From ce859292460781f7d2287f73769af5aee55b4e97 Mon Sep 17 00:00:00 2001
From: Sayantan Roychowdhury <sayantan.rc@e.email>
Date: Mon, 10 Apr 2023 16:01:56 +0530
Subject: [PATCH 1/3] use material button

---
 app/ui/legacy/src/main/res/layout/wizard_setup.xml   | 5 ++---
 app/ui/legacy/src/main/res/layout/wizard_welcome.xml | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/ui/legacy/src/main/res/layout/wizard_setup.xml b/app/ui/legacy/src/main/res/layout/wizard_setup.xml
index c15c50bfda..7b398f8f45 100644
--- a/app/ui/legacy/src/main/res/layout/wizard_setup.xml
+++ b/app/ui/legacy/src/main/res/layout/wizard_setup.xml
@@ -20,13 +20,12 @@
             android:background="?selectableItemBackground"
             android:text="@string/account_setup_basics_manual_setup_action" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/next"
-            style="@style/Widget.AppCompat.Button.Colored"
+            style="@style/Widget.MaterialComponents.Button.TextButton.Dialog.Flush"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             app:layout_constraintEnd_toEndOf="parent"
-            android:background="@drawable/btn_bg_rounded_corner"
             android:backgroundTint="@color/btn_color_bg_state"
             android:textColor="@color/color_default_background"
             android:textSize="14sp"
diff --git a/app/ui/legacy/src/main/res/layout/wizard_welcome.xml b/app/ui/legacy/src/main/res/layout/wizard_welcome.xml
index 4a2e911124..b7fd41e500 100644
--- a/app/ui/legacy/src/main/res/layout/wizard_welcome.xml
+++ b/app/ui/legacy/src/main/res/layout/wizard_welcome.xml
@@ -20,14 +20,13 @@
             android:textSize="14sp"
             android:text="@string/settings_import" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/next"
-            style="@style/Widget.AppCompat.Button.Colored"
+            style="@style/Widget.MaterialComponents.Button.TextButton.Dialog.Flush"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             app:layout_constraintEnd_toEndOf="parent"
             android:textColor="@color/color_default_background"
-            android:background="@drawable/btn_bg_rounded_corner"
             android:backgroundTint="@color/color_default_accent"
             android:textSize="14sp"
             android:text="@string/next_action" />
-- 
GitLab


From 8bfa88b050b5e51167312e5c9ee0647fbdcfb4a5 Mon Sep 17 00:00:00 2001
From: Sayantan Roychowdhury <sayantan.rc@e.email>
Date: Mon, 10 Apr 2023 16:02:33 +0530
Subject: [PATCH 2/3] add margin bottom

---
 app/ui/legacy/src/main/res/layout/wizard_setup.xml   | 1 +
 app/ui/legacy/src/main/res/layout/wizard_welcome.xml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/ui/legacy/src/main/res/layout/wizard_setup.xml b/app/ui/legacy/src/main/res/layout/wizard_setup.xml
index 7b398f8f45..4c923e8f2e 100644
--- a/app/ui/legacy/src/main/res/layout/wizard_setup.xml
+++ b/app/ui/legacy/src/main/res/layout/wizard_setup.xml
@@ -6,6 +6,7 @@
         style="?android:attr/buttonBarStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="6dp"
         android:layout_marginEnd="16dp" >
 
         <Button
diff --git a/app/ui/legacy/src/main/res/layout/wizard_welcome.xml b/app/ui/legacy/src/main/res/layout/wizard_welcome.xml
index b7fd41e500..7a52f9090f 100644
--- a/app/ui/legacy/src/main/res/layout/wizard_welcome.xml
+++ b/app/ui/legacy/src/main/res/layout/wizard_welcome.xml
@@ -6,6 +6,7 @@
         style="?android:attr/buttonBarStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="6dp"
         android:layout_marginEnd="16dp" >
 
         <Button
-- 
GitLab


From 31d38840e6c879cb096e7b9d3bee91be8f9a9597 Mon Sep 17 00:00:00 2001
From: Sayantan Roychowdhury <sayantan.rc@e.email>
Date: Mon, 10 Apr 2023 16:04:33 +0530
Subject: [PATCH 3/3] remove btn_bg_rounded_corner

---
 .../res/drawable/btn_bg_rounded_corner.xml    | 42 -------------------
 1 file changed, 42 deletions(-)
 delete mode 100644 app/ui/legacy/src/main/res/drawable/btn_bg_rounded_corner.xml

diff --git a/app/ui/legacy/src/main/res/drawable/btn_bg_rounded_corner.xml b/app/ui/legacy/src/main/res/drawable/btn_bg_rounded_corner.xml
deleted file mode 100644
index 3a12e2ae6d..0000000000
--- a/app/ui/legacy/src/main/res/drawable/btn_bg_rounded_corner.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright MURENA SAS 2023
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
-  -->
-
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/ripple_material_dark">
-
-    <item android:id="@android:id/mask">
-        <shape android:shape="rectangle">
-            <stroke
-                android:width="7dp"
-                android:color="#00FFFFFF" />
-            <solid android:color="@android:color/white" />
-            <corners android:radius="7dp" />
-        </shape>
-    </item>
-
-    <item>
-        <shape
-            android:shape="rectangle">
-            <stroke
-                android:width="7dp"
-                android:color="#00FFFFFF" />
-            <solid android:color="#FFFFFF"/>
-            <corners android:radius="7dp"/>
-        </shape>
-    </item>
-
-</ripple>
-- 
GitLab