From f89b03b587931130e495cf3082086975a2265582 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Tue, 31 Oct 2023 22:48:30 +0100
Subject: tweak setup next and cancel button layout

---
 .../main/res/drawable/cust_setup_button_primary_pressed.xml  | 12 +++++++++++-
 app/src/main/res/layout/activity_setup.xml                   |  5 ++++-
 app/src/main/res/values/colors.xml                           |  3 ++-
 app/src/main/res/values/dimens.xml                           |  1 +
 app/src/main/res/values/styles.xml                           |  2 +-
 5 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/drawable/cust_setup_button_primary_pressed.xml b/app/src/main/res/drawable/cust_setup_button_primary_pressed.xml
index 6fb664d9..69f6e056 100644
--- a/app/src/main/res/drawable/cust_setup_button_primary_pressed.xml
+++ b/app/src/main/res/drawable/cust_setup_button_primary_pressed.xml
@@ -1,6 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item>
+    <item
+        android:bottom="@dimen/button_bevel_pressed"
+        >
+        <shape android:shape="rectangle"  >
+            <corners android:radius="8dp" />
+            <solid android:color="@color/colorPrimary_transparent_dark"/>
+        </shape>
+    </item>
+    <item
+        android:bottom="@dimen/button_bevel"
+        >
         <shape android:shape="rectangle"  >
             <corners android:radius="8dp" />
             <padding android:left="8dp" android:right="8dp"/>
diff --git a/app/src/main/res/layout/activity_setup.xml b/app/src/main/res/layout/activity_setup.xml
index 6a2c5209..7ba0125f 100644
--- a/app/src/main/res/layout/activity_setup.xml
+++ b/app/src/main/res/layout/activity_setup.xml
@@ -169,7 +169,8 @@
             android:layout_centerVertical="true"
             android:text="@string/next"
             tools:visibility="visible"
-
+            android:gravity="top|center_horizontal"
+            android:paddingTop="5dp"
             />
 
         <androidx.appcompat.widget.AppCompatButton
@@ -179,6 +180,8 @@
             android:layout_height="wrap_content"
             android:layout_alignParentStart="true"
             android:layout_centerVertical="true"
+            android:gravity="top|center_horizontal"
+            android:paddingTop="5dp"
             android:text="@string/cancel"
             android:visibility="gone"
             tools:visibility="visible"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 0ad20a63..84a2d9f0 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,7 +3,8 @@
     <color name="colorPrimary">#ff1b8b</color>
     <color name="colorPrimaryLight">#FF69B4</color>
     <color name="colorPrimaryDark">#ef0072</color>
-    <color name="colorPrimary_transparent">#0B000000</color>
+    <color name="colorPrimary_transparent">#0D000000</color>
+    <color name="colorPrimary_transparent_dark">#1F000000</color>
     <color name="colorBackground">#fffafafa</color>
     <color name="colorError">#ef9a9a</color>
     <color name="colorSuccess">#a5d6a7</color>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index edda28c7..d80ed4a6 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -42,6 +42,7 @@
 
     <dimen name="toast_bottom_padding">20dp</dimen>
     <dimen name="button_bevel">3dp</dimen>
+    <dimen name="button_bevel_pressed">1dp</dimen>
     <dimen name="button_radius">16dp</dimen>
     <dimen name="mainbutton_padding">8dp</dimen>
     <dimen name="donation_reminder_padding">8dp</dimen>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 8ee40614..3a4dbe40 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -68,7 +68,7 @@
         <item name="android:textColor">@color/color_font_btn</item>
     </style>
 
-    <style name="BitmaskSetupButton" parent="Widget.AppCompat.Button">
+    <style name="BitmaskSetupButton" parent="Widget.AppCompat.Button.Borderless">
         <item name="android:background">@drawable/cust_setup_button_primary</item>
         <item name="android:textAllCaps">false</item>
         <item name="android:height">36dp</item>
-- 
cgit v1.2.3