opt: ui

ReChronoRain · Dec 31, 2024 · 85afc48 · 85afc48
1 parent 7d483bc
commit 85afc48
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/app/libs/appcompat-debug.aar b/app/libs/appcompat-debug.aar
diff --git a/app/libs/preference-debug.aar b/app/libs/preference-debug.aar
diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/main/ModuleSettingsFragment.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/main/ModuleSettingsFragment.java
@@ -31,6 +31,7 @@
 import com.sevtinge.hyperceiler.R;
 import com.sevtinge.hyperceiler.ui.activity.LauncherActivity;
 import com.sevtinge.hyperceiler.ui.fragment.base.SettingsPreferenceFragment;
+import com.sevtinge.hyperceiler.ui.fragment.dashboard.DashboardFragment;
 import com.sevtinge.hyperceiler.utils.BackupUtils;
 import com.sevtinge.hyperceiler.utils.DialogHelper;
 import com.sevtinge.hyperceiler.utils.LanguageHelper;
@@ -42,7 +43,7 @@
 import fan.navigator.NavigatorFragmentListener;
 import fan.preference.DropDownPreference;
 
-public class ModuleSettingsFragment extends SettingsPreferenceFragment
+public class ModuleSettingsFragment extends DashboardFragment
         implements Preference.OnPreferenceChangeListener, NavigatorFragmentListener, IFragmentChange {
     DropDownPreference mIconModePreference;
     DropDownPreference mIconModeValue;

diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/sub/CustomBackgroundSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/sub/CustomBackgroundSettings.java
@@ -30,6 +30,7 @@
 import fan.preference.SeekBarPreferenceCompat;
 
 import androidx.preference.Preference;
+import androidx.preference.SeekBarPreference;
 import androidx.preference.SwitchPreference;
 
 public class CustomBackgroundSettings extends SettingsPreferenceFragment implements Preference.OnPreferenceChangeListener {
@@ -45,10 +46,10 @@ public class CustomBackgroundSettings extends SettingsPreferenceFragment impleme
     private SwitchPreference mCustomEnabledPreference;
 
     private ColorPickerPreference mColorPickerPreference;
-    private SeekBarPreferenceCompat mCornerRadiusPreference;
+    private SeekBarPreference mCornerRadiusPreference;
 
     private SwitchPreference mBlurEnabledPreference;
-    private SeekBarPreferenceCompat mBlurRadiusPreference;
+    private SeekBarPreference mBlurRadiusPreference;
 
     @Override
     public int getPreferenceScreenResId() {
@@ -96,9 +97,9 @@ public void initPrefs() {
     private void loadData() {
         mCustomEnabledPreference.setChecked(isCustomEnabled());
         mColorPickerPreference.setColor(getColor(-1));
-        //mCornerRadiusPreference.setValue(getSeekBarValue(mCornerRadiusKey, 18));
+        mCornerRadiusPreference.setValue(getSeekBarValue(mCornerRadiusKey, 18));
         mBlurEnabledPreference.setChecked(isBackgroundBlurEnabled());
-        //mBlurRadiusPreference.setValue(getSeekBarValue(mBlurRadiusKey, 60));
+        mBlurRadiusPreference.setValue(getSeekBarValue(mBlurRadiusKey, 60));
     }
 
     private boolean isCustomEnabled() {

diff --git a/app/src/main/res/xml/various_dialog_custom_background.xml b/app/src/main/res/xml/various_dialog_custom_background.xml
@@ -31,7 +31,7 @@
             android:persistent="false"
             android:title="@string/custom_background_color" />
 
-        <SeekBarPreferenceCompat
+        <SeekBarPreference
             android:key="prefs_key_custom_background_corner_radius"
             android:dependency="prefs_key_custom_background_enabled"
             android:persistent="false"
@@ -40,6 +40,7 @@
             app:format="%d dp"
             app:showSeekBarValue="true"
             app:maxValue="60"
+            android:max="60"
             app:defaultValueTitle="@string/array_default"/>
 
         <SwitchPreference
@@ -48,12 +49,13 @@
             android:persistent="false"
             android:title="@string/custom_background_blur_enabled" />
 
-        <SeekBarPreferenceCompat
+        <SeekBarPreference
             android:dependency="prefs_key_custom_background_blur_enabled"
             android:key="prefs_key_custom_background_blur_radius"
             android:persistent="false"
             android:title="@string/custom_background_blur_radius"
-            app:defaultValue="60"
+            android:max="100"
+            android:defaultValue="60"
             app:format="%d dp"
             app:showSeekBarValue="true"
             app:maxValue="100"