sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-20 04:39:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change class flow fixes

Browse source
This commit is contained in:
Hafiz 2023-07-12 04:23:38 -04:00 committed by Phillip Thelen
parent d0bc53e17a
commit 79f37ce9a1
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -318,7 +318,7 @@
<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 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_selected_confirmation">Do you want to change your class to %1$s?</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>
<string name="change_class_equipment_warning">This will refund your stat points, switch which gear is unlocked in shops, and change your available skills.</string>

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt
View file

@ -95,7 +95,7 @@ class ClassSelectionActivity : BaseActivity() {
}
binding.healerWrapper.setOnClickListener { newClass = "healer" }
binding.mageWrapper.setOnClickListener { newClass = "wizard" }
binding.mageWrapper.setOnClickListener { newClass = "mage" }
binding.rogueWrapper.setOnClickListener { newClass = "rogue" }
binding.warriorWrapper.setOnClickListener { newClass = "warrior" }
binding.selectedButton.setOnClickListener { displayConfirmationDialogForClass() }

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

@ -147,13 +147,13 @@ class PreferencesFragment : BasePreferencesFragment(),
"choose_class" -> {
val isPlayerOptedOutOfClass = user?.preferences?.disableClasses ?: false
val isClassSelected = if (isPlayerOptedOutOfClass) false else (user?.flags?.classSelected ?: false)
val isClassSelected = user?.flags?.classSelected ?: false
val bundle = Bundle()
bundle.putBoolean("isInitialSelection", isClassSelected)
val intent = Intent(activity, ClassSelectionActivity::class.java)
intent.putExtras(bundle)
if (isClassSelected) {
if (isClassSelected && !isPlayerOptedOutOfClass) {
if ((user?.gemCount ?: 0) >= 3) {
context?.let { context ->
val dialog = HabiticaAlertDialog(context)