From c11be87a199070d02f80516a1b8fbd17079ca6c5 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Sat, 5 Aug 2023 23:41:15 +0200
Subject: tweak next and cancel button appearance in setup flow

---
 app/src/main/res/layout/activity_setup.xml | 8 ++++++--
 app/src/main/res/values/styles.xml         | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout/activity_setup.xml b/app/src/main/res/layout/activity_setup.xml
index 26ef2285..d321f751 100644
--- a/app/src/main/res/layout/activity_setup.xml
+++ b/app/src/main/res/layout/activity_setup.xml
@@ -2,6 +2,7 @@
 <androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     android:weightSum="1"
     xmlns:app="http://schemas.android.com/apk/res-auto">
@@ -129,7 +130,7 @@
             </androidx.cardview.widget.CardView>
 
         </LinearLayout>
-        <Button
+        <androidx.appcompat.widget.AppCompatButton
             style="@style/BitmaskSetupButton"
             android:id="@+id/setup_next_button"
             android:layout_width="wrap_content"
@@ -137,9 +138,11 @@
             android:layout_alignParentEnd="true"
             android:layout_alignParentBottom="true"
             android:text="@string/next"
+            tools:visibility="visible"
+
             />
 
-        <Button
+        <androidx.appcompat.widget.AppCompatButton
             style="@style/BitmaskSetupButton"
             android:id="@+id/setup_cancel_button"
             android:layout_width="wrap_content"
@@ -148,6 +151,7 @@
             android:layout_alignParentBottom="true"
             android:text="@string/cancel"
             android:visibility="gone"
+            tools:visibility="visible"
             />
     </RelativeLayout>
 </androidx.appcompat.widget.LinearLayoutCompat>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d59b5150..8ee40614 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -68,14 +68,14 @@
         <item name="android:textColor">@color/color_font_btn</item>
     </style>
 
-    <style name="BitmaskSetupButton" parent="android:Widget.Button">
+    <style name="BitmaskSetupButton" parent="Widget.AppCompat.Button">
         <item name="android:background">@drawable/cust_setup_button_primary</item>
         <item name="android:textAllCaps">false</item>
         <item name="android:height">36dp</item>
         <item name="android:minWidth">75dp</item>
         <item name="android:textColor">@color/colorActionBarTitleFont</item>
-        <item name="android:textFontWeight" tools:targetApi="p">900</item>
         <item name="android:textStyle">bold</item>
+        <item name="android:letterSpacing">0.05</item>
     </style>
 
     <style name="BitmaskActivity">
-- 
cgit v1.2.3