Improve button styles

farmblocks-android issue: 3
CraveFood · Aug 16, 2019 · 5e1b4af · 5e1b4af
1 parent d113235
commit 5e1b4af
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/app/src/main/res/layout/activity_buttons.xml b/app/src/main/res/layout/activity_buttons.xml
@@ -8,25 +8,25 @@
 	android:orientation="vertical"
 	tools:context=".ButtonsActivity">
 
-	<Button
+	<com.google.android.material.button.MaterialButton
 		style="@style/FarmBlocks.Button.Primary"
 		android:layout_margin="8dp"
 		android:text="Primary Button"
 		tools:ignore="HardcodedText" />
 
-	<Button
+	<com.google.android.material.button.MaterialButton
 		style="@style/FarmBlocks.Button.Neutral"
 		android:layout_margin="8dp"
 		android:text="Neutral Button"
 		tools:ignore="HardcodedText" />
 
-	<Button
+	<com.google.android.material.button.MaterialButton
 		style="@style/FarmBlocks.Button.White"
 		android:layout_margin="8dp"
 		android:text="White Button"
 		tools:ignore="HardcodedText" />
 
-	<Button
+	<com.google.android.material.button.MaterialButton
 		style="@style/FarmBlocks.Button.Primary"
 		android:layout_margin="8dp"
 		android:enabled="false"

diff --git a/components/src/main/res/values/button_styles.xml b/components/src/main/res/values/button_styles.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-	<style name="FarmBlocks.Button">
-		<item name="android:textAppearance">@style/FarmBlocks.TextStyle.Button.White</item>
-		<item name="android:foreground">?android:attr/selectableItemBackground</item>
+	<style name="FarmBlocks.Button" parent="Widget.MaterialComponents.Button">
+		<item name="android:textAppearance">@style/FarmBlocks.TextStyle.Button</item>
 		<item name="android:background">@drawable/button_shape_background</item>
 		<item name="android:layout_width">wrap_content</item>
-		<item name="android:layout_height">50dp</item>
+		<item name="android:layout_height">56dp</item>
 		<item name="android:paddingStart">24dp</item>
 		<item name="android:paddingEnd">24dp</item>
+		<item name="android:elevation">2dp</item>
+		<item name="android:textAllCaps">false</item>
 	</style>
 
 	<style name="FarmBlocks.Button.Primary">