Minus UI changes

Signed-off-by: DHD2280 <[email protected]>
DHD2280 · Nov 13, 2024 · 21d9bc9 · 21d9bc9
1 parent 3f50ef4
commit 21d9bc9
Show file tree

Hide file tree

Showing 16 changed files with 172 additions and 160 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -208,7 +208,6 @@ dependencies {
 
     // Oneplus UI
     implementation(libs.oneplus.ui)
-
 }
 
 tasks.register("printVersionName") {

diff --git a/app/src/main/res/layout/custom_preference_illustration.xml b/app/src/main/res/layout/custom_preference_illustration.xml
@@ -21,7 +21,8 @@
     android:gravity="center"
     android:clickable="false"
     android:importantForAccessibility="noHideDescendants"
-    android:layout_margin="@dimen/preference_card_margin_horizontal"
+    android:layout_marginHorizontal="@dimen/preference_card_margin_horizontal"
+    android:layout_marginTop="@dimen/preference_card_margin_horizontal"
     android:orientation="horizontal">
 
     <FrameLayout

diff --git a/app/src/main/res/xml/aod_prefs.xml b/app/src/main/res/xml/aod_prefs.xml
@@ -6,17 +6,20 @@
         android:key="sb_illustration"
         app:lottie_rawRes="@raw/aod_illustration" />
 
-    <it.dhd.oneplusui.preference.OplusJumpPreference
-        android:fragment="it.dhd.oxygencustomizer.ui.fragments.mods.aod.AodClock"
-        android:key="aod_clock"
-        android:title="@string/aod_clock"
-        app:forcePosition="top"
-        app:iconSpaceReserved="false" />
+    <it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
-    <it.dhd.oneplusui.preference.OplusJumpPreference
-        android:fragment="it.dhd.oxygencustomizer.ui.fragments.mods.aod.AodWeather"
-        android:key="aod_weather"
-        android:title="@string/aod_weather"
-        app:iconSpaceReserved="false" />
+        <it.dhd.oneplusui.preference.OplusJumpPreference
+            android:fragment="it.dhd.oxygencustomizer.ui.fragments.mods.aod.AodClock"
+            android:key="aod_clock"
+            android:title="@string/aod_clock"
+            app:iconSpaceReserved="false" />
+
+        <it.dhd.oneplusui.preference.OplusJumpPreference
+            android:fragment="it.dhd.oxygencustomizer.ui.fragments.mods.aod.AodWeather"
+            android:key="aod_weather"
+            android:title="@string/aod_weather"
+            app:iconSpaceReserved="false" />
+
+    </it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
 </PreferenceScreen>
diff --git a/app/src/main/res/xml/aod_weather_prefs.xml b/app/src/main/res/xml/aod_weather_prefs.xml
@@ -10,7 +10,7 @@
         app:forcePosition="full"
         app:iconSpaceReserved="false" />
 
-    <PreferenceCategory>
+    <it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
         <it.dhd.oneplusui.preference.OplusMenuPreference
             android:defaultValue="2"
@@ -68,9 +68,9 @@
             app:iconSpaceReserved="false"
             app:useSimpleSummaryProvider="true" />
 
-    </PreferenceCategory>
+    </it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
-    <PreferenceCategory android:key="aod_weather_prefs">
+    <it.dhd.oneplusui.preference.OplusPreferenceCategory android:key="aod_weather_prefs">
 
         <it.dhd.oneplusui.preference.OplusSwitchPreference
             android:defaultValue="true"
@@ -126,9 +126,9 @@
             app:minVal="13"
             app:valueFormat="dp" />
 
-    </PreferenceCategory>
+    </it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
-    <PreferenceCategory android:key="aod_weather_colors_prefs">
+    <it.dhd.oneplusui.preference.OplusPreferenceCategory android:key="aod_weather_colors_prefs">
 
         <it.dhd.oneplusui.preference.OplusSwitchPreference
             android:defaultValue="false"
@@ -145,7 +145,7 @@
             android:title="@string/custom_color"
             app:iconSpaceReserved="false" />
 
-    </PreferenceCategory>
+    </it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
     <it.dhd.oneplusui.preference.OplusPreferenceCategory android:title="@string/weather_custom_location_title">
 
@@ -164,7 +164,7 @@
 
     </it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
-    <PreferenceCategory>
+    <it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
         <it.dhd.oxygencustomizer.ui.preferences.ListWithPopUpPreference
             android:dependency="aod_weather_enabled"
@@ -208,6 +208,6 @@
             app:minVal="0"
             app:valueFormat="dp" />
 
-    </PreferenceCategory>
+    </it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
 </PreferenceScreen>
diff --git a/app/src/main/res/xml/battery_bar_settings.xml b/app/src/main/res/xml/battery_bar_settings.xml
@@ -11,7 +11,7 @@
         app:forcePosition="full"
         app:iconSpaceReserved="false" />
 
-    <PreferenceCategory>
+    <it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
         <it.dhd.oneplusui.preference.OplusSwitchPreference
             android:defaultValue="false"
@@ -52,9 +52,9 @@
             android:summaryOn="@string/general_on"
             android:title="@string/BB_center_align_title"
             app:iconSpaceReserved="false" />
-    </PreferenceCategory>
+    </it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
-    <PreferenceCategory>
+    <it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
         <it.dhd.oneplusui.preference.OplusSwitchPreference
             android:defaultValue="false"
@@ -113,9 +113,9 @@
             android:key="batteryPowerSaveColor"
             android:title="@string/BB_batteryPowerSaveColor"
             app:iconSpaceReserved="false" />
-    </PreferenceCategory>
+    </it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
-    <PreferenceCategory>
+    <it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
         <it.dhd.oneplusui.preference.OplusSliderPreference
             android:key="batteryWarningRange"
@@ -149,6 +149,6 @@
             android:title="@string/BB_batteryWarningColor"
             app:iconSpaceReserved="false" />
 
-    </PreferenceCategory>
+    </it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
 </PreferenceScreen>
diff --git a/app/src/main/res/xml/colors_prefs.xml b/app/src/main/res/xml/colors_prefs.xml
@@ -7,13 +7,15 @@
         app:lottie_cacheComposition="false"
         app:lottie_rawRes="@raw/themes_illustration" />
 
+    <it.dhd.oneplusui.preference.OplusPreferenceCategory/>
+
     <it.dhd.oxygencustomizer.ui.preferences.OplusColorPreference
         android:key="primary_color"
         android:title="@string/primary_color"
         app:cpv_showAlphaSlider="true"
         app:forcePosition="full" />
 
-    <PreferenceCategory/>
+    <it.dhd.oneplusui.preference.OplusPreferenceCategory/>
 
     <it.dhd.oneplusui.preference.OplusPreference
         android:key="apply_colors"

diff --git a/app/src/main/res/xml/gesture_prefs.xml b/app/src/main/res/xml/gesture_prefs.xml
@@ -44,7 +44,7 @@
             app:iconSpaceReserved="false" />
     </it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
-    <PreferenceCategory>
+    <it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
         <it.dhd.oneplusui.preference.OplusSwitchPreference
             android:defaultValue="false"
@@ -79,7 +79,7 @@
             app:iconSpaceReserved="false"
             app:useSimpleSummaryProvider="true" />
 
-    </PreferenceCategory>
+    </it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
     <it.dhd.oneplusui.preference.OplusPreferenceCategory
         android:key="nav_pill_cat"

diff --git a/app/src/main/res/xml/lockscreen_weather_prefs.xml b/app/src/main/res/xml/lockscreen_weather_prefs.xml
@@ -25,7 +25,7 @@
         app:forcePosition="full"
         app:iconSpaceReserved="false" />
 
-    <PreferenceCategory>
+    <it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
         <it.dhd.oneplusui.preference.OplusMenuPreference
             android:defaultValue="2"
@@ -83,9 +83,9 @@
             app:iconSpaceReserved="false"
             app:useSimpleSummaryProvider="true" />
 
-    </PreferenceCategory>
+    </it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
-    <PreferenceCategory android:key="lockscreen_weather_prefs">
+    <it.dhd.oneplusui.preference.OplusPreferenceCategory android:key="lockscreen_weather_prefs">
 
         <it.dhd.oneplusui.preference.OplusSwitchPreference
             android:defaultValue="true"
@@ -141,9 +141,9 @@
             app:minVal="13"
             app:valueFormat="dp" />
 
-    </PreferenceCategory>
+    </it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
-    <PreferenceCategory android:key="lockscreen_weather_colors_prefs">
+    <it.dhd.oneplusui.preference.OplusPreferenceCategory android:key="lockscreen_weather_colors_prefs">
         <it.dhd.oneplusui.preference.OplusSwitchPreference
             android:defaultValue="false"
             android:key="weather_custom_color_switch"
@@ -158,7 +158,7 @@
             android:key="weather_custom_color"
             android:title="@string/custom_color"
             app:iconSpaceReserved="false" />
-    </PreferenceCategory>
+    </it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
     <it.dhd.oneplusui.preference.OplusPreferenceCategory android:title="@string/weather_custom_location_title">
 
@@ -177,7 +177,7 @@
 
     </it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
-    <PreferenceCategory>
+    <it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
         <it.dhd.oxygencustomizer.ui.preferences.ListWithPopUpPreference
             android:dependency="lockscreen_weather_enabled"
@@ -230,6 +230,6 @@
             app:iconSpaceReserved="false"
             app:useSimpleSummaryProvider="true" />
 
-    </PreferenceCategory>
+    </it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
 </PreferenceScreen>
diff --git a/app/src/main/res/xml/memc_overview.xml b/app/src/main/res/xml/memc_overview.xml
@@ -2,7 +2,7 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <PreferenceCategory>
+    <it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
         <it.dhd.oneplusui.preference.OplusPreference
             android:key="memc_feature_on"
@@ -34,9 +34,9 @@
             android:title="@string/memc_mode"
             app:iconSpaceReserved="false" />
 
-    </PreferenceCategory>
+    </it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
-    <PreferenceCategory>
+    <it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
         <it.dhd.oneplusui.preference.OplusSwitchPreference
             android:defaultValue="false"
@@ -58,7 +58,7 @@
             android:summary="@string/custom_memc_configuration_summary"
             app:iconSpaceReserved="false" />
 
-    </PreferenceCategory>
+    </it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
     <it.dhd.oxygencustomizer.ui.preferences.FooterPreference
         android:key="footer"

diff --git a/app/src/main/res/xml/misc_prefs.xml b/app/src/main/res/xml/misc_prefs.xml
@@ -6,23 +6,26 @@
         android:key="sb_illustration"
         app:lottie_rawRes="@raw/misc_illustration" />
 
-    <it.dhd.oneplusui.preference.OplusSwitchPreference
-        android:defaultValue="false"
-        android:key="misc_remove_rotate_floating"
-        android:summaryOff="@string/general_off"
-        android:summaryOn="@string/general_on"
-        android:title="@string/misc_remove_rotate_floating_title"
-        app:forcePosition="top"
-        app:iconSpaceReserved="false" />
-
-    <it.dhd.oneplusui.preference.OplusSwitchPreference
-        android:defaultValue="false"
-        android:key="remove_usb_dialog"
-        android:summary="@string/remove_usb_dialog_summary"
-        android:title="@string/remove_usb_dialog"
-        app:forcePosition="bottom"
-        app:iconSpaceReserved="false" />
+    <it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
+        <it.dhd.oneplusui.preference.OplusSwitchPreference
+            android:defaultValue="false"
+            android:key="misc_remove_rotate_floating"
+            android:summaryOff="@string/general_off"
+            android:summaryOn="@string/general_on"
+            android:title="@string/misc_remove_rotate_floating_title"
+            app:forcePosition="top"
+            app:iconSpaceReserved="false" />
+
+        <it.dhd.oneplusui.preference.OplusSwitchPreference
+            android:defaultValue="false"
+            android:key="remove_usb_dialog"
+            android:summary="@string/remove_usb_dialog_summary"
+            android:title="@string/remove_usb_dialog"
+            app:forcePosition="bottom"
+            app:iconSpaceReserved="false" />
+
+    </it.dhd.oneplusui.preference.OplusPreferenceCategory>
 
     <it.dhd.oneplusui.preference.OplusPreferenceCategory
         android:title="@string/misc_power_menu"
@@ -126,9 +129,9 @@
         app:iconSpaceReserved="false">
 
         <it.dhd.oneplusui.preference.OplusJumpPreference
+            android:fragment="it.dhd.oxygencustomizer.ui.fragments.mods.misc.MemcFragment"
             android:key="memc_prefs"
             android:title="@string/memc_page_title"
-            android:fragment="it.dhd.oxygencustomizer.ui.fragments.mods.misc.MemcFragment"
             app:iconSpaceReserved="false" />
 
     </it.dhd.oneplusui.preference.OplusPreferenceCategory>
-Original file line number
+Diff line change
@@ Expand Up / @@ -208,7 +208,6 @@ dependencies { @@
         // Oneplus UI
         implementation(libs.oneplus.ui)
     }
     tasks.register("printVersionName") {
@@ Expand Down @@