优化：主页入口设置不会再显示两个相机

ReChronoRain · Apr 20, 2024 · 7a67153 · 7a67153
1 parent aa9c6e7
commit 7a67153
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 53 deletions.
diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/MainFragment.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/MainFragment.java
@@ -62,7 +62,6 @@
 public class MainFragment extends SettingsPreferenceFragment implements HomepageEntrance.EntranceState {
 
     Preference mCamera;
-    Preference mCameraNew;
     Preference mPowerSetting;
     Preference mMTB;
     Preference mSecurityCenter;
@@ -133,8 +132,7 @@ public void initPrefs() {
                 }
             }
         });
-        mCamera = findPreference("prefs_key_camera");
-        mCameraNew = findPreference("prefs_key_camera_new");
+        mCamera = findPreference("prefs_key_camera_2");
         mPowerSetting = findPreference("prefs_key_powerkeeper");
         mMTB = findPreference("prefs_key_mtb");
         mSecurityCenter = findPreference("prefs_key_security_center");
@@ -147,17 +145,18 @@ public void initPrefs() {
 
         mHelpCantSeeApps.setVisible(!getSharedPreferences().getBoolean("prefs_key_help_cant_see_apps_switch", false));
 
-        mCamera.setVisible(!isMoreHyperOSVersion(1f) && !PackagesUtils.checkAppStatus(getContext(), "com.android.camera"));
-        mCameraNew.setVisible(isMoreHyperOSVersion(1f) && !PackagesUtils.checkAppStatus(getContext(), "com.android.camera"));
+        mCamera.setVisible(!PackagesUtils.checkAppStatus(getContext(), "com.android.camera"));
         mPowerSetting.setVisible(!PackagesUtils.checkAppStatus(getContext(), "com.miui.powerkeeper"));
         mMTB.setVisible(!PackagesUtils.checkAppStatus(getContext(), "com.xiaomi.mtb"));
 
         if (isMoreHyperOSVersion(1f)) {
+            mCamera.setFragment("com.sevtinge.hyperceiler.ui.fragment.CameraNewFragment");
             mAod.setTitle(R.string.aod_hyperos);
             mMiLink.setTitle(R.string.milink_hyperos);
             mGuardProvider.setTitle(R.string.guard_provider_hyperos);
             mSecurityCenter.setTitle(R.string.security_center_hyperos);
         } else {
+            mCamera.setFragment("com.sevtinge.hyperceiler.ui.fragment.CameraFragment");
             mAod.setTitle(R.string.aod);
             mMiLink.setTitle(R.string.milink);
             mGuardProvider.setTitle(R.string.guard_provider);

diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/StatusBarSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/systemui/StatusBarSettings.java
@@ -35,12 +35,10 @@
 
 public class StatusBarSettings extends SettingsPreferenceFragment {
 
-    Preference mOldClockStatus; // 旧时钟指示器
-    Preference mNewClockStatus; // 新时钟指示器
+    Preference mClockStatus; // 时钟指示器
     Preference mDeviceStatus; // 硬件指示器
     Preference mToastStatus; // 灵动 Toast
-    Preference mIconManagerOld;
-    Preference mIconManagerNew;
+    Preference mIconManager;
     PreferenceCategory mStatusBarLayout; // 状态栏布局
     RecommendPreference mRecommend;
 
@@ -59,22 +57,22 @@ public View.OnClickListener addRestartListener() {
 
     @Override
     public void initPrefs() {
-        mOldClockStatus = findPreference("prefs_key_old_clock_status");
-        mNewClockStatus = findPreference("prefs_key_new_clock_status");
+        mIconManager = findPreference("prefs_key_icon_manager");
+        mClockStatus = findPreference("prefs_key_clock_status");
+
         mDeviceStatus = findPreference("prefs_key_system_ui_status_bar_device");
         mToastStatus = findPreference("prefs_key_system_ui_status_bar_toast");
-        mIconManagerOld = findPreference("prefs_key_icon_manager_old");
-        mIconManagerNew = findPreference("prefs_key_icon_manager_new");
         mStatusBarLayout = findPreference("pref_key_system_ui_statusbar_layout");
-
         mDeviceStatus.setVisible(!isHyperOSVersion(1f) && !isMoreAndroidVersion(34));
         mToastStatus.setVisible(isHyperOSVersion(1f));
 
-        mIconManagerOld.setVisible(!isMoreHyperOSVersion(1f));
-        mIconManagerNew.setVisible(isMoreHyperOSVersion(1f));
-
-        mOldClockStatus.setVisible(!isMoreHyperOSVersion(1f));
-        mNewClockStatus.setVisible(isMoreHyperOSVersion(1f));
+        if (isMoreHyperOSVersion(1f)) {
+            mIconManager.setFragment("com.sevtinge.hyperceiler.ui.fragment.systemui.statusbar.IconManageNewSettings");
+            mClockStatus.setFragment("com.sevtinge.hyperceiler.ui.fragment.systemui.statusbar.NewClockIndicatorSettings");
+        } else {
+            mIconManager.setFragment("com.sevtinge.hyperceiler.ui.fragment.systemui.statusbar.IconManageSettings");
+            mClockStatus.setFragment("com.sevtinge.hyperceiler.ui.fragment.systemui.statusbar.ClockIndicatorSettings");
+        }
 
         mStatusBarLayout.setVisible(!isMoreHyperOSVersion(1f));
 

diff --git a/app/src/main/res/xml/prefs_main.xml b/app/src/main/res/xml/prefs_main.xml
@@ -31,16 +31,8 @@
             android:title="@string/calendar" />
 
         <com.sevtinge.hyperceiler.prefs.PreferenceHeader
-            android:fragment="com.sevtinge.hyperceiler.ui.fragment.CameraFragment"
             android:icon="@drawable/ic_camera"
-            android:key="prefs_key_camera"
-            android:summary="com.android.camera"
-            android:title="@string/camera" />
-
-        <com.sevtinge.hyperceiler.prefs.PreferenceHeader
-            android:fragment="com.sevtinge.hyperceiler.ui.fragment.CameraNewFragment"
-            android:icon="@drawable/ic_camera"
-            android:key="prefs_key_camera_new"
+            android:key="prefs_key_camera_2"
             android:summary="com.android.camera"
             android:title="@string/camera" />
 

diff --git a/app/src/main/res/xml/prefs_set_homepage_entrance.xml b/app/src/main/res/xml/prefs_set_homepage_entrance.xml
@@ -32,15 +32,7 @@
     <SwitchPreference
         android:defaultValue="true"
         android:icon="@drawable/ic_camera"
-        android:key="prefs_key_camera_state"
-        android:layout="@layout/preference_header"
-        android:summary="com.android.camera"
-        android:title="@string/camera" />
-
-    <SwitchPreference
-        android:defaultValue="true"
-        android:icon="@drawable/ic_camera"
-        android:key="prefs_key_camera_new_state"
+        android:key="prefs_key_camera_2_state"
         android:layout="@layout/preference_header"
         android:summary="com.android.camera"
         android:title="@string/camera" />

diff --git a/app/src/main/res/xml/system_ui_status_bar.xml b/app/src/main/res/xml/system_ui_status_bar.xml
@@ -4,29 +4,15 @@
     app:myLocation="@string/system_ui_statusbar_title">
 
     <Preference
-        android:fragment="com.sevtinge.hyperceiler.ui.fragment.systemui.statusbar.IconManageSettings"
         android:title="@string/system_ui_statusbar_iconmanage_title"
-        android:key="prefs_key_icon_manager_old"
-        app:isPreferenceVisible="false"/>
-
-    <Preference
-        android:fragment="com.sevtinge.hyperceiler.ui.fragment.systemui.statusbar.IconManageNewSettings"
-        android:title="@string/system_ui_statusbar_iconmanage_title"
-        android:key="prefs_key_icon_manager_new"
-        app:isPreferenceVisible="false"/>
+        android:key="prefs_key_icon_manager" />
 
     <Preference
         android:fragment="com.sevtinge.hyperceiler.ui.fragment.systemui.statusbar.NetworkSpeedIndicatorSettings"
         android:title="@string/system_ui_statusbar_network_speed_indicator_title" />
 
     <Preference
-        android:fragment="com.sevtinge.hyperceiler.ui.fragment.systemui.statusbar.ClockIndicatorSettings"
-        android:key="prefs_key_old_clock_status"
-        android:title="@string/system_ui_statusbar_clock_title" />
-
-    <Preference
-        android:fragment="com.sevtinge.hyperceiler.ui.fragment.systemui.statusbar.NewClockIndicatorSettings"
-        android:key="prefs_key_new_clock_status"
+        android:key="prefs_key_clock_status"
         android:title="@string/system_ui_statusbar_clock_title" />
 
     <Preference