From 5a87a6a5cc64ef621daa460f4fd297cf8abae208 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Fri, 12 Feb 2021 12:36:06 +0100 Subject: [PATCH] finalize 3.2 --- Habitica/build.gradle | 2 +- Habitica/res/navigation/navigation.xml | 2 +- Habitica/res/values/strings.xml | 2 +- .../android/habitica/components/UserComponent.java | 2 +- .../habitica/ui/fragments/NavigationDrawerFragment.kt | 2 ++ .../habitica/ui/fragments/social/QuestDetailFragment.kt | 8 ++++++-- .../social/{ => party}/NoPartyFragmentFragment.kt | 2 +- fastlane/changelog.txt | 2 +- 8 files changed, 14 insertions(+), 8 deletions(-) rename Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/{ => party}/NoPartyFragmentFragment.kt (97%) diff --git a/Habitica/build.gradle b/Habitica/build.gradle index 4f160880f..61652636e 100644 --- a/Habitica/build.gradle +++ b/Habitica/build.gradle @@ -150,7 +150,7 @@ android { buildConfigField "String", "TESTING_LEVEL", "\"production\"" resConfigs "en", "bg", "de", "en-rGB", "es", "fr", "hr-rHR", "in", "it", "iw", "ja", "ko", "lt", "nl", "pl", "pt-rBR", "pt-rPT", "ru", "tr", "zh", "zh-rTW" - versionCode 2813 + versionCode 2820 versionName "3.2" } diff --git a/Habitica/res/navigation/navigation.xml b/Habitica/res/navigation/navigation.xml index 4f081fc83..c46ba89f9 100644 --- a/Habitica/res/navigation/navigation.xml +++ b/Habitica/res/navigation/navigation.xml @@ -53,7 +53,7 @@ Accept Reject Begin Quest - Cancel Invitation + Cancel Abort Quest Version %1$s (%2$d) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/components/UserComponent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/components/UserComponent.java index 6e56a570f..2deb53969 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/components/UserComponent.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/components/UserComponent.java @@ -79,7 +79,7 @@ import com.habitrpg.android.habitica.ui.fragments.social.guilds.GuildDetailFragm import com.habitrpg.android.habitica.ui.fragments.social.guilds.GuildFragment; import com.habitrpg.android.habitica.ui.fragments.social.InboxMessageListFragment; import com.habitrpg.android.habitica.ui.fragments.social.InboxOverviewFragment; -import com.habitrpg.android.habitica.ui.fragments.social.NoPartyFragmentFragment; +import com.habitrpg.android.habitica.ui.fragments.social.party.NoPartyFragmentFragment; import com.habitrpg.android.habitica.ui.fragments.social.guilds.GuildListFragment; import com.habitrpg.android.habitica.ui.fragments.social.QuestDetailFragment; import com.habitrpg.android.habitica.ui.fragments.social.TavernDetailFragment; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt index ee9a275e2..43872f3cd 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt @@ -192,6 +192,8 @@ class NavigationDrawerFragment : DialogFragment() { getItemWithIdentifier(SIDEBAR_TEAMS)?.isVisible = it.size != 0 adapter.setTeams(it) }, RxErrorHandler.handleEmptyError())) + } else { + getItemWithIdentifier(SIDEBAR_TEAMS)?.isVisible = false } subscriptions?.add(userRepository.getUser().subscribe({ diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/QuestDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/QuestDetailFragment.kt index db9ebf359..9bc9aeed8 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/QuestDetailFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/QuestDetailFragment.kt @@ -112,11 +112,15 @@ class QuestDetailFragment : BaseMainFragment() { } else if (showLeaderButtons()) { binding?.questParticipantResponseWrapper?.visibility = View.GONE binding?.questLeaderResponseWrapper?.visibility = View.VISIBLE + binding?.questCancelButton?.visibility = View.VISIBLE if (isQuestActive) { - binding?.questCancelButton?.visibility = View.GONE + if (userId != party?.quest?.leader) { + binding?.questLeaveButton?.visibility = View.VISIBLE + } else { + binding?.questLeaveButton?.visibility = View.GONE + } binding?.questBeginButton?.visibility = View.GONE } else { - binding?.questCancelButton?.visibility = View.VISIBLE binding?.questBeginButton?.visibility = View.VISIBLE } } else { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/NoPartyFragmentFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/NoPartyFragmentFragment.kt similarity index 97% rename from Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/NoPartyFragmentFragment.kt rename to Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/NoPartyFragmentFragment.kt index 40a68b6c6..df579880a 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/NoPartyFragmentFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/NoPartyFragmentFragment.kt @@ -1,4 +1,4 @@ -package com.habitrpg.android.habitica.ui.fragments.social +package com.habitrpg.android.habitica.ui.fragments.social.party import android.app.Activity import android.content.ClipData diff --git a/fastlane/changelog.txt b/fastlane/changelog.txt index c37397f06..c0c57196e 100644 --- a/fastlane/changelog.txt +++ b/fastlane/changelog.txt @@ -1 +1 @@ -This update is full of bug fixes and quality of life upgrades. You can now use the Fortify Potion! If your tasks are getting out of hand and you’re overwhelmed with red, just get a Fortify Potion from the Market and it will reset all tasks to a neutral value. You’ll now receive an in-app message when you’ve won a Challenge and won Challenges will be listed in your Achievements. We’ve also improved the flow for hatching Pets, receiving Pet Achievements, starting Quests, and creating Challenges. +In this update we've cleaned up Guilds and Challenges to look better than ever. Check them out and maybe find something new! Starting or leaving a Quest will update the Party view right away. Snowballs will actually transform your party members now. Certain notifications work better, bringing you to the right place and no longer crashing the app in some cases. Subscriber Mystery Boxes have a fancy new view when opening as well. Check these out and lots of other fixes by downloading the update!