From 149d35c687bff26368ed80628c969d9007377d3f Mon Sep 17 00:00:00 2001
From: Viktor De Pasquale <info@depasquale.wiki>
Date: Sat, 5 Oct 2019 11:13:57 +0200
Subject: [PATCH] Updated strings

---
 .../magisk/redesign/home/HomeFragment.kt      |  2 +-
 .../magisk/redesign/home/HomeViewModel.kt     | 16 ++++++++--------
 app/src/main/res/layout/fragment_home_md2.xml |  6 ++++--
 app/src/main/res/menu/menu_bottom_nav.xml     |  8 ++++----
 app/src/main/res/values/strings_md2.xml       | 19 +++++++++++++++++++
 native/jni/external/mincrypt                  |  2 +-
 6 files changed, 37 insertions(+), 16 deletions(-)
 create mode 100644 app/src/main/res/values/strings_md2.xml

diff --git a/app/src/main/java/com/topjohnwu/magisk/redesign/home/HomeFragment.kt b/app/src/main/java/com/topjohnwu/magisk/redesign/home/HomeFragment.kt
index 8770bad72..3bf76be98 100644
--- a/app/src/main/java/com/topjohnwu/magisk/redesign/home/HomeFragment.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/redesign/home/HomeFragment.kt
@@ -16,7 +16,7 @@ class HomeFragment : CompatFragment<HomeViewModel, FragmentHomeMd2Binding>() {
     override fun onStart() {
         super.onStart()
 
-        activity.title = "Home"
+        activity.title = resources.getString(R.string.section_home)
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/topjohnwu/magisk/redesign/home/HomeViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/redesign/home/HomeViewModel.kt
index 621158a16..7f6b0f9e0 100644
--- a/app/src/main/java/com/topjohnwu/magisk/redesign/home/HomeViewModel.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/redesign/home/HomeViewModel.kt
@@ -22,18 +22,18 @@ class HomeViewModel(
     val stateManager = KObservableField(MagiskState.LOADING)
     val stateTextMagisk = Observer(stateMagisk) {
         when (stateMagisk.value) {
-            MagiskState.NOT_INSTALLED -> R.string.magisk_version_error.res()
-            MagiskState.UP_TO_DATE -> R.string.magisk_up_to_date.res()
-            MagiskState.LOADING -> R.string.checking_for_updates.res()
-            MagiskState.OBSOLETE -> R.string.magisk_update_title.res()
+            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()
         }
     }
     val stateTextManager = Observer(stateManager) {
         when (stateManager.value) {
-            MagiskState.NOT_INSTALLED -> R.string.invalid_update_channel.res()
-            MagiskState.UP_TO_DATE -> R.string.manager_up_to_date.res()
-            MagiskState.LOADING -> R.string.checking_for_updates.res()
-            MagiskState.OBSOLETE -> R.string.manager_update_title.res()
+            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()
         }
     }
 
diff --git a/app/src/main/res/layout/fragment_home_md2.xml b/app/src/main/res/layout/fragment_home_md2.xml
index db6eaf9a8..7a1cc7cf4 100644
--- a/app/src/main/res/layout/fragment_home_md2.xml
+++ b/app/src/main/res/layout/fragment_home_md2.xml
@@ -60,7 +60,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/l1"
                         android:gravity="center"
-                        android:text="Magisk"
+                        android:text="@string/magisk"
                         android:textAppearance="?appearanceTextTitleNormal"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
@@ -151,7 +151,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/l1"
                         android:gravity="center"
-                        android:text="Manager"
+                        android:text="@string/manager"
                         android:textAppearance="?appearanceTextTitleNormal"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
@@ -207,6 +207,8 @@
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
+                android:layout_marginStart="@dimen/l1"
+                android:layout_marginEnd="@dimen/l1"
                 android:layout_marginTop="@dimen/l2"
                 android:layout_marginBottom="@dimen/l2"
                 android:background="?colorSurfaceVariant" />
diff --git a/app/src/main/res/menu/menu_bottom_nav.xml b/app/src/main/res/menu/menu_bottom_nav.xml
index 3f956627a..d1d5b41ab 100644
--- a/app/src/main/res/menu/menu_bottom_nav.xml
+++ b/app/src/main/res/menu/menu_bottom_nav.xml
@@ -5,13 +5,13 @@
     <item
         android:id="@+id/homeFragment"
         android:icon="@drawable/ic_home_md2"
-        android:title="Home"
+        android:title="@string/section_home"
         tools:showAsAction="always" />
 
     <item
         android:id="@+id/modulesFragment"
         android:icon="@drawable/ic_module_md2"
-        android:title="@string/modules"
+        android:title="@string/section_modules"
         tools:showAsAction="always" />
 
     <item
@@ -23,13 +23,13 @@
     <item
         android:id="@+id/logFragment"
         android:icon="@drawable/ic_bug_md2"
-        android:title="@string/log"
+        android:title="@string/section_log"
         tools:showAsAction="always" />
 
     <item
         android:id="@+id/settingsFragment"
         android:icon="@drawable/ic_settings_md2"
-        android:title="@string/settings"
+        android:title="@string/section_settings"
         tools:showAsAction="always" />
 
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings_md2.xml b/app/src/main/res/values/strings_md2.xml
new file mode 100644
index 000000000..61f4a4cd8
--- /dev/null
+++ b/app/src/main/res/values/strings_md2.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="manager">Manager</string>
+    <string name="magisk">Magisk</string>
+
+    <string name="section_home">Home</string>
+    <string name="section_modules">@string/modules</string>
+    <string name="section_superuser">@string/superuser</string>
+    <string name="section_log">@string/log</string>
+    <string name="section_settings">@string/settings</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>
+
+</resources>
\ No newline at end of file
diff --git a/native/jni/external/mincrypt b/native/jni/external/mincrypt
index d443357d3..ac33afa79 160000
--- a/native/jni/external/mincrypt
+++ b/native/jni/external/mincrypt
@@ -1 +1 @@
-Subproject commit d443357d300f263179e04ef0893e6b8f040c9451
+Subproject commit ac33afa79e57e198b9eeec231140d64816a0bb1e