From 975dfd70231047f78ca45f97ba20da8631b74415 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 12 Feb 2020 17:21:43 +0100
Subject: [PATCH] Better indication for when user is not participating in quest

---
 Habitica/build.gradle                            |  2 +-
 Habitica/res/values/strings.xml                  |  1 +
 Habitica/res/values/values.xml                   | 16 ++++++++++++++++
 .../social/party/PartyDetailFragment.kt          | 11 ++++++++++-
 4 files changed, 28 insertions(+), 2 deletions(-)

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 @@
     <string name="unlock_level">Unlock by reaching level %d</string>
     <string name="unlock_previous_short">Finish Quest %d</string>
     <string name="unlock_level_short">Level %d</string>
+    <string name="not_participating">You are not participating</string>
 </resources>
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 @@
         <item>Rosstavo\'s Theme</item>
         <item>Dewin\'s Theme</item>
         <item>Airu\'s Theme</item>
+        <item>Beatscribe\'s NES Theme</item>
+        <item>Arashi\'s Theme</item>
+        <item>Triumph Theme</item>
+        <item>Lunasol Theme</item>
+        <item>SpacePenguin\'s Theme</item>
+        <item>MAFL Theme</item>
+        <item>Pizilden\'s Theme</item>
+        <item>Farvoid Theme</item>
     </string-array>
 
     <string-array name="AudioValues">
@@ -100,6 +108,14 @@
         <item>rosstavoTheme</item>
         <item>dewinTheme</item>
         <item>airuTheme</item>
+        <item>beatscribeNesTheme</item>
+        <item>arashiTheme</item>
+        <item>triumphTheme</item>
+        <item>lunasolTheme</item>
+        <item>spacePenguinTheme</item>
+        <item>maflTheme</item>
+        <item>pizildenTheme</item>
+        <item>farvoidTheme</item>
     </string-array>
 
 
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
         }