Fix: button size and style

therajanmaurya · Nov 27, 2020 · f7de65c · f7de65c
1 parent 592404a
commit f7de65c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/SweetUpdate/src/main/java/com/github/sweet/play/update/SweetPlayAppUpdaterBottomSheet.kt b/SweetUpdate/src/main/java/com/github/sweet/play/update/SweetPlayAppUpdaterBottomSheet.kt
@@ -62,7 +62,7 @@ class SweetPlayAppUpdaterBottomSheet(
             headerImage = this@SweetPlayAppUpdaterBottomSheet.headerImage
             bsBackground = this@SweetPlayAppUpdaterBottomSheet.background
 
-            /*typeface?.let {
+            typeface?.let {
                 tvUpdateAvailable.typeface = it
                 tvUpdateAvailableMessage.typeface = it
                 tvUpdateProgress.typeface = it
@@ -72,7 +72,7 @@ class SweetPlayAppUpdaterBottomSheet(
                 btnDownloadInstall.typeface = it
                 btnCancel.typeface = it
                 btnOk.typeface = it
-            }*/
+            }
         }
         return binding.root
     }

diff --git a/SweetUpdate/src/main/res/layout/layout_sweet_update_bottom_sheet.xml b/SweetUpdate/src/main/res/layout/layout_sweet_update_bottom_sheet.xml
@@ -137,17 +137,13 @@
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btnLater"
                 style="@style/SweetButtonStyle.BorderedOutlined"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
                 android:layout_marginEnd="@dimen/layout_padding_16dp"
                 android:onClick="@{() -> fragment.dismiss()}"
                 android:text="@string/later" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btnDownloadInstall"
                 style="@style/SweetButtonStyle.BorderedOutlined"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/layout_padding_16dp"
                 android:text="@string/download" />
 
@@ -226,8 +222,6 @@
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btnCancel"
                 style="@style/SweetButtonStyle.BorderedOutlined"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
                 android:onClick="@{() -> fragment.dismiss()}"
                 android:text="@string/cancel"
                 android:textAllCaps="false" />
@@ -249,8 +243,6 @@
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btnOk"
                 style="@style/SweetButtonStyle.BorderedOutlined"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_padding_8dp"
                 android:onClick="@{() -> fragment.dismiss()}"
                 android:text="@string/ok"

diff --git a/SweetUpdate/src/main/res/values/sweet_play_update_styles.xml b/SweetUpdate/src/main/res/values/sweet_play_update_styles.xml
@@ -17,7 +17,8 @@
     </style>
 
     <style name="SweetButtonStyle.BorderedOutlined" parent="Widget.MaterialComponents.Button.OutlinedButton">
-        <item name="android:layout_height">48dp</item>
+        <item name="android:layout_height">40dp</item>
+        <item name="android:layout_width">wrap_content</item>
         <item name="android:insetTop">0dp</item>
         <item name="android:insetBottom">0dp</item>
         <item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Body1</item>