From e6fadc4f43421790e802d980948a0b8d07b1586e Mon Sep 17 00:00:00 2001 From: Dashwave Date: Sun, 10 Nov 2024 12:05:44 +0000 Subject: [PATCH 1/3] Update flat button styles for 20% rounded corners. --- .../main/res/drawable/rounded_flat_button_background.xml | 6 ++++++ .../res/drawable/rounded_flat_stroke_button_background.xml | 6 ++++++ sample/src/main/res/layout/layout_flat_button.xml | 3 ++- sample/src/main/res/layout/layout_flat_stroke_button.xml | 5 +++-- 4 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 sample/src/main/res/drawable/rounded_flat_button_background.xml create mode 100644 sample/src/main/res/drawable/rounded_flat_stroke_button_background.xml diff --git a/sample/src/main/res/drawable/rounded_flat_button_background.xml b/sample/src/main/res/drawable/rounded_flat_button_background.xml new file mode 100644 index 0000000..95b6cdf --- /dev/null +++ b/sample/src/main/res/drawable/rounded_flat_button_background.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/sample/src/main/res/drawable/rounded_flat_stroke_button_background.xml b/sample/src/main/res/drawable/rounded_flat_stroke_button_background.xml new file mode 100644 index 0000000..95b6cdf --- /dev/null +++ b/sample/src/main/res/drawable/rounded_flat_stroke_button_background.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/sample/src/main/res/layout/layout_flat_button.xml b/sample/src/main/res/layout/layout_flat_button.xml index 2e5b571..33fb4e5 100644 --- a/sample/src/main/res/layout/layout_flat_button.xml +++ b/sample/src/main/res/layout/layout_flat_button.xml @@ -2,7 +2,8 @@ + android:clickable="true" + android:background="@drawable/rounded_flat_button_background"> + android:clickable="true" + android:background="@drawable/rounded_flat_stroke_button_background"> - \ No newline at end of file + From d40d935cfac0b0cfbf36cf277f603ef54be0356b Mon Sep 17 00:00:00 2001 From: Dashwave Date: Sun, 10 Nov 2024 12:15:10 +0000 Subject: [PATCH 2/3] Update drawable resources for flat buttons with 20dp rounded corners. --- sample/src/main/res/drawable/rounded_flat_button_background.xml | 2 +- .../main/res/drawable/rounded_flat_stroke_button_background.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sample/src/main/res/drawable/rounded_flat_button_background.xml b/sample/src/main/res/drawable/rounded_flat_button_background.xml index 95b6cdf..baa03e1 100644 --- a/sample/src/main/res/drawable/rounded_flat_button_background.xml +++ b/sample/src/main/res/drawable/rounded_flat_button_background.xml @@ -1,6 +1,6 @@ - + diff --git a/sample/src/main/res/drawable/rounded_flat_stroke_button_background.xml b/sample/src/main/res/drawable/rounded_flat_stroke_button_background.xml index 95b6cdf..baa03e1 100644 --- a/sample/src/main/res/drawable/rounded_flat_stroke_button_background.xml +++ b/sample/src/main/res/drawable/rounded_flat_stroke_button_background.xml @@ -1,6 +1,6 @@ - + From a17bc1915c0cc9bb0aff4ca5ba854894498861b3 Mon Sep 17 00:00:00 2001 From: Dashwave Date: Sun, 10 Nov 2024 12:18:45 +0000 Subject: [PATCH 3/3] Change flat button surface color to blue (#0000FF). --- sample/src/main/res/layout/layout_flat_button.xml | 3 ++- sample/src/main/res/layout/layout_flat_stroke_button.xml | 3 ++- sample/src/main/res/values/colors.xml | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sample/src/main/res/layout/layout_flat_button.xml b/sample/src/main/res/layout/layout_flat_button.xml index 33fb4e5..afa9640 100644 --- a/sample/src/main/res/layout/layout_flat_button.xml +++ b/sample/src/main/res/layout/layout_flat_button.xml @@ -3,7 +3,8 @@ style="@style/Primary40_Flat_White" android:layout_width="match_parent" android:clickable="true" - android:background="@drawable/rounded_flat_button_background"> + android:background="@drawable/rounded_flat_button_background" + android:neopop_center_surface_color="@color/blue"> + android:background="@drawable/rounded_flat_stroke_button_background" + android:neopop_center_surface_color="@color/blue"> #FFEB34 #8DD04A #3D3D3D - \ No newline at end of file + #0000FF +