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

Merge string resources

Browse Source
This commit is contained in:
topjohnwu
2020-01-23 01:40:36 +08:00
parent 345c3ef15e
commit 2291be5d26
50 changed files with 246 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/HomeItems.kt
View File

@@ -26,7 +26,7 @@ sealed class HomeItem : ComparableRvItem<HomeItem>() {
// region Children
sealed class PayPal : HomeItem() {
override val icon = R.drawable.ic_paypal
override val title = R.string.home_item_paypal
override val title = R.string.paypal
override val link = "https://paypal.me/%s"
// region Children
@@ -42,13 +42,13 @@ sealed class HomeItem : ComparableRvItem<HomeItem>() {
object Patreon : HomeItem() {
override val icon = R.drawable.ic_patreon
override val title = R.string.home_item_patreon
override val title = R.string.patreon
override val link = Const.Url.PATREON_URL
}
sealed class Twitter : HomeItem() {
override val icon = R.drawable.ic_twitter
override val title = R.string.home_item_twitter
override val title = R.string.twitter
override val link = "https://twitter.com/%s"
// region Children
@@ -70,7 +70,7 @@ sealed class HomeItem : ComparableRvItem<HomeItem>() {
object Xda : HomeItem() {
override val icon = R.drawable.ic_xda
override val title = R.string.home_item_xda
override val title = R.string.xda
override val link = Const.Url.XDA_THREAD
}
// endregion
@@ -97,13 +97,13 @@ sealed class DeveloperItem : ComparableRvItem<DeveloperItem>() {
object Mainline : DeveloperItem() {
override val items =
listOf(HomeItem.PayPal.Mainline, HomeItem.Patreon, HomeItem.Twitter.Mainline)
override val name = R.string.home_links_mainline
override val name = R.string.topjohnwu
}
object App : DeveloperItem() {
override val items =
listOf(HomeItem.PayPal.App, HomeItem.Twitter.App)
override val name = R.string.home_links_app
override val name = R.string.diareuse
}
object Project : DeveloperItem() {

6
app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/TappableHeadlineItem.kt
View File

@@ -27,12 +27,12 @@ sealed class TappableHeadlineItem : ComparableRvItem<TappableHeadlineItem>() {
// --- objects
object Hide : TappableHeadlineItem() {
override val title = R.string.magisk_hide_md2
override val title = R.string.magiskhide
override val icon = R.drawable.ic_hide_md2
}
object Safetynet : TappableHeadlineItem() {
override val title = R.string.safetyNet
override val title = R.string.safetynet
override val icon = R.drawable.ic_safetynet_md2
}
@@ -41,4 +41,4 @@ sealed class TappableHeadlineItem : ComparableRvItem<TappableHeadlineItem>() {
override val icon = R.drawable.ic_day_night
}
}
}

2
app/src/main/java/com/topjohnwu/magisk/ui/log/LogFragment.kt
View File

@@ -33,7 +33,7 @@ class LogFragment : CompatFragment<LogViewModel, FragmentLogMd2Binding>() {
override fun onStart() {
super.onStart()
setHasOptionsMenu(true)
activity.title = resources.getString(R.string.section_log)
activity.title = resources.getString(R.string.logs)
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

2
app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleFragment.kt
View File

@@ -49,7 +49,7 @@ class ModuleFragment : CompatFragment<ModuleViewModel, FragmentModuleMd2Binding>
override fun onStart() {
super.onStart()
setHasOptionsMenu(true)
activity.title = resources.getString(R.string.section_modules)
activity.title = resources.getString(R.string.modules)
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

4
app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt
View File

@@ -71,7 +71,7 @@ class ModuleViewModel(
it.bindExtra(BR.viewModel, this)
}
private val itemNoneInstalled = TextItem(R.string.module_install_none)
private val itemNoneInstalled = TextItem(R.string.no_modules_found)
private val itemNoneUpdatable = TextItem(R.string.module_update_none)
private val itemsInstalledHelpers = ObservableArrayList<TextItem>().also {
@@ -116,7 +116,7 @@ class ModuleViewModel(
).also { it.hasButton = false }
private val sectionActive = SectionTitle(
R.string.module_section_installed,
R.string.installed,
R.string.reboot,
R.drawable.ic_restart
).also { it.hasButton = false }

2
app/src/main/java/com/topjohnwu/magisk/ui/safetynet/SafetynetFragment.kt
View File

@@ -12,7 +12,7 @@ class SafetynetFragment : CompatFragment<SafetynetViewModel, FragmentSafetynetMd
override fun onStart() {
super.onStart()
activity.setTitle(R.string.safetyNet)
activity.setTitle(R.string.safetynet)
}
}

2
app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.kt
View File

@@ -19,7 +19,7 @@ class SettingsFragment : CompatFragment<SettingsViewModel, FragmentSettingsMd2Bi
override fun onStart() {
super.onStart()
activity.title = resources.getString(R.string.section_settings)
activity.title = resources.getString(R.string.settings)
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

2
app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserFragment.kt
View File

@@ -22,7 +22,7 @@ class SuperuserFragment : CompatFragment<SuperuserViewModel, FragmentSuperuserMd
override fun onStart() {
super.onStart()
activity.title = resources.getString(R.string.section_superuser)
activity.title = resources.getString(R.string.superuser)
setHasOptionsMenu(true)
}