From e2f3761a8289dcbd931aac8453176ec063d2a8a7 Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Thu, 29 Nov 2018 13:14:45 -0600
Subject: [PATCH] Migrate Crystal's theme to the new MaterialComponents style.
 Also update all buttons in the app to use the new MaterialButton.

---
 .../activities/LicenseActivity.java           |  4 +-
 .../res/animator/button_state_list_anim.xml   | 93 +++++++++++++++++++
 app/src/main/res/layout/activity_accounts.xml |  1 -
 .../res/layout/activity_create_contact.xml    | 39 ++++----
 app/src/main/res/layout/activity_license.xml  | 44 ++++-----
 app/src/main/res/layout/contact_list_item.xml |  2 +-
 app/src/main/res/layout/create_seed.xml       | 53 ++++-------
 .../res/layout/fragment_accounts_settings.xml | 29 ++----
 .../res/layout/fragment_backups_settings.xml  | 24 ++---
 .../layout/fragment_bitshares_settings.xml    |  5 +-
 ...nt_general_crypto_net_account_settings.xml |  7 +-
 .../res/layout/fragment_general_settings.xml  |  6 +-
 .../fragment_import_account_options.xml       | 23 ++---
 .../res/layout/fragment_none_security.xml     |  5 +-
 .../main/res/layout/fragment_pin_security.xml | 11 +--
 app/src/main/res/layout/import_seed.xml       | 45 ++++-----
 .../main/res/layout/transaction_list_item.xml | 12 +--
 app/src/main/res/values/styles.xml            | 28 ++----
 18 files changed, 225 insertions(+), 206 deletions(-)
 create mode 100644 app/src/main/res/animator/button_state_list_anim.xml

diff --git a/app/src/main/java/cy/agorise/crystalwallet/activities/LicenseActivity.java b/app/src/main/java/cy/agorise/crystalwallet/activities/LicenseActivity.java
index 00dbede..ec83552 100644
--- a/app/src/main/java/cy/agorise/crystalwallet/activities/LicenseActivity.java
+++ b/app/src/main/java/cy/agorise/crystalwallet/activities/LicenseActivity.java
@@ -21,7 +21,7 @@ public class LicenseActivity extends AppCompatActivity {
 
     @BindView(R.id.wvEULA) WebView wvEULA;
 
-    @BindView(R.id.btnDisAgree)
+    @BindView(R.id.btnDisagree)
     Button btnDisAgree;
 
     @BindView(R.id.btnAgree)
@@ -91,7 +91,7 @@ public class LicenseActivity extends AppCompatActivity {
         finish();
     }
 
-    @OnClick(R.id.btnDisAgree)
+    @OnClick(R.id.btnDisagree)
     public void onDisagree() {
         finish();
     }
diff --git a/app/src/main/res/animator/button_state_list_anim.xml b/app/src/main/res/animator/button_state_list_anim.xml
new file mode 100644
index 0000000..22f62c3
--- /dev/null
+++ b/app/src/main/res/animator/button_state_list_anim.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <!-- Pressed state -->
+    <item
+        android:state_enabled="true"
+        android:state_pressed="true">
+        <set>
+            <objectAnimator
+                android:duration="100"
+                android:propertyName="translationZ"
+                android:valueTo="2dp"
+                android:valueType="floatType" />
+            <objectAnimator
+                android:duration="0"
+                android:propertyName="elevation"
+                android:valueTo="6dp"
+                android:valueType="floatType" />
+        </set>
+    </item>
+
+    <!-- Hover state. This is triggered via mouse. -->
+    <item
+        android:state_enabled="true"
+        android:state_hovered="true">
+        <set>
+            <objectAnimator
+                android:duration="100"
+                android:propertyName="translationZ"
+                android:valueTo="2dp"
+                android:valueType="floatType" />
+            <objectAnimator
+                android:duration="0"
+                android:propertyName="elevation"
+                android:valueTo="6dp"
+                android:valueType="floatType" />
+        </set>
+    </item>
+
+    <!-- Focused state. This is triggered via keyboard. -->
+    <item
+        android:state_enabled="true"
+        android:state_focused="true">
+        <set>
+            <objectAnimator
+                android:duration="100"
+                android:propertyName="translationZ"
+                android:valueTo="2dp"
+                android:valueType="floatType" />
+            <objectAnimator
+                android:duration="0"
+                android:propertyName="elevation"
+                android:valueTo="6dp"
+                android:valueType="floatType" />
+        </set>
+    </item>
+
+    <!-- Base state (enabled, not pressed) -->
+    <item android:state_enabled="true">
+        <set>
+            <objectAnimator
+                android:duration="100"
+                android:propertyName="translationZ"
+                android:startDelay="100"
+                android:valueTo="0dp"
+                android:valueType="floatType"
+                tools:ignore="UnusedAttribute" />
+            <objectAnimator
+                android:duration="0"
+                android:propertyName="elevation"
+                android:valueTo="6dp"
+                android:valueType="floatType" />
+        </set>
+    </item>
+
+    <!-- Disabled state -->
+    <item>
+        <set>
+            <objectAnimator
+                android:duration="0"
+                android:propertyName="translationZ"
+                android:valueTo="0dp"
+                android:valueType="floatType" />
+            <objectAnimator
+                android:duration="0"
+                android:propertyName="elevation"
+                android:valueTo="0dp"
+                android:valueType="floatType" />
+        </set>
+    </item>
+
+</selector>
diff --git a/app/src/main/res/layout/activity_accounts.xml b/app/src/main/res/layout/activity_accounts.xml
index d9471ba..289b1dd 100644
--- a/app/src/main/res/layout/activity_accounts.xml
+++ b/app/src/main/res/layout/activity_accounts.xml
@@ -87,7 +87,6 @@
             android:visibility="visible"
             app:backgroundTint="@color/colorPrimary"
             app:fabSize="normal"
-            android:theme="@style/BlueButton"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/secondView"
             app:srcCompat="@drawable/ic_add_24dp" />
diff --git a/app/src/main/res/layout/activity_create_contact.xml b/app/src/main/res/layout/activity_create_contact.xml
index 02884b4..190d98f 100644
--- a/app/src/main/res/layout/activity_create_contact.xml
+++ b/app/src/main/res/layout/activity_create_contact.xml
@@ -43,7 +43,7 @@
         android:layout_marginTop="8dp"
         android:layout_marginStart="@dimen/activity_horizontal_margin"
         android:text="Crypto addresses"
-        android:textAppearance="@style/TextAppearance.Body1"
+        android:textAppearance="@style/TextAppearance.Crystal.Body1"
         android:textStyle="bold"
         app:layout_constraintTop_toTopOf="@id/btnAddAddress"
         app:layout_constraintStart_toStartOf="parent"/>
@@ -58,26 +58,29 @@
         tools:listitem="@layout/contact_address_list_item"
         tools:itemCount="1"/>
 
-    <Button
-        android:id="@+id/btnCancel"
-        android:layout_width="wrap_content"
+    <RelativeLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/spacing_different_section"
-        android:layout_marginStart="@dimen/activity_horizontal_margin"
-        android:theme="@style/RedButton"
-        android:text="@string/cancel"
-        app:layout_constraintTop_toBottomOf="@id/rvContactAddresses"
-        app:layout_constraintStart_toStartOf="parent"/>
-
-    <Button
-        android:id="@+id/btnCreate"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/activity_horizontal_margin"
-        android:theme="@style/BlueButton"
-        android:text="Create"
-        app:layout_constraintTop_toTopOf="@id/btnCancel"
-        app:layout_constraintEnd_toEndOf="parent"/>
+        app:layout_constraintTop_toBottomOf="@id/rvContactAddresses">
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/btnCreate"
+            style="@style/Widget.Crystal.Button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_marginBottom="4dp"
+            android:text="@string/create"/>
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/btnCancel"
+            style="@style/Widget.Crystal.Button.TextButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="12dp"
+            android:layout_toStartOf="@id/btnCreate"
+            android:text="@android:string/cancel"/>
+    </RelativeLayout>
 
     <cy.agorise.crystalwallet.util.BottomStatusBar
         android:id="@+id/bottomStatusBar"
diff --git a/app/src/main/res/layout/activity_license.xml b/app/src/main/res/layout/activity_license.xml
index f2889e9..690e84e 100644
--- a/app/src/main/res/layout/activity_license.xml
+++ b/app/src/main/res/layout/activity_license.xml
@@ -21,34 +21,28 @@
 
     </ScrollView>
 
-    <LinearLayout
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        android:background="@android:color/white"
-        android:clipToPadding="false"
-        android:padding="4dp"
-        android:orientation="horizontal">
-        <Button
-            android:id="@+id/btnDisAgree"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_weight="0.50"
-            android:layout_marginEnd="8dp"
-            android:theme="@style/RedButton"
-            android:textColor="@color/white"
-            android:textSize="14sp"
-            android:text="@string/disagree" />
-        <Button
+        android:background="@android:color/white">
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/btnAgree"
-            android:layout_width="match_parent"
+            style="@style/Widget.Crystal.Button"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="0.5"
-            android:layout_marginStart="8dp"
-            android:theme="@style/BlueButton"
+            android:layout_alignParentEnd="true"
+            android:layout_marginBottom="4dp"
+            android:layout_marginEnd="@dimen/activity_horizontal_margin"
             android:text="@string/agree"
-            android:textSize="14sp"
-            android:textColor="@color/white" />
-    </LinearLayout>
+            android:backgroundTint="#139657"/>
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/btnDisagree"
+            style="@style/Widget.Crystal.Button.TextButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="12dp"
+            android:layout_toStartOf="@id/btnAgree"
+            android:text="@string/disagree"
+            android:textColor="@color/red"/>
+    </RelativeLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/contact_list_item.xml b/app/src/main/res/layout/contact_list_item.xml
index a02ae40..1c7561e 100644
--- a/app/src/main/res/layout/contact_list_item.xml
+++ b/app/src/main/res/layout/contact_list_item.xml
@@ -26,7 +26,7 @@
         android:layout_marginTop="8dp"
         android:layout_marginStart="16dp"
         tools:text="Loading name..."
-        android:textAppearance="@style/TextAppearance.Body1"
+        android:textAppearance="@style/TextAppearance.Crystal.Body1"
         android:textStyle="bold"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toEndOf="@id/ivContactThumbnail"/>
diff --git a/app/src/main/res/layout/create_seed.xml b/app/src/main/res/layout/create_seed.xml
index 72d513a..a7066ac 100644
--- a/app/src/main/res/layout/create_seed.xml
+++ b/app/src/main/res/layout/create_seed.xml
@@ -85,43 +85,30 @@
 
     </com.google.android.material.textfield.TextInputLayout>
 
-
-
-    <LinearLayout
+    <RelativeLayout
         android:id="@+id/layoutBtns"
         android:layout_width="match_parent"
-        android:layout_height="65dp"
-        android:background="@android:color/white"
-        android:padding="4dp"
-        android:orientation="horizontal"
+        android:layout_height="wrap_content"
         app:layout_constraintTop_toBottomOf="@+id/tilAccountName"
-        android:layout_marginTop="60dp">
-
-        <Button
-            android:id="@+id/btnCancel"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_gravity="center"
-            android:layout_weight="0.50"
-            android:layout_marginEnd="8dp"
-            android:layout_marginStart="8dp"
-            android:theme="@style/RedButton"
-            android:textColor="@color/white"
-            android:textSize="14sp"
-            android:text="@string/cancel" />
-        <Button
+        android:layout_marginTop="60dp"
+        android:layout_marginEnd="@dimen/activity_horizontal_margin">
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/btnCreate"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="0.5"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="8dp"
-            android:theme="@style/BlueButton"
-            android:text="@string/create_wallet"
-            android:textSize="14sp"
-            android:textColor="@color/white" />
-
-    </LinearLayout>
+            style="@style/Widget.Crystal.Button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_marginBottom="4dp"
+            android:text="@string/create"/>
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/btnCancel"
+            style="@style/Widget.Crystal.Button.TextButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="12dp"
+            android:layout_toStartOf="@id/btnCreate"
+            android:text="@android:string/cancel"/>
+    </RelativeLayout>
 
     <cy.agorise.crystalwallet.util.BottomStatusBar
         android:id="@+id/bottomStatusBar"
diff --git a/app/src/main/res/layout/fragment_accounts_settings.xml b/app/src/main/res/layout/fragment_accounts_settings.xml
index 930f386..a7d9d0e 100644
--- a/app/src/main/res/layout/fragment_accounts_settings.xml
+++ b/app/src/main/res/layout/fragment_accounts_settings.xml
@@ -23,16 +23,13 @@
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintEnd_toEndOf="parent"/>
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/btnUpgrade"
+            style="@style/Widget.Crystal.Button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
-            style="@style/Widget.Button"
             android:text="@string/upgrade"
-            android:theme="@style/BlueButton"
-            android:textStyle="bold"
-            android:textColor="@color/white"
             app:layout_constraintTop_toBottomOf="@id/tvUpgrade"
             app:layout_constraintStart_toStartOf="@id/tvUpgrade" />
 
@@ -47,16 +44,13 @@
             app:layout_constraintTop_toBottomOf="@id/btnUpgrade"
             app:layout_constraintEnd_toEndOf="@id/tvUpgrade"/>
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/btnImport"
+            style="@style/Widget.Crystal.Button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
-            style="@style/Widget.Button"
             android:text="@string/import_"
-            android:theme="@style/BlueButton"
-            android:textStyle="bold"
-            android:textColor="@color/white"
             app:layout_constraintTop_toBottomOf="@id/tvImport"
             app:layout_constraintStart_toStartOf="@id/btnUpgrade" />
 
@@ -71,16 +65,13 @@
             app:layout_constraintTop_toBottomOf="@id/btnImport"
             app:layout_constraintEnd_toEndOf="@id/tvImport"/>
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/btnRefresh"
+            style="@style/Widget.Crystal.Button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
-            style="@style/Widget.Button"
             android:text="@string/refresh"
-            android:textStyle="bold"
-            android:theme="@style/BlueButton"
-            android:textColor="@color/white"
             app:layout_constraintTop_toBottomOf="@id/tvRefresh"
             app:layout_constraintStart_toStartOf="@id/btnImport" />
 
@@ -95,16 +86,14 @@
             app:layout_constraintTop_toBottomOf="@id/btnRefresh"
             app:layout_constraintEnd_toEndOf="@id/tvRefresh"/>
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/btnRemove"
-            style="@style/Widget.Button"
+            style="@style/Widget.Crystal.Button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
             android:text="@string/remove"
-            android:theme="@style/RedButton"
-            android:textColor="@color/white"
-            android:textStyle="bold"
+            android:backgroundTint="@color/red"
             app:layout_constraintStart_toStartOf="@id/btnRefresh"
             app:layout_constraintTop_toBottomOf="@id/tvRemove" />
 
diff --git a/app/src/main/res/layout/fragment_backups_settings.xml b/app/src/main/res/layout/fragment_backups_settings.xml
index e61a467..b4b2593 100644
--- a/app/src/main/res/layout/fragment_backups_settings.xml
+++ b/app/src/main/res/layout/fragment_backups_settings.xml
@@ -18,15 +18,13 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintEnd_toEndOf="parent"/>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/btnBinFile"
+        style="@style/Widget.Crystal.Button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
         android:text="@string/create_a_backup"
-        android:theme="@style/BlueButton"
-        android:textStyle="bold"
-        android:textColor="@color/white"
         app:layout_constraintTop_toBottomOf="@id/tvBinFile"
         app:layout_constraintStart_toStartOf="@id/tvBinFile" />
 
@@ -41,15 +39,13 @@
         app:layout_constraintStart_toStartOf="@id/tvBinFile"
         app:layout_constraintTop_toBottomOf="@id/btnBinFile" />
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/btnBrainkey"
+        style="@style/Widget.Crystal.Button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
         android:text="@string/view_and_copy"
-        android:theme="@style/BlueButton"
-        android:textColor="@color/white"
-        android:textStyle="bold"
         app:layout_constraintStart_toStartOf="@id/btnBinFile"
         app:layout_constraintTop_toBottomOf="@id/tvBrainkey" />
 
@@ -60,23 +56,19 @@
         android:layout_marginTop="24dp"
         android:text="@string/wif_key_description"
         android:textSize="15sp"
-        android:visibility="invisible"
+        android:visibility="gone"
         app:layout_constraintEnd_toEndOf="@id/tvBrainkey"
         app:layout_constraintStart_toStartOf="@id/tvBrainkey"
         app:layout_constraintTop_toBottomOf="@id/btnBrainkey" />
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/btnWIFKey"
-        style="@style/Widget.Button"
+        style="@style/Widget.Crystal.Button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        android:background="@color/colorPrimary"
         android:text="@string/view_and_copy"
-        android:theme="@style/BlueButton"
-        android:textColor="@color/white"
-        android:textStyle="bold"
-        android:visibility="invisible"
+        android:visibility="gone"
         app:layout_constraintStart_toStartOf="@id/btnBrainkey"
         app:layout_constraintTop_toBottomOf="@id/tvWIFKey" />
 
diff --git a/app/src/main/res/layout/fragment_bitshares_settings.xml b/app/src/main/res/layout/fragment_bitshares_settings.xml
index d9665d5..1ff9237 100644
--- a/app/src/main/res/layout/fragment_bitshares_settings.xml
+++ b/app/src/main/res/layout/fragment_bitshares_settings.xml
@@ -20,15 +20,14 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/btnUpgradeToLtm"
+            style="@style/Widget.Crystal.Button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
             android:layout_marginEnd="32dp"
-            android:textColor="@color/black"
             android:text="Upgrade"
-            android:theme="@style/WhiteButton"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="@+id/tvUpgradeToLtm"
             app:layout_constraintTop_toBottomOf="@id/tvUpgradeToLtm" />
diff --git a/app/src/main/res/layout/fragment_general_crypto_net_account_settings.xml b/app/src/main/res/layout/fragment_general_crypto_net_account_settings.xml
index 97af11d..b944035 100644
--- a/app/src/main/res/layout/fragment_general_crypto_net_account_settings.xml
+++ b/app/src/main/res/layout/fragment_general_crypto_net_account_settings.xml
@@ -51,16 +51,15 @@
 
         </LinearLayout>
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/btnCopy"
+            style="@style/Widget.Crystal.Button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@+id/linearlayout1"
             android:layout_marginTop="25dp"
-            android:theme="@style/BlueButton"
             android:layout_alignParentRight="true"
-            android:text="@string/window_seed_copy"
-            android:textColor="@color/white"/>
+            android:text="@string/window_seed_copy"/>
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/fragment_general_settings.xml b/app/src/main/res/layout/fragment_general_settings.xml
index a7f45ac..28d1059 100644
--- a/app/src/main/res/layout/fragment_general_settings.xml
+++ b/app/src/main/res/layout/fragment_general_settings.xml
@@ -184,15 +184,13 @@
             app:layout_constraintStart_toStartOf="@id/tvCloseWalletTimer"
             app:layout_constraintTop_toBottomOf="@id/tvCloseWalletTimer"/>
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/btnContact"
+            style="@style/Widget.Crystal.Button"
             android:layout_width="wrap_content"
             android:layout_height="45dp"
             android:layout_marginTop="30dp"
             android:text="CONTACT"
-            android:textColor="@color/white"
-            android:textStyle="bold"
-            android:theme="@style/BlueButton"
             app:layout_constraintEnd_toEndOf="@id/sCloseWalletTimer"
             app:layout_constraintTop_toBottomOf="@id/tvCloseWalletTimer" />
 
diff --git a/app/src/main/res/layout/fragment_import_account_options.xml b/app/src/main/res/layout/fragment_import_account_options.xml
index 0da7d1d..355547a 100644
--- a/app/src/main/res/layout/fragment_import_account_options.xml
+++ b/app/src/main/res/layout/fragment_import_account_options.xml
@@ -21,50 +21,43 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/btnImportBackup"
+        style="@style/Widget.Crystal.Button"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="48dp"
-        android:background="@color/colorPrimary"
         android:text="@string/import_account_backup"
         android:textAllCaps="false"
-        android:textColor="@color/white"
         android:textSize="18sp"
-        android:theme="@style/BlueButton"
-        android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="@id/tvDescription"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="@id/tvDescription"
         app:layout_constraintTop_toBottomOf="@id/tvDescription" />
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/btnImportSeed"
+        style="@style/Widget.Crystal.Button"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="32dp"
-        android:background="@color/colorPrimary"
         android:text="@string/import_account_seed"
         android:textAllCaps="false"
-        android:theme="@style/BlueButton"
-        android:textColor="@color/white"
         android:textSize="18sp"
-        android:textStyle="bold"
         app:layout_constraintTop_toBottomOf="@id/btnImportBackup"
         app:layout_constraintStart_toStartOf="@id/btnImportBackup"
         app:layout_constraintEnd_toEndOf="@id/btnImportBackup"/>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/btnCancel"
+        style="@style/Widget.Crystal.Button"
         android:layout_width="0dp"
-        android:layout_height="59dp"
+        android:layout_height="wrap_content"
         android:layout_marginTop="22dp"
-        android:theme="@style/RedButton"
         android:text="@string/dialog_cancel"
         android:textAllCaps="false"
-        android:textColor="@color/white"
         android:textSize="18sp"
-        android:textStyle="bold"
+        android:backgroundTint="@color/red"
         app:layout_constraintEnd_toEndOf="@id/btnImportSeed"
         app:layout_constraintStart_toStartOf="@id/btnImportSeed"
         app:layout_constraintTop_toBottomOf="@id/btnImportSeed" />
diff --git a/app/src/main/res/layout/fragment_none_security.xml b/app/src/main/res/layout/fragment_none_security.xml
index 05386f8..c67a8e5 100644
--- a/app/src/main/res/layout/fragment_none_security.xml
+++ b/app/src/main/res/layout/fragment_none_security.xml
@@ -15,15 +15,14 @@
         android:textAlignment="center"
         android:layout_centerInParent="true"/>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/btnOK"
+        style="@style/Widget.Crystal.Button"
         android:layout_centerHorizontal="true"
         android:layout_marginTop="10dp"
         android:layout_below="@+id/txtFirst"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:theme="@style/WhiteButton"
-        android:textColor="@color/black"
         android:text="@string/ok"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_pin_security.xml b/app/src/main/res/layout/fragment_pin_security.xml
index b0a62f9..d4ddb90 100644
--- a/app/src/main/res/layout/fragment_pin_security.xml
+++ b/app/src/main/res/layout/fragment_pin_security.xml
@@ -38,15 +38,14 @@
         android:textColor="@color/red"
         android:layout_below="@+id/etConfirmPin" />
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/btnOK"
+        style="@style/Widget.Crystal.Button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:theme="@style/WhiteButton"
-        android:text="@string/ok"
-        android:layout_below="@+id/etConfirmPin"
         android:layout_marginTop="5dp"
-        android:textColor="@color/black"
-        android:layout_centerHorizontal="true"/>
+        android:layout_centerHorizontal="true"
+        android:text="@string/ok"
+        android:layout_below="@+id/etConfirmPin" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/import_seed.xml b/app/src/main/res/layout/import_seed.xml
index b592216..7925823 100644
--- a/app/src/main/res/layout/import_seed.xml
+++ b/app/src/main/res/layout/import_seed.xml
@@ -113,41 +113,30 @@
             android:visibility="invisible"
             android:layout_marginTop="5dp"/>
 
-
-        <LinearLayout
+        <RelativeLayout
             android:id="@+id/linearlayoutButtons"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
             android:layout_below="@+id/txtErrorAccount"
-            android:orientation="horizontal"
             android:layout_marginTop="10dp">
-
-            <Button
-                android:id="@+id/btnCancel"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_weight="0.50"
-                android:layout_marginEnd="8dp"
-                android:layout_marginStart="8dp"
-                android:theme="@style/RedButton"
-                android:textColor="@color/white"
-                android:textSize="14sp"
-                android:text="@string/cancel" />
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/btnImport"
-                android:layout_width="match_parent"
+                style="@style/Widget.Crystal.Button"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_weight="0.50"
-                android:layout_marginEnd="8dp"
-                android:layout_marginStart="8dp"
-                android:theme="@style/BlueButton"
-                android:text="@string/create_wallet"
-                android:textSize="14sp"
-                android:textColor="@color/white" />
-
-        </LinearLayout>
+                android:layout_alignParentEnd="true"
+                android:layout_marginBottom="4dp"
+                android:layout_marginEnd="@dimen/activity_horizontal_margin"
+                android:text="@string/import_"/>
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/btnCancel"
+                style="@style/Widget.Crystal.Button.TextButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="12dp"
+                android:layout_toStartOf="@id/btnImport"
+                android:text="@string/cancel"/>
+        </RelativeLayout>
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/transaction_list_item.xml b/app/src/main/res/layout/transaction_list_item.xml
index ec02ff6..c6d4e93 100644
--- a/app/src/main/res/layout/transaction_list_item.xml
+++ b/app/src/main/res/layout/transaction_list_item.xml
@@ -70,7 +70,7 @@
             android:layout_marginTop="16dp"
             android:maxLines="1"
             tools:text="denzel-washington"
-            android:textAppearance="@style/TextAppearance.Body2"
+            android:textAppearance="@style/TextAppearance.Crystal.Body2"
             android:textColor="@color/gray"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toEndOf="@id/firstVerticalGuideline"
@@ -93,7 +93,7 @@
             android:layout_height="wrap_content"
             android:maxLines="1"
             tools:text="joes-grocery-13"
-            android:textAppearance="@style/TextAppearance.Body2"
+            android:textAppearance="@style/TextAppearance.Crystal.Body2"
             android:textColor="@color/gray"
             android:textAlignment="textEnd"
             app:layout_constraintTop_toTopOf="@id/tvFrom"
@@ -145,7 +145,7 @@
             android:maxLines="1"
             tools:text="02 Oct"
             android:textStyle="bold"
-            android:textAppearance="@style/TextAppearance.Body1"
+            android:textAppearance="@style/TextAppearance.Crystal.Body1"
             app:layout_constraintTop_toBottomOf="@id/llMemo"
             app:layout_constraintStart_toEndOf="@id/firstVerticalGuideline"
             app:layout_constraintEnd_toStartOf="@id/centeredVerticalGuideline"/>
@@ -156,7 +156,7 @@
             android:layout_height="wrap_content"
             android:maxLines="1"
             tools:text="15:01:18 CET"
-            android:textAppearance="@style/TextAppearance.Body2"
+            android:textAppearance="@style/TextAppearance.Crystal.Body2"
             android:textColor="@color/gray"
             app:layout_constraintTop_toBottomOf="@+id/tvDate"
             app:layout_constraintStart_toEndOf="@id/firstVerticalGuideline"
@@ -168,7 +168,7 @@
             android:layout_height="wrap_content"
             android:maxLines="1"
             tools:text="1234567.1234 BTS"
-            android:textAppearance="@style/TextAppearance.Body1"
+            android:textAppearance="@style/TextAppearance.Crystal.Body1"
             android:textStyle="bold"
             android:textAlignment="textEnd"
             app:layout_constraintTop_toTopOf="@id/tvDate"
@@ -182,7 +182,7 @@
             android:layout_marginBottom="16dp"
             android:maxLines="1"
             tools:text="4119.75 $"
-            android:textAppearance="@style/TextAppearance.Body2"
+            android:textAppearance="@style/TextAppearance.Crystal.Body2"
             android:textColor="@color/gray"
             android:textAlignment="textEnd"
             app:layout_constraintTop_toBottomOf="@+id/tvCryptoAmount"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 6b258e1..0a7e5c2 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,5 +1,5 @@
 <resources>
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppTheme" parent="Theme.MaterialComponents.Light.DarkActionBar.Bridge">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
@@ -69,30 +69,16 @@
         <item name="android:textAllCaps">true</item>
     </style>
 
-    <style name="BaseButton" parent="Theme.AppCompat">
+    <style name="Widget.Crystal.Button" parent="Widget.MaterialComponents.Button">
         <item name="android:textColor">@android:color/white</item>
-        <item name="colorButtonNormal">@color/gray</item>
-        <item name="android:buttonStyle">@style/Widget.AppCompat.Button.Colored</item>
+        <item name="android:stateListAnimator">@animator/button_state_list_anim</item>
     </style>
 
-    <style name="BlueButton" parent="BaseButton">
-        <item name="colorAccent">@color/colorPrimary</item>
-        <item name="colorControlHighlight">@color/colorPrimaryDark</item>
-    </style>
-
-    <style name="WhiteButton" parent="BaseButton">
-        <item name="colorAccent">@color/white</item>
-        <item name="colorControlHighlight">@color/lightGray</item>
-    </style>
-
-    <style name="RedButton" parent="BaseButton">
-        <item name="colorAccent">@color/red</item>
-        <item name="colorControlHighlight">@color/redColor</item>
+    <style name="Widget.Crystal.Button.TextButton" parent="Widget.MaterialComponents.Button.TextButton">
+        <item name="android:textColor">?android:attr/colorPrimaryDark</item>
     </style>
 
     <!-- Text styles -->
-    <style name="TextAppearance.Body1" parent="Base.TextAppearance.AppCompat.Body1" >
-        <item name="android:textSize">16sp</item>
-    </style>
-    <style name="TextAppearance.Body2" parent="Base.TextAppearance.AppCompat.Body2" />
+    <style name="TextAppearance.Crystal.Body1" parent="TextAppearance.MaterialComponents.Body1" />
+    <style name="TextAppearance.Crystal.Body2" parent="TextAppearance.MaterialComponents.Body2" />
 </resources>