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" /> + style="@style/ArmoireSubHeader" /> + style="@style/ArmoireSubHeader" /> New Equipment pieces are added every month. If you own all pieces of equipment, then you\'ll get Food or Experience, 50/50 odds. 60% Piece of Equipment 20% Piece of Food - During special events, normal food items will change to their cake or candy counterparts. + You’ll receive one of the ten types of Food. During special events, normal foods will change to their cake or candy counterparts. 20% Experience points The amount gained varies randomly from 10 to 50 Day Start Adjustment diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml index 78d8f584e..48e23d006 100644 --- a/Habitica/res/values/styles.xml +++ b/Habitica/res/values/styles.xml @@ -742,15 +742,21 @@ + + 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("dailyDueDefaultView")?.setDefaultValue(user?.preferences?.dailyDueDefaultView) + val dailyDueDefault = findPreference("dailyDueDefaultView") as? CheckBoxPreference + dailyDueDefault?.isChecked = user?.preferences?.dailyDueDefaultView == true val languagePreference = findPreference("language") as? ListPreference languagePreference?.value = user?.preferences?.language languagePreference?.summary = languagePreference?.entry