diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 5eecdee75..54d8758f8 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -153,7 +153,7 @@ android {
multiDexEnabled true
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 2371
+ versionCode 2373
versionName "2.5"
}
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index b4b759143..64e1fb01f 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -952,4 +952,5 @@
Unlock by reaching level %d
Finish Quest %d
Level %d
+ You are not participating
diff --git a/Habitica/res/values/values.xml b/Habitica/res/values/values.xml
index 2572ea591..b6510e863 100644
--- a/Habitica/res/values/values.xml
+++ b/Habitica/res/values/values.xml
@@ -89,6 +89,14 @@
- Rosstavo\'s Theme
- Dewin\'s Theme
- Airu\'s Theme
+ - Beatscribe\'s NES Theme
+ - Arashi\'s Theme
+ - Triumph Theme
+ - Lunasol Theme
+ - SpacePenguin\'s Theme
+ - MAFL Theme
+ - Pizilden\'s Theme
+ - Farvoid Theme
@@ -100,6 +108,14 @@
- rosstavoTheme
- dewinTheme
- airuTheme
+ - beatscribeNesTheme
+ - arashiTheme
+ - triumphTheme
+ - lunasolTheme
+ - spacePenguinTheme
+ - maflTheme
+ - pizildenTheme
+ - farvoidTheme
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt
index 4eaee013d..cc0aac872 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt
@@ -208,11 +208,20 @@ class PartyDetailFragment : BaseFragment() {
} else {
DataBindingUtils.loadImage(questImageView, "quest_" + questContent.key)
}
+ questImageWrapper?.alpha = 1.0f
+ questProgressView?.alpha = 1.0f
if (viewModel?.isQuestActive == true) {
questProgressView?.visibility = View.VISIBLE
questProgressView?.setData(questContent, viewModel?.getGroupData()?.value?.quest?.progress)
- questParticipationView?.text = context?.getString(R.string.number_participants, viewModel?.getGroupData()?.value?.quest?.members?.size)
+ val questParticipants = viewModel?.getGroupData()?.value?.quest?.members
+ if (questParticipants?.find { it.key == userId } != null) {
+ questParticipationView?.text = context?.getString(R.string.number_participants, questParticipants.size)
+ } else {
+ questParticipationView?.text = context?.getString(R.string.not_participating)
+ questImageWrapper?.alpha = 0.5f
+ questProgressView?.alpha = 0.5f
+ }
} else {
questProgressView?.visibility = View.GONE
}