From 675bb20f5251f16b4911f4eb7104faae2f8dc211 Mon Sep 17 00:00:00 2001 From: ShirkNeko <109797057+ShirkNeko@users.noreply.github.com> Date: Tue, 3 Jun 2025 15:26:03 +0800 Subject: [PATCH] manager: Modify the Show KPM function to hidden and update the related settings. --- .../app/src/main/java/com/sukisu/ultra/ui/MainActivity.kt | 2 +- .../java/com/sukisu/ultra/ui/viewmodel/HomeViewModel.kt | 4 ++-- .../zako/zako/zako/zakoui/activity/component/BottomBar.kt | 2 +- .../zako/zako/zako/zakoui/activity/util/DataRefreshUtils.kt | 2 +- .../java/zako/zako/zako/zakoui/activity/util/ThemeUtils.kt | 2 +- .../main/java/zako/zako/zako/zakoui/screen/MoreSettings.kt | 6 +++--- manager/app/src/main/res/values-zh-rCN/strings.xml | 4 ++-- manager/app/src/main/res/values/strings.xml | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/manager/app/src/main/java/com/sukisu/ultra/ui/MainActivity.kt b/manager/app/src/main/java/com/sukisu/ultra/ui/MainActivity.kt index 78f31fc2..55c90f1e 100644 --- a/manager/app/src/main/java/com/sukisu/ultra/ui/MainActivity.kt +++ b/manager/app/src/main/java/com/sukisu/ultra/ui/MainActivity.kt @@ -39,7 +39,7 @@ class MainActivity : ComponentActivity() { data class SettingsState( val isHideOtherInfo: Boolean = false, - val showKpmInfo: Boolean = true + val showKpmInfo: Boolean = false ) private lateinit var themeChangeObserver: ThemeChangeContentObserver diff --git a/manager/app/src/main/java/com/sukisu/ultra/ui/viewmodel/HomeViewModel.kt b/manager/app/src/main/java/com/sukisu/ultra/ui/viewmodel/HomeViewModel.kt index c09072bc..2504b46a 100644 --- a/manager/app/src/main/java/com/sukisu/ultra/ui/viewmodel/HomeViewModel.kt +++ b/manager/app/src/main/java/com/sukisu/ultra/ui/viewmodel/HomeViewModel.kt @@ -86,7 +86,7 @@ class HomeViewModel : ViewModel() { private set var isHideLinkCard by mutableStateOf(false) private set - var showKpmInfo by mutableStateOf(true) + var showKpmInfo by mutableStateOf(false) private set fun loadUserSettings(context: Context) { @@ -97,7 +97,7 @@ class HomeViewModel : ViewModel() { isHideOtherInfo = prefs.getBoolean("is_hide_other_info", false) isHideSusfsStatus = prefs.getBoolean("is_hide_susfs_status", false) isHideLinkCard = prefs.getBoolean("is_hide_link_card", false) - showKpmInfo = prefs.getBoolean("show_kpm_info", true) + showKpmInfo = prefs.getBoolean("show_kpm_info", false) } } diff --git a/manager/app/src/main/java/zako/zako/zako/zakoui/activity/component/BottomBar.kt b/manager/app/src/main/java/zako/zako/zako/zakoui/activity/component/BottomBar.kt index 4ffda32c..c0217eed 100644 --- a/manager/app/src/main/java/zako/zako/zako/zakoui/activity/component/BottomBar.kt +++ b/manager/app/src/main/java/zako/zako/zako/zakoui/activity/component/BottomBar.kt @@ -59,7 +59,7 @@ fun BottomBar(navController: NavHostController) { ) { BottomBarDestination.entries.forEach { destination -> if (destination == BottomBarDestination.Kpm) { - if (kpmVersion.isNotEmpty() && !kpmVersion.startsWith("Error") && showKpmInfo && Natives.version >= Natives.MINIMAL_SUPPORTED_KPM) { + if (kpmVersion.isNotEmpty() && !kpmVersion.startsWith("Error") && !showKpmInfo && Natives.version >= Natives.MINIMAL_SUPPORTED_KPM) { if (!isFullFeatured && destination.rootRequired) return@forEach val isCurrentDestOnBackStack by navController.isRouteOnBackStackAsState(destination.direction) NavigationBarItem( diff --git a/manager/app/src/main/java/zako/zako/zako/zakoui/activity/util/DataRefreshUtils.kt b/manager/app/src/main/java/zako/zako/zako/zakoui/activity/util/DataRefreshUtils.kt index 143a293f..0e9bd72f 100644 --- a/manager/app/src/main/java/zako/zako/zako/zakoui/activity/util/DataRefreshUtils.kt +++ b/manager/app/src/main/java/zako/zako/zako/zakoui/activity/util/DataRefreshUtils.kt @@ -31,7 +31,7 @@ object DataRefreshUtils { val prefs = activity.getSharedPreferences("settings", Context.MODE_PRIVATE) settingsStateFlow.value = MainActivity.SettingsState( isHideOtherInfo = prefs.getBoolean("is_hide_other_info", false), - showKpmInfo = prefs.getBoolean("show_kpm_info", true) + showKpmInfo = prefs.getBoolean("show_kpm_info", false) ) delay(1000) } diff --git a/manager/app/src/main/java/zako/zako/zako/zakoui/activity/util/ThemeUtils.kt b/manager/app/src/main/java/zako/zako/zako/zakoui/activity/util/ThemeUtils.kt index df3880f9..75ce7daf 100644 --- a/manager/app/src/main/java/zako/zako/zako/zakoui/activity/util/ThemeUtils.kt +++ b/manager/app/src/main/java/zako/zako/zako/zakoui/activity/util/ThemeUtils.kt @@ -27,7 +27,7 @@ object ThemeUtils { settingsStateFlow.value = MainActivity.SettingsState( isHideOtherInfo = prefs.getBoolean("is_hide_other_info", false), - showKpmInfo = prefs.getBoolean("show_kpm_info", true) + showKpmInfo = prefs.getBoolean("show_kpm_info", false) ) if (isFirstRun) { diff --git a/manager/app/src/main/java/zako/zako/zako/zakoui/screen/MoreSettings.kt b/manager/app/src/main/java/zako/zako/zako/zakoui/screen/MoreSettings.kt index 6882edcc..d2e59f92 100644 --- a/manager/app/src/main/java/zako/zako/zako/zakoui/screen/MoreSettings.kt +++ b/manager/app/src/main/java/zako/zako/zako/zakoui/screen/MoreSettings.kt @@ -221,7 +221,7 @@ fun MoreSettingsScreen( // 显示KPM开关状态 var isShowKpmInfo by remember { - mutableStateOf(prefs.getBoolean("show_kpm_info", true)) + mutableStateOf(prefs.getBoolean("show_kpm_info", false)) } // 隐藏SuSFS状态开关状态 @@ -1063,9 +1063,9 @@ fun MoreSettingsScreen( ) if (Natives.version >= Natives.MINIMAL_SUPPORTED_KPM) { - // 显示KPM开关 + // 隐藏KPM开关 SwitchSettingItem( - icon = Icons.Filled.Visibility, + icon = Icons.Filled.VisibilityOff, title = stringResource(R.string.show_kpm_info), summary = stringResource(R.string.show_kpm_info_summary), checked = isShowKpmInfo, diff --git a/manager/app/src/main/res/values-zh-rCN/strings.xml b/manager/app/src/main/res/values-zh-rCN/strings.xml index 443ba9a3..0a978fd6 100644 --- a/manager/app/src/main/res/values-zh-rCN/strings.xml +++ b/manager/app/src/main/res/values-zh-rCN/strings.xml @@ -325,8 +325,8 @@ 已切换图标 需要 root 权限 - 显示 KPM 功能 - 在主页和底栏显示 KPM 相关功能和信息 (需要重新打开应用) + 隐藏 KPM 功能 + 在主页和底栏隐藏 KPM 相关功能和信息 选择使用的 WebUI 引擎 自动选择 diff --git a/manager/app/src/main/res/values/strings.xml b/manager/app/src/main/res/values/strings.xml index fefc903a..c99590c7 100644 --- a/manager/app/src/main/res/values/strings.xml +++ b/manager/app/src/main/res/values/strings.xml @@ -327,8 +327,8 @@ Icon switched Requires root privileges - Display KPM Function - Display KPM information and Function in home and bottom bar (Need to reopen the app) + Hides KPM Function + Hides KPM information and Function in home and bottom bar Select the WebUI engine to use Automatic Selection