Set gray outline only for unselected sub purchase options

HabitRPG · Sep 17, 2023 · 200e407 · 200e407
1 parent 4091ecd
commit 200e407
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/Habitica/res/drawable/subscription_box_bg.xml b/Habitica/res/drawable/subscription_box_bg.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="?attr/colorWindowBackground"/>
-    <corners android:radius="8dip"/>
+    <corners android:radius="20dip"/>
     <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
-    <stroke android:color="@color/gray600_gray50" android:width="3dp" />
-</shape>
+</shape>
diff --git a/Habitica/res/drawable/subscription_type_box_bg.xml b/Habitica/res/drawable/subscription_type_box_bg.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="?attr/colorWindowBackground"/>
+    <corners android:radius="8dip"/>
+    <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
+    <stroke android:color="@color/gray600_gray50" android:width="3dp" />
+</shape>
diff --git a/Habitica/res/values-night/colors.xml b/Habitica/res/values-night/colors.xml
@@ -61,7 +61,7 @@
     <color name="text_gold">@color/yellow_100</color>
 
     <color name="text_green10_green500">@color/green_500</color>
-    <color name="gray100_gray400">@color/gray_10</color>
+    <color name="gray100_gray400">@color/gray_400</color>
     <color name="gray200_gray400">@color/gray_400</color>
     <color name="gray600_gray50">@color/gray_50</color>
     <color name="gray700_gray10">@color/gray_10</color>

diff --git a/.../main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionOptionView.kt b/.../main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionOptionView.kt
@@ -70,7 +70,7 @@ class SubscriptionOptionView(context: Context, attrs: AttributeSet) : FrameLayou
             binding.priceLabel.setTextColor(ContextCompat.getColor(context, R.color.text_brand))
             binding.descriptionTextView.setTextColor(ContextCompat.getColor(context, R.color.text_brand))
         } else {
-            binding.wrapper.setBackgroundResource(R.drawable.subscription_box_bg)
+            binding.wrapper.setBackgroundResource(R.drawable.subscription_type_box_bg)
             binding.subscriptionSelectedView.setBackgroundResource(R.drawable.subscription_unselected)
             binding.gemCapTextView.setBackgroundResource(R.drawable.pill_bg_gray)
             binding.gemCapTextView.setTextColor(ContextCompat.getColor(context, R.color.text_secondary))