TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-12-26 05:46:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor string resources

Browse Source
This commit is contained in:
topjohnwu
2020-02-10 01:43:28 -08:00
parent b5ac24f239
commit d51d549a28
43 changed files with 682 additions and 934 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/com/topjohnwu/magisk/core/Hacks.kt
View File

@@ -156,21 +156,21 @@ object ClassMap {
}
/*
* TODO: These string were used in the old design, but currently aren't.
* However, they should be, so keep a reference here to prevent it from
* being removed when running "remove unused resources" */
val shouldKeepStrings = listOf(
* Keep a reference to these resources to prevent it from
* being removed when running "remove unused resources" */
val shouldKeepResources = listOf(
/* TODO: The following strings should be used somewhere */
R.string.patch_file_msg,
R.string.no_apps_found,
R.string.no_info_provided,
R.string.reboot_bootloader,
R.string.reboot_recovery,
R.string.reboot_edl,
R.string.reboot_download,
R.string.release_notes,
R.string.settings_download_path_error,
R.string.unsupport_magisk_msg,
R.string.unsupport_magisk_title,
R.string.install_inactive_slot_msg,
R.string.invalid_update_channel
R.string.invalid_update_channel,
R.string.update_available,
/* Android Studio is dumb and cannot detect following usages in databinding */
R.menu.menu_reboot
)

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

@@ -41,14 +41,14 @@ class HomeViewModel(
val stateMagisk = KObservableField(MagiskState.LOADING)
val stateManager = KObservableField(MagiskState.LOADING)
val stateMagiskRemoteVersion = KObservableField(R.string.home_loading.res())
val stateMagiskRemoteVersion = KObservableField(R.string.loading.res())
val stateMagiskInstalledVersion get() =
"${Info.env.magiskVersionString} (${Info.env.magiskVersionCode})"
val stateMagiskMode get() = (if (Config.coreOnly)
R.string.home_extra_mode_safe else R.string.home_extra_mode_normal).res()
R.string.home_status_safe else R.string.home_status_normal).res()
val stateMagiskProgress = KObservableField(0)
val stateManagerRemoteVersion = KObservableField(R.string.home_loading.res())
val stateManagerRemoteVersion = KObservableField(R.string.loading.res())
val stateManagerInstalledVersion = Info.stub?.let {
"${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE}) (${it.version})"
} ?: "${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})"

4
app/src/main/java/com/topjohnwu/magisk/ui/safetynet/SafetynetViewModel.kt
View File

@@ -83,8 +83,8 @@ class SafetynetViewModel(
ctsState.value = false
basicIntegrityState.value = false
safetyNetTitle.value = when (response) {
SafetyNetHelper.RESPONSE_ERR -> R.string.safetyNet_res_invalid
else -> R.string.safetyNet_api_error
SafetyNetHelper.RESPONSE_ERR -> R.string.safetynet_res_invalid
else -> R.string.safetynet_api_error
}
}
}