From dd4ce4380cb709dc0eb8ce343417ae68ba650d11 Mon Sep 17 00:00:00 2001
From: Hafiz <hafizbhamidi@gmail.com>
Date: Thu, 18 Aug 2022 08:19:17 -0400
Subject: [PATCH 1/2] Set dailyDueFaultView isChecked prefs

---
 .../habitica/ui/fragments/preferences/PreferencesFragment.kt   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 5c1afcbf5..5577c4353 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
@@ -315,7 +315,8 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
         val cdsTimePreference = findPreference("cds_time") as? ListPreference
         cdsTimePreference?.value = user?.preferences?.dayStart.toString()
         cdsTimePreference?.summary = cdsTimePreference?.entry
-        findPreference<Preference>("dailyDueDefaultView")?.setDefaultValue(user?.preferences?.dailyDueDefaultView)
+        val dailyDueDefault = findPreference<Preference>("dailyDueDefaultView") as? CheckBoxPreference
+        dailyDueDefault?.isChecked = user?.preferences?.dailyDueDefaultView == true
         val languagePreference = findPreference("language") as? ListPreference
         languagePreference?.value = user?.preferences?.language
         languagePreference?.summary = languagePreference?.entry

From c3bfa5236699652c34a2067d0e0bddba48db5ac7 Mon Sep 17 00:00:00 2001
From: Hafiz <hafizbhamidi@gmail.com>
Date: Thu, 18 Aug 2022 08:29:49 -0400
Subject: [PATCH 2/2] Top line text roboto 16 medium Category text lines roboto
 16 regular food description updated less character spacing for supporting
 text less character spacing for top text

---
 Habitica/res/layout/armoire_drop_rate_dialog.xml |  6 +++---
 Habitica/res/values/strings.xml                  |  2 +-
 Habitica/res/values/styles.xml                   | 12 +++++++++---
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Habitica/res/layout/armoire_drop_rate_dialog.xml b/Habitica/res/layout/armoire_drop_rate_dialog.xml
index 786fd9b83..af3d821d9 100644
--- a/Habitica/res/layout/armoire_drop_rate_dialog.xml
+++ b/Habitica/res/layout/armoire_drop_rate_dialog.xml
@@ -19,7 +19,7 @@
         android:layout_height="wrap_content"
         android:textColor="@color/text_primary"
         android:text="@string/armoire_rate_equipment_title"
-        style="@style/SubHeader1" />
+        style="@style/ArmoireSubHeader" />
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -33,7 +33,7 @@
         android:layout_height="wrap_content"
         android:textColor="@color/text_primary"
         android:text="@string/armoire_rate_food_title"
-        style="@style/SubHeader1" />
+        style="@style/ArmoireSubHeader" />
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -47,7 +47,7 @@
         android:layout_height="wrap_content"
         android:textColor="@color/text_primary"
         android:text="@string/armoire_rate_experience_title"
-        style="@style/SubHeader1" />
+        style="@style/ArmoireSubHeader" />
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 50125ea84..2d92d4e58 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -1192,7 +1192,7 @@
     <string name="armoire_rate_equipment_description">New Equipment pieces are added every month. If you own all pieces of equipment, then you\'ll get Food or Experience, 50/50 odds.</string>
     <string name="armoire_rate_equipment_title">60% Piece of Equipment</string>
     <string name="armoire_rate_food_title">20% Piece of Food</string>
-    <string name="armoire_rate_food_description">During special events, normal food items will change to their cake or candy counterparts.</string>
+    <string name="armoire_rate_food_description">You’ll receive one of the ten types of Food. During special events, normal foods will change to their cake or candy counterparts.</string>
     <string name="armoire_rate_experience_title">20% Experience points</string>
     <string name="armoire_rate_experience_description">The amount gained varies randomly from 10 to 50</string>
     <string name="day_start_adjustment">Day Start Adjustment</string>
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index 6032ace73..36a603599 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -742,15 +742,21 @@
 
     <style name="ArmoireTitleTextView">
         <item name="android:fontFamily">@string/font_family_medium</item>
-        <item name="android:textSize">20sp</item>
-        <item name="android:letterSpacing">0.07</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:letterSpacing">0.04</item>
         <item name="android:textColor">@color/armoire_text</item>
     </style>
 
+    <style name="ArmoireSubHeader">
+        <item name="android:fontFamily">@string/font_family_regular</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:textColor">?textColorSecondary</item>
+    </style>
+
     <style name="ArmoireDescriptionTextView">
         <item name="android:fontFamily">@string/font_family_regular</item>
         <item name="android:textSize">12sp</item>
-        <item name="android:letterSpacing">0.04</item>
+        <item name="android:letterSpacing">0.02</item>
         <item name="android:textColor">@color/armoire_text</item>
     </style>