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() { 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 @@ 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 @@ \ 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 @@ + + + + Manager + Magisk + + Home + @string/modules + @string/superuser + @string/log + @string/settings + + is not installed + has invalid update channel! + is up to date + can be updated! + is loading… + + \ 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