From 2a78e896240a23d5de10060924934f4169f9369f Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Fri, 17 Mar 2023 15:16:08 +0100
Subject: [PATCH] finalize first version of party seeking

---
 Habitica/res/drawable/party_seeking.png       | Bin 0 -> 2696 bytes
 Habitica/res/drawable/success_border.xml      |   5 ++
 Habitica/res/layout/fragment_no_party.xml     |  64 ++++++++++++++----
 Habitica/res/values/strings.xml               |   6 ++
 Habitica/res/values/styles.xml                |   2 +-
 .../android/habitica/api/ApiService.kt        |   2 +-
 .../habitica/api/GSonFactoryCreator.java      |   1 +
 .../android/habitica/data/ApiClient.kt        |   2 +-
 .../android/habitica/data/UserRepository.kt   |   4 +-
 .../data/implementation/ApiClientImpl.kt      |   2 +-
 .../data/implementation/UserRepositoryImpl.kt |   8 +--
 .../habitica/models/social/UserParty.kt       |   2 +
 .../customization/AvatarOverviewFragment.kt   |   1 -
 .../social/party/NoPartyFragmentFragment.kt   |  52 ++++----------
 .../fragments/social/party/PartyFragment.kt   |   4 +-
 .../habitica/ui/viewmodels/InboxViewModel.kt  |   2 +-
 .../progress/HabiticaPullRefreshIndicator.kt  |   6 --
 build.gradle                                  |   6 +-
 common/src/main/res/values-night/colors.xml   |   1 +
 common/src/main/res/values/colors.xml         |   1 +
 common/src/main/res/values/dimens.xml         |   3 +-
 21 files changed, 99 insertions(+), 75 deletions(-)
 create mode 100644 Habitica/res/drawable/party_seeking.png
 create mode 100644 Habitica/res/drawable/success_border.xml

diff --git a/Habitica/res/drawable/party_seeking.png b/Habitica/res/drawable/party_seeking.png
new file mode 100644
index 0000000000000000000000000000000000000000..e025cf3292dd5f5a8b9529db4128c944b2664067
GIT binary patch
literal 2696
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
C!8|7b

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable/success_border.xml b/Habitica/res/drawable/success_border.xml
new file mode 100644
index 000000000..0d26a21e1
--- /dev/null
+++ b/Habitica/res/drawable/success_border.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+<corners android:radius="8dp" />
+    <stroke android:color="@color/background_green" android:width="3dp" />
+</shape>
diff --git a/Habitica/res/layout/fragment_no_party.xml b/Habitica/res/layout/fragment_no_party.xml
index 46cc96e7b..99c408a28 100644
--- a/Habitica/res/layout/fragment_no_party.xml
+++ b/Habitica/res/layout/fragment_no_party.xml
@@ -12,9 +12,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:paddingBottom="?android:actionBarSize">
-
+            android:orientation="vertical">
             <FrameLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -57,7 +55,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
-                    android:layout_margin="@dimen/spacing_large">
+                    android:layout_margin="@dimen/spacing_sides">
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -86,15 +84,25 @@
                 </LinearLayout>
                 <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="0dp"
+                    android:layout_weight="1"
                     android:orientation="vertical"
-                    android:layout_margin="@dimen/spacing_large">
+                    android:paddingHorizontal="@dimen/spacing_sides"
+                    android:paddingTop="@dimen/spacing_sides"
+                    android:paddingBottom="60dp"
+                    android:background="@color/window_background">
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:src="@drawable/party_seeking"
+                        android:layout_marginBottom="@dimen/spacing_large"/>
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         style="@style/Headline"
                         android:textSize="16sp"
-                        android:text="@string/join_party_title"
+                        android:text="@string/seeking_party_title"
                         android:gravity="center"
                         android:layout_marginBottom="@dimen/spacing_medium"/>
                     <TextView
@@ -102,23 +110,51 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         style="@style/Body2"
-                        android:text="@string/join_party_description"
+                        android:text="@string/seeking_party_description"
                         android:textColor="@color/text_quad"
                         android:textColorLink="@color/text_brand_neon"
                         android:gravity="center"
                         android:layout_marginStart="@dimen/spacing_large"
-                        android:layout_marginEnd="@dimen/spacing_large"/>
+                        android:layout_marginEnd="@dimen/spacing_large"
+                        android:layout_marginBottom="@dimen/spacing_large"/>
 
                     <Button
-                        android:id="@+id/username_textview"
+                        android:id="@+id/seek_party_button"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        style="@style/HabiticaButton.Gray"
-                        android:layout_marginTop="@dimen/spacing_large"
-                        android:layout_marginBottom="@dimen/spacing_large"/>
+                        style="@style/HabiticaButton.Primary"
+                        android:text="@string/look_for_party"/>
+                    <LinearLayout
+                        android:id="@+id/seeking_party_wrapper"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical">
+                        <TextView
+                            android:layout_width="match_parent"
+                            android:layout_height="40dp"
+                            android:text="@string/you_re_looking_for_party"
+                            android:textColor="@color/text_green"
+                            style="@style/Body1_Button"
+                            android:background="@drawable/success_border"/>
+                        <TextView
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:text="@string/seeking_hint"
+                            android:textColor="@color/text_green"
+                            style="@style/Body1"
+                            android:gravity="center"
+                            android:layout_marginTop="6dp"/>
+                        <Button
+                            android:id="@+id/leave_seeking_button"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            style="@style/HabiticaButton.Borderless"
+                            android:textColor="@color/text_maroon"
+                            android:text="@string/leave_party_finder"/>
+                    </LinearLayout>
 
                 </LinearLayout>
             </LinearLayout>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
-</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
\ No newline at end of file
+</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 25dabb879..45fe6ee65 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -1370,6 +1370,12 @@
     <string name="invite_with_username_email">Invite with @username or email</string>
     <string name="habiticans_send_invite">Send an invite directly to Habiticans you know</string>
     <string name="username_or_email">Username or email address</string>
+    <string name="seeking_party_description">Want to join a Party with others but don’t know any Habiticans? Join our Party Finder to let Party leaders know you’re looking for an invite!</string>
+    <string name="seeking_party_title">Looking for a Party?</string>
+    <string name="look_for_party">Look for a Party</string>
+    <string name="you_re_looking_for_party">You’re looking for a Party!</string>
+    <string name="seeking_hint">Keep an eye out for an invite or start your own Party at any time</string>
+    <string name="leave_party_finder">Leave Party Finder</string>
 
     <plurals name="you_x_others">
         <item quantity="zero">You</item>
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index e341ee6b8..91a68d4e1 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -1015,7 +1015,7 @@
 
     <style name="FlatCardView">
         <item name="android:background">@drawable/layout_rounded_bg_window</item>
-        <item name="android:layout_margin">@dimen/spacing_medium</item>
+        <item name="android:layout_margin">@dimen/spacing_sides</item>
     </style>
 
     <style name="CountLabel">
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt
index 66c52d8f8..0198ab7eb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt
@@ -72,7 +72,7 @@ interface ApiService {
     suspend fun getContent(@Query("language") language: String?): HabitResponse<ContentResult>
 
     @PUT("user/")
-    suspend fun updateUser(@Body updateDictionary: Map<String, Any>): HabitResponse<User>
+    suspend fun updateUser(@Body updateDictionary: Map<String, Any?>): HabitResponse<User>
 
     @PUT("user/")
     suspend fun registrationLanguage(@Header("Accept-Language") registrationLanguage: String): HabitResponse<User>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/api/GSonFactoryCreator.java b/Habitica/src/main/java/com/habitrpg/android/habitica/api/GSonFactoryCreator.java
index 860c8de38..5613e2a95 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/api/GSonFactoryCreator.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/api/GSonFactoryCreator.java
@@ -141,6 +141,7 @@ public class GSonFactoryCreator {
                 .registerTypeAdapter(Notification.class, new NotificationDeserializer())
                 .registerTypeAdapter(SocialAuthentication.class, new SocialAuthenticationDeserializer())
                 .setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
+                .serializeNulls()
                 .create();
     }
         public static GsonConverterFactory create() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.kt
index 28133bff4..4fa50fc55 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.kt
@@ -56,7 +56,7 @@ interface ApiClient {
     var languageCode: String?
     suspend fun getContent(language: String? = null): ContentResult?
 
-    suspend fun updateUser(updateDictionary: Map<String, Any>): User?
+    suspend fun updateUser(updateDictionary: Map<String, Any?>): User?
 
     suspend fun registrationLanguage(registrationLanguage: String): User?
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.kt
index e9c60a3de..b263edc62 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.kt
@@ -20,8 +20,8 @@ interface UserRepository : BaseRepository {
     fun getUser(): Flow<User?>
     fun getUser(userID: String): Flow<User?>
 
-    suspend fun updateUser(updateData: Map<String, Any>): User?
-    suspend fun updateUser(key: String, value: Any): User?
+    suspend fun updateUser(updateData: Map<String, Any?>): User?
+    suspend fun updateUser(key : String, value : Any?): User?
 
     suspend fun retrieveUser(withTasks: Boolean = false, forced: Boolean = false, overrideExisting: Boolean = false): User?
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt
index 05703c3b3..e8e9897a9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt
@@ -328,7 +328,7 @@ class ApiClientImpl(
         return process { apiService.getContent(language ?: this.languageCode) }
     }
 
-    override suspend fun updateUser(updateDictionary: Map<String, Any>): User? {
+    override suspend fun updateUser(updateDictionary: Map<String, Any?>): User? {
         return process { apiService.updateUser(updateDictionary) }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt
index 6898f3796..1154a3cff 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt
@@ -46,21 +46,21 @@ class UserRepositoryImpl(
     override fun getUser(): Flow<User?> = getUser(userID)
     override fun getUser(userID: String): Flow<User?> = localRepository.getUser(userID)
 
-    private suspend fun updateUser(userID: String, updateData: Map<String, Any>): User? {
+    private suspend fun updateUser(userID: String, updateData: Map<String, Any?>): User? {
         val networkUser = apiClient.updateUser(updateData) ?: return null
         val oldUser = localRepository.getUser(userID).firstOrNull()
         return mergeUser(oldUser, networkUser)
     }
 
-    private suspend fun updateUser(userID: String, key: String, value: Any): User? {
+    private suspend fun updateUser(userID : String, key : String, value : Any?): User? {
         return updateUser(userID, mapOf(key to value))
     }
 
-    override suspend fun updateUser(updateData: Map<String, Any>): User? {
+    override suspend fun updateUser(updateData: Map<String, Any?>): User? {
         return updateUser(userID, updateData)
     }
 
-    override suspend fun updateUser(key: String, value: Any): User? {
+    override suspend fun updateUser(key : String, value : Any?): User? {
         return updateUser(userID, key, value)
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/UserParty.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/UserParty.kt
index 23f0d64a8..ef5eacf82 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/UserParty.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/UserParty.kt
@@ -5,12 +5,14 @@ import com.habitrpg.android.habitica.models.BaseObject
 import com.habitrpg.android.habitica.models.inventory.Quest
 import io.realm.RealmObject
 import io.realm.annotations.RealmClass
+import java.util.Date
 
 @RealmClass(embedded = true)
 open class UserParty : RealmObject(), BaseObject {
     @SerializedName("_id")
     var id: String = ""
     var quest: Quest? = null
+    var seeking: Date? = null
     @SerializedName("order")
     var partyOrder: String? = null // Order to display ppl
     var orderAscending: String? = null // Order type
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt
index cc491d095..425a31a29 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt
@@ -24,7 +24,6 @@ import androidx.compose.ui.unit.dp
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.map
 import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.databinding.FragmentComposeScrollingBinding
 import com.habitrpg.android.habitica.helpers.MainNavigationController
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/NoPartyFragmentFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/NoPartyFragmentFragment.kt
index 1c8d667aa..25b1364c4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/NoPartyFragmentFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/NoPartyFragmentFragment.kt
@@ -1,14 +1,10 @@
 package com.habitrpg.android.habitica.ui.fragments.social.party
 
 import android.app.Activity
-import android.content.ClipData
-import android.content.ClipboardManager
-import android.content.Context
 import android.content.Intent
 import android.graphics.Bitmap
 import android.graphics.Shader
 import android.graphics.drawable.BitmapDrawable
-import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -16,8 +12,8 @@ import android.view.ViewGroup
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.graphics.drawable.toBitmap
 import androidx.core.os.bundleOf
+import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
-import com.google.firebase.analytics.FirebaseAnalytics
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.databinding.FragmentNoPartyBinding
@@ -26,15 +22,14 @@ import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.ui.activities.GroupFormActivity
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
-import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
 import com.habitrpg.common.habitica.extensions.DataBindingUtils
 import com.habitrpg.common.habitica.helpers.ExceptionHandler
 import com.habitrpg.common.habitica.helpers.launchCatching
-import com.habitrpg.common.habitica.helpers.setMarkdown
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 import kotlin.math.roundToInt
 import dagger.hilt.android.AndroidEntryPoint
+import java.util.Date
 
 @AndroidEntryPoint
 class NoPartyFragmentFragment : BaseMainFragment<FragmentNoPartyBinding>() {
@@ -97,15 +92,21 @@ class NoPartyFragmentFragment : BaseMainFragment<FragmentNoPartyBinding>() {
             } else {
                 binding?.invitationWrapper?.visibility = View.GONE
             }
+
+            val isSeeking = user?.party?.seeking != null
+            binding?.seekPartyButton?.isVisible = !isSeeking
+            binding?.seekingPartyWrapper?.isVisible = isSeeking
         }
 
-        binding?.usernameTextview?.setOnClickListener {
-            val clipboard = context?.getSystemService(Context.CLIPBOARD_SERVICE) as? ClipboardManager
-            val clip = ClipData.newPlainText(context?.getString(R.string.username), userViewModel.username)
-            clipboard?.setPrimaryClip(clip)
-            val activity = mainActivity
-            if (activity != null && Build.VERSION.SDK_INT <= Build.VERSION_CODES.S_V2) {
-                HabiticaSnackbar.showSnackbar(activity.snackbarContainer, getString(R.string.username_copied), HabiticaSnackbar.SnackbarDisplayType.NORMAL)
+        binding?.seekPartyButton?.setOnClickListener {
+            lifecycleScope.launchCatching {
+                userRepository.updateUser("party.seeking", Date())
+            }
+        }
+
+        binding?.leaveSeekingButton?.setOnClickListener {
+            lifecycleScope.launchCatching {
+                userRepository.updateUser("party.seeking", null)
             }
         }
 
@@ -132,16 +133,6 @@ class NoPartyFragmentFragment : BaseMainFragment<FragmentNoPartyBinding>() {
                 }
             }
         }
-
-        if (configManager.noPartyLinkPartyGuild()) {
-            binding?.joinPartyDescriptionTextview?.setMarkdown(getString(R.string.join_party_description_guild, "[Party Wanted Guild](https://habitica.com/groups/guild/f2db2a7f-13c5-454d-b3ee-ea1f5089e601)"))
-            binding?.joinPartyDescriptionTextview?.setOnClickListener {
-                context?.let { FirebaseAnalytics.getInstance(it).logEvent("clicked_party_wanted", null) }
-                MainNavigationController.navigate(R.id.guildFragment, bundleOf("groupID" to "f2db2a7f-13c5-454d-b3ee-ea1f5089e601"))
-            }
-        }
-
-        binding?.usernameTextview?.text = userViewModel.formattedUsername
     }
 
     private val groupFormResult = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
@@ -184,20 +175,7 @@ class NoPartyFragmentFragment : BaseMainFragment<FragmentNoPartyBinding>() {
     }
 
     override fun onDestroy() {
-        userRepository.close()
         socialRepository.close()
         super.onDestroy()
     }
-
-
-    companion object {
-
-        fun newInstance(): NoPartyFragmentFragment {
-            val args = Bundle()
-
-            val fragment = NoPartyFragmentFragment()
-            fragment.arguments = args
-            return fragment
-        }
-    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.kt
index 5058aa4cb..451d9e7d3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.kt
@@ -160,7 +160,7 @@ class PartyFragment : BaseMainFragment<FragmentViewpagerBinding>() {
             val inviteData = HashMap<String, Any>()
             inviteData["inviter"] = viewModel.user.value?.profile?.name ?: ""
             val emails = it.data?.getStringArrayExtra(GroupInviteActivity.EMAILS_KEY)
-            if (emails != null && emails.isNotEmpty()) {
+            if (!emails.isNullOrEmpty()) {
                 val invites = ArrayList<HashMap<String, String>>()
                 emails.forEach { email ->
                     val invite = HashMap<String, String>()
@@ -171,7 +171,7 @@ class PartyFragment : BaseMainFragment<FragmentViewpagerBinding>() {
                 inviteData["emails"] = invites
             }
             val userIDs = it.data?.getStringArrayExtra(GroupInviteActivity.USER_IDS_KEY)
-            if (userIDs != null && userIDs.isNotEmpty()) {
+            if (!userIDs.isNullOrEmpty()) {
                 val invites = ArrayList<String>()
                 userIDs.forEach { invites.add(it) }
                 inviteData["usernames"] = invites
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/InboxViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/InboxViewModel.kt
index 1392ae68b..faf80f04f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/InboxViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/InboxViewModel.kt
@@ -45,7 +45,7 @@ class InboxViewModel @Inject constructor(
         .setEnablePlaceholders(false)
         .build()
 
-    val dataSourceFactory = MessagesDataSourceFactory(socialRepository, recipientID, ChatMessage())
+    private val dataSourceFactory = MessagesDataSourceFactory(socialRepository, recipientID, ChatMessage())
     val messages: LiveData<PagedList<ChatMessage>> = dataSourceFactory.toLiveData(config)
     private val member = memberIDFlow
         .filterNotNull()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/progress/HabiticaPullRefreshIndicator.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/progress/HabiticaPullRefreshIndicator.kt
index 7a57ec730..67b1fb76a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/progress/HabiticaPullRefreshIndicator.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/progress/HabiticaPullRefreshIndicator.kt
@@ -18,9 +18,6 @@ import androidx.compose.material.pullrefresh.pullRefresh
 import androidx.compose.material.pullrefresh.pullRefreshIndicatorTransform
 import androidx.compose.material.pullrefresh.rememberPullRefreshState
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.derivedStateOf
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -47,9 +44,6 @@ fun HabiticaPullRefreshIndicator(
         }
     }
     if (!isInitial) {
-        val showElevation by remember(isRefreshing, state) {
-            derivedStateOf { isRefreshing || state.progress > 0.5f }
-        }
         Surface(
             modifier = modifier
                 .pullRefreshIndicatorTransform(state, scale),
diff --git a/build.gradle b/build.gradle
index 755e23bfb..c0e4169eb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,7 @@ buildscript {
         kotest_version = '5.5.5'
         kotlin_version = '1.8.10'
         ktlint_version = '0.48.2'
-        lifecycle_version = '2.5.1'
+        lifecycle_version = '2.6.0'
         markwon_version = '4.6.2'
         mockk_version = '1.13.4'
         moshi_version = '1.14.0'
@@ -30,7 +30,7 @@ buildscript {
         preferences_version = '1.2.0'
         realm_version = '1.0.2'
         retrofit_version = '2.9.0'
-        recyclerview_version = '1.2.1'
+        recyclerview_version = '1.3.0'
     }
 
     repositories {
@@ -39,7 +39,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.1'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
         classpath 'com.google.gms:google-services:4.3.15'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.4'
diff --git a/common/src/main/res/values-night/colors.xml b/common/src/main/res/values-night/colors.xml
index 82a50b761..45bde1118 100644
--- a/common/src/main/res/values-night/colors.xml
+++ b/common/src/main/res/values-night/colors.xml
@@ -11,6 +11,7 @@
     <color name="text_inverted">@color/gray_10</color>
     <color name="text_brand">@color/brand_600</color>
     <color name="text_brand_neon">@color/brand_500</color>
+    <color name="text_maroon">@color/maroon_100</color>
     <color name="text_red">@color/red_100</color>
     <color name="text_orange">@color/orange_100</color>
     <color name="text_yellow">@color/yellow_100</color>
diff --git a/common/src/main/res/values/colors.xml b/common/src/main/res/values/colors.xml
index 182b918e2..adcf2ae10 100644
--- a/common/src/main/res/values/colors.xml
+++ b/common/src/main/res/values/colors.xml
@@ -151,6 +151,7 @@
     <color name="text_inverted">@color/gray_700</color>
     <color name="text_brand">@color/brand_300</color>
     <color name="text_brand_neon">@color/brand_400</color>
+    <color name="text_maroon">@color/maroon_10</color>
     <color name="text_red">@color/maroon_100</color>
     <color name="text_orange">@color/orange_10</color>
     <color name="text_yellow">@color/yellow_10</color>
diff --git a/common/src/main/res/values/dimens.xml b/common/src/main/res/values/dimens.xml
index 464a14c9d..641690924 100644
--- a/common/src/main/res/values/dimens.xml
+++ b/common/src/main/res/values/dimens.xml
@@ -10,9 +10,10 @@
     <dimen name="spacing_large">16dp</dimen>
     <dimen name="spacing_medium">8dp</dimen>
     <dimen name="spacing_xlarge">32dp</dimen>
+    <dimen name="spacing_sides">25dp</dimen>
 
     <dimen name="icon_size">18dp</dimen>
 
     <dimen name="card_medium_text">18.0sp</dimen>
     <dimen name="card_small_text">14.0sp</dimen>
-</resources>
\ No newline at end of file
+</resources>