Preference fix, dimens fix, button style rework

Yanndroid · Yanndroid · commit 6e22377744be · 2021-10-01T21:20:41.000+02:00
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
@@ -11,27 +11,27 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/about_btn1"
-        style="@style/AboutPageButtonStyle"
+        style="@style/ButtonStyle.AboutPage"
         android:text="Loading" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/about_btn2"
-        style="@style/AboutPageButtonStyle"
+        style="@style/ButtonStyle.AboutPage"
         android:text="No Update" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/about_btn3"
-        style="@style/AboutPageButtonStyle"
+        style="@style/ButtonStyle.AboutPage"
         android:text="Update available" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/about_btn4"
-        style="@style/AboutPageButtonStyle"
+        style="@style/ButtonStyle.AboutPage"
         android:text="Not Updateable" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/about_btn5"
-        style="@style/AboutPageButtonStyle"
+        style="@style/ButtonStyle.AboutPage"
         android:text="No Connection" />
 
 </de.dlyt.yanndroid.oneui.layout.AboutPage>
diff --git a/app/src/main/res/layout/fragment_views_tab.xml b/app/src/main/res/layout/fragment_views_tab.xml
@@ -191,7 +191,7 @@
                         android:background="@color/divider_color" />
 
                     <com.google.android.material.button.MaterialButton
-                        style="@style/ButtonStyle.Invert"
+                        style="@style/ButtonStyle.Colored"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -206,7 +206,7 @@
                         android:background="@color/divider_color" />
 
                     <com.google.android.material.button.MaterialButton
-                        style="@style/ButtonStyle.Invert.Secondary"
+                        style="@style/ButtonStyle.Filled"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -297,7 +297,7 @@
                 android:orientation="vertical">
 
                 <com.google.android.material.button.MaterialButton
-                    style="@style/ButtonStyle.Invert"
+                    style="@style/ButtonStyle.Colored"
                     android:layout_width="200dp"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
@@ -306,7 +306,7 @@
                     android:text="Classic" />
 
                 <com.google.android.material.button.MaterialButton
-                    style="@style/ButtonStyle.Invert"
+                    style="@style/ButtonStyle.Colored"
                     android:layout_width="200dp"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
diff --git a/yanndroid/oneui/src/main/java/de/dlyt/yanndroid/oneui/preference/DropDownPreference.java b/yanndroid/oneui/src/main/java/de/dlyt/yanndroid/oneui/preference/DropDownPreference.java
@@ -81,7 +81,7 @@ public int findSpinnerIndexOfValue(String value) {
     }
 
     @Override
-    protected void notifyChanged() {
+    public void notifyChanged() {
         super.notifyChanged();
         mAdapter.notifyDataSetChanged();
     }
diff --git a/yanndroid/oneui/src/main/java/de/dlyt/yanndroid/oneui/preference/Preference.java b/yanndroid/oneui/src/main/java/de/dlyt/yanndroid/oneui/preference/Preference.java
@@ -505,6 +505,7 @@ public final int getWidgetLayoutResource() {
 
     public void setWidgetLayoutResource(int var1) {
         this.mWidgetLayoutResId = var1;
+        this.notifyChanged();
     }
 
     public boolean hasKey() {
@@ -597,7 +598,7 @@ public final boolean isVisible() {
         return this.mVisible;
     }
 
-    protected void notifyChanged() {
+    public void notifyChanged() {
         if (this.mListener != null) {
             this.mListener.onPreferenceChange(this);
         }
diff --git a/yanndroid/oneui/src/main/res/drawable/about_screen_button.xml b/yanndroid/oneui/src/main/res/drawable/about_screen_button.xml
diff --git a/yanndroid/oneui/src/main/res/drawable/sesl_btn_about.xml b/yanndroid/oneui/src/main/res/drawable/sesl_btn_about.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/item_color">
+    <item
+        android:id="@android:id/mask"
+        android:drawable="@drawable/sesl_btn_default_mask" />
+    <item android:drawable="@drawable/sesl_btn_default_background" />
+</ripple>
diff --git a/yanndroid/oneui/src/main/res/layout-land/samsung_about_screen.xml b/yanndroid/oneui/src/main/res/layout-land/samsung_about_screen.xml
@@ -71,12 +71,12 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/update_button"
-                style="@style/AboutPageButtonStyle.Update"
+                style="@style/ButtonStyle.AboutPageUpdate"
                 android:text="@string/sesl_update" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/retry_button"
-                style="@style/AboutPageButtonStyle.Update"
+                style="@style/ButtonStyle.AboutPageUpdate"
                 android:text="@string/retry" />
 
 
diff --git a/yanndroid/oneui/src/main/res/layout/samsung_about_screen.xml b/yanndroid/oneui/src/main/res/layout/samsung_about_screen.xml
@@ -68,12 +68,12 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/update_button"
-            style="@style/AboutPageButtonStyle.Update"
+            style="@style/ButtonStyle.AboutPageUpdate"
             android:text="@string/sesl_update" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/retry_button"
-            style="@style/AboutPageButtonStyle.Update"
+            style="@style/ButtonStyle.AboutPageUpdate"
             android:text="@string/retry" />
 
 
diff --git a/yanndroid/oneui/src/main/res/values-xxhdpi/dimens.xml b/yanndroid/oneui/src/main/res/values-xxhdpi/dimens.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="sesl_switch_divider_height">2.0px</dimen>
-    <dimen name="sesl_list_divider_height">2.0px</dimen>
+    <dimen name="sesl_list_divider_height">3.0px</dimen>
     <dimen name="sesl_edit_textfield_cursor_width">5.0px</dimen>
 </resources>
diff --git a/yanndroid/oneui/src/main/res/values/dimens.xml b/yanndroid/oneui/src/main/res/values/dimens.xml
@@ -27,7 +27,7 @@
     <dimen name="progress_bar_height">24.0dip</dimen>
     <dimen name="progress_bar_radius">12.0dip</dimen>
 
-    <dimen name="sesl_button_corner_radius">18.0dip</dimen>
+    <dimen name="sesl_button_corner_radius">26.0dip</dimen>
     <dimen name="sesl_button_text_size">15.0sp</dimen>
     <dimen name="sesl_show_button_background_radius">2.0dip</dimen>
 
diff --git a/yanndroid/oneui/src/main/res/values/styles.xml b/yanndroid/oneui/src/main/res/values/styles.xml
@@ -232,41 +232,40 @@
         <item name="android:background">@drawable/sesl_btn_transparent</item>
     </style>
 
-    <style name="ButtonStyle.Invert">
+    <style name="ButtonStyle.Colored">
         <item name="android:backgroundTint">@color/sesl_btn_color_state</item>
         <item name="android:textColor">@color/white</item>
     </style>
 
-    <style name="ButtonStyle.Invert.Secondary">
-        <item name="rippleColor">@color/item_color</item>
+    <style name="ButtonStyle.Filled">
         <item name="android:backgroundTint">@color/button_background_color</item>
         <item name="android:textColor">@color/item_color</item>
     </style>
 
-    <style name="AboutPageButtonStyle" parent="Widget.AppCompat.Button">
-        <item name="android:layout_width">250dp</item>
+    <style name="ButtonStyle.AboutPage">
+        <item name="android:background">@drawable/sesl_btn_about</item>
+        <item name="android:backgroundTint">@color/button_background_color</item>
+
+        <item name="android:layout_width">240dp</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:minHeight">44.0dip</item>
         <item name="android:layout_marginTop">7dp</item>
         <item name="android:layout_marginBottom">7dp</item>
 
-        <item name="android:background">@drawable/about_screen_button</item>
-        <item name="backgroundTint">@color/button_background_color</item>
-        <item name="android:focusable">true</item>
-
+        <item name="android:textAppearance">@style/ButtonTextStyle</item>
         <item name="android:textSize">17sp</item>
-        <item name="android:textAllCaps">false</item>
-        <item name="android:textStyle">bold</item>
         <item name="android:textColor">@color/sesl_primary_text</item>
-        <item name="android:maxLines">2</item>
-        <item name="android:fontFamily">@string/sesl_font_family_regular</item>
-        <item name="android:ellipsize">end</item>
     </style>
 
-    <style name="AboutPageButtonStyle.Update">
-        <item name="backgroundTint">@color/sesl_btn_color_state</item>
-        <item name="android:layout_marginBottom">0dp</item>
-        <item name="android:layout_marginTop">0dp</item>
+    <style name="ButtonStyle.AboutPageUpdate">
+        <item name="android:backgroundTint">@color/sesl_btn_color_state</item>
+
+        <item name="android:layout_width">240dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:minHeight">44.0dip</item>
+
+        <item name="android:textAppearance">@style/ButtonTextStyle</item>
+        <item name="android:textSize">17sp</item>
         <item name="android:textColor">@color/white</item>
     </style>
 

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public int findSpinnerIndexOfValue(String value) {`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`@Override`
`84`		`- protected void notifyChanged() {`
	`84`	`+ public void notifyChanged() {`
`85`	`85`	`super.notifyChanged();`
`86`	`86`	`mAdapter.notifyDataSetChanged();`
`87`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -505,6 +505,7 @@ public final int getWidgetLayoutResource() {`
`505`	`505`
`506`	`506`	`public void setWidgetLayoutResource(int var1) {`
`507`	`507`	`this.mWidgetLayoutResId = var1;`
	`508`	`+ this.notifyChanged();`
`508`	`509`	`}`
`509`	`510`
`510`	`511`	`public boolean hasKey() {`
`@@ -597,7 +598,7 @@ public final boolean isVisible() {`
`597`	`598`	`return this.mVisible;`
`598`	`599`	`}`
`599`	`600`
`600`		`- protected void notifyChanged() {`
	`601`	`+ public void notifyChanged() {`
`601`	`602`	`if (this.mListener != null) {`
`602`	`603`	`this.mListener.onPreferenceChange(this);`
`603`	`604`	`}`