From c698bfca440f0bd4036aa557ca027a974490f0c5 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Mon, 9 May 2022 13:28:49 -0300
Subject: [PATCH] Fix currency selection disabled state.

---
 .../subscription/models/CurrencySelection.kt  |  1 +
 .../currency_selector_text_color.xml          |  5 +++++
 .../color/currency_selector_text_color.xml    |  5 +++++
 .../currency_selection_background.xml         | 21 +++++++++++++++++++
 .../currency_selection_background.xml         |  8 +++++++
 .../subscription_currency_selection.xml       |  3 ++-
 6 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/color-night/currency_selector_text_color.xml
 create mode 100644 app/src/main/res/color/currency_selector_text_color.xml
 create mode 100644 app/src/main/res/drawable-night/currency_selection_background.xml
 create mode 100644 app/src/main/res/drawable/currency_selection_background.xml

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/models/CurrencySelection.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/models/CurrencySelection.kt
index ef34396b9..02da2fd88 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/models/CurrencySelection.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/models/CurrencySelection.kt
@@ -36,6 +36,7 @@ object CurrencySelection {
 
     override fun bind(model: Model) {
       spinner.text = model.selectedCurrency.currencyCode
+      spinner.isEnabled = model.isEnabled
 
       itemView.setOnClickListener { model.onClick() }
 
diff --git a/app/src/main/res/color-night/currency_selector_text_color.xml b/app/src/main/res/color-night/currency_selector_text_color.xml
new file mode 100644
index 000000000..cdaf45fc9
--- /dev/null
+++ b/app/src/main/res/color-night/currency_selector_text_color.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="@color/core_grey_45" />
+    <item android:color="@color/signal_text_primary" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/currency_selector_text_color.xml b/app/src/main/res/color/currency_selector_text_color.xml
new file mode 100644
index 000000000..539757e3d
--- /dev/null
+++ b/app/src/main/res/color/currency_selector_text_color.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="@color/signal_text_primary_disabled" />
+    <item android:color="@color/signal_text_primary" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-night/currency_selection_background.xml b/app/src/main/res/drawable-night/currency_selection_background.xml
new file mode 100644
index 000000000..22a847024
--- /dev/null
+++ b/app/src/main/res/drawable-night/currency_selection_background.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false">
+        <shape
+            android:shape="rectangle">
+            <stroke
+                android:width="1.5dp"
+                android:color="@color/core_grey_65" />
+            <corners android:radius="@dimen/material_button_full_round_corner_radius" />
+        </shape>
+    </item>
+    <item>
+        <shape
+            android:shape="rectangle">
+            <stroke
+                android:width="1.5dp"
+                android:color="@color/signal_button_secondary_stroke" />
+            <corners android:radius="@dimen/material_button_full_round_corner_radius" />
+        </shape>
+    </item>
+</selector>
diff --git a/app/src/main/res/drawable/currency_selection_background.xml b/app/src/main/res/drawable/currency_selection_background.xml
new file mode 100644
index 000000000..aacb93c3d
--- /dev/null
+++ b/app/src/main/res/drawable/currency_selection_background.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <stroke
+        android:width="1.5dp"
+        android:color="@color/signal_button_secondary_stroke" />
+    <corners android:radius="@dimen/material_button_full_round_corner_radius" />
+</shape>
diff --git a/app/src/main/res/layout/subscription_currency_selection.xml b/app/src/main/res/layout/subscription_currency_selection.xml
index 14226c102..e6f3826b6 100644
--- a/app/src/main/res/layout/subscription_currency_selection.xml
+++ b/app/src/main/res/layout/subscription_currency_selection.xml
@@ -25,11 +25,12 @@
         android:id="@+id/subscription_currency_selection_spinner"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="@drawable/circled_rectangle_outline"
+        android:background="@drawable/currency_selection_background"
         android:drawablePadding="8dp"
         android:gravity="center"
         android:minHeight="32dp"
         android:padding="12dp"
+        android:textColor="@color/currency_selector_text_color"
         app:drawableEndCompat="@drawable/ic_chevron_down_20"
         app:drawableTint="@color/conversation_mention_background_color"
         app:layout_constraintBottom_toBottomOf="@id/subscription_currency_selection_donation_amount"