From bbe5bb005cad4e26147432e7fc644067f9650e71 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Tue, 13 Jul 2021 09:57:34 +0200
Subject: [PATCH] Fix minor issues

---
 Habitica/AndroidManifest.xml                              | 1 -
 Habitica/build.gradle                                     | 2 +-
 Habitica/res/layout/activity_full_profile.xml             | 6 ------
 .../local/implementation/RealmSocialLocalRepository.kt    | 4 ++++
 .../android/habitica/models/social/ChatMessage.kt         | 3 +--
 .../android/habitica/ui/activities/FullProfileActivity.kt | 8 ++------
 .../habitica/ui/adapter/social/GuildListAdapter.kt        | 2 ++
 .../ui/fragments/social/guilds/GuildListFragment.kt       | 6 +++++-
 .../ui/fragments/social/guilds/GuildOverviewFragment.kt   | 3 +++
 .../android/habitica/utils/ChatMessageDeserializer.kt     | 1 +
 10 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index c785eef06..20aa8c698 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -176,7 +176,6 @@
         <activity
             android:name=".ui.activities.ChallengeFormActivity"
             android:parentActivityName=".ui.activities.MainActivity"
-            android:launchMode="singleTask"
             tools:ignore="UnusedAttribute">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index b131ac285..d1287ec83 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -146,7 +146,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 3000
+        versionCode 3006
         versionName "3.3"
     }
 
diff --git a/Habitica/res/layout/activity_full_profile.xml b/Habitica/res/layout/activity_full_profile.xml
index 2b2e31514..24ba8d7fc 100644
--- a/Habitica/res/layout/activity_full_profile.xml
+++ b/Habitica/res/layout/activity_full_profile.xml
@@ -398,12 +398,6 @@
                         android:text="@string/profile_achievements"
                         android:textStyle="bold" />
 
-                    <ProgressBar
-                        android:id="@+id/achievement_progress"
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content"
-                        android:indeterminate="true" />
-
                     <com.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport
                         android:id="@+id/achievement_group_list"
                         android:layout_width="match_parent"
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmSocialLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmSocialLocalRepository.kt
index 312f2591c..417a729cb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmSocialLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmSocialLocalRepository.kt
@@ -188,6 +188,7 @@ class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm)
         if (liked) {
             executeTransaction {
                 liveMessage?.likes?.add(ChatMessageLike(userId))
+                liveMessage?.likeCount = liveMessage?.likes?.size ?: 0
             }
         } else {
             liveMessage?.likes?.filter { userId == it.id }?.forEach { like ->
@@ -195,6 +196,9 @@ class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm)
                     like.deleteFromRealm()
                 })
             }
+            executeTransaction {
+                liveMessage?.likeCount = liveMessage?.likes?.size ?: 0
+            }
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/ChatMessage.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/ChatMessage.kt
index f552cd912..6f6496d44 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/ChatMessage.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/ChatMessage.kt
@@ -52,8 +52,7 @@ open class ChatMessage : RealmObject(), BaseMainObject {
     val isSystemMessage: Boolean
         get() = uuid == "system"
 
-    val likeCount: Int
-        get() = likes?.size ?: 0
+    var likeCount: Int = 0
 
     var username: String? = null
     val formattedUsername: String?
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt
index c54a2cdce..333c284f8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt
@@ -28,6 +28,7 @@ import com.habitrpg.android.habitica.models.user.Outfit
 import com.habitrpg.android.habitica.models.user.Stats
 import com.habitrpg.android.habitica.ui.AvatarWithBarsViewModel
 import com.habitrpg.android.habitica.ui.adapter.social.AchievementProfileAdapter
+import com.habitrpg.android.habitica.ui.helpers.RecyclerViewState
 import com.habitrpg.android.habitica.ui.helpers.loadImage
 import com.habitrpg.android.habitica.ui.helpers.setMarkdown
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
@@ -260,7 +261,7 @@ class FullProfileActivity : BaseActivity() {
         binding.achievementGroupList.layoutManager = layoutManager
         binding.achievementGroupList.adapter = adapter
 
-        stopAndHideProgress(binding.achievementProgress)
+        binding.achievementGroupList.state = RecyclerViewState.DISPLAYING_DATA
     }
 
     private fun fillAchievements(labelID: Int, achievements: List<Achievement>, targetList: MutableList<Any>) {
@@ -272,11 +273,6 @@ class FullProfileActivity : BaseActivity() {
         targetList.addAll(achievementList)
     }
 
-    private fun stopAndHideProgress(bar: ProgressBar) {
-        bar.isIndeterminate = false
-        bar.visibility = View.GONE
-    }
-
     private fun getFloorValueString(`val`: Float, roundDown: Boolean): String {
         return if (roundDown) {
             floor(`val`.toDouble()).toString()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/GuildListAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/GuildListAdapter.kt
index 81ad5a311..0cebe5937 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/GuildListAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/GuildListAdapter.kt
@@ -76,6 +76,8 @@ class GuildListAdapter : BaseRecyclerViewAdapter<Group, RecyclerView.ViewHolder>
                                 .contains("summary", constraint.toString(), Case.INSENSITIVE)
                                 .endGroup()
                                 .findAll()
+                    } else {
+                        data = it
                     }
                 }
             }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildListFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildListFragment.kt
index 633c44773..172761165 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildListFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildListFragment.kt
@@ -16,7 +16,7 @@ import com.habitrpg.android.habitica.ui.helpers.KeyboardUtil
 import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
 import javax.inject.Inject
 
-class GuildListFragment : BaseFragment<FragmentRefreshRecyclerviewBinding>(), SearchView.OnQueryTextListener, SwipeRefreshLayout.OnRefreshListener {
+class GuildListFragment : BaseFragment<FragmentRefreshRecyclerviewBinding>(), SearchView.OnQueryTextListener, SearchView.OnCloseListener, SwipeRefreshLayout.OnRefreshListener {
 
     @Inject
     lateinit var socialRepository: SocialRepository
@@ -87,4 +87,8 @@ class GuildListFragment : BaseFragment<FragmentRefreshRecyclerviewBinding>(), Se
         fetchGuilds()
     }
 
+    override fun onClose(): Boolean {
+        viewAdapter.filter.filter("")
+        return false
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildOverviewFragment.kt
index 940921d45..d0f25aeb8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildOverviewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildOverviewFragment.kt
@@ -59,6 +59,9 @@ class GuildOverviewFragment : BaseMainFragment<FragmentViewpagerBinding>(), Sear
         context?.let { theTextArea?.setHintTextColor(ContextCompat.getColor(it, R.color.white)) }
         guildSearchView?.queryHint = getString(R.string.guild_search_hint)
         guildSearchView?.setOnQueryTextListener(this)
+        guildSearchView?.setOnCloseListener {
+            getActiveFragment()?.onClose() ?: true
+        }
     }
 
     @Suppress("ReturnCount")
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChatMessageDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChatMessageDeserializer.kt
index d5b724022..4468d8b1b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChatMessageDeserializer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChatMessageDeserializer.kt
@@ -31,6 +31,7 @@ class ChatMessageDeserializer : JsonDeserializer<ChatMessage> {
                     message.likes?.add(ChatMessageLike(key))
                 }
             }
+            message.likeCount = message.likes?.size ?: 0
         }
         if (obj.has("flagCount")) {
             message.flagCount = obj.get("flagCount").asInt