kopia lustrzana https://github.com/ryukoposting/Signal-Android
Fix currency selection disabled state.
rodzic
431f5501c6
commit
c698bfca44
|
@ -36,6 +36,7 @@ object CurrencySelection {
|
||||||
|
|
||||||
override fun bind(model: Model) {
|
override fun bind(model: Model) {
|
||||||
spinner.text = model.selectedCurrency.currencyCode
|
spinner.text = model.selectedCurrency.currencyCode
|
||||||
|
spinner.isEnabled = model.isEnabled
|
||||||
|
|
||||||
itemView.setOnClickListener { model.onClick() }
|
itemView.setOnClickListener { model.onClick() }
|
||||||
|
|
||||||
|
|
|
@ -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>
|
|
@ -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>
|
|
@ -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>
|
|
@ -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>
|
|
@ -25,11 +25,12 @@
|
||||||
android:id="@+id/subscription_currency_selection_spinner"
|
android:id="@+id/subscription_currency_selection_spinner"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:background="@drawable/circled_rectangle_outline"
|
android:background="@drawable/currency_selection_background"
|
||||||
android:drawablePadding="8dp"
|
android:drawablePadding="8dp"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:minHeight="32dp"
|
android:minHeight="32dp"
|
||||||
android:padding="12dp"
|
android:padding="12dp"
|
||||||
|
android:textColor="@color/currency_selector_text_color"
|
||||||
app:drawableEndCompat="@drawable/ic_chevron_down_20"
|
app:drawableEndCompat="@drawable/ic_chevron_down_20"
|
||||||
app:drawableTint="@color/conversation_mention_background_color"
|
app:drawableTint="@color/conversation_mention_background_color"
|
||||||
app:layout_constraintBottom_toBottomOf="@id/subscription_currency_selection_donation_amount"
|
app:layout_constraintBottom_toBottomOf="@id/subscription_currency_selection_donation_amount"
|
||||||
|
|
Ładowanie…
Reference in New Issue