TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-11-24 10:35:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated strings

Browse Source
This commit is contained in:
Viktor De Pasquale 2019-10-05 11:13:57 +02:00
parent 3a18e68751
commit 149d35c687
6 changed files with 37 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/topjohnwu/magisk/redesign/home/HomeFragment.kt
View File

@ -16,7 +16,7 @@ class HomeFragment : CompatFragment<HomeViewModel, FragmentHomeMd2Binding>() {
override fun onStart() { override fun onStart() {
super.onStart() super.onStart()
activity.title = "Home" activity.title = resources.getString(R.string.section_home)
} }
} }

16
app/src/main/java/com/topjohnwu/magisk/redesign/home/HomeViewModel.kt
View File

@ -22,18 +22,18 @@ class HomeViewModel(
val stateManager = KObservableField(MagiskState.LOADING) val stateManager = KObservableField(MagiskState.LOADING)
val stateTextMagisk = Observer(stateMagisk) { val stateTextMagisk = Observer(stateMagisk) {
when (stateMagisk.value) { when (stateMagisk.value) {
MagiskState.NOT_INSTALLED -> R.string.magisk_version_error.res() MagiskState.NOT_INSTALLED -> R.string.installed_error_md2.res()
MagiskState.UP_TO_DATE -> R.string.magisk_up_to_date.res() MagiskState.UP_TO_DATE -> R.string.up_to_date_md2.res()
MagiskState.LOADING -> R.string.checking_for_updates.res() MagiskState.LOADING -> R.string.loading_md2.res()
MagiskState.OBSOLETE -> R.string.magisk_update_title.res() MagiskState.OBSOLETE -> R.string.obsolete_md2.res()
} }
} }
val stateTextManager = Observer(stateManager) { val stateTextManager = Observer(stateManager) {
when (stateManager.value) { when (stateManager.value) {
MagiskState.NOT_INSTALLED -> R.string.invalid_update_channel.res() MagiskState.NOT_INSTALLED -> R.string.channel_error_md2.res()
MagiskState.UP_TO_DATE -> R.string.manager_up_to_date.res() MagiskState.UP_TO_DATE -> R.string.up_to_date_md2.res()
MagiskState.LOADING -> R.string.checking_for_updates.res() MagiskState.LOADING -> R.string.loading_md2.res()
MagiskState.OBSOLETE -> R.string.manager_update_title.res() MagiskState.OBSOLETE -> R.string.obsolete_md2.res()
} }
} }

6
app/src/main/res/layout/fragment_home_md2.xml
View File

@ -60,7 +60,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/l1" android:layout_marginTop="@dimen/l1"
android:gravity="center" android:gravity="center"
android:text="Magisk" android:text="@string/magisk"
android:textAppearance="?appearanceTextTitleNormal" android:textAppearance="?appearanceTextTitleNormal"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@ -151,7 +151,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/l1" android:layout_marginTop="@dimen/l1"
android:gravity="center" android:gravity="center"
android:text="Manager" android:text="@string/manager"
android:textAppearance="?appearanceTextTitleNormal" android:textAppearance="?appearanceTextTitleNormal"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@ -207,6 +207,8 @@
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginStart="@dimen/l1"
android:layout_marginEnd="@dimen/l1"
android:layout_marginTop="@dimen/l2" android:layout_marginTop="@dimen/l2"
android:layout_marginBottom="@dimen/l2" android:layout_marginBottom="@dimen/l2"
android:background="?colorSurfaceVariant" /> android:background="?colorSurfaceVariant" />

8
app/src/main/res/menu/menu_bottom_nav.xml
View File

@ -5,13 +5,13 @@
<item <item
android:id="@+id/homeFragment" android:id="@+id/homeFragment"
android:icon="@drawable/ic_home_md2" android:icon="@drawable/ic_home_md2"
android:title="Home" android:title="@string/section_home"
tools:showAsAction="always" /> tools:showAsAction="always" />
<item <item
android:id="@+id/modulesFragment" android:id="@+id/modulesFragment"
android:icon="@drawable/ic_module_md2" android:icon="@drawable/ic_module_md2"
android:title="@string/modules" android:title="@string/section_modules"
tools:showAsAction="always" /> tools:showAsAction="always" />
<item <item
@ -23,13 +23,13 @@
<item <item
android:id="@+id/logFragment" android:id="@+id/logFragment"
android:icon="@drawable/ic_bug_md2" android:icon="@drawable/ic_bug_md2"
android:title="@string/log" android:title="@string/section_log"
tools:showAsAction="always" /> tools:showAsAction="always" />
<item <item
android:id="@+id/settingsFragment" android:id="@+id/settingsFragment"
android:icon="@drawable/ic_settings_md2" android:icon="@drawable/ic_settings_md2"
android:title="@string/settings" android:title="@string/section_settings"
tools:showAsAction="always" /> tools:showAsAction="always" />
</menu> </menu>

19
app/src/main/res/values/strings_md2.xml Normal file
View File

@ -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>

2
native/jni/external/mincrypt vendored

@ -1 +1 @@
Subproject commit d443357d300f263179e04ef0893e6b8f040c9451 Subproject commit ac33afa79e57e198b9eeec231140d64816a0bb1e