From c586106e51ddcf66477a5edb40f8dc66868d0776 Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Tue, 11 Feb 2020 19:55:21 -0800 Subject: [PATCH] Remove confusing scrambled "Manager" text --- .../com/topjohnwu/magisk/ui/home/HomeViewModel.kt | 11 +---------- app/src/main/res/layout/include_home_manager.xml | 2 +- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt index 6824817a2..dfe57420f 100644 --- a/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt +++ b/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt @@ -44,8 +44,7 @@ class HomeViewModel( 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_status_safe else R.string.home_status_normal).res() + val stateMagiskMode get() = (if (Config.coreOnly) R.string.home_status_safe else R.string.home_status_normal).res() val stateMagiskProgress = KObservableField(0) val stateManagerRemoteVersion = KObservableField(R.string.loading.res()) @@ -55,14 +54,6 @@ class HomeViewModel( val statePackageName = packageName val stateManagerProgress = KObservableField(0) - val stateHideManagerName = R.string.manager.res().let { - if (packageName != BuildConfig.APPLICATION_ID) { - it.replaceRandomWithSpecial(3) - } else { - it - } - } - val items = listOf(DeveloperItem.Mainline, DeveloperItem.App, DeveloperItem.Project) val itemBinding = itemBindingOf { it.bindExtra(BR.viewModel, this) diff --git a/app/src/main/res/layout/include_home_manager.xml b/app/src/main/res/layout/include_home_manager.xml index 5326926ba..225047be0 100644 --- a/app/src/main/res/layout/include_home_manager.xml +++ b/app/src/main/res/layout/include_home_manager.xml @@ -44,7 +44,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="@dimen/l1" - android:text="@{viewModel.stateHideManagerName}" + android:text="@string/manager" android:textAppearance="@style/AppearanceFoundation.Title" android:textColor="?colorPrimary" app:layout_constraintBottom_toBottomOf="@+id/home_manager_icon"