Browse Source

Replace custom download dialog buttons with MaterialButtons

arkon 3 years ago
parent
commit
35e0561950
2 changed files with 22 additions and 20 deletions
  1. 12 20
      app/src/main/res/layout/download_custom_amount.xml
  2. 10 0
      app/src/main/res/values/styles.xml

+ 12 - 20
app/src/main/res/layout/download_custom_amount.xml

@@ -7,23 +7,19 @@
     android:orientation="horizontal"
     android:paddingVertical="8dp">
 
-    <androidx.appcompat.widget.AppCompatImageButton
+    <com.google.android.material.button.MaterialButton
+        style="@style/Widget.Tachiyomi.Button.IconButton"
         android:id="@+id/btn_decrease_10"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:background="@drawable/list_item_selector"
-        android:padding="8dp"
-        android:tint="?attr/colorAccent"
-        app:srcCompat="@drawable/ic_chevron_left_double_black_24dp" />
+        app:icon="@drawable/ic_chevron_left_double_black_24dp" />
 
-    <androidx.appcompat.widget.AppCompatImageButton
+    <com.google.android.material.button.MaterialButton
+        style="@style/Widget.Tachiyomi.Button.IconButton"
         android:id="@+id/btn_decrease"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:background="@drawable/list_item_selector"
-        android:padding="8dp"
-        android:tint="?attr/colorAccent"
-        app:srcCompat="@drawable/ic_chevron_left_black_24dp" />
+        app:icon="@drawable/ic_chevron_left_black_24dp" />
 
     <eu.kanade.tachiyomi.widget.TachiyomiTextInputEditText
         android:id="@+id/myNumber"
@@ -34,22 +30,18 @@
         android:padding="8dp"
         android:textStyle="bold" />
 
-    <androidx.appcompat.widget.AppCompatImageButton
+    <com.google.android.material.button.MaterialButton
+        style="@style/Widget.Tachiyomi.Button.IconButton"
         android:id="@+id/btn_increase"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:background="@drawable/list_item_selector"
-        android:padding="8dp"
-        android:tint="?attr/colorAccent"
-        app:srcCompat="@drawable/ic_chevron_right_black_24dp" />
+        app:icon="@drawable/ic_chevron_right_black_24dp" />
 
-    <androidx.appcompat.widget.AppCompatImageButton
+    <com.google.android.material.button.MaterialButton
+        style="@style/Widget.Tachiyomi.Button.IconButton"
         android:id="@+id/btn_increase_10"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:background="@drawable/list_item_selector"
-        android:padding="8dp"
-        android:tint="?attr/colorAccent"
-        app:srcCompat="@drawable/ic_chevron_right_double_black_24dp" />
+        app:icon="@drawable/ic_chevron_right_double_black_24dp" />
 
 </LinearLayout>

+ 10 - 0
app/src/main/res/values/styles.xml

@@ -129,6 +129,16 @@
         <item name="android:textSize">12sp</item>
     </style>
 
+    <style name="Widget.Tachiyomi.Button.IconButton" parent="Widget.Material3.Button.TextButton.Icon">
+        <item name="iconTint">?attr/colorAccent</item>
+        <item name="iconPadding">0dp</item>
+        <item name="android:insetTop">0dp</item>
+        <item name="android:insetBottom">0dp</item>
+        <item name="android:paddingLeft">12dp</item>
+        <item name="android:paddingRight">12dp</item>
+        <item name="android:minWidth">0dp</item>
+    </style>
+
     <style name="Widget.Tachiyomi.Button.InlineButton" parent="Widget.Material3.Button.TextButton">
         <item name="android:minHeight">0dp</item>
         <item name="android:minWidth">0dp</item>