Re-organise string resources

3 files changed, 7 insertions, 7 deletions

diff --git a/app/src/main/java/org/pacien/tincapp/context/App.kt b/app/src/main/java/org/pacien/tincapp/context/App.kt
index 359cd23..6f28bd0 100644
--- a/app/src/main/java/org/pacien/tincapp/context/App.kt
+++ b/app/src/main/java/org/pacien/tincapp/context/App.kt
@@ -67,7 +67,7 @@ class App : Application() {
 
     fun openURL(url: String) {
       val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
-      val chooser = Intent.createChooser(intent, getResources().getString(R.string.action_open_web_page))
+      val chooser = Intent.createChooser(intent, getResources().getString(R.string.generic_action_open_web_page))
       appContext?.startActivity(chooser.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK))
     }
 
@@ -78,7 +78,7 @@ class App : Application() {
         .apply { if (body != null) putExtra(Intent.EXTRA_TEXT, body) }
         .apply { if (attachment != null) putExtra(Intent.EXTRA_STREAM, Uri.fromFile(attachment)) }
 
-      val chooser = Intent.createChooser(intent, getResources().getString(R.string.action_send_email))
+      val chooser = Intent.createChooser(intent, getResources().getString(R.string.crash_modal_action_send_email))
       appContext?.startActivity(chooser.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK))
     }
   }
diff --git a/app/src/main/java/org/pacien/tincapp/context/AppInfo.kt b/app/src/main/java/org/pacien/tincapp/context/AppInfo.kt
index e0d49f1..a412fa9 100644
--- a/app/src/main/java/org/pacien/tincapp/context/AppInfo.kt
+++ b/app/src/main/java/org/pacien/tincapp/context/AppInfo.kt
@@ -27,17 +27,17 @@ import org.pacien.tincapp.R
  */
 object AppInfo {
   private fun appVersion(): String = App.getResources().getString(
-    R.string.info_version_format,
+    R.string.about_app_version_format,
     BuildConfig.VERSION_NAME,
     BuildConfig.BUILD_TYPE)
 
   private fun androidVersion(): String = App.getResources().getString(
-    R.string.info_running_on_format,
+    R.string.about_app_running_on_format,
     Build.VERSION.CODENAME,
     Build.VERSION.RELEASE)
 
   private fun supportedABIs(): String = App.getResources().getString(
-    R.string.info_supported_abis_format,
+    R.string.about_app_supported_abis_format,
     Build.SUPPORTED_ABIS.joinToString(","))
 
   fun all(): String = listOf(
diff --git a/app/src/main/java/org/pacien/tincapp/context/AppNotificationManager.kt b/app/src/main/java/org/pacien/tincapp/context/AppNotificationManager.kt
index d543210..bdbc8be 100644
--- a/app/src/main/java/org/pacien/tincapp/context/AppNotificationManager.kt
+++ b/app/src/main/java/org/pacien/tincapp/context/AppNotificationManager.kt
@@ -64,7 +64,7 @@ class AppNotificationManager(private val context: Context) {
 
   @RequiresApi(Build.VERSION_CODES.O)
   private fun registerChannel() {
-    val name = context.getString(R.string.notification_channel_error_name)
+    val name = context.getString(R.string.notification_error_channel_name)
     val importance = NotificationManager.IMPORTANCE_HIGH
     val channel = NotificationChannel(CHANNEL_ID, name, importance)
     val notificationManager = context.getSystemService(NotificationManager::class.java)
@@ -79,6 +79,6 @@ class AppNotificationManager(private val context: Context) {
   private fun NotificationCompat.Builder.setManualLink(manualLink: String) = apply {
     val intent = Intent(Intent.ACTION_VIEW, Uri.parse(manualLink))
     val pendingIntent = PendingIntent.getActivity(context, 0, intent, 0)
-    addAction(R.drawable.ic_help_primary_24dp, context.getString(R.string.action_open_manual), pendingIntent)
+    addAction(R.drawable.ic_help_primary_24dp, context.getString(R.string.notification_error_action_open_manual), pendingIntent)
   }
 }