From 7b2983958648fa65f08dc25dba57807afcf4ee45 Mon Sep 17 00:00:00 2001
From: Hafiz <hafizbhamidi@gmail.com>
Date: Thu, 29 Jun 2023 15:39:40 -0400
Subject: [PATCH] Base Dialog updates

 - Update Habitica Dialog destructive button color/improved accessibility
- Change class "go back" text changed to "close"
- Update Habitica Dialog message text size & color
---
 Habitica/res/layout/activity_class_selection.xml          | 2 +-
 Habitica/res/layout/dialog_habitica_base.xml              | 3 +--
 .../layout/dialog_habitica_primary_destructive_button.xml | 2 +-
 Habitica/res/layout/dialog_insufficient_gems.xml          | 2 +-
 Habitica/res/values/strings.xml                           | 2 +-
 Habitica/res/values/styles.habitica.xml                   | 8 ++++++++
 .../habitica/ui/activities/ClassSelectionActivity.kt      | 2 +-
 .../habitica/ui/fragments/inventory/shops/ShopFragment.kt | 4 ++--
 .../ui/fragments/preferences/PreferencesFragment.kt       | 2 +-
 9 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/Habitica/res/layout/activity_class_selection.xml b/Habitica/res/layout/activity_class_selection.xml
index 72ebd0407..81ae8a0b6 100644
--- a/Habitica/res/layout/activity_class_selection.xml
+++ b/Habitica/res/layout/activity_class_selection.xml
@@ -171,7 +171,7 @@
                     android:layout_height="wrap_content"
                     tools:text="@string/healer_description"
                     android:gravity="center_horizontal"
-                    style="@style/Body2"
+                    style="@style/Body4"
                     android:lineSpacingExtra="4sp"/>
             </ScrollView>
             <TextView
diff --git a/Habitica/res/layout/dialog_habitica_base.xml b/Habitica/res/layout/dialog_habitica_base.xml
index 48eaed0e1..0901d2fbe 100644
--- a/Habitica/res/layout/dialog_habitica_base.xml
+++ b/Habitica/res/layout/dialog_habitica_base.xml
@@ -59,9 +59,8 @@
             android:paddingBottom="@dimen/spacing_medium"
             android:paddingStart="@dimen/alert_side_padding"
             android:paddingEnd="@dimen/alert_side_padding"
-            android:textColor="?textColorSecondary"
             android:scrollbars = "vertical"
-            style="@style/Body2"
+            style="@style/Body4"
             />
         <com.habitrpg.android.habitica.ui.views.login.LockableScrollView
             android:id="@+id/main_scroll_view"
diff --git a/Habitica/res/layout/dialog_habitica_primary_destructive_button.xml b/Habitica/res/layout/dialog_habitica_primary_destructive_button.xml
index 7c70142de..6d3ee2459 100644
--- a/Habitica/res/layout/dialog_habitica_primary_destructive_button.xml
+++ b/Habitica/res/layout/dialog_habitica_primary_destructive_button.xml
@@ -2,5 +2,5 @@
 <Button xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="48dp"
-    style="@style/HabiticaButton.Red">
+    style="@style/HabiticaButton.Maroon">
 </Button>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_insufficient_gems.xml b/Habitica/res/layout/dialog_insufficient_gems.xml
index a9c2df31c..1260e76e8 100644
--- a/Habitica/res/layout/dialog_insufficient_gems.xml
+++ b/Habitica/res/layout/dialog_insufficient_gems.xml
@@ -76,7 +76,7 @@
                 android:id="@+id/purchase_button"
                 android:layout_width="129dp"
                 android:layout_height="50dp"
-                style="@style/HabiticaButton.White.Small"
+                style="@style/HabiticaButton.Maroon.Small"
                 tools:text="$0.99"
                 android:textSize="16sp"
                 android:visibility="invisible"/>
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 6a912a6ab..d04832bc8 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -317,7 +317,7 @@
     <string name="share_hatched">I just hatched a %1$s %2$s pet in #Habitica by completing my real-life tasks!</string>
     <string name="share_raised">I just gained a %1$s mount in #Habitica by completing my real-life tasks!</string>
     <string name="open_in_store">Open Play Store</string>
-    <string name="change_class_confirmation">Do you want to change your class for 3 Gems?</string>
+    <string name="change_class_confirmation">Do you want to change class for 3 Gems?</string>
     <string name="change_class_selected_confirmation">Do you want to change your class to %1$s for 3 Gems?</string>
     <string name="change_class_message">This will remove your current class and refund all stat points then let you select a new class</string>
     <string name="change_class_confirmation_message">This will switch which gear is unlocked in shops and change your available skills</string>
diff --git a/Habitica/res/values/styles.habitica.xml b/Habitica/res/values/styles.habitica.xml
index aea22a321..1c2d437e7 100644
--- a/Habitica/res/values/styles.habitica.xml
+++ b/Habitica/res/values/styles.habitica.xml
@@ -87,6 +87,14 @@
         <item name="android:letterSpacing">0.035</item>
     </style>
 
+    <style name="Body4">
+        <item name="android:fontFamily">@string/font_family_regular</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:letterSpacing">0.02</item>
+        <item name="android:lineSpacingExtra">6sp</item>
+        <item name="textColor">?textColorPrimary</item>
+    </style>
+
     <!-- Captions -->
     <style name="Caption1">
         <item name="android:fontFamily">@string/font_family_regular</item>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt
index a80759bcd..498b91806 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt
@@ -218,7 +218,7 @@ class ClassSelectionActivity : BaseActivity() {
         val alert = HabiticaAlertDialog(this)
         alert.setTitle(getString(R.string.opt_out_confirmation))
         alert.setMessage(getString(R.string.opt_out_description))
-        alert.addButton(R.string.opt_out_class, true) { _, _ ->
+        alert.addButton(R.string.opt_out_class, true, true) { _, _ ->
             lifecycleScope.launch(ExceptionHandler.coroutine()) {
                 // Set Player to have no class, and opt out
                 userRepository.changeClass()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt
index 05be9aaf9..c93a9e3b3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt
@@ -248,7 +248,7 @@ open class ShopFragment : BaseMainFragment<FragmentRefreshRecyclerviewBinding>()
                             loadMarketGear()
                         }
                     }
-                    alert.addButton(R.string.dialog_go_back, false)
+                    alert.addButton(R.string.close, false)
                     alert.show()
                 } else {
                     val alert = HabiticaAlertDialog(context)
@@ -266,7 +266,7 @@ open class ShopFragment : BaseMainFragment<FragmentRefreshRecyclerviewBinding>()
                             loadMarketGear()
                         }
                     }
-                    alert.addButton(R.string.dialog_go_back, false)
+                    alert.addButton(R.string.close, false)
                     alert.show()
                 }
             }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.kt
index 188225bec..ff40ee6c9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.kt
@@ -167,7 +167,7 @@ class PreferencesFragment : BasePreferencesFragment(),
                                     intent
                                 )
                             }
-                            dialog.addButton(R.string.dialog_go_back, false)
+                            dialog.addButton(R.string.close, false)
                             dialog.enqueue()
                         }
                     } else {