[wallet] Refactored error colors using MaterialTheme

7 files changed, 16 insertions, 11 deletions

diff --git a/wallet/src/main/res/layout/fragment_error.xml b/wallet/src/main/res/layout/fragment_error.xml
index c8c4913..2af166a 100644
--- a/wallet/src/main/res/layout/fragment_error.xml
+++ b/wallet/src/main/res/layout/fragment_error.xml
@@ -29,13 +29,13 @@
         android:alpha="0.56"
         android:src="@drawable/ic_error"
         app:layout_constraintBottom_toTopOf="@+id/errorTitle"
-        app:layout_constraintDimensionRatio="1:1"
+        app:layout_constraintDimensionRatio="1.5:1"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.0"
         app:layout_constraintVertical_chainStyle="packed"
-        app:tint="@color/red"
+        app:tint="?colorError"
         tools:ignore="ContentDescription" />
 
     <TextView
@@ -45,7 +45,7 @@
         android:layout_margin="16dp"
         android:gravity="center_horizontal|top"
         android:minHeight="64dp"
-        android:textColor="@color/red"
+        android:textColor="?colorError"
         app:autoSizeMaxTextSize="40sp"
         app:autoSizeTextType="uniform"
         app:layout_constraintBottom_toTopOf="@+id/errorMessage"
@@ -74,7 +74,7 @@
         android:layout_margin="16dp"
         android:fontFamily="monospace"
         android:gravity="center"
-        android:textColor="@color/red"
+        android:textColor="?colorError"
         android:textIsSelectable="true"
         android:visibility="gone"
         app:layout_constraintBottom_toTopOf="@+id/backButton"
diff --git a/wallet/src/main/res/layout/fragment_exchange_fees.xml b/wallet/src/main/res/layout/fragment_exchange_fees.xml
index 6f8814f..03d69f5 100644
--- a/wallet/src/main/res/layout/fragment_exchange_fees.xml
+++ b/wallet/src/main/res/layout/fragment_exchange_fees.xml
@@ -44,7 +44,7 @@
             app:layout_constraintStart_toEndOf="@+id/withdrawFeeLabel"
             app:layout_constraintTop_toTopOf="@+id/withdrawFeeLabel"
             tools:text="-0.23 TESTKUDOS"
-            tools:textColor="@color/red" />
+            tools:textColor="?colorError" />
 
         <TextView
             android:id="@+id/overheadLabel"
@@ -64,7 +64,7 @@
             app:layout_constraintStart_toEndOf="@+id/overheadLabel"
             app:layout_constraintTop_toTopOf="@+id/overheadLabel"
             tools:text="-0.42 TESTKUDOS"
-            tools:textColor="@color/red" />
+            tools:textColor="?colorError" />
 
         <TextView
             android:id="@+id/expirationLabel"
diff --git a/wallet/src/main/res/layout/fragment_prompt_tip.xml b/wallet/src/main/res/layout/fragment_prompt_tip.xml
index 941274f..e3b32cd 100644
--- a/wallet/src/main/res/layout/fragment_prompt_tip.xml
+++ b/wallet/src/main/res/layout/fragment_prompt_tip.xml
@@ -114,7 +114,7 @@
         android:layout_marginTop="8dp"
         android:layout_marginEnd="16dp"
         android:gravity="center"
-        android:textColor="@color/red"
+        android:textColor="?colorError"
         android:textSize="20sp"
         android:visibility="invisible"
         app:layout_constraintBottom_toTopOf="@+id/exchangeIntroView"
diff --git a/wallet/src/main/res/layout/fragment_prompt_withdraw.xml b/wallet/src/main/res/layout/fragment_prompt_withdraw.xml
index 03e7d1a..7b63d1b 100644
--- a/wallet/src/main/res/layout/fragment_prompt_withdraw.xml
+++ b/wallet/src/main/res/layout/fragment_prompt_withdraw.xml
@@ -114,7 +114,7 @@
         android:layout_marginTop="8dp"
         android:layout_marginEnd="16dp"
         android:gravity="center"
-        android:textColor="@color/red"
+        android:textColor="?colorError"
         android:textSize="20sp"
         android:visibility="invisible"
         app:layout_constraintBottom_toTopOf="@+id/exchangeIntroView"
diff --git a/wallet/src/main/res/layout/fragment_review_exchange_tos.xml b/wallet/src/main/res/layout/fragment_review_exchange_tos.xml
index ec8d996..20c1013 100644
--- a/wallet/src/main/res/layout/fragment_review_exchange_tos.xml
+++ b/wallet/src/main/res/layout/fragment_review_exchange_tos.xml
@@ -48,7 +48,7 @@
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
         android:gravity="center"
-        android:textColor="@color/red"
+        android:textColor="?colorError"
         android:textSize="16sp"
         android:visibility="invisible"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/wallet/src/main/res/layout/fragment_transaction_payment.xml b/wallet/src/main/res/layout/fragment_transaction_payment.xml
index c5f5f81..71447dd 100644
--- a/wallet/src/main/res/layout/fragment_transaction_payment.xml
+++ b/wallet/src/main/res/layout/fragment_transaction_payment.xml
@@ -39,6 +39,7 @@
             android:id="@+id/amountPaidWithFeesLabel"
             style="@style/TransactionLabel"
             android:text="@string/transaction_paid"
+            app:layout_constraintBottom_toTopOf="@+id/amountPaidWithFeesView"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/timeView" />
@@ -119,6 +120,7 @@
             android:text="@string/transactions_delete"
             app:backgroundTint="@color/red"
             app:icon="@drawable/ic_delete"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/orderIdView" />
diff --git a/wallet/src/main/res/layout/fragment_transaction_withdrawal.xml b/wallet/src/main/res/layout/fragment_transaction_withdrawal.xml
index 47dbafb..9c1dbda 100644
--- a/wallet/src/main/res/layout/fragment_transaction_withdrawal.xml
+++ b/wallet/src/main/res/layout/fragment_transaction_withdrawal.xml
@@ -111,7 +111,7 @@
         <TextView
             android:id="@+id/feeView"
             style="@style/TransactionContent"
-            android:textColor="@color/red"
+            android:textColor="?colorError"
             app:layout_constraintBottom_toTopOf="@+id/exchangeLabel"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -142,8 +142,11 @@
             android:layout_height="wrap_content"
             android:layout_marginVertical="10dp"
             android:text="@string/transactions_delete"
-            app:backgroundTint="@color/red"
+            app:backgroundTint="?colorError"
             app:icon="@drawable/ic_delete"
+            android:textColor="?colorOnError"
+            app:iconTint="?colorOnError"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/exchangeView" />