sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-07-14 18:21:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' of https://github.com/HabitRPG/habitica-android

Browse source
This commit is contained in:
Phillip Thelen 2022-08-18 16:46:39 +02:00
commit 247366821a
4 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Habitica/res/layout/armoire_drop_rate_dialog.xml
View file

@ -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"

2
Habitica/res/values/strings.xml
View file

@ -1191,7 +1191,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>

12
Habitica/res/values/styles.xml
View file

@ -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>

3
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.kt
View file

@ -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