TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-12-25 10:17:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename some string IDs

Browse Source
This commit is contained in:
topjohnwu 2020-01-23 02:34:18 +08:00
parent 36513c2301
commit 0dc9f5c324
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,18 +43,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.installed_error_md2.res() MagiskState.NOT_INSTALLED -> R.string.installed_error.res()
MagiskState.UP_TO_DATE -> R.string.up_to_date_md2.res() MagiskState.UP_TO_DATE -> R.string.up_to_date.res()
MagiskState.LOADING -> R.string.loading_md2.res() MagiskState.LOADING -> R.string.loading.res()
MagiskState.OBSOLETE -> R.string.obsolete_md2.res() MagiskState.OBSOLETE -> R.string.obsolete.res()
} }
} }
val stateTextManager = Observer(stateManager) { val stateTextManager = Observer(stateManager) {
when (stateManager.value) { when (stateManager.value) {
MagiskState.NOT_INSTALLED -> R.string.channel_error_md2.res() MagiskState.NOT_INSTALLED -> R.string.channel_error.res()
MagiskState.UP_TO_DATE -> R.string.up_to_date_md2.res() MagiskState.UP_TO_DATE -> R.string.up_to_date.res()
MagiskState.LOADING -> R.string.loading_md2.res() MagiskState.LOADING -> R.string.loading.res()
MagiskState.OBSOLETE -> R.string.obsolete_md2.res() MagiskState.OBSOLETE -> R.string.obsolete.res()
} }
} }
val statePackageManager = packageName val statePackageManager = packageName

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

@ -354,7 +354,7 @@
app:layout_constraintEnd_toEndOf="@+id/home_magisk_title" app:layout_constraintEnd_toEndOf="@+id/home_magisk_title"
app:layout_constraintStart_toStartOf="@+id/home_magisk_title" app:layout_constraintStart_toStartOf="@+id/home_magisk_title"
app:layout_constraintTop_toBottomOf="@+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 <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/home_magisk_version" android:id="@+id/home_magisk_version"
@ -588,7 +588,7 @@
app:layout_constraintEnd_toEndOf="@+id/home_manager_title" app:layout_constraintEnd_toEndOf="@+id/home_manager_title"
app:layout_constraintStart_toStartOf="@+id/home_manager_title" app:layout_constraintStart_toStartOf="@+id/home_manager_title"
app:layout_constraintTop_toBottomOf="@+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 <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/home_manager_version" android:id="@+id/home_manager_version"

10
app/src/main/res/values/strings.xml
View File

@ -12,11 +12,11 @@
<!--Home--> <!--Home-->
<string name="no_connection">No connection available</string> <string name="no_connection">No connection available</string>
<string name="installed_error_md2">is not installed</string> <string name="installed_error">is not installed</string>
<string name="channel_error_md2">has invalid update channel!</string> <string name="channel_error">has invalid update channel!</string>
<string name="up_to_date_md2">is up to date</string> <string name="up_to_date">is up to date</string>
<string name="obsolete_md2">can be updated!</string> <string name="obsolete">can be updated!</string>
<string name="loading_md2">is loading…</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_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="home_notice_hide">Hide</string>
<string name="app_changelog">Changelog</string> <string name="app_changelog">Changelog</string>