From 0dc9f5c324e8aeb4223aba343f45e50a1bc8aca3 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Thu, 23 Jan 2020 02:34:18 +0800
Subject: [PATCH] Rename some string IDs

---
 .../topjohnwu/magisk/ui/home/HomeViewModel.kt    | 16 ++++++++--------
 app/src/main/res/layout/fragment_home_md2.xml    |  4 ++--
 app/src/main/res/values/strings.xml              | 10 +++++-----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt
index 64a455047..850f2a552 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt
@@ -43,18 +43,18 @@ class HomeViewModel(
     val stateManager = KObservableField(MagiskState.LOADING)
     val stateTextMagisk = Observer(stateMagisk) {
         when (stateMagisk.value) {
-            MagiskState.NOT_INSTALLED -> R.string.installed_error_md2.res()
-            MagiskState.UP_TO_DATE -> R.string.up_to_date_md2.res()
-            MagiskState.LOADING -> R.string.loading_md2.res()
-            MagiskState.OBSOLETE -> R.string.obsolete_md2.res()
+            MagiskState.NOT_INSTALLED -> R.string.installed_error.res()
+            MagiskState.UP_TO_DATE -> R.string.up_to_date.res()
+            MagiskState.LOADING -> R.string.loading.res()
+            MagiskState.OBSOLETE -> R.string.obsolete.res()
         }
     }
     val stateTextManager = Observer(stateManager) {
         when (stateManager.value) {
-            MagiskState.NOT_INSTALLED -> R.string.channel_error_md2.res()
-            MagiskState.UP_TO_DATE -> R.string.up_to_date_md2.res()
-            MagiskState.LOADING -> R.string.loading_md2.res()
-            MagiskState.OBSOLETE -> R.string.obsolete_md2.res()
+            MagiskState.NOT_INSTALLED -> R.string.channel_error.res()
+            MagiskState.UP_TO_DATE -> R.string.up_to_date.res()
+            MagiskState.LOADING -> R.string.loading.res()
+            MagiskState.OBSOLETE -> R.string.obsolete.res()
         }
     }
     val statePackageManager = packageName
diff --git a/app/src/main/res/layout/fragment_home_md2.xml b/app/src/main/res/layout/fragment_home_md2.xml
index 28c74fd38..fb9d29e14 100644
--- a/app/src/main/res/layout/fragment_home_md2.xml
+++ b/app/src/main/res/layout/fragment_home_md2.xml
@@ -354,7 +354,7 @@
                                 app:layout_constraintEnd_toEndOf="@+id/home_magisk_title"
                                 app:layout_constraintStart_toStartOf="@+id/home_magisk_title"
                                 app:layout_constraintTop_toBottomOf="@+id/home_magisk_title"
-                                tools:text="@string/up_to_date_md2" />
+                                tools:text="@string/up_to_date" />
 
                             <androidx.appcompat.widget.AppCompatTextView
                                 android:id="@+id/home_magisk_version"
@@ -588,7 +588,7 @@
                                 app:layout_constraintEnd_toEndOf="@+id/home_manager_title"
                                 app:layout_constraintStart_toStartOf="@+id/home_manager_title"
                                 app:layout_constraintTop_toBottomOf="@+id/home_manager_title"
-                                tools:text="@string/obsolete_md2" />
+                                tools:text="@string/obsolete" />
 
                             <androidx.appcompat.widget.AppCompatTextView
                                 android:id="@+id/home_manager_version"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b7917cec3..284f9c3b2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -12,11 +12,11 @@
 
     <!--Home-->
     <string name="no_connection">No connection available</string>
-    <string name="installed_error_md2">is not installed</string>
-    <string name="channel_error_md2">has invalid update channel!</string>
-    <string name="up_to_date_md2">is up to date</string>
-    <string name="obsolete_md2">can be updated!</string>
-    <string name="loading_md2">is loading…</string>
+    <string name="installed_error">is not installed</string>
+    <string name="channel_error">has invalid update channel!</string>
+    <string name="up_to_date">is up to date</string>
+    <string name="obsolete">can be updated!</string>
+    <string name="loading">is loading…</string>
     <string name="home_notice_content">Always make sure you\'re using open-source Magisk Manager. Manager of unknown source can perform malicious actions.</string>
     <string name="home_notice_hide">Hide</string>
     <string name="app_changelog">Changelog</string>