diff --git a/.editorconfig b/.editorconfig
index 7ee2f96c9..8234eac1e 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,2 +1,14 @@
 [*.{kt,kts}]
 max_line_length=off
+ktlint_function_naming_ignore_when_annotated_with=Composable
+
+[*.gradle.kts]
+property_naming=off
+
+
+[shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/responses/TaskDirectionData.kt]
+ktlint_standard_backing-property-naming=disabled
+
+[**/generated/**/*.kt]
+ktlint_standard_property-naming=disabled
+ktlint_standard_backing-property-naming=disabled
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index b3d0139b6..20034a6d3 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -25,6 +25,11 @@ jobs:
 
   unit-test:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        module:
+          - "common"
+          - "Habitica"
     steps:
     - uses: actions/checkout@v3
     - name: set up JDK 17
@@ -38,7 +43,7 @@ jobs:
     - name: Run with Gradle
       uses: gradle/gradle-build-action@v2
       with:
-        arguments: testProdDebugUnitTest
+        arguments: ${{ matrix.module }}:testProdDebugUnitTest
 
 #  ui-test:
 #    runs-on: ubuntu-latest
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index 1530d97c4..24c94a157 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -1,8 +1,9 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
 
     <!-- Application theme. -->
     <style name="AppTheme" parent="Theme.Material3.DayNight">
-        <item name="android:listSeparatorTextViewStyle">@style/MyOwnListSeperatorTextViewStyle</item>
+        <item name="android:listSeparatorTextViewStyle">@style/MyOwnListSeperatorTextViewStyle
+        </item>
 
         <item name="android:elevation">0dp</item>
         <item name="elevation">0dp</item>
@@ -69,8 +70,7 @@
         <item name="headerTextColor">@color/text_title</item>
     </style>
 
-    <style name="MainAppTheme" parent="AppTheme">
-    </style>
+    <style name="MainAppTheme" parent="AppTheme"></style>
 
     <style name="MainAppTheme.Dark">
         <item name="colorPrimary">@color/brand_400</item>
@@ -541,7 +541,7 @@
 
     <style name="SubscriptionListTitle" parent="GemPurchaseListItem">
         <item name="android:layout_gravity">left|center_vertical</item>
-        <item name="android:fontFamily" >@string/font_family_medium</item>
+        <item name="android:fontFamily">@string/font_family_medium</item>
         <item name="android:textSize">14sp</item>
         <item name="paddingEnd">32dp</item>
     </style>
@@ -581,6 +581,7 @@
     <style name="Pill.Content" parent="Pill">
         <item name="android:background">@drawable/pill_bg_content</item>
     </style>
+
     <style name="Pill.Purple">
         <item name="android:textColor">@color/white</item>
         <item name="android:background">@drawable/pill_bg_purple_300</item>
@@ -618,7 +619,7 @@
 
     <style name="subscriptionBoxText.Title">
         <item name="android:textSize">14sp</item>
-        <item name="android:fontFamily" >
+        <item name="android:fontFamily">
             @string/font_family_medium
         </item>
         <item name="android:textColor">@color/text_primary</item>
@@ -627,7 +628,7 @@
 
     <style name="subscriptionBoxText.Subtitle">
         <item name="android:textSize">14sp</item>
-        <item name="android:fontFamily" >
+        <item name="android:fontFamily">
             @string/font_family_regular
         </item>
         <item name="android:textColor">@color/text_primary</item>
@@ -635,7 +636,7 @@
 
     <style name="SubscriptionListDescription" parent="GemPurchaseListItemDescription">
         <item name="android:layout_marginBottom">24dp</item>
-        <item name="android:fontFamily" >
+        <item name="android:fontFamily">
             @string/font_family_condensed
         </item>
         <item name="android:textSize">14sp</item>
@@ -881,12 +882,15 @@
     <style name="RedTextLabel" parent="TextAppearance.AppCompat">
         <item name="android:textColor">@color/red_10</item>
     </style>
+
     <style name="YellowTextLabel" parent="TextAppearance.AppCompat">
         <item name="android:textColor">@color/yellow_5</item>
     </style>
+
     <style name="BlueTextLabel" parent="TextAppearance.AppCompat">
         <item name="android:textColor">@color/blue_10</item>
     </style>
+
     <style name="PurpleTextLabel" parent="TextAppearance.AppCompat">
         <item name="android:textColor">@color/brand_300</item>
     </style>
@@ -919,7 +923,6 @@
     </style>
 
 
-
     <style name="TaskFormTextInputLayoutAppearance" parent="Widget.MaterialComponents.TextInputLayout.FilledBox">
         <!-- reference our hint & error styles -->
         <item name="boxBackgroundColor">?colorTintedBackground</item>
@@ -1021,6 +1024,7 @@
         <item name="android:textSize">12sp</item>
         <item name="android:textStyle">bold</item>
     </style>
+
     <style name="ActiveLabel">
         <item name="android:background">@drawable/pill_bg_teal_100</item>
         <item name="android:paddingStart">4dp</item>
diff --git a/Habitica/src/androidTest/java/com/habitrpg/android/habitica/HabiticaTestCase.kt b/Habitica/src/androidTest/java/com/habitrpg/android/habitica/HabiticaTestCase.kt
index 95036d5a9..76560b2de 100644
--- a/Habitica/src/androidTest/java/com/habitrpg/android/habitica/HabiticaTestCase.kt
+++ b/Habitica/src/androidTest/java/com/habitrpg/android/habitica/HabiticaTestCase.kt
@@ -13,7 +13,6 @@ import com.habitrpg.android.habitica.data.TaskRepository
 import com.habitrpg.android.habitica.data.TutorialRepository
 import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.helpers.AppConfigManager
-import com.habitrpg.common.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.helpers.NotificationsManager
 import com.habitrpg.android.habitica.helpers.SoundManager
 import com.habitrpg.android.habitica.interactors.FeedPetUseCase
@@ -28,6 +27,7 @@ import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import com.habitrpg.common.habitica.api.HostConfig
 import com.habitrpg.common.habitica.helpers.ExceptionHandler
+import com.habitrpg.common.habitica.helpers.MainNavigationController
 import com.kaspersky.kaspresso.testcases.api.testcase.TestCase
 import io.mockk.clearAllMocks
 import io.mockk.every
@@ -104,7 +104,10 @@ open class HabiticaTestCase : TestCase() {
         every { inventoryRepository.getItems(QuestContent::class.java, any()) } returns flowOf(content.quests)
     }
 
-    internal fun <T> loadJsonFile(s: String, type: Type): T {
+    internal fun <T> loadJsonFile(
+        s: String,
+        type: Type,
+    ): T {
         val userStream = javaClass.classLoader?.getResourceAsStream("$s.json")
         return gson.fromJson(gson.newJsonReader(InputStreamReader(userStream)), type)
     }
@@ -132,7 +135,11 @@ open class HabiticaTestCase : TestCase() {
     }
 
     @Suppress("UNCHECKED_CAST")
-    private fun <P, C> assign(it: KCallable<*>, obj: C, value: P) {
+    private fun <P, C> assign(
+        it: KCallable<*>,
+        obj: C,
+        value: P,
+    ) {
         if ((it as KMutableProperty1<C, P>).javaField!!.get(obj) == null) {
             it.set(obj, value)
         }
diff --git a/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/activities/IntroActivityTest.kt b/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/activities/IntroActivityTest.kt
index d6922537f..ec7055559 100644
--- a/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/activities/IntroActivityTest.kt
+++ b/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/activities/IntroActivityTest.kt
@@ -19,7 +19,6 @@ class IntroActivityScreen : Screen<IntroActivityScreen>() {
 @LargeTest
 @RunWith(AndroidJUnit4::class)
 class IntroActivityTest : ActivityTestCase() {
-
     @Rule
     @JvmField
     var mActivityTestRule = ActivityScenarioRule(IntroActivity::class.java)
diff --git a/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/activities/MainActivityTest.kt b/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/activities/MainActivityTest.kt
index 960e5e8e7..584e1dd1e 100644
--- a/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/activities/MainActivityTest.kt
+++ b/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/activities/MainActivityTest.kt
@@ -22,7 +22,6 @@ class MainActivityScreen : Screen<MainActivityScreen>() {
 @LargeTest
 @RunWith(AndroidJUnit4::class)
 class MainActivityTest : ActivityTestCase() {
-
     val screen = MainActivityScreen()
 
     lateinit var scenario: ActivityScenario<MainActivity>
diff --git a/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivityTest.kt b/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivityTest.kt
index fe8ab8314..41d29336e 100644
--- a/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivityTest.kt
+++ b/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivityTest.kt
@@ -48,7 +48,6 @@ class TaskFormScreen : Screen<TaskFormScreen>() {
 @LargeTest
 @RunWith(AndroidJUnit4::class)
 class TaskFormActivityTest : ActivityTestCase() {
-
     val screen = TaskFormScreen()
 
     lateinit var scenario: ActivityScenario<TaskFormActivity>
@@ -297,7 +296,7 @@ class TaskFormActivityTest : ActivityTestCase() {
             }
             KSpinner(
                 builder = { withId(R.id.repeats_every_spinner) },
-                itemTypeBuilder = { itemType(::KSpinnerItem) }
+                itemTypeBuilder = { itemType(::KSpinnerItem) },
             ) perform {
                 open()
                 childAt<KSpinnerItem>(1) {
diff --git a/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/FragmentTestCase.kt b/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/FragmentTestCase.kt
index 3ac657ccb..b3d225790 100644
--- a/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/FragmentTestCase.kt
+++ b/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/FragmentTestCase.kt
@@ -9,13 +9,15 @@ import io.github.kakaocup.kakao.screen.Screen
 import org.junit.Before
 
 abstract class FragmentTestCase<F : Fragment, VB : ViewBinding, S : Screen<S>>(
-    val shouldLaunchFragment: Boolean = true
+    val shouldLaunchFragment: Boolean = true,
 ) : HabiticaTestCase() {
     lateinit var scenario: FragmentScenario<F>
     lateinit var fragment: F
 
     abstract fun makeFragment()
+
     abstract fun launchFragment(args: Bundle? = null)
+
     abstract val screen: S
 
     @Before
diff --git a/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragmentTest.kt b/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragmentTest.kt
index 376fd1236..2602bb61b 100644
--- a/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragmentTest.kt
+++ b/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragmentTest.kt
@@ -23,9 +23,10 @@ class MainItem(parent: Matcher<View>) : KRecyclerItem<MainItem>(parent) {
 }
 
 class NavigationDrawerScreen : Screen<NavigationDrawerScreen>() {
-    val recycler: KRecyclerView = KRecyclerView({
-        withId(R.id.recyclerView)
-    }, itemTypeBuilder = {
+    val recycler: KRecyclerView =
+        KRecyclerView({
+            withId(R.id.recyclerView)
+        }, itemTypeBuilder = {
             itemType(::SectionHeaderItem)
             itemType(::MainItem)
         })
@@ -38,9 +39,10 @@ internal class NavigationDrawerFragmentTest : FragmentTestCase<NavigationDrawerF
     }
 
     override fun launchFragment(args: Bundle?) {
-        scenario = launchFragmentInContainer(args, R.style.MainAppTheme) {
-            return@launchFragmentInContainer fragment
-        }
+        scenario =
+            launchFragmentInContainer(args, R.style.MainAppTheme) {
+                return@launchFragmentInContainer fragment
+            }
     }
 
     override val screen = NavigationDrawerScreen()
diff --git a/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/PartyDetailFragmentTest.kt b/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/PartyDetailFragmentTest.kt
index 82687b6de..19294c839 100644
--- a/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/PartyDetailFragmentTest.kt
+++ b/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/PartyDetailFragmentTest.kt
@@ -50,9 +50,10 @@ class PartyDetailFragmentTest : FragmentTestCase<PartyDetailFragment, FragmentPa
     }
 
     override fun launchFragment(args: Bundle?) {
-        scenario = launchFragmentInContainer(args, R.style.MainAppTheme) {
-            return@launchFragmentInContainer fragment
-        }
+        scenario =
+            launchFragmentInContainer(args, R.style.MainAppTheme) {
+                return@launchFragmentInContainer fragment
+            }
     }
 
     @Test
diff --git a/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/StatsFragmentTest.kt b/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/StatsFragmentTest.kt
index 546b6d618..3f06acd58 100644
--- a/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/StatsFragmentTest.kt
+++ b/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/StatsFragmentTest.kt
@@ -21,32 +21,35 @@ import org.junit.runner.RunWith
 
 class StatsScreen : Screen<StatsScreen>() {
     val strengthStatsView = KView { withId(R.id.strengthStatsView) }
-    val strengthAllocateButton = KButton {
-        withId(R.id.allocateButton)
-        isDescendantOfA { withId(R.id.strengthStatsView) }
-    }
+    val strengthAllocateButton =
+        KButton {
+            withId(R.id.allocateButton)
+            isDescendantOfA { withId(R.id.strengthStatsView) }
+        }
     val intelligenceStatsView = KView { withId(R.id.intelligenceStatsView) }
-    val intelligenceAllocateButton = KButton {
-        withId(R.id.allocateButton)
-        isDescendantOfA { withId(R.id.intelligenceStatsView) }
-    }
+    val intelligenceAllocateButton =
+        KButton {
+            withId(R.id.allocateButton)
+            isDescendantOfA { withId(R.id.intelligenceStatsView) }
+        }
     val constitutionStatsView = KView { withId(R.id.constitutionStatsView) }
-    val constitutionAllocateButton = KButton {
-        withId(R.id.allocateButton)
-        isDescendantOfA { withId(R.id.constitutionStatsView) }
-    }
+    val constitutionAllocateButton =
+        KButton {
+            withId(R.id.allocateButton)
+            isDescendantOfA { withId(R.id.constitutionStatsView) }
+        }
     val perceptionStatsView = KView { withId(R.id.perceptionStatsView) }
-    val perceptionAllocateButton = KButton {
-        withId(R.id.allocateButton)
-        isDescendantOfA { withId(R.id.perceptionStatsView) }
-    }
+    val perceptionAllocateButton =
+        KButton {
+            withId(R.id.allocateButton)
+            isDescendantOfA { withId(R.id.perceptionStatsView) }
+        }
     val bulkAllocateButton = KView { withId(R.id.statsAllocationButton) }
 }
 
 @LargeTest
 @RunWith(AndroidJUnit4::class)
 class StatsFragmentTest : FragmentTestCase<StatsFragment, FragmentStatsBinding, StatsScreen>() {
-
     override val screen = StatsScreen()
 
     override fun makeFragment() {
@@ -55,9 +58,10 @@ class StatsFragmentTest : FragmentTestCase<StatsFragment, FragmentStatsBinding,
     }
 
     override fun launchFragment(args: Bundle?) {
-        scenario = launchFragmentInContainer(args, R.style.MainAppTheme) {
-            return@launchFragmentInContainer fragment
-        }
+        scenario =
+            launchFragmentInContainer(args, R.style.MainAppTheme) {
+                return@launchFragmentInContainer fragment
+            }
     }
 
     @Before
diff --git a/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragmentTest.kt b/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragmentTest.kt
index 8378b4f93..af55ebe0b 100644
--- a/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragmentTest.kt
+++ b/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragmentTest.kt
@@ -34,21 +34,26 @@ private val KTextView.text: CharSequence?
     get() {
         var string: CharSequence? = null
         (
-            this.view.perform(object : ViewAction {
-                override fun getConstraints(): Matcher<View> {
-                    return isA(TextView::class.java)
-                }
+            this.view.perform(
+                object : ViewAction {
+                    override fun getConstraints(): Matcher<View> {
+                        return isA(TextView::class.java)
+                    }
 
-                override fun getDescription(): String {
-                    return "getting text from a TextView"
-                }
+                    override fun getDescription(): String {
+                        return "getting text from a TextView"
+                    }
 
-                override fun perform(uiController: UiController?, view: View?) {
-                    val tv = view as TextView
-                    string = tv.text
-                }
-            })
+                    override fun perform(
+                        uiController: UiController?,
+                        view: View?,
+                    ) {
+                        val tv = view as TextView
+                        string = tv.text
+                    }
+                },
             )
+        )
         return string
     }
 
@@ -58,9 +63,10 @@ class ItemItem(parent: Matcher<View>) : KRecyclerItem<ItemItem>(parent) {
 }
 
 class ItemScreen : Screen<ItemScreen>() {
-    val recycler: KRecyclerView = KRecyclerView({
-        withId(R.id.recyclerView)
-    }, itemTypeBuilder = {
+    val recycler: KRecyclerView =
+        KRecyclerView({
+            withId(R.id.recyclerView)
+        }, itemTypeBuilder = {
             itemType(::ItemItem)
         })
 }
@@ -78,9 +84,10 @@ internal class ItemRecyclerFragmentTest : FragmentTestCase<ItemRecyclerFragment,
     }
 
     override fun launchFragment(args: Bundle?) {
-        scenario = launchFragmentInContainer(args, R.style.MainAppTheme) {
-            return@launchFragmentInContainer fragment
-        }
+        scenario =
+            launchFragmentInContainer(args, R.style.MainAppTheme) {
+                return@launchFragmentInContainer fragment
+            }
     }
 
     override val screen = ItemScreen()
diff --git a/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailFragmentTest.kt b/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailFragmentTest.kt
index fc8e9a6ab..4f6eb911b 100644
--- a/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailFragmentTest.kt
+++ b/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailFragmentTest.kt
@@ -21,9 +21,10 @@ import kotlinx.coroutines.flow.flowOf
 import org.junit.Test
 
 class PetDetailScreen : Screen<PetDetailScreen>() {
-    val recycler: KRecyclerView = KRecyclerView({
-        withId(R.id.recyclerView)
-    }, itemTypeBuilder = {
+    val recycler: KRecyclerView =
+        KRecyclerView({
+            withId(R.id.recyclerView)
+        }, itemTypeBuilder = {
             itemType(::SectionItem)
             itemType(::PetItem)
         })
@@ -37,23 +38,25 @@ internal class PetDetailRecyclerFragmentTest :
         every { inventoryRepository.getOwnedItems("food") } returns flowOf(user.items?.food!!.filter { it.numberOwned > 0 })
         val saddle = OwnedItem()
         saddle.numberOwned = 1
-        every { inventoryRepository.getOwnedItems(true) } returns flowOf(
-            mapOf(
-                Pair(
-                    "Saddle-food",
-                    saddle
-                )
+        every { inventoryRepository.getOwnedItems(true) } returns
+            flowOf(
+                mapOf(
+                    Pair(
+                        "Saddle-food",
+                        saddle,
+                    ),
+                ),
             )
-        )
 
         fragment = spyk()
         fragment.shouldInitializeComponent = false
     }
 
     override fun launchFragment(args: Bundle?) {
-        scenario = launchFragmentInContainer(args, R.style.MainAppTheme) {
-            return@launchFragmentInContainer fragment
-        }
+        scenario =
+            launchFragmentInContainer(args, R.style.MainAppTheme) {
+                return@launchFragmentInContainer fragment
+            }
     }
 
     override val screen = PetDetailScreen()
@@ -66,18 +69,18 @@ internal class PetDetailRecyclerFragmentTest :
             inventoryRepository.getPets(
                 any(),
                 any(),
-                any()
+                any(),
             )
         } returns flowOf(content.pets.filter { it.animal == "Cactus" })
         every {
             inventoryRepository.getMounts(
                 any(),
                 any(),
-                any()
+                any(),
             )
         } returns flowOf(content.mounts.filter { it.animal == "Cactus" })
         launchFragment(
-            PetDetailRecyclerFragmentArgs.Builder("cactus", "drop", "").build().toBundle()
+            PetDetailRecyclerFragmentArgs.Builder("cactus", "drop", "").build().toBundle(),
         )
         screen {
             recycler {
@@ -99,14 +102,14 @@ internal class PetDetailRecyclerFragmentTest :
             inventoryRepository.getPets(
                 any(),
                 any(),
-                any()
+                any(),
             )
         } returns flowOf(content.pets.filter { it.animal == "Fox" })
         every {
             inventoryRepository.getMounts(
                 any(),
                 any(),
-                any()
+                any(),
             )
         } returns flowOf(content.mounts.filter { it.animal == "Fox" })
         launchFragment(PetDetailRecyclerFragmentArgs.Builder("fox", "drop", "").build().toBundle())
diff --git a/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragmentTest.kt b/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragmentTest.kt
index 5cfd1e1eb..10e189d5a 100644
--- a/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragmentTest.kt
+++ b/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragmentTest.kt
@@ -5,8 +5,8 @@ import android.view.View
 import androidx.fragment.app.testing.launchFragmentInContainer
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.FragmentRecyclerviewBinding
-import com.habitrpg.common.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.ui.fragments.FragmentTestCase
+import com.habitrpg.common.habitica.helpers.MainNavigationController
 import io.github.kakaocup.kakao.common.views.KView
 import io.github.kakaocup.kakao.recycler.KRecyclerItem
 import io.github.kakaocup.kakao.recycler.KRecyclerView
@@ -30,9 +30,10 @@ class SectionItem(parent: Matcher<View>) : KRecyclerItem<PetItem>(parent) {
 }
 
 class StableScreen : Screen<StableScreen>() {
-    val recycler: KRecyclerView = KRecyclerView({
-        withId(R.id.recyclerView)
-    }, itemTypeBuilder = {
+    val recycler: KRecyclerView =
+        KRecyclerView({
+            withId(R.id.recyclerView)
+        }, itemTypeBuilder = {
             itemType(::SectionItem)
             itemType(::PetItem)
         })
@@ -48,9 +49,10 @@ internal class StableRecyclerFragmentTest : FragmentTestCase<StableRecyclerFragm
     }
 
     override fun launchFragment(args: Bundle?) {
-        scenario = launchFragmentInContainer(args, R.style.MainAppTheme) {
-            return@launchFragmentInContainer fragment
-        }
+        scenario =
+            launchFragmentInContainer(args, R.style.MainAppTheme) {
+                return@launchFragmentInContainer fragment
+            }
     }
 
     override val screen = StableScreen()
diff --git a/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/purchases/GemsPurchaseFragmentTest.kt b/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/purchases/GemsPurchaseFragmentTest.kt
deleted file mode 100644
index cef82017e..000000000
--- a/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/purchases/GemsPurchaseFragmentTest.kt
+++ /dev/null
@@ -1,143 +0,0 @@
-package com.habitrpg.android.habitica.ui.fragments.purchases
-
-/*
-class GemPurchaseScreen: Screen<GemPurchaseScreen>() {
-    val gems4View = KView { withId(R.id.gems_4_view) }
-    val gems4Button = KTextView {
-        withId(R.id.purchase_button)
-        isDescendantOfA { withId(R.id.gems_4_view) }
-    }
-    val gems21View = KView { withId(R.id.gems_21_view) }
-    val gems21Button = KTextView {
-        withId(R.id.purchase_button)
-        isDescendantOfA { withId(R.id.gems_21_view) }
-    }
-    val gems42View = KView { withId(R.id.gems_42_view) }
-    val gems42Button = KTextView {
-        withId(R.id.purchase_button)
-        isDescendantOfA { withId(R.id.gems_42_view) }
-    }
-    val gems84View = KView { withId(R.id.gems_84_view) }
-    val gems84Button = KTextView {
-        withId(R.id.purchase_button)
-        isDescendantOfA {  withId(R.id.gems_84_view) }
-    }
-}
-
-@LargeTest
-@RunWith(AndroidJUnit4::class)
-class GemsPurchaseFragmentTest :
-    FragmentTestCase<GemsPurchaseFragment, FragmentGemPurchaseBinding, GemPurchaseScreen>() {
-
-    private lateinit var gemSkuMock: MockKAdditionalAnswerScope<List<Sku>, List<Sku>>
-    private var purchaseHandler: PurchaseHandler = mockk(relaxed = true)
-
-    override val screen = GemPurchaseScreen()
-
-    private fun makeTestSKU(
-        product: String,
-        code: String,
-        price: Long,
-        title: String,
-        description: String
-    ): Sku {
-        return Sku(
-            product,
-            code,
-            "$${price}",
-            Sku.Price(price, ""),
-            title,
-            description,
-            "",
-            Sku.Price(10L, ""),
-            "",
-            "",
-            "",
-            0
-        )
-    }
-
-    override fun makeFragment() {
-        gemSkuMock = coEvery { purchaseHandler.getAllGemSKUs() } returns listOf(
-            makeTestSKU("4Gems", PurchaseTypes.Purchase4Gems, 99, "4 Gems", "smol amount of gems"),
-            makeTestSKU("21Gems", PurchaseTypes.Purchase21Gems, 499, "21 Gems", "medium amount of gems"),
-            makeTestSKU("42Gems", PurchaseTypes.Purchase42Gems, 999, "42 Gems", "lorge amount of gems"),
-            makeTestSKU("84Gems", PurchaseTypes.Purchase84Gems, 1999, "84 Gems", "huge amount of gems")
-        )
-
-        scenario = launchFragmentInContainer(null, R.style.MainAppTheme) {
-            fragment = spyk()
-            fragment.shouldInitializeComponent = false
-            fragment.userRepository = userRepository
-            fragment.tutorialRepository = tutorialRepository
-            fragment.appConfigManager = appConfigManager
-            fragment.setPurchaseHandler(purchaseHandler)
-            return@launchFragmentInContainer fragment
-        }
-    }
-
-    @Test
-    fun displaysGemOptions() {
-        screen {
-            fragment.setupCheckout()
-            gems4View.hasDescendant { withText("4") }
-            gems4View.hasDescendant { withText("$99") }
-            gems21View.hasDescendant { withText("21") }
-            gems21View.hasDescendant { withText("$499") }
-            gems42View.hasDescendant { withText("42") }
-            gems42View.hasDescendant { withText("$999") }
-            gems84View.hasDescendant { withText("84") }
-            gems84View.hasDescendant { withText("$1999") }
-        }
-    }
-
-    @Test
-    fun callsCorrectPurchaseFunction() {
-        screen {
-            fragment.setupCheckout()
-            gems4Button.click()
-            verify(exactly = 1) { purchaseHandler.purchaseGems(PurchaseTypes.Purchase4Gems) }
-
-            gems21Button.click()
-            verify(exactly = 1) { purchaseHandler.purchaseGems(PurchaseTypes.Purchase21Gems) }
-
-            gems42Button.click()
-            verify(exactly = 1) { purchaseHandler.purchaseGems(PurchaseTypes.Purchase42Gems) }
-
-            gems84Button.click()
-            verify(exactly = 1) { purchaseHandler.purchaseGems(PurchaseTypes.Purchase84Gems) }
-        }
-    }
-
-    @Test
-    fun disablesButtonsWithoutData() {
-        gemSkuMock = coEvery { purchaseHandler.getAllGemSKUs() } returns emptyList()
-        screen {
-            fragment.setupCheckout()
-            gems4Button.click()
-            gems21Button.click()
-            gems42Button.click()
-            gems84Button.click()
-            verify(exactly = 0) { purchaseHandler.purchaseGems(any()) }
-        }
-    }
-
-    @Test
-    fun displaysSubscriptionBannerForUnsubscribed() {
-        screen {
-            subscriptionPromo.isVisible()
-            subscriptionPromoButton.isClickable()
-        }
-    }
-
-    @Test
-    fun hidesSubscriptionBannerForSubscribed() {
-        user.purchased = Purchases()
-        user.purchased?.plan = SubscriptionPlan()
-        user.purchased?.plan?.customerId = "plan"
-        userSubject.onNext(user)
-        screen {
-            subscriptionPromo.isGone()
-        }
-    }
-}*/
diff --git a/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragmentTest.kt b/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragmentTest.kt
deleted file mode 100644
index 6790afd44..000000000
--- a/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragmentTest.kt
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.habitrpg.android.habitica.ui.fragments.purchases
-
-/*
-
-class SubscriptionScreen: Screen<SubscriptionScreen>() {
-    val sub1MonthView = KView { withId(R.id.subscription1month) }
-    val sub3MonthView = KView { withId(R.id.subscription3month) }
-    val sub6MonthView = KView { withId(R.id.subscription6month) }
-    val sub12MonthView = KView { withId(R.id.subscription12month) }
-    val subscribeButton = KView { withId(R.id.subscribeButton) }
-    val subscriptionDetails = KView { withId(R.id.subscriptionDetails) }
-}
-
-@LargeTest
-@RunWith(AndroidJUnit4::class)
-class SubscriptionFragmentTest :
-    FragmentTestCase<SubscriptionFragment, FragmentSubscriptionBinding, SubscriptionScreen>() {
-    private lateinit var subSkuMock: MockKAdditionalAnswerScope<Inventory.Product?, Inventory.Product?>
-    private var purchaseHandler: PurchaseHandler = mockk(relaxed = true)
-
-    private fun makeTestSKU(
-        product: String,
-        code: String,
-        price: Long,
-        title: String,
-        description: String
-    ): Sku {
-        return Sku(
-            product,
-            code,
-            "$${price}",
-            Sku.Price(price, ""),
-            title,
-            description,
-            "",
-            Sku.Price(10L, ""),
-            "",
-            "",
-            "",
-            0
-        )
-    }
-
-    override fun makeFragment() {
-        subSkuMock = coEvery { purchaseHandler.getAllSubscriptionProducts() } answers {
-            val product = mockk<Inventory.Product>()
-            every { product.skus } returns listOf(
-                makeTestSKU("1Month", PurchaseTypes.Subscription1Month, 99, "1 Month", "smol amount of gems"),
-                makeTestSKU("3Month", PurchaseTypes.Subscription3Month, 499, "3 Months", "medium amount of gems"),
-                makeTestSKU("6Month", PurchaseTypes.Subscription6Month, 999, "6 Months", "lorge amount of gems"),
-                makeTestSKU("12Month", PurchaseTypes.Subscription12Month, 1999, "12 Months", "huge amount of gems")
-            )
-            product
-        }
-
-        scenario = launchFragmentInContainer(null, R.style.MainAppTheme) {
-            fragment = spyk()
-            fragment.shouldInitializeComponent = false
-            fragment.userRepository = userRepository
-            fragment.inventoryRepository = inventoryRepository
-            fragment.tutorialRepository = tutorialRepository
-            fragment.appConfigManager = appConfigManager
-            fragment.setPurchaseHandler(purchaseHandler)
-            return@launchFragmentInContainer fragment
-        }
-    }
-
-    override val screen = SubscriptionScreen()
-
-    @Test
-    fun showsSubscriptionOptions() {
-        fragment.setupCheckout()
-        screen {
-            sub1MonthView.isVisible()
-            sub1MonthView.hasDescendant { withText("1 Month") }
-            sub3MonthView.isVisible()
-            sub3MonthView.hasDescendant { withText("3 Months") }
-            sub6MonthView.isVisible()
-            sub6MonthView.hasDescendant { withText("6 Months") }
-            sub12MonthView.isVisible()
-            sub12MonthView.hasDescendant { withText("12 Months") }
-        }
-    }
-}*/
diff --git a/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragmentTest.kt b/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragmentTest.kt
index 9bda37f92..874ef2254 100644
--- a/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragmentTest.kt
+++ b/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragmentTest.kt
@@ -28,15 +28,15 @@ open class TaskItem(val parent: Matcher<View>) : KRecyclerItem<TaskItem>(parent)
 }
 
 class TaskListScreen : Screen<TaskListScreen>() {
-    val recycler: KRecyclerView = KRecyclerView({
-        withId(R.id.recyclerView)
-    }, itemTypeBuilder = {
+    val recycler: KRecyclerView =
+        KRecyclerView({
+            withId(R.id.recyclerView)
+        }, itemTypeBuilder = {
             itemType(::TaskItem)
         })
 }
 
 internal class TaskRecyclerViewFragmentTest : FragmentTestCase<TaskRecyclerViewFragment, FragmentRefreshRecyclerviewBinding, TaskListScreen>(false) {
-
     lateinit var tasks: MutableCollection<Task>
 
     override fun makeFragment() {
@@ -46,9 +46,10 @@ internal class TaskRecyclerViewFragmentTest : FragmentTestCase<TaskRecyclerViewF
     }
 
     override fun launchFragment(args: Bundle?) {
-        scenario = launchFragmentInContainer(args, R.style.MainAppTheme) {
-            return@launchFragmentInContainer fragment
-        }
+        scenario =
+            launchFragmentInContainer(args, R.style.MainAppTheme) {
+                return@launchFragmentInContainer fragment
+            }
     }
 
     override val screen = TaskListScreen()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt
index 014eebd73..9db984e3c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt
@@ -1,328 +1,342 @@
-package com.habitrpg.android.habitica
-
-import android.app.Activity
-import android.app.Application
-import android.content.Context
-import android.content.Intent
-import android.content.SharedPreferences
-import android.content.pm.PackageInfo
-import android.content.pm.PackageManager
-import android.content.res.Configuration
-import android.content.res.Resources
-import android.database.DatabaseErrorHandler
-import android.database.sqlite.SQLiteDatabase
-import android.os.Build
-import android.os.Build.VERSION.SDK_INT
-import android.os.Bundle
-import android.util.Log
-import androidx.appcompat.app.AppCompatDelegate
-import androidx.core.content.edit
-import androidx.lifecycle.DefaultLifecycleObserver
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.ProcessLifecycleOwner
-import androidx.preference.PreferenceManager
-import com.google.android.gms.wearable.Wearable
-import com.google.firebase.installations.FirebaseInstallations
-import com.google.firebase.remoteconfig.FirebaseRemoteConfig
-import com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings
-import com.gu.toolargetool.TooLargeTool
-import com.habitrpg.android.habitica.data.ApiClient
-import com.habitrpg.android.habitica.extensions.DateUtils
-import com.habitrpg.android.habitica.helpers.AdHandler
-import com.habitrpg.android.habitica.helpers.Analytics
-import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManager
-import com.habitrpg.android.habitica.modules.AuthenticationHandler
-import com.habitrpg.android.habitica.ui.activities.BaseActivity
-import com.habitrpg.android.habitica.ui.activities.LoginActivity
-import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import com.habitrpg.common.habitica.extensions.setupCoil
-import com.habitrpg.common.habitica.helpers.ExceptionHandler
-import com.habitrpg.common.habitica.helpers.LanguageHelper
-import com.habitrpg.common.habitica.helpers.MarkdownParser
-import com.habitrpg.common.habitica.helpers.launchCatching
-import dagger.hilt.android.HiltAndroidApp
-import io.realm.Realm
-import io.realm.RealmConfiguration
-import kotlinx.coroutines.MainScope
-import java.lang.ref.WeakReference
-import java.util.Date
-import javax.inject.Inject
-
-class ApplicationLifecycleTracker(private val sharedPreferences: SharedPreferences): DefaultLifecycleObserver {
-    private var lastResumeTime = 0L
-    override fun onResume(owner : LifecycleOwner) {
-        super.onResume(owner)
-        lastResumeTime = Date().time
-    }
-
-    override fun onPause(owner : LifecycleOwner) {
-        super.onPause(owner)
-        val duration = Date().time - lastResumeTime
-        addDurationToDay(duration / 1000)
-    }
-
-    private fun addDurationToDay(duration: Long) {
-        var currentTotal = sharedPreferences.getLong("usage_time_total", 0L)
-        currentTotal += duration
-        var currentDay = Date()
-        if (sharedPreferences.contains("usage_time_day")) {
-            currentDay = Date(sharedPreferences.getLong("usage_time_day", 0L))
-        }
-        var current = sharedPreferences.getLong("usage_time_current", 0L)
-        if (!DateUtils.isSameDay(currentDay, Date())) {
-            var average = sharedPreferences.getLong("usage_time_daily_average", 0L)
-            var observedDays = sharedPreferences.getInt("usage_time_day_count", 0)
-            average = ((average * observedDays) + current) / (observedDays + 1)
-            sharedPreferences.edit {
-                putInt("usage_time_day_count", ++observedDays)
-                putLong("usage_time_daily_average", average)
-            }
-            Analytics.setUserProperty("usage_time_daily_average", average)
-            Analytics.setUserProperty("usage_time_total", currentTotal)
-            current = 0
-            currentDay = Date()
-        }
-        current += duration
-        sharedPreferences.edit {
-            putLong("usage_time_current", current)
-            putLong("usage_time_total", currentTotal)
-            putLong("usage_time_day", currentDay.time)
-        }
-    }
-}
-
-@HiltAndroidApp
-abstract class HabiticaBaseApplication : Application(), Application.ActivityLifecycleCallbacks {
-    @Inject
-    internal lateinit var lazyApiHelper: ApiClient
-
-    @Inject
-    internal lateinit var sharedPrefs: SharedPreferences
-
-    @Inject
-    internal lateinit var pushNotificationManager: PushNotificationManager
-
-    @Inject
-    internal lateinit var authenticationHandler: AuthenticationHandler
-
-    private lateinit var lifecycleTracker: ApplicationLifecycleTracker
-
-    /**
-     * For better performance billing class should be used as singleton
-     */
-    // endregion
-
-    override fun onCreate() {
-        super.onCreate()
-
-        lifecycleTracker = ApplicationLifecycleTracker(sharedPrefs)
-        ProcessLifecycleOwner.get().lifecycle.addObserver(lifecycleTracker)
-
-        if (!BuildConfig.DEBUG) {
-            TooLargeTool.startLogging(this)
-            try {
-                Analytics.initialize(this)
-            } catch (ignored: Resources.NotFoundException) {
-            }
-            Analytics.identify(sharedPrefs)
-            Analytics.setUserID(lazyApiHelper.hostConfig.userID)
-        }
-        registerActivityLifecycleCallbacks(this)
-        setupRealm()
-        setLocale()
-        setupRemoteConfig()
-        setupNotifications()
-        setupAdHandler()
-        HabiticaIconsHelper.init(this)
-        MarkdownParser.setup(this)
-        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
-
-        setupCoil()
-
-        ExceptionHandler.init {
-            Analytics.logException(it)
-        }
-
-        Analytics.setUserProperty("app_testing_level", BuildConfig.TESTING_LEVEL)
-
-        checkIfNewVersion()
-    }
-
-
-    private fun setupAdHandler() {
-        AdHandler.setup(sharedPrefs)
-    }
-
-    private fun setLocale() {
-        val resources = resources
-        val configuration: Configuration = resources.configuration
-        val languageHelper = LanguageHelper(sharedPrefs.getString("language", "en"))
-        if (if (SDK_INT >= Build.VERSION_CODES.N) {
-            configuration.locales.isEmpty || configuration.locales[0] != languageHelper.locale
-        } else {
-                @Suppress("DEPRECATION")
-                configuration.locale != languageHelper.locale
-            }
-        ) {
-            configuration.setLocale(languageHelper.locale)
-            resources.updateConfiguration(configuration, null)
-        }
-    }
-
-    protected open fun setupRealm() {
-        Realm.init(this)
-        val builder = RealmConfiguration.Builder()
-            .schemaVersion(1)
-            .deleteRealmIfMigrationNeeded()
-            .allowWritesOnUiThread(true)
-            .compactOnLaunch { totalBytes, usedBytes ->
-                // Compact if the file is over 100MB in size and less than 50% 'used'
-                val oneHundredMB = 50 * 1024 * 1024
-                (totalBytes > oneHundredMB) && (usedBytes / totalBytes) < 0.5
-            }
-        try {
-            Realm.setDefaultConfiguration(builder.build())
-        } catch (ignored: UnsatisfiedLinkError) {
-            // Catch crash in tests
-        }
-    }
-
-    private fun checkIfNewVersion() {
-        var info: PackageInfo? = null
-        try {
-            info = packageManager.getPackageInfo(packageName, 0)
-        } catch (e: PackageManager.NameNotFoundException) {
-            Log.e("MyApplication", "couldn't get package info!")
-        }
-
-        if (info == null) {
-            return
-        }
-
-        val lastInstalledVersion = sharedPrefs.getInt("last_installed_version", 0)
-        @Suppress("DEPRECATION")
-        if (lastInstalledVersion < info.versionCode) {
-            @Suppress("DEPRECATION")
-            sharedPrefs.edit {
-                putInt("last_installed_version", info.versionCode)
-            }
-        }
-    }
-
-    override fun openOrCreateDatabase(
-        name: String,
-        mode: Int,
-        factory: SQLiteDatabase.CursorFactory?
-    ): SQLiteDatabase {
-        return super.openOrCreateDatabase(getDatabasePath(name).absolutePath, mode, factory)
-    }
-
-    override fun openOrCreateDatabase(
-        name: String,
-        mode: Int,
-        factory: SQLiteDatabase.CursorFactory?,
-        errorHandler: DatabaseErrorHandler?
-    ): SQLiteDatabase {
-        return super.openOrCreateDatabase(getDatabasePath(name).absolutePath, mode, factory, errorHandler)
-    }
-
-    // endregion
-
-    // region IAP - Specific
-
-    override fun deleteDatabase(name: String): Boolean {
-        val realm = Realm.getDefaultInstance()
-        realm.executeTransaction { realm1 ->
-            realm1.deleteAll()
-            realm1.close()
-        }
-        return true
-    }
-
-    private fun setupRemoteConfig() {
-        val remoteConfig = FirebaseRemoteConfig.getInstance()
-        val configSettings = FirebaseRemoteConfigSettings.Builder()
-            .setMinimumFetchIntervalInSeconds(if (BuildConfig.DEBUG) 0 else 3600)
-            .build()
-        remoteConfig.setConfigSettingsAsync(configSettings)
-        remoteConfig.setDefaultsAsync(R.xml.remote_config_defaults)
-        remoteConfig.fetchAndActivate()
-    }
-
-    private fun setupNotifications() {
-        FirebaseInstallations.getInstance().id.addOnCompleteListener { task ->
-            if (!task.isSuccessful) {
-                Log.w("Token", "getInstanceId failed", task.exception)
-                return@addOnCompleteListener
-            }
-            val token = task.result
-            if (BuildConfig.DEBUG) {
-                Log.d("Token", "Firebase Notification Token: $token")
-            }
-        }
-    }
-
-    var currentActivity: WeakReference<BaseActivity>? = null
-
-    override fun onActivityResumed(activity: Activity) {
-        currentActivity = WeakReference(activity as? BaseActivity)
-    }
-
-    override fun onActivityStarted(activity: Activity) {
-        currentActivity = WeakReference(activity as? BaseActivity)
-    }
-
-    override fun onActivityPaused(activity: Activity) {
-        if (currentActivity?.get() == activity) {
-            currentActivity = null
-        }
-    }
-
-    override fun onActivityCreated(p0: Activity, p1: Bundle?) {
-    }
-
-    override fun onActivityDestroyed(p0: Activity) {
-    }
-
-    override fun onActivitySaveInstanceState(p0: Activity, p1: Bundle) {
-    }
-
-    override fun onActivityStopped(p0: Activity) {
-    }
-
-    companion object {
-        fun getInstance(context: Context): HabiticaBaseApplication? {
-            return context.applicationContext as? HabiticaBaseApplication
-        }
-
-        fun logout(context: Context) {
-            MainScope().launchCatching {
-                getInstance(context)?.pushNotificationManager?.removePushDeviceUsingStoredToken()
-                val realm = Realm.getDefaultInstance()
-                getInstance(context)?.deleteDatabase(realm.path)
-                realm.close()
-                val preferences = PreferenceManager.getDefaultSharedPreferences(context)
-                val useReminder = preferences.getBoolean("use_reminder", false)
-                val reminderTime = preferences.getString("reminder_time", "19:00")
-                val lightMode = preferences.getString("theme_mode", "system")
-                val launchScreen = preferences.getString("launch_screen", "")
-                preferences.edit {
-                    clear()
-                    putBoolean("use_reminder", useReminder)
-                    putString("reminder_time", reminderTime)
-                    putString("theme_mode", lightMode)
-                    putString("launch_screen", launchScreen)
-                }
-                getInstance(context)?.lazyApiHelper?.updateAuthenticationCredentials(null, null)
-                Wearable.getCapabilityClient(context).removeLocalCapability("provide_auth")
-                startActivity(LoginActivity::class.java, context)
-            }
-        }
-
-        private fun startActivity(activityClass: Class<*>, context: Context) {
-            val intent = Intent(context, activityClass)
-            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK)
-            context.startActivity(intent)
-        }
-    }
-}
+package com.habitrpg.android.habitica
+
+import android.app.Activity
+import android.app.Application
+import android.content.Context
+import android.content.Intent
+import android.content.SharedPreferences
+import android.content.pm.PackageInfo
+import android.content.pm.PackageManager
+import android.content.res.Configuration
+import android.content.res.Resources
+import android.database.DatabaseErrorHandler
+import android.database.sqlite.SQLiteDatabase
+import android.os.Build
+import android.os.Build.VERSION.SDK_INT
+import android.os.Bundle
+import android.util.Log
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.core.content.edit
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.ProcessLifecycleOwner
+import androidx.preference.PreferenceManager
+import com.google.android.gms.wearable.Wearable
+import com.google.firebase.installations.FirebaseInstallations
+import com.google.firebase.remoteconfig.FirebaseRemoteConfig
+import com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings
+import com.gu.toolargetool.TooLargeTool
+import com.habitrpg.android.habitica.data.ApiClient
+import com.habitrpg.android.habitica.extensions.DateUtils
+import com.habitrpg.android.habitica.helpers.AdHandler
+import com.habitrpg.android.habitica.helpers.Analytics
+import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManager
+import com.habitrpg.android.habitica.modules.AuthenticationHandler
+import com.habitrpg.android.habitica.ui.activities.BaseActivity
+import com.habitrpg.android.habitica.ui.activities.LoginActivity
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
+import com.habitrpg.common.habitica.extensions.setupCoil
+import com.habitrpg.common.habitica.helpers.ExceptionHandler
+import com.habitrpg.common.habitica.helpers.LanguageHelper
+import com.habitrpg.common.habitica.helpers.MarkdownParser
+import com.habitrpg.common.habitica.helpers.launchCatching
+import dagger.hilt.android.HiltAndroidApp
+import io.realm.Realm
+import io.realm.RealmConfiguration
+import kotlinx.coroutines.MainScope
+import java.lang.ref.WeakReference
+import java.util.Date
+import javax.inject.Inject
+
+class ApplicationLifecycleTracker(private val sharedPreferences: SharedPreferences) :
+    DefaultLifecycleObserver {
+    private var lastResumeTime = 0L
+
+    override fun onResume(owner: LifecycleOwner) {
+        super.onResume(owner)
+        lastResumeTime = Date().time
+    }
+
+    override fun onPause(owner: LifecycleOwner) {
+        super.onPause(owner)
+        val duration = Date().time - lastResumeTime
+        addDurationToDay(duration / 1000)
+    }
+
+    private fun addDurationToDay(duration: Long) {
+        var currentTotal = sharedPreferences.getLong("usage_time_total", 0L)
+        currentTotal += duration
+        var currentDay = Date()
+        if (sharedPreferences.contains("usage_time_day")) {
+            currentDay = Date(sharedPreferences.getLong("usage_time_day", 0L))
+        }
+        var current = sharedPreferences.getLong("usage_time_current", 0L)
+        if (!DateUtils.isSameDay(currentDay, Date())) {
+            var average = sharedPreferences.getLong("usage_time_daily_average", 0L)
+            var observedDays = sharedPreferences.getInt("usage_time_day_count", 0)
+            average = ((average * observedDays) + current) / (observedDays + 1)
+            sharedPreferences.edit {
+                putInt("usage_time_day_count", ++observedDays)
+                putLong("usage_time_daily_average", average)
+            }
+            Analytics.setUserProperty("usage_time_daily_average", average)
+            Analytics.setUserProperty("usage_time_total", currentTotal)
+            current = 0
+            currentDay = Date()
+        }
+        current += duration
+        sharedPreferences.edit {
+            putLong("usage_time_current", current)
+            putLong("usage_time_total", currentTotal)
+            putLong("usage_time_day", currentDay.time)
+        }
+    }
+}
+
+@HiltAndroidApp
+abstract class HabiticaBaseApplication : Application(), Application.ActivityLifecycleCallbacks {
+    @Inject
+    internal lateinit var lazyApiHelper: ApiClient
+
+    @Inject
+    internal lateinit var sharedPrefs: SharedPreferences
+
+    @Inject
+    internal lateinit var pushNotificationManager: PushNotificationManager
+
+    @Inject
+    internal lateinit var authenticationHandler: AuthenticationHandler
+
+    private lateinit var lifecycleTracker: ApplicationLifecycleTracker
+
+    // endregion
+
+    override fun onCreate() {
+        super.onCreate()
+
+        lifecycleTracker = ApplicationLifecycleTracker(sharedPrefs)
+        ProcessLifecycleOwner.get().lifecycle.addObserver(lifecycleTracker)
+
+        if (!BuildConfig.DEBUG) {
+            TooLargeTool.startLogging(this)
+            try {
+                Analytics.initialize(this)
+            } catch (ignored: Resources.NotFoundException) {
+            }
+            Analytics.identify(sharedPrefs)
+            Analytics.setUserID(lazyApiHelper.hostConfig.userID)
+        }
+        registerActivityLifecycleCallbacks(this)
+        setupRealm()
+        setLocale()
+        setupRemoteConfig()
+        setupNotifications()
+        setupAdHandler()
+        HabiticaIconsHelper.init(this)
+        MarkdownParser.setup(this)
+        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
+
+        setupCoil()
+
+        ExceptionHandler.init {
+            Analytics.logException(it)
+        }
+
+        Analytics.setUserProperty("app_testing_level", BuildConfig.TESTING_LEVEL)
+
+        checkIfNewVersion()
+    }
+
+    private fun setupAdHandler() {
+        AdHandler.setup(sharedPrefs)
+    }
+
+    private fun setLocale() {
+        val resources = resources
+        val configuration: Configuration = resources.configuration
+        val languageHelper = LanguageHelper(sharedPrefs.getString("language", "en"))
+        if (if (SDK_INT >= Build.VERSION_CODES.N) {
+                configuration.locales.isEmpty || configuration.locales[0] != languageHelper.locale
+            } else {
+                @Suppress("DEPRECATION")
+                configuration.locale != languageHelper.locale
+            }
+        ) {
+            configuration.setLocale(languageHelper.locale)
+            resources.updateConfiguration(configuration, null)
+        }
+    }
+
+    protected open fun setupRealm() {
+        Realm.init(this)
+        val builder =
+            RealmConfiguration.Builder()
+                .schemaVersion(1)
+                .deleteRealmIfMigrationNeeded()
+                .allowWritesOnUiThread(true)
+                .compactOnLaunch { totalBytes, usedBytes ->
+                    // Compact if the file is over 100MB in size and less than 50% 'used'
+                    val oneHundredMB = 50 * 1024 * 1024
+                    (totalBytes > oneHundredMB) && (usedBytes / totalBytes) < 0.5
+                }
+        try {
+            Realm.setDefaultConfiguration(builder.build())
+        } catch (ignored: UnsatisfiedLinkError) {
+            // Catch crash in tests
+        }
+    }
+
+    private fun checkIfNewVersion() {
+        var info: PackageInfo? = null
+        try {
+            info = packageManager.getPackageInfo(packageName, 0)
+        } catch (e: PackageManager.NameNotFoundException) {
+            Log.e("MyApplication", "couldn't get package info!")
+        }
+
+        if (info == null) {
+            return
+        }
+
+        val lastInstalledVersion = sharedPrefs.getInt("last_installed_version", 0)
+        @Suppress("DEPRECATION")
+        if (lastInstalledVersion < info.versionCode) {
+            @Suppress("DEPRECATION")
+            sharedPrefs.edit {
+                putInt("last_installed_version", info.versionCode)
+            }
+        }
+    }
+
+    override fun openOrCreateDatabase(
+        name: String,
+        mode: Int,
+        factory: SQLiteDatabase.CursorFactory?,
+    ): SQLiteDatabase {
+        return super.openOrCreateDatabase(getDatabasePath(name).absolutePath, mode, factory)
+    }
+
+    override fun openOrCreateDatabase(
+        name: String,
+        mode: Int,
+        factory: SQLiteDatabase.CursorFactory?,
+        errorHandler: DatabaseErrorHandler?,
+    ): SQLiteDatabase {
+        return super.openOrCreateDatabase(
+            getDatabasePath(name).absolutePath,
+            mode,
+            factory,
+            errorHandler,
+        )
+    }
+
+    // endregion
+
+    // region IAP - Specific
+
+    override fun deleteDatabase(name: String): Boolean {
+        val realm = Realm.getDefaultInstance()
+        realm.executeTransaction { realm1 ->
+            realm1.deleteAll()
+            realm1.close()
+        }
+        return true
+    }
+
+    private fun setupRemoteConfig() {
+        val remoteConfig = FirebaseRemoteConfig.getInstance()
+        val configSettings =
+            FirebaseRemoteConfigSettings.Builder()
+                .setMinimumFetchIntervalInSeconds(if (BuildConfig.DEBUG) 0 else 3600)
+                .build()
+        remoteConfig.setConfigSettingsAsync(configSettings)
+        remoteConfig.setDefaultsAsync(R.xml.remote_config_defaults)
+        remoteConfig.fetchAndActivate()
+    }
+
+    private fun setupNotifications() {
+        FirebaseInstallations.getInstance().id.addOnCompleteListener { task ->
+            if (!task.isSuccessful) {
+                Log.w("Token", "getInstanceId failed", task.exception)
+                return@addOnCompleteListener
+            }
+            val token = task.result
+            if (BuildConfig.DEBUG) {
+                Log.d("Token", "Firebase Notification Token: $token")
+            }
+        }
+    }
+
+    var currentActivity: WeakReference<BaseActivity>? = null
+
+    override fun onActivityResumed(activity: Activity) {
+        currentActivity = WeakReference(activity as? BaseActivity)
+    }
+
+    override fun onActivityStarted(activity: Activity) {
+        currentActivity = WeakReference(activity as? BaseActivity)
+    }
+
+    override fun onActivityPaused(activity: Activity) {
+        if (currentActivity?.get() == activity) {
+            currentActivity = null
+        }
+    }
+
+    override fun onActivityCreated(
+        p0: Activity,
+        p1: Bundle?,
+    ) {
+    }
+
+    override fun onActivityDestroyed(p0: Activity) {
+    }
+
+    override fun onActivitySaveInstanceState(
+        p0: Activity,
+        p1: Bundle,
+    ) {
+    }
+
+    override fun onActivityStopped(p0: Activity) {
+    }
+
+    companion object {
+        fun getInstance(context: Context): HabiticaBaseApplication? {
+            return context.applicationContext as? HabiticaBaseApplication
+        }
+
+        fun logout(context: Context) {
+            MainScope().launchCatching {
+                getInstance(context)?.pushNotificationManager?.removePushDeviceUsingStoredToken()
+                val realm = Realm.getDefaultInstance()
+                getInstance(context)?.deleteDatabase(realm.path)
+                realm.close()
+                val preferences = PreferenceManager.getDefaultSharedPreferences(context)
+                val useReminder = preferences.getBoolean("use_reminder", false)
+                val reminderTime = preferences.getString("reminder_time", "19:00")
+                val lightMode = preferences.getString("theme_mode", "system")
+                val launchScreen = preferences.getString("launch_screen", "")
+                preferences.edit {
+                    clear()
+                    putBoolean("use_reminder", useReminder)
+                    putString("reminder_time", reminderTime)
+                    putString("theme_mode", lightMode)
+                    putString("launch_screen", launchScreen)
+                }
+                getInstance(context)?.lazyApiHelper?.updateAuthenticationCredentials(null, null)
+                Wearable.getCapabilityClient(context).removeLocalCapability("provide_auth")
+                startActivity(LoginActivity::class.java, context)
+            }
+        }
+
+        private fun startActivity(
+            activityClass: Class<*>,
+            context: Context,
+        ) {
+            val intent = Intent(context, activityClass)
+            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK)
+            context.startActivity(intent)
+        }
+    }
+}
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 a7cff73fd..2271f8a9d 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
@@ -6,9 +6,6 @@ import com.google.gson.reflect.TypeToken;
 import com.habitrpg.android.habitica.models.Achievement;
 import com.habitrpg.android.habitica.models.ContentResult;
 import com.habitrpg.android.habitica.models.FAQArticle;
-import com.habitrpg.android.habitica.models.tasks.GroupAssignedDetails;
-import com.habitrpg.android.habitica.utils.AssignedDetailsDeserializer;
-import com.habitrpg.common.habitica.models.Notification;
 import com.habitrpg.android.habitica.models.Skill;
 import com.habitrpg.android.habitica.models.Tag;
 import com.habitrpg.android.habitica.models.TutorialStep;
@@ -19,11 +16,11 @@ import com.habitrpg.android.habitica.models.inventory.Quest;
 import com.habitrpg.android.habitica.models.inventory.QuestCollect;
 import com.habitrpg.android.habitica.models.inventory.QuestDropItem;
 import com.habitrpg.android.habitica.models.members.Member;
-import com.habitrpg.shared.habitica.models.responses.FeedResponse;
 import com.habitrpg.android.habitica.models.social.Challenge;
 import com.habitrpg.android.habitica.models.social.ChatMessage;
 import com.habitrpg.android.habitica.models.social.FindUsernameResult;
 import com.habitrpg.android.habitica.models.social.Group;
+import com.habitrpg.android.habitica.models.tasks.GroupAssignedDetails;
 import com.habitrpg.android.habitica.models.tasks.Task;
 import com.habitrpg.android.habitica.models.tasks.TaskList;
 import com.habitrpg.android.habitica.models.user.OwnedItem;
@@ -33,6 +30,7 @@ import com.habitrpg.android.habitica.models.user.Purchases;
 import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.models.user.auth.SocialAuthentication;
 import com.habitrpg.android.habitica.utils.AchievementListDeserializer;
+import com.habitrpg.android.habitica.utils.AssignedDetailsDeserializer;
 import com.habitrpg.android.habitica.utils.BooleanAsIntAdapter;
 import com.habitrpg.android.habitica.utils.ChallengeDeserializer;
 import com.habitrpg.android.habitica.utils.ChallengeListDeserializer;
@@ -62,6 +60,8 @@ import com.habitrpg.android.habitica.utils.TaskTagDeserializer;
 import com.habitrpg.android.habitica.utils.TutorialStepListDeserializer;
 import com.habitrpg.android.habitica.utils.UserDeserializer;
 import com.habitrpg.android.habitica.utils.WorldStateSerialization;
+import com.habitrpg.common.habitica.models.Notification;
+import com.habitrpg.shared.habitica.models.responses.FeedResponse;
 
 import java.lang.reflect.Type;
 import java.util.Date;
@@ -145,7 +145,8 @@ public class GSonFactoryCreator {
                 .setLenient()
                 .create();
     }
-        public static GsonConverterFactory create() {
-            return GsonConverterFactory.create(createGson());
+
+    public static GsonConverterFactory create() {
+        return GsonConverterFactory.create(createGson());
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/BaseRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/BaseRepository.kt
index ec65f3742..9ec792f52 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/BaseRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/BaseRepository.kt
@@ -3,11 +3,11 @@ package com.habitrpg.android.habitica.data
 import com.habitrpg.android.habitica.models.BaseObject
 
 interface BaseRepository {
-
     val isClosed: Boolean
 
     fun close()
 
     fun <T : BaseObject> getUnmanagedCopy(obj: T): T
+
     fun <T : BaseObject> getUnmanagedCopy(list: List<T>): List<T>
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ChallengeRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ChallengeRepository.kt
index 08e938bf4..4d2b2e96b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ChallengeRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ChallengeRepository.kt
@@ -7,15 +7,25 @@ import com.habitrpg.android.habitica.models.tasks.TaskList
 import kotlinx.coroutines.flow.Flow
 
 interface ChallengeRepository : BaseRepository {
+    suspend fun retrieveChallenges(
+        page: Int = 0,
+        memberOnly: Boolean,
+    ): List<Challenge>?
 
-    suspend fun retrieveChallenges(page: Int = 0, memberOnly: Boolean): List<Challenge>?
     fun getChallenges(): Flow<List<Challenge>>
+
     fun getChallenge(challengeId: String): Flow<Challenge>
+
     fun getChallengeTasks(challengeId: String): Flow<List<Task>>
 
     suspend fun retrieveChallenge(challengeID: String): Challenge?
+
     suspend fun retrieveChallengeTasks(challengeID: String): TaskList?
-    suspend fun createChallenge(challenge: Challenge, taskList: List<Task>): Challenge?
+
+    suspend fun createChallenge(
+        challenge: Challenge,
+        taskList: List<Task>,
+    ): Challenge?
 
     /**
      *
@@ -31,18 +41,28 @@ interface ChallengeRepository : BaseRepository {
         fullTaskList: List<Task>,
         addedTaskList: List<Task>,
         updatedTaskList: List<Task>,
-        removedTaskList: List<String>
+        removedTaskList: List<String>,
     ): Challenge?
 
     suspend fun deleteChallenge(challengeId: String): Void?
+
     fun getUserChallenges(userId: String? = null): Flow<List<Challenge>>
 
-    suspend fun leaveChallenge(challenge: Challenge, keepTasks: String): Void?
+    suspend fun leaveChallenge(
+        challenge: Challenge,
+        keepTasks: String,
+    ): Void?
 
     suspend fun joinChallenge(challenge: Challenge): Challenge?
 
     fun getChallengepMembership(id: String): Flow<ChallengeMembership>
+
     fun getChallengeMemberships(): Flow<List<ChallengeMembership>>
+
     fun isChallengeMember(challengeID: String): Flow<Boolean>
-    suspend fun reportChallenge(challengeid: String, updateData: Map<String, String>): Void?
+
+    suspend fun reportChallenge(
+        challengeid: String,
+        updateData: Map<String, String>,
+    ): Void?
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ContentRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ContentRepository.kt
index 3b7a88aee..7a842fc2d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ContentRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ContentRepository.kt
@@ -1,12 +1,13 @@
-package com.habitrpg.android.habitica.data
-
-import com.habitrpg.android.habitica.models.ContentResult
-import com.habitrpg.android.habitica.models.WorldState
-import kotlinx.coroutines.flow.Flow
-
-interface ContentRepository : BaseRepository {
-    suspend fun retrieveContent(forced: Boolean = false): ContentResult?
-
-    suspend fun retrieveWorldState(forced: Boolean = false): WorldState?
-    fun getWorldState(): Flow<WorldState>
-}
+package com.habitrpg.android.habitica.data
+
+import com.habitrpg.android.habitica.models.ContentResult
+import com.habitrpg.android.habitica.models.WorldState
+import kotlinx.coroutines.flow.Flow
+
+interface ContentRepository : BaseRepository {
+    suspend fun retrieveContent(forced: Boolean = false): ContentResult?
+
+    suspend fun retrieveWorldState(forced: Boolean = false): WorldState?
+
+    fun getWorldState(): Flow<WorldState>
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/CustomizationRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/CustomizationRepository.kt
index 8c657e98a..54c51f163 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/CustomizationRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/CustomizationRepository.kt
@@ -1,8 +1,12 @@
-package com.habitrpg.android.habitica.data
-
-import com.habitrpg.android.habitica.models.inventory.Customization
-import kotlinx.coroutines.flow.Flow
-
-interface CustomizationRepository : BaseRepository {
-    fun getCustomizations(type: String, category: String?, onlyAvailable: Boolean): Flow<List<Customization>>
-}
+package com.habitrpg.android.habitica.data
+
+import com.habitrpg.android.habitica.models.inventory.Customization
+import kotlinx.coroutines.flow.Flow
+
+interface CustomizationRepository : BaseRepository {
+    fun getCustomizations(
+        type: String,
+        category: String?,
+        onlyAvailable: Boolean,
+    ): Flow<List<Customization>>
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/FAQRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/FAQRepository.kt
index d4b61d443..850673273 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/FAQRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/FAQRepository.kt
@@ -1,9 +1,10 @@
-package com.habitrpg.android.habitica.data
-
-import com.habitrpg.android.habitica.models.FAQArticle
-import kotlinx.coroutines.flow.Flow
-
-interface FAQRepository : BaseRepository {
-    fun getArticles(): Flow<List<FAQArticle>>
-    fun getArticle(position: Int): Flow<FAQArticle>
-}
+package com.habitrpg.android.habitica.data
+
+import com.habitrpg.android.habitica.models.FAQArticle
+import kotlinx.coroutines.flow.Flow
+
+interface FAQRepository : BaseRepository {
+    fun getArticles(): Flow<List<FAQArticle>>
+
+    fun getArticle(position: Int): Flow<FAQArticle>
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.kt
index 4afd8f3ef..0ec6ade8f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.kt
@@ -1,95 +1,163 @@
-package com.habitrpg.android.habitica.data
-
-import com.habitrpg.android.habitica.models.inventory.Egg
-import com.habitrpg.android.habitica.models.inventory.Equipment
-import com.habitrpg.android.habitica.models.inventory.Food
-import com.habitrpg.android.habitica.models.inventory.HatchingPotion
-import com.habitrpg.android.habitica.models.inventory.Item
-import com.habitrpg.android.habitica.models.inventory.Mount
-import com.habitrpg.android.habitica.models.inventory.Pet
-import com.habitrpg.android.habitica.models.inventory.Quest
-import com.habitrpg.android.habitica.models.inventory.QuestContent
-import com.habitrpg.android.habitica.models.responses.BuyResponse
-import com.habitrpg.android.habitica.models.shops.Shop
-import com.habitrpg.android.habitica.models.shops.ShopItem
-import com.habitrpg.android.habitica.models.user.Items
-import com.habitrpg.android.habitica.models.user.OwnedItem
-import com.habitrpg.android.habitica.models.user.OwnedMount
-import com.habitrpg.android.habitica.models.user.OwnedPet
-import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.shared.habitica.models.responses.FeedResponse
-import kotlinx.coroutines.flow.Flow
-
-interface InventoryRepository : BaseRepository {
-
-    fun getArmoireRemainingCount(): Flow<Int>
-
-    fun getInAppRewards(): Flow<List<ShopItem>>
-    fun getInAppReward(key: String): Flow<ShopItem>
-
-    fun getOwnedEquipment(): Flow<List<Equipment>>
-
-    fun getMounts(): Flow<List<Mount>>
-
-    fun getOwnedMounts(): Flow<List<OwnedMount>>
-
-    fun getPets(): Flow<List<Pet>>
-
-    fun getOwnedPets(): Flow<List<OwnedPet>>
-    fun getQuestContent(key: String): Flow<QuestContent?>
-    fun getQuestContent(keys: List<String>): Flow<List<QuestContent>>
-
-    fun getEquipment(searchedKeys: List<String>): Flow<List<Equipment>>
-    suspend fun retrieveInAppRewards(): List<ShopItem>?
-
-    fun getOwnedEquipment(type: String): Flow<List<Equipment>>
-    fun getEquipmentType(type: String, set: String): Flow<List<Equipment>>
-
-    fun getOwnedItems(itemType: String, includeZero: Boolean = false): Flow<List<OwnedItem>>
-    fun getOwnedItems(includeZero: Boolean = false): Flow<Map<String, OwnedItem>>
-
-    fun getEquipment(key: String): Flow<Equipment>
-
-    suspend fun openMysteryItem(user: User?): Equipment?
-
-    fun saveEquipment(equipment: Equipment)
-    fun getMounts(type: String?, group: String?, color: String?): Flow<List<Mount>>
-    fun getPets(type: String?, group: String?, color: String?): Flow<List<Pet>>
-
-    fun updateOwnedEquipment(user: User)
-
-    suspend fun changeOwnedCount(type: String, key: String, amountToAdd: Int)
-
-    suspend fun sellItem(type: String, key: String): User?
-    suspend fun sellItem(item: OwnedItem): User?
-
-    suspend fun equipGear(equipment: String, asCostume: Boolean): Items?
-    suspend fun equip(type: String, key: String): Items?
-
-    suspend fun feedPet(pet: Pet, food: Food): FeedResponse?
-
-    suspend fun hatchPet(egg: Egg, hatchingPotion: HatchingPotion, successFunction: () -> Unit): Items?
-
-    suspend fun inviteToQuest(quest: QuestContent): Quest?
-
-    suspend fun buyItem(user: User?, id: String, value: Double, purchaseQuantity: Int): BuyResponse?
-
-    suspend fun retrieveShopInventory(identifier: String): Shop?
-    suspend fun retrieveMarketGear(): Shop?
-
-    suspend fun purchaseMysterySet(categoryIdentifier: String): Void?
-
-    suspend fun purchaseHourglassItem(purchaseType: String, key: String): Void?
-
-    suspend fun purchaseQuest(key: String): Void?
-    suspend fun purchaseSpecialSpell(key: String): Void?
-
-    suspend fun purchaseItem(purchaseType: String, key: String, purchaseQuantity: Int): Void?
-
-    suspend fun togglePinnedItem(item: ShopItem): List<ShopItem>?
-    fun getItems(itemClass: Class<out Item>, keys: Array<String>): Flow<List<Item>>
-    fun getItems(itemClass: Class<out Item>): Flow<List<Item>>
-    fun getLatestMysteryItem(): Flow<Equipment>
-    fun getItem(type: String, key: String): Flow<Item>
-    fun getAvailableLimitedItems(): Flow<List<Item>>
-}
+package com.habitrpg.android.habitica.data
+
+import com.habitrpg.android.habitica.models.inventory.Egg
+import com.habitrpg.android.habitica.models.inventory.Equipment
+import com.habitrpg.android.habitica.models.inventory.Food
+import com.habitrpg.android.habitica.models.inventory.HatchingPotion
+import com.habitrpg.android.habitica.models.inventory.Item
+import com.habitrpg.android.habitica.models.inventory.Mount
+import com.habitrpg.android.habitica.models.inventory.Pet
+import com.habitrpg.android.habitica.models.inventory.Quest
+import com.habitrpg.android.habitica.models.inventory.QuestContent
+import com.habitrpg.android.habitica.models.responses.BuyResponse
+import com.habitrpg.android.habitica.models.shops.Shop
+import com.habitrpg.android.habitica.models.shops.ShopItem
+import com.habitrpg.android.habitica.models.user.Items
+import com.habitrpg.android.habitica.models.user.OwnedItem
+import com.habitrpg.android.habitica.models.user.OwnedMount
+import com.habitrpg.android.habitica.models.user.OwnedPet
+import com.habitrpg.android.habitica.models.user.User
+import com.habitrpg.shared.habitica.models.responses.FeedResponse
+import kotlinx.coroutines.flow.Flow
+
+interface InventoryRepository : BaseRepository {
+    fun getArmoireRemainingCount(): Flow<Int>
+
+    fun getInAppRewards(): Flow<List<ShopItem>>
+
+    fun getInAppReward(key: String): Flow<ShopItem>
+
+    fun getOwnedEquipment(): Flow<List<Equipment>>
+
+    fun getMounts(): Flow<List<Mount>>
+
+    fun getOwnedMounts(): Flow<List<OwnedMount>>
+
+    fun getPets(): Flow<List<Pet>>
+
+    fun getOwnedPets(): Flow<List<OwnedPet>>
+
+    fun getQuestContent(key: String): Flow<QuestContent?>
+
+    fun getQuestContent(keys: List<String>): Flow<List<QuestContent>>
+
+    fun getEquipment(searchedKeys: List<String>): Flow<List<Equipment>>
+
+    suspend fun retrieveInAppRewards(): List<ShopItem>?
+
+    fun getOwnedEquipment(type: String): Flow<List<Equipment>>
+
+    fun getEquipmentType(
+        type: String,
+        set: String,
+    ): Flow<List<Equipment>>
+
+    fun getOwnedItems(
+        itemType: String,
+        includeZero: Boolean = false,
+    ): Flow<List<OwnedItem>>
+
+    fun getOwnedItems(includeZero: Boolean = false): Flow<Map<String, OwnedItem>>
+
+    fun getEquipment(key: String): Flow<Equipment>
+
+    suspend fun openMysteryItem(user: User?): Equipment?
+
+    fun saveEquipment(equipment: Equipment)
+
+    fun getMounts(
+        type: String?,
+        group: String?,
+        color: String?,
+    ): Flow<List<Mount>>
+
+    fun getPets(
+        type: String?,
+        group: String?,
+        color: String?,
+    ): Flow<List<Pet>>
+
+    fun updateOwnedEquipment(user: User)
+
+    suspend fun changeOwnedCount(
+        type: String,
+        key: String,
+        amountToAdd: Int,
+    )
+
+    suspend fun sellItem(
+        type: String,
+        key: String,
+    ): User?
+
+    suspend fun sellItem(item: OwnedItem): User?
+
+    suspend fun equipGear(
+        equipment: String,
+        asCostume: Boolean,
+    ): Items?
+
+    suspend fun equip(
+        type: String,
+        key: String,
+    ): Items?
+
+    suspend fun feedPet(
+        pet: Pet,
+        food: Food,
+    ): FeedResponse?
+
+    suspend fun hatchPet(
+        egg: Egg,
+        hatchingPotion: HatchingPotion,
+        successFunction: () -> Unit,
+    ): Items?
+
+    suspend fun inviteToQuest(quest: QuestContent): Quest?
+
+    suspend fun buyItem(
+        user: User?,
+        id: String,
+        value: Double,
+        purchaseQuantity: Int,
+    ): BuyResponse?
+
+    suspend fun retrieveShopInventory(identifier: String): Shop?
+
+    suspend fun retrieveMarketGear(): Shop?
+
+    suspend fun purchaseMysterySet(categoryIdentifier: String): Void?
+
+    suspend fun purchaseHourglassItem(
+        purchaseType: String,
+        key: String,
+    ): Void?
+
+    suspend fun purchaseQuest(key: String): Void?
+
+    suspend fun purchaseSpecialSpell(key: String): Void?
+
+    suspend fun purchaseItem(
+        purchaseType: String,
+        key: String,
+        purchaseQuantity: Int,
+    ): Void?
+
+    suspend fun togglePinnedItem(item: ShopItem): List<ShopItem>?
+
+    fun getItems(
+        itemClass: Class<out Item>,
+        keys: Array<String>,
+    ): Flow<List<Item>>
+
+    fun getItems(itemClass: Class<out Item>): Flow<List<Item>>
+
+    fun getLatestMysteryItem(): Flow<Equipment>
+
+    fun getItem(
+        type: String,
+        key: String,
+    ): Flow<Item>
+
+    fun getAvailableLimitedItems(): Flow<List<Item>>
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/SetupCustomizationRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/SetupCustomizationRepository.kt
index 47402ae28..439323c97 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/SetupCustomizationRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/SetupCustomizationRepository.kt
@@ -1,26 +1,33 @@
-package com.habitrpg.android.habitica.data
-
-import com.habitrpg.android.habitica.models.SetupCustomization
-import com.habitrpg.android.habitica.models.user.User
-
-interface SetupCustomizationRepository {
-
-    fun getCustomizations(type: String, user: User): List<SetupCustomization>
-    fun getCustomizations(type: String, subtype: String?, user: User): List<SetupCustomization>
-
-    companion object {
-        const val CATEGORY_BODY = "body"
-        const val CATEGORY_SKIN = "skin"
-        const val CATEGORY_HAIR = "hair"
-        const val CATEGORY_EXTRAS = "extras"
-
-        const val SUBCATEGORY_SIZE = "size"
-        const val SUBCATEGORY_SHIRT = "shirt"
-        const val SUBCATEGORY_COLOR = "color"
-        const val SUBCATEGORY_PONYTAIL = "ponytail"
-        const val SUBCATEGORY_BANGS = "bangs"
-        const val SUBCATEGORY_FLOWER = "flower"
-        const val SUBCATEGORY_WHEELCHAIR = "wheelchair"
-        const val SUBCATEGORY_GLASSES = "glasses"
-    }
-}
+package com.habitrpg.android.habitica.data
+
+import com.habitrpg.android.habitica.models.SetupCustomization
+import com.habitrpg.android.habitica.models.user.User
+
+interface SetupCustomizationRepository {
+    fun getCustomizations(
+        type: String,
+        user: User,
+    ): List<SetupCustomization>
+
+    fun getCustomizations(
+        type: String,
+        subtype: String?,
+        user: User,
+    ): List<SetupCustomization>
+
+    companion object {
+        const val CATEGORY_BODY = "body"
+        const val CATEGORY_SKIN = "skin"
+        const val CATEGORY_HAIR = "hair"
+        const val CATEGORY_EXTRAS = "extras"
+
+        const val SUBCATEGORY_SIZE = "size"
+        const val SUBCATEGORY_SHIRT = "shirt"
+        const val SUBCATEGORY_COLOR = "color"
+        const val SUBCATEGORY_PONYTAIL = "ponytail"
+        const val SUBCATEGORY_BANGS = "bangs"
+        const val SUBCATEGORY_FLOWER = "flower"
+        const val SUBCATEGORY_WHEELCHAIR = "wheelchair"
+        const val SUBCATEGORY_GLASSES = "glasses"
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.kt
index 89ffb71e9..65ee6063e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.kt
@@ -1,123 +1,188 @@
-package com.habitrpg.android.habitica.data
-
-import com.habitrpg.android.habitica.models.Achievement
-import com.habitrpg.android.habitica.models.inventory.Quest
-import com.habitrpg.android.habitica.models.invitations.InviteResponse
-import com.habitrpg.android.habitica.models.members.Member
-import com.habitrpg.android.habitica.models.responses.PostChatMessageResult
-import com.habitrpg.android.habitica.models.social.ChatMessage
-import com.habitrpg.android.habitica.models.social.FindUsernameResult
-import com.habitrpg.android.habitica.models.social.Group
-import com.habitrpg.android.habitica.models.social.GroupMembership
-import com.habitrpg.android.habitica.models.social.InboxConversation
-import com.habitrpg.android.habitica.models.user.User
-import io.realm.RealmResults
-import kotlinx.coroutines.flow.Flow
-
-interface SocialRepository : BaseRepository {
-    fun getUserGroups(type: String?): Flow<List<Group>>
-    suspend fun retrieveGroupChat(groupId: String): List<ChatMessage>?
-    fun getGroupChat(groupId: String): Flow<List<ChatMessage>>
-
-    suspend fun markMessagesSeen(seenGroupId: String)
-
-    suspend fun flagMessage(
-        chatMessageID: String,
-        additionalInfo: String,
-        groupID: String? = null
-    ): Void?
-
-    suspend fun reportMember(memberID: String, data: Map<String, String>): Void?
-
-    suspend fun likeMessage(chatMessage: ChatMessage): ChatMessage?
-
-    suspend fun deleteMessage(chatMessage: ChatMessage): Void?
-
-    suspend fun postGroupChat(
-        groupId: String,
-        messageObject: HashMap<String, String>
-    ): PostChatMessageResult?
-
-    suspend fun postGroupChat(groupId: String, message: String): PostChatMessageResult?
-
-    suspend fun retrieveGroup(id: String): Group?
-    fun getGroup(id: String?): Flow<Group?>
-
-    suspend fun leaveGroup(id: String?, keepChallenges: Boolean): Group?
-
-    suspend fun joinGroup(id: String?): Group?
-
-    suspend fun createGroup(
-        name: String?,
-        description: String?,
-        leader: String?,
-        type: String?,
-        privacy: String?,
-        leaderCreateChallenge: Boolean?
-    ): Group?
-
-    suspend fun updateGroup(
-        group: Group?,
-        name: String?,
-        description: String?,
-        leader: String?,
-        leaderCreateChallenge: Boolean?
-    ): Group?
-
-    fun getInboxMessages(replyToUserID: String?): Flow<RealmResults<ChatMessage>>
-    suspend fun retrieveInboxMessages(uuid: String, page: Int): List<ChatMessage>?
-    suspend fun retrieveInboxConversations(): List<InboxConversation>?
-    fun getInboxConversations(): Flow<RealmResults<InboxConversation>>
-    suspend fun postPrivateMessage(
-        recipientId: String,
-        messageObject: HashMap<String, String>
-    ): List<ChatMessage>?
-
-    suspend fun postPrivateMessage(recipientId: String, message: String): List<ChatMessage>?
-
-    suspend fun getPartyMembers(id: String): Flow<List<Member>>
-    suspend fun getGroupMembers(id: String): Flow<List<Member>>
-    suspend fun retrievePartyMembers(id: String, includeAllPublicFields: Boolean): List<Member>?
-
-    suspend fun inviteToGroup(id: String, inviteData: Map<String, Any>): List<InviteResponse>?
-
-    suspend fun retrieveMember(userId: String?, fromHall: Boolean = false): Member?
-
-    suspend fun findUsernames(
-        username: String,
-        context: String? = null,
-        id: String? = null
-    ): List<FindUsernameResult>?
-
-    suspend fun markPrivateMessagesRead(user: User?)
-
-    fun markSomePrivateMessagesAsRead(user: User?, messages: List<ChatMessage>)
-
-    suspend fun transferGroupOwnership(groupID: String, userID: String): Group?
-    suspend fun removeMemberFromGroup(groupID: String, userID: String): List<Member>?
-
-    suspend fun acceptQuest(user: User?, partyId: String = "party"): Void?
-    suspend fun rejectQuest(user: User?, partyId: String = "party"): Void?
-
-    suspend fun leaveQuest(partyId: String): Void?
-
-    suspend fun cancelQuest(partyId: String): Void?
-
-    suspend fun abortQuest(partyId: String): Quest?
-
-    suspend fun rejectGroupInvite(groupId: String): Void?
-
-    suspend fun forceStartQuest(party: Group): Quest?
-
-    suspend fun getMemberAchievements(userId: String?): List<Achievement>?
-
-    suspend fun transferGems(giftedID: String, amount: Int): Void?
-
-    fun getGroupMembership(id: String): Flow<GroupMembership?>
-    fun getGroupMemberships(): Flow<List<GroupMembership>>
-    suspend fun blockMember(userID: String): List<String>?
-    fun getMember(userID: String?): Flow<Member?>
-    suspend fun updateMember(memberID: String, data: Map<String, Map<String, Boolean>>): Member?
-    suspend fun retrievePartySeekingUsers(page: Int = 0): List<Member>?
-    suspend fun retrievegroupInvites(id: String, includeAllPublicFields: Boolean): List<Member>?
-}
+package com.habitrpg.android.habitica.data
+
+import com.habitrpg.android.habitica.models.Achievement
+import com.habitrpg.android.habitica.models.inventory.Quest
+import com.habitrpg.android.habitica.models.invitations.InviteResponse
+import com.habitrpg.android.habitica.models.members.Member
+import com.habitrpg.android.habitica.models.responses.PostChatMessageResult
+import com.habitrpg.android.habitica.models.social.ChatMessage
+import com.habitrpg.android.habitica.models.social.FindUsernameResult
+import com.habitrpg.android.habitica.models.social.Group
+import com.habitrpg.android.habitica.models.social.GroupMembership
+import com.habitrpg.android.habitica.models.social.InboxConversation
+import com.habitrpg.android.habitica.models.user.User
+import io.realm.RealmResults
+import kotlinx.coroutines.flow.Flow
+
+interface SocialRepository : BaseRepository {
+    fun getUserGroups(type: String?): Flow<List<Group>>
+
+    suspend fun retrieveGroupChat(groupId: String): List<ChatMessage>?
+
+    fun getGroupChat(groupId: String): Flow<List<ChatMessage>>
+
+    suspend fun markMessagesSeen(seenGroupId: String)
+
+    suspend fun flagMessage(
+        chatMessageID: String,
+        additionalInfo: String,
+        groupID: String? = null,
+    ): Void?
+
+    suspend fun reportMember(
+        memberID: String,
+        data: Map<String, String>,
+    ): Void?
+
+    suspend fun likeMessage(chatMessage: ChatMessage): ChatMessage?
+
+    suspend fun deleteMessage(chatMessage: ChatMessage): Void?
+
+    suspend fun postGroupChat(
+        groupId: String,
+        messageObject: HashMap<String, String>,
+    ): PostChatMessageResult?
+
+    suspend fun postGroupChat(
+        groupId: String,
+        message: String,
+    ): PostChatMessageResult?
+
+    suspend fun retrieveGroup(id: String): Group?
+
+    fun getGroup(id: String?): Flow<Group?>
+
+    suspend fun leaveGroup(
+        id: String?,
+        keepChallenges: Boolean,
+    ): Group?
+
+    suspend fun joinGroup(id: String?): Group?
+
+    suspend fun createGroup(
+        name: String?,
+        description: String?,
+        leader: String?,
+        type: String?,
+        privacy: String?,
+        leaderCreateChallenge: Boolean?,
+    ): Group?
+
+    suspend fun updateGroup(
+        group: Group?,
+        name: String?,
+        description: String?,
+        leader: String?,
+        leaderCreateChallenge: Boolean?,
+    ): Group?
+
+    fun getInboxMessages(replyToUserID: String?): Flow<RealmResults<ChatMessage>>
+
+    suspend fun retrieveInboxMessages(
+        uuid: String,
+        page: Int,
+    ): List<ChatMessage>?
+
+    suspend fun retrieveInboxConversations(): List<InboxConversation>?
+
+    fun getInboxConversations(): Flow<RealmResults<InboxConversation>>
+
+    suspend fun postPrivateMessage(
+        recipientId: String,
+        messageObject: HashMap<String, String>,
+    ): List<ChatMessage>?
+
+    suspend fun postPrivateMessage(
+        recipientId: String,
+        message: String,
+    ): List<ChatMessage>?
+
+    suspend fun getPartyMembers(id: String): Flow<List<Member>>
+
+    suspend fun getGroupMembers(id: String): Flow<List<Member>>
+
+    suspend fun retrievePartyMembers(
+        id: String,
+        includeAllPublicFields: Boolean,
+    ): List<Member>?
+
+    suspend fun inviteToGroup(
+        id: String,
+        inviteData: Map<String, Any>,
+    ): List<InviteResponse>?
+
+    suspend fun retrieveMember(
+        userId: String?,
+        fromHall: Boolean = false,
+    ): Member?
+
+    suspend fun findUsernames(
+        username: String,
+        context: String? = null,
+        id: String? = null,
+    ): List<FindUsernameResult>?
+
+    suspend fun markPrivateMessagesRead(user: User?)
+
+    fun markSomePrivateMessagesAsRead(
+        user: User?,
+        messages: List<ChatMessage>,
+    )
+
+    suspend fun transferGroupOwnership(
+        groupID: String,
+        userID: String,
+    ): Group?
+
+    suspend fun removeMemberFromGroup(
+        groupID: String,
+        userID: String,
+    ): List<Member>?
+
+    suspend fun acceptQuest(
+        user: User?,
+        partyId: String = "party",
+    ): Void?
+
+    suspend fun rejectQuest(
+        user: User?,
+        partyId: String = "party",
+    ): Void?
+
+    suspend fun leaveQuest(partyId: String): Void?
+
+    suspend fun cancelQuest(partyId: String): Void?
+
+    suspend fun abortQuest(partyId: String): Quest?
+
+    suspend fun rejectGroupInvite(groupId: String): Void?
+
+    suspend fun forceStartQuest(party: Group): Quest?
+
+    suspend fun getMemberAchievements(userId: String?): List<Achievement>?
+
+    suspend fun transferGems(
+        giftedID: String,
+        amount: Int,
+    ): Void?
+
+    fun getGroupMembership(id: String): Flow<GroupMembership?>
+
+    fun getGroupMemberships(): Flow<List<GroupMembership>>
+
+    suspend fun blockMember(userID: String): List<String>?
+
+    fun getMember(userID: String?): Flow<Member?>
+
+    suspend fun updateMember(
+        memberID: String,
+        data: Map<String, Map<String, Boolean>>,
+    ): Member?
+
+    suspend fun retrievePartySeekingUsers(page: Int = 0): List<Member>?
+
+    suspend fun retrievegroupInvites(
+        id: String,
+        includeAllPublicFields: Boolean,
+    ): List<Member>?
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/TagRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/TagRepository.kt
index b6a04dcc2..350ec6992 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/TagRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/TagRepository.kt
@@ -1,18 +1,22 @@
-package com.habitrpg.android.habitica.data
-
-import com.habitrpg.android.habitica.models.Tag
-import kotlinx.coroutines.flow.Flow
-
-interface TagRepository : BaseRepository {
-
-    fun getTags(): Flow<List<Tag>>
-    fun getTags(userId: String): Flow<List<Tag>>
-
-    suspend fun createTag(tag: Tag): Tag?
-    suspend fun updateTag(tag: Tag): Tag?
-    suspend fun deleteTag(id: String): Void?
-
-    suspend fun createTags(tags: Collection<Tag>): List<Tag>
-    suspend fun updateTags(tags: Collection<Tag>): List<Tag>
-    suspend fun deleteTags(tagIds: Collection<String>): List<Void>
-}
+package com.habitrpg.android.habitica.data
+
+import com.habitrpg.android.habitica.models.Tag
+import kotlinx.coroutines.flow.Flow
+
+interface TagRepository : BaseRepository {
+    fun getTags(): Flow<List<Tag>>
+
+    fun getTags(userId: String): Flow<List<Tag>>
+
+    suspend fun createTag(tag: Tag): Tag?
+
+    suspend fun updateTag(tag: Tag): Tag?
+
+    suspend fun deleteTag(id: String): Void?
+
+    suspend fun createTags(tags: Collection<Tag>): List<Tag>
+
+    suspend fun updateTags(tags: Collection<Tag>): List<Tag>
+
+    suspend fun deleteTags(tagIds: Collection<String>): List<Void>
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.kt
index 198e969b8..de0e370bd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.kt
@@ -1,70 +1,135 @@
-package com.habitrpg.android.habitica.data
-
-import com.habitrpg.android.habitica.models.BaseMainObject
-import com.habitrpg.android.habitica.models.responses.BulkTaskScoringData
-import com.habitrpg.android.habitica.models.tasks.Task
-import com.habitrpg.android.habitica.models.tasks.TaskList
-import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.shared.habitica.models.responses.TaskScoringResult
-import com.habitrpg.shared.habitica.models.tasks.TaskType
-import com.habitrpg.shared.habitica.models.tasks.TasksOrder
-import kotlinx.coroutines.flow.Flow
-import java.util.Date
-
-interface TaskRepository : BaseRepository {
-    fun getTasks(taskType: TaskType, userID: String? = null, includedGroupIDs: Array<String>): Flow<List<Task>>
-    fun saveTasks(userId: String, order: TasksOrder, tasks: TaskList)
-
-    suspend fun retrieveTasks(userId: String, tasksOrder: TasksOrder): TaskList?
-    suspend fun retrieveTasks(userId: String, tasksOrder: TasksOrder, dueDate: Date): TaskList?
-
-    suspend fun taskChecked(
-        user: User?,
-        task: Task,
-        up: Boolean,
-        force: Boolean,
-        notifyFunc: ((TaskScoringResult) -> Unit)?
-    ): TaskScoringResult?
-    suspend fun taskChecked(
-        user: User?,
-        taskId: String,
-        up: Boolean,
-        force: Boolean,
-        notifyFunc: ((TaskScoringResult) -> Unit)?
-    ): TaskScoringResult?
-    suspend fun scoreChecklistItem(taskId: String, itemId: String): Task?
-
-    fun getTask(taskId: String): Flow<Task>
-    fun getTaskCopy(taskId: String): Flow<Task>
-    suspend fun createTask(task: Task, force: Boolean = false): Task?
-    suspend fun updateTask(task: Task, force: Boolean = false): Task?
-    suspend fun deleteTask(taskId: String): Void?
-    fun saveTask(task: Task)
-
-    suspend fun createTasks(newTasks: List<Task>): List<Task>?
-
-    fun markTaskCompleted(taskId: String, isCompleted: Boolean)
-
-    fun <T : BaseMainObject> modify(obj: T, transaction: (T) -> Unit)
-
-    fun swapTaskPosition(firstPosition: Int, secondPosition: Int)
-
-    suspend fun updateTaskPosition(taskType: TaskType, taskID: String, newPosition: Int): List<String>?
-
-    fun getUnmanagedTask(taskid: String): Flow<Task>
-
-    fun updateTaskInBackground(task: Task, assignChanges: Map<String, MutableList<String>>)
-
-    fun createTaskInBackground(task: Task, assignChanges: Map<String, MutableList<String>>)
-
-    fun getTaskCopies(): Flow<List<Task>>
-    fun getTaskCopies(tasks: List<Task>): List<Task>
-
-    suspend fun retrieveDailiesFromDate(date: Date): TaskList?
-    suspend fun retrieveCompletedTodos(userId: String? = null): TaskList?
-    suspend fun syncErroredTasks(): List<Task>?
-    suspend fun unlinkAllTasks(challengeID: String?, keepOption: String): Void?
-    fun getTasksForChallenge(challengeID: String?): Flow<List<Task>>
-    suspend fun bulkScoreTasks(data: List<Map<String, String>>): BulkTaskScoringData?
-    suspend fun markTaskNeedsWork(task: Task, userID: String)
-}
+package com.habitrpg.android.habitica.data
+
+import com.habitrpg.android.habitica.models.BaseMainObject
+import com.habitrpg.android.habitica.models.responses.BulkTaskScoringData
+import com.habitrpg.android.habitica.models.tasks.Task
+import com.habitrpg.android.habitica.models.tasks.TaskList
+import com.habitrpg.android.habitica.models.user.User
+import com.habitrpg.shared.habitica.models.responses.TaskScoringResult
+import com.habitrpg.shared.habitica.models.tasks.TaskType
+import com.habitrpg.shared.habitica.models.tasks.TasksOrder
+import kotlinx.coroutines.flow.Flow
+import java.util.Date
+
+interface TaskRepository : BaseRepository {
+    fun getTasks(
+        taskType: TaskType,
+        userID: String? = null,
+        includedGroupIDs: Array<String>,
+    ): Flow<List<Task>>
+
+    fun saveTasks(
+        userId: String,
+        order: TasksOrder,
+        tasks: TaskList,
+    )
+
+    suspend fun retrieveTasks(
+        userId: String,
+        tasksOrder: TasksOrder,
+    ): TaskList?
+
+    suspend fun retrieveTasks(
+        userId: String,
+        tasksOrder: TasksOrder,
+        dueDate: Date,
+    ): TaskList?
+
+    suspend fun taskChecked(
+        user: User?,
+        task: Task,
+        up: Boolean,
+        force: Boolean,
+        notifyFunc: ((TaskScoringResult) -> Unit)?,
+    ): TaskScoringResult?
+
+    suspend fun taskChecked(
+        user: User?,
+        taskId: String,
+        up: Boolean,
+        force: Boolean,
+        notifyFunc: ((TaskScoringResult) -> Unit)?,
+    ): TaskScoringResult?
+
+    suspend fun scoreChecklistItem(
+        taskId: String,
+        itemId: String,
+    ): Task?
+
+    fun getTask(taskId: String): Flow<Task>
+
+    fun getTaskCopy(taskId: String): Flow<Task>
+
+    suspend fun createTask(
+        task: Task,
+        force: Boolean = false,
+    ): Task?
+
+    suspend fun updateTask(
+        task: Task,
+        force: Boolean = false,
+    ): Task?
+
+    suspend fun deleteTask(taskId: String): Void?
+
+    fun saveTask(task: Task)
+
+    suspend fun createTasks(newTasks: List<Task>): List<Task>?
+
+    fun markTaskCompleted(
+        taskId: String,
+        isCompleted: Boolean,
+    )
+
+    fun <T : BaseMainObject> modify(
+        obj: T,
+        transaction: (T) -> Unit,
+    )
+
+    fun swapTaskPosition(
+        firstPosition: Int,
+        secondPosition: Int,
+    )
+
+    suspend fun updateTaskPosition(
+        taskType: TaskType,
+        taskID: String,
+        newPosition: Int,
+    ): List<String>?
+
+    fun getUnmanagedTask(taskid: String): Flow<Task>
+
+    fun updateTaskInBackground(
+        task: Task,
+        assignChanges: Map<String, MutableList<String>>,
+    )
+
+    fun createTaskInBackground(
+        task: Task,
+        assignChanges: Map<String, MutableList<String>>,
+    )
+
+    fun getTaskCopies(): Flow<List<Task>>
+
+    fun getTaskCopies(tasks: List<Task>): List<Task>
+
+    suspend fun retrieveDailiesFromDate(date: Date): TaskList?
+
+    suspend fun retrieveCompletedTodos(userId: String? = null): TaskList?
+
+    suspend fun syncErroredTasks(): List<Task>?
+
+    suspend fun unlinkAllTasks(
+        challengeID: String?,
+        keepOption: String,
+    ): Void?
+
+    fun getTasksForChallenge(challengeID: String?): Flow<List<Task>>
+
+    suspend fun bulkScoreTasks(data: List<Map<String, String>>): BulkTaskScoringData?
+
+    suspend fun markTaskNeedsWork(
+        task: Task,
+        userID: String,
+    )
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/TutorialRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/TutorialRepository.kt
index 5940aa690..058cba836 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/TutorialRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/TutorialRepository.kt
@@ -1,10 +1,10 @@
-package com.habitrpg.android.habitica.data
-
-import com.habitrpg.android.habitica.models.TutorialStep
-import kotlinx.coroutines.flow.Flow
-
-interface TutorialRepository : BaseRepository {
-
-    fun getTutorialStep(key: String): Flow<TutorialStep>
-    fun getTutorialSteps(keys: List<String>): Flow<out List<TutorialStep>>
-}
+package com.habitrpg.android.habitica.data
+
+import com.habitrpg.android.habitica.models.TutorialStep
+import kotlinx.coroutines.flow.Flow
+
+interface TutorialRepository : BaseRepository {
+    fun getTutorialStep(key: String): Flow<TutorialStep>
+
+    fun getTutorialSteps(keys: List<String>): Flow<out List<TutorialStep>>
+}
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 4592371bf..657a1b073 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
@@ -1,89 +1,147 @@
-package com.habitrpg.android.habitica.data
-
-import com.habitrpg.android.habitica.models.Achievement
-import com.habitrpg.android.habitica.models.QuestAchievement
-import com.habitrpg.android.habitica.models.Skill
-import com.habitrpg.android.habitica.models.TeamPlan
-import com.habitrpg.android.habitica.models.inventory.Customization
-import com.habitrpg.android.habitica.models.inventory.Equipment
-import com.habitrpg.android.habitica.models.responses.SkillResponse
-import com.habitrpg.android.habitica.models.responses.UnlockResponse
-import com.habitrpg.android.habitica.models.social.Group
-import com.habitrpg.android.habitica.models.tasks.Task
-import com.habitrpg.android.habitica.models.user.Stats
-import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.android.habitica.models.user.UserQuestStatus
-import com.habitrpg.common.habitica.models.Notification
-import com.habitrpg.shared.habitica.models.responses.VerifyUsernameResponse
-import com.habitrpg.shared.habitica.models.tasks.Attribute
-import kotlinx.coroutines.flow.Flow
-
-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 retrieveUser(withTasks: Boolean = false, forced: Boolean = false, overrideExisting: Boolean = false): User?
-
-    suspend fun revive(): Equipment?
-
-    suspend fun resetTutorial(): User?
-
-    suspend fun sleep(user: User): User?
-
-    fun getSkills(user: User): Flow<List<Skill>>
-
-    fun getSpecialItems(user: User): Flow<List<Skill>>
-
-    suspend fun useSkill(key: String, target: String?, taskId: String): SkillResponse?
-    suspend fun useSkill(key: String, target: String?): SkillResponse?
-
-    suspend fun disableClasses(): User?
-    suspend fun changeClass(selectedClass: String? = null): User?
-
-    suspend fun unlockPath(path: String, price: Int): UnlockResponse?
-    suspend fun unlockPath(customization: Customization): UnlockResponse?
-
-    suspend fun runCron(tasks: MutableList<Task>)
-    suspend fun runCron()
-
-    suspend fun getNews(): List<Any>?
-    suspend fun getNewsNotification(): Notification?
-
-    suspend fun readNotification(id: String): List<Any>?
-    suspend fun readNotifications(notificationIds: Map<String, List<String>>): List<Any>?
-    suspend fun seeNotifications(notificationIds: Map<String, List<String>>): List<Any>?
-
-    suspend fun changeCustomDayStart(dayStartTime: Int): User?
-
-    suspend fun updateLanguage(languageCode: String): User?
-
-    suspend fun resetAccount(password: String): User?
-    suspend fun deleteAccount(password: String): Void?
-
-    suspend fun sendPasswordResetEmail(email: String): Void?
-
-    suspend fun updateLoginName(newLoginName: String, password: String? = null): User?
-    suspend fun updateEmail(newEmail: String, password: String): Void?
-    suspend fun updatePassword(oldPassword: String, newPassword: String, newPasswordConfirmation: String): Void?
-    suspend fun verifyUsername(username: String): VerifyUsernameResponse?
-
-    suspend fun allocatePoint(stat: Attribute): Stats?
-    suspend fun bulkAllocatePoints(strength: Int, intelligence: Int, constitution: Int, perception: Int): Stats?
-
-    suspend fun useCustomization(type: String, category: String?, identifier: String): User?
-    suspend fun retrieveAchievements(): List<Achievement>?
-    fun getAchievements(): Flow<List<Achievement>>
-    fun getQuestAchievements(): Flow<List<QuestAchievement>>
-
-    fun getUserQuestStatus(): Flow<UserQuestStatus>
-
-    suspend fun reroll(): User?
-    suspend fun retrieveTeamPlans(): List<TeamPlan>?
-    fun getTeamPlans(): Flow<List<TeamPlan>>
-    suspend fun retrieveTeamPlan(teamID: String): Group?
-    fun getTeamPlan(teamID: String): Flow<Group?>
-    suspend fun syncUserStats(): User?
-}
+package com.habitrpg.android.habitica.data
+
+import com.habitrpg.android.habitica.models.Achievement
+import com.habitrpg.android.habitica.models.QuestAchievement
+import com.habitrpg.android.habitica.models.Skill
+import com.habitrpg.android.habitica.models.TeamPlan
+import com.habitrpg.android.habitica.models.inventory.Customization
+import com.habitrpg.android.habitica.models.inventory.Equipment
+import com.habitrpg.android.habitica.models.responses.SkillResponse
+import com.habitrpg.android.habitica.models.responses.UnlockResponse
+import com.habitrpg.android.habitica.models.social.Group
+import com.habitrpg.android.habitica.models.tasks.Task
+import com.habitrpg.android.habitica.models.user.Stats
+import com.habitrpg.android.habitica.models.user.User
+import com.habitrpg.android.habitica.models.user.UserQuestStatus
+import com.habitrpg.common.habitica.models.Notification
+import com.habitrpg.shared.habitica.models.responses.VerifyUsernameResponse
+import com.habitrpg.shared.habitica.models.tasks.Attribute
+import kotlinx.coroutines.flow.Flow
+
+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 retrieveUser(
+        withTasks: Boolean = false,
+        forced: Boolean = false,
+        overrideExisting: Boolean = false,
+    ): User?
+
+    suspend fun revive(): Equipment?
+
+    suspend fun resetTutorial(): User?
+
+    suspend fun sleep(user: User): User?
+
+    fun getSkills(user: User): Flow<List<Skill>>
+
+    fun getSpecialItems(user: User): Flow<List<Skill>>
+
+    suspend fun useSkill(
+        key: String,
+        target: String?,
+        taskId: String,
+    ): SkillResponse?
+
+    suspend fun useSkill(
+        key: String,
+        target: String?,
+    ): SkillResponse?
+
+    suspend fun disableClasses(): User?
+
+    suspend fun changeClass(selectedClass: String? = null): User?
+
+    suspend fun unlockPath(
+        path: String,
+        price: Int,
+    ): UnlockResponse?
+
+    suspend fun unlockPath(customization: Customization): UnlockResponse?
+
+    suspend fun runCron(tasks: MutableList<Task>)
+
+    suspend fun runCron()
+
+    suspend fun getNews(): List<Any>?
+
+    suspend fun getNewsNotification(): Notification?
+
+    suspend fun readNotification(id: String): List<Any>?
+
+    suspend fun readNotifications(notificationIds: Map<String, List<String>>): List<Any>?
+
+    suspend fun seeNotifications(notificationIds: Map<String, List<String>>): List<Any>?
+
+    suspend fun changeCustomDayStart(dayStartTime: Int): User?
+
+    suspend fun updateLanguage(languageCode: String): User?
+
+    suspend fun resetAccount(password: String): User?
+
+    suspend fun deleteAccount(password: String): Void?
+
+    suspend fun sendPasswordResetEmail(email: String): Void?
+
+    suspend fun updateLoginName(
+        newLoginName: String,
+        password: String? = null,
+    ): User?
+
+    suspend fun updateEmail(
+        newEmail: String,
+        password: String,
+    ): Void?
+
+    suspend fun updatePassword(
+        oldPassword: String,
+        newPassword: String,
+        newPasswordConfirmation: String,
+    ): Void?
+
+    suspend fun verifyUsername(username: String): VerifyUsernameResponse?
+
+    suspend fun allocatePoint(stat: Attribute): Stats?
+
+    suspend fun bulkAllocatePoints(
+        strength: Int,
+        intelligence: Int,
+        constitution: Int,
+        perception: Int,
+    ): Stats?
+
+    suspend fun useCustomization(
+        type: String,
+        category: String?,
+        identifier: String,
+    ): User?
+
+    suspend fun retrieveAchievements(): List<Achievement>?
+
+    fun getAchievements(): Flow<List<Achievement>>
+
+    fun getQuestAchievements(): Flow<List<QuestAchievement>>
+
+    fun getUserQuestStatus(): Flow<UserQuestStatus>
+
+    suspend fun reroll(): User?
+
+    suspend fun retrieveTeamPlans(): List<TeamPlan>?
+
+    fun getTeamPlans(): Flow<List<TeamPlan>>
+
+    suspend fun retrieveTeamPlan(teamID: String): Group?
+
+    fun getTeamPlan(teamID: String): Flow<Group?>
+
+    suspend fun syncUserStats(): 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 3ed819c06..57c9ae160 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
@@ -73,9 +73,8 @@ class ApiClientImpl(
     private val converter: Converter.Factory,
     override val hostConfig: HostConfig,
     private val notificationsManager: NotificationsManager,
-    private val context: Context
+    private val context: Context,
 ) : ApiClient {
-
     private lateinit var retrofitAdapter: Retrofit
 
     // I think we don't need the ApiClientImpl anymore we could just use ApiService
@@ -114,72 +113,78 @@ class ApiClientImpl(
 
         val calendar = GregorianCalendar()
         val timeZone = calendar.timeZone
-        val timezoneOffset = -TimeUnit.MINUTES.convert(
-            timeZone.getOffset(calendar.timeInMillis).toLong(),
-            TimeUnit.MILLISECONDS
-        )
+        val timezoneOffset =
+            -TimeUnit.MINUTES.convert(
+                timeZone.getOffset(calendar.timeInMillis).toLong(),
+                TimeUnit.MILLISECONDS,
+            )
 
         val cacheSize: Long = 10 * 1024 * 1024 // 10 MB
 
         val cache = Cache(File(context.cacheDir, "http_cache"), cacheSize)
 
-        val client = OkHttpClient.Builder()
-            .cache(cache)
-            .addNetworkInterceptor { chain ->
-                val original = chain.request()
-                var builder: Request.Builder = original.newBuilder()
-                if (this.hostConfig.hasAuthentication()) {
-                    builder = builder
-                        .header("x-api-key", this.hostConfig.apiKey)
-                        .header("x-api-user", this.hostConfig.userID)
-                }
-                builder = builder.header("x-client", "habitica-android")
-                    .header("x-user-timezoneOffset", timezoneOffset.toString())
-                if (userAgent != null) {
-                    builder = builder.header("user-agent", userAgent)
-                }
-                if (BuildConfig.STAGING_KEY.isNotEmpty()) {
-                    builder = builder.header("Authorization", "Basic " + BuildConfig.STAGING_KEY)
-                }
-                val request = builder.method(original.method, original.body)
-                    .build()
-                lastAPICallURL = original.url.toString()
-                val response = chain.proceed(request)
-                if (response.isSuccessful) {
-                    hideConnectionProblemDialog()
-                    return@addNetworkInterceptor response
-                } else {
-                    // Modify cache control for 4xx or 5xx range - effectively "do not cache", preventing caching of 4xx and 5xx responses
-                    if (response.code in 400..599) {
-                        when (response.code) {
-                            404 -> {
-                                // The server is returning a 404 error, which means the requested resource was not found.
-                                // In this case - we want to actually cache the response, and handle it in the app
-                                // to prevent a niche HttpException/potential network crash
-                                return@addNetworkInterceptor response
-                            }
-
-                            else -> {
-                                return@addNetworkInterceptor response.newBuilder()
-                                    .header("Cache-Control", "no-store").build()
-                            }
-                        }
-                    } else {
+        val client =
+            OkHttpClient.Builder()
+                .cache(cache)
+                .addNetworkInterceptor { chain ->
+                    val original = chain.request()
+                    var builder: Request.Builder = original.newBuilder()
+                    if (this.hostConfig.hasAuthentication()) {
+                        builder =
+                            builder
+                                .header("x-api-key", this.hostConfig.apiKey)
+                                .header("x-api-user", this.hostConfig.userID)
+                    }
+                    builder =
+                        builder.header("x-client", "habitica-android")
+                            .header("x-user-timezoneOffset", timezoneOffset.toString())
+                    if (userAgent != null) {
+                        builder = builder.header("user-agent", userAgent)
+                    }
+                    if (BuildConfig.STAGING_KEY.isNotEmpty()) {
+                        builder = builder.header("Authorization", "Basic " + BuildConfig.STAGING_KEY)
+                    }
+                    val request =
+                        builder.method(original.method, original.body)
+                            .build()
+                    lastAPICallURL = original.url.toString()
+                    val response = chain.proceed(request)
+                    if (response.isSuccessful) {
+                        hideConnectionProblemDialog()
                         return@addNetworkInterceptor response
+                    } else {
+                        // Modify cache control for 4xx or 5xx range - effectively "do not cache", preventing caching of 4xx and 5xx responses
+                        if (response.code in 400..599) {
+                            when (response.code) {
+                                404 -> {
+                                    // The server is returning a 404 error, which means the requested resource was not found.
+                                    // In this case - we want to actually cache the response, and handle it in the app
+                                    // to prevent a niche HttpException/potential network crash
+                                    return@addNetworkInterceptor response
+                                }
+
+                                else -> {
+                                    return@addNetworkInterceptor response.newBuilder()
+                                        .header("Cache-Control", "no-store").build()
+                                }
+                            }
+                        } else {
+                            return@addNetworkInterceptor response
+                        }
                     }
                 }
-            }
-            .addInterceptor(logging)
-            .readTimeout(2400, TimeUnit.SECONDS)
-            .build()
+                .addInterceptor(logging)
+                .readTimeout(2400, TimeUnit.SECONDS)
+                .build()
 
         val server = Server(this.hostConfig.address)
 
-        retrofitAdapter = Retrofit.Builder()
-            .client(client)
-            .baseUrl(server.toString())
-            .addConverterFactory(converter)
-            .build()
+        retrofitAdapter =
+            Retrofit.Builder()
+                .client(client)
+                .baseUrl(server.toString())
+                .addConverterFactory(converter)
+                .build()
 
         this.apiService = retrofitAdapter.create(ApiService::class.java)
     }
@@ -195,7 +200,7 @@ class ApiClientImpl(
         username: String,
         email: String,
         password: String,
-        confirmPassword: String
+        confirmPassword: String,
     ): UserAuthResponse? {
         val auth = UserAuth()
         auth.username = username
@@ -205,7 +210,10 @@ class ApiClientImpl(
         return process { this.apiService.registerUser(auth) }
     }
 
-    override suspend fun connectUser(username: String, password: String): UserAuthResponse? {
+    override suspend fun connectUser(
+        username: String,
+        password: String,
+    ): UserAuthResponse? {
         val auth = UserAuth()
         auth.username = username
         auth.password = password
@@ -215,7 +223,7 @@ class ApiClientImpl(
     override suspend fun connectSocial(
         network: String,
         userId: String,
-        accessToken: String
+        accessToken: String,
     ): UserAuthResponse? {
         val auth = UserAuthSocial()
         auth.network = network
@@ -243,14 +251,14 @@ class ApiClientImpl(
 
         var isUserInputCall = false
         @Suppress("DEPRECATION")
-        if (SocketException::class.java.isAssignableFrom(throwableClass)
-            || SSLException::class.java.isAssignableFrom(throwableClass)
+        if (SocketException::class.java.isAssignableFrom(throwableClass) ||
+            SSLException::class.java.isAssignableFrom(throwableClass)
         ) {
             this.showConnectionProblemDialog(R.string.internal_error_api, isUserInputCall)
         } else if (throwableClass == SocketTimeoutException::class.java || UnknownHostException::class.java == throwableClass || IOException::class.java == throwableClass) {
             this.showConnectionProblemDialog(
                 R.string.network_error_no_network_body,
-                isUserInputCall
+                isUserInputCall,
             )
         } else if (HttpException::class.java.isAssignableFrom(throwable.javaClass)) {
             val error = throwable as HttpException
@@ -258,10 +266,11 @@ class ApiClientImpl(
             val status = error.code()
             val requestUrl = error.response()?.raw()?.request?.url
             val path = requestUrl?.encodedPath?.removePrefix("/api/v4") ?: ""
-            isUserInputCall = when {
-                path.startsWith("/groups") && path.endsWith("invite") -> true
-                else -> false
-            }
+            isUserInputCall =
+                when {
+                    path.startsWith("/groups") && path.endsWith("invite") -> true
+                    else -> false
+                }
 
             if (res.message != null && res.message == "RECEIPT_ALREADY_USED") {
                 return
@@ -278,7 +287,7 @@ class ApiClientImpl(
                     showConnectionProblemDialog(
                         R.string.authentication_error_title,
                         R.string.authentication_error_body,
-                        isUserInputCall
+                        isUserInputCall,
                     )
                 }
             } else if (status in 500..599) {
@@ -295,15 +304,16 @@ class ApiClientImpl(
 
     override suspend fun updateMember(
         memberID: String,
-        updateData: Map<String, Map<String, Boolean>>
+        updateData: Map<String, Map<String, Boolean>>,
     ): Member? {
         return process { apiService.updateUser(memberID, updateData) }
     }
 
     override fun getErrorResponse(throwable: HttpException): ErrorResponse {
         val errorResponse = throwable.response()?.errorBody() ?: return ErrorResponse()
-        val errorConverter = converter
-            .responseBodyConverter(ErrorResponse::class.java, arrayOfNulls(0), retrofitAdapter)
+        val errorConverter =
+            converter
+                .responseBodyConverter(ErrorResponse::class.java, arrayOfNulls(0), retrofitAdapter)
         return try {
             errorConverter?.convert(errorResponse) as ErrorResponse
         } catch (e: IOException) {
@@ -319,7 +329,10 @@ class ApiClientImpl(
         return user
     }
 
-    override suspend fun retrieveInboxMessages(uuid: String, page: Int): List<ChatMessage>? {
+    override suspend fun retrieveInboxMessages(
+        uuid: String,
+        page: Int,
+    ): List<ChatMessage>? {
         return process { apiService.getInboxMessages(uuid, page) }
     }
 
@@ -333,7 +346,7 @@ class ApiClientImpl(
 
     private fun showConnectionProblemDialog(
         resourceMessageString: Int,
-        isFromUserInput: Boolean
+        isFromUserInput: Boolean,
     ) {
         showConnectionProblemDialog(null, context.getString(resourceMessageString), isFromUserInput)
     }
@@ -341,38 +354,41 @@ class ApiClientImpl(
     private fun showConnectionProblemDialog(
         resourceTitleString: Int,
         resourceMessageString: Int,
-        isFromUserInput: Boolean
+        isFromUserInput: Boolean,
     ) {
         showConnectionProblemDialog(
             context.getString(resourceTitleString),
             context.getString(resourceMessageString),
-            isFromUserInput
+            isFromUserInput,
         )
     }
 
     private var erroredRequestCount = 0
+
     private fun showConnectionProblemDialog(
         resourceTitleString: String?,
         resourceMessageString: String,
-        isFromUserInput: Boolean
+        isFromUserInput: Boolean,
     ) {
         erroredRequestCount += 1
-        val application = (context as? HabiticaBaseApplication)
-            ?: (context.applicationContext as? HabiticaBaseApplication)
+        val application =
+            (context as? HabiticaBaseApplication)
+                ?: (context.applicationContext as? HabiticaBaseApplication)
         application?.currentActivity?.get()
             ?.showConnectionProblem(
                 erroredRequestCount,
                 resourceTitleString,
                 resourceMessageString,
-                isFromUserInput
+                isFromUserInput,
             )
     }
 
     private fun hideConnectionProblemDialog() {
         if (erroredRequestCount == 0) return
         erroredRequestCount = 0
-        val application = (context as? HabiticaBaseApplication)
-            ?: (context.applicationContext as? HabiticaBaseApplication)
+        val application =
+            (context as? HabiticaBaseApplication)
+                ?: (context.applicationContext as? HabiticaBaseApplication)
         application?.currentActivity?.get()
             ?.hideConnectionProblem()
     }
@@ -382,7 +398,10 @@ class ApiClientImpl(
      See here for more info: http://blog.danlew.net/2015/03/02/dont-break-the-chain/
      */
 
-    override fun updateAuthenticationCredentials(userID: String?, apiToken: String?) {
+    override fun updateAuthenticationCredentials(
+        userID: String?,
+        apiToken: String?,
+    ) {
         this.hostConfig.userID = userID ?: ""
         this.hostConfig.apiKey = apiToken ?: ""
         Analytics.setUserID(hostConfig.userID)
@@ -391,9 +410,10 @@ class ApiClientImpl(
     override suspend fun getStatus(): Status? = process { apiService.getStatus() }
 
     override suspend fun syncUserStats(): User? = process { apiService.syncUserStats() }
+
     override suspend fun reportChallenge(
         challengeid: String,
-        updateData: Map<String, String>
+        updateData: Map<String, String>,
     ): Void? {
         return process { apiService.reportChallenge(challengeid, updateData) }
     }
@@ -414,15 +434,24 @@ class ApiClientImpl(
         return process { apiService.retrieveInAppRewards() }
     }
 
-    override suspend fun equipItem(type: String, itemKey: String): Items? {
+    override suspend fun equipItem(
+        type: String,
+        itemKey: String,
+    ): Items? {
         return process { apiService.equipItem(type, itemKey) }
     }
 
-    override suspend fun buyItem(itemKey: String, purchaseQuantity: Int): BuyResponse? {
+    override suspend fun buyItem(
+        itemKey: String,
+        purchaseQuantity: Int,
+    ): BuyResponse? {
         return process { apiService.buyItem(itemKey, mapOf(Pair("quantity", purchaseQuantity))) }
     }
 
-    override suspend fun unlinkAllTasks(challengeID: String?, keepOption: String): Void? {
+    override suspend fun unlinkAllTasks(
+        challengeID: String?,
+        keepOption: String,
+    ): Void? {
         return process { apiService.unlinkAllTasks(challengeID, keepOption) }
     }
 
@@ -430,17 +459,22 @@ class ApiClientImpl(
         return process { apiService.blockMember(userID) }
     }
 
-    override suspend fun purchaseItem(type: String, itemKey: String, purchaseQuantity: Int): Void? {
+    override suspend fun purchaseItem(
+        type: String,
+        itemKey: String,
+        purchaseQuantity: Int,
+    ): Void? {
         return process {
             apiService.purchaseItem(
                 type,
                 itemKey,
-                mapOf(Pair("quantity", purchaseQuantity))
+                mapOf(Pair("quantity", purchaseQuantity)),
             )
         }
     }
 
     val lastSubscribeCall: Date? = null
+
     override suspend fun validateSubscription(request: PurchaseValidationRequest): Any? {
         return if (lastSubscribeCall == null || Date().time - lastSubscribeCall.time > 60000) {
             process { apiService.validateSubscription(request) }
@@ -461,7 +495,10 @@ class ApiClientImpl(
         return processResponse(apiService.cancelSubscription())
     }
 
-    override suspend fun purchaseHourglassItem(type: String, itemKey: String): Void? {
+    override suspend fun purchaseHourglassItem(
+        type: String,
+        itemKey: String,
+    ): Void? {
         return process { apiService.purchaseHourglassItem(type, itemKey) }
     }
 
@@ -477,17 +514,26 @@ class ApiClientImpl(
         return process { apiService.purchaseSpecialSpell(key) }
     }
 
-    override suspend fun sellItem(itemType: String, itemKey: String): User? {
+    override suspend fun sellItem(
+        itemType: String,
+        itemKey: String,
+    ): User? {
         return process { apiService.sellItem(itemType, itemKey) }
     }
 
-    override suspend fun feedPet(petKey: String, foodKey: String): FeedResponse? {
+    override suspend fun feedPet(
+        petKey: String,
+        foodKey: String,
+    ): FeedResponse? {
         val response = apiService.feedPet(petKey, foodKey)
         response.data?.message = response.message
         return process { response }
     }
 
-    override suspend fun hatchPet(eggKey: String, hatchingPotionKey: String): Items? {
+    override suspend fun hatchPet(
+        eggKey: String,
+        hatchingPotionKey: String,
+    ): Items? {
         return process { apiService.hatchPet(eggKey, hatchingPotionKey) }
     }
 
@@ -497,7 +543,10 @@ class ApiClientImpl(
         return process { apiService.getTasks(type) }
     }
 
-    override suspend fun getTasks(type: String, dueDate: String): TaskList? {
+    override suspend fun getTasks(
+        type: String,
+        dueDate: String,
+    ): TaskList? {
         return process { apiService.getTasks(type, dueDate) }
     }
 
@@ -513,7 +562,10 @@ class ApiClientImpl(
         return process { apiService.getTask(id) }
     }
 
-    override suspend fun postTaskDirection(id: String, direction: String): TaskDirectionData? {
+    override suspend fun postTaskDirection(
+        id: String,
+        direction: String,
+    ): TaskDirectionData? {
         return process { apiService.postTaskDirection(id, direction) }
     }
 
@@ -521,11 +573,17 @@ class ApiClientImpl(
         return process { apiService.bulkScoreTasks(data) }
     }
 
-    override suspend fun postTaskNewPosition(id: String, position: Int): List<String>? {
+    override suspend fun postTaskNewPosition(
+        id: String,
+        position: Int,
+    ): List<String>? {
         return process { apiService.postTaskNewPosition(id, position) }
     }
 
-    override suspend fun scoreChecklistItem(taskId: String, itemId: String): Task? {
+    override suspend fun scoreChecklistItem(
+        taskId: String,
+        itemId: String,
+    ): Task? {
         return process { apiService.scoreChecklistItem(taskId, itemId) }
     }
 
@@ -533,7 +591,10 @@ class ApiClientImpl(
         return process { apiService.createTask(item) }
     }
 
-    override suspend fun createGroupTask(groupId: String, item: Task): Task? {
+    override suspend fun createGroupTask(
+        groupId: String,
+        item: Task,
+    ): Task? {
         return process { apiService.createGroupTask(groupId, item) }
     }
 
@@ -541,7 +602,10 @@ class ApiClientImpl(
         return process { apiService.createTasks(tasks) }
     }
 
-    override suspend fun updateTask(id: String, item: Task): Task? {
+    override suspend fun updateTask(
+        id: String,
+        item: Task,
+    ): Task? {
         return process { apiService.updateTask(id, item) }
     }
 
@@ -553,7 +617,10 @@ class ApiClientImpl(
         return process { apiService.createTag(tag) }
     }
 
-    override suspend fun updateTag(id: String, tag: Tag): Tag? {
+    override suspend fun updateTag(
+        id: String,
+        tag: Tag,
+    ): Tag? {
         return process { apiService.updateTag(id, tag) }
     }
 
@@ -568,12 +635,15 @@ class ApiClientImpl(
     override suspend fun useSkill(
         skillName: String,
         targetType: String,
-        targetId: String
+        targetId: String,
     ): SkillResponse? {
         return process { apiService.useSkill(skillName, targetType, targetId) }
     }
 
-    override suspend fun useSkill(skillName: String, targetType: String): SkillResponse? {
+    override suspend fun useSkill(
+        skillName: String,
+        targetType: String,
+    ): SkillResponse? {
         return process { apiService.useSkill(skillName, targetType) }
     }
 
@@ -605,11 +675,17 @@ class ApiClientImpl(
         return processResponse(apiService.createGroup(group))
     }
 
-    override suspend fun updateGroup(id: String, item: Group): Group? {
+    override suspend fun updateGroup(
+        id: String,
+        item: Group,
+    ): Group? {
         return processResponse(apiService.updateGroup(id, item))
     }
 
-    override suspend fun removeMemberFromGroup(groupID: String, userID: String): Void? {
+    override suspend fun removeMemberFromGroup(
+        groupID: String,
+        userID: String,
+    ): Void? {
         return processResponse(apiService.removeMemberFromGroup(groupID, userID))
     }
 
@@ -621,18 +697,24 @@ class ApiClientImpl(
         return processResponse(apiService.joinGroup(groupId))
     }
 
-    override suspend fun leaveGroup(groupId: String, keepChallenges: String): Void? {
+    override suspend fun leaveGroup(
+        groupId: String,
+        keepChallenges: String,
+    ): Void? {
         return processResponse(apiService.leaveGroup(groupId, keepChallenges))
     }
 
     override suspend fun postGroupChat(
         groupId: String,
-        message: Map<String, String>
+        message: Map<String, String>,
     ): PostChatMessageResult? {
         return process { apiService.postGroupChat(groupId, message) }
     }
 
-    override suspend fun deleteMessage(groupId: String, messageId: String): Void? {
+    override suspend fun deleteMessage(
+        groupId: String,
+        messageId: String,
+    ): Void? {
         return process { apiService.deleteMessage(groupId, messageId) }
     }
 
@@ -642,7 +724,7 @@ class ApiClientImpl(
 
     override suspend fun getGroupMembers(
         groupId: String,
-        includeAllPublicFields: Boolean?
+        includeAllPublicFields: Boolean?,
     ): List<Member>? {
         return processResponse(apiService.getGroupMembers(groupId, includeAllPublicFields))
     }
@@ -650,28 +732,37 @@ class ApiClientImpl(
     override suspend fun getGroupMembers(
         groupId: String,
         includeAllPublicFields: Boolean?,
-        lastId: String
+        lastId: String,
     ): List<Member>? {
         return processResponse(apiService.getGroupMembers(groupId, includeAllPublicFields, lastId))
     }
 
-    override suspend fun likeMessage(groupId: String, mid: String): ChatMessage? {
+    override suspend fun likeMessage(
+        groupId: String,
+        mid: String,
+    ): ChatMessage? {
         return process { apiService.likeMessage(groupId, mid) }
     }
 
-    override suspend fun reportMember(mid: String, data: Map<String, String>): Void? {
+    override suspend fun reportMember(
+        mid: String,
+        data: Map<String, String>,
+    ): Void? {
         return process { apiService.reportMember(mid, data) }
     }
 
     override suspend fun flagMessage(
         groupId: String,
         mid: String,
-        data: MutableMap<String, String>
+        data: MutableMap<String, String>,
     ): Void? {
         return process { apiService.flagMessage(groupId, mid, data) }
     }
 
-    override suspend fun flagInboxMessage(mid: String, data: MutableMap<String, String>): Void? {
+    override suspend fun flagInboxMessage(
+        mid: String,
+        data: MutableMap<String, String>,
+    ): Void? {
         return process { apiService.flagInboxMessage(mid, data) }
     }
 
@@ -681,7 +772,7 @@ class ApiClientImpl(
 
     override suspend fun inviteToGroup(
         groupId: String,
-        inviteData: Map<String, Any>
+        inviteData: Map<String, Any>,
     ): List<InviteResponse>? {
         return process { apiService.inviteToGroup(groupId, inviteData) }
     }
@@ -692,7 +783,7 @@ class ApiClientImpl(
 
     override suspend fun getGroupInvites(
         groupId: String,
-        includeAllPublicFields: Boolean?
+        includeAllPublicFields: Boolean?,
     ): List<Member>? {
         return process { apiService.getGroupInvites(groupId, includeAllPublicFields) }
     }
@@ -709,11 +800,17 @@ class ApiClientImpl(
         return process { apiService.cancelQuest(groupId) }
     }
 
-    override suspend fun forceStartQuest(groupId: String, group: Group): Quest? {
+    override suspend fun forceStartQuest(
+        groupId: String,
+        group: Group,
+    ): Quest? {
         return process { apiService.forceStartQuest(groupId, group) }
     }
 
-    override suspend fun inviteToQuest(groupId: String, questKey: String): Quest? {
+    override suspend fun inviteToQuest(
+        groupId: String,
+        questKey: String,
+    ): Quest? {
         return process { apiService.inviteToQuest(groupId, questKey) }
     }
 
@@ -726,6 +823,7 @@ class ApiClientImpl(
     }
 
     private val lastPurchaseValidation: Date? = null
+
     override suspend fun validatePurchase(request: PurchaseValidationRequest): PurchaseValidationResult? {
         // make sure a purchase attempt doesn't happen
         return if (lastPurchaseValidation == null || Date().time - lastPurchaseValidation.time > 5000) {
@@ -739,7 +837,10 @@ class ApiClientImpl(
         return process { apiService.changeCustomDayStart(updateObject) }
     }
 
-    override suspend fun markTaskNeedsWork(taskID: String, userID: String): Task? {
+    override suspend fun markTaskNeedsWork(
+        taskID: String,
+        userID: String,
+    ): Task? {
         return process { apiService.markTaskNeedsWork(taskID, userID) }
     }
 
@@ -760,7 +861,7 @@ class ApiClientImpl(
     override suspend fun findUsernames(
         username: String,
         context: String?,
-        id: String?
+        id: String?,
     ): List<FindUsernameResult>? {
         return process { apiService.findUsernames(username, context, id) }
     }
@@ -781,7 +882,10 @@ class ApiClientImpl(
         return process { apiService.deletePushDevice(regId) }
     }
 
-    override suspend fun getUserChallenges(page: Int, memberOnly: Boolean): List<Challenge>? {
+    override suspend fun getUserChallenges(
+        page: Int,
+        memberOnly: Boolean,
+    ): List<Challenge>? {
         return if (memberOnly) {
             process { apiService.getUserChallenges(page, memberOnly) }
         } else {
@@ -801,7 +905,10 @@ class ApiClientImpl(
         return process { apiService.joinChallenge(challengeId) }
     }
 
-    override suspend fun leaveChallenge(challengeId: String, body: LeaveChallengeBody): Void? {
+    override suspend fun leaveChallenge(
+        challengeId: String,
+        body: LeaveChallengeBody,
+    ): Void? {
         return process { apiService.leaveChallenge(challengeId, body) }
     }
 
@@ -809,11 +916,17 @@ class ApiClientImpl(
         return process { apiService.createChallenge(challenge) }
     }
 
-    override suspend fun createChallengeTasks(challengeId: String, tasks: List<Task>): List<Task>? {
+    override suspend fun createChallengeTasks(
+        challengeId: String,
+        tasks: List<Task>,
+    ): List<Task>? {
         return process { apiService.createChallengeTasks(challengeId, tasks) }
     }
 
-    override suspend fun createChallengeTask(challengeId: String, task: Task): Task? {
+    override suspend fun createChallengeTask(
+        challengeId: String,
+        task: Task,
+    ): Task? {
         return process { apiService.createChallengeTask(challengeId, task) }
     }
 
@@ -867,7 +980,10 @@ class ApiClientImpl(
         return process { apiService.deleteAccount(updateObject) }
     }
 
-    override suspend fun togglePinnedItem(pinType: String, path: String): Void? {
+    override suspend fun togglePinnedItem(
+        pinType: String,
+        path: String,
+    ): Void? {
         return process { apiService.togglePinnedItem(pinType, path) }
     }
 
@@ -877,7 +993,10 @@ class ApiClientImpl(
         return process { apiService.sendPasswordResetEmail(data) }
     }
 
-    override suspend fun updateLoginName(newLoginName: String, password: String): Void? {
+    override suspend fun updateLoginName(
+        newLoginName: String,
+        password: String,
+    ): Void? {
         val updateObject = HashMap<String, String>()
         updateObject["username"] = newLoginName
         updateObject["password"] = password
@@ -896,7 +1015,10 @@ class ApiClientImpl(
         return process { this.apiService.verifyUsername(updateObject) }
     }
 
-    override suspend fun updateEmail(newEmail: String, password: String): Void? {
+    override suspend fun updateEmail(
+        newEmail: String,
+        password: String,
+    ): Void? {
         val updateObject = HashMap<String, String>()
         updateObject["newEmail"] = newEmail
         if (password.isNotBlank()) {
@@ -908,7 +1030,7 @@ class ApiClientImpl(
     override suspend fun updatePassword(
         oldPassword: String,
         newPassword: String,
-        newPasswordConfirmation: String
+        newPasswordConfirmation: String,
     ): Void? {
         val updateObject = HashMap<String, String>()
         updateObject["password"] = oldPassword
@@ -921,13 +1043,16 @@ class ApiClientImpl(
         return process { apiService.allocatePoint(stat) }
     }
 
-    override suspend fun transferGems(giftedID: String, amount: Int): Void? {
+    override suspend fun transferGems(
+        giftedID: String,
+        amount: Int,
+    ): Void? {
         return process {
             apiService.transferGems(
                 mapOf(
                     Pair("toUserId", giftedID),
-                    Pair("gemAmount", amount)
-                )
+                    Pair("gemAmount", amount),
+                ),
             )
         }
     }
@@ -940,11 +1065,17 @@ class ApiClientImpl(
         return processResponse(apiService.getTeamPlanTasks(teamID))
     }
 
-    override suspend fun assignToTask(taskId: String, ids: List<String>): Task? {
+    override suspend fun assignToTask(
+        taskId: String,
+        ids: List<String>,
+    ): Task? {
         return process { apiService.assignToTask(taskId, ids) }
     }
 
-    override suspend fun unassignFromTask(taskId: String, userID: String): Task? {
+    override suspend fun unassignFromTask(
+        taskId: String,
+        userID: String,
+    ): Task? {
         return process { apiService.unassignFromTask(taskId, userID) }
     }
 
@@ -952,7 +1083,7 @@ class ApiClientImpl(
         strength: Int,
         intelligence: Int,
         constitution: Int,
-        perception: Int
+        perception: Int,
     ): Stats? {
         val body = HashMap<String, Map<String, Int>>()
         val stats = HashMap<String, Int>()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/BaseRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/BaseRepositoryImpl.kt
index d11783e47..ccbaba2d7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/BaseRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/BaseRepositoryImpl.kt
@@ -9,9 +9,8 @@ import com.habitrpg.android.habitica.modules.AuthenticationHandler
 abstract class BaseRepositoryImpl<T : BaseLocalRepository>(
     protected val localRepository: T,
     protected val apiClient: ApiClient,
-    protected val authenticationHandler: AuthenticationHandler
+    protected val authenticationHandler: AuthenticationHandler,
 ) : BaseRepository {
-
     val currentUserID: String
         get() = authenticationHandler.currentUserID ?: ""
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ChallengeRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ChallengeRepositoryImpl.kt
index 3b74376c5..9b859f43d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ChallengeRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ChallengeRepositoryImpl.kt
@@ -16,16 +16,16 @@ import kotlinx.coroutines.flow.Flow
 class ChallengeRepositoryImpl(
     localRepository: ChallengeLocalRepository,
     apiClient: ApiClient,
-    authenticationHandler: AuthenticationHandler
-) : BaseRepositoryImpl<ChallengeLocalRepository>(localRepository, apiClient, authenticationHandler), ChallengeRepository {
-
+    authenticationHandler: AuthenticationHandler,
+) : BaseRepositoryImpl<ChallengeLocalRepository>(localRepository, apiClient, authenticationHandler),
+    ChallengeRepository {
     override fun isChallengeMember(challengeID: String): Flow<Boolean> {
         return localRepository.isChallengeMember(currentUserID, challengeID)
     }
 
     override suspend fun reportChallenge(
         challengeid: String,
-        updateData: Map<String, String>
+        updateData: Map<String, String>,
     ): Void? {
         return apiClient.reportChallenge(challengeid, updateData)
     }
@@ -83,14 +83,29 @@ class ChallengeRepositoryImpl(
         return tasksOrder
     }
 
-    private suspend fun addChallengeTasks(challenge: Challenge, addedTaskList: List<Task>) {
+    private suspend fun addChallengeTasks(
+        challenge: Challenge,
+        addedTaskList: List<Task>,
+    ) {
         when {
-            addedTaskList.count() == 1 -> apiClient.createChallengeTask(challenge.id ?: "", addedTaskList[0])
-            addedTaskList.count() > 1 -> apiClient.createChallengeTasks(challenge.id ?: "", addedTaskList)
+            addedTaskList.count() == 1 ->
+                apiClient.createChallengeTask(
+                    challenge.id ?: "",
+                    addedTaskList[0],
+                )
+
+            addedTaskList.count() > 1 ->
+                apiClient.createChallengeTasks(
+                    challenge.id ?: "",
+                    addedTaskList,
+                )
         }
     }
 
-    override suspend fun createChallenge(challenge: Challenge, taskList: List<Task>): Challenge? {
+    override suspend fun createChallenge(
+        challenge: Challenge,
+        taskList: List<Task>,
+    ): Challenge? {
         challenge.tasksOrder = getTaskOrders(taskList)
 
         val createdChallenge = apiClient.createChallenge(challenge)
@@ -105,7 +120,7 @@ class ChallengeRepositoryImpl(
         fullTaskList: List<Task>,
         addedTaskList: List<Task>,
         updatedTaskList: List<Task>,
-        removedTaskList: List<String>
+        removedTaskList: List<String>,
     ): Challenge? {
         updatedTaskList
             .map { localRepository.getUnmanagedCopy(it) }
@@ -141,7 +156,10 @@ class ChallengeRepositoryImpl(
         return localRepository.getUserChallenges(userId ?: currentUserID)
     }
 
-    override suspend fun retrieveChallenges(page: Int, memberOnly: Boolean): List<Challenge>? {
+    override suspend fun retrieveChallenges(
+        page: Int,
+        memberOnly: Boolean,
+    ): List<Challenge>? {
         val challenges = apiClient.getUserChallenges(page, memberOnly)
         if (challenges != null) {
             localRepository.saveChallenges(challenges, page == 0, memberOnly, currentUserID)
@@ -149,7 +167,10 @@ class ChallengeRepositoryImpl(
         return challenges
     }
 
-    override suspend fun leaveChallenge(challenge: Challenge, keepTasks: String): Void? {
+    override suspend fun leaveChallenge(
+        challenge: Challenge,
+        keepTasks: String,
+    ): Void? {
         apiClient.leaveChallenge(challenge.id ?: "", LeaveChallengeBody(keepTasks))
         localRepository.setParticipating(currentUserID, challenge.id ?: "", false)
         return null
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ContentRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ContentRepositoryImpl.kt
index ea13d93ba..d8e13a3cc 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ContentRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ContentRepositoryImpl.kt
@@ -1,60 +1,59 @@
-package com.habitrpg.android.habitica.data.implementation
-
-import android.content.Context
-import com.habitrpg.android.habitica.data.ApiClient
-import com.habitrpg.android.habitica.data.ContentRepository
-import com.habitrpg.android.habitica.data.local.ContentLocalRepository
-import com.habitrpg.android.habitica.helpers.AprilFoolsHandler
-import com.habitrpg.android.habitica.models.ContentResult
-import com.habitrpg.android.habitica.models.WorldState
-import com.habitrpg.android.habitica.models.inventory.SpecialItem
-import com.habitrpg.android.habitica.modules.AuthenticationHandler
-import io.realm.RealmList
-import kotlinx.coroutines.flow.Flow
-import java.util.Date
-
-class ContentRepositoryImpl<T : ContentLocalRepository>(
-    localRepository: T,
-    apiClient: ApiClient,
-    context: Context,
-    authenticationHandler: AuthenticationHandler
-) : BaseRepositoryImpl<T>(localRepository, apiClient, authenticationHandler), ContentRepository {
-
-    private val mysteryItem = SpecialItem.makeMysteryItem(context)
-
-    private var lastContentSync = 0L
-    private var lastWorldStateSync = 0L
-
-    override suspend fun retrieveContent(forced: Boolean): ContentResult? {
-        val now = Date().time
-        if (forced || now - this.lastContentSync > 300000) {
-            val content = apiClient.getContent() ?: return null
-            lastContentSync = now
-            content.special = RealmList()
-            content.special.add(mysteryItem)
-            localRepository.saveContent(content)
-            return content
-        }
-        return null
-    }
-
-    override suspend fun retrieveWorldState(forced: Boolean): WorldState? {
-        val now = Date().time
-        if (forced || now - this.lastWorldStateSync > 3600000) {
-            val state = apiClient.getWorldState() ?: return null
-            lastWorldStateSync = now
-            localRepository.save(state)
-            for (event in state.events) {
-                if (event.aprilFools != null && event.isCurrentlyActive) {
-                    AprilFoolsHandler.handle(event.aprilFools, event.end)
-                }
-            }
-            return state
-        }
-        return null
-    }
-
-    override fun getWorldState(): Flow<WorldState> {
-        return localRepository.getWorldState()
-    }
-}
+package com.habitrpg.android.habitica.data.implementation
+
+import android.content.Context
+import com.habitrpg.android.habitica.data.ApiClient
+import com.habitrpg.android.habitica.data.ContentRepository
+import com.habitrpg.android.habitica.data.local.ContentLocalRepository
+import com.habitrpg.android.habitica.helpers.AprilFoolsHandler
+import com.habitrpg.android.habitica.models.ContentResult
+import com.habitrpg.android.habitica.models.WorldState
+import com.habitrpg.android.habitica.models.inventory.SpecialItem
+import com.habitrpg.android.habitica.modules.AuthenticationHandler
+import io.realm.RealmList
+import kotlinx.coroutines.flow.Flow
+import java.util.Date
+
+class ContentRepositoryImpl<T : ContentLocalRepository>(
+    localRepository: T,
+    apiClient: ApiClient,
+    context: Context,
+    authenticationHandler: AuthenticationHandler,
+) : BaseRepositoryImpl<T>(localRepository, apiClient, authenticationHandler), ContentRepository {
+    private val mysteryItem = SpecialItem.makeMysteryItem(context)
+
+    private var lastContentSync = 0L
+    private var lastWorldStateSync = 0L
+
+    override suspend fun retrieveContent(forced: Boolean): ContentResult? {
+        val now = Date().time
+        if (forced || now - this.lastContentSync > 300000) {
+            val content = apiClient.getContent() ?: return null
+            lastContentSync = now
+            content.special = RealmList()
+            content.special.add(mysteryItem)
+            localRepository.saveContent(content)
+            return content
+        }
+        return null
+    }
+
+    override suspend fun retrieveWorldState(forced: Boolean): WorldState? {
+        val now = Date().time
+        if (forced || now - this.lastWorldStateSync > 3600000) {
+            val state = apiClient.getWorldState() ?: return null
+            lastWorldStateSync = now
+            localRepository.save(state)
+            for (event in state.events) {
+                if (event.aprilFools != null && event.isCurrentlyActive) {
+                    AprilFoolsHandler.handle(event.aprilFools, event.end)
+                }
+            }
+            return state
+        }
+        return null
+    }
+
+    override fun getWorldState(): Flow<WorldState> {
+        return localRepository.getWorldState()
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/CustomizationRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/CustomizationRepositoryImpl.kt
index fee731782..9d77d3b85 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/CustomizationRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/CustomizationRepositoryImpl.kt
@@ -1,19 +1,27 @@
-package com.habitrpg.android.habitica.data.implementation
-
-import com.habitrpg.android.habitica.data.ApiClient
-import com.habitrpg.android.habitica.data.CustomizationRepository
-import com.habitrpg.android.habitica.data.local.CustomizationLocalRepository
-import com.habitrpg.android.habitica.models.inventory.Customization
-import com.habitrpg.android.habitica.modules.AuthenticationHandler
-import kotlinx.coroutines.flow.Flow
-
-class CustomizationRepositoryImpl(
-    localRepository: CustomizationLocalRepository,
-    apiClient: ApiClient,
-    authenticationHandler: AuthenticationHandler
-) : BaseRepositoryImpl<CustomizationLocalRepository>(localRepository, apiClient, authenticationHandler), CustomizationRepository {
-
-    override fun getCustomizations(type: String, category: String?, onlyAvailable: Boolean): Flow<List<Customization>> {
-        return localRepository.getCustomizations(type, category, onlyAvailable)
-    }
-}
+package com.habitrpg.android.habitica.data.implementation
+
+import com.habitrpg.android.habitica.data.ApiClient
+import com.habitrpg.android.habitica.data.CustomizationRepository
+import com.habitrpg.android.habitica.data.local.CustomizationLocalRepository
+import com.habitrpg.android.habitica.models.inventory.Customization
+import com.habitrpg.android.habitica.modules.AuthenticationHandler
+import kotlinx.coroutines.flow.Flow
+
+class CustomizationRepositoryImpl(
+    localRepository: CustomizationLocalRepository,
+    apiClient: ApiClient,
+    authenticationHandler: AuthenticationHandler,
+) : BaseRepositoryImpl<CustomizationLocalRepository>(
+        localRepository,
+        apiClient,
+        authenticationHandler,
+    ),
+    CustomizationRepository {
+    override fun getCustomizations(
+        type: String,
+        category: String?,
+        onlyAvailable: Boolean,
+    ): Flow<List<Customization>> {
+        return localRepository.getCustomizations(type, category, onlyAvailable)
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/FAQRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/FAQRepositoryImpl.kt
index e09cbda95..b33cf5bc2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/FAQRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/FAQRepositoryImpl.kt
@@ -1,23 +1,23 @@
-package com.habitrpg.android.habitica.data.implementation
-
-import com.habitrpg.android.habitica.data.ApiClient
-import com.habitrpg.android.habitica.data.FAQRepository
-import com.habitrpg.android.habitica.data.local.FAQLocalRepository
-import com.habitrpg.android.habitica.models.FAQArticle
-import com.habitrpg.android.habitica.modules.AuthenticationHandler
-import kotlinx.coroutines.flow.Flow
-
-class FAQRepositoryImpl(
-    localRepository: FAQLocalRepository,
-    apiClient: ApiClient,
-    authenticationHandler: AuthenticationHandler
-) : BaseRepositoryImpl<FAQLocalRepository>(localRepository, apiClient, authenticationHandler),
-    FAQRepository {
-    override fun getArticle(position: Int): Flow<FAQArticle> {
-        return localRepository.getArticle(position)
-    }
-
-    override fun getArticles(): Flow<List<FAQArticle>> {
-        return localRepository.articles
-    }
-}
+package com.habitrpg.android.habitica.data.implementation
+
+import com.habitrpg.android.habitica.data.ApiClient
+import com.habitrpg.android.habitica.data.FAQRepository
+import com.habitrpg.android.habitica.data.local.FAQLocalRepository
+import com.habitrpg.android.habitica.models.FAQArticle
+import com.habitrpg.android.habitica.modules.AuthenticationHandler
+import kotlinx.coroutines.flow.Flow
+
+class FAQRepositoryImpl(
+    localRepository: FAQLocalRepository,
+    apiClient: ApiClient,
+    authenticationHandler: AuthenticationHandler,
+) : BaseRepositoryImpl<FAQLocalRepository>(localRepository, apiClient, authenticationHandler),
+    FAQRepository {
+    override fun getArticle(position: Int): Flow<FAQArticle> {
+        return localRepository.getArticle(position)
+    }
+
+    override fun getArticles(): Flow<List<FAQArticle>> {
+        return localRepository.articles
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.kt
index ae0e6eab8..2ef324708 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.kt
@@ -1,318 +1,391 @@
-@file:OptIn(ExperimentalCoroutinesApi::class)
-
-package com.habitrpg.android.habitica.data.implementation
-
-import com.habitrpg.android.habitica.data.ApiClient
-import com.habitrpg.android.habitica.data.InventoryRepository
-import com.habitrpg.android.habitica.data.local.InventoryLocalRepository
-import com.habitrpg.android.habitica.helpers.AppConfigManager
-import com.habitrpg.android.habitica.models.inventory.Egg
-import com.habitrpg.android.habitica.models.inventory.Equipment
-import com.habitrpg.android.habitica.models.inventory.Food
-import com.habitrpg.android.habitica.models.inventory.HatchingPotion
-import com.habitrpg.android.habitica.models.inventory.Item
-import com.habitrpg.android.habitica.models.inventory.Mount
-import com.habitrpg.android.habitica.models.inventory.Pet
-import com.habitrpg.android.habitica.models.inventory.Quest
-import com.habitrpg.android.habitica.models.inventory.QuestContent
-import com.habitrpg.android.habitica.models.responses.BuyResponse
-import com.habitrpg.android.habitica.models.shops.Shop
-import com.habitrpg.android.habitica.models.shops.ShopItem
-import com.habitrpg.android.habitica.models.user.Items
-import com.habitrpg.android.habitica.models.user.OwnedItem
-import com.habitrpg.android.habitica.models.user.OwnedMount
-import com.habitrpg.android.habitica.models.user.OwnedPet
-import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.android.habitica.modules.AuthenticationHandler
-import com.habitrpg.shared.habitica.models.responses.FeedResponse
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.firstOrNull
-import kotlinx.coroutines.flow.flatMapLatest
-
-class InventoryRepositoryImpl(
-    localRepository: InventoryLocalRepository,
-    apiClient: ApiClient,
-    authenticationHandler: AuthenticationHandler,
-    var appConfigManager: AppConfigManager
-) : BaseRepositoryImpl<InventoryLocalRepository>(localRepository, apiClient, authenticationHandler), InventoryRepository {
-    override fun getQuestContent(keys: List<String>) = localRepository.getQuestContent(keys)
-
-    override fun getQuestContent(key: String) = localRepository.getQuestContent(key)
-
-    override fun getEquipment(searchedKeys: List<String>): Flow<List<Equipment>> {
-        return localRepository.getEquipment(searchedKeys)
-    }
-
-    override fun getArmoireRemainingCount(): Flow<Int> {
-        return localRepository.getArmoireRemainingCount()
-    }
-
-    override fun getInAppRewards(): Flow<List<ShopItem>> {
-        return localRepository.getInAppRewards()
-    }
-
-    override fun getInAppReward(key: String): Flow<ShopItem> {
-        return localRepository.getInAppReward(key)
-    }
-
-    override suspend fun retrieveInAppRewards(): List<ShopItem>? {
-        val rewards = apiClient.retrieveInAppRewards()
-        if (rewards != null) {
-            localRepository.saveInAppRewards(rewards)
-        }
-        return rewards
-    }
-
-    override fun getOwnedEquipment(type: String): Flow<List<Equipment>> {
-        return localRepository.getOwnedEquipment(type)
-    }
-
-    override fun getOwnedEquipment(): Flow<List<Equipment>> {
-        return localRepository.getOwnedEquipment()
-    }
-
-    override fun getEquipmentType(type: String, set: String): Flow<List<Equipment>> {
-        return localRepository.getEquipmentType(type, set)
-    }
-
-    override fun getOwnedItems(itemType: String, includeZero: Boolean): Flow<List<OwnedItem>> {
-        return authenticationHandler.userIDFlow.flatMapLatest { localRepository.getOwnedItems(itemType, it, includeZero) }
-    }
-
-    override fun getOwnedItems(includeZero: Boolean): Flow<Map<String, OwnedItem>> {
-        return authenticationHandler.userIDFlow.flatMapLatest { localRepository.getOwnedItems(it, includeZero) }
-    }
-
-    override fun getItems(itemClass: Class<out Item>, keys: Array<String>): Flow<List<Item>> {
-        return localRepository.getItems(itemClass, keys)
-    }
-
-    override fun getItems(itemClass: Class<out Item>): Flow<List<Item>> {
-        return localRepository.getItems(itemClass)
-    }
-
-    override fun getEquipment(key: String): Flow<Equipment> {
-        return localRepository.getEquipment(key)
-    }
-
-    override suspend fun openMysteryItem(user: User?): Equipment? {
-        val item = apiClient.openMysteryItem()
-        val equipment = localRepository.getEquipment(item?.key ?: "").firstOrNull() ?: return null
-        val liveEquipment = localRepository.getLiveObject(equipment)
-        localRepository.executeTransaction {
-            liveEquipment?.owned = true
-        }
-        localRepository.decrementMysteryItemCount(user)
-        return equipment
-    }
-
-    override fun saveEquipment(equipment: Equipment) {
-        localRepository.save(equipment)
-    }
-
-    override fun getMounts(): Flow<List<Mount>> {
-        return localRepository.getMounts()
-    }
-
-    override fun getMounts(type: String?, group: String?, color: String?): Flow<List<Mount>> {
-        return localRepository.getMounts(type, group, color)
-    }
-
-    override fun getOwnedMounts(): Flow<List<OwnedMount>> {
-        return authenticationHandler.userIDFlow.flatMapLatest { localRepository.getOwnedMounts(it) }
-    }
-
-    override fun getPets(): Flow<List<Pet>> {
-        return localRepository.getPets()
-    }
-
-    override fun getPets(type: String?, group: String?, color: String?): Flow<List<Pet>> {
-        return localRepository.getPets(type, group, color)
-    }
-
-    override fun getOwnedPets(): Flow<List<OwnedPet>> {
-        return authenticationHandler.userIDFlow.flatMapLatest { localRepository.getOwnedPets(it) }
-    }
-
-    override fun updateOwnedEquipment(user: User) {
-        localRepository.updateOwnedEquipment(user)
-    }
-
-    override suspend fun changeOwnedCount(type: String, key: String, amountToAdd: Int) {
-        localRepository.changeOwnedCount(type, key, currentUserID, amountToAdd)
-    }
-
-    override suspend fun sellItem(type: String, key: String): User? {
-        val item = localRepository.getOwnedItem(currentUserID, type, key, true).firstOrNull() ?: return null
-        return sellItem(item)
-    }
-
-    override suspend fun sellItem(item: OwnedItem): User? {
-        val itemData = localRepository.getItem(item.itemType ?: "", item.key ?: "").firstOrNull() ?: return null
-        return sellItem(itemData, item)
-    }
-
-    override fun getLatestMysteryItem(): Flow<Equipment> {
-        return localRepository.getLatestMysteryItem()
-    }
-
-    override fun getItem(type: String, key: String): Flow<Item> {
-        return localRepository.getItem(type, key)
-    }
-
-    private suspend fun sellItem(item: Item, ownedItem: OwnedItem): User? {
-        localRepository.executeTransaction {
-            val liveItem = localRepository.getLiveObject(ownedItem)
-            liveItem?.numberOwned = (liveItem?.numberOwned ?: 0) - 1
-        }
-        val user = apiClient.sellItem(item.type, item.key) ?: return null
-        return localRepository.soldItem(currentUserID, user)
-    }
-
-    override suspend fun equipGear(equipment: String, asCostume: Boolean): Items? {
-        return equip(if (asCostume) "costume" else "equipped", equipment)
-    }
-
-    override suspend fun equip(type: String, key: String): Items? {
-        val liveUser = localRepository.getLiveUser(currentUserID)
-
-        if (liveUser != null) {
-            localRepository.modify(liveUser) { user ->
-                if (type == "mount") {
-                    user.items?.currentMount = key
-                } else if (type == "pet") {
-                    user.items?.currentPet = key
-                }
-                val outfit = if (type == "costume") {
-                    user.items?.gear?.costume
-                } else {
-                    user.items?.gear?.equipped
-                }
-                when (key.split("_").firstOrNull()) {
-                    "weapon" -> outfit?.weapon = key
-                    "armor" -> outfit?.armor = key
-                    "shield" -> outfit?.shield = key
-                    "eyewear" -> outfit?.eyeWear = key
-                    "head" -> outfit?.head = key
-                    "back" -> outfit?.back = key
-                    "headAccessory" -> outfit?.headAccessory = key
-                    "body" -> outfit?.body = key
-                }
-            }
-        }
-        val items = apiClient.equipItem(type, key) ?: return null
-        if (liveUser == null) return null
-        localRepository.modify(liveUser) { liveUser ->
-            val newEquipped = items.gear?.equipped
-            val oldEquipped = liveUser.items?.gear?.equipped
-            val newCostume = items.gear?.costume
-            val oldCostume = liveUser.items?.gear?.costume
-            newEquipped?.let { equipped -> oldEquipped?.updateWith(equipped) }
-            newCostume?.let { costume -> oldCostume?.updateWith(costume) }
-            liveUser.items?.currentMount = items.currentMount
-            liveUser.items?.currentPet = items.currentPet
-            liveUser.balance = liveUser.balance
-        }
-        return items
-    }
-
-    override suspend fun feedPet(pet: Pet, food: Food): FeedResponse? {
-        val feedResponse = apiClient.feedPet(pet.key, food.key) ?: return null
-        localRepository.feedPet(food.key, pet.key, feedResponse.value ?: 0, currentUserID)
-        return feedResponse
-    }
-
-    override suspend fun hatchPet(egg: Egg, hatchingPotion: HatchingPotion, successFunction: () -> Unit): Items? {
-        if (appConfigManager.enableLocalChanges()) {
-            localRepository.hatchPet(egg.key, hatchingPotion.key, currentUserID)
-            successFunction()
-        }
-        val items = apiClient.hatchPet(egg.key, hatchingPotion.key) ?: return null
-        localRepository.save(items, currentUserID)
-        if (!appConfigManager.enableLocalChanges()) {
-            successFunction()
-        }
-        return items
-    }
-
-    override suspend fun inviteToQuest(quest: QuestContent): Quest? {
-        val newQuest = apiClient.inviteToQuest("party", quest.key)
-        localRepository.changeOwnedCount("quests", quest.key, currentUserID, -1)
-        return newQuest
-    }
-
-    override suspend fun buyItem(user: User?, id: String, value: Double, purchaseQuantity: Int): BuyResponse? {
-        val buyResponse = apiClient.buyItem(id, purchaseQuantity) ?: return null
-        val foundUser = user ?: localRepository.getLiveUser(currentUserID) ?: return buyResponse
-        val copiedUser = localRepository.getUnmanagedCopy(foundUser)
-        if (buyResponse.items != null) {
-            copiedUser.items = buyResponse.items
-        }
-        if (buyResponse.hp != null) {
-            copiedUser.stats?.hp = buyResponse.hp
-        }
-        if (buyResponse.exp != null) {
-            copiedUser.stats?.exp = buyResponse.exp
-        }
-        if (buyResponse.mp != null) {
-            copiedUser.stats?.mp = buyResponse.mp
-        }
-        if (buyResponse.gp != null) {
-            copiedUser.stats?.gp = buyResponse.gp
-        } else {
-            copiedUser.stats?.gp = (copiedUser.stats?.gp ?: 0.0) - (value * purchaseQuantity)
-        }
-        if (buyResponse.lvl != null) {
-            copiedUser.stats?.lvl = buyResponse.lvl
-        }
-        localRepository.save(copiedUser)
-        return buyResponse
-    }
-
-    override fun getAvailableLimitedItems(): Flow<List<Item>> {
-        return localRepository.getAvailableLimitedItems()
-    }
-
-    override suspend fun retrieveShopInventory(identifier: String): Shop? {
-        return apiClient.retrieveShopIventory(identifier)
-    }
-
-    override suspend fun retrieveMarketGear(): Shop? {
-        return apiClient.retrieveMarketGear()
-    }
-
-    override suspend fun purchaseMysterySet(categoryIdentifier: String): Void? {
-        return apiClient.purchaseMysterySet(categoryIdentifier)
-    }
-
-    override suspend fun purchaseHourglassItem(purchaseType: String, key: String): Void? {
-        return apiClient.purchaseHourglassItem(purchaseType, key)
-    }
-
-    override suspend fun purchaseQuest(key: String): Void? {
-        return apiClient.purchaseQuest(key)
-    }
-
-    override suspend fun purchaseSpecialSpell(key: String): Void? {
-        return apiClient.purchaseSpecialSpell(key)
-    }
-
-    override suspend fun purchaseItem(purchaseType: String, key: String, purchaseQuantity: Int): Void? {
-        val response = apiClient.purchaseItem(purchaseType, key, purchaseQuantity)
-        if (key == "gem") {
-            val user = localRepository.getLiveUser(currentUserID)
-            localRepository.executeTransaction {
-                user?.purchased?.plan?.gemsBought = purchaseQuantity + (user?.purchased?.plan?.gemsBought ?: 0)
-            }
-        }
-        return response
-    }
-
-    override suspend fun togglePinnedItem(item: ShopItem): List<ShopItem>? {
-        if (item.isValid) {
-            apiClient.togglePinnedItem(item.pinType ?: "", item.path ?: "")
-        }
-        return retrieveInAppRewards()
-    }
-}
+@file:OptIn(ExperimentalCoroutinesApi::class)
+
+package com.habitrpg.android.habitica.data.implementation
+
+import com.habitrpg.android.habitica.data.ApiClient
+import com.habitrpg.android.habitica.data.InventoryRepository
+import com.habitrpg.android.habitica.data.local.InventoryLocalRepository
+import com.habitrpg.android.habitica.helpers.AppConfigManager
+import com.habitrpg.android.habitica.models.inventory.Egg
+import com.habitrpg.android.habitica.models.inventory.Equipment
+import com.habitrpg.android.habitica.models.inventory.Food
+import com.habitrpg.android.habitica.models.inventory.HatchingPotion
+import com.habitrpg.android.habitica.models.inventory.Item
+import com.habitrpg.android.habitica.models.inventory.Mount
+import com.habitrpg.android.habitica.models.inventory.Pet
+import com.habitrpg.android.habitica.models.inventory.Quest
+import com.habitrpg.android.habitica.models.inventory.QuestContent
+import com.habitrpg.android.habitica.models.responses.BuyResponse
+import com.habitrpg.android.habitica.models.shops.Shop
+import com.habitrpg.android.habitica.models.shops.ShopItem
+import com.habitrpg.android.habitica.models.user.Items
+import com.habitrpg.android.habitica.models.user.OwnedItem
+import com.habitrpg.android.habitica.models.user.OwnedMount
+import com.habitrpg.android.habitica.models.user.OwnedPet
+import com.habitrpg.android.habitica.models.user.User
+import com.habitrpg.android.habitica.modules.AuthenticationHandler
+import com.habitrpg.shared.habitica.models.responses.FeedResponse
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.flow.flatMapLatest
+
+class InventoryRepositoryImpl(
+    localRepository: InventoryLocalRepository,
+    apiClient: ApiClient,
+    authenticationHandler: AuthenticationHandler,
+    var appConfigManager: AppConfigManager,
+) : BaseRepositoryImpl<InventoryLocalRepository>(localRepository, apiClient, authenticationHandler),
+    InventoryRepository {
+    override fun getQuestContent(keys: List<String>) = localRepository.getQuestContent(keys)
+
+    override fun getQuestContent(key: String) = localRepository.getQuestContent(key)
+
+    override fun getEquipment(searchedKeys: List<String>): Flow<List<Equipment>> {
+        return localRepository.getEquipment(searchedKeys)
+    }
+
+    override fun getArmoireRemainingCount(): Flow<Int> {
+        return localRepository.getArmoireRemainingCount()
+    }
+
+    override fun getInAppRewards(): Flow<List<ShopItem>> {
+        return localRepository.getInAppRewards()
+    }
+
+    override fun getInAppReward(key: String): Flow<ShopItem> {
+        return localRepository.getInAppReward(key)
+    }
+
+    override suspend fun retrieveInAppRewards(): List<ShopItem>? {
+        val rewards = apiClient.retrieveInAppRewards()
+        if (rewards != null) {
+            localRepository.saveInAppRewards(rewards)
+        }
+        return rewards
+    }
+
+    override fun getOwnedEquipment(type: String): Flow<List<Equipment>> {
+        return localRepository.getOwnedEquipment(type)
+    }
+
+    override fun getOwnedEquipment(): Flow<List<Equipment>> {
+        return localRepository.getOwnedEquipment()
+    }
+
+    override fun getEquipmentType(
+        type: String,
+        set: String,
+    ): Flow<List<Equipment>> {
+        return localRepository.getEquipmentType(type, set)
+    }
+
+    override fun getOwnedItems(
+        itemType: String,
+        includeZero: Boolean,
+    ): Flow<List<OwnedItem>> {
+        return authenticationHandler.userIDFlow.flatMapLatest {
+            localRepository.getOwnedItems(
+                itemType,
+                it,
+                includeZero,
+            )
+        }
+    }
+
+    override fun getOwnedItems(includeZero: Boolean): Flow<Map<String, OwnedItem>> {
+        return authenticationHandler.userIDFlow.flatMapLatest {
+            localRepository.getOwnedItems(
+                it,
+                includeZero,
+            )
+        }
+    }
+
+    override fun getItems(
+        itemClass: Class<out Item>,
+        keys: Array<String>,
+    ): Flow<List<Item>> {
+        return localRepository.getItems(itemClass, keys)
+    }
+
+    override fun getItems(itemClass: Class<out Item>): Flow<List<Item>> {
+        return localRepository.getItems(itemClass)
+    }
+
+    override fun getEquipment(key: String): Flow<Equipment> {
+        return localRepository.getEquipment(key)
+    }
+
+    override suspend fun openMysteryItem(user: User?): Equipment? {
+        val item = apiClient.openMysteryItem()
+        val equipment = localRepository.getEquipment(item?.key ?: "").firstOrNull() ?: return null
+        val liveEquipment = localRepository.getLiveObject(equipment)
+        localRepository.executeTransaction {
+            liveEquipment?.owned = true
+        }
+        localRepository.decrementMysteryItemCount(user)
+        return equipment
+    }
+
+    override fun saveEquipment(equipment: Equipment) {
+        localRepository.save(equipment)
+    }
+
+    override fun getMounts(): Flow<List<Mount>> {
+        return localRepository.getMounts()
+    }
+
+    override fun getMounts(
+        type: String?,
+        group: String?,
+        color: String?,
+    ): Flow<List<Mount>> {
+        return localRepository.getMounts(type, group, color)
+    }
+
+    override fun getOwnedMounts(): Flow<List<OwnedMount>> {
+        return authenticationHandler.userIDFlow.flatMapLatest { localRepository.getOwnedMounts(it) }
+    }
+
+    override fun getPets(): Flow<List<Pet>> {
+        return localRepository.getPets()
+    }
+
+    override fun getPets(
+        type: String?,
+        group: String?,
+        color: String?,
+    ): Flow<List<Pet>> {
+        return localRepository.getPets(type, group, color)
+    }
+
+    override fun getOwnedPets(): Flow<List<OwnedPet>> {
+        return authenticationHandler.userIDFlow.flatMapLatest { localRepository.getOwnedPets(it) }
+    }
+
+    override fun updateOwnedEquipment(user: User) {
+        localRepository.updateOwnedEquipment(user)
+    }
+
+    override suspend fun changeOwnedCount(
+        type: String,
+        key: String,
+        amountToAdd: Int,
+    ) {
+        localRepository.changeOwnedCount(type, key, currentUserID, amountToAdd)
+    }
+
+    override suspend fun sellItem(
+        type: String,
+        key: String,
+    ): User? {
+        val item =
+            localRepository.getOwnedItem(currentUserID, type, key, true).firstOrNull()
+                ?: return null
+        return sellItem(item)
+    }
+
+    override suspend fun sellItem(item: OwnedItem): User? {
+        val itemData =
+            localRepository.getItem(item.itemType ?: "", item.key ?: "").firstOrNull()
+                ?: return null
+        return sellItem(itemData, item)
+    }
+
+    override fun getLatestMysteryItem(): Flow<Equipment> {
+        return localRepository.getLatestMysteryItem()
+    }
+
+    override fun getItem(
+        type: String,
+        key: String,
+    ): Flow<Item> {
+        return localRepository.getItem(type, key)
+    }
+
+    private suspend fun sellItem(
+        item: Item,
+        ownedItem: OwnedItem,
+    ): User? {
+        localRepository.executeTransaction {
+            val liveItem = localRepository.getLiveObject(ownedItem)
+            liveItem?.numberOwned = (liveItem?.numberOwned ?: 0) - 1
+        }
+        val user = apiClient.sellItem(item.type, item.key) ?: return null
+        return localRepository.soldItem(currentUserID, user)
+    }
+
+    override suspend fun equipGear(
+        equipment: String,
+        asCostume: Boolean,
+    ): Items? {
+        return equip(if (asCostume) "costume" else "equipped", equipment)
+    }
+
+    override suspend fun equip(
+        type: String,
+        key: String,
+    ): Items? {
+        val liveUser = localRepository.getLiveUser(currentUserID)
+
+        if (liveUser != null) {
+            localRepository.modify(liveUser) { user ->
+                if (type == "mount") {
+                    user.items?.currentMount = key
+                } else if (type == "pet") {
+                    user.items?.currentPet = key
+                }
+                val outfit =
+                    if (type == "costume") {
+                        user.items?.gear?.costume
+                    } else {
+                        user.items?.gear?.equipped
+                    }
+                when (key.split("_").firstOrNull()) {
+                    "weapon" -> outfit?.weapon = key
+                    "armor" -> outfit?.armor = key
+                    "shield" -> outfit?.shield = key
+                    "eyewear" -> outfit?.eyeWear = key
+                    "head" -> outfit?.head = key
+                    "back" -> outfit?.back = key
+                    "headAccessory" -> outfit?.headAccessory = key
+                    "body" -> outfit?.body = key
+                }
+            }
+        }
+        val items = apiClient.equipItem(type, key) ?: return null
+        if (liveUser == null) return null
+        localRepository.modify(liveUser) { liveUser ->
+            val newEquipped = items.gear?.equipped
+            val oldEquipped = liveUser.items?.gear?.equipped
+            val newCostume = items.gear?.costume
+            val oldCostume = liveUser.items?.gear?.costume
+            newEquipped?.let { equipped -> oldEquipped?.updateWith(equipped) }
+            newCostume?.let { costume -> oldCostume?.updateWith(costume) }
+            liveUser.items?.currentMount = items.currentMount
+            liveUser.items?.currentPet = items.currentPet
+            liveUser.balance = liveUser.balance
+        }
+        return items
+    }
+
+    override suspend fun feedPet(
+        pet: Pet,
+        food: Food,
+    ): FeedResponse? {
+        val feedResponse = apiClient.feedPet(pet.key, food.key) ?: return null
+        localRepository.feedPet(food.key, pet.key, feedResponse.value ?: 0, currentUserID)
+        return feedResponse
+    }
+
+    override suspend fun hatchPet(
+        egg: Egg,
+        hatchingPotion: HatchingPotion,
+        successFunction: () -> Unit,
+    ): Items? {
+        if (appConfigManager.enableLocalChanges()) {
+            localRepository.hatchPet(egg.key, hatchingPotion.key, currentUserID)
+            successFunction()
+        }
+        val items = apiClient.hatchPet(egg.key, hatchingPotion.key) ?: return null
+        localRepository.save(items, currentUserID)
+        if (!appConfigManager.enableLocalChanges()) {
+            successFunction()
+        }
+        return items
+    }
+
+    override suspend fun inviteToQuest(quest: QuestContent): Quest? {
+        val newQuest = apiClient.inviteToQuest("party", quest.key)
+        localRepository.changeOwnedCount("quests", quest.key, currentUserID, -1)
+        return newQuest
+    }
+
+    override suspend fun buyItem(
+        user: User?,
+        id: String,
+        value: Double,
+        purchaseQuantity: Int,
+    ): BuyResponse? {
+        val buyResponse = apiClient.buyItem(id, purchaseQuantity) ?: return null
+        val foundUser = user ?: localRepository.getLiveUser(currentUserID) ?: return buyResponse
+        val copiedUser = localRepository.getUnmanagedCopy(foundUser)
+        if (buyResponse.items != null) {
+            copiedUser.items = buyResponse.items
+        }
+        if (buyResponse.hp != null) {
+            copiedUser.stats?.hp = buyResponse.hp
+        }
+        if (buyResponse.exp != null) {
+            copiedUser.stats?.exp = buyResponse.exp
+        }
+        if (buyResponse.mp != null) {
+            copiedUser.stats?.mp = buyResponse.mp
+        }
+        if (buyResponse.gp != null) {
+            copiedUser.stats?.gp = buyResponse.gp
+        } else {
+            copiedUser.stats?.gp = (copiedUser.stats?.gp ?: 0.0) - (value * purchaseQuantity)
+        }
+        if (buyResponse.lvl != null) {
+            copiedUser.stats?.lvl = buyResponse.lvl
+        }
+        localRepository.save(copiedUser)
+        return buyResponse
+    }
+
+    override fun getAvailableLimitedItems(): Flow<List<Item>> {
+        return localRepository.getAvailableLimitedItems()
+    }
+
+    override suspend fun retrieveShopInventory(identifier: String): Shop? {
+        return apiClient.retrieveShopIventory(identifier)
+    }
+
+    override suspend fun retrieveMarketGear(): Shop? {
+        return apiClient.retrieveMarketGear()
+    }
+
+    override suspend fun purchaseMysterySet(categoryIdentifier: String): Void? {
+        return apiClient.purchaseMysterySet(categoryIdentifier)
+    }
+
+    override suspend fun purchaseHourglassItem(
+        purchaseType: String,
+        key: String,
+    ): Void? {
+        return apiClient.purchaseHourglassItem(purchaseType, key)
+    }
+
+    override suspend fun purchaseQuest(key: String): Void? {
+        return apiClient.purchaseQuest(key)
+    }
+
+    override suspend fun purchaseSpecialSpell(key: String): Void? {
+        return apiClient.purchaseSpecialSpell(key)
+    }
+
+    override suspend fun purchaseItem(
+        purchaseType: String,
+        key: String,
+        purchaseQuantity: Int,
+    ): Void? {
+        val response = apiClient.purchaseItem(purchaseType, key, purchaseQuantity)
+        if (key == "gem") {
+            val user = localRepository.getLiveUser(currentUserID)
+            localRepository.executeTransaction {
+                user?.purchased?.plan?.gemsBought =
+                    purchaseQuantity + (user?.purchased?.plan?.gemsBought ?: 0)
+            }
+        }
+        return response
+    }
+
+    override suspend fun togglePinnedItem(item: ShopItem): List<ShopItem>? {
+        if (item.isValid) {
+            apiClient.togglePinnedItem(item.pinType ?: "", item.path ?: "")
+        }
+        return retrieveInAppRewards()
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SetupCustomizationRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SetupCustomizationRepositoryImpl.kt
index d4031773c..552862489 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SetupCustomizationRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SetupCustomizationRepositoryImpl.kt
@@ -1,89 +1,212 @@
-package com.habitrpg.android.habitica.data.implementation
-
-import android.content.Context
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.data.SetupCustomizationRepository
-import com.habitrpg.android.habitica.models.SetupCustomization
-import com.habitrpg.android.habitica.models.user.User
-import javax.inject.Inject
-
-@Suppress("StringLiteralDuplication")
-class SetupCustomizationRepositoryImpl @Inject
-constructor(private val context: Context) : SetupCustomizationRepository {
-
-    private val wheelchairs: List<SetupCustomization>
-        get() = listOf(SetupCustomization.createWheelchair("none", 0), SetupCustomization.createWheelchair("black", R.drawable.creator_chair_black), SetupCustomization.createWheelchair("blue", R.drawable.creator_chair_blue), SetupCustomization.createWheelchair("green", R.drawable.creator_chair_green), SetupCustomization.createWheelchair("pink", R.drawable.creator_chair_pink), SetupCustomization.createWheelchair("red", R.drawable.creator_chair_red), SetupCustomization.createWheelchair("yellow", R.drawable.creator_chair_yellow))
-
-    private val glasses: List<SetupCustomization>
-        get() = listOf(SetupCustomization.createGlasses("", R.drawable.creator_blank_face), SetupCustomization.createGlasses("eyewear_special_blackTopFrame", R.drawable.creator_eyewear_special_blacktopframe), SetupCustomization.createGlasses("eyewear_special_blueTopFrame", R.drawable.creator_eyewear_special_bluetopframe), SetupCustomization.createGlasses("eyewear_special_greenTopFrame", R.drawable.creator_eyewear_special_greentopframe), SetupCustomization.createGlasses("eyewear_special_pinkTopFrame", R.drawable.creator_eyewear_special_pinktopframe), SetupCustomization.createGlasses("eyewear_special_redTopFrame", R.drawable.creator_eyewear_special_redtopframe), SetupCustomization.createGlasses("eyewear_special_yellowTopFrame", R.drawable.creator_eyewear_special_yellowtopframe), SetupCustomization.createGlasses("eyewear_special_whiteTopFrame", R.drawable.creator_eyewear_special_whitetopframe))
-
-    private val flowers: List<SetupCustomization>
-        get() = listOf(SetupCustomization.createFlower("0", R.drawable.creator_blank_face), SetupCustomization.createFlower("1", R.drawable.creator_hair_flower_1), SetupCustomization.createFlower("2", R.drawable.creator_hair_flower_2), SetupCustomization.createFlower("3", R.drawable.creator_hair_flower_3), SetupCustomization.createFlower("4", R.drawable.creator_hair_flower_4), SetupCustomization.createFlower("5", R.drawable.creator_hair_flower_5), SetupCustomization.createFlower("6", R.drawable.creator_hair_flower_6))
-
-    private val hairColors: List<SetupCustomization>
-        get() = listOf(SetupCustomization.createHairColor("white", R.color.hair_white), SetupCustomization.createHairColor("brown", R.color.hair_brown), SetupCustomization.createHairColor("blond", R.color.hair_blond), SetupCustomization.createHairColor("red", R.color.hair_red), SetupCustomization.createHairColor("black", R.color.hair_black))
-
-    private val sizes: List<SetupCustomization>
-        get() = listOf(SetupCustomization.createSize("slim", R.drawable.creator_slim_shirt_black, context.getString(R.string.avatar_size_slim)), SetupCustomization.createSize("broad", R.drawable.creator_broad_shirt_black, context.getString(R.string.avatar_size_broad)))
-
-    private val skins: List<SetupCustomization>
-        get() = listOf(SetupCustomization.createSkin("ddc994", R.color.skin_ddc994), SetupCustomization.createSkin("f5a76e", R.color.skin_f5a76e), SetupCustomization.createSkin("ea8349", R.color.skin_ea8349), SetupCustomization.createSkin("c06534", R.color.skin_c06534), SetupCustomization.createSkin("98461a", R.color.skin_98461a), SetupCustomization.createSkin("915533", R.color.skin_915533), SetupCustomization.createSkin("c3e1dc", R.color.skin_c3e1dc), SetupCustomization.createSkin("6bd049", R.color.skin_6bd049))
-
-    override fun getCustomizations(type: String, user: User): List<SetupCustomization> {
-        return getCustomizations(type, null, user)
-    }
-
-    override fun getCustomizations(type: String, subtype: String?, user: User): List<SetupCustomization> {
-        return when (type) {
-            SetupCustomizationRepository.CATEGORY_BODY -> {
-                when (subtype) {
-                    SetupCustomizationRepository.SUBCATEGORY_SIZE -> sizes
-                    SetupCustomizationRepository.SUBCATEGORY_SHIRT -> getShirts(user.preferences?.size ?: "slim")
-                    else -> emptyList()
-                }
-            }
-            SetupCustomizationRepository.CATEGORY_SKIN -> skins
-            SetupCustomizationRepository.CATEGORY_HAIR -> {
-                when (subtype) {
-                    SetupCustomizationRepository.SUBCATEGORY_BANGS -> getBangs(user.preferences?.hair?.color ?: "")
-                    SetupCustomizationRepository.SUBCATEGORY_PONYTAIL -> getHairBases(user.preferences?.hair?.color ?: "")
-                    SetupCustomizationRepository.SUBCATEGORY_COLOR -> hairColors
-                    else -> emptyList()
-                }
-            }
-            SetupCustomizationRepository.CATEGORY_EXTRAS -> {
-                when (subtype) {
-                    SetupCustomizationRepository.SUBCATEGORY_FLOWER -> flowers
-                    SetupCustomizationRepository.SUBCATEGORY_GLASSES -> glasses
-                    SetupCustomizationRepository.SUBCATEGORY_WHEELCHAIR -> wheelchairs
-                    else -> emptyList()
-                }
-            }
-            else -> emptyList()
-        }
-    }
-
-    private fun getHairBases(color: String): List<SetupCustomization> {
-        return listOf(SetupCustomization.createHairPonytail("0", R.drawable.creator_blank_face), SetupCustomization.createHairPonytail("1", getResId("creator_hair_base_1_$color")), SetupCustomization.createHairPonytail("3", getResId("creator_hair_base_3_$color")))
-    }
-
-    private fun getBangs(color: String): List<SetupCustomization> {
-        return listOf(SetupCustomization.createHairBangs("0", R.drawable.creator_blank_face), SetupCustomization.createHairBangs("1", getResId("creator_hair_bangs_1_$color")), SetupCustomization.createHairBangs("2", getResId("creator_hair_bangs_2_$color")), SetupCustomization.createHairBangs("3", getResId("creator_hair_bangs_3_$color")))
-    }
-
-    private fun getShirts(size: String): List<SetupCustomization> {
-        return if (size == "broad") {
-            listOf(SetupCustomization.createShirt("black", R.drawable.creator_broad_shirt_black), SetupCustomization.createShirt("blue", R.drawable.creator_broad_shirt_blue), SetupCustomization.createShirt("green", R.drawable.creator_broad_shirt_green), SetupCustomization.createShirt("pink", R.drawable.creator_broad_shirt_pink), SetupCustomization.createShirt("white", R.drawable.creator_broad_shirt_white), SetupCustomization.createShirt("yellow", R.drawable.creator_broad_shirt_yellow))
-        } else {
-            listOf(SetupCustomization.createShirt("black", R.drawable.creator_slim_shirt_black), SetupCustomization.createShirt("blue", R.drawable.creator_slim_shirt_blue), SetupCustomization.createShirt("green", R.drawable.creator_slim_shirt_green), SetupCustomization.createShirt("pink", R.drawable.creator_slim_shirt_pink), SetupCustomization.createShirt("white", R.drawable.creator_slim_shirt_white), SetupCustomization.createShirt("yellow", R.drawable.creator_slim_shirt_yellow))
-        }
-    }
-
-    private fun getResId(resName: String): Int {
-        return try {
-            context.resources.getIdentifier(resName, "drawable", context.packageName)
-        } catch (e: Exception) {
-            -1
-        }
-    }
-}
+package com.habitrpg.android.habitica.data.implementation
+
+import android.content.Context
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.data.SetupCustomizationRepository
+import com.habitrpg.android.habitica.models.SetupCustomization
+import com.habitrpg.android.habitica.models.user.User
+import javax.inject.Inject
+
+@Suppress("StringLiteralDuplication")
+class SetupCustomizationRepositoryImpl
+    @Inject
+    constructor(private val context: Context) : SetupCustomizationRepository {
+        private val wheelchairs: List<SetupCustomization>
+            get() =
+                listOf(
+                    SetupCustomization.createWheelchair("none", 0),
+                    SetupCustomization.createWheelchair("black", R.drawable.creator_chair_black),
+                    SetupCustomization.createWheelchair("blue", R.drawable.creator_chair_blue),
+                    SetupCustomization.createWheelchair("green", R.drawable.creator_chair_green),
+                    SetupCustomization.createWheelchair("pink", R.drawable.creator_chair_pink),
+                    SetupCustomization.createWheelchair("red", R.drawable.creator_chair_red),
+                    SetupCustomization.createWheelchair("yellow", R.drawable.creator_chair_yellow),
+                )
+
+        private val glasses: List<SetupCustomization>
+            get() =
+                listOf(
+                    SetupCustomization.createGlasses("", R.drawable.creator_blank_face),
+                    SetupCustomization.createGlasses(
+                        "eyewear_special_blackTopFrame",
+                        R.drawable.creator_eyewear_special_blacktopframe,
+                    ),
+                    SetupCustomization.createGlasses(
+                        "eyewear_special_blueTopFrame",
+                        R.drawable.creator_eyewear_special_bluetopframe,
+                    ),
+                    SetupCustomization.createGlasses(
+                        "eyewear_special_greenTopFrame",
+                        R.drawable.creator_eyewear_special_greentopframe,
+                    ),
+                    SetupCustomization.createGlasses(
+                        "eyewear_special_pinkTopFrame",
+                        R.drawable.creator_eyewear_special_pinktopframe,
+                    ),
+                    SetupCustomization.createGlasses(
+                        "eyewear_special_redTopFrame",
+                        R.drawable.creator_eyewear_special_redtopframe,
+                    ),
+                    SetupCustomization.createGlasses(
+                        "eyewear_special_yellowTopFrame",
+                        R.drawable.creator_eyewear_special_yellowtopframe,
+                    ),
+                    SetupCustomization.createGlasses(
+                        "eyewear_special_whiteTopFrame",
+                        R.drawable.creator_eyewear_special_whitetopframe,
+                    ),
+                )
+
+        private val flowers: List<SetupCustomization>
+            get() =
+                listOf(
+                    SetupCustomization.createFlower("0", R.drawable.creator_blank_face),
+                    SetupCustomization.createFlower("1", R.drawable.creator_hair_flower_1),
+                    SetupCustomization.createFlower("2", R.drawable.creator_hair_flower_2),
+                    SetupCustomization.createFlower("3", R.drawable.creator_hair_flower_3),
+                    SetupCustomization.createFlower("4", R.drawable.creator_hair_flower_4),
+                    SetupCustomization.createFlower("5", R.drawable.creator_hair_flower_5),
+                    SetupCustomization.createFlower("6", R.drawable.creator_hair_flower_6),
+                )
+
+        private val hairColors: List<SetupCustomization>
+            get() =
+                listOf(
+                    SetupCustomization.createHairColor("white", R.color.hair_white),
+                    SetupCustomization.createHairColor("brown", R.color.hair_brown),
+                    SetupCustomization.createHairColor("blond", R.color.hair_blond),
+                    SetupCustomization.createHairColor("red", R.color.hair_red),
+                    SetupCustomization.createHairColor("black", R.color.hair_black),
+                )
+
+        private val sizes: List<SetupCustomization>
+            get() =
+                listOf(
+                    SetupCustomization.createSize(
+                        "slim",
+                        R.drawable.creator_slim_shirt_black,
+                        context.getString(R.string.avatar_size_slim),
+                    ),
+                    SetupCustomization.createSize(
+                        "broad",
+                        R.drawable.creator_broad_shirt_black,
+                        context.getString(R.string.avatar_size_broad),
+                    ),
+                )
+
+        private val skins: List<SetupCustomization>
+            get() =
+                listOf(
+                    SetupCustomization.createSkin("ddc994", R.color.skin_ddc994),
+                    SetupCustomization.createSkin("f5a76e", R.color.skin_f5a76e),
+                    SetupCustomization.createSkin("ea8349", R.color.skin_ea8349),
+                    SetupCustomization.createSkin("c06534", R.color.skin_c06534),
+                    SetupCustomization.createSkin("98461a", R.color.skin_98461a),
+                    SetupCustomization.createSkin("915533", R.color.skin_915533),
+                    SetupCustomization.createSkin("c3e1dc", R.color.skin_c3e1dc),
+                    SetupCustomization.createSkin("6bd049", R.color.skin_6bd049),
+                )
+
+        override fun getCustomizations(
+            type: String,
+            user: User,
+        ): List<SetupCustomization> {
+            return getCustomizations(type, null, user)
+        }
+
+        override fun getCustomizations(
+            type: String,
+            subtype: String?,
+            user: User,
+        ): List<SetupCustomization> {
+            return when (type) {
+                SetupCustomizationRepository.CATEGORY_BODY -> {
+                    when (subtype) {
+                        SetupCustomizationRepository.SUBCATEGORY_SIZE -> sizes
+                        SetupCustomizationRepository.SUBCATEGORY_SHIRT ->
+                            getShirts(
+                                user.preferences?.size ?: "slim",
+                            )
+
+                        else -> emptyList()
+                    }
+                }
+
+                SetupCustomizationRepository.CATEGORY_SKIN -> skins
+                SetupCustomizationRepository.CATEGORY_HAIR -> {
+                    when (subtype) {
+                        SetupCustomizationRepository.SUBCATEGORY_BANGS ->
+                            getBangs(
+                                user.preferences?.hair?.color ?: "",
+                            )
+
+                        SetupCustomizationRepository.SUBCATEGORY_PONYTAIL ->
+                            getHairBases(
+                                user.preferences?.hair?.color ?: "",
+                            )
+
+                        SetupCustomizationRepository.SUBCATEGORY_COLOR -> hairColors
+                        else -> emptyList()
+                    }
+                }
+
+                SetupCustomizationRepository.CATEGORY_EXTRAS -> {
+                    when (subtype) {
+                        SetupCustomizationRepository.SUBCATEGORY_FLOWER -> flowers
+                        SetupCustomizationRepository.SUBCATEGORY_GLASSES -> glasses
+                        SetupCustomizationRepository.SUBCATEGORY_WHEELCHAIR -> wheelchairs
+                        else -> emptyList()
+                    }
+                }
+
+                else -> emptyList()
+            }
+        }
+
+        private fun getHairBases(color: String): List<SetupCustomization> {
+            return listOf(
+                SetupCustomization.createHairPonytail("0", R.drawable.creator_blank_face),
+                SetupCustomization.createHairPonytail("1", getResId("creator_hair_base_1_$color")),
+                SetupCustomization.createHairPonytail("3", getResId("creator_hair_base_3_$color")),
+            )
+        }
+
+        private fun getBangs(color: String): List<SetupCustomization> {
+            return listOf(
+                SetupCustomization.createHairBangs("0", R.drawable.creator_blank_face),
+                SetupCustomization.createHairBangs("1", getResId("creator_hair_bangs_1_$color")),
+                SetupCustomization.createHairBangs("2", getResId("creator_hair_bangs_2_$color")),
+                SetupCustomization.createHairBangs("3", getResId("creator_hair_bangs_3_$color")),
+            )
+        }
+
+        private fun getShirts(size: String): List<SetupCustomization> {
+            return if (size == "broad") {
+                listOf(
+                    SetupCustomization.createShirt("black", R.drawable.creator_broad_shirt_black),
+                    SetupCustomization.createShirt("blue", R.drawable.creator_broad_shirt_blue),
+                    SetupCustomization.createShirt("green", R.drawable.creator_broad_shirt_green),
+                    SetupCustomization.createShirt("pink", R.drawable.creator_broad_shirt_pink),
+                    SetupCustomization.createShirt("white", R.drawable.creator_broad_shirt_white),
+                    SetupCustomization.createShirt("yellow", R.drawable.creator_broad_shirt_yellow),
+                )
+            } else {
+                listOf(
+                    SetupCustomization.createShirt("black", R.drawable.creator_slim_shirt_black),
+                    SetupCustomization.createShirt("blue", R.drawable.creator_slim_shirt_blue),
+                    SetupCustomization.createShirt("green", R.drawable.creator_slim_shirt_green),
+                    SetupCustomization.createShirt("pink", R.drawable.creator_slim_shirt_pink),
+                    SetupCustomization.createShirt("white", R.drawable.creator_slim_shirt_white),
+                    SetupCustomization.createShirt("yellow", R.drawable.creator_slim_shirt_yellow),
+                )
+            }
+        }
+
+        private fun getResId(resName: String): Int {
+            return try {
+                context.resources.getIdentifier(resName, "drawable", context.packageName)
+            } catch (e: Exception) {
+                -1
+            }
+        }
+    }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt
index 32681459d..306d67bca 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt
@@ -1,359 +1,441 @@
-@file:OptIn(ExperimentalCoroutinesApi::class)
-
-package com.habitrpg.android.habitica.data.implementation
-
-import com.habitrpg.android.habitica.BuildConfig
-import com.habitrpg.android.habitica.data.ApiClient
-import com.habitrpg.android.habitica.data.SocialRepository
-import com.habitrpg.android.habitica.data.local.SocialLocalRepository
-import com.habitrpg.android.habitica.models.Achievement
-import com.habitrpg.android.habitica.models.inventory.Quest
-import com.habitrpg.android.habitica.models.members.Member
-import com.habitrpg.android.habitica.models.responses.PostChatMessageResult
-import com.habitrpg.android.habitica.models.social.ChatMessage
-import com.habitrpg.android.habitica.models.social.FindUsernameResult
-import com.habitrpg.android.habitica.models.social.Group
-import com.habitrpg.android.habitica.models.social.GroupMembership
-import com.habitrpg.android.habitica.models.social.InboxConversation
-import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.android.habitica.modules.AuthenticationHandler
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.emptyFlow
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.firstOrNull
-import kotlinx.coroutines.flow.flatMapLatest
-import java.util.UUID
-
-class SocialRepositoryImpl(
-    localRepository: SocialLocalRepository,
-    apiClient: ApiClient,
-    authenticationHandler: AuthenticationHandler
-) : BaseRepositoryImpl<SocialLocalRepository>(localRepository, apiClient, authenticationHandler), SocialRepository {
-    override suspend fun transferGroupOwnership(groupID: String, userID: String): Group? {
-        val group = localRepository.getGroup(groupID).first()?.let { localRepository.getUnmanagedCopy(it) }
-        group?.leaderID = userID
-        return group?.let { apiClient.updateGroup(groupID, it) }
-    }
-
-    override suspend fun removeMemberFromGroup(groupID: String, userID: String): List<Member>? {
-        apiClient.removeMemberFromGroup(groupID, userID)
-        return retrievePartyMembers(groupID, true)
-    }
-
-    override suspend fun blockMember(userID: String): List<String>? {
-        return apiClient.blockMember(userID)
-    }
-
-    override fun getMember(userID: String?): Flow<Member?> {
-        return localRepository.getMember(userID)
-    }
-
-    override suspend fun updateMember(
-        memberID: String,
-        data: Map<String, Map<String, Boolean>>
-    ): Member? {
-        return apiClient.updateMember(memberID, data)
-    }
-
-    override suspend fun retrievePartySeekingUsers(page: Int): List<Member>? {
-        return apiClient.retrievePartySeekingUsers(page)
-    }
-
-    override fun getGroupMembership(id: String) = authenticationHandler.userIDFlow.flatMapLatest { localRepository.getGroupMembership(it, id) }
-
-    override fun getGroupMemberships(): Flow<List<GroupMembership>> {
-        return authenticationHandler.userIDFlow.flatMapLatest { localRepository.getGroupMemberships(it) }
-    }
-
-    override suspend fun retrieveGroupChat(groupId: String): List<ChatMessage>? {
-        val messages = apiClient.listGroupChat(groupId)
-        messages?.forEach { it.groupId = groupId }
-        return messages
-    }
-
-    override fun getGroupChat(groupId: String): Flow<List<ChatMessage>> {
-        return localRepository.getGroupChat(groupId)
-    }
-
-    override suspend fun markMessagesSeen(seenGroupId: String) {
-        apiClient.seenMessages(seenGroupId)
-    }
-
-    override suspend fun flagMessage(chatMessageID: String, additionalInfo: String, groupID: String?): Void? {
-        return when {
-            chatMessageID.isBlank() -> return null
-            currentUserID == BuildConfig.ANDROID_TESTING_UUID -> return null
-            else -> {
-                val data = mutableMapOf<String, String>()
-                data["comment"] = additionalInfo
-                if (groupID?.isNotBlank() != true) {
-                    apiClient.flagInboxMessage(chatMessageID, data)
-                } else {
-                    apiClient.flagMessage(groupID, chatMessageID, data)
-                }
-            }
-        }
-    }
-
-    override suspend fun reportMember(memberID: String, data: Map<String, String>): Void? {
-        return apiClient.reportMember(memberID, data)
-    }
-
-    override suspend fun likeMessage(chatMessage: ChatMessage): ChatMessage? {
-        if (chatMessage.id.isBlank()) {
-            return null
-        }
-        val message = apiClient.likeMessage(chatMessage.groupId ?: "", chatMessage.id)
-        message?.groupId = chatMessage.groupId
-        message?.let { localRepository.save(it) }
-        return message
-    }
-
-    override suspend fun deleteMessage(chatMessage: ChatMessage): Void? {
-        if (chatMessage.isInboxMessage) {
-            apiClient.deleteInboxMessage(chatMessage.id)
-        } else {
-            apiClient.deleteMessage(chatMessage.groupId ?: "", chatMessage.id)
-        }
-        localRepository.deleteMessage(chatMessage.id)
-        return null
-    }
-
-    override suspend fun postGroupChat(groupId: String, messageObject: HashMap<String, String>): PostChatMessageResult? {
-        val result = apiClient.postGroupChat(groupId, messageObject)
-        result?.message?.groupId = groupId
-        return result
-    }
-
-    override suspend fun postGroupChat(groupId: String, message: String): PostChatMessageResult? {
-        val messageObject = HashMap<String, String>()
-        messageObject["message"] = message
-        return postGroupChat(groupId, messageObject)
-    }
-
-    override suspend fun retrieveGroup(id: String): Group? {
-        val group = apiClient.getGroup(id)
-        group?.let { localRepository.saveGroup(it) }
-        retrieveGroupChat(id)
-        return group
-    }
-
-    override fun getGroup(id: String?): Flow<Group?> {
-        if (id?.isNotBlank() != true) {
-            return emptyFlow()
-        }
-        return localRepository.getGroup(id)
-    }
-
-    override suspend fun leaveGroup(id: String?, keepChallenges: Boolean): Group? {
-        if (id?.isNotBlank() != true) {
-            return null
-        }
-
-        apiClient.leaveGroup(id, if (keepChallenges) "remain-in-challenges" else "leave-challenges")
-        localRepository.updateMembership(currentUserID, id, false)
-        return localRepository.getGroup(id).firstOrNull()
-    }
-
-    override suspend fun joinGroup(id: String?): Group? {
-        if (id?.isNotBlank() != true) {
-            return null
-        }
-        val group = apiClient.joinGroup(id)
-        group?.let {
-            localRepository.updateMembership(currentUserID, id, true)
-            localRepository.save(group)
-        }
-        return group
-    }
-
-    override suspend fun createGroup(
-        name: String?,
-        description: String?,
-        leader: String?,
-        type: String?,
-        privacy: String?,
-        leaderCreateChallenge: Boolean?
-    ): Group? {
-        val group = Group()
-        group.name = name
-        group.description = description
-        group.type = type
-        group.leaderID = leader
-        group.privacy = privacy
-        val savedGroup = apiClient.createGroup(group)
-        savedGroup?.let { localRepository.save(it) }
-        return savedGroup
-    }
-
-    override suspend fun updateGroup(
-        group: Group?,
-        name: String?,
-        description: String?,
-        leader: String?,
-        leaderCreateChallenge: Boolean?
-    ): Group? {
-        if (group == null) {
-            return null
-        }
-        val copiedGroup = localRepository.getUnmanagedCopy(group)
-        copiedGroup.name = name
-        copiedGroup.description = description
-        copiedGroup.leaderID = leader
-        copiedGroup.leaderOnlyChallenges = leaderCreateChallenge ?: false
-        localRepository.save(copiedGroup)
-        return apiClient.updateGroup(copiedGroup.id, copiedGroup)
-    }
-
-    override fun getInboxConversations() = authenticationHandler.userIDFlow.flatMapLatest { localRepository.getInboxConversation(it) }
-
-    override fun getInboxMessages(replyToUserID: String?) = authenticationHandler.userIDFlow.flatMapLatest { localRepository.getInboxMessages(it, replyToUserID) }
-
-    override suspend fun retrieveInboxMessages(uuid: String, page: Int): List<ChatMessage>? {
-        val messages = apiClient.retrieveInboxMessages(uuid, page) ?: return null
-        messages.forEach {
-            it.isInboxMessage = true
-        }
-        localRepository.saveInboxMessages(currentUserID, uuid, messages, page)
-        return messages
-    }
-
-    override suspend fun retrieveInboxConversations(): List<InboxConversation>? {
-        val conversations = apiClient.retrieveInboxConversations() ?: return null
-        localRepository.saveInboxConversations(currentUserID, conversations)
-        return conversations
-    }
-
-    override suspend fun postPrivateMessage(recipientId: String, messageObject: HashMap<String, String>): List<ChatMessage>? {
-        apiClient.postPrivateMessage(messageObject)
-        return retrieveInboxMessages(recipientId, 0)
-    }
-
-    override suspend fun postPrivateMessage(recipientId: String, message: String): List<ChatMessage>? {
-        val messageObject = HashMap<String, String>()
-        messageObject["message"] = message
-        messageObject["toUserId"] = recipientId
-        return postPrivateMessage(recipientId, messageObject)
-    }
-
-    override suspend fun getPartyMembers(id: String) = localRepository.getPartyMembers(id)
-    override suspend fun getGroupMembers(id: String) = localRepository.getGroupMembers(id)
-
-    override suspend fun retrievePartyMembers(id: String, includeAllPublicFields: Boolean): List<Member>? {
-        val members = apiClient.getGroupMembers(id, includeAllPublicFields)
-        members?.let { localRepository.savePartyMembers(id, it) }
-        return members
-    }
-
-    override suspend fun inviteToGroup(id: String, inviteData: Map<String, Any>) = apiClient.inviteToGroup(id, inviteData)
-
-    override suspend fun retrieveMember(userId: String?, fromHall: Boolean): Member? {
-        return if (userId == null) {
-            null
-        } else {
-            if (fromHall) {
-                apiClient.getHallMember(userId)
-            } else {
-                try {
-                    val uuid = UUID.fromString(userId).toString()
-                    apiClient.getMember(uuid)
-                } catch (_: IllegalArgumentException) {
-                    apiClient.getMemberWithUsername(userId)
-                }
-            }
-        }
-    }
-
-    override suspend fun retrievegroupInvites(id: String, includeAllPublicFields: Boolean) = apiClient.getGroupInvites(id, includeAllPublicFields)
-
-    override suspend fun findUsernames(username: String, context: String?, id: String?): List<FindUsernameResult>? {
-        return apiClient.findUsernames(username, context, id)
-    }
-
-    override suspend fun markPrivateMessagesRead(user: User?) {
-        if (user?.isManaged == true) {
-            localRepository.modify(user) {
-                it.inbox?.hasUserSeenInbox = true
-            }
-        }
-        return apiClient.markPrivateMessagesRead()
-    }
-
-    override fun markSomePrivateMessagesAsRead(user: User?, messages: List<ChatMessage>) {
-        if (user?.isManaged == true) {
-            val numOfUnseenMessages = messages.count { !it.isSeen }
-            localRepository.modify(user) {
-                val numOfNewMessagesFromInbox = it.inbox?.newMessages ?: 0
-                if (numOfNewMessagesFromInbox > numOfUnseenMessages) {
-                    it.inbox?.newMessages = numOfNewMessagesFromInbox - numOfUnseenMessages
-                } else {
-                    it.inbox?.newMessages = 0
-                }
-            }
-        }
-        for (message in messages.filter { it.isManaged && !it.isSeen }) {
-            localRepository.modify(message) {
-                it.isSeen = true
-            }
-        }
-    }
-
-    override fun getUserGroups(type: String?) = authenticationHandler.userIDFlow.flatMapLatest { localRepository.getUserGroups(it, type) }
-
-    override suspend fun acceptQuest(user: User?, partyId: String): Void? {
-        apiClient.acceptQuest(partyId)
-        user?.let {
-            localRepository.updateRSVPNeeded(it, false)
-        }
-        return null
-    }
-
-    override suspend fun rejectQuest(user: User?, partyId: String): Void? {
-        apiClient.rejectQuest(partyId)
-        user?.let {
-            localRepository.updateRSVPNeeded(it, false)
-        }
-        return null
-    }
-
-    override suspend fun leaveQuest(partyId: String): Void? {
-        return apiClient.leaveQuest(partyId)
-    }
-
-    override suspend fun cancelQuest(partyId: String): Void? {
-        apiClient.cancelQuest(partyId)
-        localRepository.removeQuest(partyId)
-        return null
-    }
-
-    override suspend fun abortQuest(partyId: String): Quest? {
-        val quest = apiClient.abortQuest(partyId)
-        localRepository.removeQuest(partyId)
-        return quest
-    }
-
-    override suspend fun rejectGroupInvite(groupId: String): Void? {
-        apiClient.rejectGroupInvite(groupId)
-        localRepository.rejectGroupInvitation(currentUserID, groupId)
-        return null
-    }
-
-    override suspend fun forceStartQuest(party: Group): Quest? {
-        val quest = apiClient.forceStartQuest(party.id, localRepository.getUnmanagedCopy(party))
-        localRepository.setQuestActivity(party, true)
-        return quest
-    }
-
-    override suspend fun getMemberAchievements(userId: String?): List<Achievement>? {
-        return if (userId == null) {
-            null
-        } else {
-            apiClient.getMemberAchievements(userId)
-        }
-    }
-
-    override suspend fun transferGems(giftedID: String, amount: Int): Void? {
-        return apiClient.transferGems(giftedID, amount)
-    }
-}
+@file:OptIn(ExperimentalCoroutinesApi::class)
+
+package com.habitrpg.android.habitica.data.implementation
+
+import com.habitrpg.android.habitica.BuildConfig
+import com.habitrpg.android.habitica.data.ApiClient
+import com.habitrpg.android.habitica.data.SocialRepository
+import com.habitrpg.android.habitica.data.local.SocialLocalRepository
+import com.habitrpg.android.habitica.models.Achievement
+import com.habitrpg.android.habitica.models.inventory.Quest
+import com.habitrpg.android.habitica.models.members.Member
+import com.habitrpg.android.habitica.models.responses.PostChatMessageResult
+import com.habitrpg.android.habitica.models.social.ChatMessage
+import com.habitrpg.android.habitica.models.social.FindUsernameResult
+import com.habitrpg.android.habitica.models.social.Group
+import com.habitrpg.android.habitica.models.social.GroupMembership
+import com.habitrpg.android.habitica.models.social.InboxConversation
+import com.habitrpg.android.habitica.models.user.User
+import com.habitrpg.android.habitica.modules.AuthenticationHandler
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.emptyFlow
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.flow.flatMapLatest
+import java.util.UUID
+
+class SocialRepositoryImpl(
+    localRepository: SocialLocalRepository,
+    apiClient: ApiClient,
+    authenticationHandler: AuthenticationHandler,
+) : BaseRepositoryImpl<SocialLocalRepository>(localRepository, apiClient, authenticationHandler),
+    SocialRepository {
+    override suspend fun transferGroupOwnership(
+        groupID: String,
+        userID: String,
+    ): Group? {
+        val group =
+            localRepository.getGroup(groupID).first()?.let { localRepository.getUnmanagedCopy(it) }
+        group?.leaderID = userID
+        return group?.let { apiClient.updateGroup(groupID, it) }
+    }
+
+    override suspend fun removeMemberFromGroup(
+        groupID: String,
+        userID: String,
+    ): List<Member>? {
+        apiClient.removeMemberFromGroup(groupID, userID)
+        return retrievePartyMembers(groupID, true)
+    }
+
+    override suspend fun blockMember(userID: String): List<String>? {
+        return apiClient.blockMember(userID)
+    }
+
+    override fun getMember(userID: String?): Flow<Member?> {
+        return localRepository.getMember(userID)
+    }
+
+    override suspend fun updateMember(
+        memberID: String,
+        data: Map<String, Map<String, Boolean>>,
+    ): Member? {
+        return apiClient.updateMember(memberID, data)
+    }
+
+    override suspend fun retrievePartySeekingUsers(page: Int): List<Member>? {
+        return apiClient.retrievePartySeekingUsers(page)
+    }
+
+    override fun getGroupMembership(id: String) =
+        authenticationHandler.userIDFlow.flatMapLatest {
+            localRepository.getGroupMembership(
+                it,
+                id,
+            )
+        }
+
+    override fun getGroupMemberships(): Flow<List<GroupMembership>> {
+        return authenticationHandler.userIDFlow.flatMapLatest {
+            localRepository.getGroupMemberships(
+                it,
+            )
+        }
+    }
+
+    override suspend fun retrieveGroupChat(groupId: String): List<ChatMessage>? {
+        val messages = apiClient.listGroupChat(groupId)
+        messages?.forEach { it.groupId = groupId }
+        return messages
+    }
+
+    override fun getGroupChat(groupId: String): Flow<List<ChatMessage>> {
+        return localRepository.getGroupChat(groupId)
+    }
+
+    override suspend fun markMessagesSeen(seenGroupId: String) {
+        apiClient.seenMessages(seenGroupId)
+    }
+
+    override suspend fun flagMessage(
+        chatMessageID: String,
+        additionalInfo: String,
+        groupID: String?,
+    ): Void? {
+        return when {
+            chatMessageID.isBlank() -> return null
+            currentUserID == BuildConfig.ANDROID_TESTING_UUID -> return null
+            else -> {
+                val data = mutableMapOf<String, String>()
+                data["comment"] = additionalInfo
+                if (groupID?.isNotBlank() != true) {
+                    apiClient.flagInboxMessage(chatMessageID, data)
+                } else {
+                    apiClient.flagMessage(groupID, chatMessageID, data)
+                }
+            }
+        }
+    }
+
+    override suspend fun reportMember(
+        memberID: String,
+        data: Map<String, String>,
+    ): Void? {
+        return apiClient.reportMember(memberID, data)
+    }
+
+    override suspend fun likeMessage(chatMessage: ChatMessage): ChatMessage? {
+        if (chatMessage.id.isBlank()) {
+            return null
+        }
+        val message = apiClient.likeMessage(chatMessage.groupId ?: "", chatMessage.id)
+        message?.groupId = chatMessage.groupId
+        message?.let { localRepository.save(it) }
+        return message
+    }
+
+    override suspend fun deleteMessage(chatMessage: ChatMessage): Void? {
+        if (chatMessage.isInboxMessage) {
+            apiClient.deleteInboxMessage(chatMessage.id)
+        } else {
+            apiClient.deleteMessage(chatMessage.groupId ?: "", chatMessage.id)
+        }
+        localRepository.deleteMessage(chatMessage.id)
+        return null
+    }
+
+    override suspend fun postGroupChat(
+        groupId: String,
+        messageObject: HashMap<String, String>,
+    ): PostChatMessageResult? {
+        val result = apiClient.postGroupChat(groupId, messageObject)
+        result?.message?.groupId = groupId
+        return result
+    }
+
+    override suspend fun postGroupChat(
+        groupId: String,
+        message: String,
+    ): PostChatMessageResult? {
+        val messageObject = HashMap<String, String>()
+        messageObject["message"] = message
+        return postGroupChat(groupId, messageObject)
+    }
+
+    override suspend fun retrieveGroup(id: String): Group? {
+        val group = apiClient.getGroup(id)
+        group?.let { localRepository.saveGroup(it) }
+        retrieveGroupChat(id)
+        return group
+    }
+
+    override fun getGroup(id: String?): Flow<Group?> {
+        if (id?.isNotBlank() != true) {
+            return emptyFlow()
+        }
+        return localRepository.getGroup(id)
+    }
+
+    override suspend fun leaveGroup(
+        id: String?,
+        keepChallenges: Boolean,
+    ): Group? {
+        if (id?.isNotBlank() != true) {
+            return null
+        }
+
+        apiClient.leaveGroup(id, if (keepChallenges) "remain-in-challenges" else "leave-challenges")
+        localRepository.updateMembership(currentUserID, id, false)
+        return localRepository.getGroup(id).firstOrNull()
+    }
+
+    override suspend fun joinGroup(id: String?): Group? {
+        if (id?.isNotBlank() != true) {
+            return null
+        }
+        val group = apiClient.joinGroup(id)
+        group?.let {
+            localRepository.updateMembership(currentUserID, id, true)
+            localRepository.save(group)
+        }
+        return group
+    }
+
+    override suspend fun createGroup(
+        name: String?,
+        description: String?,
+        leader: String?,
+        type: String?,
+        privacy: String?,
+        leaderCreateChallenge: Boolean?,
+    ): Group? {
+        val group = Group()
+        group.name = name
+        group.description = description
+        group.type = type
+        group.leaderID = leader
+        group.privacy = privacy
+        val savedGroup = apiClient.createGroup(group)
+        savedGroup?.let { localRepository.save(it) }
+        return savedGroup
+    }
+
+    override suspend fun updateGroup(
+        group: Group?,
+        name: String?,
+        description: String?,
+        leader: String?,
+        leaderCreateChallenge: Boolean?,
+    ): Group? {
+        if (group == null) {
+            return null
+        }
+        val copiedGroup = localRepository.getUnmanagedCopy(group)
+        copiedGroup.name = name
+        copiedGroup.description = description
+        copiedGroup.leaderID = leader
+        copiedGroup.leaderOnlyChallenges = leaderCreateChallenge ?: false
+        localRepository.save(copiedGroup)
+        return apiClient.updateGroup(copiedGroup.id, copiedGroup)
+    }
+
+    override fun getInboxConversations() =
+        authenticationHandler.userIDFlow.flatMapLatest { localRepository.getInboxConversation(it) }
+
+    override fun getInboxMessages(replyToUserID: String?) =
+        authenticationHandler.userIDFlow.flatMapLatest {
+            localRepository.getInboxMessages(
+                it,
+                replyToUserID,
+            )
+        }
+
+    override suspend fun retrieveInboxMessages(
+        uuid: String,
+        page: Int,
+    ): List<ChatMessage>? {
+        val messages = apiClient.retrieveInboxMessages(uuid, page) ?: return null
+        messages.forEach {
+            it.isInboxMessage = true
+        }
+        localRepository.saveInboxMessages(currentUserID, uuid, messages, page)
+        return messages
+    }
+
+    override suspend fun retrieveInboxConversations(): List<InboxConversation>? {
+        val conversations = apiClient.retrieveInboxConversations() ?: return null
+        localRepository.saveInboxConversations(currentUserID, conversations)
+        return conversations
+    }
+
+    override suspend fun postPrivateMessage(
+        recipientId: String,
+        messageObject: HashMap<String, String>,
+    ): List<ChatMessage>? {
+        apiClient.postPrivateMessage(messageObject)
+        return retrieveInboxMessages(recipientId, 0)
+    }
+
+    override suspend fun postPrivateMessage(
+        recipientId: String,
+        message: String,
+    ): List<ChatMessage>? {
+        val messageObject = HashMap<String, String>()
+        messageObject["message"] = message
+        messageObject["toUserId"] = recipientId
+        return postPrivateMessage(recipientId, messageObject)
+    }
+
+    override suspend fun getPartyMembers(id: String) = localRepository.getPartyMembers(id)
+
+    override suspend fun getGroupMembers(id: String) = localRepository.getGroupMembers(id)
+
+    override suspend fun retrievePartyMembers(
+        id: String,
+        includeAllPublicFields: Boolean,
+    ): List<Member>? {
+        val members = apiClient.getGroupMembers(id, includeAllPublicFields)
+        members?.let { localRepository.savePartyMembers(id, it) }
+        return members
+    }
+
+    override suspend fun inviteToGroup(
+        id: String,
+        inviteData: Map<String, Any>,
+    ) =
+        apiClient.inviteToGroup(id, inviteData)
+
+    override suspend fun retrieveMember(
+        userId: String?,
+        fromHall: Boolean,
+    ): Member? {
+        return if (userId == null) {
+            null
+        } else {
+            if (fromHall) {
+                apiClient.getHallMember(userId)
+            } else {
+                try {
+                    val uuid = UUID.fromString(userId).toString()
+                    apiClient.getMember(uuid)
+                } catch (_: IllegalArgumentException) {
+                    apiClient.getMemberWithUsername(userId)
+                }
+            }
+        }
+    }
+
+    override suspend fun retrievegroupInvites(
+        id: String,
+        includeAllPublicFields: Boolean,
+    ) =
+        apiClient.getGroupInvites(id, includeAllPublicFields)
+
+    override suspend fun findUsernames(
+        username: String,
+        context: String?,
+        id: String?,
+    ): List<FindUsernameResult>? {
+        return apiClient.findUsernames(username, context, id)
+    }
+
+    override suspend fun markPrivateMessagesRead(user: User?) {
+        if (user?.isManaged == true) {
+            localRepository.modify(user) {
+                it.inbox?.hasUserSeenInbox = true
+            }
+        }
+        return apiClient.markPrivateMessagesRead()
+    }
+
+    override fun markSomePrivateMessagesAsRead(
+        user: User?,
+        messages: List<ChatMessage>,
+    ) {
+        if (user?.isManaged == true) {
+            val numOfUnseenMessages = messages.count { !it.isSeen }
+            localRepository.modify(user) {
+                val numOfNewMessagesFromInbox = it.inbox?.newMessages ?: 0
+                if (numOfNewMessagesFromInbox > numOfUnseenMessages) {
+                    it.inbox?.newMessages = numOfNewMessagesFromInbox - numOfUnseenMessages
+                } else {
+                    it.inbox?.newMessages = 0
+                }
+            }
+        }
+        for (message in messages.filter { it.isManaged && !it.isSeen }) {
+            localRepository.modify(message) {
+                it.isSeen = true
+            }
+        }
+    }
+
+    override fun getUserGroups(type: String?) =
+        authenticationHandler.userIDFlow.flatMapLatest { localRepository.getUserGroups(it, type) }
+
+    override suspend fun acceptQuest(
+        user: User?,
+        partyId: String,
+    ): Void? {
+        apiClient.acceptQuest(partyId)
+        user?.let {
+            localRepository.updateRSVPNeeded(it, false)
+        }
+        return null
+    }
+
+    override suspend fun rejectQuest(
+        user: User?,
+        partyId: String,
+    ): Void? {
+        apiClient.rejectQuest(partyId)
+        user?.let {
+            localRepository.updateRSVPNeeded(it, false)
+        }
+        return null
+    }
+
+    override suspend fun leaveQuest(partyId: String): Void? {
+        return apiClient.leaveQuest(partyId)
+    }
+
+    override suspend fun cancelQuest(partyId: String): Void? {
+        apiClient.cancelQuest(partyId)
+        localRepository.removeQuest(partyId)
+        return null
+    }
+
+    override suspend fun abortQuest(partyId: String): Quest? {
+        val quest = apiClient.abortQuest(partyId)
+        localRepository.removeQuest(partyId)
+        return quest
+    }
+
+    override suspend fun rejectGroupInvite(groupId: String): Void? {
+        apiClient.rejectGroupInvite(groupId)
+        localRepository.rejectGroupInvitation(currentUserID, groupId)
+        return null
+    }
+
+    override suspend fun forceStartQuest(party: Group): Quest? {
+        val quest = apiClient.forceStartQuest(party.id, localRepository.getUnmanagedCopy(party))
+        localRepository.setQuestActivity(party, true)
+        return quest
+    }
+
+    override suspend fun getMemberAchievements(userId: String?): List<Achievement>? {
+        return if (userId == null) {
+            null
+        } else {
+            apiClient.getMemberAchievements(userId)
+        }
+    }
+
+    override suspend fun transferGems(
+        giftedID: String,
+        amount: Int,
+    ): Void? {
+        return apiClient.transferGems(giftedID, amount)
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TagRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TagRepositoryImpl.kt
index 90e3f6948..57de8ab46 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TagRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TagRepositoryImpl.kt
@@ -1,64 +1,63 @@
-@file:OptIn(ExperimentalCoroutinesApi::class)
-
-package com.habitrpg.android.habitica.data.implementation
-
-import com.habitrpg.android.habitica.data.ApiClient
-import com.habitrpg.android.habitica.data.TagRepository
-import com.habitrpg.android.habitica.data.local.TagLocalRepository
-import com.habitrpg.android.habitica.models.Tag
-import com.habitrpg.android.habitica.modules.AuthenticationHandler
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.flatMapLatest
-
-class TagRepositoryImpl(
-    localRepository: TagLocalRepository,
-    apiClient: ApiClient,
-    authenticationHandler: AuthenticationHandler
-) : BaseRepositoryImpl<TagLocalRepository>(localRepository, apiClient, authenticationHandler),
-    TagRepository {
-
-    override fun getTags() = authenticationHandler.userIDFlow.flatMapLatest { getTags(it) }
-
-    override fun getTags(userId: String): Flow<List<Tag>> {
-        return localRepository.getTags(userId)
-    }
-
-    override suspend fun createTag(tag: Tag): Tag? {
-        val savedTag = apiClient.createTag(tag) ?: return null
-        savedTag.userId = currentUserID
-        localRepository.save(savedTag)
-        return savedTag
-    }
-
-    override suspend fun updateTag(tag: Tag): Tag? {
-        val savedTag = apiClient.updateTag(tag.id, tag) ?: return null
-        savedTag.userId = currentUserID
-        localRepository.save(savedTag)
-        return savedTag
-    }
-
-    override suspend fun deleteTag(id: String): Void? {
-        apiClient.deleteTag(id)
-        localRepository.deleteTag(id)
-        return null
-    }
-
-    override suspend fun createTags(tags: Collection<Tag>): List<Tag> {
-        return tags.mapNotNull {
-            createTag(it)
-        }
-    }
-
-    override suspend fun updateTags(tags: Collection<Tag>): List<Tag> {
-        return tags.mapNotNull {
-            updateTag(it)
-        }
-    }
-
-    override suspend fun deleteTags(tagIds: Collection<String>): List<Void> {
-        return tagIds.mapNotNull {
-            deleteTag(it)
-        }
-    }
-}
+@file:OptIn(ExperimentalCoroutinesApi::class)
+
+package com.habitrpg.android.habitica.data.implementation
+
+import com.habitrpg.android.habitica.data.ApiClient
+import com.habitrpg.android.habitica.data.TagRepository
+import com.habitrpg.android.habitica.data.local.TagLocalRepository
+import com.habitrpg.android.habitica.models.Tag
+import com.habitrpg.android.habitica.modules.AuthenticationHandler
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flatMapLatest
+
+class TagRepositoryImpl(
+    localRepository: TagLocalRepository,
+    apiClient: ApiClient,
+    authenticationHandler: AuthenticationHandler,
+) : BaseRepositoryImpl<TagLocalRepository>(localRepository, apiClient, authenticationHandler),
+    TagRepository {
+    override fun getTags() = authenticationHandler.userIDFlow.flatMapLatest { getTags(it) }
+
+    override fun getTags(userId: String): Flow<List<Tag>> {
+        return localRepository.getTags(userId)
+    }
+
+    override suspend fun createTag(tag: Tag): Tag? {
+        val savedTag = apiClient.createTag(tag) ?: return null
+        savedTag.userId = currentUserID
+        localRepository.save(savedTag)
+        return savedTag
+    }
+
+    override suspend fun updateTag(tag: Tag): Tag? {
+        val savedTag = apiClient.updateTag(tag.id, tag) ?: return null
+        savedTag.userId = currentUserID
+        localRepository.save(savedTag)
+        return savedTag
+    }
+
+    override suspend fun deleteTag(id: String): Void? {
+        apiClient.deleteTag(id)
+        localRepository.deleteTag(id)
+        return null
+    }
+
+    override suspend fun createTags(tags: Collection<Tag>): List<Tag> {
+        return tags.mapNotNull {
+            createTag(it)
+        }
+    }
+
+    override suspend fun updateTags(tags: Collection<Tag>): List<Tag> {
+        return tags.mapNotNull {
+            updateTag(it)
+        }
+    }
+
+    override suspend fun deleteTags(tagIds: Collection<String>): List<Void> {
+        return tagIds.mapNotNull {
+            deleteTag(it)
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt
index 37d577185..36efd8e50 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt
@@ -1,405 +1,485 @@
-package com.habitrpg.android.habitica.data.implementation
-
-import com.habitrpg.android.habitica.data.ApiClient
-import com.habitrpg.android.habitica.data.TaskRepository
-import com.habitrpg.android.habitica.data.local.TaskLocalRepository
-import com.habitrpg.android.habitica.helpers.Analytics
-import com.habitrpg.android.habitica.helpers.AppConfigManager
-import com.habitrpg.android.habitica.helpers.EventCategory
-import com.habitrpg.android.habitica.helpers.HitType
-import com.habitrpg.android.habitica.interactors.ScoreTaskLocallyInteractor
-import com.habitrpg.android.habitica.models.BaseMainObject
-import com.habitrpg.android.habitica.models.responses.BulkTaskScoringData
-import com.habitrpg.android.habitica.models.tasks.ChecklistItem
-import com.habitrpg.android.habitica.models.tasks.Task
-import com.habitrpg.android.habitica.models.tasks.TaskList
-import com.habitrpg.android.habitica.models.user.OwnedItem
-import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.android.habitica.modules.AuthenticationHandler
-import com.habitrpg.common.habitica.helpers.launchCatching
-import com.habitrpg.shared.habitica.models.responses.TaskDirection
-import com.habitrpg.shared.habitica.models.responses.TaskDirectionData
-import com.habitrpg.shared.habitica.models.responses.TaskScoringResult
-import com.habitrpg.shared.habitica.models.tasks.TaskType
-import com.habitrpg.shared.habitica.models.tasks.TasksOrder
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.MainScope
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.firstOrNull
-import kotlinx.coroutines.flow.flatMapLatest
-import kotlinx.coroutines.flow.map
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Locale
-import java.util.UUID
-
-@ExperimentalCoroutinesApi
-class TaskRepositoryImpl(
-    localRepository: TaskLocalRepository,
-    apiClient: ApiClient,
-    authenticationHandler: AuthenticationHandler,
-    val appConfigManager: AppConfigManager,
-) : BaseRepositoryImpl<TaskLocalRepository>(localRepository, apiClient, authenticationHandler), TaskRepository {
-    private var lastTaskAction: Long = 0
-
-    override fun getTasks(taskType: TaskType, userID: String?, includedGroupIDs: Array<String>): Flow<List<Task>> =
-        this.localRepository.getTasks(taskType, userID ?: authenticationHandler.currentUserID ?: "", includedGroupIDs)
-
-    override fun saveTasks(userId: String, order: TasksOrder, tasks: TaskList) {
-        localRepository.saveTasks(userId, order, tasks)
-    }
-
-    override suspend fun retrieveTasks(userId: String, tasksOrder: TasksOrder): TaskList? {
-        val tasks = apiClient.getTasks() ?: return null
-        this.localRepository.saveTasks(userId, tasksOrder, tasks)
-        return tasks
-    }
-
-    override suspend fun retrieveCompletedTodos(userId: String?): TaskList? {
-        val taskList = this.apiClient.getTasks("completedTodos") ?: return null
-        val tasks = taskList.tasks
-        this.localRepository.saveCompletedTodos(userId ?: authenticationHandler.currentUserID ?: "", tasks.values)
-        return taskList
-    }
-
-    override suspend fun retrieveTasks(userId: String, tasksOrder: TasksOrder, dueDate: Date): TaskList? {
-        val formatter = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZZZZZ", Locale.US)
-        val taskList = this.apiClient.getTasks("dailys", formatter.format(dueDate)) ?: return null
-        this.localRepository.saveTasks(userId, tasksOrder, taskList)
-        return taskList
-    }
-
-    @Suppress("ReturnCount")
-    override suspend fun taskChecked(
-        user: User?,
-        task: Task,
-        up: Boolean,
-        force: Boolean,
-        notifyFunc: ((TaskScoringResult) -> Unit)?
-    ): TaskScoringResult? {
-        val localData = if (user != null && appConfigManager.enableLocalTaskScoring()) {
-            ScoreTaskLocallyInteractor.score(user, task, if (up) TaskDirection.UP else TaskDirection.DOWN)
-        } else {
-            null
-        }
-        if (user != null && localData != null) {
-            val stats = user.stats
-            val result = TaskScoringResult(localData, stats)
-            notifyFunc?.invoke(result)
-
-            handleTaskResponse(user, localData, task, up, 0f)
-        }
-        val now = Date().time
-        val id = task.id
-        if (lastTaskAction > now - 500 && !force || id == null) {
-            return null
-        }
-
-        lastTaskAction = now
-        val res = this.apiClient.postTaskDirection(id, (if (up) TaskDirection.UP else TaskDirection.DOWN).text) ?: return null
-        // There are cases where the user object is not set correctly. So the app refetches it as a fallback
-        val thisUser = user ?: localRepository.getUser(authenticationHandler.currentUserID ?: "").firstOrNull() ?: return null
-        // save local task changes
-
-        Analytics.sendEvent(
-            "task_scored",
-            EventCategory.BEHAVIOUR,
-            HitType.EVENT,
-            mapOf(
-                "type" to (task.type ?: ""),
-                "scored_up" to up,
-                "value" to task.value
-            )
-        )
-        if (res.lvl == 0) {
-            // Team tasks that require approval have weird data that we should just ignore.
-            return TaskScoringResult()
-        }
-        val result = TaskScoringResult(res, thisUser.stats)
-        if (localData == null) {
-            notifyFunc?.invoke(result)
-        }
-        handleTaskResponse(thisUser, res, task, up, localData?.delta ?: 0f)
-        return result
-    }
-
-    override suspend fun bulkScoreTasks(data: List<Map<String, String>>): BulkTaskScoringData? {
-        return apiClient.bulkScoreTasks(data)
-    }
-
-    private fun handleTaskResponse(
-        user: User,
-        res: TaskDirectionData,
-        task: Task,
-        up: Boolean,
-        localDelta: Float
-    ) {
-        this.localRepository.executeTransaction {
-            val bgTask = localRepository.getLiveObject(task) ?: return@executeTransaction
-            val bgUser = localRepository.getLiveObject(user) ?: return@executeTransaction
-            if (bgTask.type != TaskType.REWARD && (bgTask.value - localDelta) + res.delta != bgTask.value) {
-                bgTask.value = (bgTask.value - localDelta) + res.delta
-                if (TaskType.DAILY == bgTask.type || TaskType.TODO == bgTask.type) {
-                    bgTask.completeForUser(authenticationHandler.currentUserID ?: "", up)
-                    if (TaskType.DAILY == bgTask.type) {
-                        if (up) {
-                            bgTask.streak = (bgTask.streak ?: 0) + 1
-                        } else {
-                            bgTask.streak = (bgTask.streak ?: 0) - 1
-                        }
-                    }
-                } else if (TaskType.HABIT == bgTask.type) {
-                    if (up) {
-                        bgTask.counterUp = (bgTask.counterUp ?: 0) + 1
-                    } else {
-                        bgTask.counterDown = (bgTask.counterDown ?: 0) + 1
-                    }
-                }
-
-                if (bgTask.isGroupTask) {
-                    val entry = bgTask.group?.assignedUsersDetail?.firstOrNull { it.assignedUserID == user.id }
-                    entry?.completed = up
-                    if (up) {
-                        entry?.completedDate = Date()
-                    } else {
-                        entry?.completedDate = null
-                    }
-                }
-            }
-            res._tmp?.drop?.key?.let { key ->
-                val type = when (res._tmp?.drop?.type?.lowercase(Locale.US)) {
-                    "hatchingpotion" -> "hatchingPotions"
-                    "egg" -> "eggs"
-                    else -> res._tmp?.drop?.type?.lowercase(Locale.US)
-                }
-                var item = it.where(OwnedItem::class.java).equalTo("itemType", type).equalTo("key", key).findFirst()
-                if (item == null) {
-                    item = OwnedItem()
-                    item.key = key
-                    item.itemType = type
-                    item.userID = user.id
-
-                    when (type) {
-                        "eggs" -> bgUser.items?.eggs?.add(item)
-                        "food" -> bgUser.items?.food?.add(item)
-                        "hatchingPotions" -> bgUser.items?.hatchingPotions?.add(item)
-                        "quests" -> bgUser.items?.quests?.add(item)
-                    }
-                }
-                item.numberOwned += 1
-            }
-
-            bgUser.stats?.hp = res.hp
-            bgUser.stats?.exp = res.exp
-            bgUser.stats?.mp = res.mp
-            bgUser.stats?.gp = res.gp
-            bgUser.stats?.lvl = res.lvl
-            bgUser.party?.quest?.progress?.up = (
-                bgUser.party?.quest?.progress?.up
-                    ?: 0F
-                ) + (res._tmp?.quest?.progressDelta?.toFloat() ?: 0F)
-        }
-    }
-
-    override suspend fun markTaskNeedsWork(task: Task, userID: String) {
-        val savedTask = apiClient.markTaskNeedsWork(task.id ?: "", userID)
-        if (savedTask != null) {
-            savedTask.id = task.id
-            savedTask.position = task.position
-            savedTask.group?.assignedUsersDetail?.firstOrNull { it.assignedUserID == userID }?.let {
-                it.completed = false
-                it.completedDate = null
-            }
-            localRepository.save(savedTask)
-        }
-    }
-
-    override suspend fun taskChecked(
-        user: User?,
-        taskId: String,
-        up: Boolean,
-        force: Boolean,
-        notifyFunc: ((TaskScoringResult) -> Unit)?
-    ): TaskScoringResult? {
-        val task = localRepository.getTask(taskId).firstOrNull() ?: return null
-        return taskChecked(user, task, up, force, notifyFunc)
-    }
-
-    override suspend fun scoreChecklistItem(taskId: String, itemId: String): Task? {
-        val task = apiClient.scoreChecklistItem(taskId, itemId)
-        val updatedItem: ChecklistItem? = task?.checklist?.lastOrNull { itemId == it.id }
-        if (updatedItem != null) {
-            localRepository.save(updatedItem)
-        }
-        return task
-    }
-
-    override fun getTask(taskId: String) = localRepository.getTask(taskId)
-
-    override fun getTaskCopy(taskId: String) = localRepository.getTaskCopy(taskId)
-
-    override suspend fun createTask(task: Task, force: Boolean): Task? {
-        val now = Date().time
-        if (lastTaskAction > now - 500 && !force) {
-            return null
-        }
-        lastTaskAction = now
-
-        task.isSaving = true
-        task.isCreating = true
-        task.hasErrored = false
-        task.ownerID = if (task.isGroupTask) {
-            task.group?.groupID ?: ""
-        } else {
-            authenticationHandler.currentUserID ?: ""
-        }
-        if (task.id == null) {
-            task.id = UUID.randomUUID().toString()
-        }
-        localRepository.save(task)
-
-        val savedTask = if (task.isGroupTask) {
-            apiClient.createGroupTask(task.group?.groupID ?: "", task)
-        } else {
-            apiClient.createTask(task)
-        }
-        savedTask?.dateCreated = Date()
-        if (savedTask != null) {
-            savedTask.tags = task.tags
-            localRepository.save(savedTask)
-        } else {
-            task.hasErrored = true
-            task.isSaving = false
-            localRepository.save(task)
-        }
-        return savedTask
-    }
-
-    @Suppress("ReturnCount")
-    override suspend fun updateTask(task: Task, force: Boolean): Task? {
-        val now = Date().time
-        if ((lastTaskAction > now - 500 && !force) || !task.isValid) {
-            return task
-        }
-        lastTaskAction = now
-        val id = task.id ?: return task
-        val unmanagedTask = localRepository.getUnmanagedCopy(task)
-        unmanagedTask.isSaving = true
-        unmanagedTask.hasErrored = false
-        localRepository.save(unmanagedTask)
-        val savedTask = apiClient.updateTask(id, unmanagedTask)
-        savedTask?.position = task.position
-        savedTask?.id = task.id
-        savedTask?.ownerID = task.ownerID
-        if (savedTask != null) {
-            savedTask.tags = task.tags
-            localRepository.save(savedTask)
-        } else {
-            unmanagedTask.hasErrored = true
-            unmanagedTask.isSaving = false
-            localRepository.save(unmanagedTask)
-        }
-        return savedTask
-    }
-
-    override suspend fun deleteTask(taskId: String): Void? {
-        apiClient.deleteTask(taskId) ?: return null
-        localRepository.deleteTask(taskId)
-        return null
-    }
-
-    override fun saveTask(task: Task) {
-        localRepository.save(task)
-    }
-
-    override suspend fun createTasks(newTasks: List<Task>) = apiClient.createTasks(newTasks)
-
-    override fun markTaskCompleted(taskId: String, isCompleted: Boolean) {
-        localRepository.markTaskCompleted(taskId, isCompleted)
-    }
-
-    override fun <T : BaseMainObject> modify(obj: T, transaction: (T) -> Unit) {
-        localRepository.modify(obj, transaction)
-    }
-
-    override fun swapTaskPosition(firstPosition: Int, secondPosition: Int) {
-        localRepository.swapTaskPosition(firstPosition, secondPosition)
-    }
-
-    override suspend fun updateTaskPosition(taskType: TaskType, taskID: String, newPosition: Int): List<String>? {
-        val positions = apiClient.postTaskNewPosition(taskID, newPosition) ?: return null
-        localRepository.updateTaskPositions(positions)
-        return positions
-    }
-
-    override fun getUnmanagedTask(taskid: String) = getTask(taskid).map { localRepository.getUnmanagedCopy(it) }
-
-    override fun updateTaskInBackground(task: Task, assignChanges: Map<String, MutableList<String>>) {
-        MainScope().launchCatching {
-            val updatedTask = updateTask(task) ?: return@launchCatching
-            handleAssignmentChanges(updatedTask, assignChanges)
-        }
-    }
-
-    override fun createTaskInBackground(task: Task, assignChanges: Map<String, MutableList<String>>) {
-        MainScope().launchCatching {
-            val createdTask = createTask(task) ?: return@launchCatching
-            handleAssignmentChanges(createdTask, assignChanges)
-        }
-    }
-
-    private suspend fun handleAssignmentChanges(task: Task, assignChanges: Map<String, MutableList<String>>) {
-        val taskID = task.id ?: return
-        assignChanges["assign"]?.let { assignments ->
-            if (assignments.isEmpty()) return@let
-            val savedTask = apiClient.assignToTask(taskID, assignments) ?: return@let
-            savedTask.id = task.id
-            savedTask.ownerID = task.ownerID
-            savedTask.position = task.position
-            localRepository.save(savedTask)
-        }
-
-        assignChanges["unassign"]?.let { unassignments ->
-            var savedTask: Task? = null
-            for (unassignment in unassignments) {
-                savedTask = apiClient.unassignFromTask(taskID, unassignment)
-            }
-            if (savedTask != null) {
-                savedTask.id = task.id
-                savedTask.position = task.position
-                savedTask.ownerID = task.ownerID
-                localRepository.save(savedTask)
-            }
-        }
-    }
-
-    override fun getTaskCopies(): Flow<List<Task>> = authenticationHandler.userIDFlow.flatMapLatest {
-        localRepository.getTasks(it)
-    }.map { localRepository.getUnmanagedCopy(it) }
-
-    override fun getTaskCopies(tasks: List<Task>): List<Task> = localRepository.getUnmanagedCopy(tasks)
-
-    override suspend fun retrieveDailiesFromDate(date: Date): TaskList? {
-        val formatter = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZZZZZ", Locale.US)
-        return apiClient.getTasks("dailys", formatter.format(date))
-    }
-
-    override suspend fun syncErroredTasks(): List<Task>? {
-        val tasks = localRepository.getErroredTasks(currentUserID ?: "").firstOrNull()
-        return tasks?.map { localRepository.getUnmanagedCopy(it) }?.mapNotNull {
-            if (it.isCreating) {
-                createTask(it, true)
-            } else {
-                updateTask(it, true)
-            }
-        }
-    }
-
-    override suspend fun unlinkAllTasks(challengeID: String?, keepOption: String): Void? {
-        return apiClient.unlinkAllTasks(challengeID, keepOption)
-    }
-
-    override fun getTasksForChallenge(challengeID: String?): Flow<List<Task>> {
-        return localRepository.getTasksForChallenge(challengeID, currentUserID ?: "")
-    }
-}
+package com.habitrpg.android.habitica.data.implementation
+
+import com.habitrpg.android.habitica.data.ApiClient
+import com.habitrpg.android.habitica.data.TaskRepository
+import com.habitrpg.android.habitica.data.local.TaskLocalRepository
+import com.habitrpg.android.habitica.helpers.Analytics
+import com.habitrpg.android.habitica.helpers.AppConfigManager
+import com.habitrpg.android.habitica.helpers.EventCategory
+import com.habitrpg.android.habitica.helpers.HitType
+import com.habitrpg.android.habitica.interactors.ScoreTaskLocallyInteractor
+import com.habitrpg.android.habitica.models.BaseMainObject
+import com.habitrpg.android.habitica.models.responses.BulkTaskScoringData
+import com.habitrpg.android.habitica.models.tasks.ChecklistItem
+import com.habitrpg.android.habitica.models.tasks.Task
+import com.habitrpg.android.habitica.models.tasks.TaskList
+import com.habitrpg.android.habitica.models.user.OwnedItem
+import com.habitrpg.android.habitica.models.user.User
+import com.habitrpg.android.habitica.modules.AuthenticationHandler
+import com.habitrpg.common.habitica.helpers.launchCatching
+import com.habitrpg.shared.habitica.models.responses.TaskDirection
+import com.habitrpg.shared.habitica.models.responses.TaskDirectionData
+import com.habitrpg.shared.habitica.models.responses.TaskScoringResult
+import com.habitrpg.shared.habitica.models.tasks.TaskType
+import com.habitrpg.shared.habitica.models.tasks.TasksOrder
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.map
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+import java.util.UUID
+
+@ExperimentalCoroutinesApi
+class TaskRepositoryImpl(
+    localRepository: TaskLocalRepository,
+    apiClient: ApiClient,
+    authenticationHandler: AuthenticationHandler,
+    val appConfigManager: AppConfigManager,
+) : BaseRepositoryImpl<TaskLocalRepository>(localRepository, apiClient, authenticationHandler),
+    TaskRepository {
+    private var lastTaskAction: Long = 0
+
+    override fun getTasks(
+        taskType: TaskType,
+        userID: String?,
+        includedGroupIDs: Array<String>,
+    ): Flow<List<Task>> =
+        this.localRepository.getTasks(
+            taskType,
+            userID ?: authenticationHandler.currentUserID ?: "",
+            includedGroupIDs,
+        )
+
+    override fun saveTasks(
+        userId: String,
+        order: TasksOrder,
+        tasks: TaskList,
+    ) {
+        localRepository.saveTasks(userId, order, tasks)
+    }
+
+    override suspend fun retrieveTasks(
+        userId: String,
+        tasksOrder: TasksOrder,
+    ): TaskList? {
+        val tasks = apiClient.getTasks() ?: return null
+        this.localRepository.saveTasks(userId, tasksOrder, tasks)
+        return tasks
+    }
+
+    override suspend fun retrieveCompletedTodos(userId: String?): TaskList? {
+        val taskList = this.apiClient.getTasks("completedTodos") ?: return null
+        val tasks = taskList.tasks
+        this.localRepository.saveCompletedTodos(
+            userId ?: authenticationHandler.currentUserID ?: "",
+            tasks.values,
+        )
+        return taskList
+    }
+
+    override suspend fun retrieveTasks(
+        userId: String,
+        tasksOrder: TasksOrder,
+        dueDate: Date,
+    ): TaskList? {
+        val formatter = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZZZZZ", Locale.US)
+        val taskList = this.apiClient.getTasks("dailys", formatter.format(dueDate)) ?: return null
+        this.localRepository.saveTasks(userId, tasksOrder, taskList)
+        return taskList
+    }
+
+    @Suppress("ReturnCount")
+    override suspend fun taskChecked(
+        user: User?,
+        task: Task,
+        up: Boolean,
+        force: Boolean,
+        notifyFunc: ((TaskScoringResult) -> Unit)?,
+    ): TaskScoringResult? {
+        val localData =
+            if (user != null && appConfigManager.enableLocalTaskScoring()) {
+                ScoreTaskLocallyInteractor.score(
+                    user,
+                    task,
+                    if (up) TaskDirection.UP else TaskDirection.DOWN,
+                )
+            } else {
+                null
+            }
+        if (user != null && localData != null) {
+            val stats = user.stats
+            val result = TaskScoringResult(localData, stats)
+            notifyFunc?.invoke(result)
+
+            handleTaskResponse(user, localData, task, up, 0f)
+        }
+        val now = Date().time
+        val id = task.id
+        if (lastTaskAction > now - 500 && !force || id == null) {
+            return null
+        }
+
+        lastTaskAction = now
+        val res =
+            this.apiClient.postTaskDirection(
+                id,
+                (if (up) TaskDirection.UP else TaskDirection.DOWN).text,
+            ) ?: return null
+        // There are cases where the user object is not set correctly. So the app refetches it as a fallback
+        val thisUser =
+            user ?: localRepository.getUser(authenticationHandler.currentUserID ?: "").firstOrNull()
+                ?: return null
+        // save local task changes
+
+        Analytics.sendEvent(
+            "task_scored",
+            EventCategory.BEHAVIOUR,
+            HitType.EVENT,
+            mapOf(
+                "type" to (task.type ?: ""),
+                "scored_up" to up,
+                "value" to task.value,
+            ),
+        )
+        if (res.lvl == 0) {
+            // Team tasks that require approval have weird data that we should just ignore.
+            return TaskScoringResult()
+        }
+        val result = TaskScoringResult(res, thisUser.stats)
+        if (localData == null) {
+            notifyFunc?.invoke(result)
+        }
+        handleTaskResponse(thisUser, res, task, up, localData?.delta ?: 0f)
+        return result
+    }
+
+    override suspend fun bulkScoreTasks(data: List<Map<String, String>>): BulkTaskScoringData? {
+        return apiClient.bulkScoreTasks(data)
+    }
+
+    private fun handleTaskResponse(
+        user: User,
+        res: TaskDirectionData,
+        task: Task,
+        up: Boolean,
+        localDelta: Float,
+    ) {
+        this.localRepository.executeTransaction {
+            val bgTask = localRepository.getLiveObject(task) ?: return@executeTransaction
+            val bgUser = localRepository.getLiveObject(user) ?: return@executeTransaction
+            if (bgTask.type != TaskType.REWARD && (bgTask.value - localDelta) + res.delta != bgTask.value) {
+                bgTask.value = (bgTask.value - localDelta) + res.delta
+                if (TaskType.DAILY == bgTask.type || TaskType.TODO == bgTask.type) {
+                    bgTask.completeForUser(authenticationHandler.currentUserID ?: "", up)
+                    if (TaskType.DAILY == bgTask.type) {
+                        if (up) {
+                            bgTask.streak = (bgTask.streak ?: 0) + 1
+                        } else {
+                            bgTask.streak = (bgTask.streak ?: 0) - 1
+                        }
+                    }
+                } else if (TaskType.HABIT == bgTask.type) {
+                    if (up) {
+                        bgTask.counterUp = (bgTask.counterUp ?: 0) + 1
+                    } else {
+                        bgTask.counterDown = (bgTask.counterDown ?: 0) + 1
+                    }
+                }
+
+                if (bgTask.isGroupTask) {
+                    val entry =
+                        bgTask.group?.assignedUsersDetail?.firstOrNull { it.assignedUserID == user.id }
+                    entry?.completed = up
+                    if (up) {
+                        entry?.completedDate = Date()
+                    } else {
+                        entry?.completedDate = null
+                    }
+                }
+            }
+            res._tmp?.drop?.key?.let { key ->
+                val type =
+                    when (res._tmp?.drop?.type?.lowercase(Locale.US)) {
+                        "hatchingpotion" -> "hatchingPotions"
+                        "egg" -> "eggs"
+                        else -> res._tmp?.drop?.type?.lowercase(Locale.US)
+                    }
+                var item =
+                    it.where(OwnedItem::class.java).equalTo("itemType", type).equalTo("key", key)
+                        .findFirst()
+                if (item == null) {
+                    item = OwnedItem()
+                    item.key = key
+                    item.itemType = type
+                    item.userID = user.id
+
+                    when (type) {
+                        "eggs" -> bgUser.items?.eggs?.add(item)
+                        "food" -> bgUser.items?.food?.add(item)
+                        "hatchingPotions" -> bgUser.items?.hatchingPotions?.add(item)
+                        "quests" -> bgUser.items?.quests?.add(item)
+                    }
+                }
+                item.numberOwned += 1
+            }
+
+            bgUser.stats?.hp = res.hp
+            bgUser.stats?.exp = res.exp
+            bgUser.stats?.mp = res.mp
+            bgUser.stats?.gp = res.gp
+            bgUser.stats?.lvl = res.lvl
+            bgUser.party?.quest?.progress?.up = (
+                bgUser.party?.quest?.progress?.up
+                    ?: 0F
+            ) + (res._tmp?.quest?.progressDelta?.toFloat() ?: 0F)
+        }
+    }
+
+    override suspend fun markTaskNeedsWork(
+        task: Task,
+        userID: String,
+    ) {
+        val savedTask = apiClient.markTaskNeedsWork(task.id ?: "", userID)
+        if (savedTask != null) {
+            savedTask.id = task.id
+            savedTask.position = task.position
+            savedTask.group?.assignedUsersDetail?.firstOrNull { it.assignedUserID == userID }?.let {
+                it.completed = false
+                it.completedDate = null
+            }
+            localRepository.save(savedTask)
+        }
+    }
+
+    override suspend fun taskChecked(
+        user: User?,
+        taskId: String,
+        up: Boolean,
+        force: Boolean,
+        notifyFunc: ((TaskScoringResult) -> Unit)?,
+    ): TaskScoringResult? {
+        val task = localRepository.getTask(taskId).firstOrNull() ?: return null
+        return taskChecked(user, task, up, force, notifyFunc)
+    }
+
+    override suspend fun scoreChecklistItem(
+        taskId: String,
+        itemId: String,
+    ): Task? {
+        val task = apiClient.scoreChecklistItem(taskId, itemId)
+        val updatedItem: ChecklistItem? = task?.checklist?.lastOrNull { itemId == it.id }
+        if (updatedItem != null) {
+            localRepository.save(updatedItem)
+        }
+        return task
+    }
+
+    override fun getTask(taskId: String) = localRepository.getTask(taskId)
+
+    override fun getTaskCopy(taskId: String) = localRepository.getTaskCopy(taskId)
+
+    override suspend fun createTask(
+        task: Task,
+        force: Boolean,
+    ): Task? {
+        val now = Date().time
+        if (lastTaskAction > now - 500 && !force) {
+            return null
+        }
+        lastTaskAction = now
+
+        task.isSaving = true
+        task.isCreating = true
+        task.hasErrored = false
+        task.ownerID =
+            if (task.isGroupTask) {
+                task.group?.groupID ?: ""
+            } else {
+                authenticationHandler.currentUserID ?: ""
+            }
+        if (task.id == null) {
+            task.id = UUID.randomUUID().toString()
+        }
+        localRepository.save(task)
+
+        val savedTask =
+            if (task.isGroupTask) {
+                apiClient.createGroupTask(task.group?.groupID ?: "", task)
+            } else {
+                apiClient.createTask(task)
+            }
+        savedTask?.dateCreated = Date()
+        if (savedTask != null) {
+            savedTask.tags = task.tags
+            localRepository.save(savedTask)
+        } else {
+            task.hasErrored = true
+            task.isSaving = false
+            localRepository.save(task)
+        }
+        return savedTask
+    }
+
+    @Suppress("ReturnCount")
+    override suspend fun updateTask(
+        task: Task,
+        force: Boolean,
+    ): Task? {
+        val now = Date().time
+        if ((lastTaskAction > now - 500 && !force) || !task.isValid) {
+            return task
+        }
+        lastTaskAction = now
+        val id = task.id ?: return task
+        val unmanagedTask = localRepository.getUnmanagedCopy(task)
+        unmanagedTask.isSaving = true
+        unmanagedTask.hasErrored = false
+        localRepository.save(unmanagedTask)
+        val savedTask = apiClient.updateTask(id, unmanagedTask)
+        savedTask?.position = task.position
+        savedTask?.id = task.id
+        savedTask?.ownerID = task.ownerID
+        if (savedTask != null) {
+            savedTask.tags = task.tags
+            localRepository.save(savedTask)
+        } else {
+            unmanagedTask.hasErrored = true
+            unmanagedTask.isSaving = false
+            localRepository.save(unmanagedTask)
+        }
+        return savedTask
+    }
+
+    override suspend fun deleteTask(taskId: String): Void? {
+        apiClient.deleteTask(taskId) ?: return null
+        localRepository.deleteTask(taskId)
+        return null
+    }
+
+    override fun saveTask(task: Task) {
+        localRepository.save(task)
+    }
+
+    override suspend fun createTasks(newTasks: List<Task>) = apiClient.createTasks(newTasks)
+
+    override fun markTaskCompleted(
+        taskId: String,
+        isCompleted: Boolean,
+    ) {
+        localRepository.markTaskCompleted(taskId, isCompleted)
+    }
+
+    override fun <T : BaseMainObject> modify(
+        obj: T,
+        transaction: (T) -> Unit,
+    ) {
+        localRepository.modify(obj, transaction)
+    }
+
+    override fun swapTaskPosition(
+        firstPosition: Int,
+        secondPosition: Int,
+    ) {
+        localRepository.swapTaskPosition(firstPosition, secondPosition)
+    }
+
+    override suspend fun updateTaskPosition(
+        taskType: TaskType,
+        taskID: String,
+        newPosition: Int,
+    ): List<String>? {
+        val positions = apiClient.postTaskNewPosition(taskID, newPosition) ?: return null
+        localRepository.updateTaskPositions(positions)
+        return positions
+    }
+
+    override fun getUnmanagedTask(taskid: String) =
+        getTask(taskid).map { localRepository.getUnmanagedCopy(it) }
+
+    override fun updateTaskInBackground(
+        task: Task,
+        assignChanges: Map<String, MutableList<String>>,
+    ) {
+        MainScope().launchCatching {
+            val updatedTask = updateTask(task) ?: return@launchCatching
+            handleAssignmentChanges(updatedTask, assignChanges)
+        }
+    }
+
+    override fun createTaskInBackground(
+        task: Task,
+        assignChanges: Map<String, MutableList<String>>,
+    ) {
+        MainScope().launchCatching {
+            val createdTask = createTask(task) ?: return@launchCatching
+            handleAssignmentChanges(createdTask, assignChanges)
+        }
+    }
+
+    private suspend fun handleAssignmentChanges(
+        task: Task,
+        assignChanges: Map<String, MutableList<String>>,
+    ) {
+        val taskID = task.id ?: return
+        assignChanges["assign"]?.let { assignments ->
+            if (assignments.isEmpty()) return@let
+            val savedTask = apiClient.assignToTask(taskID, assignments) ?: return@let
+            savedTask.id = task.id
+            savedTask.ownerID = task.ownerID
+            savedTask.position = task.position
+            localRepository.save(savedTask)
+        }
+
+        assignChanges["unassign"]?.let { unassignments ->
+            var savedTask: Task? = null
+            for (unassignment in unassignments) {
+                savedTask = apiClient.unassignFromTask(taskID, unassignment)
+            }
+            if (savedTask != null) {
+                savedTask.id = task.id
+                savedTask.position = task.position
+                savedTask.ownerID = task.ownerID
+                localRepository.save(savedTask)
+            }
+        }
+    }
+
+    override fun getTaskCopies(): Flow<List<Task>> =
+        authenticationHandler.userIDFlow.flatMapLatest {
+            localRepository.getTasks(it)
+        }.map { localRepository.getUnmanagedCopy(it) }
+
+    override fun getTaskCopies(tasks: List<Task>): List<Task> =
+        localRepository.getUnmanagedCopy(tasks)
+
+    override suspend fun retrieveDailiesFromDate(date: Date): TaskList? {
+        val formatter = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZZZZZ", Locale.US)
+        return apiClient.getTasks("dailys", formatter.format(date))
+    }
+
+    override suspend fun syncErroredTasks(): List<Task>? {
+        val tasks = localRepository.getErroredTasks(currentUserID).firstOrNull()
+        return tasks?.map { localRepository.getUnmanagedCopy(it) }?.mapNotNull {
+            if (it.isCreating) {
+                createTask(it, true)
+            } else {
+                updateTask(it, true)
+            }
+        }
+    }
+
+    override suspend fun unlinkAllTasks(
+        challengeID: String?,
+        keepOption: String,
+    ): Void? {
+        return apiClient.unlinkAllTasks(challengeID, keepOption)
+    }
+
+    override fun getTasksForChallenge(challengeID: String?): Flow<List<Task>> {
+        return localRepository.getTasksForChallenge(challengeID, currentUserID)
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TutorialRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TutorialRepositoryImpl.kt
index 9edda31b7..e91f9ddc9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TutorialRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TutorialRepositoryImpl.kt
@@ -1,21 +1,21 @@
-package com.habitrpg.android.habitica.data.implementation
-
-import com.habitrpg.android.habitica.data.ApiClient
-import com.habitrpg.android.habitica.data.TutorialRepository
-import com.habitrpg.android.habitica.data.local.TutorialLocalRepository
-import com.habitrpg.android.habitica.models.TutorialStep
-import com.habitrpg.android.habitica.modules.AuthenticationHandler
-import kotlinx.coroutines.flow.Flow
-
-class TutorialRepositoryImpl(
-    localRepository: TutorialLocalRepository,
-    apiClient: ApiClient,
-    authenticationHandler: AuthenticationHandler
-) : BaseRepositoryImpl<TutorialLocalRepository>(localRepository, apiClient, authenticationHandler), TutorialRepository {
-
-    override fun getTutorialStep(key: String): Flow<TutorialStep> =
-        localRepository.getTutorialStep(key)
-
-    override fun getTutorialSteps(keys: List<String>): Flow<List<TutorialStep>> =
-        localRepository.getTutorialSteps(keys)
-}
+package com.habitrpg.android.habitica.data.implementation
+
+import com.habitrpg.android.habitica.data.ApiClient
+import com.habitrpg.android.habitica.data.TutorialRepository
+import com.habitrpg.android.habitica.data.local.TutorialLocalRepository
+import com.habitrpg.android.habitica.models.TutorialStep
+import com.habitrpg.android.habitica.modules.AuthenticationHandler
+import kotlinx.coroutines.flow.Flow
+
+class TutorialRepositoryImpl(
+    localRepository: TutorialLocalRepository,
+    apiClient: ApiClient,
+    authenticationHandler: AuthenticationHandler,
+) : BaseRepositoryImpl<TutorialLocalRepository>(localRepository, apiClient, authenticationHandler),
+    TutorialRepository {
+    override fun getTutorialStep(key: String): Flow<TutorialStep> =
+        localRepository.getTutorialStep(key)
+
+    override fun getTutorialSteps(keys: List<String>): Flow<List<TutorialStep>> =
+        localRepository.getTutorialSteps(keys)
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/BaseLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/BaseLocalRepository.kt
index a341c603d..950a35485 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/BaseLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/BaseLocalRepository.kt
@@ -6,21 +6,28 @@ import com.habitrpg.android.habitica.models.user.User
 import io.realm.Realm
 
 interface BaseLocalRepository {
-
     val isClosed: Boolean
     var realm: Realm
 
     fun close()
 
     fun executeTransaction(transaction: (Realm) -> Unit)
-    fun <T : BaseMainObject> modify(obj: T, transaction: (T) -> Unit)
+
+    fun <T : BaseMainObject> modify(
+        obj: T,
+        transaction: (T) -> Unit,
+    )
+
     fun <T : BaseObject> getLiveObject(obj: T): T?
 
     fun <T : BaseObject> getUnmanagedCopy(managedObject: T): T
+
     fun <T : BaseObject> getUnmanagedCopy(list: List<T>): List<T>
 
     fun <T : BaseObject> save(objects: List<T>)
+
     fun <T : BaseObject> save(`object`: T)
+
     fun <T : BaseMainObject> delete(obj: T)
 
     fun getLiveUser(id: String): User?
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/ChallengeLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/ChallengeLocalRepository.kt
index c72ce4084..f721c49ef 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/ChallengeLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/ChallengeLocalRepository.kt
@@ -6,22 +6,36 @@ import com.habitrpg.android.habitica.models.tasks.Task
 import kotlinx.coroutines.flow.Flow
 
 interface ChallengeLocalRepository : BaseLocalRepository {
-
     val challenges: Flow<List<Challenge>>
+
     fun getChallenge(id: String): Flow<Challenge>
+
     fun getTasks(challengeID: String): Flow<List<Task>>
 
     fun getUserChallenges(userId: String): Flow<List<Challenge>>
 
-    fun setParticipating(userID: String, challengeID: String, isParticipating: Boolean)
+    fun setParticipating(
+        userID: String,
+        challengeID: String,
+        isParticipating: Boolean,
+    )
 
     fun saveChallenges(
         challenges: List<Challenge>,
         clearChallenges: Boolean,
         memberOnly: Boolean,
-        userID: String
+        userID: String,
     )
-    fun getChallengeMembership(userId: String, id: String): Flow<ChallengeMembership>
+
+    fun getChallengeMembership(
+        userId: String,
+        id: String,
+    ): Flow<ChallengeMembership>
+
     fun getChallengeMemberships(userId: String): Flow<List<ChallengeMembership>>
-    fun isChallengeMember(userID: String, challengeID: String): Flow<Boolean>
+
+    fun isChallengeMember(
+        userID: String,
+        challengeID: String,
+    ): Flow<Boolean>
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/ContentLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/ContentLocalRepository.kt
index d8a664dea..1c5aab913 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/ContentLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/ContentLocalRepository.kt
@@ -6,6 +6,8 @@ import kotlinx.coroutines.flow.Flow
 
 interface ContentLocalRepository : BaseLocalRepository {
     fun saveContent(contentResult: ContentResult)
+
     fun saveWorldState(worldState: WorldState)
+
     fun getWorldState(): Flow<WorldState>
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/CustomizationLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/CustomizationLocalRepository.kt
index 122aa7399..b8ce0c371 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/CustomizationLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/CustomizationLocalRepository.kt
@@ -1,8 +1,12 @@
-package com.habitrpg.android.habitica.data.local
-
-import com.habitrpg.android.habitica.models.inventory.Customization
-import kotlinx.coroutines.flow.Flow
-
-interface CustomizationLocalRepository : ContentLocalRepository {
-    fun getCustomizations(type: String, category: String?, onlyAvailable: Boolean): Flow<List<Customization>>
-}
+package com.habitrpg.android.habitica.data.local
+
+import com.habitrpg.android.habitica.models.inventory.Customization
+import kotlinx.coroutines.flow.Flow
+
+interface CustomizationLocalRepository : ContentLocalRepository {
+    fun getCustomizations(
+        type: String,
+        category: String?,
+        onlyAvailable: Boolean,
+    ): Flow<List<Customization>>
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.kt
index 91d76ffe4..e14c162ee 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.kt
@@ -1,70 +1,142 @@
-package com.habitrpg.android.habitica.data.local
-
-import com.habitrpg.android.habitica.models.inventory.Equipment
-import com.habitrpg.android.habitica.models.inventory.Item
-import com.habitrpg.android.habitica.models.inventory.Mount
-import com.habitrpg.android.habitica.models.inventory.Pet
-import com.habitrpg.android.habitica.models.inventory.QuestContent
-import com.habitrpg.android.habitica.models.shops.ShopItem
-import com.habitrpg.android.habitica.models.user.Items
-import com.habitrpg.android.habitica.models.user.OwnedItem
-import com.habitrpg.android.habitica.models.user.OwnedMount
-import com.habitrpg.android.habitica.models.user.OwnedPet
-import com.habitrpg.android.habitica.models.user.User
-import kotlinx.coroutines.flow.Flow
-
-interface InventoryLocalRepository : ContentLocalRepository {
-
-    fun getArmoireRemainingCount(): Flow<Int>
-    fun getOwnedEquipment(): Flow<List<Equipment>>
-
-    fun getMounts(): Flow<List<Mount>>
-
-    fun getOwnedMounts(userID: String): Flow<List<OwnedMount>>
-
-    fun getPets(): Flow<List<Pet>>
-
-    fun getOwnedPets(userID: String): Flow<List<OwnedPet>>
-
-    fun getInAppRewards(): Flow<List<ShopItem>>
-    fun getInAppReward(key: String): Flow<ShopItem>
-
-    fun getQuestContent(key: String): Flow<QuestContent?>
-    fun getQuestContent(keys: List<String>): Flow<List<QuestContent>>
-
-    fun getEquipment(searchedKeys: List<String>): Flow<List<Equipment>>
-
-    fun getOwnedEquipment(type: String): Flow<List<Equipment>>
-
-    fun getOwnedItems(itemType: String, userID: String, includeZero: Boolean): Flow<List<OwnedItem>>
-    fun getOwnedItems(userID: String, includeZero: Boolean): Flow<Map<String, OwnedItem>>
-    fun getEquipmentType(type: String, set: String): Flow<List<Equipment>>
-
-    fun getEquipment(key: String): Flow<Equipment>
-    fun getMounts(type: String?, group: String?, color: String?): Flow<List<Mount>>
-    fun getPets(type: String?, group: String?, color: String?): Flow<List<Pet>>
-
-    fun updateOwnedEquipment(user: User)
-
-    suspend fun changeOwnedCount(type: String, key: String, userID: String, amountToAdd: Int)
-    fun changeOwnedCount(item: OwnedItem, amountToAdd: Int?)
-
-    fun getItem(type: String, key: String): Flow<Item>
-    fun getOwnedItem(userID: String, type: String, key: String, includeZero: Boolean): Flow<OwnedItem>
-
-    fun decrementMysteryItemCount(user: User?)
-    fun saveInAppRewards(onlineItems: List<ShopItem>)
-
-    fun hatchPet(eggKey: String, potionKey: String, userID: String)
-    fun unhatchPet(eggKey: String, potionKey: String, userID: String)
-    fun feedPet(foodKey: String, petKey: String, feedValue: Int, userID: String)
-    fun getLatestMysteryItem(): Flow<Equipment>
-    fun soldItem(userID: String, updatedUser: User): User
-    fun getAvailableLimitedItems(): Flow<List<Item>>
-
-    fun save(items: Items, userID: String)
-
-    fun getLiveObject(obj: OwnedItem): OwnedItem?
-    fun getItems(itemClass: Class<out Item>): Flow<List<Item>>
-    fun getItems(itemClass: Class<out Item>, keys: Array<String>): Flow<List<Item>>
-}
+package com.habitrpg.android.habitica.data.local
+
+import com.habitrpg.android.habitica.models.inventory.Equipment
+import com.habitrpg.android.habitica.models.inventory.Item
+import com.habitrpg.android.habitica.models.inventory.Mount
+import com.habitrpg.android.habitica.models.inventory.Pet
+import com.habitrpg.android.habitica.models.inventory.QuestContent
+import com.habitrpg.android.habitica.models.shops.ShopItem
+import com.habitrpg.android.habitica.models.user.Items
+import com.habitrpg.android.habitica.models.user.OwnedItem
+import com.habitrpg.android.habitica.models.user.OwnedMount
+import com.habitrpg.android.habitica.models.user.OwnedPet
+import com.habitrpg.android.habitica.models.user.User
+import kotlinx.coroutines.flow.Flow
+
+interface InventoryLocalRepository : ContentLocalRepository {
+    fun getArmoireRemainingCount(): Flow<Int>
+
+    fun getOwnedEquipment(): Flow<List<Equipment>>
+
+    fun getMounts(): Flow<List<Mount>>
+
+    fun getOwnedMounts(userID: String): Flow<List<OwnedMount>>
+
+    fun getPets(): Flow<List<Pet>>
+
+    fun getOwnedPets(userID: String): Flow<List<OwnedPet>>
+
+    fun getInAppRewards(): Flow<List<ShopItem>>
+
+    fun getInAppReward(key: String): Flow<ShopItem>
+
+    fun getQuestContent(key: String): Flow<QuestContent?>
+
+    fun getQuestContent(keys: List<String>): Flow<List<QuestContent>>
+
+    fun getEquipment(searchedKeys: List<String>): Flow<List<Equipment>>
+
+    fun getOwnedEquipment(type: String): Flow<List<Equipment>>
+
+    fun getOwnedItems(
+        itemType: String,
+        userID: String,
+        includeZero: Boolean,
+    ): Flow<List<OwnedItem>>
+
+    fun getOwnedItems(
+        userID: String,
+        includeZero: Boolean,
+    ): Flow<Map<String, OwnedItem>>
+
+    fun getEquipmentType(
+        type: String,
+        set: String,
+    ): Flow<List<Equipment>>
+
+    fun getEquipment(key: String): Flow<Equipment>
+
+    fun getMounts(
+        type: String?,
+        group: String?,
+        color: String?,
+    ): Flow<List<Mount>>
+
+    fun getPets(
+        type: String?,
+        group: String?,
+        color: String?,
+    ): Flow<List<Pet>>
+
+    fun updateOwnedEquipment(user: User)
+
+    suspend fun changeOwnedCount(
+        type: String,
+        key: String,
+        userID: String,
+        amountToAdd: Int,
+    )
+
+    fun changeOwnedCount(
+        item: OwnedItem,
+        amountToAdd: Int?,
+    )
+
+    fun getItem(
+        type: String,
+        key: String,
+    ): Flow<Item>
+
+    fun getOwnedItem(
+        userID: String,
+        type: String,
+        key: String,
+        includeZero: Boolean,
+    ): Flow<OwnedItem>
+
+    fun decrementMysteryItemCount(user: User?)
+
+    fun saveInAppRewards(onlineItems: List<ShopItem>)
+
+    fun hatchPet(
+        eggKey: String,
+        potionKey: String,
+        userID: String,
+    )
+
+    fun unhatchPet(
+        eggKey: String,
+        potionKey: String,
+        userID: String,
+    )
+
+    fun feedPet(
+        foodKey: String,
+        petKey: String,
+        feedValue: Int,
+        userID: String,
+    )
+
+    fun getLatestMysteryItem(): Flow<Equipment>
+
+    fun soldItem(
+        userID: String,
+        updatedUser: User,
+    ): User
+
+    fun getAvailableLimitedItems(): Flow<List<Item>>
+
+    fun save(
+        items: Items,
+        userID: String,
+    )
+
+    fun getLiveObject(obj: OwnedItem): OwnedItem?
+
+    fun getItems(itemClass: Class<out Item>): Flow<List<Item>>
+
+    fun getItems(
+        itemClass: Class<out Item>,
+        keys: Array<String>,
+    ): Flow<List<Item>>
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/SocialLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/SocialLocalRepository.kt
index 32fcb9ab2..c49772f6f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/SocialLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/SocialLocalRepository.kt
@@ -1,55 +1,103 @@
-package com.habitrpg.android.habitica.data.local
-
-import com.habitrpg.android.habitica.models.members.Member
-import com.habitrpg.android.habitica.models.social.ChatMessage
-import com.habitrpg.android.habitica.models.social.Group
-import com.habitrpg.android.habitica.models.social.GroupMembership
-import com.habitrpg.android.habitica.models.social.InboxConversation
-import com.habitrpg.android.habitica.models.user.User
-import io.realm.RealmResults
-import kotlinx.coroutines.flow.Flow
-
-interface SocialLocalRepository : BaseLocalRepository {
-    fun getUserGroups(userID: String, type: String?): Flow<List<Group>>
-
-    fun getGroup(id: String): Flow<Group?>
-    fun saveGroup(group: Group)
-
-    fun getGroupChat(groupId: String): Flow<List<ChatMessage>>
-
-    fun deleteMessage(id: String)
-
-    fun getPartyMembers(partyId: String): Flow<List<Member>>
-    fun getGroupMembers(groupID: String): Flow<List<Member>>
-
-    fun updateRSVPNeeded(user: User?, newValue: Boolean)
-
-    fun likeMessage(chatMessage: ChatMessage, userId: String, liked: Boolean)
-
-    fun savePartyMembers(groupId: String?, members: List<Member>)
-
-    fun removeQuest(partyId: String)
-
-    fun setQuestActivity(party: Group?, active: Boolean)
-
-    fun saveChatMessages(groupId: String?, chatMessages: List<ChatMessage>)
-
-    fun doesGroupExist(id: String): Boolean
-    fun updateMembership(userId: String, id: String, isMember: Boolean)
-    fun getGroupMembership(userId: String, id: String): Flow<GroupMembership?>
-    fun getGroupMemberships(userId: String): Flow<List<GroupMembership>>
-    fun rejectGroupInvitation(userID: String, groupID: String)
-
-    fun getInboxMessages(userId: String, replyToUserID: String?): Flow<RealmResults<ChatMessage>>
-
-    fun getInboxConversation(userId: String): Flow<RealmResults<InboxConversation>>
-    fun saveGroupMemberships(userID: String?, memberships: List<GroupMembership>)
-    fun saveInboxMessages(
-        userID: String,
-        recipientID: String,
-        messages: List<ChatMessage>,
-        page: Int
-    )
-    fun saveInboxConversations(userID: String, conversations: List<InboxConversation>)
-    fun getMember(userID: String?): Flow<Member?>
-}
+package com.habitrpg.android.habitica.data.local
+
+import com.habitrpg.android.habitica.models.members.Member
+import com.habitrpg.android.habitica.models.social.ChatMessage
+import com.habitrpg.android.habitica.models.social.Group
+import com.habitrpg.android.habitica.models.social.GroupMembership
+import com.habitrpg.android.habitica.models.social.InboxConversation
+import com.habitrpg.android.habitica.models.user.User
+import io.realm.RealmResults
+import kotlinx.coroutines.flow.Flow
+
+interface SocialLocalRepository : BaseLocalRepository {
+    fun getUserGroups(
+        userID: String,
+        type: String?,
+    ): Flow<List<Group>>
+
+    fun getGroup(id: String): Flow<Group?>
+
+    fun saveGroup(group: Group)
+
+    fun getGroupChat(groupId: String): Flow<List<ChatMessage>>
+
+    fun deleteMessage(id: String)
+
+    fun getPartyMembers(partyId: String): Flow<List<Member>>
+
+    fun getGroupMembers(groupID: String): Flow<List<Member>>
+
+    fun updateRSVPNeeded(
+        user: User?,
+        newValue: Boolean,
+    )
+
+    fun likeMessage(
+        chatMessage: ChatMessage,
+        userId: String,
+        liked: Boolean,
+    )
+
+    fun savePartyMembers(
+        groupId: String?,
+        members: List<Member>,
+    )
+
+    fun removeQuest(partyId: String)
+
+    fun setQuestActivity(
+        party: Group?,
+        active: Boolean,
+    )
+
+    fun saveChatMessages(
+        groupId: String?,
+        chatMessages: List<ChatMessage>,
+    )
+
+    fun doesGroupExist(id: String): Boolean
+
+    fun updateMembership(
+        userId: String,
+        id: String,
+        isMember: Boolean,
+    )
+
+    fun getGroupMembership(
+        userId: String,
+        id: String,
+    ): Flow<GroupMembership?>
+
+    fun getGroupMemberships(userId: String): Flow<List<GroupMembership>>
+
+    fun rejectGroupInvitation(
+        userID: String,
+        groupID: String,
+    )
+
+    fun getInboxMessages(
+        userId: String,
+        replyToUserID: String?,
+    ): Flow<RealmResults<ChatMessage>>
+
+    fun getInboxConversation(userId: String): Flow<RealmResults<InboxConversation>>
+
+    fun saveGroupMemberships(
+        userID: String?,
+        memberships: List<GroupMembership>,
+    )
+
+    fun saveInboxMessages(
+        userID: String,
+        recipientID: String,
+        messages: List<ChatMessage>,
+        page: Int,
+    )
+
+    fun saveInboxConversations(
+        userID: String,
+        conversations: List<InboxConversation>,
+    )
+
+    fun getMember(userID: String?): Flow<Member?>
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TaskLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TaskLocalRepository.kt
index 710518cfc..76442f3ee 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TaskLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TaskLocalRepository.kt
@@ -1,35 +1,63 @@
-package com.habitrpg.android.habitica.data.local
-
-import com.habitrpg.android.habitica.models.tasks.Task
-import com.habitrpg.android.habitica.models.tasks.TaskList
-import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.shared.habitica.models.tasks.TaskType
-import com.habitrpg.shared.habitica.models.tasks.TasksOrder
-import kotlinx.coroutines.flow.Flow
-
-interface TaskLocalRepository : BaseLocalRepository {
-
-    fun getTasks(taskType: TaskType, userID: String, includedGroupIDs: Array<String>): Flow<List<Task>>
-    fun getTasks(userId: String): Flow<List<Task>>
-
-    fun saveTasks(ownerID: String, tasksOrder: TasksOrder, tasks: TaskList)
-
-    fun deleteTask(taskID: String)
-
-    fun getTask(taskId: String): Flow<Task>
-    fun getTaskCopy(taskId: String): Flow<Task>
-
-    fun markTaskCompleted(taskId: String, isCompleted: Boolean)
-
-    fun swapTaskPosition(firstPosition: Int, secondPosition: Int)
-
-    fun getTaskAtPosition(taskType: String, position: Int): Flow<Task>
-
-    fun updateIsdue(daily: TaskList): TaskList
-
-    fun updateTaskPositions(taskOrder: List<String>)
-    fun saveCompletedTodos(userId: String, tasks: MutableCollection<Task>)
-    fun getErroredTasks(userID: String): Flow<List<Task>>
-    fun getUser(userID: String): Flow<User>
-    fun getTasksForChallenge(challengeID: String?, userID: String?): Flow<List<Task>>
-}
+package com.habitrpg.android.habitica.data.local
+
+import com.habitrpg.android.habitica.models.tasks.Task
+import com.habitrpg.android.habitica.models.tasks.TaskList
+import com.habitrpg.android.habitica.models.user.User
+import com.habitrpg.shared.habitica.models.tasks.TaskType
+import com.habitrpg.shared.habitica.models.tasks.TasksOrder
+import kotlinx.coroutines.flow.Flow
+
+interface TaskLocalRepository : BaseLocalRepository {
+    fun getTasks(
+        taskType: TaskType,
+        userID: String,
+        includedGroupIDs: Array<String>,
+    ): Flow<List<Task>>
+
+    fun getTasks(userId: String): Flow<List<Task>>
+
+    fun saveTasks(
+        ownerID: String,
+        tasksOrder: TasksOrder,
+        tasks: TaskList,
+    )
+
+    fun deleteTask(taskID: String)
+
+    fun getTask(taskId: String): Flow<Task>
+
+    fun getTaskCopy(taskId: String): Flow<Task>
+
+    fun markTaskCompleted(
+        taskId: String,
+        isCompleted: Boolean,
+    )
+
+    fun swapTaskPosition(
+        firstPosition: Int,
+        secondPosition: Int,
+    )
+
+    fun getTaskAtPosition(
+        taskType: String,
+        position: Int,
+    ): Flow<Task>
+
+    fun updateIsdue(daily: TaskList): TaskList
+
+    fun updateTaskPositions(taskOrder: List<String>)
+
+    fun saveCompletedTodos(
+        userId: String,
+        tasks: MutableCollection<Task>,
+    )
+
+    fun getErroredTasks(userID: String): Flow<List<Task>>
+
+    fun getUser(userID: String): Flow<User>
+
+    fun getTasksForChallenge(
+        challengeID: String?,
+        userID: String?,
+    ): Flow<List<Task>>
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TutorialLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TutorialLocalRepository.kt
index 951986edc..3b0e74851 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TutorialLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TutorialLocalRepository.kt
@@ -1,10 +1,10 @@
-package com.habitrpg.android.habitica.data.local
-
-import com.habitrpg.android.habitica.models.TutorialStep
-import kotlinx.coroutines.flow.Flow
-
-interface TutorialLocalRepository : BaseLocalRepository {
-
-    fun getTutorialStep(key: String): Flow<TutorialStep>
-    fun getTutorialSteps(keys: List<String>): Flow<List<TutorialStep>>
-}
+package com.habitrpg.android.habitica.data.local
+
+import com.habitrpg.android.habitica.models.TutorialStep
+import kotlinx.coroutines.flow.Flow
+
+interface TutorialLocalRepository : BaseLocalRepository {
+    fun getTutorialStep(key: String): Flow<TutorialStep>
+
+    fun getTutorialSteps(keys: List<String>): Flow<List<TutorialStep>>
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/UserLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/UserLocalRepository.kt
index 1814760df..b9ab833b9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/UserLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/UserLocalRepository.kt
@@ -1,32 +1,40 @@
-package com.habitrpg.android.habitica.data.local
-
-import com.habitrpg.android.habitica.models.Achievement
-import com.habitrpg.android.habitica.models.QuestAchievement
-import com.habitrpg.android.habitica.models.Skill
-import com.habitrpg.android.habitica.models.TeamPlan
-import com.habitrpg.android.habitica.models.TutorialStep
-import com.habitrpg.android.habitica.models.social.ChatMessage
-import com.habitrpg.android.habitica.models.social.Group
-import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.android.habitica.models.user.UserQuestStatus
-import io.realm.RealmResults
-import kotlinx.coroutines.flow.Flow
-
-interface UserLocalRepository : BaseLocalRepository {
-
-    suspend fun getTutorialSteps(): Flow<RealmResults<TutorialStep>>
-
-    fun getUser(userID: String): Flow<User?>
-    fun saveUser(user: User, overrideExisting: Boolean = true)
-
-    fun saveMessages(messages: List<ChatMessage>)
-
-    fun getSkills(user: User): Flow<List<Skill>>
-
-    fun getSpecialItems(user: User): Flow<List<Skill>>
-    fun getAchievements(): Flow<List<Achievement>>
-    fun getQuestAchievements(userID: String): Flow<List<QuestAchievement>>
-    fun getUserQuestStatus(userID: String): Flow<UserQuestStatus>
-    fun getTeamPlans(userID: String): Flow<List<TeamPlan>>
-    fun getTeamPlan(teamID: String): Flow<Group?>
-}
+package com.habitrpg.android.habitica.data.local
+
+import com.habitrpg.android.habitica.models.Achievement
+import com.habitrpg.android.habitica.models.QuestAchievement
+import com.habitrpg.android.habitica.models.Skill
+import com.habitrpg.android.habitica.models.TeamPlan
+import com.habitrpg.android.habitica.models.TutorialStep
+import com.habitrpg.android.habitica.models.social.ChatMessage
+import com.habitrpg.android.habitica.models.social.Group
+import com.habitrpg.android.habitica.models.user.User
+import com.habitrpg.android.habitica.models.user.UserQuestStatus
+import io.realm.RealmResults
+import kotlinx.coroutines.flow.Flow
+
+interface UserLocalRepository : BaseLocalRepository {
+    suspend fun getTutorialSteps(): Flow<RealmResults<TutorialStep>>
+
+    fun getUser(userID: String): Flow<User?>
+
+    fun saveUser(
+        user: User,
+        overrideExisting: Boolean = true,
+    )
+
+    fun saveMessages(messages: List<ChatMessage>)
+
+    fun getSkills(user: User): Flow<List<Skill>>
+
+    fun getSpecialItems(user: User): Flow<List<Skill>>
+
+    fun getAchievements(): Flow<List<Achievement>>
+
+    fun getQuestAchievements(userID: String): Flow<List<QuestAchievement>>
+
+    fun getUserQuestStatus(userID: String): Flow<UserQuestStatus>
+
+    fun getTeamPlans(userID: String): Flow<List<TeamPlan>>
+
+    fun getTeamPlan(teamID: String): Flow<Group?>
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmBaseLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmBaseLocalRepository.kt
index 94f8030b2..4ac3727de 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmBaseLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmBaseLocalRepository.kt
@@ -1,128 +1,144 @@
-package com.habitrpg.android.habitica.data.local.implementation
-
-import com.habitrpg.android.habitica.data.local.BaseLocalRepository
-import com.habitrpg.android.habitica.models.BaseMainObject
-import com.habitrpg.android.habitica.models.BaseObject
-import com.habitrpg.android.habitica.models.user.User
-import io.realm.Realm
-import io.realm.RealmModel
-import io.realm.RealmObject
-import io.realm.kotlin.deleteFromRealm
-import io.realm.kotlin.toFlow
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.filter
-import kotlinx.coroutines.flow.map
-import java.util.concurrent.atomic.AtomicBoolean
-
-abstract class RealmBaseLocalRepository internal constructor(override var realm: Realm) : BaseLocalRepository {
-
-    override val isClosed: Boolean
-        get() = realm.isClosed
-
-    override fun close() {
-        realm.close()
-    }
-
-    override fun executeTransaction(transaction: (Realm) -> Unit) {
-        pendingSaves.add(transaction)
-        if (isSaving.compareAndSet(false, true)) {
-            process()
-        }
-    }
-
-    override fun <T : BaseObject> getUnmanagedCopy(managedObject: T): T {
-        return if (managedObject is RealmObject && managedObject.isManaged && managedObject.isValid) {
-            realm.copyFromRealm(managedObject)
-        } else {
-            managedObject
-        }
-    }
-
-    override fun <T : BaseObject> getUnmanagedCopy(list: List<T>): List<T> {
-        if (isClosed) { return emptyList() }
-        return realm.copyFromRealm(list)
-    }
-
-    companion object {
-        private var isSaving = AtomicBoolean(false)
-        private var pendingSaves = mutableListOf<Any>()
-    }
-
-    private fun <T : RealmModel> copy(realm: Realm, obj: T) {
-        try {
-            realm.insertOrUpdate(obj)
-        } catch (_: java.lang.IllegalArgumentException) {
-        }
-    }
-
-    private fun process() {
-        if (isClosed) { return }
-        realm.executeTransaction {
-            while (pendingSaves.isNotEmpty()) {
-                val pending = pendingSaves.removeFirst()
-                @Suppress("UNCHECKED_CAST")
-                if (pending is RealmModel) {
-                    copy(it, pending)
-                } else if (pending as? List<BaseObject> != null) {
-                    it.insertOrUpdate(pending)
-                } else if (pending is Function0<*>) {
-                    pending.invoke()
-                } else if (pending as? Function1<Realm, *> != null) {
-                    pending.invoke(it)
-                }
-            }
-            isSaving.set(false)
-        }
-    }
-
-    override fun <T : BaseObject> save(obj: T) {
-        pendingSaves.add(obj)
-        if (isSaving.compareAndSet(false, true)) {
-            process()
-        }
-    }
-
-    override fun <T : BaseObject> save(objects: List<T>) {
-        pendingSaves.add(objects)
-        if (isSaving.compareAndSet(false, true)) {
-            process()
-        }
-    }
-
-    override fun <T : BaseMainObject> modify(obj: T, transaction: (T) -> Unit) {
-        if (isClosed) { return }
-        val liveObject = getLiveObject(obj) ?: return
-        executeTransaction {
-            transaction(liveObject)
-        }
-    }
-
-    override fun <T : BaseMainObject> delete(obj: T) {
-        if (isClosed) { return }
-        val liveObject = getLiveObject(obj) ?: return
-        executeTransaction {
-            liveObject.deleteFromRealm()
-        }
-    }
-
-    override fun getLiveUser(id: String): User? {
-        return realm.where(User::class.java).equalTo("id", id).findFirst()
-    }
-
-    override fun <T : BaseObject> getLiveObject(obj: T): T? {
-        if (isClosed) return null
-        if (obj !is RealmObject || !obj.isManaged) return obj
-        val baseObject = obj as? BaseMainObject ?: return null
-        @Suppress("UNCHECKED_CAST")
-        return realm.where(baseObject.realmClass).equalTo(baseObject.primaryIdentifierName, baseObject.primaryIdentifier).findFirst() as? T
-    }
-
-    fun queryUser(userID: String): Flow<User?> {
-        return realm.where(User::class.java)
-            .equalTo("id", userID)
-            .findAll()
-            .toFlow()
-            .filter { it.isLoaded && it.isValid && !it.isEmpty() }
-            .map { it.firstOrNull() }
-    }
-}
+package com.habitrpg.android.habitica.data.local.implementation
+
+import com.habitrpg.android.habitica.data.local.BaseLocalRepository
+import com.habitrpg.android.habitica.models.BaseMainObject
+import com.habitrpg.android.habitica.models.BaseObject
+import com.habitrpg.android.habitica.models.user.User
+import io.realm.Realm
+import io.realm.RealmModel
+import io.realm.RealmObject
+import io.realm.kotlin.deleteFromRealm
+import io.realm.kotlin.toFlow
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.map
+import java.util.concurrent.atomic.AtomicBoolean
+
+abstract class RealmBaseLocalRepository internal constructor(override var realm: Realm) :
+    BaseLocalRepository {
+        override val isClosed: Boolean
+            get() = realm.isClosed
+
+        override fun close() {
+            realm.close()
+        }
+
+        override fun executeTransaction(transaction: (Realm) -> Unit) {
+            pendingSaves.add(transaction)
+            if (isSaving.compareAndSet(false, true)) {
+                process()
+            }
+        }
+
+        override fun <T : BaseObject> getUnmanagedCopy(managedObject: T): T {
+            return if (managedObject is RealmObject && managedObject.isManaged && managedObject.isValid) {
+                realm.copyFromRealm(managedObject)
+            } else {
+                managedObject
+            }
+        }
+
+        override fun <T : BaseObject> getUnmanagedCopy(list: List<T>): List<T> {
+            if (isClosed) {
+                return emptyList()
+            }
+            return realm.copyFromRealm(list)
+        }
+
+        companion object {
+            private var isSaving = AtomicBoolean(false)
+            private var pendingSaves = mutableListOf<Any>()
+        }
+
+        private fun <T : RealmModel> copy(
+            realm: Realm,
+            obj: T,
+        ) {
+            try {
+                realm.insertOrUpdate(obj)
+            } catch (_: java.lang.IllegalArgumentException) {
+            }
+        }
+
+        private fun process() {
+            if (isClosed) {
+                return
+            }
+            realm.executeTransaction {
+                while (pendingSaves.isNotEmpty()) {
+                    val pending = pendingSaves.removeFirst()
+                    @Suppress("UNCHECKED_CAST")
+                    if (pending is RealmModel) {
+                        copy(it, pending)
+                    } else if (pending as? List<BaseObject> != null) {
+                        it.insertOrUpdate(pending)
+                    } else if (pending is Function0<*>) {
+                        pending.invoke()
+                    } else if (pending as? Function1<Realm, *> != null) {
+                        pending.invoke(it)
+                    }
+                }
+                isSaving.set(false)
+            }
+        }
+
+        override fun <T : BaseObject> save(obj: T) {
+            pendingSaves.add(obj)
+            if (isSaving.compareAndSet(false, true)) {
+                process()
+            }
+        }
+
+        override fun <T : BaseObject> save(objects: List<T>) {
+            pendingSaves.add(objects)
+            if (isSaving.compareAndSet(false, true)) {
+                process()
+            }
+        }
+
+        override fun <T : BaseMainObject> modify(
+            obj: T,
+            transaction: (T) -> Unit,
+        ) {
+            if (isClosed) {
+                return
+            }
+            val liveObject = getLiveObject(obj) ?: return
+            executeTransaction {
+                transaction(liveObject)
+            }
+        }
+
+        override fun <T : BaseMainObject> delete(obj: T) {
+            if (isClosed) {
+                return
+            }
+            val liveObject = getLiveObject(obj) ?: return
+            executeTransaction {
+                liveObject.deleteFromRealm()
+            }
+        }
+
+        override fun getLiveUser(id: String): User? {
+            return realm.where(User::class.java).equalTo("id", id).findFirst()
+        }
+
+        override fun <T : BaseObject> getLiveObject(obj: T): T? {
+            if (isClosed) return null
+            if (obj !is RealmObject || !obj.isManaged) return obj
+            val baseObject = obj as? BaseMainObject ?: return null
+            @Suppress("UNCHECKED_CAST")
+            return realm.where(baseObject.realmClass)
+                .equalTo(baseObject.primaryIdentifierName, baseObject.primaryIdentifier)
+                .findFirst() as? T
+        }
+
+        fun queryUser(userID: String): Flow<User?> {
+            return realm.where(User::class.java)
+                .equalTo("id", userID)
+                .findAll()
+                .toFlow()
+                .filter { it.isLoaded && it.isValid && !it.isEmpty() }
+                .map { it.firstOrNull() }
+        }
+    }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmChallengeLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmChallengeLocalRepository.kt
index 577cce920..0e34c12b7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmChallengeLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmChallengeLocalRepository.kt
@@ -15,30 +15,40 @@ import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.map
 
-class RealmChallengeLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm), ChallengeLocalRepository {
+class RealmChallengeLocalRepository(realm: Realm) :
+    RealmBaseLocalRepository(realm),
+    ChallengeLocalRepository {
+    override fun isChallengeMember(
+        userID: String,
+        challengeID: String,
+    ): Flow<Boolean> =
+        realm.where(ChallengeMembership::class.java)
+            .equalTo("userID", userID)
+            .equalTo("challengeID", challengeID)
+            .findAll()
+            .toFlow()
+            .filter { it.isLoaded }
+            .map { it.count() > 0 }
 
-    override fun isChallengeMember(userID: String, challengeID: String): Flow<Boolean> = realm.where(ChallengeMembership::class.java)
-        .equalTo("userID", userID)
-        .equalTo("challengeID", challengeID)
-        .findAll()
-        .toFlow()
-        .filter { it.isLoaded }
-        .map { it.count() > 0 }
+    override fun getChallengeMembership(
+        userId: String,
+        id: String,
+    ) =
+        realm.where(ChallengeMembership::class.java)
+            .equalTo("userID", userId)
+            .equalTo("challengeID", id)
+            .findAll()
+            .toFlow()
+            .filter { it.isLoaded }
+            .map { it.first() }
+            .filterNotNull()
 
-    override fun getChallengeMembership(userId: String, id: String) = realm.where(ChallengeMembership::class.java)
-        .equalTo("userID", userId)
-        .equalTo("challengeID", id)
-        .findAll()
-        .toFlow()
-        .filter { it.isLoaded }
-        .map { it.first() }
-        .filterNotNull()
-
-    override fun getChallengeMemberships(userId: String) = realm.where(ChallengeMembership::class.java)
-        .equalTo("userID", userId)
-        .findAll()
-        .toFlow()
-        .filter { it.isLoaded }
+    override fun getChallengeMemberships(userId: String) =
+        realm.where(ChallengeMembership::class.java)
+            .equalTo("userID", userId)
+            .findAll()
+            .toFlow()
+            .filter { it.isLoaded }
 
     override fun getChallenge(id: String): Flow<Challenge> {
         return realm.where(Challenge::class.java)
@@ -59,12 +69,13 @@ class RealmChallengeLocalRepository(realm: Realm) : RealmBaseLocalRepository(rea
     }
 
     override val challenges: Flow<List<Challenge>>
-        get() = realm.where(Challenge::class.java)
-            .isNotNull("name")
-            .sort("official", Sort.DESCENDING, "createdAt", Sort.DESCENDING)
-            .findAll()
-            .toFlow()
-            .filter { it.isLoaded }
+        get() =
+            realm.where(Challenge::class.java)
+                .isNotNull("name")
+                .sort("official", Sort.DESCENDING, "createdAt", Sort.DESCENDING)
+                .findAll()
+                .toFlow()
+                .filter { it.isLoaded }
 
     @OptIn(ExperimentalCoroutinesApi::class)
     override fun getUserChallenges(userId: String): Flow<List<Challenge>> {
@@ -74,9 +85,10 @@ class RealmChallengeLocalRepository(realm: Realm) : RealmBaseLocalRepository(rea
             .toFlow()
             .filter { it.isLoaded }
             .flatMapLatest { it ->
-                val ids = it.map {
-                    return@map it.challengeID
-                }.toTypedArray()
+                val ids =
+                    it.map {
+                        return@map it.challengeID
+                    }.toTypedArray()
                 realm.where(Challenge::class.java)
                     .isNotNull("name")
                     .beginGroup()
@@ -91,13 +103,19 @@ class RealmChallengeLocalRepository(realm: Realm) : RealmBaseLocalRepository(rea
             }
     }
 
-    override fun setParticipating(userID: String, challengeID: String, isParticipating: Boolean) {
+    override fun setParticipating(
+        userID: String,
+        challengeID: String,
+        isParticipating: Boolean,
+    ) {
         val user = realm.where(User::class.java).equalTo("id", userID).findFirst() ?: return
         executeTransaction {
             if (isParticipating) {
                 user.challenges?.add(ChallengeMembership(userID, challengeID))
             } else {
-                val membership = user.challenges?.firstOrNull { it.challengeID == challengeID } ?: return@executeTransaction
+                val membership =
+                    user.challenges?.firstOrNull { it.challengeID == challengeID }
+                        ?: return@executeTransaction
                 user.challenges?.remove(membership)
             }
         }
@@ -107,7 +125,7 @@ class RealmChallengeLocalRepository(realm: Realm) : RealmBaseLocalRepository(rea
         challenges: List<Challenge>,
         clearChallenges: Boolean,
         memberOnly: Boolean,
-        userID: String
+        userID: String,
     ) {
         if (clearChallenges || memberOnly) {
             val localChallenges = realm.where(Challenge::class.java).findAll().createSnapshot()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmContentLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmContentLocalRepository.kt
index d78c9d325..0ac2bfd10 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmContentLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmContentLocalRepository.kt
@@ -10,8 +10,9 @@ import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.map
 
-open class RealmContentLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm), ContentLocalRepository {
-
+open class RealmContentLocalRepository(realm: Realm) :
+    RealmBaseLocalRepository(realm),
+    ContentLocalRepository {
     override fun saveContent(contentResult: ContentResult) {
         executeTransaction { realm1 ->
             contentResult.potion?.let { realm1.insertOrUpdate(it) }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmCustomizationLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmCustomizationLocalRepository.kt
index c6110b991..48f363a14 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmCustomizationLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmCustomizationLocalRepository.kt
@@ -8,26 +8,33 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.filter
 import java.util.Date
 
-class RealmCustomizationLocalRepository(realm: Realm) : RealmContentLocalRepository(realm), CustomizationLocalRepository {
-
-    override fun getCustomizations(type: String, category: String?, onlyAvailable: Boolean): Flow<List<Customization>> {
-        var query = realm.where(Customization::class.java)
-            .equalTo("type", type)
-            .equalTo("category", category)
+class RealmCustomizationLocalRepository(realm: Realm) :
+    RealmContentLocalRepository(realm),
+    CustomizationLocalRepository {
+    override fun getCustomizations(
+        type: String,
+        category: String?,
+        onlyAvailable: Boolean,
+    ): Flow<List<Customization>> {
+        var query =
+            realm.where(Customization::class.java)
+                .equalTo("type", type)
+                .equalTo("category", category)
         if (onlyAvailable) {
             val today = Date()
-            query = query
-                .beginGroup()
-                .beginGroup()
-                .lessThanOrEqualTo("availableFrom", today)
-                .greaterThanOrEqualTo("availableUntil", today)
-                .endGroup()
-                .or()
-                .beginGroup()
-                .isNull("availableFrom")
-                .isNull("availableUntil")
-                .endGroup()
-                .endGroup()
+            query =
+                query
+                    .beginGroup()
+                    .beginGroup()
+                    .lessThanOrEqualTo("availableFrom", today)
+                    .greaterThanOrEqualTo("availableUntil", today)
+                    .endGroup()
+                    .or()
+                    .beginGroup()
+                    .isNull("availableFrom")
+                    .isNull("availableUntil")
+                    .endGroup()
+                    .endGroup()
         }
         return query
             .sort("customizationSet")
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmFAQLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmFAQLocalRepository.kt
index 30d4c8d8e..bb0bfd2a6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmFAQLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmFAQLocalRepository.kt
@@ -9,7 +9,9 @@ import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.map
 
-class RealmFAQLocalRepository(realm: Realm) : RealmContentLocalRepository(realm), FAQLocalRepository {
+class RealmFAQLocalRepository(realm: Realm) :
+    RealmContentLocalRepository(realm),
+    FAQLocalRepository {
     override fun getArticle(position: Int): Flow<FAQArticle> {
         return realm.where(FAQArticle::class.java)
             .equalTo("position", position)
@@ -21,8 +23,9 @@ class RealmFAQLocalRepository(realm: Realm) : RealmContentLocalRepository(realm)
     }
 
     override val articles: Flow<List<FAQArticle>>
-        get() = realm.where(FAQArticle::class.java)
-            .findAll()
-            .toFlow()
-            .filter { it.isLoaded }
+        get() =
+            realm.where(FAQArticle::class.java)
+                .findAll()
+                .toFlow()
+                .filter { it.isLoaded }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.kt
index b510b5200..ccffaa649 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.kt
@@ -92,7 +92,10 @@ class RealmInventoryLocalRepository(realm: Realm) :
             .filter { it.isLoaded }
     }
 
-    override fun getEquipmentType(type: String, set: String): Flow<out List<Equipment>> {
+    override fun getEquipmentType(
+        type: String,
+        set: String,
+    ): Flow<out List<Equipment>> {
         return realm.where(Equipment::class.java)
             .equalTo("type", type)
             .equalTo("gearSet", set)
@@ -104,17 +107,18 @@ class RealmInventoryLocalRepository(realm: Realm) :
     override fun getOwnedItems(
         itemType: String,
         userID: String,
-        includeZero: Boolean
+        includeZero: Boolean,
     ): Flow<List<OwnedItem>> {
         return queryUser(userID).map {
-            val items = when (itemType) {
-                "eggs" -> it?.items?.eggs
-                "hatchingPotions" -> it?.items?.hatchingPotions
-                "food" -> it?.items?.food
-                "quests" -> it?.items?.quests
-                "special" -> it?.items?.special
-                else -> emptyList()
-            } ?: emptyList()
+            val items =
+                when (itemType) {
+                    "eggs" -> it?.items?.eggs
+                    "hatchingPotions" -> it?.items?.hatchingPotions
+                    "food" -> it?.items?.food
+                    "quests" -> it?.items?.quests
+                    "special" -> it?.items?.special
+                    else -> emptyList()
+                } ?: emptyList()
             if (includeZero) {
                 items
             } else {
@@ -128,12 +132,18 @@ class RealmInventoryLocalRepository(realm: Realm) :
             .filter { it.isLoaded }
     }
 
-    override fun getItems(itemClass: Class<out Item>, keys: Array<String>): Flow<List<Item>> {
+    override fun getItems(
+        itemClass: Class<out Item>,
+        keys: Array<String>,
+    ): Flow<List<Item>> {
         return realm.where(itemClass).`in`("key", keys).findAll().toFlow()
             .filter { it.isLoaded }
     }
 
-    override fun getOwnedItems(userID: String, includeZero: Boolean): Flow<Map<String, OwnedItem>> {
+    override fun getOwnedItems(
+        userID: String,
+        includeZero: Boolean,
+    ): Flow<Map<String, OwnedItem>> {
         return queryUser(userID)
             .filterNotNull()
             .map {
@@ -168,9 +178,14 @@ class RealmInventoryLocalRepository(realm: Realm) :
             .filter { it.isLoaded }
     }
 
-    override fun getMounts(type: String?, group: String?, color: String?): Flow<List<Mount>> {
-        var query = realm.where(Mount::class.java)
-            .sort("type", Sort.ASCENDING, if (color == null) "color" else "animal", Sort.ASCENDING)
+    override fun getMounts(
+        type: String?,
+        group: String?,
+        color: String?,
+    ): Flow<List<Mount>> {
+        var query =
+            realm.where(Mount::class.java)
+                .sort("type", Sort.ASCENDING, if (color == null) "color" else "animal", Sort.ASCENDING)
         if (type != null) {
             query = query.equalTo("animal", type)
         }
@@ -202,9 +217,14 @@ class RealmInventoryLocalRepository(realm: Realm) :
             .filter { it.isLoaded }
     }
 
-    override fun getPets(type: String?, group: String?, color: String?): Flow<List<Pet>> {
-        var query = realm.where(Pet::class.java)
-            .sort("type", Sort.ASCENDING, if (color == null) "color" else "animal", Sort.ASCENDING)
+    override fun getPets(
+        type: String?,
+        group: String?,
+        color: String?,
+    ): Flow<List<Pet>> {
+        var query =
+            realm.where(Pet::class.java)
+                .sort("type", Sort.ASCENDING, if (color == null) "color" else "animal", Sort.ASCENDING)
         if (type != null) {
             query = query.equalTo("animal", type)
         }
@@ -239,7 +259,7 @@ class RealmInventoryLocalRepository(realm: Realm) :
         type: String,
         key: String,
         userID: String,
-        amountToAdd: Int
+        amountToAdd: Int,
     ) {
         val item = getOwnedItem(userID, type, key, true).firstOrNull()
         if (item != null) {
@@ -247,7 +267,10 @@ class RealmInventoryLocalRepository(realm: Realm) :
         }
     }
 
-    override fun changeOwnedCount(item: OwnedItem, amountToAdd: Int?) {
+    override fun changeOwnedCount(
+        item: OwnedItem,
+        amountToAdd: Int?,
+    ) {
         val liveItem = getLiveObject(item) ?: return
         amountToAdd?.let { amount ->
             executeTransaction { liveItem.numberOwned = liveItem.numberOwned + amount }
@@ -258,7 +281,7 @@ class RealmInventoryLocalRepository(realm: Realm) :
         userID: String,
         type: String,
         key: String,
-        includeZero: Boolean
+        includeZero: Boolean,
     ): Flow<OwnedItem> {
         return queryUser(userID)
             .filterNotNull()
@@ -271,7 +294,7 @@ class RealmInventoryLocalRepository(realm: Realm) :
                         "quests" -> it.items?.quests
                         else -> emptyList()
                     } ?: emptyList()
-                    )
+                )
                 items = items.filter { it.key == key }
                 if (includeZero) {
                     items
@@ -283,15 +306,19 @@ class RealmInventoryLocalRepository(realm: Realm) :
             .map { it.first() }
     }
 
-    override fun getItem(type: String, key: String): Flow<Item> {
-        val itemClass: Class<out RealmObject> = when (type) {
-            "eggs" -> Egg::class.java
-            "hatchingPotions" -> HatchingPotion::class.java
-            "food" -> Food::class.java
-            "quests" -> QuestContent::class.java
-            "special" -> SpecialItem::class.java
-            else -> Egg::class.java
-        }
+    override fun getItem(
+        type: String,
+        key: String,
+    ): Flow<Item> {
+        val itemClass: Class<out RealmObject> =
+            when (type) {
+                "eggs" -> Egg::class.java
+                "hatchingPotions" -> HatchingPotion::class.java
+                "food" -> Food::class.java
+                "quests" -> QuestContent::class.java
+                "special" -> SpecialItem::class.java
+                else -> Egg::class.java
+            }
         return realm.where(itemClass).equalTo("key", key)
             .findAll()
             .toFlow()
@@ -347,7 +374,11 @@ class RealmInventoryLocalRepository(realm: Realm) :
         }
     }
 
-    override fun hatchPet(eggKey: String, potionKey: String, userID: String) {
+    override fun hatchPet(
+        eggKey: String,
+        potionKey: String,
+        userID: String,
+    ) {
         val newPet = OwnedPet()
         newPet.key = "$eggKey-$potionKey"
         newPet.trained = 5
@@ -369,7 +400,10 @@ class RealmInventoryLocalRepository(realm: Realm) :
             .equalTo("itemType", obj.itemType).findFirst()
     }
 
-    override fun save(items: Items, userID: String) {
+    override fun save(
+        items: Items,
+        userID: String,
+    ) {
         val user = realm.where(User::class.java).equalTo("id", userID).findFirst() ?: return
         items.setItemTypes()
         executeTransaction {
@@ -377,7 +411,11 @@ class RealmInventoryLocalRepository(realm: Realm) :
         }
     }
 
-    override fun unhatchPet(eggKey: String, potionKey: String, userID: String) {
+    override fun unhatchPet(
+        eggKey: String,
+        potionKey: String,
+        userID: String,
+    ) {
         val pet = realm.where(OwnedPet::class.java).equalTo("key", "$eggKey-$potionKey").findFirst()
         val user = realm.where(User::class.java).equalTo("id", userID).findFirst() ?: return
         val egg = user.items?.eggs?.firstOrNull { it.key == eggKey } ?: return
@@ -390,7 +428,12 @@ class RealmInventoryLocalRepository(realm: Realm) :
         }
     }
 
-    override fun feedPet(foodKey: String, petKey: String, feedValue: Int, userID: String) {
+    override fun feedPet(
+        foodKey: String,
+        petKey: String,
+        feedValue: Int,
+        userID: String,
+    ) {
         val user = realm.where(User::class.java).equalTo("id", userID).findFirst() ?: return
         val pet = user.items?.pets?.firstOrNull { it.key == petKey } ?: return
         val food = user.items?.food?.firstOrNull { it.key == foodKey } ?: return
@@ -422,10 +465,14 @@ class RealmInventoryLocalRepository(realm: Realm) :
             }
     }
 
-    override fun soldItem(userID: String, updatedUser: User): User {
-        val user = realm.where(User::class.java)
-            .equalTo("id", userID)
-            .findFirst() ?: return updatedUser
+    override fun soldItem(
+        userID: String,
+        updatedUser: User,
+    ): User {
+        val user =
+            realm.where(User::class.java)
+                .equalTo("id", userID)
+                .findFirst() ?: return updatedUser
         executeTransaction {
             val items = updatedUser.items
             if (items != null) {
@@ -453,7 +500,7 @@ class RealmInventoryLocalRepository(realm: Realm) :
                 realm.where(Food::class.java)
                     .lessThan("event.start", Date())
                     .greaterThan("event.end", Date())
-                    .findAll().toFlow()
+                    .findAll().toFlow(),
             ) { items, food ->
                 items.addAll(food)
                 items
@@ -462,7 +509,7 @@ class RealmInventoryLocalRepository(realm: Realm) :
                 realm.where(HatchingPotion::class.java)
                     .lessThan("event.start", Date())
                     .greaterThan("event.end", Date())
-                    .findAll().toFlow()
+                    .findAll().toFlow(),
             ) { items, food ->
                 items.addAll(food)
                 items
@@ -471,7 +518,7 @@ class RealmInventoryLocalRepository(realm: Realm) :
                 realm.where(QuestContent::class.java)
                     .lessThan("event.start", Date())
                     .greaterThan("event.end", Date())
-                    .findAll().toFlow()
+                    .findAll().toFlow(),
             ) { items, food ->
                 items.addAll(food)
                 items
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 35706b1eb..dc47c90dc 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
@@ -18,27 +18,39 @@ import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.map
 
-class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm), SocialLocalRepository {
+class RealmSocialLocalRepository(realm: Realm) :
+    RealmBaseLocalRepository(realm),
+    SocialLocalRepository {
+    override fun getGroupMembership(
+        userId: String,
+        id: String,
+    ) =
+        realm.where(GroupMembership::class.java)
+            .equalTo("userID", userId)
+            .equalTo("groupID", id)
+            .findAll()
+            .toFlow()
+            .filter { it.isLoaded && it.isNotEmpty() }
+            .map { it.first() }
 
-    override fun getGroupMembership(userId: String, id: String) = realm.where(GroupMembership::class.java)
-        .equalTo("userID", userId)
-        .equalTo("groupID", id)
-        .findAll()
-        .toFlow()
-        .filter { it.isLoaded && it.isNotEmpty() }
-        .map { it.first() }
+    override fun getGroupMemberships(userId: String): Flow<List<GroupMembership>> =
+        realm.where(GroupMembership::class.java)
+            .equalTo("userID", userId)
+            .findAll()
+            .toFlow()
+            .filter { it.isLoaded }
 
-    override fun getGroupMemberships(userId: String): Flow<List<GroupMembership>> = realm.where(GroupMembership::class.java)
-        .equalTo("userID", userId)
-        .findAll()
-        .toFlow()
-        .filter { it.isLoaded }
-
-    override fun updateMembership(userId: String, id: String, isMember: Boolean) {
+    override fun updateMembership(
+        userId: String,
+        id: String,
+        isMember: Boolean,
+    ) {
         if (isMember) {
             save(GroupMembership(userId, id))
         } else {
-            val membership = realm.where(GroupMembership::class.java).equalTo("userID", userId).equalTo("groupID", id).findFirst()
+            val membership =
+                realm.where(GroupMembership::class.java).equalTo("userID", userId)
+                    .equalTo("groupID", id).findFirst()
             if (membership != null) {
                 executeTransaction {
                     membership.deleteFromRealm()
@@ -61,19 +73,22 @@ class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm)
         userID: String,
         recipientID: String,
         messages: List<ChatMessage>,
-        page: Int
+        page: Int,
     ) {
         messages.forEach { it.userID = userID }
         for (message in messages) {
-            val existingMessage = realm.where(ChatMessage::class.java)
-                .equalTo("id", message.id)
-                .findAll()
-                .firstOrNull()
+            val existingMessage =
+                realm.where(ChatMessage::class.java)
+                    .equalTo("id", message.id)
+                    .findAll()
+                    .firstOrNull()
             message.isSeen = existingMessage != null
         }
         save(messages)
         if (page != 0) return
-        val existingMessages = realm.where(ChatMessage::class.java).equalTo("isInboxMessage", true).equalTo("uuid", recipientID).findAll()
+        val existingMessages =
+            realm.where(ChatMessage::class.java).equalTo("isInboxMessage", true)
+                .equalTo("uuid", recipientID).findAll()
         val messagesToRemove = ArrayList<ChatMessage>()
         for (existingMessage in existingMessages) {
             val isStillMember = messages.any { existingMessage.id == it.id }
@@ -86,7 +101,10 @@ class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm)
         }
     }
 
-    override fun saveInboxConversations(userID: String, conversations: List<InboxConversation>) {
+    override fun saveInboxConversations(
+        userID: String,
+        conversations: List<InboxConversation>,
+    ) {
         conversations.forEach { it.userID = userID }
         save(conversations)
         val existingConversations = realm.where(InboxConversation::class.java).findAll()
@@ -111,10 +129,14 @@ class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm)
             .map { member -> member.firstOrNull() }
     }
 
-    override fun saveGroupMemberships(userID: String?, memberships: List<GroupMembership>) {
+    override fun saveGroupMemberships(
+        userID: String?,
+        memberships: List<GroupMembership>,
+    ) {
         save(memberships)
         if (userID != null) {
-            val existingMemberships = realm.where(GroupMembership::class.java).equalTo("userID", userID).findAll()
+            val existingMemberships =
+                realm.where(GroupMembership::class.java).equalTo("userID", userID).findAll()
             val membersToRemove = ArrayList<GroupMembership>()
             for (existingMembership in existingMemberships) {
                 val isStillMember = memberships.any { existingMembership.groupID == it.groupID }
@@ -129,24 +151,28 @@ class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm)
     }
 
     @OptIn(ExperimentalCoroutinesApi::class)
-    override fun getUserGroups(userID: String, type: String?) = realm.where(GroupMembership::class.java)
-        .equalTo("userID", userID)
-        .findAll()
-        .toFlow()
-        .filter { it.isLoaded }
-        .flatMapLatest { memberships ->
-            realm.where(Group::class.java)
-                .equalTo("type", type ?: "guild")
-                .`in`(
-                    "id",
-                    memberships.map {
-                        return@map it.groupID
-                    }.toTypedArray()
-                )
-                .sort("memberCount", Sort.DESCENDING)
-                .findAll()
-                .toFlow()
-        }
+    override fun getUserGroups(
+        userID: String,
+        type: String?,
+    ) =
+        realm.where(GroupMembership::class.java)
+            .equalTo("userID", userID)
+            .findAll()
+            .toFlow()
+            .filter { it.isLoaded }
+            .flatMapLatest { memberships ->
+                realm.where(Group::class.java)
+                    .equalTo("type", type ?: "guild")
+                    .`in`(
+                        "id",
+                        memberships.map {
+                            return@map it.groupID
+                        }.toTypedArray(),
+                    )
+                    .sort("memberCount", Sort.DESCENDING)
+                    .findAll()
+                    .toFlow()
+            }
 
     override fun getGroup(id: String): Flow<Group?> {
         return realm.where(Group::class.java)
@@ -171,23 +197,32 @@ class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm)
         executeTransaction { chatMessage?.deleteFromRealm() }
     }
 
-    override fun getPartyMembers(partyId: String) = realm.where(Member::class.java)
-        .equalTo("party.id", partyId)
-        .findAll()
-        .toFlow()
+    override fun getPartyMembers(partyId: String) =
+        realm.where(Member::class.java)
+            .equalTo("party.id", partyId)
+            .findAll()
+            .toFlow()
 
-    override fun getGroupMembers(groupID: String) = realm.where(GroupMembership::class.java)
-        .equalTo("groupID", groupID)
-        .findAll()
-        .toFlow()
-        .map { memberships -> memberships.map { it.userID }.toTypedArray() }
-        .flatMapLatest { realm.where(Member::class.java).`in`("id", it).findAll().toFlow() }
+    override fun getGroupMembers(groupID: String) =
+        realm.where(GroupMembership::class.java)
+            .equalTo("groupID", groupID)
+            .findAll()
+            .toFlow()
+            .map { memberships -> memberships.map { it.userID }.toTypedArray() }
+            .flatMapLatest { realm.where(Member::class.java).`in`("id", it).findAll().toFlow() }
 
-    override fun updateRSVPNeeded(user: User?, newValue: Boolean) {
+    override fun updateRSVPNeeded(
+        user: User?,
+        newValue: Boolean,
+    ) {
         executeTransaction { user?.party?.quest?.RSVPNeeded = newValue }
     }
 
-    override fun likeMessage(chatMessage: ChatMessage, userId: String, liked: Boolean) {
+    override fun likeMessage(
+        chatMessage: ChatMessage,
+        userId: String,
+        liked: Boolean,
+    ) {
         val liveMessage = getLiveObject(chatMessage)
         if (liveMessage == null) {
             executeTransaction {
@@ -216,13 +251,18 @@ class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm)
         }
     }
 
-    override fun savePartyMembers(groupId: String?, members: List<Member>) {
+    override fun savePartyMembers(
+        groupId: String?,
+        members: List<Member>,
+    ) {
         save(members)
         if (groupId != null) {
-            val existingMembers = realm.where(Member::class.java).equalTo("party.id", groupId).findAll()
+            val existingMembers =
+                realm.where(Member::class.java).equalTo("party.id", groupId).findAll()
             val membersToRemove = ArrayList<Member>()
             for (existingMember in existingMembers) {
-                val isStillMember = members.any { existingMember.id != null && existingMember.id == it.id }
+                val isStillMember =
+                    members.any { existingMember.id != null && existingMember.id == it.id }
                 if (!isStillMember) {
                     membersToRemove.add(existingMember)
                 }
@@ -233,7 +273,10 @@ class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm)
         }
     }
 
-    override fun rejectGroupInvitation(userID: String, groupID: String) {
+    override fun rejectGroupInvitation(
+        userID: String,
+        groupID: String,
+    ) {
         val user = realm.where(User::class.java).equalTo("id", userID).findFirst()
         executeTransaction {
             user?.invitations?.removeInvitation(groupID)
@@ -247,7 +290,10 @@ class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm)
         }
     }
 
-    override fun setQuestActivity(party: Group?, active: Boolean) {
+    override fun setQuestActivity(
+        party: Group?,
+        active: Boolean,
+    ) {
         if (party == null) return
         val liveParty = getLiveObject(party)
         executeTransaction {
@@ -255,10 +301,14 @@ class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm)
         }
     }
 
-    override fun saveChatMessages(groupId: String?, chatMessages: List<ChatMessage>) {
+    override fun saveChatMessages(
+        groupId: String?,
+        chatMessages: List<ChatMessage>,
+    ) {
         save(chatMessages)
         if (groupId != null) {
-            val existingMessages = realm.where(ChatMessage::class.java).equalTo("groupId", groupId).findAll()
+            val existingMessages =
+                realm.where(ChatMessage::class.java).equalTo("groupId", groupId).findAll()
             val messagesToRemove = ArrayList<ChatMessage>()
             for (existingMessage in existingMessages) {
                 val isStillMember = chatMessages.any { existingMessage.id == it.id }
@@ -279,19 +329,24 @@ class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm)
         return party != null && party.isValid
     }
 
-    override fun getInboxMessages(userId: String, replyToUserID: String?) = realm.where(ChatMessage::class.java)
-        .equalTo("isInboxMessage", true)
-        .equalTo("uuid", replyToUserID)
-        .equalTo("userID", userId)
-        .sort("timestamp", Sort.DESCENDING)
-        .findAll()
-        .toFlow()
-        .filter { it.isLoaded }
+    override fun getInboxMessages(
+        userId: String,
+        replyToUserID: String?,
+    ) =
+        realm.where(ChatMessage::class.java)
+            .equalTo("isInboxMessage", true)
+            .equalTo("uuid", replyToUserID)
+            .equalTo("userID", userId)
+            .sort("timestamp", Sort.DESCENDING)
+            .findAll()
+            .toFlow()
+            .filter { it.isLoaded }
 
-    override fun getInboxConversation(userId: String) = realm.where(InboxConversation::class.java)
-        .equalTo("userID", userId)
-        .sort("timestamp", Sort.DESCENDING)
-        .findAll()
-        .toFlow()
-        .filter { it.isLoaded }
+    override fun getInboxConversation(userId: String) =
+        realm.where(InboxConversation::class.java)
+            .equalTo("userID", userId)
+            .sort("timestamp", Sort.DESCENDING)
+            .findAll()
+            .toFlow()
+            .filter { it.isLoaded }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.kt
index 1ab172d73..0a46d71dc 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.kt
@@ -1,254 +1,294 @@
-package com.habitrpg.android.habitica.data.local.implementation
-
-import com.habitrpg.android.habitica.data.local.TaskLocalRepository
-import com.habitrpg.android.habitica.models.tasks.ChecklistItem
-import com.habitrpg.android.habitica.models.tasks.RemindersItem
-import com.habitrpg.android.habitica.models.tasks.Task
-import com.habitrpg.android.habitica.models.tasks.TaskList
-import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.shared.habitica.models.tasks.TaskType
-import com.habitrpg.shared.habitica.models.tasks.TasksOrder
-import io.realm.Realm
-import io.realm.RealmResults
-import io.realm.Sort
-import io.realm.kotlin.toFlow
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.emptyFlow
-import kotlinx.coroutines.flow.filter
-import kotlinx.coroutines.flow.filterNotNull
-import kotlinx.coroutines.flow.map
-
-class RealmTaskLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm), TaskLocalRepository {
-
-    override fun getTasks(taskType: TaskType, userID: String, includedGroupIDs: Array<String>): Flow<List<Task>> {
-        if (realm.isClosed) return emptyFlow()
-        return findTasks(taskType, userID)
-            .toFlow()
-            .filter { it.isLoaded }
-    }
-
-    private fun findTasks(
-        taskType: TaskType,
-        ownerID: String
-    ): RealmResults<Task> {
-        return realm.where(Task::class.java)
-            .equalTo("typeValue", taskType.value)
-            .equalTo("ownerID", ownerID)
-            .sort("position", Sort.ASCENDING, "dateCreated", Sort.DESCENDING)
-            .findAll()
-    }
-
-    override fun getTasks(userId: String): Flow<List<Task>> {
-        if (realm.isClosed) return emptyFlow()
-        return realm.where(Task::class.java).equalTo("ownerID", userId)
-            .sort("position", Sort.ASCENDING, "dateCreated", Sort.DESCENDING)
-            .findAll()
-            .toFlow()
-            .filter { it.isLoaded }
-    }
-
-    override fun saveTasks(ownerID: String, tasksOrder: TasksOrder, tasks: TaskList) {
-        val sortedTasks = mutableListOf<Task>()
-        sortedTasks.addAll(sortTasks(tasks.tasks, tasksOrder.habits))
-        sortedTasks.addAll(sortTasks(tasks.tasks, tasksOrder.dailys))
-        sortedTasks.addAll(sortTasks(tasks.tasks, tasksOrder.todos))
-        sortedTasks.addAll(sortTasks(tasks.tasks, tasksOrder.rewards))
-        for (task in tasks.tasks.values) {
-            task.position = (sortedTasks.lastOrNull { it.type == task.type }?.position ?: -1) + 1
-            sortedTasks.add(task)
-        }
-        removeOldTasks(ownerID, sortedTasks)
-
-        val allChecklistItems = ArrayList<ChecklistItem>()
-        val allReminders = ArrayList<RemindersItem>()
-        sortedTasks.forEach {
-            if (it.ownerID.isBlank()) {
-                it.ownerID = ownerID
-            }
-            it.checklist?.let { it1 -> allChecklistItems.addAll(it1) }
-            it.reminders?.let { it1 -> allReminders.addAll(it1) }
-        }
-        removeOldReminders(allReminders)
-        removeOldChecklists(allChecklistItems)
-
-        executeTransaction { realm1 -> realm1.insertOrUpdate(sortedTasks) }
-    }
-
-    override fun saveCompletedTodos(userId: String, tasks: MutableCollection<Task>) {
-        removeCompletedTodos(userId, tasks)
-        executeTransaction { realm1 -> realm1.insertOrUpdate(tasks) }
-    }
-
-    private fun removeOldChecklists(onlineItems: List<ChecklistItem>) {
-        val localItems = realm.where(ChecklistItem::class.java).findAll().createSnapshot()
-        val itemsToDelete = localItems.filterNot { onlineItems.contains(it) }
-        realm.executeTransaction {
-            for (item in itemsToDelete) {
-                item.deleteFromRealm()
-            }
-        }
-    }
-
-    private fun removeOldReminders(onlineReminders: List<RemindersItem>) {
-        val localReminders = realm.where(RemindersItem::class.java).findAll().createSnapshot()
-        val itemsToDelete = localReminders.filterNot { onlineReminders.contains(it) }
-        realm.executeTransaction {
-            for (item in itemsToDelete) {
-                item.deleteFromRealm()
-            }
-        }
-    }
-
-    private fun sortTasks(taskMap: MutableMap<String, Task>, taskOrder: List<String>): List<Task> {
-        val taskList = ArrayList<Task>()
-        var position = 0
-        for (taskId in taskOrder) {
-            val task = taskMap[taskId]
-            if (task != null) {
-                task.position = position
-                taskList.add(task)
-                position++
-                taskMap.remove(taskId)
-            }
-        }
-        return taskList
-    }
-
-    private fun removeOldTasks(ownerID: String, onlineTaskList: List<Task>) {
-        if (realm.isClosed) return
-        val localTasks = realm.where(Task::class.java)
-            .equalTo("ownerID", ownerID)
-            .beginGroup()
-            .beginGroup()
-            .equalTo("typeValue", TaskType.TODO.value)
-            .equalTo("completed", false)
-            .endGroup()
-            .or()
-            .notEqualTo("typeValue", TaskType.TODO.value)
-            .endGroup()
-            .findAll()
-            .createSnapshot()
-        val tasksToDelete = localTasks.filterNot { onlineTaskList.contains(it) }
-        executeTransaction {
-            for (localTask in tasksToDelete) {
-                localTask.deleteFromRealm()
-            }
-        }
-    }
-
-    private fun removeCompletedTodos(userID: String, onlineTaskList: MutableCollection<Task>) {
-        val localTasks = realm.where(Task::class.java)
-            .equalTo("ownerID", userID)
-            .equalTo("typeValue", TaskType.TODO.value)
-            .equalTo("completed", true)
-            .findAll()
-            .createSnapshot()
-        val tasksToDelete = localTasks.filterNot { onlineTaskList.contains(it) }
-        executeTransaction {
-            for (localTask in tasksToDelete) {
-                localTask.deleteFromRealm()
-            }
-        }
-    }
-
-    override fun deleteTask(taskID: String) {
-        val task = realm.where(Task::class.java).equalTo("id", taskID).findFirst()
-        executeTransaction {
-            if (task?.isManaged == true) {
-                task.deleteFromRealm()
-            }
-        }
-    }
-
-    override fun getTask(taskId: String): Flow<Task> {
-        if (realm.isClosed) {
-            return emptyFlow()
-        }
-        return realm.where(Task::class.java).equalTo("id", taskId).findAll().toFlow()
-            .filter { realmObject -> realmObject.isLoaded && realmObject.isNotEmpty() }
-            .map { it.first() }
-            .filterNotNull()
-    }
-
-    override fun getTaskCopy(taskId: String): Flow<Task> {
-        return getTask(taskId)
-            .map { task ->
-                return@map if (task.isManaged && task.isValid) {
-                    realm.copyFromRealm(task)
-                } else {
-                    task
-                }
-            }
-    }
-
-    override fun markTaskCompleted(taskId: String, isCompleted: Boolean) {
-        val task = realm.where(Task::class.java).equalTo("id", taskId).findFirst()
-        executeTransaction { task?.completed = true }
-    }
-
-    override fun swapTaskPosition(firstPosition: Int, secondPosition: Int) {
-        val firstTask = realm.where(Task::class.java).equalTo("position", firstPosition).findFirst()
-        val secondTask = realm.where(Task::class.java).equalTo("position", secondPosition).findFirst()
-        if (firstTask != null && secondTask != null && firstTask.isValid && secondTask.isValid) {
-            executeTransaction {
-                firstTask.position = secondPosition
-                secondTask.position = firstPosition
-            }
-        }
-    }
-
-    override fun getTaskAtPosition(taskType: String, position: Int): Flow<Task> {
-        return realm.where(Task::class.java).equalTo("typeValue", taskType).equalTo("position", position)
-            .findAll()
-            .toFlow()
-            .filter { realmObject -> realmObject.isLoaded && realmObject.isNotEmpty() }
-            .map { it.first() }
-            .filterNotNull()
-    }
-
-    override fun updateIsdue(daily: TaskList): TaskList {
-        val tasks = realm.where(Task::class.java).equalTo("typeValue", TaskType.DAILY.value).findAll()
-        realm.beginTransaction()
-        tasks.filter { daily.tasks.containsKey(it.id) }.forEach { it.isDue = daily.tasks[it.id]?.isDue }
-        realm.commitTransaction()
-        return daily
-    }
-
-    override fun updateTaskPositions(taskOrder: List<String>) {
-        if (taskOrder.isNotEmpty()) {
-            val tasks = realm.where(Task::class.java).`in`("id", taskOrder.toTypedArray()).findAll()
-            executeTransaction { _ ->
-                tasks.filter { taskOrder.contains(it.id) }.forEach { it.position = taskOrder.indexOf(it.id) }
-            }
-        }
-    }
-
-    override fun getErroredTasks(userID: String): Flow<List<Task>> {
-        return realm.where(Task::class.java)
-            .equalTo("ownerID", userID)
-            .equalTo("hasErrored", true)
-            .sort("position")
-            .findAll()
-            .toFlow()
-            .filter { it.isLoaded }
-    }
-
-    override fun getUser(userID: String): Flow<User> {
-        return realm.where(User::class.java)
-            .equalTo("id", userID)
-            .findAll()
-            .toFlow()
-            .filter { realmObject -> realmObject.isLoaded && realmObject.isValid && !realmObject.isEmpty() }
-            .map { users -> users.first() }
-            .filterNotNull()
-    }
-
-    override fun getTasksForChallenge(challengeID: String?, userID: String?): Flow<List<Task>> {
-        return realm.where(Task::class.java)
-            .equalTo("challengeID", challengeID)
-            .equalTo("ownerID", userID)
-            .findAll()
-            .toFlow()
-            .filter { it.isLoaded }
-    }
-}
+package com.habitrpg.android.habitica.data.local.implementation
+
+import com.habitrpg.android.habitica.data.local.TaskLocalRepository
+import com.habitrpg.android.habitica.models.tasks.ChecklistItem
+import com.habitrpg.android.habitica.models.tasks.RemindersItem
+import com.habitrpg.android.habitica.models.tasks.Task
+import com.habitrpg.android.habitica.models.tasks.TaskList
+import com.habitrpg.android.habitica.models.user.User
+import com.habitrpg.shared.habitica.models.tasks.TaskType
+import com.habitrpg.shared.habitica.models.tasks.TasksOrder
+import io.realm.Realm
+import io.realm.RealmResults
+import io.realm.Sort
+import io.realm.kotlin.toFlow
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.emptyFlow
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.map
+
+class RealmTaskLocalRepository(realm: Realm) :
+    RealmBaseLocalRepository(realm),
+    TaskLocalRepository {
+    override fun getTasks(
+        taskType: TaskType,
+        userID: String,
+        includedGroupIDs: Array<String>,
+    ): Flow<List<Task>> {
+        if (realm.isClosed) return emptyFlow()
+        return findTasks(taskType, userID)
+            .toFlow()
+            .filter { it.isLoaded }
+    }
+
+    private fun findTasks(
+        taskType: TaskType,
+        ownerID: String,
+    ): RealmResults<Task> {
+        return realm.where(Task::class.java)
+            .equalTo("typeValue", taskType.value)
+            .equalTo("ownerID", ownerID)
+            .sort("position", Sort.ASCENDING, "dateCreated", Sort.DESCENDING)
+            .findAll()
+    }
+
+    override fun getTasks(userId: String): Flow<List<Task>> {
+        if (realm.isClosed) return emptyFlow()
+        return realm.where(Task::class.java).equalTo("ownerID", userId)
+            .sort("position", Sort.ASCENDING, "dateCreated", Sort.DESCENDING)
+            .findAll()
+            .toFlow()
+            .filter { it.isLoaded }
+    }
+
+    override fun saveTasks(
+        ownerID: String,
+        tasksOrder: TasksOrder,
+        tasks: TaskList,
+    ) {
+        val sortedTasks = mutableListOf<Task>()
+        sortedTasks.addAll(sortTasks(tasks.tasks, tasksOrder.habits))
+        sortedTasks.addAll(sortTasks(tasks.tasks, tasksOrder.dailys))
+        sortedTasks.addAll(sortTasks(tasks.tasks, tasksOrder.todos))
+        sortedTasks.addAll(sortTasks(tasks.tasks, tasksOrder.rewards))
+        for (task in tasks.tasks.values) {
+            task.position = (sortedTasks.lastOrNull { it.type == task.type }?.position ?: -1) + 1
+            sortedTasks.add(task)
+        }
+        removeOldTasks(ownerID, sortedTasks)
+
+        val allChecklistItems = ArrayList<ChecklistItem>()
+        val allReminders = ArrayList<RemindersItem>()
+        sortedTasks.forEach {
+            if (it.ownerID.isBlank()) {
+                it.ownerID = ownerID
+            }
+            it.checklist?.let { it1 -> allChecklistItems.addAll(it1) }
+            it.reminders?.let { it1 -> allReminders.addAll(it1) }
+        }
+        removeOldReminders(allReminders)
+        removeOldChecklists(allChecklistItems)
+
+        executeTransaction { realm1 -> realm1.insertOrUpdate(sortedTasks) }
+    }
+
+    override fun saveCompletedTodos(
+        userId: String,
+        tasks: MutableCollection<Task>,
+    ) {
+        removeCompletedTodos(userId, tasks)
+        executeTransaction { realm1 -> realm1.insertOrUpdate(tasks) }
+    }
+
+    private fun removeOldChecklists(onlineItems: List<ChecklistItem>) {
+        val localItems = realm.where(ChecklistItem::class.java).findAll().createSnapshot()
+        val itemsToDelete = localItems.filterNot { onlineItems.contains(it) }
+        realm.executeTransaction {
+            for (item in itemsToDelete) {
+                item.deleteFromRealm()
+            }
+        }
+    }
+
+    private fun removeOldReminders(onlineReminders: List<RemindersItem>) {
+        val localReminders = realm.where(RemindersItem::class.java).findAll().createSnapshot()
+        val itemsToDelete = localReminders.filterNot { onlineReminders.contains(it) }
+        realm.executeTransaction {
+            for (item in itemsToDelete) {
+                item.deleteFromRealm()
+            }
+        }
+    }
+
+    private fun sortTasks(
+        taskMap: MutableMap<String, Task>,
+        taskOrder: List<String>,
+    ): List<Task> {
+        val taskList = ArrayList<Task>()
+        var position = 0
+        for (taskId in taskOrder) {
+            val task = taskMap[taskId]
+            if (task != null) {
+                task.position = position
+                taskList.add(task)
+                position++
+                taskMap.remove(taskId)
+            }
+        }
+        return taskList
+    }
+
+    private fun removeOldTasks(
+        ownerID: String,
+        onlineTaskList: List<Task>,
+    ) {
+        if (realm.isClosed) return
+        val localTasks =
+            realm.where(Task::class.java)
+                .equalTo("ownerID", ownerID)
+                .beginGroup()
+                .beginGroup()
+                .equalTo("typeValue", TaskType.TODO.value)
+                .equalTo("completed", false)
+                .endGroup()
+                .or()
+                .notEqualTo("typeValue", TaskType.TODO.value)
+                .endGroup()
+                .findAll()
+                .createSnapshot()
+        val tasksToDelete = localTasks.filterNot { onlineTaskList.contains(it) }
+        executeTransaction {
+            for (localTask in tasksToDelete) {
+                localTask.deleteFromRealm()
+            }
+        }
+    }
+
+    private fun removeCompletedTodos(
+        userID: String,
+        onlineTaskList: MutableCollection<Task>,
+    ) {
+        val localTasks =
+            realm.where(Task::class.java)
+                .equalTo("ownerID", userID)
+                .equalTo("typeValue", TaskType.TODO.value)
+                .equalTo("completed", true)
+                .findAll()
+                .createSnapshot()
+        val tasksToDelete = localTasks.filterNot { onlineTaskList.contains(it) }
+        executeTransaction {
+            for (localTask in tasksToDelete) {
+                localTask.deleteFromRealm()
+            }
+        }
+    }
+
+    override fun deleteTask(taskID: String) {
+        val task = realm.where(Task::class.java).equalTo("id", taskID).findFirst()
+        executeTransaction {
+            if (task?.isManaged == true) {
+                task.deleteFromRealm()
+            }
+        }
+    }
+
+    override fun getTask(taskId: String): Flow<Task> {
+        if (realm.isClosed) {
+            return emptyFlow()
+        }
+        return realm.where(Task::class.java).equalTo("id", taskId).findAll().toFlow()
+            .filter { realmObject -> realmObject.isLoaded && realmObject.isNotEmpty() }
+            .map { it.first() }
+            .filterNotNull()
+    }
+
+    override fun getTaskCopy(taskId: String): Flow<Task> {
+        return getTask(taskId)
+            .map { task ->
+                return@map if (task.isManaged && task.isValid) {
+                    realm.copyFromRealm(task)
+                } else {
+                    task
+                }
+            }
+    }
+
+    override fun markTaskCompleted(
+        taskId: String,
+        isCompleted: Boolean,
+    ) {
+        val task = realm.where(Task::class.java).equalTo("id", taskId).findFirst()
+        executeTransaction { task?.completed = true }
+    }
+
+    override fun swapTaskPosition(
+        firstPosition: Int,
+        secondPosition: Int,
+    ) {
+        val firstTask = realm.where(Task::class.java).equalTo("position", firstPosition).findFirst()
+        val secondTask =
+            realm.where(Task::class.java).equalTo("position", secondPosition).findFirst()
+        if (firstTask != null && secondTask != null && firstTask.isValid && secondTask.isValid) {
+            executeTransaction {
+                firstTask.position = secondPosition
+                secondTask.position = firstPosition
+            }
+        }
+    }
+
+    override fun getTaskAtPosition(
+        taskType: String,
+        position: Int,
+    ): Flow<Task> {
+        return realm.where(Task::class.java).equalTo("typeValue", taskType)
+            .equalTo("position", position)
+            .findAll()
+            .toFlow()
+            .filter { realmObject -> realmObject.isLoaded && realmObject.isNotEmpty() }
+            .map { it.first() }
+            .filterNotNull()
+    }
+
+    override fun updateIsdue(daily: TaskList): TaskList {
+        val tasks =
+            realm.where(Task::class.java).equalTo("typeValue", TaskType.DAILY.value).findAll()
+        realm.beginTransaction()
+        tasks.filter { daily.tasks.containsKey(it.id) }
+            .forEach { it.isDue = daily.tasks[it.id]?.isDue }
+        realm.commitTransaction()
+        return daily
+    }
+
+    override fun updateTaskPositions(taskOrder: List<String>) {
+        if (taskOrder.isNotEmpty()) {
+            val tasks = realm.where(Task::class.java).`in`("id", taskOrder.toTypedArray()).findAll()
+            executeTransaction { _ ->
+                tasks.filter { taskOrder.contains(it.id) }
+                    .forEach { it.position = taskOrder.indexOf(it.id) }
+            }
+        }
+    }
+
+    override fun getErroredTasks(userID: String): Flow<List<Task>> {
+        return realm.where(Task::class.java)
+            .equalTo("ownerID", userID)
+            .equalTo("hasErrored", true)
+            .sort("position")
+            .findAll()
+            .toFlow()
+            .filter { it.isLoaded }
+    }
+
+    override fun getUser(userID: String): Flow<User> {
+        return realm.where(User::class.java)
+            .equalTo("id", userID)
+            .findAll()
+            .toFlow()
+            .filter { realmObject -> realmObject.isLoaded && realmObject.isValid && !realmObject.isEmpty() }
+            .map { users -> users.first() }
+            .filterNotNull()
+    }
+
+    override fun getTasksForChallenge(
+        challengeID: String?,
+        userID: String?,
+    ): Flow<List<Task>> {
+        return realm.where(Task::class.java)
+            .equalTo("challengeID", challengeID)
+            .equalTo("ownerID", userID)
+            .findAll()
+            .toFlow()
+            .filter { it.isLoaded }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTutorialLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTutorialLocalRepository.kt
index a1ab82ab7..f9e802783 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTutorialLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTutorialLocalRepository.kt
@@ -10,8 +10,9 @@ import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.map
 
-class RealmTutorialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm), TutorialLocalRepository {
-
+class RealmTutorialLocalRepository(realm: Realm) :
+    RealmBaseLocalRepository(realm),
+    TutorialLocalRepository {
     override fun getTutorialStep(key: String): Flow<TutorialStep> {
         if (realm.isClosed) return emptyFlow()
         return realm.where(TutorialStep::class.java).equalTo("identifier", key)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.kt
index 0dd9ad6f7..6d0a2f9dc 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.kt
@@ -44,6 +44,7 @@ class RealmUserLocalRepository(realm: Realm) :
                     it.quest?.members?.find { questMember -> questMember.key == userID } === null -> UserQuestStatus.NO_QUEST
                     it.quest?.progress?.collect?.isNotEmpty()
                         ?: false -> UserQuestStatus.QUEST_COLLECT
+
                     (it.quest?.progress?.hp ?: 0.0) > 0.0 -> UserQuestStatus.QUEST_BOSS
                     else -> UserQuestStatus.QUEST_UNKNOWN
                 }
@@ -81,11 +82,15 @@ class RealmUserLocalRepository(realm: Realm) :
             .map { users -> users.first() }
     }
 
-    override fun saveUser(user: User, overrideExisting: Boolean) {
+    override fun saveUser(
+        user: User,
+        overrideExisting: Boolean,
+    ) {
         if (realm.isClosed) return
-        val oldUser = realm.where(User::class.java)
-            .equalTo("id", user.id)
-            .findFirst()
+        val oldUser =
+            realm.where(User::class.java)
+                .equalTo("id", user.id)
+                .findFirst()
         if (oldUser != null && oldUser.isValid) {
             if (user.needsCron && !oldUser.needsCron) {
                 if (user.lastCron?.before(oldUser.lastCron) == true) {
@@ -101,7 +106,10 @@ class RealmUserLocalRepository(realm: Realm) :
         removeOldTags(user.id ?: "", user.tags)
     }
 
-    private fun removeOldTags(userId: String, onlineTags: List<Tag>) {
+    private fun removeOldTags(
+        userId: String,
+        onlineTags: List<Tag>,
+    ) {
         val tags = realm.where(Tag::class.java).equalTo("userId", userId).findAll().createSnapshot()
         val tagsToDelete = tags.filterNot { onlineTags.contains(it) }
         executeTransaction {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/AlertDialogExtensions.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/AlertDialogExtensions.kt
index 270423f2f..14414b30c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/AlertDialogExtensions.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/AlertDialogExtensions.kt
@@ -5,21 +5,21 @@ import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 
 fun HabiticaAlertDialog.addOkButton(
     isPrimary: Boolean = true,
-    listener: ((HabiticaAlertDialog, Int) -> Unit)? = null
+    listener: ((HabiticaAlertDialog, Int) -> Unit)? = null,
 ) {
     this.addButton(R.string.ok, isPrimary, false, true, listener)
 }
 
 fun HabiticaAlertDialog.addCloseButton(
     isPrimary: Boolean = false,
-    listener: ((HabiticaAlertDialog, Int) -> Unit)? = null
+    listener: ((HabiticaAlertDialog, Int) -> Unit)? = null,
 ) {
     this.addButton(R.string.close, isPrimary, false, true, listener)
 }
 
 fun HabiticaAlertDialog.addCancelButton(
     isPrimary: Boolean = false,
-    listener: ((HabiticaAlertDialog, Int) -> Unit)? = null
+    listener: ((HabiticaAlertDialog, Int) -> Unit)? = null,
 ) {
     this.addButton(R.string.cancel, isPrimary, false, true, listener)
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/AnimalExtensions.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/AnimalExtensions.kt
index 954e9982c..61f97e1af 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/AnimalExtensions.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/AnimalExtensions.kt
@@ -8,7 +8,10 @@ fun Animal.getTranslatedType(c: Context?): String? {
     return getTranslatedAnimalType(c, type)
 }
 
-fun getTranslatedAnimalType(c: Context?, type: String?): String? {
+fun getTranslatedAnimalType(
+    c: Context?,
+    type: String?,
+): String? {
     if (c == null) {
         return type
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/AttributeSetExtentions.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/AttributeSetExtentions.kt
index 2a93b16c6..0e5e57ce6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/AttributeSetExtentions.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/AttributeSetExtentions.kt
@@ -4,5 +4,8 @@ import android.content.Context
 import android.content.res.TypedArray
 import android.util.AttributeSet
 
-fun AttributeSet.styledAttributes(context: Context?, style: IntArray): TypedArray? =
+fun AttributeSet.styledAttributes(
+    context: Context?,
+    style: IntArray,
+): TypedArray? =
     context?.theme?.obtainStyledAttributes(this, style, 0, 0)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/DateExtensions.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/DateExtensions.kt
index 511196698..c9929516e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/DateExtensions.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/DateExtensions.kt
@@ -13,7 +13,11 @@ import kotlin.time.toDuration
 
 class DateUtils {
     companion object {
-        fun createDate(year: Int, month: Int, day: Int): Date {
+        fun createDate(
+            year: Int,
+            month: Int,
+            day: Int,
+        ): Date {
             val cal = Calendar.getInstance()
             cal.set(Calendar.YEAR, year)
             cal.set(Calendar.MONTH, month)
@@ -25,7 +29,10 @@ class DateUtils {
             return cal.time
         }
 
-        fun isSameDay(date1 : Date, date2 : Date) : Boolean {
+        fun isSameDay(
+            date1: Date,
+            date2: Date,
+        ): Boolean {
             val cal1 = Calendar.getInstance()
             val cal2 = Calendar.getInstance()
             cal1.time = date1
@@ -50,26 +57,34 @@ fun Long.getAgoString(res: Resources): String {
     val diffMonths = diffDays / 30
 
     return when {
-        diffMonths != 0L -> if (diffMonths == 1L) {
-            res.getString(R.string.ago_1month)
-        } else {
-            res.getString(R.string.ago_months, diffMonths)
-        }
-        diffWeeks != 0L -> if (diffWeeks == 1L) {
-            res.getString(R.string.ago_1week)
-        } else {
-            res.getString(R.string.ago_weeks, diffWeeks)
-        }
-        diffDays != 0L -> if (diffDays == 1L) {
-            res.getString(R.string.ago_1day)
-        } else {
-            res.getString(R.string.ago_days, diffDays)
-        }
-        diffHours != 0L -> if (diffHours == 1L) {
-            res.getString(R.string.ago_1hour)
-        } else {
-            res.getString(R.string.ago_hours, diffHours)
-        }
+        diffMonths != 0L ->
+            if (diffMonths == 1L) {
+                res.getString(R.string.ago_1month)
+            } else {
+                res.getString(R.string.ago_months, diffMonths)
+            }
+
+        diffWeeks != 0L ->
+            if (diffWeeks == 1L) {
+                res.getString(R.string.ago_1week)
+            } else {
+                res.getString(R.string.ago_weeks, diffWeeks)
+            }
+
+        diffDays != 0L ->
+            if (diffDays == 1L) {
+                res.getString(R.string.ago_1day)
+            } else {
+                res.getString(R.string.ago_days, diffDays)
+            }
+
+        diffHours != 0L ->
+            if (diffHours == 1L) {
+                res.getString(R.string.ago_1hour)
+            } else {
+                res.getString(R.string.ago_hours, diffHours)
+            }
+
         diffMinutes == 1L -> res.getString(R.string.ago_1Minute)
         else -> res.getString(R.string.ago_minutes, diffMinutes)
     }
@@ -89,26 +104,34 @@ fun Long.getRemainingString(res: Resources): String {
     val diffMonths = diffDays / 30
 
     return when {
-        diffMonths != 0L -> if (diffMonths == 1L) {
-            res.getString(R.string.remaining_1month)
-        } else {
-            res.getString(R.string.remaining_months, diffMonths)
-        }
-        diffWeeks != 0L -> if (diffWeeks == 1L) {
-            res.getString(R.string.remaining_1week)
-        } else {
-            res.getString(R.string.remaining_weeks, diffWeeks)
-        }
-        diffDays != 0L -> if (diffDays == 1L) {
-            res.getString(R.string.remaining_1day)
-        } else {
-            res.getString(R.string.remaining_days, diffDays)
-        }
-        diffHours != 0L -> if (diffHours == 1L) {
-            res.getString(R.string.remaining_1hour)
-        } else {
-            res.getString(R.string.remaining_hours, diffHours)
-        }
+        diffMonths != 0L ->
+            if (diffMonths == 1L) {
+                res.getString(R.string.remaining_1month)
+            } else {
+                res.getString(R.string.remaining_months, diffMonths)
+            }
+
+        diffWeeks != 0L ->
+            if (diffWeeks == 1L) {
+                res.getString(R.string.remaining_1week)
+            } else {
+                res.getString(R.string.remaining_weeks, diffWeeks)
+            }
+
+        diffDays != 0L ->
+            if (diffDays == 1L) {
+                res.getString(R.string.remaining_1day)
+            } else {
+                res.getString(R.string.remaining_days, diffDays)
+            }
+
+        diffHours != 0L ->
+            if (diffHours == 1L) {
+                res.getString(R.string.remaining_1hour)
+            } else {
+                res.getString(R.string.remaining_hours, diffHours)
+            }
+
         diffMinutes == 1L -> res.getString(R.string.remaining_1Minute)
         else -> res.getString(R.string.remaining_minutes, diffMinutes)
     }
@@ -151,11 +174,12 @@ fun Duration.getMinuteOrSeconds(): DurationUnit {
 
 fun Date.formatForLocale(): String {
     val locale = Locale.getDefault()
-    val dateFormatter: DateFormat = if (locale == Locale.US || locale == Locale.ENGLISH) {
-        SimpleDateFormat("M/d/yy", locale)
-    } else {
-        SimpleDateFormat.getDateInstance(DateFormat.LONG, locale)
-    }
+    val dateFormatter: DateFormat =
+        if (locale == Locale.US || locale == Locale.ENGLISH) {
+            SimpleDateFormat("M/d/yy", locale)
+        } else {
+            SimpleDateFormat.getDateInstance(DateFormat.LONG, locale)
+        }
 
     return dateFormatter.format(this)
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/ResourcesExtensions.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/ResourcesExtensions.kt
index 9af04da29..16ecda148 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/ResourcesExtensions.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/ResourcesExtensions.kt
@@ -8,7 +8,10 @@ import com.google.firebase.ktx.Firebase
 import com.habitrpg.android.habitica.ui.activities.BaseActivity
 import java.util.Locale
 
-fun Resources.forceLocale(activity: BaseActivity, locale: Locale) {
+fun Resources.forceLocale(
+    activity: BaseActivity,
+    locale: Locale,
+) {
     Locale.setDefault(locale)
     val configuration = Configuration()
     configuration.setLocale(locale)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/TextWatcherExtensions.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/TextWatcherExtensions.kt
index 79d43c1fd..f58c23b06 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/TextWatcherExtensions.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/TextWatcherExtensions.kt
@@ -3,24 +3,50 @@ package com.habitrpg.android.habitica.extensions
 import android.text.Editable
 import android.text.TextWatcher
 
-class OnChangeTextWatcher(private var function: (CharSequence?, Int, Int, Int) -> Unit) : TextWatcher {
-    override fun afterTextChanged(s: Editable?) { /* no-on */ }
+class OnChangeTextWatcher(private var function: (CharSequence?, Int, Int, Int) -> Unit) :
+    TextWatcher {
+    override fun afterTextChanged(s: Editable?) { // no-on
+    }
 
-    override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { /* no-on */ }
+    override fun beforeTextChanged(
+        s: CharSequence?,
+        start: Int,
+        count: Int,
+        after: Int,
+    ) { // no-on
+    }
 
-    override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+    override fun onTextChanged(
+        s: CharSequence?,
+        start: Int,
+        before: Int,
+        count: Int,
+    ) {
         function(s, start, before, count)
     }
 }
 
-class BeforeChangeTextWatcher(private var function: (CharSequence?, Int, Int, Int) -> Unit) : TextWatcher {
-    override fun afterTextChanged(s: Editable?) { /* no-on */ }
+class BeforeChangeTextWatcher(private var function: (CharSequence?, Int, Int, Int) -> Unit) :
+    TextWatcher {
+    override fun afterTextChanged(s: Editable?) { // no-on
+    }
 
-    override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
+    override fun beforeTextChanged(
+        s: CharSequence?,
+        start: Int,
+        count: Int,
+        after: Int,
+    ) {
         function(s, start, count, after)
     }
 
-    override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { /* no-on */ }
+    override fun onTextChanged(
+        s: CharSequence?,
+        start: Int,
+        before: Int,
+        count: Int,
+    ) { // no-on
+    }
 }
 
 class AfterChangeTextWatcher(private var function: (Editable?) -> Unit) : TextWatcher {
@@ -28,7 +54,19 @@ class AfterChangeTextWatcher(private var function: (Editable?) -> Unit) : TextWa
         function(s)
     }
 
-    override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { /* no-on */ }
+    override fun beforeTextChanged(
+        s: CharSequence?,
+        start: Int,
+        count: Int,
+        after: Int,
+    ) { // no-on
+    }
 
-    override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { /* no-on */ }
+    override fun onTextChanged(
+        s: CharSequence?,
+        start: Int,
+        before: Int,
+        count: Int,
+    ) { // no-on
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/WindowExtensions.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/WindowExtensions.kt
index 3381f86c6..bd40e239f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/WindowExtensions.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/WindowExtensions.kt
@@ -6,11 +6,15 @@ import android.view.Window
 import com.habitrpg.android.habitica.R
 import com.habitrpg.common.habitica.extensions.getThemeColor
 
-fun Window.updateStatusBarColor(color: Int, isLight: Boolean) {
+fun Window.updateStatusBarColor(
+    color: Int,
+    isLight: Boolean,
+) {
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
         statusBarColor = color
         @Suppress("DEPRECATION")
-        decorView.systemUiVisibility = if (isLight) View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR else View.SYSTEM_UI_FLAG_VISIBLE
+        decorView.systemUiVisibility =
+            if (isLight) View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR else View.SYSTEM_UI_FLAG_VISIBLE
     } else {
         statusBarColor = context.getThemeColor(R.attr.colorPrimaryDark)
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/ZonedDateExtensions.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/ZonedDateExtensions.kt
index a525ee706..7d4ff050c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/ZonedDateExtensions.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/ZonedDateExtensions.kt
@@ -1,7 +1,6 @@
 package com.habitrpg.android.habitica.extensions
 
 import com.habitrpg.android.habitica.models.tasks.Days
-import com.habitrpg.shared.habitica.models.tasks.Frequency
 import java.time.DayOfWeek
 import java.time.LocalDateTime
 import java.time.ZoneId
@@ -9,17 +8,17 @@ import java.time.ZonedDateTime
 import java.time.format.DateTimeFormatter
 import java.time.format.DateTimeFormatterBuilder
 import java.time.format.TextStyle
-import java.time.temporal.ChronoUnit
 import java.time.temporal.TemporalAccessor
 import java.util.Date
 import java.util.Locale
 
 fun String.parseToZonedDateTime(): ZonedDateTime? {
-    val parsed: TemporalAccessor = formatter().parseBest(
-        this,
-        ZonedDateTime::from,
-        LocalDateTime::from
-    )
+    val parsed: TemporalAccessor =
+        formatter().parseBest(
+            this,
+            ZonedDateTime::from,
+            LocalDateTime::from,
+        )
     return if (parsed is ZonedDateTime) {
         parsed
     } else {
@@ -46,7 +45,6 @@ fun formatter(): DateTimeFormatter =
         .appendPattern("[XX]")
         .toFormatter()
 
-
 fun ZonedDateTime.matchesRepeatDays(repeatDays: Days?): Boolean {
     repeatDays ?: return true // If no repeatDays specified, assume it matches
 
@@ -61,7 +59,3 @@ fun ZonedDateTime.matchesRepeatDays(repeatDays: Days?): Boolean {
         else -> false
     }
 }
-
-
-
-
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AdHandler.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AdHandler.kt
index 2b86c281b..7316a32c1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AdHandler.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AdHandler.kt
@@ -23,7 +23,8 @@ import kotlin.time.toDuration
 enum class AdType {
     ARMOIRE,
     SPELL,
-    FAINT;
+    FAINT,
+    ;
 
     val adUnitID: String
         get() {
@@ -60,14 +61,14 @@ fun String.md5(): String? {
 }
 
 class AdHandler(val activity: Activity, val type: AdType, val rewardAction: (Boolean) -> Unit) {
-    //private var rewardedAd: RewardedAd? = null
+    // private var rewardedAd: RewardedAd? = null
 
     companion object {
         private enum class AdStatus {
             UNINITIALIZED,
             INITIALIZING,
             READY,
-            DISABLED
+            DISABLED,
         }
 
         private lateinit var sharedPreferences: SharedPreferences
@@ -100,15 +101,18 @@ class AdHandler(val activity: Activity, val type: AdType, val rewardAction: (Boo
             }
         }
 
-        fun initialize(context: Context, onComplete: () -> Unit) {
+        fun initialize(
+            context: Context,
+            onComplete: () -> Unit,
+        ) {
             if (currentAdStatus != AdStatus.UNINITIALIZED) return
 
             if (BuildConfig.DEBUG || BuildConfig.TESTING_LEVEL == "staff" || BuildConfig.TESTING_LEVEL == "alpha") {
                 val androidId: String =
                     Settings.Secure.getString(context.contentResolver, Settings.Secure.ANDROID_ID)
                 val deviceId: String = androidId.md5()?.uppercase() ?: ""
-                //val configuration = RequestConfiguration.Builder().setTestDeviceIds(listOf(deviceId)).build()
-                //MobileAds.setRequestConfiguration(configuration)
+                // val configuration = RequestConfiguration.Builder().setTestDeviceIds(listOf(deviceId)).build()
+                // MobileAds.setRequestConfiguration(configuration)
             }
 
             currentAdStatus = AdStatus.INITIALIZING
@@ -119,19 +123,25 @@ class AdHandler(val activity: Activity, val type: AdType, val rewardAction: (Boo
             }*/
         }
 
-        fun whenAdsInitialized(context: Context, onComplete: () -> Unit) {
+        fun whenAdsInitialized(
+            context: Context,
+            onComplete: () -> Unit,
+        ) {
             when (currentAdStatus) {
                 AdStatus.READY -> {
                     onComplete()
                 }
+
                 AdStatus.DISABLED -> {
                     return
                 }
+
                 AdStatus.UNINITIALIZED -> {
                     initialize(context) {
                         onComplete()
                     }
                 }
+
                 AdStatus.INITIALIZING -> {
                     return
                 }
@@ -189,24 +199,27 @@ class AdHandler(val activity: Activity, val type: AdType, val rewardAction: (Boo
             AdStatus.READY -> {
                 showRewardedAd()
             }
+
             AdStatus.DISABLED -> {
                 rewardAction(false)
                 return
             }
+
             AdStatus.UNINITIALIZED -> {
                 initialize(activity) {
                     showRewardedAd()
                 }
             }
+
             AdStatus.INITIALIZING -> {
                 return
             }
         }
     }
 
-    //private fun configureReward() {
-        //rewardedAd?.run { }
-    //}
+    // private fun configureReward() {
+    // rewardedAd?.run { }
+    // }
 
     private fun showRewardedAd() {
         if (nextAdAllowedDate(type)?.after(Date()) == true) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/Analytics.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/Analytics.kt
index 1345467bc..e4d582e87 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/Analytics.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/Analytics.kt
@@ -13,12 +13,12 @@ import com.habitrpg.android.habitica.R
 
 enum class AnalyticsTarget {
     AMPLITUDE,
-    FIREBASE
+    FIREBASE,
 }
 
 enum class EventCategory(val key: String) {
     BEHAVIOUR("behaviour"),
-    NAVIGATION("navigation")
+    NAVIGATION("navigation"),
 }
 
 enum class HitType(val key: String) {
@@ -26,7 +26,7 @@ enum class HitType(val key: String) {
     PAGEVIEW("pageview"),
     CREATE_WIDGET("create"),
     REMOVE_WIDGET("remove"),
-    UPDATE_WIDGET("update")
+    UPDATE_WIDGET("update"),
 }
 
 object Analytics {
@@ -39,17 +39,18 @@ object Analytics {
         category: EventCategory?,
         hitType: HitType?,
         additionalData: Map<String, Any>? = null,
-        target: AnalyticsTarget? = null
+        target: AnalyticsTarget? = null,
     ) {
         if (BuildConfig.DEBUG) {
             return
         }
-        val data = mutableMapOf<String, Any?>(
-            "eventAction" to eventAction,
-            "eventCategory" to category?.key,
-            "hitType" to hitType?.key,
-            "status" to "displayed"
-        )
+        val data =
+            mutableMapOf<String, Any?>(
+                "eventAction" to eventAction,
+                "eventCategory" to category?.key,
+                "hitType" to hitType?.key,
+                "status" to "displayed",
+            )
         if (additionalData != null) {
             data.putAll(additionalData)
         }
@@ -74,18 +75,20 @@ object Analytics {
     }
 
     fun initialize(context: Context) {
-        amplitude = Amplitude(
-            Configuration(
-                context.getString(R.string.amplitude_app_id),
-                context
+        amplitude =
+            Amplitude(
+                Configuration(
+                    context.getString(R.string.amplitude_app_id),
+                    context,
+                ),
             )
-        )
         firebase = FirebaseAnalytics.getInstance(context)
     }
 
     fun identify(sharedPrefs: SharedPreferences) {
-        val identify = Identify()
-            .setOnce("androidStore", BuildConfig.STORE)
+        val identify =
+            Identify()
+                .setOnce("androidStore", BuildConfig.STORE)
         sharedPrefs.getString("launch_screen", "")?.let {
             identify.set("launch_screen", it)
         }
@@ -104,7 +107,10 @@ object Analytics {
         }
     }
 
-    fun setUserProperty(identifier: String, value: Any?) {
+    fun setUserProperty(
+        identifier: String,
+        value: Any?,
+    ) {
         if (this::amplitude.isInitialized) {
             amplitude.identify(mapOf(identifier to value))
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AppConfigManager.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AppConfigManager.kt
index 525c86fc1..26f519e16 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AppConfigManager.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AppConfigManager.kt
@@ -17,8 +17,8 @@ import com.habitrpg.common.habitica.helpers.launchCatching
 import kotlinx.coroutines.MainScope
 import java.util.Date
 
-class AppConfigManager(contentRepository: ContentRepository?) : com.habitrpg.common.habitica.helpers.AppConfigManager() {
-
+class AppConfigManager(contentRepository: ContentRepository?) :
+    com.habitrpg.common.habitica.helpers.AppConfigManager() {
     private var worldState: WorldState? = null
 
     init {
@@ -122,7 +122,12 @@ class AppConfigManager(contentRepository: ContentRepository?) : com.habitrpg.com
         if (worldState?.isValid == true) {
             for (event in worldState?.events ?: listOf(worldState?.currentEvent)) {
                 if (event == null) return null
-                val thisPromo = getHabiticaPromotionFromKey(event.promo ?: event.eventKey ?: "", event.start, event.end)
+                val thisPromo =
+                    getHabiticaPromotionFromKey(
+                        event.promo ?: event.eventKey ?: "",
+                        event.start,
+                        event.end,
+                    )
                 if (thisPromo != null) {
                     promo = thisPromo
                 }
@@ -178,7 +183,8 @@ class AppConfigManager(contentRepository: ContentRepository?) : com.habitrpg.com
     }
 
     fun getBirthdayEvent(): WorldStateEvent? {
-        val events = ((worldState?.events as? List<WorldStateEvent>) ?: listOf(worldState?.currentEvent))
+        val events =
+            ((worldState?.events as? List<WorldStateEvent>) ?: listOf(worldState?.currentEvent))
         return events.firstOrNull { it?.eventKey == "birthday10" && it.end?.after(Date()) == true }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AprilFoolsHandler.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AprilFoolsHandler.kt
index 2f6104fed..9ba769688 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AprilFoolsHandler.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AprilFoolsHandler.kt
@@ -3,11 +3,13 @@ package com.habitrpg.android.habitica.helpers
 import java.util.Date
 
 class AprilFoolsHandler {
-
     companion object {
         private var eventEnd: Date? = null
 
-        fun handle(name: String?, endDate: Date?) {
+        fun handle(
+            name: String?,
+            endDate: Date?,
+        ) {
             if (endDate != null) {
                 this.eventEnd = endDate
             }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/GroupPlanInfoProvider.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/GroupPlanInfoProvider.kt
index a7bc2b05b..e4f500444 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/GroupPlanInfoProvider.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/GroupPlanInfoProvider.kt
@@ -4,8 +4,14 @@ import android.content.res.Resources
 import com.habitrpg.android.habitica.models.tasks.Task
 
 interface GroupPlanInfoProvider {
-    fun assignedTextForTask(resources: Resources, assignedUsers: List<String>): String
+    fun assignedTextForTask(
+        resources: Resources,
+        assignedUsers: List<String>,
+    ): String
+
     fun canScoreTask(task: Task): Boolean
+
     suspend fun canEditTask(task: Task): Boolean
+
     suspend fun canAddTasks(): Boolean
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/LifecycleCollect.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/LifecycleCollect.kt
index 1c2099659..73a4ed1dc 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/LifecycleCollect.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/LifecycleCollect.kt
@@ -15,15 +15,18 @@ import kotlin.coroutines.EmptyCoroutineContext
 @Composable
 fun <T> rememberFlow(
     flow: Flow<T>,
-    lifecycleOwner: LifecycleOwner = LocalLifecycleOwner.current
+    lifecycleOwner: LifecycleOwner = LocalLifecycleOwner.current,
 ): Flow<T> {
-    return remember(key1 = flow, key2 = lifecycleOwner) { flow.flowWithLifecycle(lifecycleOwner.lifecycle, Lifecycle.State.STARTED) }
+    return remember(
+        key1 = flow,
+        key2 = lifecycleOwner,
+    ) { flow.flowWithLifecycle(lifecycleOwner.lifecycle, Lifecycle.State.STARTED) }
 }
 
 @Composable
 fun <T : R, R> Flow<T>.collectAsStateLifecycleAware(
     initial: R,
-    context: CoroutineContext = EmptyCoroutineContext
+    context: CoroutineContext = EmptyCoroutineContext,
 ): State<R> {
     val lifecycleAwareFlow = rememberFlow(flow = this)
     return lifecycleAwareFlow.collectAsState(initial = initial, context = context)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationOpenHandler.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationOpenHandler.kt
index 729d2f0da..1866964de 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationOpenHandler.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationOpenHandler.kt
@@ -10,21 +10,41 @@ import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.launch
 
 class NotificationOpenHandler {
-
     companion object {
-
-        fun handleOpenedByNotification(identifier: String, intent: Intent) {
+        fun handleOpenedByNotification(
+            identifier: String,
+            intent: Intent,
+        ) {
             MainScope().launch(context = Dispatchers.Main) {
                 when (identifier) {
                     PushNotificationManager.PARTY_INVITE_PUSH_NOTIFICATION_KEY -> openNoPartyScreen()
                     PushNotificationManager.QUEST_BEGUN_PUSH_NOTIFICATION_KEY -> openPartyScreen()
                     PushNotificationManager.QUEST_INVITE_PUSH_NOTIFICATION_KEY -> openPartyScreen()
-                    PushNotificationManager.GUILD_INVITE_PUSH_NOTIFICATION_KEY -> openGuildDetailScreen(intent.getStringExtra("groupID"))
-                    PushNotificationManager.RECEIVED_PRIVATE_MESSAGE_PUSH_NOTIFICATION_KEY -> openPrivateMessageScreen(intent.getStringExtra("replyToUUID"), intent.getStringExtra("replyToUsername"))
+                    PushNotificationManager.GUILD_INVITE_PUSH_NOTIFICATION_KEY ->
+                        openGuildDetailScreen(
+                            intent.getStringExtra("groupID"),
+                        )
+
+                    PushNotificationManager.RECEIVED_PRIVATE_MESSAGE_PUSH_NOTIFICATION_KEY ->
+                        openPrivateMessageScreen(
+                            intent.getStringExtra("replyToUUID"),
+                            intent.getStringExtra("replyToUsername"),
+                        )
+
                     PushNotificationManager.CHANGE_USERNAME_PUSH_NOTIFICATION_KEY -> openSettingsScreen()
                     PushNotificationManager.GIFT_ONE_GET_ONE_PUSH_NOTIFICATION_KEY -> openSubscriptionScreen()
-                    PushNotificationManager.CHAT_MENTION_NOTIFICATION_KEY -> handleChatMessage(intent.getStringExtra("type"), intent.getStringExtra("groupID"))
-                    PushNotificationManager.GROUP_ACTIVITY_NOTIFICATION_KEY -> handleChatMessage(intent.getStringExtra("type"), intent.getStringExtra("groupID"))
+                    PushNotificationManager.CHAT_MENTION_NOTIFICATION_KEY ->
+                        handleChatMessage(
+                            intent.getStringExtra("type"),
+                            intent.getStringExtra("groupID"),
+                        )
+
+                    PushNotificationManager.GROUP_ACTIVITY_NOTIFICATION_KEY ->
+                        handleChatMessage(
+                            intent.getStringExtra("type"),
+                            intent.getStringExtra("groupID"),
+                        )
+
                     PushNotificationManager.G1G1_PROMO_KEY -> openGiftOneGetOneInfoScreen()
                     else -> {
                         intent.getStringExtra("openURL")?.let {
@@ -36,12 +56,21 @@ class NotificationOpenHandler {
         }
 
         private fun openSubscriptionScreen() {
-            MainNavigationController.navigate(R.id.gemPurchaseActivity, bundleOf(Pair("openSubscription", true)))
+            MainNavigationController.navigate(
+                R.id.gemPurchaseActivity,
+                bundleOf(Pair("openSubscription", true)),
+            )
         }
 
-        private fun openPrivateMessageScreen(userID: String?, userName: String?) {
+        private fun openPrivateMessageScreen(
+            userID: String?,
+            userName: String?,
+        ) {
             if (userID != null && userName != null) {
-                MainNavigationController.navigate(R.id.inboxMessageListFragment, bundleOf("userID" to userID, "username" to userName))
+                MainNavigationController.navigate(
+                    R.id.inboxMessageListFragment,
+                    bundleOf("userID" to userID, "username" to userName),
+                )
             } else {
                 MainNavigationController.navigate(R.id.inboxFragment)
             }
@@ -49,7 +78,10 @@ class NotificationOpenHandler {
 
         private fun openPartyScreen(isChatNotification: Boolean = false) {
             val tabToOpen = if (isChatNotification) 1 else 0
-            MainNavigationController.navigate(R.id.partyFragment, bundleOf("tabToOpen" to tabToOpen))
+            MainNavigationController.navigate(
+                R.id.partyFragment,
+                bundleOf("tabToOpen" to tabToOpen),
+            )
         }
 
         private fun openNoPartyScreen() {
@@ -72,7 +104,10 @@ class NotificationOpenHandler {
             MainNavigationController.navigate(R.id.prefsActivity)
         }
 
-        private fun handleChatMessage(type: String?, groupID: String?) {
+        private fun handleChatMessage(
+            type: String?,
+            groupID: String?,
+        ) {
             when (type) {
                 "party" -> openPartyScreen()
                 "guild" -> openGuildDetailScreen(groupID)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationsManager.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationsManager.kt
index 550d42278..22621153b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationsManager.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationsManager.kt
@@ -20,20 +20,26 @@ interface NotificationsManager {
     var apiClient: WeakReference<ApiClient>?
 
     fun setNotifications(current: List<Notification>)
+
     fun getNotifications(): Flow<List<Notification>>
+
     fun getNotification(id: String): Notification?
-    fun dismissTaskNotification(context: Context, task: Task)
+
+    fun dismissTaskNotification(
+        context: Context,
+        task: Task,
+    )
 }
 
 class MainNotificationsManager : NotificationsManager {
-
     private val seenNotifications: MutableMap<String, Boolean>
     override var apiClient: WeakReference<ApiClient>? = null
 
     private var lastNotificationHandling: Date? = null
     private val notificationsFlow = MutableStateFlow<List<Notification>?>(null)
     private val displayedNotificationEvents = Channel<Notification>()
-    override val displayNotificationEvents: Flow<Notification> = displayedNotificationEvents.receiveAsFlow().filterNotNull()
+    override val displayNotificationEvents: Flow<Notification> =
+        displayedNotificationEvents.receiveAsFlow().filterNotNull()
 
     init {
         this.seenNotifications = HashMap()
@@ -52,7 +58,10 @@ class MainNotificationsManager : NotificationsManager {
         return notificationsFlow.value?.find { it.id == id }
     }
 
-    override fun dismissTaskNotification(context: Context, task: Task) {
+    override fun dismissTaskNotification(
+        context: Context,
+        task: Task,
+    ) {
         NotificationManagerCompat.from(context).cancel(task.id.hashCode())
     }
 
@@ -65,46 +74,47 @@ class MainNotificationsManager : NotificationsManager {
         notifications
             .filter { !this.seenNotifications.containsKey(it.id) }
             .map {
-                val notificationDisplayed = when (it.type) {
-                    Notification.Type.ACHIEVEMENT_PARTY_UP.type -> true
-                    Notification.Type.ACHIEVEMENT_PARTY_ON.type -> true
-                    Notification.Type.ACHIEVEMENT_BEAST_MASTER.type -> true
-                    Notification.Type.ACHIEVEMENT_MOUNT_MASTER.type -> true
-                    Notification.Type.ACHIEVEMENT_TRIAD_BINGO.type -> true
-                    Notification.Type.ACHIEVEMENT_GUILD_JOINED.type -> true
-                    Notification.Type.ACHIEVEMENT_CHALLENGE_JOINED.type -> true
-                    Notification.Type.ACHIEVEMENT_INVITED_FRIEND.type -> true
+                val notificationDisplayed =
+                    when (it.type) {
+                        Notification.Type.ACHIEVEMENT_PARTY_UP.type -> true
+                        Notification.Type.ACHIEVEMENT_PARTY_ON.type -> true
+                        Notification.Type.ACHIEVEMENT_BEAST_MASTER.type -> true
+                        Notification.Type.ACHIEVEMENT_MOUNT_MASTER.type -> true
+                        Notification.Type.ACHIEVEMENT_TRIAD_BINGO.type -> true
+                        Notification.Type.ACHIEVEMENT_GUILD_JOINED.type -> true
+                        Notification.Type.ACHIEVEMENT_CHALLENGE_JOINED.type -> true
+                        Notification.Type.ACHIEVEMENT_INVITED_FRIEND.type -> true
 
-                    Notification.Type.ACHIEVEMENT_ALL_YOUR_BASE.type -> true
-                    Notification.Type.ACHIEVEMENT_BACK_TO_BASICS.type -> true
-                    Notification.Type.ACHIEVEMENT_JUST_ADD_WATER.type -> true
-                    Notification.Type.ACHIEVEMENT_LOST_MASTERCLASSER.type -> true
-                    Notification.Type.ACHIEVEMENT_MIND_OVER_MATTER.type -> true
-                    Notification.Type.ACHIEVEMENT_DUST_DEVIL.type -> true
-                    Notification.Type.ACHIEVEMENT_ARID_AUTHORITY.type -> true
-                    Notification.Type.ACHIEVEMENT_MONSTER_MAGUS.type -> true
-                    Notification.Type.ACHIEVEMENT_UNDEAD_UNDERTAKER.type -> true
-                    Notification.Type.ACHIEVEMENT_PRIMED_FOR_PAINTING.type -> true
-                    Notification.Type.ACHIEVEMENT_PEARLY_PRO.type -> true
-                    Notification.Type.ACHIEVEMENT_TICKLED_PINK.type -> true
-                    Notification.Type.ACHIEVEMENT_ROSY_OUTLOOK.type -> true
-                    Notification.Type.ACHIEVEMENT_BUG_BONANZA.type -> true
-                    Notification.Type.ACHIEVEMENT_BARE_NECESSITIES.type -> true
-                    Notification.Type.ACHIEVEMENT_FRESHWATER_FRIENDS.type -> true
-                    Notification.Type.ACHIEVEMENT_GOOD_AS_GOLD.type -> true
-                    Notification.Type.ACHIEVEMENT_ALL_THAT_GLITTERS.type -> true
-                    Notification.Type.ACHIEVEMENT_BONE_COLLECTOR.type -> true
-                    Notification.Type.ACHIEVEMENT_SKELETON_CREW.type -> true
-                    Notification.Type.ACHIEVEMENT_SEEING_RED.type -> true
-                    Notification.Type.ACHIEVEMENT_RED_LETTER_DAY.type -> true
+                        Notification.Type.ACHIEVEMENT_ALL_YOUR_BASE.type -> true
+                        Notification.Type.ACHIEVEMENT_BACK_TO_BASICS.type -> true
+                        Notification.Type.ACHIEVEMENT_JUST_ADD_WATER.type -> true
+                        Notification.Type.ACHIEVEMENT_LOST_MASTERCLASSER.type -> true
+                        Notification.Type.ACHIEVEMENT_MIND_OVER_MATTER.type -> true
+                        Notification.Type.ACHIEVEMENT_DUST_DEVIL.type -> true
+                        Notification.Type.ACHIEVEMENT_ARID_AUTHORITY.type -> true
+                        Notification.Type.ACHIEVEMENT_MONSTER_MAGUS.type -> true
+                        Notification.Type.ACHIEVEMENT_UNDEAD_UNDERTAKER.type -> true
+                        Notification.Type.ACHIEVEMENT_PRIMED_FOR_PAINTING.type -> true
+                        Notification.Type.ACHIEVEMENT_PEARLY_PRO.type -> true
+                        Notification.Type.ACHIEVEMENT_TICKLED_PINK.type -> true
+                        Notification.Type.ACHIEVEMENT_ROSY_OUTLOOK.type -> true
+                        Notification.Type.ACHIEVEMENT_BUG_BONANZA.type -> true
+                        Notification.Type.ACHIEVEMENT_BARE_NECESSITIES.type -> true
+                        Notification.Type.ACHIEVEMENT_FRESHWATER_FRIENDS.type -> true
+                        Notification.Type.ACHIEVEMENT_GOOD_AS_GOLD.type -> true
+                        Notification.Type.ACHIEVEMENT_ALL_THAT_GLITTERS.type -> true
+                        Notification.Type.ACHIEVEMENT_BONE_COLLECTOR.type -> true
+                        Notification.Type.ACHIEVEMENT_SKELETON_CREW.type -> true
+                        Notification.Type.ACHIEVEMENT_SEEING_RED.type -> true
+                        Notification.Type.ACHIEVEMENT_RED_LETTER_DAY.type -> true
 
-                    Notification.Type.ACHIEVEMENT_GENERIC.type -> true
-                    Notification.Type.ACHIEVEMENT_ONBOARDING_COMPLETE.type -> true
-                    Notification.Type.LOGIN_INCENTIVE.type -> true
-                    Notification.Type.NEW_MYSTERY_ITEMS.type -> true
-                    Notification.Type.FIRST_DROP.type -> true
-                    else -> false
-                }
+                        Notification.Type.ACHIEVEMENT_GENERIC.type -> true
+                        Notification.Type.ACHIEVEMENT_ONBOARDING_COMPLETE.type -> true
+                        Notification.Type.LOGIN_INCENTIVE.type -> true
+                        Notification.Type.NEW_MYSTERY_ITEMS.type -> true
+                        Notification.Type.FIRST_DROP.type -> true
+                        else -> false
+                    }
 
                 if (notificationDisplayed) {
                     readNotification(it)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseHandler.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseHandler.kt
index a60879bda..f54c4b5ea 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseHandler.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseHandler.kt
@@ -54,23 +54,29 @@ import kotlin.time.toDuration
 class PurchaseHandler(
     private val context: Context,
     private val apiClient: ApiClient,
-    private val userViewModel: MainUserViewModel
+    private val userViewModel: MainUserViewModel,
 ) : PurchasesUpdatedListener, PurchasesResponseListener {
     private val billingClient =
         BillingClient.newBuilder(context).setListener(this).enablePendingPurchases().build()
 
-    override fun onPurchasesUpdated(result: BillingResult, purchases: MutableList<Purchase>?) {
+    override fun onPurchasesUpdated(
+        result: BillingResult,
+        purchases: MutableList<Purchase>?,
+    ) {
         purchases?.let { processPurchases(result, it) }
     }
 
     override fun onQueryPurchasesResponse(
         result: BillingResult,
-        purchases: MutableList<Purchase>
+        purchases: MutableList<Purchase>,
     ) {
         processPurchases(result, purchases)
     }
 
-    private fun processPurchases(result: BillingResult, purchases: List<Purchase>) {
+    private fun processPurchases(
+        result: BillingResult,
+        purchases: List<Purchase>,
+    ) {
         when (result.responseCode) {
             BillingClient.BillingResponseCode.OK -> {
                 val mostRecentSub = findMostRecentSubscription(purchases)
@@ -79,8 +85,9 @@ class PurchaseHandler(
                         .filterNotNull().take(1).collect {
                             val plan = it.purchased!!.plan
                             for (purchase in purchases) {
-                                if (plan?.isActive == true && PurchaseTypes.allSubscriptionTypes.contains(
-                                        purchase.products.firstOrNull()
+                                if (plan?.isActive == true &&
+                                    PurchaseTypes.allSubscriptionTypes.contains(
+                                        purchase.products.firstOrNull(),
                                     )
                                 ) {
                                     if (((plan.dateTerminated != null) == purchase.isAutoRenewing) ||
@@ -125,7 +132,12 @@ class PurchaseHandler(
     private var billingClientState: BillingClientState = BillingClientState.UNINITIALIZED
 
     private enum class BillingClientState {
-        UNINITIALIZED, READY, UNAVAILABLE, DISCONNECTED, CONNECTING;
+        UNINITIALIZED,
+        READY,
+        UNAVAILABLE,
+        DISCONNECTED,
+        CONNECTING,
+        ;
 
         val canMaybePurchase: Boolean
             get() {
@@ -134,6 +146,7 @@ class PurchaseHandler(
     }
 
     private var listeningRetryCount = 0
+
     fun startListening() {
         if (billingClient.connectionState == BillingClient.ConnectionState.CONNECTING ||
             billingClient.connectionState == BillingClient.ConnectionState.CONNECTED ||
@@ -147,32 +160,37 @@ class PurchaseHandler(
             return
         }
         billingClientState = BillingClientState.CONNECTING
-        billingClient.startConnection(object : BillingClientStateListener {
-            override fun onBillingSetupFinished(billingResult: BillingResult) {
-                when (billingResult.responseCode) {
-                    BillingClient.BillingResponseCode.OK -> {
-                        billingClientState = BillingClientState.READY
-                        MainScope().launchCatching {
-                            queryPurchases()
+        billingClient.startConnection(
+            object : BillingClientStateListener {
+                override fun onBillingSetupFinished(billingResult: BillingResult) {
+                    when (billingResult.responseCode) {
+                        BillingClient.BillingResponseCode.OK -> {
+                            billingClientState = BillingClientState.READY
+                            MainScope().launchCatching {
+                                queryPurchases()
+                            }
+                        }
+
+                        BillingClient.BillingResponseCode.SERVICE_DISCONNECTED -> {
+                            retryListening()
+                        }
+
+                        BillingClient.BillingResponseCode.SERVICE_TIMEOUT -> {
+                            retryListening()
+                        }
+
+                        else -> {
+                            billingClientState = BillingClientState.UNAVAILABLE
                         }
                     }
-                    BillingClient.BillingResponseCode.SERVICE_DISCONNECTED -> {
-                        retryListening()
-                    }
-                    BillingClient.BillingResponseCode.SERVICE_TIMEOUT -> {
-                        retryListening()
-                    }
-                    else -> {
-                        billingClientState = BillingClientState.UNAVAILABLE
-                    }
                 }
-            }
 
-            override fun onBillingServiceDisconnected() {
-                billingClientState = BillingClientState.DISCONNECTED
-                retryListening()
-            }
-        })
+                override fun onBillingServiceDisconnected() {
+                    billingClientState = BillingClientState.DISCONNECTED
+                    retryListening()
+                }
+            },
+        )
     }
 
     private fun retryListening() {
@@ -195,20 +213,22 @@ class PurchaseHandler(
             }
             billingClientState.canMaybePurchase && billingClient.isReady
         }
-        val subResponse = billingClient.queryPurchasesAsync(
-            QueryPurchasesParams.newBuilder().setProductType(BillingClient.ProductType.SUBS)
-                .build()
-        )
+        val subResponse =
+            billingClient.queryPurchasesAsync(
+                QueryPurchasesParams.newBuilder().setProductType(BillingClient.ProductType.SUBS)
+                    .build(),
+            )
         processPurchases(subResponse.billingResult, subResponse.purchasesList)
-        val iapResponse = billingClient.queryPurchasesAsync(
-            QueryPurchasesParams.newBuilder().setProductType(BillingClient.ProductType.INAPP)
-                .build()
-        )
+        val iapResponse =
+            billingClient.queryPurchasesAsync(
+                QueryPurchasesParams.newBuilder().setProductType(BillingClient.ProductType.INAPP)
+                    .build(),
+            )
         processPurchases(iapResponse.billingResult, iapResponse.purchasesList)
     }
 
     suspend fun getGryphatriceSKU() =
-        getSKU(BillingClient.ProductType.INAPP, PurchaseTypes.JubilantGrphatrice)
+        getSKU(BillingClient.ProductType.INAPP, PurchaseTypes.JUBILANT_GRYPHATRICE)
 
     suspend fun getAllGemSKUs() =
         getSKUs(BillingClient.ProductType.INAPP, PurchaseTypes.allGemTypes)
@@ -222,29 +242,40 @@ class PurchaseHandler(
     suspend fun getInAppPurchaseSKU(identifier: String) =
         getSKU(BillingClient.ProductType.INAPP, identifier)
 
-    private suspend fun getSKUs(type: String, identifiers: List<String>) =
+    private suspend fun getSKUs(
+        type: String,
+        identifiers: List<String>,
+    ) =
         loadInventory(type, identifiers) ?: emptyList()
 
-    private suspend fun getSKU(type: String, identifier: String): ProductDetails? {
+    private suspend fun getSKU(
+        type: String,
+        identifier: String,
+    ): ProductDetails? {
         val inventory = loadInventory(type, listOf(identifier))
         return inventory?.firstOrNull()
     }
 
-    private suspend fun loadInventory(type: String, skus: List<String>): List<ProductDetails>? {
+    private suspend fun loadInventory(
+        type: String,
+        skus: List<String>,
+    ): List<ProductDetails>? {
         retryUntil {
             if (billingClientState == BillingClientState.DISCONNECTED) {
                 startListening()
             }
             billingClientState.canMaybePurchase && billingClient.isReady
         }
-        val params = QueryProductDetailsParams.newBuilder().setProductList(
-            skus.map {
-                Product.newBuilder().setProductId(it).setProductType(type).build()
+        val params =
+            QueryProductDetailsParams.newBuilder().setProductList(
+                skus.map {
+                    Product.newBuilder().setProductId(it).setProductType(type).build()
+                },
+            ).build()
+        val skuDetailsResult =
+            withContext(Dispatchers.IO) {
+                billingClient.queryProductDetails(params)
             }
-        ).build()
-        val skuDetailsResult = withContext(Dispatchers.IO) {
-            billingClient.queryProductDetails(params)
-        }
         return skuDetailsResult.productDetailsList
     }
 
@@ -253,7 +284,7 @@ class PurchaseHandler(
         skuDetails: ProductDetails,
         recipient: String? = null,
         recipientUsername: String? = null,
-        isSaleGemPurchase: Boolean = false
+        isSaleGemPurchase: Boolean = false,
     ) {
         this.isSaleGemPurchase = isSaleGemPurchase
         recipient?.let {
@@ -264,14 +295,17 @@ class PurchaseHandler(
                 listOf(skuDetails).map {
                     BillingFlowParams.ProductDetailsParams.newBuilder()
                         .setProductDetails(skuDetails).setOfferToken(
-                            skuDetails.subscriptionOfferDetails?.first()?.offerToken ?: ""
+                            skuDetails.subscriptionOfferDetails?.first()?.offerToken ?: "",
                         ).build()
-                }
+                },
             ).build()
         billingClient.launchBillingFlow(activity, flowParams)
     }
 
-    private suspend fun consume(purchase: Purchase, retries: Int = 4) {
+    private suspend fun consume(
+        purchase: Purchase,
+        retries: Int = 4,
+    ) {
         retryUntil { billingClientState.canMaybePurchase && billingClient.isReady }
         val params = ConsumeParams.newBuilder().setPurchaseToken(purchase.purchaseToken).build()
         val result = billingClient.consumePurchase(params)
@@ -287,14 +321,19 @@ class PurchaseHandler(
     }
 
     private var processedPurchases = mutableSetOf<String>()
+
     private fun handle(purchase: Purchase) {
-        if (purchase.purchaseState != Purchase.PurchaseState.PURCHASED || processedPurchases.contains(purchase.orderId)) {
+        if (purchase.purchaseState != Purchase.PurchaseState.PURCHASED ||
+            processedPurchases.contains(
+                purchase.orderId,
+            )
+        ) {
             return
         }
         purchase.orderId?.let { processedPurchases.add(it) }
         val sku = purchase.products.firstOrNull()
         when {
-            sku == PurchaseTypes.JubilantGrphatrice -> {
+            sku == PurchaseTypes.JUBILANT_GRYPHATRICE -> {
                 val validationRequest = buildValidationRequest(purchase)
                 MainScope().launchCatching {
                     try {
@@ -363,7 +402,10 @@ class PurchaseHandler(
         }
     }
 
-    private suspend fun acknowledgePurchase(purchase: Purchase, retries: Int = 4) {
+    private suspend fun acknowledgePurchase(
+        purchase: Purchase,
+        retries: Int = 4,
+    ) {
         val params =
             AcknowledgePurchaseParams.newBuilder().setPurchaseToken(purchase.purchaseToken).build()
         val response = billingClient.acknowledgePurchase(params)
@@ -397,7 +439,10 @@ class PurchaseHandler(
         return validationRequest
     }
 
-    private fun handleError(throwable: Throwable, purchase: Purchase) {
+    private fun handleError(
+        throwable: Throwable,
+        purchase: Purchase,
+    ) {
         when (throwable) {
             is HttpException -> {
                 if (throwable.code() == 401) {
@@ -412,6 +457,7 @@ class PurchaseHandler(
                     }
                 }
             }
+
             else -> {
                 // Handles other potential errors such as IOException or an exception
                 // thrown by billingClient.consumePurchase method that is not handled
@@ -425,12 +471,13 @@ class PurchaseHandler(
     }
 
     suspend fun checkForSubscription(): Purchase? {
-        val result = withContext(Dispatchers.IO) {
-            val params =
-                QueryPurchasesParams.newBuilder().setProductType(BillingClient.ProductType.SUBS)
-                    .build()
-            billingClient.queryPurchasesAsync(params)
-        }
+        val result =
+            withContext(Dispatchers.IO) {
+                val params =
+                    QueryPurchasesParams.newBuilder().setProductType(BillingClient.ProductType.SUBS)
+                        .build()
+                billingClient.queryPurchasesAsync(params)
+            }
         val fallback: Purchase? = null
         if (result.billingResult.responseCode == BillingClient.BillingResponseCode.OK) {
             return findMostRecentSubscription(result.purchasesList)
@@ -454,6 +501,7 @@ class PurchaseHandler(
     }
 
     private var alreadyTriedCancellation = false
+
     suspend fun cancelSubscription(): User? {
         if (alreadyTriedCancellation) return null
         alreadyTriedCancellation = true
@@ -463,10 +511,10 @@ class PurchaseHandler(
 
     private fun durationString(sku: String): String {
         return when (sku) {
-            PurchaseTypes.Subscription1MonthNoRenew, PurchaseTypes.Subscription1Month -> "1"
-            PurchaseTypes.Subscription3MonthNoRenew, PurchaseTypes.Subscription3Month -> "3"
-            PurchaseTypes.Subscription6MonthNoRenew, PurchaseTypes.Subscription6Month -> "6"
-            PurchaseTypes.Subscription12MonthNoRenew, PurchaseTypes.Subscription12Month -> "12"
+            PurchaseTypes.SUBSCRIPTION_1_MONTH_NORENEW, PurchaseTypes.SUBSCRIPTION_1_MONTH -> "1"
+            PurchaseTypes.SUBSCRIPTION_3_MONTH_NORENEW, PurchaseTypes.SUBSCRIPTION_3_MONTH -> "3"
+            PurchaseTypes.SUBSCRIPTION_6_MONTH_NORENEW, PurchaseTypes.SUBSCRIPTION_6_MONTH -> "6"
+            PurchaseTypes.SUBSCRIPTION_12_MONTH_NORENEW, PurchaseTypes.SUBSCRIPTION_12_MONTH -> "12"
             else -> ""
         }
     }
@@ -477,18 +525,18 @@ class PurchaseHandler(
         if (isSaleGemPurchase) {
             isSaleGemPurchase = false
             return when (sku) {
-                PurchaseTypes.Purchase4Gems -> "5"
-                PurchaseTypes.Purchase21Gems -> "30"
-                PurchaseTypes.Purchase42Gems -> "60"
-                PurchaseTypes.Purchase84Gems -> "125"
+                PurchaseTypes.PURCHASE_4_GEMS -> "5"
+                PurchaseTypes.PURCHASE_21_GEMS -> "30"
+                PurchaseTypes.PURCHASE_42_GEMS -> "60"
+                PurchaseTypes.PURCHASE_84_GEMS -> "125"
                 else -> ""
             }
         } else {
             return when (sku) {
-                PurchaseTypes.Purchase4Gems -> "4"
-                PurchaseTypes.Purchase21Gems -> "21"
-                PurchaseTypes.Purchase42Gems -> "42"
-                PurchaseTypes.Purchase84Gems -> "84"
+                PurchaseTypes.PURCHASE_4_GEMS -> "4"
+                PurchaseTypes.PURCHASE_21_GEMS -> "21"
+                PurchaseTypes.PURCHASE_42_GEMS -> "42"
+                PurchaseTypes.PURCHASE_84_GEMS -> "84"
                 else -> ""
             }
         }
@@ -496,52 +544,57 @@ class PurchaseHandler(
 
     private val displayedConfirmations = mutableListOf<String>()
 
-    private fun displayConfirmationDialog(purchase: Purchase, giftedTo: String? = null) {
+    private fun displayConfirmationDialog(
+        purchase: Purchase,
+        giftedTo: String? = null,
+    ) {
         if (displayedConfirmations.contains(purchase.orderId)) {
             return
         }
         purchase.orderId?.let { displayedConfirmations.add(it) }
         CoroutineScope(Dispatchers.Main).launchCatching {
-            val application = (context as? HabiticaBaseApplication)
-                ?: (context.applicationContext as? HabiticaBaseApplication) ?: return@launchCatching
+            val application =
+                (context as? HabiticaBaseApplication)
+                    ?: (context.applicationContext as? HabiticaBaseApplication) ?: return@launchCatching
             val sku = purchase.products.firstOrNull() ?: return@launchCatching
             var title = context.getString(R.string.successful_purchase_generic)
-            val message = when {
-                PurchaseTypes.allSubscriptionNoRenewTypes.contains(sku) -> {
-                    title = context.getString(R.string.gift_confirmation_title)
-                    context.getString(
-                        R.string.gift_confirmation_text_sub,
-                        giftedTo,
-                        durationString(sku)
-                    )
-                }
-
-                PurchaseTypes.allSubscriptionTypes.contains(sku) -> {
-                    if (sku == PurchaseTypes.Subscription1Month) {
-                        context.getString(R.string.subscription_confirmation)
-                    } else {
+            val message =
+                when {
+                    PurchaseTypes.allSubscriptionNoRenewTypes.contains(sku) -> {
+                        title = context.getString(R.string.gift_confirmation_title)
                         context.getString(
-                            R.string.subscription_confirmation_multiple,
-                            durationString(sku)
+                            R.string.gift_confirmation_text_sub,
+                            giftedTo,
+                            durationString(sku),
                         )
                     }
-                }
 
-                PurchaseTypes.allGemTypes.contains(sku) && giftedTo != null -> {
-                    title = context.getString(R.string.gift_confirmation_title)
-                    context.getString(
-                        R.string.gift_confirmation_text_gems_new,
-                        giftedTo,
-                        gemAmountString(sku)
-                    )
-                }
+                    PurchaseTypes.allSubscriptionTypes.contains(sku) -> {
+                        if (sku == PurchaseTypes.SUBSCRIPTION_1_MONTH) {
+                            context.getString(R.string.subscription_confirmation)
+                        } else {
+                            context.getString(
+                                R.string.subscription_confirmation_multiple,
+                                durationString(sku),
+                            )
+                        }
+                    }
 
-                PurchaseTypes.allGemTypes.contains(sku) && giftedTo == null -> {
-                    context.getString(R.string.gem_purchase_confirmation, gemAmountString(sku))
-                }
+                    PurchaseTypes.allGemTypes.contains(sku) && giftedTo != null -> {
+                        title = context.getString(R.string.gift_confirmation_title)
+                        context.getString(
+                            R.string.gift_confirmation_text_gems_new,
+                            giftedTo,
+                            gemAmountString(sku),
+                        )
+                    }
 
-                else -> null
-            }
+                    PurchaseTypes.allGemTypes.contains(sku) && giftedTo == null -> {
+                        context.getString(R.string.gem_purchase_confirmation, gemAmountString(sku))
+                    }
+
+                    else -> null
+                }
             application.currentActivity?.get()?.let { activity ->
                 val alert = HabiticaAlertDialog(activity)
                 alert.setTitle(title)
@@ -559,17 +612,19 @@ class PurchaseHandler(
 
     private fun displayGryphatriceConfirmationDialog(
         purchase: Purchase,
-        giftedTo: String? = null
+        giftedTo: String? = null,
     ) {
         MainScope().launch(ExceptionHandler.coroutine()) {
-            val application = (context as? HabiticaBaseApplication)
-                ?: (context.applicationContext as? HabiticaBaseApplication) ?: return@launch
+            val application =
+                (context as? HabiticaBaseApplication)
+                    ?: (context.applicationContext as? HabiticaBaseApplication) ?: return@launch
             val title = context.getString(R.string.successful_purchase_generic)
-            val message = if (giftedTo != null) {
-                context.getString(R.string.jubilant_gryphatrice_confirmation_gift)
-            } else {
-                context.getString(R.string.jubilant_gryphatrice_confirmation)
-            }
+            val message =
+                if (giftedTo != null) {
+                    context.getString(R.string.jubilant_gryphatrice_confirmation_gift)
+                } else {
+                    context.getString(R.string.jubilant_gryphatrice_confirmation)
+                }
             application.currentActivity?.get()?.let { activity ->
                 val alert = HabiticaAlertDialog(activity)
                 alert.setTitle(title)
@@ -590,7 +645,11 @@ class PurchaseHandler(
         private var pendingGifts: MutableMap<String, Triple<Date, String, String>> = HashMap()
         private var preferences: SharedPreferences? = null
 
-        fun addGift(sku: String, userID: String, username: String) {
+        fun addGift(
+            sku: String,
+            userID: String,
+            username: String,
+        ) {
             pendingGifts[sku] = Triple(Date(), userID, username)
             savePendingGifts()
         }
@@ -616,7 +675,7 @@ suspend fun retryUntil(
     initialDelay: Long = 100, // 0.1 second
     maxDelay: Long = 1000, // 1 second
     factor: Double = 2.0,
-    block: suspend () -> Boolean
+    block: suspend () -> Boolean,
 ) {
     var currentDelay = initialDelay
     repeat(times - 1) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseTypes.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseTypes.kt
index b4326692c..26406fc58 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseTypes.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseTypes.kt
@@ -1,30 +1,36 @@
 package com.habitrpg.android.habitica.helpers
 
 object PurchaseTypes {
-    const val JubilantGrphatrice = "com.habitrpg.android.habitica.iap.pets.gryphatrice_jubilant"
-    const val Purchase4Gems = "com.habitrpg.android.habitica.iap.4gems"
-    const val Purchase21Gems = "com.habitrpg.android.habitica.iap.21gems"
-    const val Purchase42Gems = "com.habitrpg.android.habitica.iap.42gems"
-    const val Purchase84Gems = "com.habitrpg.android.habitica.iap.84gems"
-    val allGemTypes = listOf(Purchase4Gems, Purchase21Gems, Purchase42Gems, Purchase84Gems)
-    const val Subscription1Month = "com.habitrpg.android.habitica.subscription.1month"
-    const val Subscription3Month = "com.habitrpg.android.habitica.subscription.3month"
-    const val Subscription6Month = "com.habitrpg.android.habitica.subscription.6month"
-    const val Subscription12Month = "com.habitrpg.android.habitica.subscription.12month"
-    val allSubscriptionTypes = mutableListOf(
-        Subscription1Month,
-        Subscription3Month,
-        Subscription6Month,
-        Subscription12Month
-    )
-    const val Subscription1MonthNoRenew = "com.habitrpg.android.habitica.norenew_subscription.1month"
-    const val Subscription3MonthNoRenew = "com.habitrpg.android.habitica.norenew_subscription.3month"
-    const val Subscription6MonthNoRenew = "com.habitrpg.android.habitica.norenew_subscription.6month"
-    const val Subscription12MonthNoRenew = "com.habitrpg.android.habitica.norenew_subscription.12month"
-    var allSubscriptionNoRenewTypes = listOf(
-        Subscription1MonthNoRenew,
-        Subscription3MonthNoRenew,
-        Subscription6MonthNoRenew,
-        Subscription12MonthNoRenew
-    )
+    const val JUBILANT_GRYPHATRICE = "com.habitrpg.android.habitica.iap.pets.gryphatrice_jubilant"
+    const val PURCHASE_4_GEMS = "com.habitrpg.android.habitica.iap.4gems"
+    const val PURCHASE_21_GEMS = "com.habitrpg.android.habitica.iap.21gems"
+    const val PURCHASE_42_GEMS = "com.habitrpg.android.habitica.iap.42gems"
+    const val PURCHASE_84_GEMS = "com.habitrpg.android.habitica.iap.84gems"
+    val allGemTypes = listOf(PURCHASE_4_GEMS, PURCHASE_21_GEMS, PURCHASE_42_GEMS, PURCHASE_84_GEMS)
+    const val SUBSCRIPTION_1_MONTH = "com.habitrpg.android.habitica.subscription.1month"
+    const val SUBSCRIPTION_3_MONTH = "com.habitrpg.android.habitica.subscription.3month"
+    const val SUBSCRIPTION_6_MONTH = "com.habitrpg.android.habitica.subscription.6month"
+    const val SUBSCRIPTION_12_MONTH = "com.habitrpg.android.habitica.subscription.12month"
+    val allSubscriptionTypes =
+        mutableListOf(
+            SUBSCRIPTION_1_MONTH,
+            SUBSCRIPTION_3_MONTH,
+            SUBSCRIPTION_6_MONTH,
+            SUBSCRIPTION_12_MONTH,
+        )
+    const val SUBSCRIPTION_1_MONTH_NORENEW =
+        "com.habitrpg.android.habitica.norenew_subscription.1month"
+    const val SUBSCRIPTION_3_MONTH_NORENEW =
+        "com.habitrpg.android.habitica.norenew_subscription.3month"
+    const val SUBSCRIPTION_6_MONTH_NORENEW =
+        "com.habitrpg.android.habitica.norenew_subscription.6month"
+    const val SUBSCRIPTION_12_MONTH_NORENEW =
+        "com.habitrpg.android.habitica.norenew_subscription.12month"
+    var allSubscriptionNoRenewTypes =
+        listOf(
+            SUBSCRIPTION_1_MONTH_NORENEW,
+            SUBSCRIPTION_3_MONTH_NORENEW,
+            SUBSCRIPTION_6_MONTH_NORENEW,
+            SUBSCRIPTION_12_MONTH_NORENEW,
+        )
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/ReviewManager.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/ReviewManager.kt
index 6e6377adf..e4ec54ba2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/ReviewManager.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/ReviewManager.kt
@@ -6,7 +6,6 @@ import androidx.core.content.edit
 import com.google.android.play.core.review.ReviewManagerFactory
 
 class ReviewManager(context: Context, private val configManager: AppConfigManager) {
-
     private val reviewManager = ReviewManagerFactory.create(context)
     private val sharedPref = context.getSharedPreferences("ReviewPrefs", Context.MODE_PRIVATE)
 
@@ -59,7 +58,10 @@ class ReviewManager(context: Context, private val configManager: AppConfigManage
         return !(lastReviewCheckin != -1 && currentCheckins - lastReviewCheckin < 5)
     }
 
-    fun requestReview(activity: AppCompatActivity, currentCheckins: Int) {
+    fun requestReview(
+        activity: AppCompatActivity,
+        currentCheckins: Int,
+    ) {
         if (!canRequestReview(currentCheckins)) return
 
         val request = reviewManager.requestReviewFlow()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundFile.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundFile.kt
index 5c75ce0fc..802cd3e73 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundFile.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundFile.kt
@@ -36,10 +36,11 @@ class SoundFile(val theme: String, private val fileName: String) {
 
         try {
             player?.setDataSource(file?.path)
-            val attributes = AudioAttributes.Builder()
-                .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
-                .setLegacyStreamType(AudioManager.STREAM_MUSIC)
-                .build()
+            val attributes =
+                AudioAttributes.Builder()
+                    .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
+                    .setLegacyStreamType(AudioManager.STREAM_MUSIC)
+                    .build()
             player?.setAudioAttributes(attributes)
             player?.prepare()
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundFileLoader.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundFileLoader.kt
index db5f9020c..f796721ff 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundFileLoader.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundFileLoader.kt
@@ -20,7 +20,9 @@ class SoundFileLoader(private val context: Context) {
 
     private val externalCacheDir: String?
         get() {
-            val cacheDir = HabiticaBaseApplication.getInstance(context)?.getExternalFilesDir(Environment.DIRECTORY_NOTIFICATIONS)
+            val cacheDir =
+                HabiticaBaseApplication.getInstance(context)
+                    ?.getExternalFilesDir(Environment.DIRECTORY_NOTIFICATIONS)
             return cacheDir?.path
         }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundManager.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundManager.kt
index 2698b6ea1..8e6d516eb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundManager.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundManager.kt
@@ -6,64 +6,66 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class SoundManager @Inject constructor(var soundFileLoader: SoundFileLoader) {
-    var soundTheme: String = SoundThemeOff
+class SoundManager
+    @Inject
+    constructor(var soundFileLoader: SoundFileLoader) {
+        var soundTheme: String = SOUND_THEME_OFF
 
-    private val loadedSoundFiles: MutableMap<String, SoundFile> = HashMap()
+        private val loadedSoundFiles: MutableMap<String, SoundFile> = HashMap()
 
-    fun preloadAllFiles() {
-        loadedSoundFiles.clear()
-        if (soundTheme == SoundThemeOff) {
-            return
-        }
+        fun preloadAllFiles() {
+            loadedSoundFiles.clear()
+            if (soundTheme == SOUND_THEME_OFF) {
+                return
+            }
 
-        val soundFiles = ArrayList<SoundFile>()
-        soundFiles.add(SoundFile(soundTheme, SoundAchievementUnlocked))
-        soundFiles.add(SoundFile(soundTheme, SoundChat))
-        soundFiles.add(SoundFile(soundTheme, SoundDaily))
-        soundFiles.add(SoundFile(soundTheme, SoundDeath))
-        soundFiles.add(SoundFile(soundTheme, SoundItemDrop))
-        soundFiles.add(SoundFile(soundTheme, SoundLevelUp))
-        soundFiles.add(SoundFile(soundTheme, SoundMinusHabit))
-        soundFiles.add(SoundFile(soundTheme, SoundPlusHabit))
-        soundFiles.add(SoundFile(soundTheme, SoundReward))
-        soundFiles.add(SoundFile(soundTheme, SoundTodo))
-        MainScope().launchCatching {
-            soundFileLoader.download(soundFiles)
-        }
-    }
-
-    fun loadAndPlayAudio(type: String) {
-        if (soundTheme == SoundThemeOff) {
-            return
-        }
-
-        if (loadedSoundFiles.containsKey(type)) {
-            loadedSoundFiles[type]?.play()
-        } else {
             val soundFiles = ArrayList<SoundFile>()
-
-            soundFiles.add(SoundFile(soundTheme, type))
+            soundFiles.add(SoundFile(soundTheme, SOUND_ACHIEVEMENT_UNLOCKED))
+            soundFiles.add(SoundFile(soundTheme, SOUND_CHAT))
+            soundFiles.add(SoundFile(soundTheme, SOUND_DAILY))
+            soundFiles.add(SoundFile(soundTheme, SOUND_DEATH))
+            soundFiles.add(SoundFile(soundTheme, SOUND_ITEM_DROP))
+            soundFiles.add(SoundFile(soundTheme, SOUND_LEVEL_UP))
+            soundFiles.add(SoundFile(soundTheme, SOUND_MINUS_HABIT))
+            soundFiles.add(SoundFile(soundTheme, SOUND_PLUS_HABIT))
+            soundFiles.add(SoundFile(soundTheme, SOUND_REWARD))
+            soundFiles.add(SoundFile(soundTheme, SOUND_TODO))
             MainScope().launchCatching {
-                val newFiles = soundFileLoader.download(soundFiles)
-                val file = newFiles[0]
-                loadedSoundFiles[type] = file
-                file.play()
+                soundFileLoader.download(soundFiles)
             }
         }
-    }
 
-    companion object {
-        const val SoundAchievementUnlocked = "Achievement_Unlocked"
-        const val SoundChat = "Chat"
-        const val SoundDaily = "Daily"
-        const val SoundDeath = "Death"
-        const val SoundItemDrop = "Item_Drop"
-        const val SoundLevelUp = "Level_Up"
-        const val SoundMinusHabit = "Minus_Habit"
-        const val SoundPlusHabit = "Plus_Habit"
-        const val SoundReward = "Reward"
-        const val SoundTodo = "Todo"
-        const val SoundThemeOff = "off"
+        fun loadAndPlayAudio(type: String) {
+            if (soundTheme == SOUND_THEME_OFF) {
+                return
+            }
+
+            if (loadedSoundFiles.containsKey(type)) {
+                loadedSoundFiles[type]?.play()
+            } else {
+                val soundFiles = ArrayList<SoundFile>()
+
+                soundFiles.add(SoundFile(soundTheme, type))
+                MainScope().launchCatching {
+                    val newFiles = soundFileLoader.download(soundFiles)
+                    val file = newFiles[0]
+                    loadedSoundFiles[type] = file
+                    file.play()
+                }
+            }
+        }
+
+        companion object {
+            const val SOUND_ACHIEVEMENT_UNLOCKED = "Achievement_Unlocked"
+            const val SOUND_CHAT = "Chat"
+            const val SOUND_DAILY = "Daily"
+            const val SOUND_DEATH = "Death"
+            const val SOUND_ITEM_DROP = "Item_Drop"
+            const val SOUND_LEVEL_UP = "Level_Up"
+            const val SOUND_MINUS_HABIT = "Minus_Habit"
+            const val SOUND_PLUS_HABIT = "Plus_Habit"
+            const val SOUND_REWARD = "Reward"
+            const val SOUND_TODO = "Todo"
+            const val SOUND_THEME_OFF = "off"
+        }
     }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.kt
index 10c8224d1..31c7bdb86 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.kt
@@ -1,287 +1,322 @@
-package com.habitrpg.android.habitica.helpers
-
-import android.app.AlarmManager
-import android.app.PendingIntent
-import android.content.Context
-import android.content.Intent
-import android.os.Build
-import android.util.Log
-import androidx.preference.PreferenceManager
-import com.habitrpg.android.habitica.data.TaskRepository
-import com.habitrpg.android.habitica.extensions.withImmutableFlag
-import com.habitrpg.android.habitica.models.tasks.RemindersItem
-import com.habitrpg.android.habitica.models.tasks.Task
-import com.habitrpg.android.habitica.modules.AuthenticationHandler
-import com.habitrpg.android.habitica.receivers.NotificationPublisher
-import com.habitrpg.android.habitica.receivers.TaskReceiver
-import com.habitrpg.common.habitica.helpers.ExceptionHandler
-import com.habitrpg.shared.habitica.HLogger
-import com.habitrpg.shared.habitica.LogLevel
-import com.habitrpg.shared.habitica.models.tasks.TaskType
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.MainScope
-import kotlinx.coroutines.flow.filter
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.firstOrNull
-import kotlinx.coroutines.launch
-import java.time.DateTimeException
-import java.time.ZoneId
-import java.time.ZonedDateTime
-import java.time.format.DateTimeFormatter
-import java.util.Calendar
-import java.util.Date
-
-class TaskAlarmManager(
-    private var context: Context,
-    private var taskRepository: TaskRepository,
-    private var authenticationHandler: AuthenticationHandler
-) {
-    private val am: AlarmManager? = context.getSystemService(Context.ALARM_SERVICE) as? AlarmManager
-    private val upcomingReminderOccurrencesToSchedule = 3
-
-
-    /**
-     * Schedules multiple alarms for each reminder associated with a given task.
-     *
-     * This method iterates through all reminders of a task and schedules multiple upcoming alarms for each.
-     * It determines the upcoming reminder times based on the reminder's configuration (like frequency, repeat days, etc.)
-     * and schedules an alarm for each of these times.
-     *
-     * For each reminder, it updates the reminder's time to each upcoming occurrence and then calls
-     * `setAlarmForRemindersItem` to handle the actual alarm scheduling. This ensures that each reminder
-     * is scheduled accurately according to its specified rules and times.
-     *
-     * This method is particularly useful for reminders that need to be repeated at regular intervals
-     * (e.g., daily, weekly) or on specific days, as it schedules multiple occurrences in advance.
-     *
-     * @param task The task for which the alarms are being set. Each reminder in the task's reminder list
-     *             is processed to schedule the upcoming alarms.
-     */
-    private fun setAlarmsForTask(task: Task) {
-        CoroutineScope(Dispatchers.IO).launch {
-            val reminderOccurencesToSchedule = if (task.type == TaskType.TODO) { 1 } else {
-                // For dailies, we schedule multiple reminders in advance
-                upcomingReminderOccurrencesToSchedule
-            }
-            task.reminders?.let { reminders ->
-                for (reminder in reminders) {
-                    try {
-                        val upcomingReminders =
-                            task.getNextReminderOccurrences(reminder, reminderOccurencesToSchedule)
-                        upcomingReminders?.forEachIndexed { index, reminderNextOccurrenceTime ->
-                            reminder?.time =
-                                reminderNextOccurrenceTime.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME)
-                            setAlarmForRemindersItem(task, reminder, index)
-                        }
-                    } catch (_: DateTimeException) {
-                        // code accidentally generated an invalid date
-                    }
-                }
-            }
-        }
-    }
-
-
-    fun removeAlarmsForTask(task: Task) {
-        CoroutineScope(Dispatchers.IO).launch {
-            task.reminders?.let { reminders ->
-                // Remove not only the immediate reminder, but also the next however many (upcomingReminderOccurrencesToSchedule) reminders
-                reminders.forEachIndexed { index, reminder ->
-                    removeAlarmForRemindersItem(reminder, index)
-                }
-            }
-        }
-    }
-
-    // This function is used from the TaskReceiver since we do not have access to the task
-    // We currently only use this function to schedule the next reminder for dailies
-    // We may be able to use repeating alarms instead of this in the future
-    fun addAlarmForTaskId(taskId: String) {
-        MainScope().launch(ExceptionHandler.coroutine()) {
-            val task = taskRepository.getTaskCopy(taskId)
-                .filter { task -> task.isValid && task.isManaged && TaskType.DAILY == task.type }
-                .first()
-            setAlarmsForTask(task)
-        }
-    }
-
-    suspend fun scheduleAllSavedAlarms(preventDailyReminder: Boolean) {
-        val tasks = taskRepository.getTaskCopies().firstOrNull()
-        tasks?.forEach { this.setAlarmsForTask(it) }
-
-        if (!preventDailyReminder) {
-            scheduleDailyReminder(context)
-        }
-    }
-
-    fun scheduleAlarmsForTask(task: Task) {
-        setAlarmsForTask(task)
-    }
-
-    /**
-     * Schedules an alarm for a given reminder associated with a task.
-     *
-     * This method takes a task and its associated reminder item to schedule an alarm.
-     * It first checks if the reminder time is valid and not in the past. If the reminder time
-     * is valid, it prepares an intent for the alarm, uniquely identified by combining the reminder's ID
-     * and its scheduled time. This unique identifier ensures that each reminder occurrence is distinctly handled.
-     *
-     * If an alarm with the same identifier already exists, it is cancelled and replaced with the new one.
-     * This ensures that reminders are always up to date with their latest scheduled times.
-     *
-     * The alarm is scheduled to trigger at the exact time specified in the reminder. Upon triggering,
-     * it will send a broadcast to `TaskReceiver`, which should handle the reminder notification.
-     *
-     * @param reminderItemTask The task associated with the reminder.
-     * @param remindersItem The reminder item containing details like ID and the time for the reminder.
-     *                      If this is null, the method returns immediately without scheduling an alarm.
-     */
-    private fun setAlarmForRemindersItem(reminderItemTask: Task, remindersItem: RemindersItem?,  occurrenceIndex: Int) {
-        if (remindersItem == null) return
-
-        val now = ZonedDateTime.now().withZoneSameLocal(ZoneId.systemDefault())?.toInstant()
-        val reminderZonedTime = remindersItem.getLocalZonedDateTimeInstant()
-
-        if (reminderZonedTime == null || reminderZonedTime.isBefore(now)) {
-            return
-        }
-
-
-        val intent = Intent(context, TaskReceiver::class.java)
-        intent.action = remindersItem.id
-        intent.putExtra(TASK_NAME_INTENT_KEY, reminderItemTask.text)
-        intent.putExtra(TASK_ID_INTENT_KEY, reminderItemTask.id)
-
-        // Create a unique identifier based on remindersItem.id and the occurrence index
-        val intentId = (remindersItem.id?.hashCode() ?: 0) + occurrenceIndex
-
-        // Cancel alarm if already exists
-        val previousSender = PendingIntent.getBroadcast(
-            context,
-            intentId,
-            intent,
-            withImmutableFlag(PendingIntent.FLAG_NO_CREATE)
-        )
-        if (previousSender != null) {
-            previousSender.cancel()
-            am?.cancel(previousSender)
-        }
-
-        val sender = PendingIntent.getBroadcast(
-            context,
-            intentId,
-            intent,
-            withImmutableFlag(PendingIntent.FLAG_CANCEL_CURRENT)
-        )
-
-
-        CoroutineScope(Dispatchers.IO).launch {
-            setAlarm(context, reminderZonedTime.toEpochMilli(), sender)
-        }
-    }
-
-    private fun removeAlarmForRemindersItem(remindersItem: RemindersItem, occurrenceIndex: Int? = null) {
-        val intent = Intent(context, TaskReceiver::class.java)
-        intent.action = remindersItem.id
-        val intentId = if (occurrenceIndex != null) (remindersItem.id?.hashCode() ?: (0 and 0xfffffff)) + occurrenceIndex else (remindersItem.id?.hashCode() ?: (0 and 0xfffffff))
-        val sender = PendingIntent.getBroadcast(
-            context,
-            intentId,
-            intent,
-            withImmutableFlag(PendingIntent.FLAG_UPDATE_CURRENT)
-        )
-        val am = context.getSystemService(Context.ALARM_SERVICE) as? AlarmManager
-        sender.cancel()
-        am?.cancel(sender)
-    }
-
-    companion object {
-        const val TASK_ID_INTENT_KEY = "TASK_ID"
-        const val TASK_NAME_INTENT_KEY = "TASK_NAME"
-
-        fun scheduleDailyReminder(context: Context?) {
-            if (context == null) return
-            val prefs = PreferenceManager.getDefaultSharedPreferences(context)
-            if (prefs.getBoolean("use_reminder", false)) {
-                val timeval = prefs.getString("reminder_time", "19:00")
-
-                val pieces =
-                    timeval?.split(":".toRegex())?.dropLastWhile { it.isEmpty() }?.toTypedArray()
-                        ?: return
-                val hour = Integer.parseInt(pieces[0])
-                val minute = Integer.parseInt(pieces[1])
-                val cal = Calendar.getInstance()
-                cal.set(Calendar.HOUR_OF_DAY, hour)
-                cal.set(Calendar.MINUTE, minute)
-                cal.set(Calendar.SECOND, 0)
-                if (cal.timeInMillis < Date().time) {
-                    cal.set(Calendar.DAY_OF_YEAR, cal.get(Calendar.DAY_OF_YEAR) + 1)
-                }
-                val triggerTime = cal.timeInMillis
-
-                val notificationIntent = Intent(context, NotificationPublisher::class.java)
-                notificationIntent.putExtra(NotificationPublisher.NOTIFICATION_ID, 1)
-                notificationIntent.putExtra(NotificationPublisher.CHECK_DAILIES, false)
-
-                val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as? AlarmManager
-                val previousSender = PendingIntent.getBroadcast(
-                    context,
-                    0,
-                    notificationIntent,
-                    withImmutableFlag(PendingIntent.FLAG_NO_CREATE)
-                )
-                if (previousSender != null) {
-                    previousSender.cancel()
-                    alarmManager?.cancel(previousSender)
-                }
-
-                val pendingIntent = PendingIntent.getBroadcast(
-                    context,
-                    0,
-                    notificationIntent,
-                    withImmutableFlag(PendingIntent.FLAG_UPDATE_CURRENT)
-                )
-
-                setAlarm(context, triggerTime, pendingIntent)
-            }
-        }
-
-        fun removeDailyReminder(context: Context?) {
-            val notificationIntent = Intent(context, NotificationPublisher::class.java)
-            val alarmManager = context?.getSystemService(Context.ALARM_SERVICE) as? AlarmManager
-            val displayIntent =
-                PendingIntent.getBroadcast(context, 0, notificationIntent, withImmutableFlag(0))
-            alarmManager?.cancel(displayIntent)
-        }
-
-        private fun setAlarm(context: Context, time: Long, pendingIntent: PendingIntent?) {
-            HLogger.log(LogLevel.INFO, "TaskAlarmManager", "Scheduling for $time")
-            val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as? AlarmManager
-
-            if (pendingIntent == null) {
-                return
-            }
-
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                // For SDK >= Android 12, allows batching of reminders
-                try {
-                    alarmManager?.setAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, time, pendingIntent)
-                    Log.d("TaskAlarmManager", "setAlarm: Scheduling for $time using setAndAllowWhileIdle")
-                } catch (ex: Exception) {
-                    when (ex) {
-                        is IllegalStateException, is SecurityException -> {
-                            alarmManager?.setWindow(AlarmManager.RTC_WAKEUP, time, 600000, pendingIntent)
-                        }
-                        else -> {
-                            throw ex
-                        }
-
-                    }
-                }
-            } else {
-                alarmManager?.setWindow(AlarmManager.RTC_WAKEUP, time, 600000, pendingIntent)
-            }
-        }
-    }
-}
+package com.habitrpg.android.habitica.helpers
+
+import android.app.AlarmManager
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import android.util.Log
+import androidx.preference.PreferenceManager
+import com.habitrpg.android.habitica.data.TaskRepository
+import com.habitrpg.android.habitica.extensions.withImmutableFlag
+import com.habitrpg.android.habitica.models.tasks.RemindersItem
+import com.habitrpg.android.habitica.models.tasks.Task
+import com.habitrpg.android.habitica.modules.AuthenticationHandler
+import com.habitrpg.android.habitica.receivers.NotificationPublisher
+import com.habitrpg.android.habitica.receivers.TaskReceiver
+import com.habitrpg.common.habitica.helpers.ExceptionHandler
+import com.habitrpg.shared.habitica.HLogger
+import com.habitrpg.shared.habitica.LogLevel
+import com.habitrpg.shared.habitica.models.tasks.TaskType
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.launch
+import java.time.DateTimeException
+import java.time.ZoneId
+import java.time.ZonedDateTime
+import java.time.format.DateTimeFormatter
+import java.util.Calendar
+import java.util.Date
+
+class TaskAlarmManager(
+    private var context: Context,
+    private var taskRepository: TaskRepository,
+    private var authenticationHandler: AuthenticationHandler,
+) {
+    private val am: AlarmManager? = context.getSystemService(Context.ALARM_SERVICE) as? AlarmManager
+    private val upcomingReminderOccurrencesToSchedule = 3
+
+    /**
+     * Schedules multiple alarms for each reminder associated with a given task.
+     *
+     * This method iterates through all reminders of a task and schedules multiple upcoming alarms for each.
+     * It determines the upcoming reminder times based on the reminder's configuration (like frequency, repeat days, etc.)
+     * and schedules an alarm for each of these times.
+     *
+     * For each reminder, it updates the reminder's time to each upcoming occurrence and then calls
+     * `setAlarmForRemindersItem` to handle the actual alarm scheduling. This ensures that each reminder
+     * is scheduled accurately according to its specified rules and times.
+     *
+     * This method is particularly useful for reminders that need to be repeated at regular intervals
+     * (e.g., daily, weekly) or on specific days, as it schedules multiple occurrences in advance.
+     *
+     * @param task The task for which the alarms are being set. Each reminder in the task's reminder list
+     *             is processed to schedule the upcoming alarms.
+     */
+    private fun setAlarmsForTask(task: Task) {
+        CoroutineScope(Dispatchers.IO).launch {
+            val reminderOccurencesToSchedule =
+                if (task.type == TaskType.TODO) {
+                    1
+                } else {
+                    // For dailies, we schedule multiple reminders in advance
+                    upcomingReminderOccurrencesToSchedule
+                }
+            task.reminders?.let { reminders ->
+                for (reminder in reminders) {
+                    try {
+                        val upcomingReminders =
+                            task.getNextReminderOccurrences(reminder, reminderOccurencesToSchedule)
+                        upcomingReminders?.forEachIndexed { index, reminderNextOccurrenceTime ->
+                            reminder?.time =
+                                reminderNextOccurrenceTime.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME)
+                            setAlarmForRemindersItem(task, reminder, index)
+                        }
+                    } catch (_: DateTimeException) {
+                        // code accidentally generated an invalid date
+                    }
+                }
+            }
+        }
+    }
+
+    fun removeAlarmsForTask(task: Task) {
+        CoroutineScope(Dispatchers.IO).launch {
+            task.reminders?.let { reminders ->
+                // Remove not only the immediate reminder, but also the next however many (upcomingReminderOccurrencesToSchedule) reminders
+                reminders.forEachIndexed { index, reminder ->
+                    removeAlarmForRemindersItem(reminder, index)
+                }
+            }
+        }
+    }
+
+    // This function is used from the TaskReceiver since we do not have access to the task
+    // We currently only use this function to schedule the next reminder for dailies
+    // We may be able to use repeating alarms instead of this in the future
+    fun addAlarmForTaskId(taskId: String) {
+        MainScope().launch(ExceptionHandler.coroutine()) {
+            val task =
+                taskRepository.getTaskCopy(taskId)
+                    .filter { task -> task.isValid && task.isManaged && TaskType.DAILY == task.type }
+                    .first()
+            setAlarmsForTask(task)
+        }
+    }
+
+    suspend fun scheduleAllSavedAlarms(preventDailyReminder: Boolean) {
+        val tasks = taskRepository.getTaskCopies().firstOrNull()
+        tasks?.forEach { this.setAlarmsForTask(it) }
+
+        if (!preventDailyReminder) {
+            scheduleDailyReminder(context)
+        }
+    }
+
+    fun scheduleAlarmsForTask(task: Task) {
+        setAlarmsForTask(task)
+    }
+
+    /**
+     * Schedules an alarm for a given reminder associated with a task.
+     *
+     * This method takes a task and its associated reminder item to schedule an alarm.
+     * It first checks if the reminder time is valid and not in the past. If the reminder time
+     * is valid, it prepares an intent for the alarm, uniquely identified by combining the reminder's ID
+     * and its scheduled time. This unique identifier ensures that each reminder occurrence is distinctly handled.
+     *
+     * If an alarm with the same identifier already exists, it is cancelled and replaced with the new one.
+     * This ensures that reminders are always up to date with their latest scheduled times.
+     *
+     * The alarm is scheduled to trigger at the exact time specified in the reminder. Upon triggering,
+     * it will send a broadcast to `TaskReceiver`, which should handle the reminder notification.
+     *
+     * @param reminderItemTask The task associated with the reminder.
+     * @param remindersItem The reminder item containing details like ID and the time for the reminder.
+     *                      If this is null, the method returns immediately without scheduling an alarm.
+     */
+    private fun setAlarmForRemindersItem(
+        reminderItemTask: Task,
+        remindersItem: RemindersItem?,
+        occurrenceIndex: Int,
+    ) {
+        if (remindersItem == null) return
+
+        val now = ZonedDateTime.now().withZoneSameLocal(ZoneId.systemDefault())?.toInstant()
+        val reminderZonedTime = remindersItem.getLocalZonedDateTimeInstant()
+
+        if (reminderZonedTime == null || reminderZonedTime.isBefore(now)) {
+            return
+        }
+
+        val intent = Intent(context, TaskReceiver::class.java)
+        intent.action = remindersItem.id
+        intent.putExtra(TASK_NAME_INTENT_KEY, reminderItemTask.text)
+        intent.putExtra(TASK_ID_INTENT_KEY, reminderItemTask.id)
+
+        // Create a unique identifier based on remindersItem.id and the occurrence index
+        val intentId = (remindersItem.id?.hashCode() ?: 0) + occurrenceIndex
+
+        // Cancel alarm if already exists
+        val previousSender =
+            PendingIntent.getBroadcast(
+                context,
+                intentId,
+                intent,
+                withImmutableFlag(PendingIntent.FLAG_NO_CREATE),
+            )
+        if (previousSender != null) {
+            previousSender.cancel()
+            am?.cancel(previousSender)
+        }
+
+        val sender =
+            PendingIntent.getBroadcast(
+                context,
+                intentId,
+                intent,
+                withImmutableFlag(PendingIntent.FLAG_CANCEL_CURRENT),
+            )
+
+        CoroutineScope(Dispatchers.IO).launch {
+            setAlarm(context, reminderZonedTime.toEpochMilli(), sender)
+        }
+    }
+
+    private fun removeAlarmForRemindersItem(
+        remindersItem: RemindersItem,
+        occurrenceIndex: Int? = null,
+    ) {
+        val intent = Intent(context, TaskReceiver::class.java)
+        intent.action = remindersItem.id
+        val intentId =
+            if (occurrenceIndex != null) {
+                (
+                    remindersItem.id?.hashCode()
+                        ?: (0 and 0xfffffff)
+                ) + occurrenceIndex
+            } else {
+                (
+                    remindersItem.id?.hashCode()
+                        ?: (0 and 0xfffffff)
+                )
+            }
+        val sender =
+            PendingIntent.getBroadcast(
+                context,
+                intentId,
+                intent,
+                withImmutableFlag(PendingIntent.FLAG_UPDATE_CURRENT),
+            )
+        val am = context.getSystemService(Context.ALARM_SERVICE) as? AlarmManager
+        sender.cancel()
+        am?.cancel(sender)
+    }
+
+    companion object {
+        const val TASK_ID_INTENT_KEY = "TASK_ID"
+        const val TASK_NAME_INTENT_KEY = "TASK_NAME"
+
+        fun scheduleDailyReminder(context: Context?) {
+            if (context == null) return
+            val prefs = PreferenceManager.getDefaultSharedPreferences(context)
+            if (prefs.getBoolean("use_reminder", false)) {
+                val timeval = prefs.getString("reminder_time", "19:00")
+
+                val pieces =
+                    timeval?.split(":".toRegex())?.dropLastWhile { it.isEmpty() }?.toTypedArray()
+                        ?: return
+                val hour = Integer.parseInt(pieces[0])
+                val minute = Integer.parseInt(pieces[1])
+                val cal = Calendar.getInstance()
+                cal.set(Calendar.HOUR_OF_DAY, hour)
+                cal.set(Calendar.MINUTE, minute)
+                cal.set(Calendar.SECOND, 0)
+                if (cal.timeInMillis < Date().time) {
+                    cal.set(Calendar.DAY_OF_YEAR, cal.get(Calendar.DAY_OF_YEAR) + 1)
+                }
+                val triggerTime = cal.timeInMillis
+
+                val notificationIntent = Intent(context, NotificationPublisher::class.java)
+                notificationIntent.putExtra(NotificationPublisher.NOTIFICATION_ID, 1)
+                notificationIntent.putExtra(NotificationPublisher.CHECK_DAILIES, false)
+
+                val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as? AlarmManager
+                val previousSender =
+                    PendingIntent.getBroadcast(
+                        context,
+                        0,
+                        notificationIntent,
+                        withImmutableFlag(PendingIntent.FLAG_NO_CREATE),
+                    )
+                if (previousSender != null) {
+                    previousSender.cancel()
+                    alarmManager?.cancel(previousSender)
+                }
+
+                val pendingIntent =
+                    PendingIntent.getBroadcast(
+                        context,
+                        0,
+                        notificationIntent,
+                        withImmutableFlag(PendingIntent.FLAG_UPDATE_CURRENT),
+                    )
+
+                setAlarm(context, triggerTime, pendingIntent)
+            }
+        }
+
+        fun removeDailyReminder(context: Context?) {
+            val notificationIntent = Intent(context, NotificationPublisher::class.java)
+            val alarmManager = context?.getSystemService(Context.ALARM_SERVICE) as? AlarmManager
+            val displayIntent =
+                PendingIntent.getBroadcast(context, 0, notificationIntent, withImmutableFlag(0))
+            alarmManager?.cancel(displayIntent)
+        }
+
+        private fun setAlarm(
+            context: Context,
+            time: Long,
+            pendingIntent: PendingIntent?,
+        ) {
+            HLogger.log(LogLevel.INFO, "TaskAlarmManager", "Scheduling for $time")
+            val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as? AlarmManager
+
+            if (pendingIntent == null) {
+                return
+            }
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                // For SDK >= Android 12, allows batching of reminders
+                try {
+                    alarmManager?.setAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, time, pendingIntent)
+                    Log.d(
+                        "TaskAlarmManager",
+                        "setAlarm: Scheduling for $time using setAndAllowWhileIdle",
+                    )
+                } catch (ex: Exception) {
+                    when (ex) {
+                        is IllegalStateException, is SecurityException -> {
+                            alarmManager?.setWindow(
+                                AlarmManager.RTC_WAKEUP,
+                                time,
+                                600000,
+                                pendingIntent,
+                            )
+                        }
+
+                        else -> {
+                            throw ex
+                        }
+                    }
+                }
+            } else {
+                alarmManager?.setWindow(AlarmManager.RTC_WAKEUP, time, 600000, pendingIntent)
+            }
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskDescriptionBuilder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskDescriptionBuilder.kt
index 46ee68fff..24863fd1a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskDescriptionBuilder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskDescriptionBuilder.kt
@@ -15,34 +15,38 @@ import java.util.Date
 import java.util.Locale
 
 class TaskDescriptionBuilder(private val context: Context) {
-
     fun describe(task: Task): String {
         return when (task.type) {
-            TaskType.HABIT -> context.getString(
-                R.string.habit_summary_description,
-                describeHabitDirections(task.up ?: false, task.down ?: false),
-                describeDifficulty(task.priority)
-            )
+            TaskType.HABIT ->
+                context.getString(
+                    R.string.habit_summary_description,
+                    describeHabitDirections(task.up ?: false, task.down ?: false),
+                    describeDifficulty(task.priority),
+                )
+
             TaskType.TODO -> {
                 if (task.dueDate != null) {
                     context.getString(
                         R.string.todo_summary_description_duedate,
                         describeDifficulty(task.priority),
-                        describeDate(task.dueDate!!)
+                        describeDate(task.dueDate!!),
                     )
                 } else {
                     context.getString(
                         R.string.todo_summary_description,
-                        describeDifficulty(task.priority)
+                        describeDifficulty(task.priority),
                     )
                 }
             }
-            TaskType.DAILY -> context.getString(
-                R.string.daily_summary_description,
-                describeDifficulty(task.priority),
-                describeRepeatInterval(task.frequency, task.everyX ?: 1),
-                describeRepeatDays(task)
-            )
+
+            TaskType.DAILY ->
+                context.getString(
+                    R.string.daily_summary_description,
+                    describeDifficulty(task.priority),
+                    describeRepeatInterval(task.frequency, task.everyX ?: 1),
+                    describeRepeatDays(task),
+                )
+
             else -> ""
         }
     }
@@ -59,48 +63,61 @@ class TaskDescriptionBuilder(private val context: Context) {
         }
         return when (task.frequency) {
             Frequency.WEEKLY -> {
-                " " + if (task.repeat?.isEveryDay == true) {
-                    context.getString(R.string.on_every_day_of_week)
-                } else {
-                    if (task.repeat?.isOnlyWeekdays == true) {
-                        context.getString(R.string.on_weekdays)
-                    } else if (task.repeat?.isOnlyWeekends == true) {
-                        context.getString(R.string.on_weekends)
+                " " +
+                    if (task.repeat?.isEveryDay == true) {
+                        context.getString(R.string.on_every_day_of_week)
                     } else {
-                        val dayStrings = task.repeat?.dayStrings(context) ?: listOf()
-                        joinToCount(dayStrings)
+                        if (task.repeat?.isOnlyWeekdays == true) {
+                            context.getString(R.string.on_weekdays)
+                        } else if (task.repeat?.isOnlyWeekends == true) {
+                            context.getString(R.string.on_weekends)
+                        } else {
+                            val dayStrings = task.repeat?.dayStrings(context) ?: listOf()
+                            joinToCount(dayStrings)
+                        }
                     }
-                }
             }
-            Frequency.MONTHLY -> {
-                " " + if (task.getDaysOfMonth()?.isNotEmpty() == true) {
-                    val dayList = task.getDaysOfMonth()?.map {
-                        withOrdinal(it)
-                    }
-                    context.getString(R.string.on_the_x, joinToCount(dayList))
-                } else if (task.getWeeksOfMonth()?.isNotEmpty() == true) {
-                    val occurrence = when (task.getWeeksOfMonth()?.first()) {
-                        0 -> context.getString(R.string.first)
-                        1 -> context.getString(R.string.second)
-                        2 -> context.getString(R.string.third)
-                        3 -> context.getString(R.string.fourth)
-                        4 -> context.getString(R.string.fifth)
-                        else -> return ""
-                    }
-                    val dayStrings = task.repeat?.dayStrings(context) ?: listOf()
 
-                    context.getString(R.string.on_the_x_of_month, occurrence, joinToCount(dayStrings))
-                } else {
-                    ""
-                }
+            Frequency.MONTHLY -> {
+                " " +
+                    if (task.getDaysOfMonth()?.isNotEmpty() == true) {
+                        val dayList =
+                            task.getDaysOfMonth()?.map {
+                                withOrdinal(it)
+                            }
+                        context.getString(R.string.on_the_x, joinToCount(dayList))
+                    } else if (task.getWeeksOfMonth()?.isNotEmpty() == true) {
+                        val occurrence =
+                            when (task.getWeeksOfMonth()?.first()) {
+                                0 -> context.getString(R.string.first)
+                                1 -> context.getString(R.string.second)
+                                2 -> context.getString(R.string.third)
+                                3 -> context.getString(R.string.fourth)
+                                4 -> context.getString(R.string.fifth)
+                                else -> return ""
+                            }
+                        val dayStrings = task.repeat?.dayStrings(context) ?: listOf()
+
+                        context.getString(
+                            R.string.on_the_x_of_month,
+                            occurrence,
+                            joinToCount(dayStrings),
+                        )
+                    } else {
+                        ""
+                    }
             }
-            Frequency.YEARLY -> " " + context.getString(
-                R.string.on_x,
-                task.startDate?.let {
-                    val flags = DateUtils.FORMAT_SHOW_DATE + DateUtils.FORMAT_NO_YEAR
-                    DateUtils.formatDateTime(context, it.time, flags)
-                } ?: ""
-            )
+
+            Frequency.YEARLY ->
+                " " +
+                    context.getString(
+                        R.string.on_x,
+                        task.startDate?.let {
+                            val flags = DateUtils.FORMAT_SHOW_DATE + DateUtils.FORMAT_NO_YEAR
+                            DateUtils.formatDateTime(context, it.time, flags)
+                        } ?: "",
+                    )
+
             else -> ""
         }
     }
@@ -121,24 +138,50 @@ class TaskDescriptionBuilder(private val context: Context) {
         }
     }
 
-    private fun describeRepeatInterval(interval: Frequency?, everyX: Int): String {
+    private fun describeRepeatInterval(
+        interval: Frequency?,
+        everyX: Int,
+    ): String {
         if (everyX == 0) {
             return context.getString(R.string.never)
         }
         return when (interval) {
-            Frequency.DAILY -> context.resources.getQuantityString(R.plurals.repeat_daily, everyX, everyX)
-            Frequency.WEEKLY -> context.resources.getQuantityString(R.plurals.repeat_weekly, everyX, everyX)
-            Frequency.MONTHLY -> context.resources.getQuantityString(
-                R.plurals.repeat_monthly,
-                everyX,
-                everyX
-            )
-            Frequency.YEARLY -> context.resources.getQuantityString(R.plurals.repeat_yearly, everyX, everyX)
+            Frequency.DAILY ->
+                context.resources.getQuantityString(
+                    R.plurals.repeat_daily,
+                    everyX,
+                    everyX,
+                )
+
+            Frequency.WEEKLY ->
+                context.resources.getQuantityString(
+                    R.plurals.repeat_weekly,
+                    everyX,
+                    everyX,
+                )
+
+            Frequency.MONTHLY ->
+                context.resources.getQuantityString(
+                    R.plurals.repeat_monthly,
+                    everyX,
+                    everyX,
+                )
+
+            Frequency.YEARLY ->
+                context.resources.getQuantityString(
+                    R.plurals.repeat_yearly,
+                    everyX,
+                    everyX,
+                )
+
             null -> ""
         }
     }
 
-    private fun describeHabitDirections(up: Boolean, down: Boolean): String {
+    private fun describeHabitDirections(
+        up: Boolean,
+        down: Boolean,
+    ): String {
         return if (up && down) {
             context.getString(R.string.positive_and_negative)
         } else if (up) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/UserStatComputer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/UserStatComputer.kt
index e78170026..4d63049ff 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/UserStatComputer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/UserStatComputer.kt
@@ -1,142 +1,149 @@
-package com.habitrpg.android.habitica.helpers
-
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.models.inventory.Equipment
-import com.habitrpg.android.habitica.models.user.Stats
-import com.habitrpg.shared.habitica.models.Avatar
-
-class UserStatComputer {
-
-    interface StatsRow
-
-    inner class AttributeRow : StatsRow {
-        var labelId: Int = 0
-        var strVal: Float = 0.toFloat()
-        var intVal: Float = 0.toFloat()
-        var conVal: Float = 0.toFloat()
-        var perVal: Float = 0.toFloat()
-        var roundDown: Boolean = false
-        var summary: Boolean = false
-    }
-
-    inner class EquipmentRow : StatsRow {
-        var gearKey: String? = null
-        var text: String? = null
-        var stats: String? = null
-    }
-
-    fun computeClassBonus(equipmentList: List<Equipment>?, user: Avatar): List<StatsRow> {
-        val skillRows = ArrayList<StatsRow>()
-
-        var strAttributes = 0f
-        var intAttributes = 0f
-        var conAttributes = 0f
-        var perAttributes = 0f
-
-        var strClassBonus = 0f
-        var intClassBonus = 0f
-        var conClassBonus = 0f
-        var perClassBonus = 0f
-
-        // Summarize stats and fill equipment table
-        for (i in equipmentList ?: emptyList()) {
-            val strength = i.str
-            val intelligence = i._int
-            val constitution = i.con
-            val perception = i.per
-
-            strAttributes += strength.toFloat()
-            intAttributes += intelligence.toFloat()
-            conAttributes += constitution.toFloat()
-            perAttributes += perception.toFloat()
-
-            val sb = StringBuilder()
-
-            if (strength != 0) {
-                sb.append("STR ").append(strength).append(", ")
-            }
-            if (intelligence != 0) {
-                sb.append("INT ").append(intelligence).append(", ")
-            }
-            if (constitution != 0) {
-                sb.append("CON ").append(constitution).append(", ")
-            }
-            if (perception != 0) {
-                sb.append("PER ").append(perception).append(", ")
-            }
-
-            // remove the last comma
-            if (sb.length > 2) {
-                sb.delete(sb.length - 2, sb.length)
-            }
-
-            val equipmentRow = EquipmentRow()
-            equipmentRow.gearKey = i.key
-            equipmentRow.text = i.text
-            equipmentRow.stats = sb.toString()
-            skillRows.add(equipmentRow)
-
-            // Calculate class bonus
-            var itemClass: String? = i.klass
-            val itemSpecialClass = i.specialClass
-
-            val classDoesNotExist = itemClass.isNullOrEmpty()
-            val specialClassDoesNotExist = itemSpecialClass.isEmpty()
-
-            if (classDoesNotExist && specialClassDoesNotExist) {
-                continue
-            }
-
-            var classBonus = 0.5f
-            val userClassMatchesGearClass = !classDoesNotExist && itemClass == user.stats?.habitClass
-            val userClassMatchesGearSpecialClass = !specialClassDoesNotExist && itemSpecialClass == user.stats?.habitClass
-
-            if (!userClassMatchesGearClass && !userClassMatchesGearSpecialClass) classBonus = 0f
-
-            if (itemClass.isNullOrEmpty() || itemClass == "special") {
-                itemClass = itemSpecialClass
-            }
-
-            when (itemClass) {
-                Stats.ROGUE -> {
-                    strClassBonus += strength * classBonus
-                    perClassBonus += perception * classBonus
-                }
-                Stats.HEALER -> {
-                    conClassBonus += constitution * classBonus
-                    intClassBonus += intelligence * classBonus
-                }
-                Stats.WARRIOR -> {
-                    strClassBonus += strength * classBonus
-                    conClassBonus += constitution * classBonus
-                }
-                Stats.MAGE -> {
-                    intClassBonus += intelligence * classBonus
-                    perClassBonus += perception * classBonus
-                }
-            }
-        }
-
-        val attributeRow = AttributeRow()
-        attributeRow.labelId = R.string.battle_gear
-        attributeRow.strVal = strAttributes
-        attributeRow.intVal = intAttributes
-        attributeRow.conVal = conAttributes
-        attributeRow.perVal = perAttributes
-        attributeRow.roundDown = true
-        attributeRow.summary = false
-        skillRows.add(attributeRow)
-
-        val attributeRow2 = AttributeRow()
-        attributeRow2.labelId = R.string.profile_class_bonus
-        attributeRow2.strVal = strClassBonus
-        attributeRow2.intVal = intClassBonus
-        attributeRow2.conVal = conClassBonus
-        attributeRow2.perVal = perClassBonus
-        attributeRow2.roundDown = false
-        attributeRow2.summary = false
-        skillRows.add(attributeRow2)
-
-        return skillRows
-    }
-}
+package com.habitrpg.android.habitica.helpers
+
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.models.inventory.Equipment
+import com.habitrpg.android.habitica.models.user.Stats
+import com.habitrpg.shared.habitica.models.Avatar
+
+class UserStatComputer {
+    interface StatsRow
+
+    inner class AttributeRow : StatsRow {
+        var labelId: Int = 0
+        var strVal: Float = 0.toFloat()
+        var intVal: Float = 0.toFloat()
+        var conVal: Float = 0.toFloat()
+        var perVal: Float = 0.toFloat()
+        var roundDown: Boolean = false
+        var summary: Boolean = false
+    }
+
+    inner class EquipmentRow : StatsRow {
+        var gearKey: String? = null
+        var text: String? = null
+        var stats: String? = null
+    }
+
+    fun computeClassBonus(
+        equipmentList: List<Equipment>?,
+        user: Avatar,
+    ): List<StatsRow> {
+        val skillRows = ArrayList<StatsRow>()
+
+        var strAttributes = 0f
+        var intAttributes = 0f
+        var conAttributes = 0f
+        var perAttributes = 0f
+
+        var strClassBonus = 0f
+        var intClassBonus = 0f
+        var conClassBonus = 0f
+        var perClassBonus = 0f
+
+        // Summarize stats and fill equipment table
+        for (i in equipmentList ?: emptyList()) {
+            val strength = i.str
+            val intelligence = i.intelligence
+            val constitution = i.con
+            val perception = i.per
+
+            strAttributes += strength.toFloat()
+            intAttributes += intelligence.toFloat()
+            conAttributes += constitution.toFloat()
+            perAttributes += perception.toFloat()
+
+            val sb = StringBuilder()
+
+            if (strength != 0) {
+                sb.append("STR ").append(strength).append(", ")
+            }
+            if (intelligence != 0) {
+                sb.append("INT ").append(intelligence).append(", ")
+            }
+            if (constitution != 0) {
+                sb.append("CON ").append(constitution).append(", ")
+            }
+            if (perception != 0) {
+                sb.append("PER ").append(perception).append(", ")
+            }
+
+            // remove the last comma
+            if (sb.length > 2) {
+                sb.delete(sb.length - 2, sb.length)
+            }
+
+            val equipmentRow = EquipmentRow()
+            equipmentRow.gearKey = i.key
+            equipmentRow.text = i.text
+            equipmentRow.stats = sb.toString()
+            skillRows.add(equipmentRow)
+
+            // Calculate class bonus
+            var itemClass: String? = i.klass
+            val itemSpecialClass = i.specialClass
+
+            val classDoesNotExist = itemClass.isNullOrEmpty()
+            val specialClassDoesNotExist = itemSpecialClass.isEmpty()
+
+            if (classDoesNotExist && specialClassDoesNotExist) {
+                continue
+            }
+
+            var classBonus = 0.5f
+            val userClassMatchesGearClass =
+                !classDoesNotExist && itemClass == user.stats?.habitClass
+            val userClassMatchesGearSpecialClass =
+                !specialClassDoesNotExist && itemSpecialClass == user.stats?.habitClass
+
+            if (!userClassMatchesGearClass && !userClassMatchesGearSpecialClass) classBonus = 0f
+
+            if (itemClass.isNullOrEmpty() || itemClass == "special") {
+                itemClass = itemSpecialClass
+            }
+
+            when (itemClass) {
+                Stats.ROGUE -> {
+                    strClassBonus += strength * classBonus
+                    perClassBonus += perception * classBonus
+                }
+
+                Stats.HEALER -> {
+                    conClassBonus += constitution * classBonus
+                    intClassBonus += intelligence * classBonus
+                }
+
+                Stats.WARRIOR -> {
+                    strClassBonus += strength * classBonus
+                    conClassBonus += constitution * classBonus
+                }
+
+                Stats.MAGE -> {
+                    intClassBonus += intelligence * classBonus
+                    perClassBonus += perception * classBonus
+                }
+            }
+        }
+
+        val attributeRow = AttributeRow()
+        attributeRow.labelId = R.string.battle_gear
+        attributeRow.strVal = strAttributes
+        attributeRow.intVal = intAttributes
+        attributeRow.conVal = conAttributes
+        attributeRow.perVal = perAttributes
+        attributeRow.roundDown = true
+        attributeRow.summary = false
+        skillRows.add(attributeRow)
+
+        val attributeRow2 = AttributeRow()
+        attributeRow2.labelId = R.string.profile_class_bonus
+        attributeRow2.strVal = strClassBonus
+        attributeRow2.intVal = intClassBonus
+        attributeRow2.conVal = conClassBonus
+        attributeRow2.perVal = perClassBonus
+        attributeRow2.roundDown = false
+        attributeRow2.summary = false
+        skillRows.add(attributeRow2)
+
+        return skillRows
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ChangeUsernameLocalNotification.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ChangeUsernameLocalNotification.kt
index e8ee92022..140d86f61 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ChangeUsernameLocalNotification.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ChangeUsernameLocalNotification.kt
@@ -2,4 +2,5 @@ package com.habitrpg.android.habitica.helpers.notifications
 
 import android.content.Context
 
-class ChangeUsernameLocalNotification(context: Context, identifier: String?) : HabiticaLocalNotification(context, identifier)
+class ChangeUsernameLocalNotification(context: Context, identifier: String?) :
+    HabiticaLocalNotification(context, identifier)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ChatMentionNotification.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ChatMentionNotification.kt
index 6641b23e5..1c73b48a2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ChatMentionNotification.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ChatMentionNotification.kt
@@ -4,12 +4,13 @@ import android.content.Context
 import android.content.Intent
 import androidx.core.app.NotificationCompat
 
-class ChatMentionNotification(context: Context, identifier: String?) : HabiticaLocalNotification(context, identifier) {
-
+class ChatMentionNotification(context: Context, identifier: String?) :
+    HabiticaLocalNotification(context, identifier) {
     override fun configureNotificationBuilder(data: MutableMap<String, String>): NotificationCompat.Builder {
-        val style = NotificationCompat.BigTextStyle()
-            .setBigContentTitle(title)
-            .bigText(message)
+        val style =
+            NotificationCompat.BigTextStyle()
+                .setBigContentTitle(title)
+                .bigText(message)
         return super.configureNotificationBuilder(data)
             .setStyle(style)
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/GenericLocalNotification.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/GenericLocalNotification.kt
index ee768552d..1883ba9e2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/GenericLocalNotification.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/GenericLocalNotification.kt
@@ -2,4 +2,5 @@ package com.habitrpg.android.habitica.helpers.notifications
 
 import android.content.Context
 
-class GenericLocalNotification(context: Context, identifier: String?) : HabiticaLocalNotification(context, identifier)
+class GenericLocalNotification(context: Context, identifier: String?) :
+    HabiticaLocalNotification(context, identifier)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/GiftOneGetOneLocalNotification.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/GiftOneGetOneLocalNotification.kt
index a14ab5e28..4a4203bb5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/GiftOneGetOneLocalNotification.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/GiftOneGetOneLocalNotification.kt
@@ -2,4 +2,5 @@ package com.habitrpg.android.habitica.helpers.notifications
 
 import android.content.Context
 
-class GiftOneGetOneLocalNotification(context: Context, identifier: String?) : HabiticaLocalNotification(context, identifier)
+class GiftOneGetOneLocalNotification(context: Context, identifier: String?) :
+    HabiticaLocalNotification(context, identifier)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/GroupActivityNotification.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/GroupActivityNotification.kt
index b116c872f..d886ee113 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/GroupActivityNotification.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/GroupActivityNotification.kt
@@ -18,8 +18,8 @@ import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
 
-class GroupActivityNotification(context: Context, identifier: String?) : HabiticaLocalNotification(context, identifier) {
-
+class GroupActivityNotification(context: Context, identifier: String?) :
+    HabiticaLocalNotification(context, identifier) {
     override fun getNotificationID(data: MutableMap<String, String>): Int {
         return data["groupID"].hashCode()
     }
@@ -27,17 +27,22 @@ class GroupActivityNotification(context: Context, identifier: String?) : Habitic
     override fun configureNotificationBuilder(data: MutableMap<String, String>): NotificationCompat.Builder {
         val user = Person.Builder().setName("You").build()
         val message = makeMessageFromData(data)
-        var style = NotificationCompat.MessagingStyle(user)
-            .setGroupConversation(true)
-            .setConversationTitle(data["groupName"])
+        var style =
+            NotificationCompat.MessagingStyle(user)
+                .setGroupConversation(true)
+                .setConversationTitle(data["groupName"])
 
-        val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as? NotificationManager
-        val existingNotifications = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            notificationManager?.activeNotifications?.filter { it.id == getNotificationID(data) }
-        } else {
-            null
-        }
-        val oldMessages = existingNotifications?.firstOrNull()?.notification?.extras?.getBundle("messages")?.get("messages") as? ArrayList<Map<String, String>> ?: arrayListOf()
+        val notificationManager =
+            context.getSystemService(Context.NOTIFICATION_SERVICE) as? NotificationManager
+        val existingNotifications =
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                notificationManager?.activeNotifications?.filter { it.id == getNotificationID(data) }
+            } else {
+                null
+            }
+        val oldMessages =
+            existingNotifications?.firstOrNull()?.notification?.extras?.getBundle("messages")
+                ?.get("messages") as? ArrayList<Map<String, String>> ?: arrayListOf()
         for (oldMessage in oldMessages) {
             style = style.addMessage(makeMessageFromData(oldMessage))
         }
@@ -57,20 +62,24 @@ class GroupActivityNotification(context: Context, identifier: String?) : Habitic
         return NotificationCompat.MessagingStyle.Message(
             messageText,
             timestamp.time,
-            sender
+            sender,
         )
     }
 
-    override fun setNotificationActions(notificationId: Int, data: Map<String, String>) {
+    override fun setNotificationActions(
+        notificationId: Int,
+        data: Map<String, String>,
+    ) {
         super.setNotificationActions(notificationId, data)
         val groupID = data["groupID"] ?: return
 
         val actionName = context.getString(R.string.group_message_reply)
         val replyLabel: String = context.getString(R.string.reply)
-        val remoteInput: RemoteInput = RemoteInput.Builder(actionName).run {
-            setLabel(replyLabel)
-            build()
-        }
+        val remoteInput: RemoteInput =
+            RemoteInput.Builder(actionName).run {
+                setLabel(replyLabel)
+                build()
+            }
         val intent = Intent(context, LocalNotificationActionReceiver::class.java)
         intent.action = actionName
         intent.putExtra("groupID", groupID)
@@ -80,14 +89,14 @@ class GroupActivityNotification(context: Context, identifier: String?) : Habitic
                 context,
                 groupID.hashCode(),
                 intent,
-                withMutableFlag(PendingIntent.FLAG_UPDATE_CURRENT)
+                withMutableFlag(PendingIntent.FLAG_UPDATE_CURRENT),
             )
 
         val action: NotificationCompat.Action =
             NotificationCompat.Action.Builder(
                 R.drawable.ic_send_grey_600_24dp,
                 context.getString(R.string.reply),
-                replyPendingIntent
+                replyPendingIntent,
             )
                 .addRemoteInput(remoteInput)
                 .build()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/GuildInviteLocalNotification.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/GuildInviteLocalNotification.kt
index 802c03e32..1ed419c60 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/GuildInviteLocalNotification.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/GuildInviteLocalNotification.kt
@@ -10,14 +10,17 @@ import com.habitrpg.android.habitica.receivers.LocalNotificationActionReceiver
 /**
  * Created by keithholliday on 7/1/16.
  */
-class GuildInviteLocalNotification(context: Context, identifier: String?) : HabiticaLocalNotification(context, identifier) {
-
+class GuildInviteLocalNotification(context: Context, identifier: String?) :
+    HabiticaLocalNotification(context, identifier) {
     override fun configureMainIntent(intent: Intent) {
         super.configureMainIntent(intent)
         intent.putExtra("groupID", data?.get("groupID"))
     }
 
-    override fun setNotificationActions(notificationId: Int, data: Map<String, String>) {
+    override fun setNotificationActions(
+        notificationId: Int,
+        data: Map<String, String>,
+    ) {
         super.setNotificationActions(notificationId, data)
         val res = context.resources
 
@@ -26,24 +29,26 @@ class GuildInviteLocalNotification(context: Context, identifier: String?) : Habi
         val groupID = data["groupID"]
         acceptInviteIntent.putExtra("groupID", groupID)
         acceptInviteIntent.putExtra("NOTIFICATION_ID", notificationId)
-        val pendingIntentAccept = PendingIntent.getBroadcast(
-            context,
-            groupID.hashCode(),
-            acceptInviteIntent,
-            withImmutableFlag(PendingIntent.FLAG_UPDATE_CURRENT)
-        )
+        val pendingIntentAccept =
+            PendingIntent.getBroadcast(
+                context,
+                groupID.hashCode(),
+                acceptInviteIntent,
+                withImmutableFlag(PendingIntent.FLAG_UPDATE_CURRENT),
+            )
         notificationBuilder.addAction(0, "Accept", pendingIntentAccept)
 
         val rejectInviteIntent = Intent(context, LocalNotificationActionReceiver::class.java)
         rejectInviteIntent.action = res.getString(R.string.reject_guild_invite)
         rejectInviteIntent.putExtra("groupID", groupID)
         acceptInviteIntent.putExtra("NOTIFICATION_ID", notificationId)
-        val pendingIntentReject = PendingIntent.getBroadcast(
-            context,
-            groupID.hashCode() + 1,
-            rejectInviteIntent,
-            withImmutableFlag(PendingIntent.FLAG_UPDATE_CURRENT)
-        )
+        val pendingIntentReject =
+            PendingIntent.getBroadcast(
+                context,
+                groupID.hashCode() + 1,
+                rejectInviteIntent,
+                withImmutableFlag(PendingIntent.FLAG_UPDATE_CURRENT),
+            )
         notificationBuilder.addAction(0, "Reject", pendingIntentReject)
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaFirebaseMessagingService.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaFirebaseMessagingService.kt
index 7be4c1ef3..2616207fc 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaFirebaseMessagingService.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaFirebaseMessagingService.kt
@@ -1,28 +1,27 @@
-package com.habitrpg.android.habitica.helpers.notifications
-
-import com.google.firebase.messaging.FirebaseMessaging
-import com.google.firebase.messaging.FirebaseMessagingService
-import com.google.firebase.messaging.RemoteMessage
-import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class HabiticaFirebaseMessagingService : FirebaseMessagingService() {
-
-    @Inject
-    internal lateinit var pushNotificationManager: PushNotificationManager
-
-    override fun onMessageReceived(remoteMessage: RemoteMessage) {
-        PushNotificationManager.displayNotification(remoteMessage, applicationContext)
-    }
-
-    override fun onNewToken(s: String) {
-        super.onNewToken(s)
-        FirebaseMessaging.getInstance().token.addOnCompleteListener { task ->
-            val refreshedToken = task.result
-            if (refreshedToken != null && this::pushNotificationManager.isInitialized) {
-                pushNotificationManager.refreshedToken = refreshedToken
-            }
-        }
-    }
-}
+package com.habitrpg.android.habitica.helpers.notifications
+
+import com.google.firebase.messaging.FirebaseMessaging
+import com.google.firebase.messaging.FirebaseMessagingService
+import com.google.firebase.messaging.RemoteMessage
+import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class HabiticaFirebaseMessagingService : FirebaseMessagingService() {
+    @Inject
+    internal lateinit var pushNotificationManager: PushNotificationManager
+
+    override fun onMessageReceived(remoteMessage: RemoteMessage) {
+        PushNotificationManager.displayNotification(remoteMessage, applicationContext)
+    }
+
+    override fun onNewToken(s: String) {
+        super.onNewToken(s)
+        FirebaseMessaging.getInstance().token.addOnCompleteListener { task ->
+            val refreshedToken = task.result
+            if (refreshedToken != null && this::pushNotificationManager.isInitialized) {
+                pushNotificationManager.refreshedToken = refreshedToken
+            }
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotification.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotification.kt
index 74ec4507d..4b77af004 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotification.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotification.kt
@@ -18,16 +18,16 @@ import java.util.Date
  */
 abstract class HabiticaLocalNotification(
     protected var context: Context,
-    protected var identifier: String?
+    protected var identifier: String?,
 ) {
-
     protected var data: Map<String, String>? = null
     protected var title: String? = null
     protected var message: String? = null
 
-    protected var notificationBuilder = NotificationCompat.Builder(context, "default")
-        .setSmallIcon(R.drawable.ic_gryphon_white)
-        .setAutoCancel(true)
+    protected var notificationBuilder =
+        NotificationCompat.Builder(context, "default")
+            .setSmallIcon(R.drawable.ic_gryphon_white)
+            .setAutoCancel(true)
 
     open fun configureNotificationBuilder(data: MutableMap<String, String>): NotificationCompat.Builder {
         val path = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION)
@@ -37,7 +37,11 @@ abstract class HabiticaLocalNotification(
     }
 
     @CallSuper
-    open fun notifyLocally(title: String?, message: String?, data: MutableMap<String, String>) {
+    open fun notifyLocally(
+        title: String?,
+        message: String?,
+        data: MutableMap<String, String>,
+    ) {
         this.title = title
         this.message = message
 
@@ -65,16 +69,20 @@ abstract class HabiticaLocalNotification(
         this.data = data
     }
 
-    protected open fun setNotificationActions(notificationId: Int, data: Map<String, String>) {
+    protected open fun setNotificationActions(
+        notificationId: Int,
+        data: Map<String, String>,
+    ) {
         val intent = Intent(context, MainActivity::class.java)
         configureMainIntent(intent)
         intent.putExtra("NOTIFICATION_ID", notificationId)
-        val pendingIntent = PendingIntent.getActivity(
-            context,
-            3000,
-            intent,
-            withImmutableFlag(PendingIntent.FLAG_UPDATE_CURRENT)
-        )
+        val pendingIntent =
+            PendingIntent.getActivity(
+                context,
+                3000,
+                intent,
+                withImmutableFlag(PendingIntent.FLAG_UPDATE_CURRENT),
+            )
         notificationBuilder.setContentIntent(pendingIntent)
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotificationFactory.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotificationFactory.kt
index f45e3e122..4c4f242a8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotificationFactory.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotificationFactory.kt
@@ -4,44 +4,95 @@ import android.content.Context
 
 class HabiticaLocalNotificationFactory {
     // use getShape method to get object of type shape
-    fun build(notificationType: String?, context: Context?): HabiticaLocalNotification {
+    fun build(
+        notificationType: String?,
+        context: Context?,
+    ): HabiticaLocalNotification {
         return when {
-            PushNotificationManager.PARTY_INVITE_PUSH_NOTIFICATION_KEY.equals(notificationType, true) -> {
+            PushNotificationManager.PARTY_INVITE_PUSH_NOTIFICATION_KEY.equals(
+                notificationType,
+                true,
+            ) -> {
                 PartyInviteLocalNotification(context!!, notificationType)
             }
-            PushNotificationManager.RECEIVED_PRIVATE_MESSAGE_PUSH_NOTIFICATION_KEY.equals(notificationType, true) -> {
+
+            PushNotificationManager.RECEIVED_PRIVATE_MESSAGE_PUSH_NOTIFICATION_KEY.equals(
+                notificationType,
+                true,
+            ) -> {
                 ReceivedPrivateMessageLocalNotification(context!!, notificationType)
             }
-            PushNotificationManager.RECEIVED_GEMS_PUSH_NOTIFICATION_KEY.equals(notificationType, true) -> {
+
+            PushNotificationManager.RECEIVED_GEMS_PUSH_NOTIFICATION_KEY.equals(
+                notificationType,
+                true,
+            ) -> {
                 ReceivedGemsGiftLocalNotification(context!!, notificationType)
             }
-            PushNotificationManager.RECEIVED_SUBSCRIPTION_GIFT_PUSH_NOTIFICATION_KEY.equals(notificationType, true) -> {
+
+            PushNotificationManager.RECEIVED_SUBSCRIPTION_GIFT_PUSH_NOTIFICATION_KEY.equals(
+                notificationType,
+                true,
+            ) -> {
                 ReceivedSubscriptionGiftLocalNotification(context!!, notificationType)
             }
-            PushNotificationManager.GUILD_INVITE_PUSH_NOTIFICATION_KEY.equals(notificationType, true) -> {
+
+            PushNotificationManager.GUILD_INVITE_PUSH_NOTIFICATION_KEY.equals(
+                notificationType,
+                true,
+            ) -> {
                 GuildInviteLocalNotification(context!!, notificationType)
             }
-            PushNotificationManager.QUEST_INVITE_PUSH_NOTIFICATION_KEY.equals(notificationType, true) -> {
+
+            PushNotificationManager.QUEST_INVITE_PUSH_NOTIFICATION_KEY.equals(
+                notificationType,
+                true,
+            ) -> {
                 QuestInviteLocalNotification(context!!, notificationType)
             }
-            PushNotificationManager.QUEST_BEGUN_PUSH_NOTIFICATION_KEY.equals(notificationType, true) -> {
+
+            PushNotificationManager.QUEST_BEGUN_PUSH_NOTIFICATION_KEY.equals(
+                notificationType,
+                true,
+            ) -> {
                 QuestBegunLocalNotification(context!!, notificationType)
             }
-            PushNotificationManager.WON_CHALLENGE_PUSH_NOTIFICATION_KEY.equals(notificationType, true) -> {
+
+            PushNotificationManager.WON_CHALLENGE_PUSH_NOTIFICATION_KEY.equals(
+                notificationType,
+                true,
+            ) -> {
                 WonChallengeLocalNotification(context!!, notificationType)
             }
-            PushNotificationManager.CHANGE_USERNAME_PUSH_NOTIFICATION_KEY.equals(notificationType, true) -> {
+
+            PushNotificationManager.CHANGE_USERNAME_PUSH_NOTIFICATION_KEY.equals(
+                notificationType,
+                true,
+            ) -> {
                 ChangeUsernameLocalNotification(context!!, notificationType)
             }
-            PushNotificationManager.GIFT_ONE_GET_ONE_PUSH_NOTIFICATION_KEY.equals(notificationType, true) -> {
+
+            PushNotificationManager.GIFT_ONE_GET_ONE_PUSH_NOTIFICATION_KEY.equals(
+                notificationType,
+                true,
+            ) -> {
                 GiftOneGetOneLocalNotification(context!!, notificationType)
             }
-            PushNotificationManager.CHAT_MENTION_NOTIFICATION_KEY.equals(notificationType, true) -> {
+
+            PushNotificationManager.CHAT_MENTION_NOTIFICATION_KEY.equals(
+                notificationType,
+                true,
+            ) -> {
                 ChatMentionNotification(context!!, notificationType)
             }
-            PushNotificationManager.GROUP_ACTIVITY_NOTIFICATION_KEY.equals(notificationType, true) -> {
+
+            PushNotificationManager.GROUP_ACTIVITY_NOTIFICATION_KEY.equals(
+                notificationType,
+                true,
+            ) -> {
                 GroupActivityNotification(context!!, notificationType)
             }
+
             else -> {
                 GenericLocalNotification(context!!, notificationType)
             }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PartyInviteLocalNotification.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PartyInviteLocalNotification.kt
index 794a00419..8e98cf970 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PartyInviteLocalNotification.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PartyInviteLocalNotification.kt
@@ -10,9 +10,12 @@ import com.habitrpg.android.habitica.receivers.LocalNotificationActionReceiver
 /**
  * Created by keithholliday on 6/28/16.
  */
-class PartyInviteLocalNotification(context: Context, identifier: String?) : HabiticaLocalNotification(context, identifier) {
-
-    override fun setNotificationActions(notificationId: Int, data: Map<String, String>) {
+class PartyInviteLocalNotification(context: Context, identifier: String?) :
+    HabiticaLocalNotification(context, identifier) {
+    override fun setNotificationActions(
+        notificationId: Int,
+        data: Map<String, String>,
+    ) {
         super.setNotificationActions(notificationId, data)
         val res = context.resources
 
@@ -21,24 +24,26 @@ class PartyInviteLocalNotification(context: Context, identifier: String?) : Habi
         val groupID = data["groupID"]
         acceptInviteIntent.putExtra("groupID", groupID)
         acceptInviteIntent.putExtra("NOTIFICATION_ID", notificationId)
-        val pendingIntentAccept = PendingIntent.getBroadcast(
-            context,
-            groupID.hashCode(),
-            acceptInviteIntent,
-            withImmutableFlag(PendingIntent.FLAG_UPDATE_CURRENT)
-        )
+        val pendingIntentAccept =
+            PendingIntent.getBroadcast(
+                context,
+                groupID.hashCode(),
+                acceptInviteIntent,
+                withImmutableFlag(PendingIntent.FLAG_UPDATE_CURRENT),
+            )
         notificationBuilder.addAction(0, context.getString(R.string.accept), pendingIntentAccept)
 
         val rejectInviteIntent = Intent(context, LocalNotificationActionReceiver::class.java)
         rejectInviteIntent.action = res.getString(R.string.reject_party_invite)
         rejectInviteIntent.putExtra("groupID", groupID)
         rejectInviteIntent.putExtra("NOTIFICATION_ID", notificationId)
-        val pendingIntentReject = PendingIntent.getBroadcast(
-            context,
-            groupID.hashCode() + 1,
-            rejectInviteIntent,
-            withImmutableFlag(PendingIntent.FLAG_UPDATE_CURRENT)
-        )
+        val pendingIntentReject =
+            PendingIntent.getBroadcast(
+                context,
+                groupID.hashCode() + 1,
+                rejectInviteIntent,
+                withImmutableFlag(PendingIntent.FLAG_UPDATE_CURRENT),
+            )
         notificationBuilder.addAction(0, context.getString(R.string.reject), pendingIntentReject)
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PushNotificationManager.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PushNotificationManager.kt
index fb2b49b48..c7fde3266 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PushNotificationManager.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PushNotificationManager.kt
@@ -1,174 +1,179 @@
-package com.habitrpg.android.habitica.helpers.notifications
-
-import android.content.Context
-import android.content.SharedPreferences
-import androidx.core.app.NotificationManagerCompat
-import androidx.core.content.edit
-import com.google.firebase.messaging.FirebaseMessaging
-import com.google.firebase.messaging.RemoteMessage
-import com.habitrpg.android.habitica.data.ApiClient
-import com.habitrpg.android.habitica.helpers.Analytics
-import com.habitrpg.android.habitica.helpers.EventCategory
-import com.habitrpg.android.habitica.helpers.HitType
-import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.common.habitica.helpers.launchCatching
-import kotlinx.coroutines.MainScope
-import java.io.IOException
-
-class PushNotificationManager(
-    var apiClient: ApiClient,
-    private val sharedPreferences: SharedPreferences,
-    private val context: Context
-) {
-
-    var refreshedToken: String = ""
-        set(value) {
-            if (value.isEmpty()) {
-                return
-            }
-
-            field = value
-            sharedPreferences.edit {
-                putString(DEVICE_TOKEN_PREFERENCE_KEY, value)
-            }
-        }
-    private var user: User? = null
-
-    fun setUser(user: User) {
-        this.user = user
-    }
-
-    /**
-     * New installs on Android 13 require
-     * Notification permissions be approved.
-     * Devices on Android 12L or lower with previously
-     * allowed notification permissions that update to 13
-     * will have notification permissions enabled by default.
-     */
-    fun notificationPermissionEnabled(): Boolean {
-        val notificationManager = NotificationManagerCompat.from(context)
-        return notificationManager.areNotificationsEnabled()
-    }
-
-    fun addPushDeviceUsingStoredToken() {
-        if (refreshedToken.isNotBlank()) {
-            addRefreshToken()
-        } else {
-            try {
-                FirebaseMessaging.getInstance().token.addOnCompleteListener {
-                    try {
-                        refreshedToken = it.result
-                        addRefreshToken()
-                    } catch (_: IOException) {
-                        // catchy catch-catch
-                    } catch (_: Exception) {
-                        // catchy catch-catch-cat, I'm out of breath.
-                    }
-                }
-            } catch (_: Exception) {
-                // catchy catch
-            }
-        }
-    }
-
-    private fun addRefreshToken() {
-        if (this.refreshedToken.isEmpty() || this.user == null || this.userHasPushDevice()) {
-            return
-        }
-        val pushDeviceData = HashMap<String, String>()
-        pushDeviceData["regId"] = this.refreshedToken
-        pushDeviceData["type"] = "android"
-        MainScope().launchCatching {
-            apiClient.addPushDevice(pushDeviceData)
-        }
-    }
-
-    suspend fun removePushDeviceUsingStoredToken() {
-        if (this.refreshedToken.isEmpty() || !userHasPushDevice()) {
-            return
-        }
-        apiClient.deletePushDevice(refreshedToken)
-    }
-
-    private fun userHasPushDevice(): Boolean {
-        for (pushDevice in this.user?.pushDevices ?: emptyList()) {
-            if (pushDevice.regId == this.refreshedToken) {
-                return true
-            }
-        }
-        return this.user?.pushDevices == null
-    }
-
-    private fun userIsSubscribedToNotificationType(type: String?): Boolean {
-        val key = when {
-            type == PARTY_INVITE_PUSH_NOTIFICATION_KEY -> "preference_push_invited_to_party"
-            type?.contains(RECEIVED_PRIVATE_MESSAGE_PUSH_NOTIFICATION_KEY) == true -> "preference_push_received_a_private_message"
-            type?.contains(RECEIVED_GEMS_PUSH_NOTIFICATION_KEY) == true -> "preference_push_gifted_gems"
-            type?.contains(RECEIVED_SUBSCRIPTION_GIFT_PUSH_NOTIFICATION_KEY) == true -> "preference_push_gifted_subscription"
-            type?.contains(GUILD_INVITE_PUSH_NOTIFICATION_KEY) == true -> "preference_push_invited_to_guild"
-            type?.contains(QUEST_INVITE_PUSH_NOTIFICATION_KEY) == true -> "preference_push_invited_to_quest"
-            type?.contains(QUEST_BEGUN_PUSH_NOTIFICATION_KEY) == true -> "preference_push_your_quest_has_begun"
-            type?.contains(WON_CHALLENGE_PUSH_NOTIFICATION_KEY) == true -> "preference_push_you_won_challenge"
-            type?.contains(CONTENT_RELEASE_NOTIFICATION_KEY) == true -> "preference_push_content_release"
-            else -> return true
-        }
-
-        return sharedPreferences.getBoolean(key, true)
-    }
-
-    companion object {
-        const val PARTY_INVITE_PUSH_NOTIFICATION_KEY = "invitedParty"
-        const val RECEIVED_PRIVATE_MESSAGE_PUSH_NOTIFICATION_KEY = "newPM"
-        const val RECEIVED_GEMS_PUSH_NOTIFICATION_KEY = "giftedGems"
-        const val RECEIVED_SUBSCRIPTION_GIFT_PUSH_NOTIFICATION_KEY = "giftedSubscription"
-        const val GUILD_INVITE_PUSH_NOTIFICATION_KEY = "invitedGuild"
-        const val QUEST_INVITE_PUSH_NOTIFICATION_KEY = "questInvitation"
-        const val QUEST_BEGUN_PUSH_NOTIFICATION_KEY = "questStarted"
-        const val WON_CHALLENGE_PUSH_NOTIFICATION_KEY = "wonChallenge"
-        const val CHANGE_USERNAME_PUSH_NOTIFICATION_KEY = "changeUsername"
-        const val GIFT_ONE_GET_ONE_PUSH_NOTIFICATION_KEY = "gift1get1"
-        const val CHAT_MENTION_NOTIFICATION_KEY = "chatMention"
-        const val GROUP_ACTIVITY_NOTIFICATION_KEY = "groupActivity"
-        const val CONTENT_RELEASE_NOTIFICATION_KEY = "contentRelease"
-        const val G1G1_PROMO_KEY = "g1g1Promo"
-        private const val DEVICE_TOKEN_PREFERENCE_KEY = "device-token-preference"
-
-        fun displayNotification(remoteMessage: RemoteMessage, context: Context, pushNotificationManager: PushNotificationManager? = null) {
-            val remoteMessageIdentifier = remoteMessage.data["identifier"]
-
-            if (pushNotificationManager?.userIsSubscribedToNotificationType(remoteMessageIdentifier) != false) {
-                if (remoteMessage.data.containsKey("sendAnalytics")) {
-                    val additionalData = HashMap<String, Any>()
-                    additionalData["identifier"] = remoteMessageIdentifier ?: ""
-                    Analytics.sendEvent(
-                        "receive notification",
-                        EventCategory.BEHAVIOUR,
-                        HitType.EVENT,
-                        additionalData
-                    )
-                }
-
-                val notificationFactory = HabiticaLocalNotificationFactory()
-                val localNotification = notificationFactory.build(
-                    remoteMessageIdentifier,
-                    context
-                )
-                localNotification.setExtras(remoteMessage.data)
-                val notification = remoteMessage.notification
-                if (notification != null) {
-                    localNotification.notifyLocally(
-                        notification.title ?: remoteMessage.data["title"],
-                        notification.body ?: remoteMessage.data["body"],
-                        remoteMessage.data
-                    )
-                } else {
-                    localNotification.notifyLocally(
-                        remoteMessage.data["title"],
-                        remoteMessage.data["body"],
-                        remoteMessage.data
-                    )
-                }
-            }
-        }
-    }
-}
+package com.habitrpg.android.habitica.helpers.notifications
+
+import android.content.Context
+import android.content.SharedPreferences
+import androidx.core.app.NotificationManagerCompat
+import androidx.core.content.edit
+import com.google.firebase.messaging.FirebaseMessaging
+import com.google.firebase.messaging.RemoteMessage
+import com.habitrpg.android.habitica.data.ApiClient
+import com.habitrpg.android.habitica.helpers.Analytics
+import com.habitrpg.android.habitica.helpers.EventCategory
+import com.habitrpg.android.habitica.helpers.HitType
+import com.habitrpg.android.habitica.models.user.User
+import com.habitrpg.common.habitica.helpers.launchCatching
+import kotlinx.coroutines.MainScope
+import java.io.IOException
+
+class PushNotificationManager(
+    var apiClient: ApiClient,
+    private val sharedPreferences: SharedPreferences,
+    private val context: Context,
+) {
+    var refreshedToken: String = ""
+        set(value) {
+            if (value.isEmpty()) {
+                return
+            }
+
+            field = value
+            sharedPreferences.edit {
+                putString(DEVICE_TOKEN_PREFERENCE_KEY, value)
+            }
+        }
+    private var user: User? = null
+
+    fun setUser(user: User) {
+        this.user = user
+    }
+
+    /**
+     * New installs on Android 13 require
+     * Notification permissions be approved.
+     * Devices on Android 12L or lower with previously
+     * allowed notification permissions that update to 13
+     * will have notification permissions enabled by default.
+     */
+    fun notificationPermissionEnabled(): Boolean {
+        val notificationManager = NotificationManagerCompat.from(context)
+        return notificationManager.areNotificationsEnabled()
+    }
+
+    fun addPushDeviceUsingStoredToken() {
+        if (refreshedToken.isNotBlank()) {
+            addRefreshToken()
+        } else {
+            try {
+                FirebaseMessaging.getInstance().token.addOnCompleteListener {
+                    try {
+                        refreshedToken = it.result
+                        addRefreshToken()
+                    } catch (_: IOException) {
+                        // catchy catch-catch
+                    } catch (_: Exception) {
+                        // catchy catch-catch-cat, I'm out of breath.
+                    }
+                }
+            } catch (_: Exception) {
+                // catchy catch
+            }
+        }
+    }
+
+    private fun addRefreshToken() {
+        if (this.refreshedToken.isEmpty() || this.user == null || this.userHasPushDevice()) {
+            return
+        }
+        val pushDeviceData = HashMap<String, String>()
+        pushDeviceData["regId"] = this.refreshedToken
+        pushDeviceData["type"] = "android"
+        MainScope().launchCatching {
+            apiClient.addPushDevice(pushDeviceData)
+        }
+    }
+
+    suspend fun removePushDeviceUsingStoredToken() {
+        if (this.refreshedToken.isEmpty() || !userHasPushDevice()) {
+            return
+        }
+        apiClient.deletePushDevice(refreshedToken)
+    }
+
+    private fun userHasPushDevice(): Boolean {
+        for (pushDevice in this.user?.pushDevices ?: emptyList()) {
+            if (pushDevice.regId == this.refreshedToken) {
+                return true
+            }
+        }
+        return this.user?.pushDevices == null
+    }
+
+    private fun userIsSubscribedToNotificationType(type: String?): Boolean {
+        val key =
+            when {
+                type == PARTY_INVITE_PUSH_NOTIFICATION_KEY -> "preference_push_invited_to_party"
+                type?.contains(RECEIVED_PRIVATE_MESSAGE_PUSH_NOTIFICATION_KEY) == true -> "preference_push_received_a_private_message"
+                type?.contains(RECEIVED_GEMS_PUSH_NOTIFICATION_KEY) == true -> "preference_push_gifted_gems"
+                type?.contains(RECEIVED_SUBSCRIPTION_GIFT_PUSH_NOTIFICATION_KEY) == true -> "preference_push_gifted_subscription"
+                type?.contains(GUILD_INVITE_PUSH_NOTIFICATION_KEY) == true -> "preference_push_invited_to_guild"
+                type?.contains(QUEST_INVITE_PUSH_NOTIFICATION_KEY) == true -> "preference_push_invited_to_quest"
+                type?.contains(QUEST_BEGUN_PUSH_NOTIFICATION_KEY) == true -> "preference_push_your_quest_has_begun"
+                type?.contains(WON_CHALLENGE_PUSH_NOTIFICATION_KEY) == true -> "preference_push_you_won_challenge"
+                type?.contains(CONTENT_RELEASE_NOTIFICATION_KEY) == true -> "preference_push_content_release"
+                else -> return true
+            }
+
+        return sharedPreferences.getBoolean(key, true)
+    }
+
+    companion object {
+        const val PARTY_INVITE_PUSH_NOTIFICATION_KEY = "invitedParty"
+        const val RECEIVED_PRIVATE_MESSAGE_PUSH_NOTIFICATION_KEY = "newPM"
+        const val RECEIVED_GEMS_PUSH_NOTIFICATION_KEY = "giftedGems"
+        const val RECEIVED_SUBSCRIPTION_GIFT_PUSH_NOTIFICATION_KEY = "giftedSubscription"
+        const val GUILD_INVITE_PUSH_NOTIFICATION_KEY = "invitedGuild"
+        const val QUEST_INVITE_PUSH_NOTIFICATION_KEY = "questInvitation"
+        const val QUEST_BEGUN_PUSH_NOTIFICATION_KEY = "questStarted"
+        const val WON_CHALLENGE_PUSH_NOTIFICATION_KEY = "wonChallenge"
+        const val CHANGE_USERNAME_PUSH_NOTIFICATION_KEY = "changeUsername"
+        const val GIFT_ONE_GET_ONE_PUSH_NOTIFICATION_KEY = "gift1get1"
+        const val CHAT_MENTION_NOTIFICATION_KEY = "chatMention"
+        const val GROUP_ACTIVITY_NOTIFICATION_KEY = "groupActivity"
+        const val CONTENT_RELEASE_NOTIFICATION_KEY = "contentRelease"
+        const val G1G1_PROMO_KEY = "g1g1Promo"
+        private const val DEVICE_TOKEN_PREFERENCE_KEY = "device-token-preference"
+
+        fun displayNotification(
+            remoteMessage: RemoteMessage,
+            context: Context,
+            pushNotificationManager: PushNotificationManager? = null,
+        ) {
+            val remoteMessageIdentifier = remoteMessage.data["identifier"]
+
+            if (pushNotificationManager?.userIsSubscribedToNotificationType(remoteMessageIdentifier) != false) {
+                if (remoteMessage.data.containsKey("sendAnalytics")) {
+                    val additionalData = HashMap<String, Any>()
+                    additionalData["identifier"] = remoteMessageIdentifier ?: ""
+                    Analytics.sendEvent(
+                        "receive notification",
+                        EventCategory.BEHAVIOUR,
+                        HitType.EVENT,
+                        additionalData,
+                    )
+                }
+
+                val notificationFactory = HabiticaLocalNotificationFactory()
+                val localNotification =
+                    notificationFactory.build(
+                        remoteMessageIdentifier,
+                        context,
+                    )
+                localNotification.setExtras(remoteMessage.data)
+                val notification = remoteMessage.notification
+                if (notification != null) {
+                    localNotification.notifyLocally(
+                        notification.title ?: remoteMessage.data["title"],
+                        notification.body ?: remoteMessage.data["body"],
+                        remoteMessage.data,
+                    )
+                } else {
+                    localNotification.notifyLocally(
+                        remoteMessage.data["title"],
+                        remoteMessage.data["body"],
+                        remoteMessage.data,
+                    )
+                }
+            }
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/QuestBegunLocalNotification.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/QuestBegunLocalNotification.kt
index 964f329fb..c3c04775b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/QuestBegunLocalNotification.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/QuestBegunLocalNotification.kt
@@ -5,4 +5,5 @@ import android.content.Context
 /**
  * Created by keithholliday on 7/1/16.
  */
-class QuestBegunLocalNotification(context: Context, identifier: String?) : HabiticaLocalNotification(context, identifier)
+class QuestBegunLocalNotification(context: Context, identifier: String?) :
+    HabiticaLocalNotification(context, identifier)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/QuestInviteLocalNotification.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/QuestInviteLocalNotification.kt
index cdfe782d4..846c00b1c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/QuestInviteLocalNotification.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/QuestInviteLocalNotification.kt
@@ -10,41 +10,47 @@ import com.habitrpg.android.habitica.receivers.LocalNotificationActionReceiver
 /**
  * Created by keithholliday on 7/1/16.
  */
-class QuestInviteLocalNotification(context: Context, identifier: String?) : HabiticaLocalNotification(context, identifier) {
-
+class QuestInviteLocalNotification(context: Context, identifier: String?) :
+    HabiticaLocalNotification(context, identifier) {
     override fun getNotificationID(data: MutableMap<String, String>): Int {
         return 1000
     }
 
-    override fun setNotificationActions(notificationId: Int, data: Map<String, String>) {
+    override fun setNotificationActions(
+        notificationId: Int,
+        data: Map<String, String>,
+    ) {
         super.setNotificationActions(notificationId, data)
         val res = context.resources
 
         val acceptInviteIntent = Intent(context, LocalNotificationActionReceiver::class.java)
         acceptInviteIntent.action = res.getString(R.string.accept_quest_invite)
         acceptInviteIntent.putExtra("NOTIFICATION_ID", notificationId)
-        val flags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            PendingIntent.FLAG_UPDATE_CURRENT + PendingIntent.FLAG_IMMUTABLE
-        } else {
-            PendingIntent.FLAG_UPDATE_CURRENT
-        }
-        val pendingIntentAccept = PendingIntent.getBroadcast(
-            context,
-            3001,
-            acceptInviteIntent,
-            flags
-        )
+        val flags =
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                PendingIntent.FLAG_UPDATE_CURRENT + PendingIntent.FLAG_IMMUTABLE
+            } else {
+                PendingIntent.FLAG_UPDATE_CURRENT
+            }
+        val pendingIntentAccept =
+            PendingIntent.getBroadcast(
+                context,
+                3001,
+                acceptInviteIntent,
+                flags,
+            )
         notificationBuilder.addAction(0, "Accept", pendingIntentAccept)
 
         val rejectInviteIntent = Intent(context, LocalNotificationActionReceiver::class.java)
         rejectInviteIntent.action = res.getString(R.string.reject_quest_invite)
         rejectInviteIntent.putExtra("NOTIFICATION_ID", notificationId)
-        val pendingIntentReject = PendingIntent.getBroadcast(
-            context,
-            2001,
-            rejectInviteIntent,
-            flags
-        )
+        val pendingIntentReject =
+            PendingIntent.getBroadcast(
+                context,
+                2001,
+                rejectInviteIntent,
+                flags,
+            )
         notificationBuilder.addAction(0, "Reject", pendingIntentReject)
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ReceivedGemsGiftLocalNotification.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ReceivedGemsGiftLocalNotification.kt
index 04a881bf1..0fde9592e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ReceivedGemsGiftLocalNotification.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ReceivedGemsGiftLocalNotification.kt
@@ -5,4 +5,5 @@ import android.content.Context
 /**
  * Created by keithholliday on 7/1/16.
  */
-class ReceivedGemsGiftLocalNotification(context: Context, identifier: String?) : HabiticaLocalNotification(context, identifier)
+class ReceivedGemsGiftLocalNotification(context: Context, identifier: String?) :
+    HabiticaLocalNotification(context, identifier)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ReceivedPrivateMessageLocalNotification.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ReceivedPrivateMessageLocalNotification.kt
index 0d65a2009..070c57939 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ReceivedPrivateMessageLocalNotification.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ReceivedPrivateMessageLocalNotification.kt
@@ -14,37 +14,55 @@ import com.habitrpg.android.habitica.extensions.withMutableFlag
 import com.habitrpg.android.habitica.receivers.LocalNotificationActionReceiver
 import com.habitrpg.common.habitica.helpers.EmojiParser
 
-class ReceivedPrivateMessageLocalNotification(context: Context, identifier: String?) : HabiticaLocalNotification(context, identifier) {
+class ReceivedPrivateMessageLocalNotification(context: Context, identifier: String?) :
+    HabiticaLocalNotification(context, identifier) {
     override fun configureNotificationBuilder(data: MutableMap<String, String>): NotificationCompat.Builder {
-        val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as? NotificationManager
-        val existingNotifications = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            notificationManager?.activeNotifications?.filter { it.id == getNotificationID(data) }
-        } else {
-            null
-        }
+        val notificationManager =
+            context.getSystemService(Context.NOTIFICATION_SERVICE) as? NotificationManager
+        val existingNotifications =
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                notificationManager?.activeNotifications?.filter { it.id == getNotificationID(data) }
+            } else {
+                null
+            }
         val messageText = EmojiParser.parseEmojis(data["message"]?.trim { it <= ' ' })
-        val oldMessages = existingNotifications?.firstOrNull()?.notification?.extras?.getStringArrayList("messages") ?: arrayListOf()
+        val oldMessages =
+            existingNotifications?.firstOrNull()?.notification?.extras?.getStringArrayList("messages")
+                ?: arrayListOf()
         var style = NotificationCompat.InboxStyle()
         for (oldMessage in oldMessages) {
             style = style.addLine(oldMessage)
         }
         style = style.addLine(messageText)
         oldMessages.add(messageText)
-        var notification = super.configureNotificationBuilder(data)
-            .setExtras(bundleOf(Pair("messages", oldMessages)))
+        var notification =
+            super.configureNotificationBuilder(data)
+                .setExtras(bundleOf(Pair("messages", oldMessages)))
         if (oldMessages.size > 1) {
-            val notificationTitle = if (data["senderName"] != null) {
-                context.getString(R.string.inbox_messages_title, oldMessages.size, data["senderName"])
-            } else {
-                context.getString(R.string.inbox_messages_title_nosender, oldMessages.size)
-            }
-            notification = notification
-                .setContentTitle(notificationTitle)
-                .setCategory(Notification.CATEGORY_MESSAGE)
-                .setStyle(style)
+            val notificationTitle =
+                if (data["senderName"] != null) {
+                    context.getString(
+                        R.string.inbox_messages_title,
+                        oldMessages.size,
+                        data["senderName"],
+                    )
+                } else {
+                    context.getString(R.string.inbox_messages_title_nosender, oldMessages.size)
+                }
+            notification =
+                notification
+                    .setContentTitle(notificationTitle)
+                    .setCategory(Notification.CATEGORY_MESSAGE)
+                    .setStyle(style)
             title = null
         } else {
-            notification = notification.setContentTitle(context.getString(R.string.inbox_messages_title_single, data["senderName"]))
+            notification =
+                notification.setContentTitle(
+                    context.getString(
+                        R.string.inbox_messages_title_single,
+                        data["senderName"],
+                    ),
+                )
         }
         return notification
     }
@@ -59,16 +77,20 @@ class ReceivedPrivateMessageLocalNotification(context: Context, identifier: Stri
         intent.putExtra("replyToUsername", data?.get("senderName"))
     }
 
-    override fun setNotificationActions(notificationId: Int, data: Map<String, String>) {
+    override fun setNotificationActions(
+        notificationId: Int,
+        data: Map<String, String>,
+    ) {
         super.setNotificationActions(notificationId, data)
         val senderID = data["replyTo"] ?: return
 
         val actionName = context.getString(R.string.inbox_message_reply)
         val replyLabel: String = context.getString(R.string.reply)
-        val remoteInput: RemoteInput = RemoteInput.Builder(actionName).run {
-            setLabel(replyLabel)
-            build()
-        }
+        val remoteInput: RemoteInput =
+            RemoteInput.Builder(actionName).run {
+                setLabel(replyLabel)
+                build()
+            }
         val intent = Intent(context, LocalNotificationActionReceiver::class.java)
         intent.action = actionName
         intent.putExtra("senderID", senderID)
@@ -78,14 +100,14 @@ class ReceivedPrivateMessageLocalNotification(context: Context, identifier: Stri
                 context,
                 senderID.hashCode(),
                 intent,
-                withMutableFlag(PendingIntent.FLAG_UPDATE_CURRENT)
+                withMutableFlag(PendingIntent.FLAG_UPDATE_CURRENT),
             )
 
         val action: NotificationCompat.Action =
             NotificationCompat.Action.Builder(
                 R.drawable.ic_send_grey_600_24dp,
                 context.getString(R.string.reply),
-                replyPendingIntent
+                replyPendingIntent,
             )
                 .addRemoteInput(remoteInput)
                 .build()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ReceivedSubscriptionGiftLocalNotification.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ReceivedSubscriptionGiftLocalNotification.kt
index e8be7bb5b..0d0d6e71b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ReceivedSubscriptionGiftLocalNotification.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ReceivedSubscriptionGiftLocalNotification.kt
@@ -5,4 +5,5 @@ import android.content.Context
 /**
  * Created by keithholliday on 7/1/16.
  */
-class ReceivedSubscriptionGiftLocalNotification(context: Context, identifier: String?) : HabiticaLocalNotification(context, identifier)
+class ReceivedSubscriptionGiftLocalNotification(context: Context, identifier: String?) :
+    HabiticaLocalNotification(context, identifier)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/WonChallengeLocalNotification.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/WonChallengeLocalNotification.kt
index 24f2a9e7c..5d84917a5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/WonChallengeLocalNotification.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/WonChallengeLocalNotification.kt
@@ -2,4 +2,5 @@ package com.habitrpg.android.habitica.helpers.notifications
 
 import android.content.Context
 
-class WonChallengeLocalNotification(context: Context, identifier: String?) : HabiticaLocalNotification(context, identifier)
+class WonChallengeLocalNotification(context: Context, identifier: String?) :
+    HabiticaLocalNotification(context, identifier)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/postProcessors/InvertPostProcessor.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/postProcessors/InvertPostProcessor.kt
deleted file mode 100644
index 7f0b6172e..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/postProcessors/InvertPostProcessor.kt
+++ /dev/null
@@ -1 +0,0 @@
-package com.habitrpg.android.habitica.helpers.postProcessors
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/BuyRewardUseCase.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/BuyRewardUseCase.kt
index 29a1aec90..953038c92 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/BuyRewardUseCase.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/BuyRewardUseCase.kt
@@ -1,27 +1,34 @@
-package com.habitrpg.android.habitica.interactors
-
-import com.habitrpg.android.habitica.data.TaskRepository
-import com.habitrpg.android.habitica.helpers.SoundManager
-import com.habitrpg.android.habitica.models.tasks.Task
-import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.shared.habitica.models.responses.TaskScoringResult
-import javax.inject.Inject
-
-class BuyRewardUseCase @Inject
-constructor(
-    private val taskRepository: TaskRepository,
-    private val soundManager: SoundManager
-) : UseCase<BuyRewardUseCase.RequestValues, TaskScoringResult?>() {
-
-    override suspend fun run(requestValues: RequestValues): TaskScoringResult? {
-        val response = taskRepository.taskChecked(requestValues.user, requestValues.task, false, false, requestValues.notifyFunc)
-        soundManager.loadAndPlayAudio(SoundManager.SoundReward)
-        return response
-    }
-
-    class RequestValues(
-        internal val user: User?,
-        val task: Task,
-        val notifyFunc: (TaskScoringResult) -> Unit
-    ) : UseCase.RequestValues
-}
+package com.habitrpg.android.habitica.interactors
+
+import com.habitrpg.android.habitica.data.TaskRepository
+import com.habitrpg.android.habitica.helpers.SoundManager
+import com.habitrpg.android.habitica.models.tasks.Task
+import com.habitrpg.android.habitica.models.user.User
+import com.habitrpg.shared.habitica.models.responses.TaskScoringResult
+import javax.inject.Inject
+
+class BuyRewardUseCase
+    @Inject
+    constructor(
+        private val taskRepository: TaskRepository,
+        private val soundManager: SoundManager,
+    ) : UseCase<BuyRewardUseCase.RequestValues, TaskScoringResult?>() {
+        override suspend fun run(requestValues: RequestValues): TaskScoringResult? {
+            val response =
+                taskRepository.taskChecked(
+                    requestValues.user,
+                    requestValues.task,
+                    false,
+                    false,
+                    requestValues.notifyFunc,
+                )
+            soundManager.loadAndPlayAudio(SoundManager.SOUND_REWARD)
+            return response
+        }
+
+        class RequestValues(
+            internal val user: User?,
+            val task: Task,
+            val notifyFunc: (TaskScoringResult) -> Unit,
+        ) : UseCase.RequestValues
+    }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/CheckClassSelectionUseCase.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/CheckClassSelectionUseCase.kt
index 7000f5daa..9c3a8822d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/CheckClassSelectionUseCase.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/CheckClassSelectionUseCase.kt
@@ -1,46 +1,52 @@
-package com.habitrpg.android.habitica.interactors
-
-import android.app.Activity
-import android.content.Intent
-import android.os.Bundle
-import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.android.habitica.ui.activities.ClassSelectionActivity
-import javax.inject.Inject
-
-class CheckClassSelectionUseCase @Inject constructor() : UseCase<CheckClassSelectionUseCase.RequestValues, Unit>() {
-
-    override suspend fun run(requestValues: RequestValues) {
-        val user = requestValues.user
-        if (requestValues.currentClass == null) {
-            if ((user?.stats?.lvl ?: 0) >= 9 &&
-                user?.preferences?.disableClasses != true &&
-                user?.flags?.classSelected != true
-            ) {
-                displayClassSelectionActivity(false, null, requestValues.activity)
-            }
-        } else {
-            displayClassSelectionActivity(requestValues.isClassSelected, requestValues.currentClass, requestValues.activity)
-        }
-    }
-
-    private fun displayClassSelectionActivity(
-        isClassSelected: Boolean,
-        currentClass: String?,
-        activity: Activity
-    ) {
-        val bundle = Bundle()
-        bundle.putBoolean("isClassSelected", isClassSelected)
-        bundle.putString("currentClass", currentClass)
-
-        val intent = Intent(activity, ClassSelectionActivity::class.java)
-        intent.putExtras(bundle)
-        activity.startActivity(intent)
-    }
-
-    class RequestValues(
-        val user: User?,
-        val isClassSelected: Boolean,
-        val currentClass: String?,
-        val activity: Activity
-    ) : UseCase.RequestValues
-}
+package com.habitrpg.android.habitica.interactors
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Bundle
+import com.habitrpg.android.habitica.models.user.User
+import com.habitrpg.android.habitica.ui.activities.ClassSelectionActivity
+import javax.inject.Inject
+
+class CheckClassSelectionUseCase
+    @Inject
+    constructor() :
+    UseCase<CheckClassSelectionUseCase.RequestValues, Unit>() {
+        override suspend fun run(requestValues: RequestValues) {
+            val user = requestValues.user
+            if (requestValues.currentClass == null) {
+                if ((user?.stats?.lvl ?: 0) >= 9 &&
+                    user?.preferences?.disableClasses != true &&
+                    user?.flags?.classSelected != true
+                ) {
+                    displayClassSelectionActivity(false, null, requestValues.activity)
+                }
+            } else {
+                displayClassSelectionActivity(
+                    requestValues.isClassSelected,
+                    requestValues.currentClass,
+                    requestValues.activity,
+                )
+            }
+        }
+
+        private fun displayClassSelectionActivity(
+            isClassSelected: Boolean,
+            currentClass: String?,
+            activity: Activity,
+        ) {
+            val bundle = Bundle()
+            bundle.putBoolean("isClassSelected", isClassSelected)
+            bundle.putString("currentClass", currentClass)
+
+            val intent = Intent(activity, ClassSelectionActivity::class.java)
+            intent.putExtras(bundle)
+            activity.startActivity(intent)
+        }
+
+        class RequestValues(
+            val user: User?,
+            val isClassSelected: Boolean,
+            val currentClass: String?,
+            val activity: Activity,
+        ) : UseCase.RequestValues
+    }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/DisplayItemDropUseCase.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/DisplayItemDropUseCase.kt
index fd037c2f0..db315a1a9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/DisplayItemDropUseCase.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/DisplayItemDropUseCase.kt
@@ -1,56 +1,56 @@
-package com.habitrpg.android.habitica.interactors
-
-import android.view.ViewGroup
-import androidx.appcompat.app.AppCompatActivity
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.helpers.SoundManager
-import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
-import com.habitrpg.shared.habitica.models.responses.TaskScoringResult
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.MainScope
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-
-class DisplayItemDropUseCase @Inject
-constructor(private val soundManager: SoundManager) :
-    UseCase<DisplayItemDropUseCase.RequestValues, Unit>() {
-
-    override suspend fun run(requestValues: RequestValues) {
-        val data = requestValues.data
-        val snackbarText = StringBuilder(data?.drop?.dialog ?: "")
-
-        if ((data?.questItemsFound ?: 0) > 0 && requestValues.showQuestItems) {
-            if (snackbarText.isNotEmpty()) {
-                snackbarText.append('\n')
-            }
-            snackbarText.append(
-                requestValues.context.getString(
-                    R.string.quest_items_found,
-                    data!!.questItemsFound
-                )
-            )
-        }
-
-        if (snackbarText.isNotEmpty()) {
-            MainScope().launch(context = Dispatchers.Main) {
-                delay(3000L)
-                HabiticaSnackbar.showSnackbar(
-                    requestValues.snackbarTargetView,
-                    snackbarText,
-                    HabiticaSnackbar.SnackbarDisplayType.DROP,
-                    true
-                )
-                soundManager.loadAndPlayAudio(SoundManager.SoundItemDrop)
-            }
-        }
-        return
-    }
-
-    class RequestValues(
-        val data: TaskScoringResult?,
-        val context: AppCompatActivity,
-        val snackbarTargetView: ViewGroup,
-        val showQuestItems: Boolean
-    ) : UseCase.RequestValues
-}
+package com.habitrpg.android.habitica.interactors
+
+import android.view.ViewGroup
+import androidx.appcompat.app.AppCompatActivity
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.helpers.SoundManager
+import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
+import com.habitrpg.shared.habitica.models.responses.TaskScoringResult
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+class DisplayItemDropUseCase
+    @Inject
+    constructor(private val soundManager: SoundManager) :
+    UseCase<DisplayItemDropUseCase.RequestValues, Unit>() {
+        override suspend fun run(requestValues: RequestValues) {
+            val data = requestValues.data
+            val snackbarText = StringBuilder(data?.drop?.dialog ?: "")
+
+            if ((data?.questItemsFound ?: 0) > 0 && requestValues.showQuestItems) {
+                if (snackbarText.isNotEmpty()) {
+                    snackbarText.append('\n')
+                }
+                snackbarText.append(
+                    requestValues.context.getString(
+                        R.string.quest_items_found,
+                        data!!.questItemsFound,
+                    ),
+                )
+            }
+
+            if (snackbarText.isNotEmpty()) {
+                MainScope().launch(context = Dispatchers.Main) {
+                    delay(3000L)
+                    HabiticaSnackbar.showSnackbar(
+                        requestValues.snackbarTargetView,
+                        snackbarText,
+                        HabiticaSnackbar.SnackbarDisplayType.DROP,
+                        true,
+                    )
+                    soundManager.loadAndPlayAudio(SoundManager.SOUND_ITEM_DROP)
+                }
+            }
+            return
+        }
+
+        class RequestValues(
+            val data: TaskScoringResult?,
+            val context: AppCompatActivity,
+            val snackbarTargetView: ViewGroup,
+            val showQuestItems: Boolean,
+        ) : UseCase.RequestValues
+    }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/FeedPetUseCase.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/FeedPetUseCase.kt
index 341bfda8c..a11dc9005 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/FeedPetUseCase.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/FeedPetUseCase.kt
@@ -21,60 +21,65 @@ import com.habitrpg.shared.habitica.models.responses.FeedResponse
 import kotlinx.coroutines.MainScope
 import javax.inject.Inject
 
-class FeedPetUseCase @Inject
-constructor(
-    private val inventoryRepository: InventoryRepository
-) : UseCase<FeedPetUseCase.RequestValues, FeedResponse?>() {
-    override suspend fun run(requestValues: RequestValues): FeedResponse? {
-        val feedResponse = inventoryRepository.feedPet(requestValues.pet, requestValues.food)
-        (requestValues.context as? SnackbarActivity)?.showSnackbar(content = feedResponse?.message)
-        if (feedResponse?.value == -1) {
-            val mountWrapper = MountImageviewBinding.inflate(requestValues.context.layoutInflater)
+class FeedPetUseCase
+    @Inject
+    constructor(
+        private val inventoryRepository: InventoryRepository,
+    ) : UseCase<FeedPetUseCase.RequestValues, FeedResponse?>() {
+        override suspend fun run(requestValues: RequestValues): FeedResponse? {
+            val feedResponse = inventoryRepository.feedPet(requestValues.pet, requestValues.food)
+            (requestValues.context as? SnackbarActivity)?.showSnackbar(content = feedResponse?.message)
+            if (feedResponse?.value == -1) {
+                val mountWrapper = MountImageviewBinding.inflate(requestValues.context.layoutInflater)
 
-            mountWrapper.mountImageview.setMount(requestValues.pet.key)
-            val currentActivity =
-                HabiticaBaseApplication.getInstance(requestValues.context)?.currentActivity?.get()
-            val dialog = HabiticaAlertDialog(requestValues.context)
-            if (currentActivity != null) {
-                mountWrapper.backgroundView.setContent {
-                    HabiticaTheme {
-                        BackgroundScene(Modifier.clip(HabiticaTheme.shapes.large))
+                mountWrapper.mountImageview.setMount(requestValues.pet.key)
+                val currentActivity =
+                    HabiticaBaseApplication.getInstance(requestValues.context)?.currentActivity?.get()
+                val dialog = HabiticaAlertDialog(requestValues.context)
+                if (currentActivity != null) {
+                    mountWrapper.backgroundView.setContent {
+                        HabiticaTheme {
+                            BackgroundScene(Modifier.clip(HabiticaTheme.shapes.large))
+                        }
+                    }
+                    dialog.window?.let {
+                        mountWrapper.root.setViewTreeSavedStateRegistryOwner(currentActivity)
+                        it.decorView.setViewTreeSavedStateRegistryOwner(currentActivity)
+                        mountWrapper.root.setViewTreeLifecycleOwner(currentActivity)
+                        it.decorView.setViewTreeLifecycleOwner(currentActivity)
                     }
                 }
-                dialog.window?.let {
-                    mountWrapper.root.setViewTreeSavedStateRegistryOwner(currentActivity)
-                    it.decorView.setViewTreeSavedStateRegistryOwner(currentActivity)
-                    mountWrapper.root.setViewTreeLifecycleOwner(currentActivity)
-                    it.decorView.setViewTreeLifecycleOwner(currentActivity)
-                }
-            }
-            dialog.setTitle(
-                requestValues.context.getString(
-                    R.string.evolved_pet_title,
-                    requestValues.pet.text
-                )
-            )
-            dialog.isCelebratory = true
-            dialog.setAdditionalContentView(mountWrapper.root)
-            dialog.addButton(R.string.onwards, true)
-            dialog.addButton(R.string.share, false) { hatchingDialog, _ ->
-                val message =
+                dialog.setTitle(
                     requestValues.context.getString(
-                        R.string.share_raised,
-                        requestValues.pet.text
-                    )
-                MainScope().launchCatching {
-                    ShareMountUseCase().callInteractor(ShareMountUseCase.RequestValues(
-                        requestValues.pet.key, message, requestValues.context
-                    ))
+                        R.string.evolved_pet_title,
+                        requestValues.pet.text,
+                    ),
+                )
+                dialog.isCelebratory = true
+                dialog.setAdditionalContentView(mountWrapper.root)
+                dialog.addButton(R.string.onwards, true)
+                dialog.addButton(R.string.share, false) { hatchingDialog, _ ->
+                    val message =
+                        requestValues.context.getString(
+                            R.string.share_raised,
+                            requestValues.pet.text,
+                        )
+                    MainScope().launchCatching {
+                        ShareMountUseCase().callInteractor(
+                            ShareMountUseCase.RequestValues(
+                                requestValues.pet.key,
+                                message,
+                                requestValues.context,
+                            ),
+                        )
+                    }
+                    hatchingDialog.dismiss()
                 }
-                hatchingDialog.dismiss()
+                dialog.enqueue()
             }
-            dialog.enqueue()
+            return feedResponse
         }
-        return feedResponse
-    }
 
-    class RequestValues(val pet: Pet, val food: Food, val context: Context) :
-        UseCase.RequestValues
-}
+        class RequestValues(val pet: Pet, val food: Food, val context: Context) :
+            UseCase.RequestValues
+    }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/HatchPetUseCase.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/HatchPetUseCase.kt
index 17ac4715b..92ab251a5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/HatchPetUseCase.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/HatchPetUseCase.kt
@@ -13,80 +13,81 @@ import com.habitrpg.android.habitica.databinding.PetImageviewBinding
 import com.habitrpg.android.habitica.models.inventory.Egg
 import com.habitrpg.android.habitica.models.inventory.HatchingPotion
 import com.habitrpg.android.habitica.models.user.Items
-import com.habitrpg.common.habitica.theme.HabiticaTheme
 import com.habitrpg.android.habitica.ui.views.BackgroundScene
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.common.habitica.extensions.layoutInflater
 import com.habitrpg.common.habitica.extensions.loadImage
 import com.habitrpg.common.habitica.helpers.launchCatching
+import com.habitrpg.common.habitica.theme.HabiticaTheme
 import kotlinx.coroutines.MainScope
 import javax.inject.Inject
 
-class HatchPetUseCase @Inject
-constructor(
-    private val inventoryRepository: InventoryRepository
-) : UseCase<HatchPetUseCase.RequestValues, Items?>() {
-    override suspend fun run(requestValues: RequestValues): Items? {
-        return inventoryRepository.hatchPet(requestValues.egg, requestValues.potion) {
-            val petWrapper = PetImageviewBinding.inflate(requestValues.context.layoutInflater)
-            val petKey = requestValues.egg.key + "-" + requestValues.potion.key
-            petWrapper.petImageview.loadImage("stable_Pet-$petKey")
-            val potionName = requestValues.potion.text
-            val eggName = requestValues.egg.text
-            val currentActivity =
-                HabiticaBaseApplication.getInstance(requestValues.context)?.currentActivity?.get()
-            val dialog = HabiticaAlertDialog(requestValues.context)
-            if (currentActivity != null) {
-                petWrapper.backgroundView.setContent {
-                    HabiticaTheme {
-                        BackgroundScene(Modifier.clip(HabiticaTheme.shapes.large))
+class HatchPetUseCase
+    @Inject
+    constructor(
+        private val inventoryRepository: InventoryRepository,
+    ) : UseCase<HatchPetUseCase.RequestValues, Items?>() {
+        override suspend fun run(requestValues: RequestValues): Items? {
+            return inventoryRepository.hatchPet(requestValues.egg, requestValues.potion) {
+                val petWrapper = PetImageviewBinding.inflate(requestValues.context.layoutInflater)
+                val petKey = requestValues.egg.key + "-" + requestValues.potion.key
+                petWrapper.petImageview.loadImage("stable_Pet-$petKey")
+                val potionName = requestValues.potion.text
+                val eggName = requestValues.egg.text
+                val currentActivity =
+                    HabiticaBaseApplication.getInstance(requestValues.context)?.currentActivity?.get()
+                val dialog = HabiticaAlertDialog(requestValues.context)
+                if (currentActivity != null) {
+                    petWrapper.backgroundView.setContent {
+                        HabiticaTheme {
+                            BackgroundScene(Modifier.clip(HabiticaTheme.shapes.large))
+                        }
+                    }
+                    dialog.window?.let {
+                        petWrapper.root.setViewTreeSavedStateRegistryOwner(currentActivity)
+                        it.decorView.setViewTreeSavedStateRegistryOwner(currentActivity)
+                        petWrapper.root.setViewTreeLifecycleOwner(currentActivity)
+                        it.decorView.setViewTreeLifecycleOwner(currentActivity)
                     }
                 }
-                dialog.window?.let {
-                    petWrapper.root.setViewTreeSavedStateRegistryOwner(currentActivity)
-                    it.decorView.setViewTreeSavedStateRegistryOwner(currentActivity)
-                    petWrapper.root.setViewTreeLifecycleOwner(currentActivity)
-                    it.decorView.setViewTreeLifecycleOwner(currentActivity)
-                }
-            }
-            dialog.isCelebratory = true
-            dialog.setTitle(
-                requestValues.context.getString(
-                    R.string.hatched_pet_title,
-                    potionName,
-                    eggName
+                dialog.isCelebratory = true
+                dialog.setTitle(
+                    requestValues.context.getString(
+                        R.string.hatched_pet_title,
+                        potionName,
+                        eggName,
+                    ),
                 )
-            )
-            dialog.setAdditionalContentView(petWrapper.root)
-            dialog.addButton(R.string.equip, true) { _, _ ->
-                MainScope().launchCatching {
-                    inventoryRepository.equip(
-                        "pet",
-                        requestValues.egg.key + "-" + requestValues.potion.key
-                    )
-                }
-            }
-            dialog.addButton(R.string.share, false) { hatchingDialog, _ ->
-                MainScope().launchCatching {
-                    SharePetUseCase().callInteractor(
-                        SharePetUseCase.RequestValues(
-                            petKey,
-                            requestValues.context.getString(
-                                R.string.share_hatched,
-                                potionName,
-                                eggName
-                            ),
-                            requestValues.context
+                dialog.setAdditionalContentView(petWrapper.root)
+                dialog.addButton(R.string.equip, true) { _, _ ->
+                    MainScope().launchCatching {
+                        inventoryRepository.equip(
+                            "pet",
+                            requestValues.egg.key + "-" + requestValues.potion.key,
                         )
-                    )
+                    }
                 }
-                hatchingDialog.dismiss()
+                dialog.addButton(R.string.share, false) { hatchingDialog, _ ->
+                    MainScope().launchCatching {
+                        SharePetUseCase().callInteractor(
+                            SharePetUseCase.RequestValues(
+                                petKey,
+                                requestValues.context.getString(
+                                    R.string.share_hatched,
+                                    potionName,
+                                    eggName,
+                                ),
+                                requestValues.context,
+                            ),
+                        )
+                    }
+                    hatchingDialog.dismiss()
+                }
+                dialog.setExtraCloseButtonVisibility(View.VISIBLE)
+                dialog.enqueue()
             }
-            dialog.setExtraCloseButtonVisibility(View.VISIBLE)
-            dialog.enqueue()
         }
-    }
 
-    class RequestValues(val potion: HatchingPotion, val egg: Egg, val context: Context) :
-        UseCase.RequestValues
-}
+        class RequestValues(val potion: HatchingPotion, val egg: Egg, val context: Context) :
+            UseCase.RequestValues
+    }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/InsufficientGemsUseCase.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/InsufficientGemsUseCase.kt
index df357a4d9..4acc149a0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/InsufficientGemsUseCase.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/InsufficientGemsUseCase.kt
@@ -6,20 +6,22 @@ import com.habitrpg.android.habitica.helpers.PurchaseTypes
 import com.habitrpg.android.habitica.ui.activities.MainActivity
 import javax.inject.Inject
 
-class InsufficientGemsUseCase @Inject constructor(
-    private val purchaseHandler: PurchaseHandler
-) : UseCase<InsufficientGemsUseCase.RequestValues, Unit>() {
-
-    override suspend fun run(requestValues: RequestValues) {
-        val activity = requestValues.activity as? MainActivity ?: return
-        val gemSku = if (requestValues.gemPrice > 4) {
-            PurchaseTypes.Purchase21Gems
-        } else {
-            PurchaseTypes.Purchase4Gems
+class InsufficientGemsUseCase
+    @Inject
+    constructor(
+        private val purchaseHandler: PurchaseHandler,
+    ) : UseCase<InsufficientGemsUseCase.RequestValues, Unit>() {
+        override suspend fun run(requestValues: RequestValues) {
+            val activity = requestValues.activity as? MainActivity ?: return
+            val gemSku =
+                if (requestValues.gemPrice > 4) {
+                    PurchaseTypes.PURCHASE_21_GEMS
+                } else {
+                    PurchaseTypes.PURCHASE_4_GEMS
+                }
+            val sku = purchaseHandler.getInAppPurchaseSKU(gemSku) ?: return
+            purchaseHandler.purchase(activity, sku)
         }
-        val sku = purchaseHandler.getInAppPurchaseSKU(gemSku) ?: return
-        purchaseHandler.purchase(activity, sku)
-    }
 
-    class RequestValues(val gemPrice: Int, val activity: Activity) : UseCase.RequestValues
-}
+        class RequestValues(val gemPrice: Int, val activity: Activity) : UseCase.RequestValues
+    }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.kt
index c9efd542c..2c6da2244 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.kt
@@ -1,106 +1,131 @@
-package com.habitrpg.android.habitica.interactors
-
-import android.view.ViewGroup
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.databinding.DialogLevelup10Binding
-import com.habitrpg.android.habitica.helpers.SoundManager
-import com.habitrpg.android.habitica.models.user.Stats
-import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.android.habitica.ui.activities.BaseActivity
-import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
-import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import com.habitrpg.common.habitica.helpers.launchCatching
-import com.habitrpg.common.habitica.views.AvatarView
-import kotlinx.coroutines.MainScope
-import javax.inject.Inject
-
-class LevelUpUseCase @Inject
-constructor(
-    private val soundManager: SoundManager,
-    private val checkClassSelectionUseCase: CheckClassSelectionUseCase
-) : UseCase<LevelUpUseCase.RequestValues, Stats?>() {
-
-    override suspend fun run(requestValues: RequestValues): Stats? {
-        soundManager.loadAndPlayAudio(SoundManager.SoundLevelUp)
-        val suppressedModals = requestValues.user.preferences?.suppressModals
-
-        if (requestValues.newLevel == 10) {
-            val binding = DialogLevelup10Binding.inflate(requestValues.activity.layoutInflater)
-            binding.healerIconView.setImageBitmap(HabiticaIconsHelper.imageOfHealerLightBg())
-            binding.mageIconView.setImageBitmap(HabiticaIconsHelper.imageOfMageLightBg())
-            binding.rogueIconView.setImageBitmap(HabiticaIconsHelper.imageOfRogueLightBg())
-            binding.warriorIconView.setImageBitmap(HabiticaIconsHelper.imageOfWarriorLightBg())
-
-            val alert = HabiticaAlertDialog(requestValues.activity)
-            alert.setTitle(requestValues.activity.getString(R.string.levelup_header, requestValues.newLevel))
-            alert.setAdditionalContentView(binding.root)
-            alert.addButton(R.string.select_class, true) { _, _ ->
-                MainScope().launchCatching {
-                    showClassSelection(requestValues)
-                }
-            }
-            alert.addButton(R.string.not_now, false)
-            alert.isCelebratory = true
-
-            if (!requestValues.activity.isFinishing) {
-                alert.enqueue()
-            }
-        } else {
-            if (suppressedModals?.levelUp == true) {
-                HabiticaSnackbar.showSnackbar(
-                    requestValues.snackbarTargetView,
-                    requestValues.activity.getString(R.string.levelup_header, requestValues.newLevel),
-                    HabiticaSnackbar.SnackbarDisplayType.SUCCESS,
-                    true
-                )
-                return requestValues.user.stats
-            }
-            val customView = requestValues.activity.layoutInflater.inflate(R.layout.dialog_levelup, null)
-            if (customView != null) {
-                val dialogAvatarView = customView.findViewById<AvatarView>(R.id.avatarView)
-                dialogAvatarView.setAvatar(requestValues.user)
-            }
-
-            val alert = HabiticaAlertDialog(requestValues.activity)
-            alert.setTitle(requestValues.activity.getString(R.string.levelup_header, requestValues.newLevel))
-            alert.setAdditionalContentView(customView)
-            alert.addButton(R.string.onwards, true) { _, _ ->
-                MainScope().launchCatching {
-                    showClassSelection(requestValues)
-                }
-            }
-            alert.addButton(R.string.share, false) { _, _ ->
-                MainScope().launchCatching {
-                    val usecase = ShareAvatarUseCase()
-                    usecase.callInteractor(ShareAvatarUseCase.RequestValues(
-                        requestValues.activity,
-                        requestValues.user,
-                        requestValues.activity.getString(R.string.share_levelup, requestValues.newLevel),
-                        "levelup"
-                    ))
-                }
-
-            }
-            alert.isCelebratory = true
-
-            if (!requestValues.activity.isFinishing) {
-                alert.enqueue()
-            }
-        }
-        return requestValues.user.stats
-    }
-
-    private suspend fun showClassSelection(requestValues: RequestValues) {
-        checkClassSelectionUseCase.callInteractor(CheckClassSelectionUseCase.RequestValues(requestValues.user, true, null, requestValues.activity))
-    }
-
-    class RequestValues(
-        val user: User,
-        val level: Int?,
-        val activity: BaseActivity,
-        val snackbarTargetView: ViewGroup
-    ) : UseCase.RequestValues {
-        val newLevel: Int = level ?: 0
-    }
-}
+package com.habitrpg.android.habitica.interactors
+
+import android.view.ViewGroup
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.DialogLevelup10Binding
+import com.habitrpg.android.habitica.helpers.SoundManager
+import com.habitrpg.android.habitica.models.user.Stats
+import com.habitrpg.android.habitica.models.user.User
+import com.habitrpg.android.habitica.ui.activities.BaseActivity
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
+import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
+import com.habitrpg.common.habitica.helpers.launchCatching
+import com.habitrpg.common.habitica.views.AvatarView
+import kotlinx.coroutines.MainScope
+import javax.inject.Inject
+
+class LevelUpUseCase
+    @Inject
+    constructor(
+        private val soundManager: SoundManager,
+        private val checkClassSelectionUseCase: CheckClassSelectionUseCase,
+    ) : UseCase<LevelUpUseCase.RequestValues, Stats?>() {
+        override suspend fun run(requestValues: RequestValues): Stats? {
+            soundManager.loadAndPlayAudio(SoundManager.SOUND_LEVEL_UP)
+            val suppressedModals = requestValues.user.preferences?.suppressModals
+
+            if (requestValues.newLevel == 10) {
+                val binding = DialogLevelup10Binding.inflate(requestValues.activity.layoutInflater)
+                binding.healerIconView.setImageBitmap(HabiticaIconsHelper.imageOfHealerLightBg())
+                binding.mageIconView.setImageBitmap(HabiticaIconsHelper.imageOfMageLightBg())
+                binding.rogueIconView.setImageBitmap(HabiticaIconsHelper.imageOfRogueLightBg())
+                binding.warriorIconView.setImageBitmap(HabiticaIconsHelper.imageOfWarriorLightBg())
+
+                val alert = HabiticaAlertDialog(requestValues.activity)
+                alert.setTitle(
+                    requestValues.activity.getString(
+                        R.string.levelup_header,
+                        requestValues.newLevel,
+                    ),
+                )
+                alert.setAdditionalContentView(binding.root)
+                alert.addButton(R.string.select_class, true) { _, _ ->
+                    MainScope().launchCatching {
+                        showClassSelection(requestValues)
+                    }
+                }
+                alert.addButton(R.string.not_now, false)
+                alert.isCelebratory = true
+
+                if (!requestValues.activity.isFinishing) {
+                    alert.enqueue()
+                }
+            } else {
+                if (suppressedModals?.levelUp == true) {
+                    HabiticaSnackbar.showSnackbar(
+                        requestValues.snackbarTargetView,
+                        requestValues.activity.getString(
+                            R.string.levelup_header,
+                            requestValues.newLevel,
+                        ),
+                        HabiticaSnackbar.SnackbarDisplayType.SUCCESS,
+                        true,
+                    )
+                    return requestValues.user.stats
+                }
+                val customView =
+                    requestValues.activity.layoutInflater.inflate(R.layout.dialog_levelup, null)
+                if (customView != null) {
+                    val dialogAvatarView = customView.findViewById<AvatarView>(R.id.avatarView)
+                    dialogAvatarView.setAvatar(requestValues.user)
+                }
+
+                val alert = HabiticaAlertDialog(requestValues.activity)
+                alert.setTitle(
+                    requestValues.activity.getString(
+                        R.string.levelup_header,
+                        requestValues.newLevel,
+                    ),
+                )
+                alert.setAdditionalContentView(customView)
+                alert.addButton(R.string.onwards, true) { _, _ ->
+                    MainScope().launchCatching {
+                        showClassSelection(requestValues)
+                    }
+                }
+                alert.addButton(R.string.share, false) { _, _ ->
+                    MainScope().launchCatching {
+                        val usecase = ShareAvatarUseCase()
+                        usecase.callInteractor(
+                            ShareAvatarUseCase.RequestValues(
+                                requestValues.activity,
+                                requestValues.user,
+                                requestValues.activity.getString(
+                                    R.string.share_levelup,
+                                    requestValues.newLevel,
+                                ),
+                                "levelup",
+                            ),
+                        )
+                    }
+                }
+                alert.isCelebratory = true
+
+                if (!requestValues.activity.isFinishing) {
+                    alert.enqueue()
+                }
+            }
+            return requestValues.user.stats
+        }
+
+        private suspend fun showClassSelection(requestValues: RequestValues) {
+            checkClassSelectionUseCase.callInteractor(
+                CheckClassSelectionUseCase.RequestValues(
+                    requestValues.user,
+                    true,
+                    null,
+                    requestValues.activity,
+                ),
+            )
+        }
+
+        class RequestValues(
+            val user: User,
+            val level: Int?,
+            val activity: BaseActivity,
+            val snackbarTargetView: ViewGroup,
+        ) : UseCase.RequestValues {
+            val newLevel: Int = level ?: 0
+        }
+    }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.kt
index 8b85cc598..866df6fcf 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.kt
@@ -1,170 +1,210 @@
-package com.habitrpg.android.habitica.interactors
-
-import android.content.Context
-import android.graphics.Bitmap
-import android.graphics.drawable.BitmapDrawable
-import android.text.SpannableStringBuilder
-import android.view.Gravity
-import android.view.View
-import android.view.ViewGroup
-import android.widget.LinearLayout
-import android.widget.TextView
-import androidx.core.content.ContextCompat
-import androidx.core.util.Pair
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.data.UserRepository
-import com.habitrpg.android.habitica.models.user.Stats
-import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.android.habitica.ui.activities.BaseActivity
-import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
-import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.SnackbarDisplayType
-import java.text.NumberFormat
-import javax.inject.Inject
-import kotlin.math.abs
-
-class NotifyUserUseCase @Inject
-constructor(
-    private val levelUpUseCase: LevelUpUseCase,
-    private val userRepository: UserRepository
-) : UseCase<NotifyUserUseCase.RequestValues, Stats?>() {
-
-    override suspend fun run(requestValues: RequestValues): Stats? {
-        if (requestValues.user == null) {
-            return null
-        }
-        val pair = getNotificationAndAddStatsToUser(requestValues.context, requestValues.xp, requestValues.hp, requestValues.gold, requestValues.mp, requestValues.questDamage, requestValues.user)
-        val view = pair.first
-        val type = pair.second
-        if (view != null && type != null) {
-            HabiticaSnackbar.showSnackbar(requestValues.snackbarTargetView, null, null, view, type)
-        }
-        if (requestValues.hasLeveledUp == true) {
-            levelUpUseCase.callInteractor(LevelUpUseCase.RequestValues(requestValues.user, requestValues.level, requestValues.context, requestValues.snackbarTargetView))
-            userRepository.retrieveUser(true)
-        }
-        return requestValues.user.stats
-    }
-
-    class RequestValues(
-        val context: BaseActivity,
-        val snackbarTargetView: ViewGroup,
-        val user: User?,
-        val xp: Double?,
-        val hp: Double?,
-        val gold: Double?,
-        val mp: Double?,
-        val questDamage: Double?,
-        val hasLeveledUp: Boolean?,
-        val level: Int?
-    ) : UseCase.RequestValues
-
-    companion object {
-        val formatter = NumberFormat.getInstance().apply {
-            this.minimumFractionDigits = 0
-            this.maximumFractionDigits = 2
-        }
-
-        fun getNotificationAndAddStatsToUser(
-            context: Context,
-            xp: Double?,
-            hp: Double?,
-            gold: Double?,
-            mp: Double?,
-            questDamage: Double?,
-            user: User?
-        ): Pair<View, SnackbarDisplayType> {
-            var displayType = SnackbarDisplayType.SUCCESS
-
-            val container = LinearLayout(context)
-            container.orientation = LinearLayout.HORIZONTAL
-
-            if (xp != null && xp > 0) {
-                container.addView(createTextView(context, xp, HabiticaIconsHelper.imageOfExperience()))
-            }
-            if (hp != null && hp != 0.0) {
-                if (hp < 0) {
-                    displayType = SnackbarDisplayType.FAILURE
-                }
-                container.addView(createTextView(context, hp, HabiticaIconsHelper.imageOfHeartDarkBg()))
-            }
-            if (gold != null && gold != 0.0) {
-                container.addView(createTextView(context, gold, HabiticaIconsHelper.imageOfGold()))
-                if (gold < 0) {
-                    displayType = SnackbarDisplayType.FAILURE
-                }
-            }
-            if (mp != null && mp > 0 && user?.hasClass == true) {
-                container.addView(createTextView(context, mp, HabiticaIconsHelper.imageOfMagic()))
-            }
-            if (questDamage != null && questDamage > 0) {
-                container.addView(createTextView(context, questDamage, HabiticaIconsHelper.imageOfDamage()))
-            }
-
-            val childCount = container.childCount
-            if (childCount == 0) {
-                return Pair(null, displayType)
-            }
-            val padding = context.resources.getDimension(R.dimen.spacing_medium).toInt()
-            (1 until childCount)
-                .map { container.getChildAt(it) }
-                .forEach { it.setPadding(padding, 0, 0, 0) }
-
-            return Pair(container, displayType)
-        }
-
-        private fun createTextView(context: Context, value: Double, icon: Bitmap): View {
-            val textView = TextView(context)
-            val iconDrawable = BitmapDrawable(context.resources, icon)
-            textView.setCompoundDrawablesWithIntrinsicBounds(iconDrawable, null, null, null)
-            val text: String = if (value > 0) {
-                " + " + formatter.format(abs(value))
-            } else {
-                " - " + formatter.format(abs(value))
-            }
-            textView.text = text
-            textView.gravity = Gravity.CENTER_VERTICAL
-            textView.setTextColor(ContextCompat.getColor(context, R.color.white))
-            return textView
-        }
-
-        private fun formatValue(value: Double): String {
-            return if (value >= 0) {
-                " + " + formatter.format(abs(value))
-            } else {
-                " - " + formatter.format(abs(value))
-            }
-        }
-
-        fun getNotificationAndAddStatsToUserAsText(
-            xp: Double?,
-            hp: Double?,
-            gold: Double?,
-            mp: Double?
-        ): Pair<SpannableStringBuilder, SnackbarDisplayType> {
-            val builder = SpannableStringBuilder()
-            var displayType = SnackbarDisplayType.NORMAL
-
-            if (xp != null && xp != 0.0) {
-                builder.append(formatValue(xp)).append(" Exp")
-            }
-            if (hp != null && hp != 0.0) {
-                if (hp < 0) {
-                    displayType = SnackbarDisplayType.FAILURE
-                }
-                builder.append(formatValue(hp)).append(" Health")
-            }
-            if (gold != null && gold != 0.0) {
-                if (gold < 0) {
-                    displayType = SnackbarDisplayType.FAILURE
-                }
-                builder.append(formatValue(gold)).append(" Gold")
-            }
-            if (mp != null && mp != 0.0) {
-                builder.append(formatValue(mp)).append(" Exp").append(" Mana")
-            }
-
-            return Pair(builder, displayType)
-        }
-    }
-}
+package com.habitrpg.android.habitica.interactors
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.drawable.BitmapDrawable
+import android.text.SpannableStringBuilder
+import android.view.Gravity
+import android.view.View
+import android.view.ViewGroup
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.core.content.ContextCompat
+import androidx.core.util.Pair
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.data.UserRepository
+import com.habitrpg.android.habitica.models.user.Stats
+import com.habitrpg.android.habitica.models.user.User
+import com.habitrpg.android.habitica.ui.activities.BaseActivity
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
+import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.SnackbarDisplayType
+import java.text.NumberFormat
+import javax.inject.Inject
+import kotlin.math.abs
+
+class NotifyUserUseCase
+    @Inject
+    constructor(
+        private val levelUpUseCase: LevelUpUseCase,
+        private val userRepository: UserRepository,
+    ) : UseCase<NotifyUserUseCase.RequestValues, Stats?>() {
+        override suspend fun run(requestValues: RequestValues): Stats? {
+            if (requestValues.user == null) {
+                return null
+            }
+            val pair =
+                getNotificationAndAddStatsToUser(
+                    requestValues.context,
+                    requestValues.xp,
+                    requestValues.hp,
+                    requestValues.gold,
+                    requestValues.mp,
+                    requestValues.questDamage,
+                    requestValues.user,
+                )
+            val view = pair.first
+            val type = pair.second
+            if (view != null && type != null) {
+                HabiticaSnackbar.showSnackbar(requestValues.snackbarTargetView, null, null, view, type)
+            }
+            if (requestValues.hasLeveledUp == true) {
+                levelUpUseCase.callInteractor(
+                    LevelUpUseCase.RequestValues(
+                        requestValues.user,
+                        requestValues.level,
+                        requestValues.context,
+                        requestValues.snackbarTargetView,
+                    ),
+                )
+                userRepository.retrieveUser(true)
+            }
+            return requestValues.user.stats
+        }
+
+        class RequestValues(
+            val context: BaseActivity,
+            val snackbarTargetView: ViewGroup,
+            val user: User?,
+            val xp: Double?,
+            val hp: Double?,
+            val gold: Double?,
+            val mp: Double?,
+            val questDamage: Double?,
+            val hasLeveledUp: Boolean?,
+            val level: Int?,
+        ) : UseCase.RequestValues
+
+        companion object {
+            val formatter =
+                NumberFormat.getInstance().apply {
+                    this.minimumFractionDigits = 0
+                    this.maximumFractionDigits = 2
+                }
+
+            fun getNotificationAndAddStatsToUser(
+                context: Context,
+                xp: Double?,
+                hp: Double?,
+                gold: Double?,
+                mp: Double?,
+                questDamage: Double?,
+                user: User?,
+            ): Pair<View, SnackbarDisplayType> {
+                var displayType = SnackbarDisplayType.SUCCESS
+
+                val container = LinearLayout(context)
+                container.orientation = LinearLayout.HORIZONTAL
+
+                if (xp != null && xp > 0) {
+                    container.addView(
+                        createTextView(
+                            context,
+                            xp,
+                            HabiticaIconsHelper.imageOfExperience(),
+                        ),
+                    )
+                }
+                if (hp != null && hp != 0.0) {
+                    if (hp < 0) {
+                        displayType = SnackbarDisplayType.FAILURE
+                    }
+                    container.addView(
+                        createTextView(
+                            context,
+                            hp,
+                            HabiticaIconsHelper.imageOfHeartDarkBg(),
+                        ),
+                    )
+                }
+                if (gold != null && gold != 0.0) {
+                    container.addView(createTextView(context, gold, HabiticaIconsHelper.imageOfGold()))
+                    if (gold < 0) {
+                        displayType = SnackbarDisplayType.FAILURE
+                    }
+                }
+                if (mp != null && mp > 0 && user?.hasClass == true) {
+                    container.addView(createTextView(context, mp, HabiticaIconsHelper.imageOfMagic()))
+                }
+                if (questDamage != null && questDamage > 0) {
+                    container.addView(
+                        createTextView(
+                            context,
+                            questDamage,
+                            HabiticaIconsHelper.imageOfDamage(),
+                        ),
+                    )
+                }
+
+                val childCount = container.childCount
+                if (childCount == 0) {
+                    return Pair(null, displayType)
+                }
+                val padding = context.resources.getDimension(R.dimen.spacing_medium).toInt()
+                (1 until childCount)
+                    .map { container.getChildAt(it) }
+                    .forEach { it.setPadding(padding, 0, 0, 0) }
+
+                return Pair(container, displayType)
+            }
+
+            private fun createTextView(
+                context: Context,
+                value: Double,
+                icon: Bitmap,
+            ): View {
+                val textView = TextView(context)
+                val iconDrawable = BitmapDrawable(context.resources, icon)
+                textView.setCompoundDrawablesWithIntrinsicBounds(iconDrawable, null, null, null)
+                val text: String =
+                    if (value > 0) {
+                        " + " + formatter.format(abs(value))
+                    } else {
+                        " - " + formatter.format(abs(value))
+                    }
+                textView.text = text
+                textView.gravity = Gravity.CENTER_VERTICAL
+                textView.setTextColor(ContextCompat.getColor(context, R.color.white))
+                return textView
+            }
+
+            private fun formatValue(value: Double): String {
+                return if (value >= 0) {
+                    " + " + formatter.format(abs(value))
+                } else {
+                    " - " + formatter.format(abs(value))
+                }
+            }
+
+            fun getNotificationAndAddStatsToUserAsText(
+                xp: Double?,
+                hp: Double?,
+                gold: Double?,
+                mp: Double?,
+            ): Pair<SpannableStringBuilder, SnackbarDisplayType> {
+                val builder = SpannableStringBuilder()
+                var displayType = SnackbarDisplayType.NORMAL
+
+                if (xp != null && xp != 0.0) {
+                    builder.append(formatValue(xp)).append(" Exp")
+                }
+                if (hp != null && hp != 0.0) {
+                    if (hp < 0) {
+                        displayType = SnackbarDisplayType.FAILURE
+                    }
+                    builder.append(formatValue(hp)).append(" Health")
+                }
+                if (gold != null && gold != 0.0) {
+                    if (gold < 0) {
+                        displayType = SnackbarDisplayType.FAILURE
+                    }
+                    builder.append(formatValue(gold)).append(" Gold")
+                }
+                if (mp != null && mp != 0.0) {
+                    builder.append(formatValue(mp)).append(" Exp").append(" Mana")
+                }
+
+                return Pair(builder, displayType)
+            }
+        }
+    }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ScoreTaskLocallyInteractor.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ScoreTaskLocallyInteractor.kt
index 3dbada4e7..609fb6246 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ScoreTaskLocallyInteractor.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ScoreTaskLocallyInteractor.kt
@@ -16,40 +16,65 @@ class ScoreTaskLocallyInteractor {
         const val MIN_TASK_VALUE = -47.27
         const val CLOSE_ENOUGH = 0.00001
 
-        private fun calculateDelta(task: Task, direction: TaskDirection): Double {
-            val currentValue = when {
-                task.value < MIN_TASK_VALUE -> MIN_TASK_VALUE
-                task.value > MAX_TASK_VALUE -> MAX_TASK_VALUE
-                else -> task.value
-            }
+        private fun calculateDelta(
+            task: Task,
+            direction: TaskDirection,
+        ): Double {
+            val currentValue =
+                when {
+                    task.value < MIN_TASK_VALUE -> MIN_TASK_VALUE
+                    task.value > MAX_TASK_VALUE -> MAX_TASK_VALUE
+                    else -> task.value
+                }
 
-            var nextDelta = 0.9747.pow(currentValue) * if (direction == TaskDirection.DOWN) -1 else 1
+            var nextDelta =
+                0.9747.pow(currentValue) * if (direction == TaskDirection.DOWN) -1 else 1
 
             if ((task.checklist?.size ?: 0) > 0) {
                 if (task.type == TaskType.TODO) {
                     nextDelta *= 1 + (
                         task.checklist?.map { if (it.completed) 1 else 0 }?.reduce { _, _ -> 0 }
                             ?: 0
-                        )
+                    )
                 }
             }
 
             return nextDelta
         }
 
-        private fun scoreHabit(user: User, task: Task, direction: TaskDirection) {
+        private fun scoreHabit(
+            user: User,
+            task: Task,
+            direction: TaskDirection,
+        ) {
         }
 
-        private fun scoreDaily(user: User, task: Task, direction: TaskDirection) {
+        private fun scoreDaily(
+            user: User,
+            task: Task,
+            direction: TaskDirection,
+        ) {
         }
 
-        private fun scoreToDo(user: User, task: Task, direction: TaskDirection) {
+        private fun scoreToDo(
+            user: User,
+            task: Task,
+            direction: TaskDirection,
+        ) {
         }
 
-        private fun scoreReward(user: User, task: Task, direction: TaskDirection) {
+        private fun scoreReward(
+            user: User,
+            task: Task,
+            direction: TaskDirection,
+        ) {
         }
 
-        fun score(user: User, task: Task, direction: TaskDirection): TaskDirectionData? {
+        fun score(
+            user: User,
+            task: Task,
+            direction: TaskDirection,
+        ): TaskDirectionData? {
             return if (task.type == TaskType.HABIT || direction == TaskDirection.UP) {
                 val stats = user.stats ?: return null
                 val computedStats = computeStats(user)
@@ -96,7 +121,7 @@ class ScoreTaskLocallyInteractor {
             delta: Double,
             stats: Stats,
             computedStats: Stats,
-            task: Task
+            task: Task,
         ) {
             var conBonus = 1f - ((computedStats.constitution?.toFloat() ?: 0f) / 250f)
             if (conBonus < 0.1) {
@@ -112,26 +137,27 @@ class ScoreTaskLocallyInteractor {
             stats: Stats,
             computedStats: Stats,
             task: Task,
-            direction: TaskDirection
+            direction: TaskDirection,
         ) {
             val intBonus = 1f + ((computedStats.intelligence?.toFloat() ?: 0f) * 0.025f)
             result.exp = (
                 stats.exp
                     ?: 0.0
-                ) + (delta * intBonus * task.priority * 6).roundToLong().toDouble()
+            ) + (delta * intBonus * task.priority * 6).roundToLong().toDouble()
 
             val perBonus = 1f + ((computedStats.per?.toFloat() ?: 0f) * 0.02f)
             val goldMod = delta * task.priority * perBonus
 
             val streak = task.streak ?: 0
-            result.gp = (stats.gp ?: 0.0) + if (task.streak != null) {
-                val currentStreak = if (direction == TaskDirection.DOWN) streak - 1 else streak
-                val streakBonus = (currentStreak / 100) * 1
-                val afterStreak = goldMod * streakBonus
-                afterStreak
-            } else {
-                goldMod
-            }
+            result.gp = (stats.gp ?: 0.0) +
+                if (task.streak != null) {
+                    val currentStreak = if (direction == TaskDirection.DOWN) streak - 1 else streak
+                    val streakBonus = (currentStreak / 100) * 1
+                    val afterStreak = goldMod * streakBonus
+                    afterStreak
+                } else {
+                    goldMod
+                }
         }
 
         private fun computeStats(user: User): Stats {
@@ -143,7 +169,7 @@ class ScoreTaskLocallyInteractor {
             var totalPerception = levelStat
 
             totalStrength += user.stats?.buffs?.str?.toInt() ?: 0
-            totalIntelligence += user.stats?.buffs?._int?.toInt() ?: 0
+            totalIntelligence += user.stats?.buffs?.intelligence?.toInt() ?: 0
             totalConstitution += user.stats?.buffs?.con?.toInt() ?: 0
             totalPerception += user.stats?.buffs?.per?.toInt() ?: 0
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ShareAvatarUseCase.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ShareAvatarUseCase.kt
index a5ce03667..034f08624 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ShareAvatarUseCase.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ShareAvatarUseCase.kt
@@ -7,16 +7,33 @@ import com.habitrpg.common.habitica.views.AvatarView
 import com.habitrpg.shared.habitica.models.Avatar
 import javax.inject.Inject
 
-class ShareAvatarUseCase @Inject constructor() : UseCase<ShareAvatarUseCase.RequestValues, Unit>() {
-    override suspend fun run(requestValues: RequestValues) {
-        val avatarView = AvatarView(requestValues.activity, showBackground = true, showMount = true, showPet = true)
-        avatarView.setAvatar(requestValues.avatar)
-        var sharedImage: Bitmap? = null
-        avatarView.onAvatarImageReady { image ->
-            sharedImage = image?.scale(image.width * 3, image.height * 3, false)
-            requestValues.activity.shareContent(requestValues.identifier, requestValues.message, sharedImage)
+class ShareAvatarUseCase
+    @Inject
+    constructor() : UseCase<ShareAvatarUseCase.RequestValues, Unit>() {
+        override suspend fun run(requestValues: RequestValues) {
+            val avatarView =
+                AvatarView(
+                    requestValues.activity,
+                    showBackground = true,
+                    showMount = true,
+                    showPet = true,
+                )
+            avatarView.setAvatar(requestValues.avatar)
+            var sharedImage: Bitmap? = null
+            avatarView.onAvatarImageReady { image ->
+                sharedImage = image?.scale(image.width * 3, image.height * 3, false)
+                requestValues.activity.shareContent(
+                    requestValues.identifier,
+                    requestValues.message,
+                    sharedImage,
+                )
+            }
         }
-    }
 
-    class RequestValues(val activity: BaseActivity, val avatar: Avatar, val message: String?, val identifier: String): UseCase.RequestValues
-}
+        class RequestValues(
+            val activity: BaseActivity,
+            val avatar: Avatar,
+            val message: String?,
+            val identifier: String,
+        ) : UseCase.RequestValues
+    }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ShareMountUseCase.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ShareMountUseCase.kt
index bc61153ed..f308d720a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ShareMountUseCase.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ShareMountUseCase.kt
@@ -20,14 +20,15 @@ import com.habitrpg.common.habitica.extensions.layoutInflater
 import com.habitrpg.common.habitica.theme.HabiticaTheme
 import kotlinx.coroutines.delay
 
-class ShareMountUseCase: UseCase<ShareMountUseCase.RequestValues, Unit>() {
+class ShareMountUseCase : UseCase<ShareMountUseCase.RequestValues, Unit>() {
     class RequestValues(val mountKey: String, val message: String, val context: Context) :
         UseCase.RequestValues
 
     override suspend fun run(requestValues: RequestValues) {
         val mountWrapper = MountImageviewBinding.inflate(requestValues.context.layoutInflater)
         mountWrapper.root.visibility = View.INVISIBLE
-        val width = if (mountWrapper.root.width > 0) mountWrapper.root.width else 300.dpToPx(requestValues.context)
+        val width =
+            if (mountWrapper.root.width > 0) mountWrapper.root.width else 300.dpToPx(requestValues.context)
         val height = 124.dpToPx(requestValues.context)
         mountWrapper.root.layout(0, 0, width, height)
         mountWrapper.mountImageview.setMount(requestValues.mountKey)
@@ -47,11 +48,12 @@ class ShareMountUseCase: UseCase<ShareMountUseCase.RequestValues, Unit>() {
         }
         mountWrapper.backgroundView.layout(0, 0, width, height)
         mountWrapper.mountImageview.layout(0, 0, width, height)
-        val sharedImage = Bitmap.createBitmap(
-            width,
-            height,
-            Bitmap.Config.ARGB_8888
-        )
+        val sharedImage =
+            Bitmap.createBitmap(
+                width,
+                height,
+                Bitmap.Config.ARGB_8888,
+            )
         val canvas = Canvas(sharedImage)
         var attempts = 0
         while (!mountWrapper.mountImageview.hasLoadedImages && attempts < 200) {
@@ -61,9 +63,11 @@ class ShareMountUseCase: UseCase<ShareMountUseCase.RequestValues, Unit>() {
         // Draw it to the canvas once it's layouted
         mountWrapper.root.doOnNextLayout {
             mountWrapper.root.draw(canvas)
-            ((requestValues.context as? BaseActivity) ?: HabiticaBaseApplication.getInstance(
-                requestValues.context
-            )?.currentActivity?.get())?.shareContent("pet", requestValues.message, sharedImage)
+            (
+                (requestValues.context as? BaseActivity) ?: HabiticaBaseApplication.getInstance(
+                    requestValues.context,
+                )?.currentActivity?.get()
+            )?.shareContent("pet", requestValues.message, sharedImage)
             containerView?.removeView(mountWrapper.root)
         }
         // trigger layout
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/SharePetUseCase.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/SharePetUseCase.kt
index 8d27533b6..efce3f7c8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/SharePetUseCase.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/SharePetUseCase.kt
@@ -22,7 +22,7 @@ import com.habitrpg.common.habitica.extensions.loadImage
 import com.habitrpg.common.habitica.theme.HabiticaTheme
 import kotlinx.coroutines.delay
 
-class SharePetUseCase: UseCase<SharePetUseCase.RequestValues, Unit>() {
+class SharePetUseCase : UseCase<SharePetUseCase.RequestValues, Unit>() {
     class RequestValues(val petKey: String, val message: String, val context: Context) :
         UseCase.RequestValues
 
@@ -44,13 +44,15 @@ class SharePetUseCase: UseCase<SharePetUseCase.RequestValues, Unit>() {
             petWrapper.root.setViewTreeSavedStateRegistryOwner(currentActivity)
             petWrapper.root.setViewTreeLifecycleOwner(currentActivity)
         }
-        val width = if (petWrapper.root.width > 0) petWrapper.root.width else 300.dpToPx(requestValues.context)
+        val width =
+            if (petWrapper.root.width > 0) petWrapper.root.width else 300.dpToPx(requestValues.context)
         val height = 124.dpToPx(requestValues.context)
-        val sharedImage = Bitmap.createBitmap(
-            width,
-            height,
-            Bitmap.Config.ARGB_8888
-        )
+        val sharedImage =
+            Bitmap.createBitmap(
+                width,
+                height,
+                Bitmap.Config.ARGB_8888,
+            )
         val canvas = Canvas(sharedImage)
         var attempts = 0
         while (petWrapper.petImageview.bitmap == null && attempts < 200) {
@@ -59,9 +61,11 @@ class SharePetUseCase: UseCase<SharePetUseCase.RequestValues, Unit>() {
         }
         petWrapper.root.doOnNextLayout {
             petWrapper.root.draw(canvas)
-            ((requestValues.context as? BaseActivity) ?: HabiticaBaseApplication.getInstance(
-                requestValues.context
-            )?.currentActivity?.get())?.shareContent("pet", requestValues.message, sharedImage)
+            (
+                (requestValues.context as? BaseActivity) ?: HabiticaBaseApplication.getInstance(
+                    requestValues.context,
+                )?.currentActivity?.get()
+            )?.shareContent("pet", requestValues.message, sharedImage)
             containerView?.removeView(petWrapper.root)
         }
         val m = FrameLayout.LayoutParams(width, height)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ShowNotificationInteractor.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ShowNotificationInteractor.kt
index bd6485848..d19a7900b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ShowNotificationInteractor.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ShowNotificationInteractor.kt
@@ -28,9 +28,8 @@ import kotlinx.coroutines.launch
 
 class ShowNotificationInteractor(
     private val activity: Activity,
-    private val lifecycleScope: LifecycleCoroutineScope
+    private val lifecycleScope: LifecycleCoroutineScope,
 ) {
-
     fun handleNotification(notification: Notification): Boolean {
         when (notification.type) {
             Notification.Type.LOGIN_INCENTIVE.type -> showCheckinDialog(notification)
@@ -40,28 +39,60 @@ class ShowNotificationInteractor(
             Notification.Type.ACHIEVEMENT_MOUNT_MASTER.type -> showAchievementDialog(notification)
             Notification.Type.ACHIEVEMENT_TRIAD_BINGO.type -> showAchievementDialog(notification)
             Notification.Type.ACHIEVEMENT_GUILD_JOINED.type -> showAchievementDialog(notification)
-            Notification.Type.ACHIEVEMENT_CHALLENGE_JOINED.type -> showAchievementDialog(notification)
+            Notification.Type.ACHIEVEMENT_CHALLENGE_JOINED.type ->
+                showAchievementDialog(
+                    notification,
+                )
+
             Notification.Type.ACHIEVEMENT_INVITED_FRIEND.type -> showAchievementDialog(notification)
             Notification.Type.WON_CHALLENGE.type -> showWonChallengeDialog(notification)
 
             Notification.Type.ACHIEVEMENT_ALL_YOUR_BASE.type -> showAchievementDialog(notification)
             Notification.Type.ACHIEVEMENT_BACK_TO_BASICS.type -> showAchievementDialog(notification)
             Notification.Type.ACHIEVEMENT_JUST_ADD_WATER.type -> showAchievementDialog(notification)
-            Notification.Type.ACHIEVEMENT_LOST_MASTERCLASSER.type -> showAchievementDialog(notification)
-            Notification.Type.ACHIEVEMENT_MIND_OVER_MATTER.type -> showAchievementDialog(notification)
+            Notification.Type.ACHIEVEMENT_LOST_MASTERCLASSER.type ->
+                showAchievementDialog(
+                    notification,
+                )
+
+            Notification.Type.ACHIEVEMENT_MIND_OVER_MATTER.type ->
+                showAchievementDialog(
+                    notification,
+                )
+
             Notification.Type.ACHIEVEMENT_DUST_DEVIL.type -> showAchievementDialog(notification)
             Notification.Type.ACHIEVEMENT_ARID_AUTHORITY.type -> showAchievementDialog(notification)
             Notification.Type.ACHIEVEMENT_MONSTER_MAGUS.type -> showAchievementDialog(notification)
-            Notification.Type.ACHIEVEMENT_UNDEAD_UNDERTAKER.type -> showAchievementDialog(notification)
-            Notification.Type.ACHIEVEMENT_PRIMED_FOR_PAINTING.type -> showAchievementDialog(notification)
+            Notification.Type.ACHIEVEMENT_UNDEAD_UNDERTAKER.type ->
+                showAchievementDialog(
+                    notification,
+                )
+
+            Notification.Type.ACHIEVEMENT_PRIMED_FOR_PAINTING.type ->
+                showAchievementDialog(
+                    notification,
+                )
+
             Notification.Type.ACHIEVEMENT_PEARLY_PRO.type -> showAchievementDialog(notification)
             Notification.Type.ACHIEVEMENT_TICKLED_PINK.type -> showAchievementDialog(notification)
             Notification.Type.ACHIEVEMENT_ROSY_OUTLOOK.type -> showAchievementDialog(notification)
             Notification.Type.ACHIEVEMENT_BUG_BONANZA.type -> showAchievementDialog(notification)
-            Notification.Type.ACHIEVEMENT_BARE_NECESSITIES.type -> showAchievementDialog(notification)
-            Notification.Type.ACHIEVEMENT_FRESHWATER_FRIENDS.type -> showAchievementDialog(notification)
+            Notification.Type.ACHIEVEMENT_BARE_NECESSITIES.type ->
+                showAchievementDialog(
+                    notification,
+                )
+
+            Notification.Type.ACHIEVEMENT_FRESHWATER_FRIENDS.type ->
+                showAchievementDialog(
+                    notification,
+                )
+
             Notification.Type.ACHIEVEMENT_GOOD_AS_GOLD.type -> showAchievementDialog(notification)
-            Notification.Type.ACHIEVEMENT_ALL_THAT_GLITTERS.type -> showAchievementDialog(notification)
+            Notification.Type.ACHIEVEMENT_ALL_THAT_GLITTERS.type ->
+                showAchievementDialog(
+                    notification,
+                )
+
             Notification.Type.ACHIEVEMENT_GOOD_AS_GOLD.type -> showAchievementDialog(notification)
             Notification.Type.ACHIEVEMENT_BONE_COLLECTOR.type -> showAchievementDialog(notification)
             Notification.Type.ACHIEVEMENT_SKELETON_CREW.type -> showAchievementDialog(notification)
@@ -69,7 +100,11 @@ class ShowNotificationInteractor(
             Notification.Type.ACHIEVEMENT_RED_LETTER_DAY.type -> showAchievementDialog(notification)
 
             Notification.Type.ACHIEVEMENT_GENERIC.type -> showAchievementDialog(notification)
-            Notification.Type.ACHIEVEMENT_ONBOARDING_COMPLETE.type -> showAchievementDialog(notification)
+            Notification.Type.ACHIEVEMENT_ONBOARDING_COMPLETE.type ->
+                showAchievementDialog(
+                    notification,
+                )
+
             Notification.Type.FIRST_DROP.type -> showFirstDropDialog(notification)
             else -> return false
         }
@@ -78,7 +113,8 @@ class ShowNotificationInteractor(
 
     fun showCheckinDialog(notification: Notification) {
         val notificationData = notification.data as? LoginIncentiveData
-        val nextUnlockText = activity.getString(R.string.nextPrizeUnlocks, notificationData?.nextRewardAt)
+        val nextUnlockText =
+            activity.getString(R.string.nextPrizeUnlocks, notificationData?.nextRewardAt)
         if (notificationData?.rewardKey != null) {
             val title = notificationData.message
 
@@ -92,7 +128,8 @@ class ShowNotificationInteractor(
             }
             imageView?.loadImage(imageKey)
 
-            val youEarnedMessage = activity.getString(R.string.checkInRewardEarned, notificationData.rewardText)
+            val youEarnedMessage =
+                activity.getString(R.string.checkInRewardEarned, notificationData.rewardText)
             val youEarnedTexView = view.findViewById(R.id.you_earned_message) as? TextView
             youEarnedTexView?.text = youEarnedMessage
 
@@ -115,7 +152,7 @@ class ShowNotificationInteractor(
             (activity as? SnackbarActivity)?.showSnackbar(
                 title = notificationData?.message,
                 content = nextUnlockText,
-                displayType = HabiticaSnackbar.SnackbarDisplayType.BLUE
+                displayType = HabiticaSnackbar.SnackbarDisplayType.BLUE,
             )
         }
     }
@@ -123,11 +160,12 @@ class ShowNotificationInteractor(
     fun showAchievementDialog(notification: Notification) {
         val data = (notification.data as? AchievementData) ?: return
         val achievement = data.achievement ?: notification.type ?: ""
-        val delayTime: Long = if (achievement == "createdTask" || achievement == Notification.Type.ACHIEVEMENT_ONBOARDING_COMPLETE.type) {
-            1000
-        } else {
-            200
-        }
+        val delayTime: Long =
+            if (achievement == "createdTask" || achievement == Notification.Type.ACHIEVEMENT_ONBOARDING_COMPLETE.type) {
+                1000
+            } else {
+                200
+            }
         lifecycleScope.launch(ExceptionHandler.coroutine()) {
             delay(delayTime)
             lifecycleScope.launch(context = Dispatchers.Main) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/UseCase.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/UseCase.kt
index 19c76a6fc..d75f3cedf 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/UseCase.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/UseCase.kt
@@ -5,6 +5,7 @@ import kotlinx.coroutines.withContext
 
 abstract class UseCase<Q : UseCase.RequestValues?, T> {
     protected abstract suspend fun run(requestValues: Q): T
+
     suspend fun callInteractor(requestValues: Q): T {
         return withContext(Dispatchers.Main) {
             run(requestValues)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/CustomizationFilter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/CustomizationFilter.kt
index 3c5a5ae69..c3bf30ff6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/CustomizationFilter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/CustomizationFilter.kt
@@ -3,7 +3,7 @@ package com.habitrpg.android.habitica.models
 data class CustomizationFilter(
     var onlyPurchased: Boolean = false,
     var ascending: Boolean = false,
-    var months: MutableList<String> = mutableListOf()
+    var months: MutableList<String> = mutableListOf(),
 ) {
     val isFiltering: Boolean
         get() {
@@ -12,7 +12,10 @@ data class CustomizationFilter(
 
     override fun equals(other: Any?): Boolean {
         if (other is CustomizationFilter) {
-            return onlyPurchased == other.onlyPurchased && ascending == other.ascending && months.size == other.months.size && months.containsAll(other.months)
+            return onlyPurchased == other.onlyPurchased && ascending == other.ascending && months.size == other.months.size &&
+                months.containsAll(
+                    other.months,
+                )
         }
         return super.equals(other)
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/FAQArticle.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/FAQArticle.kt
index 4a9b04449..f29a41f4f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/FAQArticle.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/FAQArticle.kt
@@ -1,13 +1,12 @@
-package com.habitrpg.android.habitica.models
-
-import io.realm.RealmObject
-import io.realm.annotations.PrimaryKey
-
-open class FAQArticle : RealmObject(), BaseObject {
-
-    @PrimaryKey
-    var position: Int? = null
-
-    var question: String? = null
-    var answer: String? = null
-}
+package com.habitrpg.android.habitica.models
+
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
+
+open class FAQArticle : RealmObject(), BaseObject {
+    @PrimaryKey
+    var position: Int? = null
+
+    var question: String? = null
+    var answer: String? = null
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/SetupCustomization.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/SetupCustomization.kt
index 7848dcb19..8c49152aa 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/SetupCustomization.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/SetupCustomization.kt
@@ -1,105 +1,131 @@
-package com.habitrpg.android.habitica.models
-
-class SetupCustomization {
-
-    var key: String = ""
-    var drawableId: Int? = null
-    var colorId: Int? = null
-    var text: String = ""
-    var path: String = ""
-    var category: String = ""
-    var subcategory: String = ""
-
-    companion object {
-
-        fun createSize(key: String, drawableId: Int, text: String): SetupCustomization {
-            val customization = SetupCustomization()
-            customization.key = key
-            customization.drawableId = drawableId
-            customization.text = text
-            customization.path = "size"
-            customization.category = "body"
-            customization.subcategory = "size"
-            return customization
-        }
-
-        fun createShirt(key: String, drawableId: Int): SetupCustomization {
-            val customization = SetupCustomization()
-            customization.key = key
-            customization.drawableId = drawableId
-            customization.path = "shirt"
-            customization.category = "body"
-            customization.subcategory = "shirt"
-            return customization
-        }
-
-        fun createSkin(key: String, colorId: Int?): SetupCustomization {
-            val customization = SetupCustomization()
-            customization.key = key
-            customization.colorId = colorId
-            customization.path = "skin"
-            customization.category = "skin"
-            return customization
-        }
-
-        fun createHairColor(key: String, colorId: Int?): SetupCustomization {
-            val customization = SetupCustomization()
-            customization.key = key
-            customization.colorId = colorId
-            customization.path = "hair.color"
-            customization.category = "hair"
-            customization.subcategory = "color"
-            return customization
-        }
-
-        fun createHairBangs(key: String, drawableId: Int?): SetupCustomization {
-            val customization = SetupCustomization()
-            customization.key = key
-            customization.drawableId = drawableId
-            customization.path = "hair.bangs"
-            customization.category = "hair"
-            customization.subcategory = "bangs"
-            return customization
-        }
-
-        fun createHairPonytail(key: String, drawableId: Int?): SetupCustomization {
-            val customization = SetupCustomization()
-            customization.key = key
-            customization.drawableId = drawableId
-            customization.path = "hair.base"
-            customization.category = "hair"
-            customization.subcategory = "base"
-            return customization
-        }
-
-        fun createGlasses(key: String, drawableId: Int?): SetupCustomization {
-            val customization = SetupCustomization()
-            customization.key = key
-            customization.drawableId = drawableId
-            customization.path = "glasses"
-            customization.category = "extras"
-            customization.subcategory = "glasses"
-            return customization
-        }
-
-        fun createFlower(key: String, drawableId: Int?): SetupCustomization {
-            val customization = SetupCustomization()
-            customization.key = key
-            customization.drawableId = drawableId
-            customization.path = "hair.flower"
-            customization.category = "extras"
-            customization.subcategory = "flower"
-            return customization
-        }
-
-        fun createWheelchair(key: String, drawableId: Int?): SetupCustomization {
-            val customization = SetupCustomization()
-            customization.key = key
-            customization.drawableId = drawableId
-            customization.path = "chair"
-            customization.category = "extras"
-            customization.subcategory = "wheelchair"
-            return customization
-        }
-    }
-}
+package com.habitrpg.android.habitica.models
+
+class SetupCustomization {
+    var key: String = ""
+    var drawableId: Int? = null
+    var colorId: Int? = null
+    var text: String = ""
+    var path: String = ""
+    var category: String = ""
+    var subcategory: String = ""
+
+    companion object {
+        fun createSize(
+            key: String,
+            drawableId: Int,
+            text: String,
+        ): SetupCustomization {
+            val customization = SetupCustomization()
+            customization.key = key
+            customization.drawableId = drawableId
+            customization.text = text
+            customization.path = "size"
+            customization.category = "body"
+            customization.subcategory = "size"
+            return customization
+        }
+
+        fun createShirt(
+            key: String,
+            drawableId: Int,
+        ): SetupCustomization {
+            val customization = SetupCustomization()
+            customization.key = key
+            customization.drawableId = drawableId
+            customization.path = "shirt"
+            customization.category = "body"
+            customization.subcategory = "shirt"
+            return customization
+        }
+
+        fun createSkin(
+            key: String,
+            colorId: Int?,
+        ): SetupCustomization {
+            val customization = SetupCustomization()
+            customization.key = key
+            customization.colorId = colorId
+            customization.path = "skin"
+            customization.category = "skin"
+            return customization
+        }
+
+        fun createHairColor(
+            key: String,
+            colorId: Int?,
+        ): SetupCustomization {
+            val customization = SetupCustomization()
+            customization.key = key
+            customization.colorId = colorId
+            customization.path = "hair.color"
+            customization.category = "hair"
+            customization.subcategory = "color"
+            return customization
+        }
+
+        fun createHairBangs(
+            key: String,
+            drawableId: Int?,
+        ): SetupCustomization {
+            val customization = SetupCustomization()
+            customization.key = key
+            customization.drawableId = drawableId
+            customization.path = "hair.bangs"
+            customization.category = "hair"
+            customization.subcategory = "bangs"
+            return customization
+        }
+
+        fun createHairPonytail(
+            key: String,
+            drawableId: Int?,
+        ): SetupCustomization {
+            val customization = SetupCustomization()
+            customization.key = key
+            customization.drawableId = drawableId
+            customization.path = "hair.base"
+            customization.category = "hair"
+            customization.subcategory = "base"
+            return customization
+        }
+
+        fun createGlasses(
+            key: String,
+            drawableId: Int?,
+        ): SetupCustomization {
+            val customization = SetupCustomization()
+            customization.key = key
+            customization.drawableId = drawableId
+            customization.path = "glasses"
+            customization.category = "extras"
+            customization.subcategory = "glasses"
+            return customization
+        }
+
+        fun createFlower(
+            key: String,
+            drawableId: Int?,
+        ): SetupCustomization {
+            val customization = SetupCustomization()
+            customization.key = key
+            customization.drawableId = drawableId
+            customization.path = "hair.flower"
+            customization.category = "extras"
+            customization.subcategory = "flower"
+            return customization
+        }
+
+        fun createWheelchair(
+            key: String,
+            drawableId: Int?,
+        ): SetupCustomization {
+            val customization = SetupCustomization()
+            customization.key = key
+            customization.drawableId = drawableId
+            customization.path = "chair"
+            customization.category = "extras"
+            customization.subcategory = "wheelchair"
+            return customization
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Skill.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Skill.kt
index 35192789f..29769f3eb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Skill.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Skill.kt
@@ -1,16 +1,15 @@
-package com.habitrpg.android.habitica.models
-
-import io.realm.RealmObject
-import io.realm.annotations.PrimaryKey
-
-open class Skill : RealmObject(), BaseObject {
-
-    @PrimaryKey
-    var key: String = ""
-    var text: String = ""
-    var notes: String? = null
-    var target: String? = null
-    var habitClass: String? = null
-    var mana: Int? = null
-    var lvl: Int? = null
-}
+package com.habitrpg.android.habitica.models
+
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
+
+open class Skill : RealmObject(), BaseObject {
+    @PrimaryKey
+    var key: String = ""
+    var text: String = ""
+    var notes: String? = null
+    var target: String? = null
+    var habitClass: String? = null
+    var mana: Int? = null
+    var lvl: Int? = null
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Tag.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Tag.kt
index acf94c6fe..d409e9212 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Tag.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Tag.kt
@@ -1,26 +1,25 @@
-package com.habitrpg.android.habitica.models
-
-import io.realm.RealmObject
-import io.realm.annotations.PrimaryKey
-
-open class Tag : RealmObject(), BaseObject {
-
-    @PrimaryKey
-    var id: String = ""
-
-    var userId: String? = null
-    var name: String = ""
-    var group: String? = null
-    internal var challenge: Boolean = false
-
-    override fun equals(other: Any?): Boolean {
-        if (other is Tag) {
-            return this.id == other.id
-        }
-        return super.equals(other)
-    }
-
-    override fun hashCode(): Int {
-        return id.hashCode()
-    }
-}
+package com.habitrpg.android.habitica.models
+
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
+
+open class Tag : RealmObject(), BaseObject {
+    @PrimaryKey
+    var id: String = ""
+
+    var userId: String? = null
+    var name: String = ""
+    var group: String? = null
+    internal var challenge: Boolean = false
+
+    override fun equals(other: Any?): Boolean {
+        if (other is Tag) {
+            return this.id == other.id
+        }
+        return super.equals(other)
+    }
+
+    override fun hashCode(): Int {
+        return id.hashCode()
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/TutorialStep.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/TutorialStep.kt
index f2b1d863e..11d05f8fc 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/TutorialStep.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/TutorialStep.kt
@@ -1,48 +1,47 @@
-package com.habitrpg.android.habitica.models
-
-import io.realm.RealmModel
-import io.realm.RealmObject
-import io.realm.annotations.RealmClass
-import java.util.Date
-
-@RealmClass(embedded = true)
-open class TutorialStep : RealmObject(), BaseMainObject {
-
-    var key: String? = null
-    var tutorialGroup: String? = null
-        set(group) {
-            field = group
-            this.key = group + "_" + this.identifier
-        }
-    var identifier: String? = null
-        set(identifier) {
-            field = identifier
-            this.key = this.tutorialGroup + "_" + identifier
-        }
-    var wasCompleted: Boolean = false
-    var displayedOn: Date? = null
-
-    val shouldDisplay: Boolean
-        get() {
-            return !this.wasCompleted && (
-                this.displayedOn == null || Date().time - (
-                    displayedOn?.time
-                        ?: 0
-                    ) > 86400000
-                )
-        }
-    override val realmClass: Class<out RealmModel>
-        get() = TutorialStep::class.java
-    override val primaryIdentifier: String?
-        get() = key
-    override val primaryIdentifierName: String
-        get() = "key"
-
-    val flagPath: String
-        get() = "flags.tutorial.$tutorialGroup.$identifier"
-
-    val linkFAQ: Boolean
-        get() {
-            return identifier == "party"
-        }
-}
+package com.habitrpg.android.habitica.models
+
+import io.realm.RealmModel
+import io.realm.RealmObject
+import io.realm.annotations.RealmClass
+import java.util.Date
+
+@RealmClass(embedded = true)
+open class TutorialStep : RealmObject(), BaseMainObject {
+    var key: String? = null
+    var tutorialGroup: String? = null
+        set(group) {
+            field = group
+            this.key = group + "_" + this.identifier
+        }
+    var identifier: String? = null
+        set(identifier) {
+            field = identifier
+            this.key = this.tutorialGroup + "_" + identifier
+        }
+    var wasCompleted: Boolean = false
+    var displayedOn: Date? = null
+
+    val shouldDisplay: Boolean
+        get() {
+            return !this.wasCompleted && (
+                this.displayedOn == null || Date().time - (
+                    displayedOn?.time
+                        ?: 0
+                ) > 86400000
+            )
+        }
+    override val realmClass: Class<out RealmModel>
+        get() = TutorialStep::class.java
+    override val primaryIdentifier: String?
+        get() = key
+    override val primaryIdentifierName: String
+        get() = "key"
+
+    val flagPath: String
+        get() = "flags.tutorial.$tutorialGroup.$identifier"
+
+    val linkFAQ: Boolean
+        get() {
+            return identifier == "party"
+        }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Customization.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Customization.kt
index 95a174152..2f331145a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Customization.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Customization.kt
@@ -1,101 +1,116 @@
-package com.habitrpg.android.habitica.models.inventory
-
-import com.habitrpg.android.habitica.models.BaseObject
-import io.realm.RealmObject
-import io.realm.annotations.PrimaryKey
-import java.util.Date
-
-open class Customization : RealmObject(), BaseObject {
-    @PrimaryKey
-    var id: String? = null
-    var identifier: String? = null
-        set(value) {
-            field = value
-            updateID()
-        }
-    var category: String? = null
-        set(value) {
-            field = value
-            updateID()
-        }
-    var type: String? = null
-        set(value) {
-            field = value
-            updateID()
-        }
-    var notes: String? = null
-    var customizationSet: String? = null
-    var customizationSetName: String? = null
-    var text: String? = null
-    var isBuyable = false
-    var price: Int? = null
-    var setPrice: Int? = null
-    var availableFrom: Date? = null
-    var availableUntil: Date? = null
-    private fun updateID() {
-        id = identifier + "_" + type + "_" + this.category
-    }
-
-    // Not released yet
-    val purchasable: Boolean
-        get() {
-            val today = Date()
-            if (availableFrom != null && !availableFrom!!.before(today)) { // Not released yet
-                return false
-            }
-            return !(availableUntil != null && !availableUntil!!.after(today))
-        }
-
-    fun getIconName(userSize: String?, hairColor: String?): String? {
-        return "icon_" + (getImageName(userSize, hairColor) ?: return null)
-    }
-
-    fun getImageName(userSize: String?, hairColor: String?): String? {
-        if (!this.isValid()) { return null }
-        if (identifier?.isNotBlank() != true || identifier == "none" || identifier == "0") return null
-        return when (type) {
-            "skin" -> return "skin_$identifier"
-            "shirt" -> return userSize + "_shirt_" + identifier
-            "hair" -> {
-                    when (this.category) {
-                        "color" -> "hair_bangs_1_$identifier"
-                        "flower" -> "hair_flower_$identifier"
-                        else -> "hair_" + this.category + "_" + identifier + "_" + hairColor
-                    }
-            }
-            "background" -> return "background_$identifier"
-            "chair" -> return "chair_$identifier"
-            else -> null
-        }
-    }
-
-    fun isUsable(purchased: Boolean): Boolean {
-        return price == null || price == 0 || purchased
-    }
-
-    val path: String
-        get() {
-            var path = if (type == "background") "backgrounds.backgrounds" else type
-            if (this.customizationSet != null) {
-                path = if (type == "background") {
-                    path + this.customizationSet?.substring(5, 7) + this.customizationSet?.substring(0, 4)
-                } else {
-                    path + "." + this.customizationSet
-                }
-            } else if (this.category != null) {
-                path = path + "." + this.category
-            }
-            path = "$path.$identifier"
-            return path
-        }
-
-    val unlockPath: String
-        get() {
-            var path = type
-            if (this.category != null) {
-                path = path + "." + this.category
-            }
-            path = "$path.$identifier"
-            return path
-        }
-}
+package com.habitrpg.android.habitica.models.inventory
+
+import com.habitrpg.android.habitica.models.BaseObject
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
+import java.util.Date
+
+open class Customization : RealmObject(), BaseObject {
+    @PrimaryKey
+    var id: String? = null
+    var identifier: String? = null
+        set(value) {
+            field = value
+            updateID()
+        }
+    var category: String? = null
+        set(value) {
+            field = value
+            updateID()
+        }
+    var type: String? = null
+        set(value) {
+            field = value
+            updateID()
+        }
+    var notes: String? = null
+    var customizationSet: String? = null
+    var customizationSetName: String? = null
+    var text: String? = null
+    var isBuyable = false
+    var price: Int? = null
+    var setPrice: Int? = null
+    var availableFrom: Date? = null
+    var availableUntil: Date? = null
+
+    private fun updateID() {
+        id = identifier + "_" + type + "_" + this.category
+    }
+
+    // Not released yet
+    val purchasable: Boolean
+        get() {
+            val today = Date()
+            if (availableFrom != null && !availableFrom!!.before(today)) { // Not released yet
+                return false
+            }
+            return !(availableUntil != null && !availableUntil!!.after(today))
+        }
+
+    fun getIconName(
+        userSize: String?,
+        hairColor: String?,
+    ): String? {
+        return "icon_" + (getImageName(userSize, hairColor) ?: return null)
+    }
+
+    fun getImageName(
+        userSize: String?,
+        hairColor: String?,
+    ): String? {
+        if (!this.isValid) {
+            return null
+        }
+        if (identifier?.isNotBlank() != true || identifier == "none" || identifier == "0") return null
+        return when (type) {
+            "skin" -> return "skin_$identifier"
+            "shirt" -> return userSize + "_shirt_" + identifier
+            "hair" -> {
+                when (this.category) {
+                    "color" -> "hair_bangs_1_$identifier"
+                    "flower" -> "hair_flower_$identifier"
+                    else -> "hair_" + this.category + "_" + identifier + "_" + hairColor
+                }
+            }
+
+            "background" -> return "background_$identifier"
+            "chair" -> return "chair_$identifier"
+            else -> null
+        }
+    }
+
+    fun isUsable(purchased: Boolean): Boolean {
+        return price == null || price == 0 || purchased
+    }
+
+    val path: String
+        get() {
+            var path = if (type == "background") "backgrounds.backgrounds" else type
+            if (this.customizationSet != null) {
+                path =
+                    if (type == "background") {
+                        path +
+                            this.customizationSet?.substring(
+                                5,
+                                7,
+                            ) + this.customizationSet?.substring(0, 4)
+                    } else {
+                        path + "." + this.customizationSet
+                    }
+            } else if (this.category != null) {
+                path = path + "." + this.category
+            }
+            path = "$path.$identifier"
+            return path
+        }
+
+    val unlockPath: String
+        get() {
+            var path = type
+            if (this.category != null) {
+                path = path + "." + this.category
+            }
+            path = "$path.$identifier"
+            return path
+        }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Equipment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Equipment.kt
index af27a2d88..11b249274 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Equipment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Equipment.kt
@@ -7,7 +7,6 @@ import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
 
 open class Equipment : RealmObject(), BaseMainObject {
-
     var value: Double = 0.toDouble()
     var type: String? = ""
 
@@ -24,7 +23,7 @@ open class Equipment : RealmObject(), BaseMainObject {
     var released: Boolean = true
 
     @SerializedName("int")
-    var _int: Int = 0
+    var intelligence: Int = 0
     var owned: Boolean? = null
     var twoHanded = false
     var mystery = ""
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Quest.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Quest.kt
index d34a9ae5c..990c75151 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Quest.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Quest.kt
@@ -1,5 +1,6 @@
 package com.habitrpg.android.habitica.models.inventory
 
+import com.google.gson.annotations.SerializedName
 import com.habitrpg.android.habitica.models.BaseObject
 import com.habitrpg.android.habitica.models.members.Member
 import io.realm.RealmList
@@ -20,7 +21,9 @@ open class Quest : RealmObject(), BaseObject {
         }
     var active: Boolean = false
     var leader: String? = null
-    var RSVPNeeded: Boolean = false
+
+    @SerializedName("RSVPNeeded")
+    var rsvpNeeded: Boolean = false
 
     var members: RealmList<QuestMember>? = null
     var progress: QuestProgress? = null
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestBoss.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestBoss.kt
index 9d2a50b41..2ac80a133 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestBoss.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestBoss.kt
@@ -1,25 +1,24 @@
-package com.habitrpg.android.habitica.models.inventory
-
-import com.habitrpg.android.habitica.models.BaseObject
-import io.realm.RealmObject
-import io.realm.annotations.PrimaryKey
-
-open class QuestBoss : RealmObject(), BaseObject {
-
-    @PrimaryKey
-    var key: String? = null
-        set(value) {
-            field = value
-            rage?.key = key
-        }
-    var name: String? = null
-    var hp: Int = 0
-    var str: Float = 0.toFloat()
-
-    var rage: QuestBossRage? = null
-
-    val hasRage: Boolean
-        get() {
-            return (rage?.value ?: 0.0) > 0.0
-        }
-}
+package com.habitrpg.android.habitica.models.inventory
+
+import com.habitrpg.android.habitica.models.BaseObject
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
+
+open class QuestBoss : RealmObject(), BaseObject {
+    @PrimaryKey
+    var key: String? = null
+        set(value) {
+            field = value
+            rage?.key = key
+        }
+    var name: String? = null
+    var hp: Int = 0
+    var str: Float = 0.toFloat()
+
+    var rage: QuestBossRage? = null
+
+    val hasRage: Boolean
+        get() {
+            return (rage?.value ?: 0.0) > 0.0
+        }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestBossRage.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestBossRage.kt
index 2396c05e5..63ec8671f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestBossRage.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestBossRage.kt
@@ -5,7 +5,6 @@ import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
 
 open class QuestBossRage : RealmObject(), BaseObject {
-
     @PrimaryKey
     var key: String? = null
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestColors.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestColors.kt
index 6884e325d..3c75bbe48 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestColors.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestColors.kt
@@ -10,7 +10,6 @@ import io.realm.annotations.PrimaryKey
  */
 
 open class QuestColors : RealmObject(), BaseObject {
-
     @PrimaryKey
     var key: String? = null
     var dark: String? = null
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestContent.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestContent.kt
index cf19c220f..9b1e88725 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestContent.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestContent.kt
@@ -1,69 +1,68 @@
-package com.habitrpg.android.habitica.models.inventory
-
-import io.realm.RealmList
-import io.realm.RealmObject
-import io.realm.annotations.PrimaryKey
-
-open class QuestContent : RealmObject(), Item {
-
-    @PrimaryKey
-    override var key: String = ""
-        set(value) {
-            field = value
-            drop?.key = value
-            colors?.key = value
-            boss?.key = value
-        }
-    override var text: String = ""
-    var notes: String = ""
-    var completion: String = ""
-    override var value: Int = 0
-    var previous: String? = null
-    var lvl: Int = 0
-    var isCanBuy: Boolean = false
-    var category: String? = null
-    var boss: QuestBoss? = null
-        set(boss) {
-            field = boss
-            if (boss != null) {
-                boss.key = key
-            }
-        }
-    var drop: QuestDrops? = null
-        set(drop) {
-            field = drop
-            if (drop != null) {
-                drop.key = key
-            }
-        }
-    var colors: QuestColors? = null
-        set(colors) {
-            field = colors
-            if (colors != null) {
-                colors.key = key
-            }
-        }
-
-    var collect: RealmList<QuestCollect>? = null
-    override var event: ItemEvent? = null
-
-    val isBossQuest: Boolean
-        get() = this.boss != null
-
-    override val type: String
-        get() = "quests"
-
-    fun getCollectWithKey(key: String?): QuestCollect? {
-        for (collect in this.collect ?: emptyList<QuestCollect>()) {
-            if (collect.key == key) {
-                return collect
-            }
-        }
-        return null
-    }
-
-    fun hasGifImage(): Boolean {
-        val gifImageKeys = listOf("lostMasterclasser4")
-        return gifImageKeys.contains(key)
-    }
-}
+package com.habitrpg.android.habitica.models.inventory
+
+import io.realm.RealmList
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
+
+open class QuestContent : RealmObject(), Item {
+    @PrimaryKey
+    override var key: String = ""
+        set(value) {
+            field = value
+            drop?.key = value
+            colors?.key = value
+            boss?.key = value
+        }
+    override var text: String = ""
+    var notes: String = ""
+    var completion: String = ""
+    override var value: Int = 0
+    var previous: String? = null
+    var lvl: Int = 0
+    var isCanBuy: Boolean = false
+    var category: String? = null
+    var boss: QuestBoss? = null
+        set(boss) {
+            field = boss
+            if (boss != null) {
+                boss.key = key
+            }
+        }
+    var drop: QuestDrops? = null
+        set(drop) {
+            field = drop
+            if (drop != null) {
+                drop.key = key
+            }
+        }
+    var colors: QuestColors? = null
+        set(colors) {
+            field = colors
+            if (colors != null) {
+                colors.key = key
+            }
+        }
+
+    var collect: RealmList<QuestCollect>? = null
+    override var event: ItemEvent? = null
+
+    val isBossQuest: Boolean
+        get() = this.boss != null
+
+    override val type: String
+        get() = "quests"
+
+    fun getCollectWithKey(key: String?): QuestCollect? {
+        for (collect in this.collect ?: emptyList<QuestCollect>()) {
+            if (collect.key == key) {
+                return collect
+            }
+        }
+        return null
+    }
+
+    fun hasGifImage(): Boolean {
+        val gifImageKeys = listOf("lostMasterclasser4")
+        return gifImageKeys.contains(key)
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestDropItem.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestDropItem.kt
index 41ef17965..fb6037edf 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestDropItem.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestDropItem.kt
@@ -23,11 +23,12 @@ open class QuestDropItem : RealmObject(), BaseObject {
     var count = 0
 
     val imageName: String
-        get() = when (type) {
-            "quests" -> "inventory_quest_scroll_$key"
-            "eggs" -> "Pet_Egg_$key"
-            "food" -> "Pet_Food_$key"
-            "hatchingPotions" -> "Pet_HatchingPotion_$key"
-            else -> "shop_$key"
-        }
+        get() =
+            when (type) {
+                "quests" -> "inventory_quest_scroll_$key"
+                "eggs" -> "Pet_Egg_$key"
+                "food" -> "Pet_Food_$key"
+                "hatchingPotions" -> "Pet_HatchingPotion_$key"
+                else -> "shop_$key"
+            }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestProgress.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestProgress.kt
index 76c8a4ef0..f50b31a45 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestProgress.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestProgress.kt
@@ -1,19 +1,18 @@
-package com.habitrpg.android.habitica.models.inventory
-
-import com.habitrpg.android.habitica.models.BaseObject
-import io.realm.RealmList
-import io.realm.RealmObject
-import io.realm.annotations.RealmClass
-
-@RealmClass(embedded = true)
-open class QuestProgress : RealmObject(), BaseObject {
-
-    var id: String? = null
-    var key: String? = null
-    var hp: Double = 0.0
-    var rage: Double = 0.0
-    var collectedItems: Int = 0
-    var collect: RealmList<QuestProgressCollect>? = null
-    var down: Float = 0.0f
-    var up: Float = 0.0f
-}
+package com.habitrpg.android.habitica.models.inventory
+
+import com.habitrpg.android.habitica.models.BaseObject
+import io.realm.RealmList
+import io.realm.RealmObject
+import io.realm.annotations.RealmClass
+
+@RealmClass(embedded = true)
+open class QuestProgress : RealmObject(), BaseObject {
+    var id: String? = null
+    var key: String? = null
+    var hp: Double = 0.0
+    var rage: Double = 0.0
+    var collectedItems: Int = 0
+    var collect: RealmList<QuestProgressCollect>? = null
+    var down: Float = 0.0f
+    var up: Float = 0.0f
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestRageStrike.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestRageStrike.kt
index 5a2291c5a..c6387a890 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestRageStrike.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestRageStrike.kt
@@ -5,7 +5,6 @@ import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
 
 open class QuestRageStrike() : RealmObject(), BaseObject {
-
     @PrimaryKey
     var key = ""
     var wasHit = false
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/SpecialItem.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/SpecialItem.kt
index 521388af6..ad5050691 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/SpecialItem.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/SpecialItem.kt
@@ -1,32 +1,31 @@
-package com.habitrpg.android.habitica.models.inventory
-
-import android.content.Context
-import com.habitrpg.android.habitica.R
-import io.realm.RealmObject
-import io.realm.annotations.PrimaryKey
-
-open class SpecialItem : RealmObject(), Item {
-    override val type: String
-        get() = "special"
-
-    @PrimaryKey
-    override var key: String = ""
-    override var text: String = ""
-    internal var notes: String = ""
-    override var value: Int = 0
-    override var event: ItemEvent? = null
-    var target: String? = null
-    var isMysteryItem: Boolean = false
-
-    companion object {
-
-        fun makeMysteryItem(context: Context): SpecialItem {
-            val item = SpecialItem()
-            item.text = context.getString(R.string.mystery_item)
-            item.notes = context.getString(R.string.myster_item_notes)
-            item.key = "inventory_present"
-            item.isMysteryItem = true
-            return item
-        }
-    }
-}
+package com.habitrpg.android.habitica.models.inventory
+
+import android.content.Context
+import com.habitrpg.android.habitica.R
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
+
+open class SpecialItem : RealmObject(), Item {
+    override val type: String
+        get() = "special"
+
+    @PrimaryKey
+    override var key: String = ""
+    override var text: String = ""
+    internal var notes: String = ""
+    override var value: Int = 0
+    override var event: ItemEvent? = null
+    var target: String? = null
+    var isMysteryItem: Boolean = false
+
+    companion object {
+        fun makeMysteryItem(context: Context): SpecialItem {
+            val item = SpecialItem()
+            item.text = context.getString(R.string.mystery_item)
+            item.notes = context.getString(R.string.myster_item_notes)
+            item.key = "inventory_present"
+            item.isMysteryItem = true
+            return item
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/invitations/GuildInvite.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/invitations/GuildInvite.kt
index c1ea1009d..98ee38b0f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/invitations/GuildInvite.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/invitations/GuildInvite.kt
@@ -1,13 +1,12 @@
-package com.habitrpg.android.habitica.models.invitations
-
-import io.realm.RealmObject
-import io.realm.annotations.RealmClass
-
-@RealmClass(embedded = true)
-open class GuildInvite : RealmObject(), GenericInvitation {
-
-    override var id: String? = null
-    override var inviter: String? = null
-    override var name: String? = null
-    var publicGuild: Boolean? = null
-}
+package com.habitrpg.android.habitica.models.invitations
+
+import io.realm.RealmObject
+import io.realm.annotations.RealmClass
+
+@RealmClass(embedded = true)
+open class GuildInvite : RealmObject(), GenericInvitation {
+    override var id: String? = null
+    override var inviter: String? = null
+    override var name: String? = null
+    var publicGuild: Boolean? = null
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/invitations/PartyInvite.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/invitations/PartyInvite.kt
index 51997bda4..05923ebc0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/invitations/PartyInvite.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/invitations/PartyInvite.kt
@@ -1,12 +1,11 @@
-package com.habitrpg.android.habitica.models.invitations
-
-import io.realm.RealmObject
-import io.realm.annotations.RealmClass
-
-@RealmClass(embedded = true)
-open class PartyInvite : RealmObject(), GenericInvitation {
-
-    override var id: String? = null
-    override var name: String? = null
-    override var inviter: String? = null
-}
+package com.habitrpg.android.habitica.models.invitations
+
+import io.realm.RealmObject
+import io.realm.annotations.RealmClass
+
+@RealmClass(embedded = true)
+open class PartyInvite : RealmObject(), GenericInvitation {
+    override var id: String? = null
+    override var name: String? = null
+    override var inviter: String? = null
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/members/Member.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/members/Member.kt
index 4b515e1fb..fad4f18e3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/members/Member.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/members/Member.kt
@@ -18,7 +18,6 @@ import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
 
 open class Member : RealmObject(), Avatar, BaseMainObject, Assignable {
-
     @PrimaryKey
     @SerializedName("_id")
     override var id: String = ""
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/members/MemberPreferences.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/members/MemberPreferences.kt
index 7b9344edd..e1ff08ef7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/members/MemberPreferences.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/members/MemberPreferences.kt
@@ -9,7 +9,6 @@ import io.realm.annotations.RealmClass
 open class MemberPreferences :
     RealmObject(),
     AvatarPreferences {
-
     override var hair: Hair? = null
     override var costume: Boolean = false
     override var disableClasses: Boolean = false
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/FallExtraGemsHabiticaPromotion.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/FallExtraGemsHabiticaPromotion.kt
index afefb281f..2fdefa5b2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/FallExtraGemsHabiticaPromotion.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/FallExtraGemsHabiticaPromotion.kt
@@ -54,14 +54,14 @@ class FallExtraGemsHabiticaPromotion(startDate: Date?, endDate: Date?) : Habitic
         view.setSubtitleImage(
             ContextCompat.getDrawable(
                 context,
-                R.drawable.fall_promo_menu_description
-            )
+                R.drawable.fall_promo_menu_description,
+            ),
         )
         view.setSubtitleText(null)
 
         view.setDecoration(
             ContextCompat.getDrawable(context, R.drawable.fall_promo_menu_left),
-            ContextCompat.getDrawable(context, R.drawable.fall_promo_menu_right)
+            ContextCompat.getDrawable(context, R.drawable.fall_promo_menu_right),
         )
 
         view.binding.button.backgroundTintList =
@@ -84,27 +84,28 @@ class FallExtraGemsHabiticaPromotion(startDate: Date?, endDate: Date?) : Habitic
         binding.promoBannerLeftImage.setImageDrawable(
             ContextCompat.getDrawable(
                 context,
-                R.drawable.fall_promo_banner_left
-            )
+                R.drawable.fall_promo_banner_left,
+            ),
         )
         binding.promoBannerRightImage.setImageDrawable(
             ContextCompat.getDrawable(
                 context,
-                R.drawable.fall_promo_banner_right
-            )
+                R.drawable.fall_promo_banner_right,
+            ),
         )
         binding.promoBannerTitleImage.setImageDrawable(
             ContextCompat.getDrawable(
                 context,
-                R.drawable.fall_promo_title
-            )
+                R.drawable.fall_promo_title,
+            ),
         )
         val formatter = SimpleDateFormat("MMM d", Locale.getDefault())
-        binding.promoBannerDurationView.text = context.getString(
-            R.string.x_to_y,
-            formatter.format(startDate),
-            formatter.format(endDate)
-        )
+        binding.promoBannerDurationView.text =
+            context.getString(
+                R.string.x_to_y,
+                formatter.format(startDate),
+                formatter.format(endDate),
+            )
         binding.promoBannerDurationView.setTextColor(Color.parseColor("#FEE2B6"))
     }
 
@@ -112,7 +113,10 @@ class FallExtraGemsHabiticaPromotion(startDate: Date?, endDate: Date?) : Habitic
     }
 
     @SuppressLint("SetTextI18n")
-    override fun configureGemView(binding: PurchaseGemViewBinding, regularAmount: Int) {
+    override fun configureGemView(
+        binding: PurchaseGemViewBinding,
+        regularAmount: Int,
+    ) {
         val context = binding.root.context
         binding.root.background = promoBackgroundDrawable(context)
         binding.purchaseButton.background = buttonDrawable(context)
@@ -152,34 +156,35 @@ class FallExtraGemsHabiticaPromotion(startDate: Date?, endDate: Date?) : Habitic
         fragment.binding?.promoBannerLeftImage?.setImageDrawable(
             ContextCompat.getDrawable(
                 context,
-                R.drawable.fall_promo_info_left
-            )
+                R.drawable.fall_promo_info_left,
+            ),
         )
         fragment.binding?.promoBannerRightImage?.setImageDrawable(
             ContextCompat.getDrawable(
                 context,
-                R.drawable.fall_promo_info_right
-            )
+                R.drawable.fall_promo_info_right,
+            ),
         )
         fragment.binding?.promoBannerTitleImage?.setImageDrawable(
             ContextCompat.getDrawable(
                 context,
-                R.drawable.fall_promo_title
-            )
+                R.drawable.fall_promo_title,
+            ),
         )
         fragment.binding?.promoBannerSubtitleView?.setText(R.string.limited_event)
         fragment.binding?.promoBannerDurationView?.setTextColor(Color.parseColor("#FEE2B6"))
         val formatter = SimpleDateFormat("MMM d", Locale.getDefault())
-        fragment.binding?.promoBannerDurationView?.text = context.getString(
-            R.string.x_to_y,
-            formatter.format(startDate),
-            formatter.format(endDate)
-        )
+        fragment.binding?.promoBannerDurationView?.text =
+            context.getString(
+                R.string.x_to_y,
+                formatter.format(startDate),
+                formatter.format(endDate),
+            )
         fragment.binding?.promoBannerDurationView?.setTextColor(
             ContextCompat.getColor(
                 context,
-                R.color.white
-            )
+                R.color.white,
+            ),
         )
         fragment.binding?.promptText?.setText(R.string.fall_promo_info_prompt)
         fragment.binding?.promptText?.setTextColor(Color.parseColor("#F78E2F"))
@@ -188,21 +193,23 @@ class FallExtraGemsHabiticaPromotion(startDate: Date?, endDate: Date?) : Habitic
         fragment.binding?.promptButton?.setTextColor(ContextCompat.getColor(context, R.color.white))
         fragment.binding?.promptButton?.setOnClickListener { MainNavigationController.navigate(R.id.gemPurchaseActivity) }
 
-        fragment.binding?.instructionDescriptionView?.text = context.getString(
-            R.string.fall_promo_info_instructions,
-            formatter.format(startDate),
-            formatter.format(endDate)
-        )
+        fragment.binding?.instructionDescriptionView?.text =
+            context.getString(
+                R.string.fall_promo_info_instructions,
+                formatter.format(startDate),
+                formatter.format(endDate),
+            )
         val limitationsFormatter =
             SimpleDateFormat.getDateTimeInstance(SimpleDateFormat.LONG, SimpleDateFormat.LONG)
         val utcTimeFormatter = SimpleDateFormat.getTimeInstance(SimpleDateFormat.LONG)
         utcTimeFormatter.timeZone = TimeZone.getTimeZone("UTC")
-        fragment.binding?.limitationsDescriptionView?.text = context.getString(
-            R.string.gems_promo_info_limitations_fixed,
-            limitationsFormatter.format(startDate),
-            utcTimeFormatter.format(startDate),
-            limitationsFormatter.format(endDate),
-            utcTimeFormatter.format(endDate)
-        )
+        fragment.binding?.limitationsDescriptionView?.text =
+            context.getString(
+                R.string.gems_promo_info_limitations_fixed,
+                limitationsFormatter.format(startDate),
+                utcTimeFormatter.format(startDate),
+                limitationsFormatter.format(endDate),
+                utcTimeFormatter.format(endDate),
+            )
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/GiftOneGetOneHabiticaPromotion.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/GiftOneGetOneHabiticaPromotion.kt
index 9e3035563..5ff569577 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/GiftOneGetOneHabiticaPromotion.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/GiftOneGetOneHabiticaPromotion.kt
@@ -54,7 +54,7 @@ class GiftOneGetOneHabiticaPromotion(startDate: Date?, endDate: Date?) : Habitic
 
         view.setDecoration(
             ContextCompat.getDrawable(context, R.drawable.g1g1_promo_menu_left),
-            ContextCompat.getDrawable(context, R.drawable.g1g1_promo_menu_right)
+            ContextCompat.getDrawable(context, R.drawable.g1g1_promo_menu_right),
         )
 
         view.binding.button.backgroundTintList =
@@ -81,14 +81,14 @@ class GiftOneGetOneHabiticaPromotion(startDate: Date?, endDate: Date?) : Habitic
         binding.promoBannerLeftImage.setImageDrawable(
             ContextCompat.getDrawable(
                 context,
-                R.drawable.g1g1_promo_left_small
-            )
+                R.drawable.g1g1_promo_left_small,
+            ),
         )
         binding.promoBannerRightImage.setImageDrawable(
             ContextCompat.getDrawable(
                 context,
-                R.drawable.g1g1_promo_right_small
-            )
+                R.drawable.g1g1_promo_right_small,
+            ),
         )
         binding.promoBannerTitleImage.visibility = View.GONE
         binding.promoBannerDurationView.visibility = View.GONE
@@ -105,14 +105,14 @@ class GiftOneGetOneHabiticaPromotion(startDate: Date?, endDate: Date?) : Habitic
         binding.promoBannerLeftImage.setImageDrawable(
             ContextCompat.getDrawable(
                 context,
-                R.drawable.g1g1_promo_left_small
-            )
+                R.drawable.g1g1_promo_left_small,
+            ),
         )
         binding.promoBannerRightImage.setImageDrawable(
             ContextCompat.getDrawable(
                 context,
-                R.drawable.g1g1_promo_right_small
-            )
+                R.drawable.g1g1_promo_right_small,
+            ),
         )
         binding.promoBannerTitleImage.visibility = View.GONE
         binding.promoBannerDurationView.visibility = View.GONE
@@ -122,7 +122,10 @@ class GiftOneGetOneHabiticaPromotion(startDate: Date?, endDate: Date?) : Habitic
             context.getString(R.string.gift_one_get_one_purchase_banner, formatter.format(endDate))
     }
 
-    override fun configureGemView(binding: PurchaseGemViewBinding, regularAmount: Int) {
+    override fun configureGemView(
+        binding: PurchaseGemViewBinding,
+        regularAmount: Int,
+    ) {
     }
 
     override fun configureInfoFragment(fragment: PromoInfoFragment) {
@@ -131,37 +134,38 @@ class GiftOneGetOneHabiticaPromotion(startDate: Date?, endDate: Date?) : Habitic
         fragment.binding?.promoBannerLeftImage?.setImageDrawable(
             ContextCompat.getDrawable(
                 context,
-                R.drawable.g1g1_promo_left
-            )
+                R.drawable.g1g1_promo_left,
+            ),
         )
         fragment.binding?.promoBannerRightImage?.setImageDrawable(
             ContextCompat.getDrawable(
                 context,
-                R.drawable.g1g1_promo_right
-            )
+                R.drawable.g1g1_promo_right,
+            ),
         )
         fragment.binding?.promoBannerTitleImage?.visibility = View.GONE
         fragment.binding?.promoBannerTitleText?.visibility = View.VISIBLE
         fragment.binding?.promoBannerTitleText?.text = context.getString(R.string.gift_one_get_one)
         fragment.binding?.promoBannerSubtitleView?.setText(R.string.limited_event)
         val formatter = SimpleDateFormat("MMM d", Locale.getDefault())
-        fragment.binding?.promoBannerDurationView?.text = context.getString(
-            R.string.x_to_y,
-            formatter.format(startDate),
-            formatter.format(endDate)
-        )
+        fragment.binding?.promoBannerDurationView?.text =
+            context.getString(
+                R.string.x_to_y,
+                formatter.format(startDate),
+                formatter.format(endDate),
+            )
         fragment.binding?.promoBannerDurationView?.setTextColor(
             ContextCompat.getColor(
                 context,
-                R.color.white
-            )
+                R.color.white,
+            ),
         )
         fragment.binding?.promptText?.setText(R.string.g1g1_promo_info_prompt)
         fragment.binding?.promptText?.setTextColor(
             ContextCompat.getColor(
                 context,
-                R.color.text_teal
-            )
+                R.color.text_teal,
+            ),
         )
         fragment.binding?.promptButton?.background =
             ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_brand_400)
@@ -170,7 +174,7 @@ class GiftOneGetOneHabiticaPromotion(startDate: Date?, endDate: Date?) : Habitic
         fragment.binding?.promptButton?.setOnClickListener {
             fragment.context?.let { context ->
                 SubscriptionFragment.showGiftSubscriptionDialog(
-                    context
+                    context,
                 )
             }
         }
@@ -181,12 +185,13 @@ class GiftOneGetOneHabiticaPromotion(startDate: Date?, endDate: Date?) : Habitic
             SimpleDateFormat.getDateTimeInstance(SimpleDateFormat.LONG, SimpleDateFormat.LONG)
         val utcTimeFormatter = SimpleDateFormat.getTimeInstance(SimpleDateFormat.LONG)
         utcTimeFormatter.timeZone = TimeZone.getTimeZone("UTC")
-        fragment.binding?.limitationsDescriptionView?.text = context.getString(
-            R.string.g1g1_promo_info_limitations_fixed,
-            limitationsFormatter.format(startDate),
-            utcTimeFormatter.format(startDate),
-            limitationsFormatter.format(endDate),
-            utcTimeFormatter.format(endDate)
-        )
+        fragment.binding?.limitationsDescriptionView?.text =
+            context.getString(
+                R.string.g1g1_promo_info_limitations_fixed,
+                limitationsFormatter.format(startDate),
+                utcTimeFormatter.format(startDate),
+                limitationsFormatter.format(endDate),
+                utcTimeFormatter.format(endDate),
+            )
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/HabiticaPromotion.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/HabiticaPromotion.kt
index c6673aa41..8f3909659 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/HabiticaPromotion.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/HabiticaPromotion.kt
@@ -13,7 +13,7 @@ enum class PromoType {
     GEMS_AMOUNT,
     GEMS_PRICE,
     SUBSCRIPTION,
-    SURVEY
+    SURVEY,
 }
 
 abstract class HabiticaPromotion {
@@ -29,25 +29,47 @@ abstract class HabiticaPromotion {
     abstract val endDate: Date
 
     abstract fun pillBackgroundDrawable(context: Context): Drawable
+
     abstract fun backgroundColor(context: Context): Int
+
     abstract fun promoBackgroundDrawable(context: Context): Drawable
 
     abstract fun buttonDrawable(context: Context): Drawable
 
     abstract fun configurePromoMenuView(view: PromoMenuView)
+
     abstract fun menuOnNavigation(context: Context)
 
     abstract fun configurePurchaseBanner(binding: FragmentGemPurchaseBinding)
+
     abstract fun configurePurchaseBanner(binding: FragmentSubscriptionBinding)
 
-    abstract fun configureGemView(binding: PurchaseGemViewBinding, regularAmount: Int)
+    abstract fun configureGemView(
+        binding: PurchaseGemViewBinding,
+        regularAmount: Int,
+    )
+
     abstract fun configureInfoFragment(fragment: PromoInfoFragment)
 }
 
-fun getHabiticaPromotionFromKey(key: String, startDate: Date?, endDate: Date?): HabiticaPromotion? {
+fun getHabiticaPromotionFromKey(
+    key: String,
+    startDate: Date?,
+    endDate: Date?,
+): HabiticaPromotion? {
     return when (key) {
-        "fall_extra_gems", "fall2020", "testFall2020" -> FallExtraGemsHabiticaPromotion(startDate, endDate)
-        "spooky_extra_gems", "fall2020SecondPromo", "spooky2020" -> SpookyExtraGemsHabiticaPromotion(startDate, endDate)
+        "fall_extra_gems", "fall2020", "testFall2020" ->
+            FallExtraGemsHabiticaPromotion(
+                startDate,
+                endDate,
+            )
+
+        "spooky_extra_gems", "fall2020SecondPromo", "spooky2020" ->
+            SpookyExtraGemsHabiticaPromotion(
+                startDate,
+                endDate,
+            )
+
         "g1g1" -> GiftOneGetOneHabiticaPromotion(startDate, endDate)
         "survey2021" -> Survey2021Promotion()
         else -> null
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/SpookyExtraGemsHabiticaPromotion.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/SpookyExtraGemsHabiticaPromotion.kt
index 0c4425435..a0e80477c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/SpookyExtraGemsHabiticaPromotion.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/SpookyExtraGemsHabiticaPromotion.kt
@@ -12,9 +12,9 @@ import com.habitrpg.android.habitica.databinding.FragmentGemPurchaseBinding
 import com.habitrpg.android.habitica.databinding.FragmentSubscriptionBinding
 import com.habitrpg.android.habitica.databinding.PurchaseGemViewBinding
 import com.habitrpg.android.habitica.extensions.DateUtils
-import com.habitrpg.common.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.ui.fragments.PromoInfoFragment
 import com.habitrpg.android.habitica.ui.views.promo.PromoMenuView
+import com.habitrpg.common.habitica.helpers.MainNavigationController
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
@@ -29,7 +29,8 @@ class SpookyExtraGemsHabiticaPromotion(startDate: Date?, endDate: Date?) : Habit
     override val endDate: Date = endDate ?: DateUtils.createDate(2020, 10, 2)
 
     override fun pillBackgroundDrawable(context: Context): Drawable {
-        return ContextCompat.getDrawable(context, R.drawable.spooky_promo_pill_bg) ?: ShapeDrawable()
+        return ContextCompat.getDrawable(context, R.drawable.spooky_promo_pill_bg)
+            ?: ShapeDrawable()
     }
 
     override fun backgroundColor(context: Context): Int {
@@ -51,15 +52,21 @@ class SpookyExtraGemsHabiticaPromotion(startDate: Date?, endDate: Date?) : Habit
         view.setBackgroundColor(backgroundColor(context))
         view.setTitleImage(ContextCompat.getDrawable(context, R.drawable.spooky_promo_title))
         view.setTitleText(null)
-        view.setSubtitleImage(ContextCompat.getDrawable(context, R.drawable.spooky_promo_menu_description))
+        view.setSubtitleImage(
+            ContextCompat.getDrawable(
+                context,
+                R.drawable.spooky_promo_menu_description,
+            ),
+        )
         view.setSubtitleText(null)
 
         view.setDecoration(
             ContextCompat.getDrawable(context, R.drawable.spooky_promo_menu_left),
-            ContextCompat.getDrawable(context, R.drawable.spooky_promo_menu_right)
+            ContextCompat.getDrawable(context, R.drawable.spooky_promo_menu_right),
         )
 
-        view.binding.button.backgroundTintList = ContextCompat.getColorStateList(context, R.color.gray_1)
+        view.binding.button.backgroundTintList =
+            ContextCompat.getColorStateList(context, R.color.gray_1)
         view.binding.button.setText(R.string.learn_more)
         view.binding.button.setTextColor(ContextCompat.getColor(context, R.color.white))
         view.binding.button.setOnClickListener {
@@ -75,15 +82,31 @@ class SpookyExtraGemsHabiticaPromotion(startDate: Date?, endDate: Date?) : Habit
         val context = binding.root.context
         binding.promoBanner.visibility = View.VISIBLE
         binding.promoBanner.background = promoBackgroundDrawable(context)
-        binding.promoBannerLeftImage.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.spooky_promo_banner_left))
-        binding.promoBannerRightImage.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.spooky_promo_banner_right))
-        binding.promoBannerTitleImage.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.spooky_promo_title))
-        val formatter = SimpleDateFormat("MMM d", Locale.getDefault())
-        binding.promoBannerDurationView.text = context.getString(
-            R.string.x_to_y,
-            formatter.format(startDate),
-            formatter.format(endDate)
+        binding.promoBannerLeftImage.setImageDrawable(
+            ContextCompat.getDrawable(
+                context,
+                R.drawable.spooky_promo_banner_left,
+            ),
         )
+        binding.promoBannerRightImage.setImageDrawable(
+            ContextCompat.getDrawable(
+                context,
+                R.drawable.spooky_promo_banner_right,
+            ),
+        )
+        binding.promoBannerTitleImage.setImageDrawable(
+            ContextCompat.getDrawable(
+                context,
+                R.drawable.spooky_promo_title,
+            ),
+        )
+        val formatter = SimpleDateFormat("MMM d", Locale.getDefault())
+        binding.promoBannerDurationView.text =
+            context.getString(
+                R.string.x_to_y,
+                formatter.format(startDate),
+                formatter.format(endDate),
+            )
         binding.promoBannerDurationView.setTextColor(ContextCompat.getColor(context, R.color.white))
     }
 
@@ -91,7 +114,10 @@ class SpookyExtraGemsHabiticaPromotion(startDate: Date?, endDate: Date?) : Habit
     }
 
     @SuppressLint("SetTextI18n")
-    override fun configureGemView(binding: PurchaseGemViewBinding, regularAmount: Int) {
+    override fun configureGemView(
+        binding: PurchaseGemViewBinding,
+        regularAmount: Int,
+    ) {
         val context = binding.root.context
         binding.root.background = promoBackgroundDrawable(context)
         binding.purchaseButton.background = buttonDrawable(context)
@@ -105,18 +131,22 @@ class SpookyExtraGemsHabiticaPromotion(startDate: Date?, endDate: Date?) : Habit
                 binding.gemAmount.text = "5"
                 binding.gemImage.setImageResource(R.drawable.spooky_gems_4)
             }
+
             21 -> {
                 binding.gemAmount.text = "30"
                 binding.gemImage.setImageResource(R.drawable.spooky_gems_21)
             }
+
             42 -> {
                 binding.gemAmount.text = "60"
                 binding.gemImage.setImageResource(R.drawable.spooky_gems_42)
             }
+
             84 -> {
                 binding.gemAmount.text = "125"
                 binding.gemImage.setImageResource(R.drawable.spooky_gems_84)
             }
+
             else -> regularAmount.toString()
         }
     }
@@ -124,35 +154,72 @@ class SpookyExtraGemsHabiticaPromotion(startDate: Date?, endDate: Date?) : Habit
     override fun configureInfoFragment(fragment: PromoInfoFragment) {
         val context = fragment.context ?: return
         fragment.binding?.promoBanner?.background = promoBackgroundDrawable(context)
-        fragment.binding?.promoBannerLeftImage?.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.spooky_promo_info_left))
-        fragment.binding?.promoBannerRightImage?.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.spooky_promo_info_right))
-        fragment.binding?.promoBannerTitleImage?.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.spooky_promo_title))
-        fragment.binding?.promoBannerSubtitleView?.setText(R.string.limited_event)
-        fragment.binding?.promoBannerDurationView?.setTextColor(ContextCompat.getColor(context, R.color.white))
-        val formatter = SimpleDateFormat("MMM d", Locale.getDefault())
-        fragment.binding?.promoBannerDurationView?.text = context.getString(
-            R.string.x_to_y,
-            formatter.format(startDate),
-            formatter.format(endDate)
+        fragment.binding?.promoBannerLeftImage?.setImageDrawable(
+            ContextCompat.getDrawable(
+                context,
+                R.drawable.spooky_promo_info_left,
+            ),
+        )
+        fragment.binding?.promoBannerRightImage?.setImageDrawable(
+            ContextCompat.getDrawable(
+                context,
+                R.drawable.spooky_promo_info_right,
+            ),
+        )
+        fragment.binding?.promoBannerTitleImage?.setImageDrawable(
+            ContextCompat.getDrawable(
+                context,
+                R.drawable.spooky_promo_title,
+            ),
+        )
+        fragment.binding?.promoBannerSubtitleView?.setText(R.string.limited_event)
+        fragment.binding?.promoBannerDurationView?.setTextColor(
+            ContextCompat.getColor(
+                context,
+                R.color.white,
+            ),
+        )
+        val formatter = SimpleDateFormat("MMM d", Locale.getDefault())
+        fragment.binding?.promoBannerDurationView?.text =
+            context.getString(
+                R.string.x_to_y,
+                formatter.format(startDate),
+                formatter.format(endDate),
+            )
+        fragment.binding?.promoBannerDurationView?.setTextColor(
+            ContextCompat.getColor(
+                context,
+                R.color.white,
+            ),
         )
-        fragment.binding?.promoBannerDurationView?.setTextColor(ContextCompat.getColor(context, R.color.white))
         fragment.binding?.promptText?.setText(R.string.spooky_promo_info_prompt)
-        fragment.binding?.promptText?.setTextColor(ContextCompat.getColor(context, R.color.orange_50))
+        fragment.binding?.promptText?.setTextColor(
+            ContextCompat.getColor(
+                context,
+                R.color.orange_50,
+            ),
+        )
         fragment.binding?.promptButton?.background = buttonDrawable(context)
         fragment.binding?.promptButton?.setText(R.string.view_gem_bundles)
         fragment.binding?.promptButton?.setTextColor(ContextCompat.getColor(context, R.color.white))
         fragment.binding?.promptButton?.setOnClickListener { MainNavigationController.navigate(R.id.gemPurchaseActivity) }
 
-        fragment.binding?.instructionDescriptionView?.text = context.getString(R.string.spooky_promo_info_instructions, formatter.format(startDate), formatter.format(endDate))
+        fragment.binding?.instructionDescriptionView?.text =
+            context.getString(
+                R.string.spooky_promo_info_instructions,
+                formatter.format(startDate),
+                formatter.format(endDate),
+            )
         val limitationsFormatter = SimpleDateFormat.getDateTimeInstance()
         val utcTimeFormatter = SimpleDateFormat.getTimeInstance(SimpleDateFormat.LONG)
         utcTimeFormatter.timeZone = TimeZone.getTimeZone("UTC")
-        fragment.binding?.limitationsDescriptionView?.text = context.getString(
-            R.string.gems_promo_info_limitations_fixed,
-            limitationsFormatter.format(startDate),
-            utcTimeFormatter.format(startDate),
-            limitationsFormatter.format(endDate),
-            utcTimeFormatter.format(endDate)
-        )
+        fragment.binding?.limitationsDescriptionView?.text =
+            context.getString(
+                R.string.gems_promo_info_limitations_fixed,
+                limitationsFormatter.format(startDate),
+                utcTimeFormatter.format(startDate),
+                limitationsFormatter.format(endDate),
+                utcTimeFormatter.format(endDate),
+            )
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/Survey2021Promotion.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/Survey2021Promotion.kt
index c1cd90f5c..270e15a99 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/Survey2021Promotion.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/Survey2021Promotion.kt
@@ -8,10 +8,10 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.FragmentGemPurchaseBinding
 import com.habitrpg.android.habitica.databinding.FragmentSubscriptionBinding
 import com.habitrpg.android.habitica.databinding.PurchaseGemViewBinding
-import com.habitrpg.common.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.ui.fragments.PromoInfoFragment
 import com.habitrpg.android.habitica.ui.fragments.PromoWebFragmentArgs
 import com.habitrpg.android.habitica.ui.views.promo.PromoMenuView
+import com.habitrpg.common.habitica.helpers.MainNavigationController
 import java.util.Date
 
 class Survey2021Promotion : HabiticaPromotion(), HabiticaWebPromotion {
@@ -52,10 +52,11 @@ class Survey2021Promotion : HabiticaPromotion(), HabiticaWebPromotion {
 
         view.setDecoration(
             ContextCompat.getDrawable(context, R.drawable.survey_art_left),
-            ContextCompat.getDrawable(context, R.drawable.survey_art_right)
+            ContextCompat.getDrawable(context, R.drawable.survey_art_right),
         )
 
-        view.binding.button.backgroundTintList = ContextCompat.getColorStateList(context, R.color.white)
+        view.binding.button.backgroundTintList =
+            ContextCompat.getColorStateList(context, R.color.white)
         view.binding.button.setText(R.string.go_to_survey)
         view.binding.button.setTextColor(ContextCompat.getColor(context, R.color.blue_10))
         view.binding.button.setOnClickListener {
@@ -64,7 +65,10 @@ class Survey2021Promotion : HabiticaPromotion(), HabiticaWebPromotion {
     }
 
     override fun menuOnNavigation(context: Context) {
-        MainNavigationController.navigate(R.id.promoWebFragment, PromoWebFragmentArgs.Builder(url ?: "").build().toBundle())
+        MainNavigationController.navigate(
+            R.id.promoWebFragment,
+            PromoWebFragmentArgs.Builder(url ?: "").build().toBundle(),
+        )
     }
 
     override fun configurePurchaseBanner(binding: FragmentGemPurchaseBinding) {
@@ -73,7 +77,10 @@ class Survey2021Promotion : HabiticaPromotion(), HabiticaWebPromotion {
     override fun configurePurchaseBanner(binding: FragmentSubscriptionBinding) {
     }
 
-    override fun configureGemView(binding: PurchaseGemViewBinding, regularAmount: Int) {
+    override fun configureGemView(
+        binding: PurchaseGemViewBinding,
+        regularAmount: Int,
+    ) {
     }
 
     override fun configureInfoFragment(fragment: PromoInfoFragment) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopCategory.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopCategory.kt
index 8a43057db..77a8321a6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopCategory.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopCategory.kt
@@ -1,13 +1,12 @@
-package com.habitrpg.android.habitica.models.shops
-
-class ShopCategory {
-
-    var identifier: String = ""
-    var text: String = ""
-    var notes: String = ""
-    var path: String = ""
-    var purchaseAll: Boolean? = null
-    var pinType: String = ""
-
-    var items: MutableList<ShopItem> = ArrayList()
-}
+package com.habitrpg.android.habitica.models.shops
+
+class ShopCategory {
+    var identifier: String = ""
+    var text: String = ""
+    var notes: String = ""
+    var path: String = ""
+    var purchaseAll: Boolean? = null
+    var pinType: String = ""
+
+    var items: MutableList<ShopItem> = ArrayList()
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItemUnlockCondition.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItemUnlockCondition.kt
index 704a18714..308d6c3c4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItemUnlockCondition.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItemUnlockCondition.kt
@@ -1,28 +1,47 @@
-package com.habitrpg.android.habitica.models.shops
-
-import android.content.Context
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.models.BaseObject
-import io.realm.RealmObject
-import io.realm.annotations.RealmClass
-
-@RealmClass(embedded = true)
-open class ShopItemUnlockCondition : RealmObject(), BaseObject {
-
-    private var condition: String? = null
-    var incentiveThreshold: Int? = null
-
-    fun readableUnlockCondition(context: Context): String = when (this.condition) {
-        "party invite" -> context.getString(R.string.party_invite)
-        "login reward" -> if (incentiveThreshold != null) context.getString(R.string.login_incentive_count, incentiveThreshold) else context.getString(R.string.login_incentive)
-        "create account" -> context.getString(R.string.create_account)
-        else -> ""
-    }
-
-    fun shortReadableUnlockCondition(context: Context): String = when (this.condition) {
-        "party invite" -> context.getString(R.string.party_invite_short)
-        "login reward" -> if (incentiveThreshold != null) context.getString(R.string.login_incentive_short_count, incentiveThreshold) else context.getString(R.string.login_incentive_short)
-        "create account" -> context.getString(R.string.create_account_short)
-        else -> ""
-    }
-}
+package com.habitrpg.android.habitica.models.shops
+
+import android.content.Context
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.models.BaseObject
+import io.realm.RealmObject
+import io.realm.annotations.RealmClass
+
+@RealmClass(embedded = true)
+open class ShopItemUnlockCondition : RealmObject(), BaseObject {
+    private var condition: String? = null
+    var incentiveThreshold: Int? = null
+
+    fun readableUnlockCondition(context: Context): String =
+        when (this.condition) {
+            "party invite" -> context.getString(R.string.party_invite)
+            "login reward" ->
+                if (incentiveThreshold != null) {
+                    context.getString(
+                        R.string.login_incentive_count,
+                        incentiveThreshold,
+                    )
+                } else {
+                    context.getString(R.string.login_incentive)
+                }
+
+            "create account" -> context.getString(R.string.create_account)
+            else -> ""
+        }
+
+    fun shortReadableUnlockCondition(context: Context): String =
+        when (this.condition) {
+            "party invite" -> context.getString(R.string.party_invite_short)
+            "login reward" ->
+                if (incentiveThreshold != null) {
+                    context.getString(
+                        R.string.login_incentive_short_count,
+                        incentiveThreshold,
+                    )
+                } else {
+                    context.getString(R.string.login_incentive_short)
+                }
+
+            "create account" -> context.getString(R.string.create_account_short)
+            else -> ""
+        }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Challenge.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Challenge.kt
index fb9013ebc..4b9a5641f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Challenge.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Challenge.kt
@@ -1,89 +1,91 @@
-package com.habitrpg.android.habitica.models.social
-
-import com.habitrpg.android.habitica.models.BaseMainObject
-import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.shared.habitica.models.tasks.TasksOrder
-import io.realm.RealmModel
-import io.realm.RealmObject
-import io.realm.annotations.Ignore
-import io.realm.annotations.PrimaryKey
-import java.util.Date
-
-open class Challenge : RealmObject(), BaseMainObject {
-
-    @PrimaryKey
-    var id: String? = null
-    var name: String? = null
-    var shortName: String? = null
-    var description: String? = null
-    var leaderName: String? = null
-    var leaderId: String? = null
-    var groupName: String? = null
-    var groupId: String? = null
-    var prize: Int = 0
-    var official: Boolean = false
-    var memberCount: Int = 0
-    var todoList: String? = null
-    var habitList: String? = null
-    var dailyList: String? = null
-    var rewardList: String? = null
-    var createdAt: Date? = null
-    var updatedAt: Date? = null
-
-    var group: Group? = null
-
-    var leader: User? = null
-
-    @Ignore
-    var tasksOrder: TasksOrder? = null
-    var summary: String? = null
-
-    fun getTasksOrder(): HashMap<String, Array<String>> {
-        val map = HashMap<String, Array<String>>()
-
-        if (dailyList?.isNotEmpty() == true) {
-            dailyList?.split(",".toRegex())?.dropLastWhile { it.isEmpty() }?.toTypedArray()?.let { map[TASK_ORDER_DAILYS] }
-        }
-
-        if (habitList?.isNotEmpty() == true) {
-            habitList?.split(",".toRegex())?.dropLastWhile { it.isEmpty() }?.toTypedArray()?.let { map[TASK_ORDER_HABITS] }
-        }
-
-        if (rewardList?.isNotEmpty() == true) {
-            rewardList?.split(",".toRegex())?.dropLastWhile { it.isEmpty() }?.toTypedArray()?.let { map[TASK_ORDER_REWARDS] }
-        }
-
-        if (todoList?.isNotEmpty() == true) {
-            todoList?.split(",".toRegex())?.dropLastWhile { it.isEmpty() }?.toTypedArray()?.let { map[TASK_ORDER_TODOS] }
-        }
-
-        return map
-    }
-
-    override val realmClass: Class<out RealmModel>
-        get() = Challenge::class.java
-    override val primaryIdentifier: String?
-        get() = id
-    override val primaryIdentifierName: String
-        get() = "id"
-
-    override fun equals(other: Any?): Boolean {
-        return if (other?.javaClass == Challenge::class.java && this.id != null) {
-            this.id == (other as Challenge).id
-        } else {
-            super.equals(other)
-        }
-    }
-
-    override fun hashCode(): Int {
-        return id?.hashCode() ?: 0
-    }
-
-    companion object {
-
-        const val TASK_ORDER_HABITS = "habits"
-        const val TASK_ORDER_TODOS = "todos"
-        const val TASK_ORDER_DAILYS = "dailys"
-        const val TASK_ORDER_REWARDS = "rewards"
-    }
-}
+package com.habitrpg.android.habitica.models.social
+
+import com.habitrpg.android.habitica.models.BaseMainObject
+import com.habitrpg.android.habitica.models.user.User
+import com.habitrpg.shared.habitica.models.tasks.TasksOrder
+import io.realm.RealmModel
+import io.realm.RealmObject
+import io.realm.annotations.Ignore
+import io.realm.annotations.PrimaryKey
+import java.util.Date
+
+open class Challenge : RealmObject(), BaseMainObject {
+    @PrimaryKey
+    var id: String? = null
+    var name: String? = null
+    var shortName: String? = null
+    var description: String? = null
+    var leaderName: String? = null
+    var leaderId: String? = null
+    var groupName: String? = null
+    var groupId: String? = null
+    var prize: Int = 0
+    var official: Boolean = false
+    var memberCount: Int = 0
+    var todoList: String? = null
+    var habitList: String? = null
+    var dailyList: String? = null
+    var rewardList: String? = null
+    var createdAt: Date? = null
+    var updatedAt: Date? = null
+
+    var group: Group? = null
+
+    var leader: User? = null
+
+    @Ignore
+    var tasksOrder: TasksOrder? = null
+    var summary: String? = null
+
+    fun getTasksOrder(): HashMap<String, Array<String>> {
+        val map = HashMap<String, Array<String>>()
+
+        if (dailyList?.isNotEmpty() == true) {
+            dailyList?.split(",".toRegex())?.dropLastWhile { it.isEmpty() }?.toTypedArray()
+                ?.let { map[TASK_ORDER_DAILYS] }
+        }
+
+        if (habitList?.isNotEmpty() == true) {
+            habitList?.split(",".toRegex())?.dropLastWhile { it.isEmpty() }?.toTypedArray()
+                ?.let { map[TASK_ORDER_HABITS] }
+        }
+
+        if (rewardList?.isNotEmpty() == true) {
+            rewardList?.split(",".toRegex())?.dropLastWhile { it.isEmpty() }?.toTypedArray()
+                ?.let { map[TASK_ORDER_REWARDS] }
+        }
+
+        if (todoList?.isNotEmpty() == true) {
+            todoList?.split(",".toRegex())?.dropLastWhile { it.isEmpty() }?.toTypedArray()
+                ?.let { map[TASK_ORDER_TODOS] }
+        }
+
+        return map
+    }
+
+    override val realmClass: Class<out RealmModel>
+        get() = Challenge::class.java
+    override val primaryIdentifier: String?
+        get() = id
+    override val primaryIdentifierName: String
+        get() = "id"
+
+    override fun equals(other: Any?): Boolean {
+        return if (other?.javaClass == Challenge::class.java && this.id != null) {
+            this.id == (other as Challenge).id
+        } else {
+            super.equals(other)
+        }
+    }
+
+    override fun hashCode(): Int {
+        return id?.hashCode() ?: 0
+    }
+
+    companion object {
+        const val TASK_ORDER_HABITS = "habits"
+        const val TASK_ORDER_TODOS = "todos"
+        const val TASK_ORDER_DAILYS = "dailys"
+        const val TASK_ORDER_REWARDS = "rewards"
+    }
+}
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 f7678d441..69d1c6511 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
@@ -1,66 +1,65 @@
-package com.habitrpg.android.habitica.models.social
-
-import android.text.Spanned
-import com.habitrpg.android.habitica.models.BaseMainObject
-import com.habitrpg.android.habitica.models.user.Backer
-import com.habitrpg.android.habitica.models.user.ContributorInfo
-import io.realm.RealmList
-import io.realm.RealmObject
-import io.realm.annotations.Ignore
-import io.realm.annotations.PrimaryKey
-
-open class ChatMessage : RealmObject(), BaseMainObject {
-
-    override val realmClass: Class<ChatMessage>
-        get() = ChatMessage::class.java
-    override val primaryIdentifier: String?
-        get() = id
-    override val primaryIdentifierName: String
-        get() = "id"
-
-    @PrimaryKey
-    var id: String = ""
-
-    var text: String? = null
-
-    @Ignore
-    var parsedText: Spanned? = null
-
-    var timestamp: Long? = null
-
-    var likes: RealmList<ChatMessageLike>? = null
-
-    var flagCount: Int = 0
-
-    var uuid: String? = null
-    var userID: String? = null
-
-    var contributor: ContributorInfo? = null
-
-    var backer: Backer? = null
-
-    var user: String? = null
-
-    var sent: Boolean = false
-
-    var groupId: String? = null
-
-    var isInboxMessage: Boolean = false
-
-    var userStyles: UserStyles? = null
-
-    val isSystemMessage: Boolean
-        get() = uuid == "system"
-
-    var likeCount: Int = 0
-
-    var username: String? = null
-    val formattedUsername: String?
-        get() = if (username != null) "@$username" else null
-
-    var isSeen: Boolean = true
-
-    fun userLikesMessage(userId: String?): Boolean {
-        return likes?.any { userId == it.id } ?: false
-    }
-}
+package com.habitrpg.android.habitica.models.social
+
+import android.text.Spanned
+import com.habitrpg.android.habitica.models.BaseMainObject
+import com.habitrpg.android.habitica.models.user.Backer
+import com.habitrpg.android.habitica.models.user.ContributorInfo
+import io.realm.RealmList
+import io.realm.RealmObject
+import io.realm.annotations.Ignore
+import io.realm.annotations.PrimaryKey
+
+open class ChatMessage : RealmObject(), BaseMainObject {
+    override val realmClass: Class<ChatMessage>
+        get() = ChatMessage::class.java
+    override val primaryIdentifier: String?
+        get() = id
+    override val primaryIdentifierName: String
+        get() = "id"
+
+    @PrimaryKey
+    var id: String = ""
+
+    var text: String? = null
+
+    @Ignore
+    var parsedText: Spanned? = null
+
+    var timestamp: Long? = null
+
+    var likes: RealmList<ChatMessageLike>? = null
+
+    var flagCount: Int = 0
+
+    var uuid: String? = null
+    var userID: String? = null
+
+    var contributor: ContributorInfo? = null
+
+    var backer: Backer? = null
+
+    var user: String? = null
+
+    var sent: Boolean = false
+
+    var groupId: String? = null
+
+    var isInboxMessage: Boolean = false
+
+    var userStyles: UserStyles? = null
+
+    val isSystemMessage: Boolean
+        get() = uuid == "system"
+
+    var likeCount: Int = 0
+
+    var username: String? = null
+    val formattedUsername: String?
+        get() = if (username != null) "@$username" else null
+
+    var isSeen: Boolean = true
+
+    fun userLikesMessage(userId: String?): Boolean {
+        return likes?.any { userId == it.id } ?: false
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/FindUsernameResult.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/FindUsernameResult.kt
index fe6387683..a7d014df1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/FindUsernameResult.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/FindUsernameResult.kt
@@ -6,7 +6,6 @@ import com.habitrpg.android.habitica.models.user.ContributorInfo
 import com.habitrpg.android.habitica.models.user.Profile
 
 class FindUsernameResult {
-
     @SerializedName("_id")
     var id: String? = null
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Group.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Group.kt
index b60d6127c..f258f39c2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Group.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Group.kt
@@ -1,90 +1,90 @@
-package com.habitrpg.android.habitica.models.social
-
-import com.google.gson.annotations.SerializedName
-import com.habitrpg.android.habitica.models.BaseMainObject
-import com.habitrpg.android.habitica.models.inventory.Quest
-import com.habitrpg.android.habitica.models.user.SubscriptionPlan
-import com.habitrpg.shared.habitica.models.tasks.TasksOrder
-import io.realm.RealmList
-import io.realm.RealmObject
-import io.realm.annotations.Ignore
-import io.realm.annotations.PrimaryKey
-
-open class Group : RealmObject(), BaseMainObject {
-
-    val isGroupPlan: Boolean
-        get() {
-            return purchased?.isActive == true
-        }
-    override val realmClass: Class<Group>
-        get() = Group::class.java
-    override val primaryIdentifier: String?
-        get() = id
-    override val primaryIdentifierName: String
-        get() = "id"
-
-    @SerializedName("_id")
-    @PrimaryKey
-    var id: String = ""
-    var balance: Double = 0.toDouble()
-    var description: String? = null
-    var summary: String? = null
-    var leaderID: String? = null
-    var leaderName: String? = null
-    var managers: RealmList<String>? = null
-    var name: String? = null
-    var memberCount: Int = 0
-    var type: String? = null
-    var logo: String? = null
-    var quest: Quest? = null
-    var privacy: String? = null
-    var challengeCount: Int = 0
-    var leaderMessage: String? = null
-    var leaderOnlyChallenges: Boolean = false
-    var leaderOnlyGetGems: Boolean = false
-    var categories: RealmList<GroupCategory>? = null
-    var purchased: SubscriptionPlan? = null
-
-    @Ignore
-    var tasksOrder: TasksOrder? = null
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) {
-            return true
-        }
-        val group = other as? Group
-        return id == group?.id
-    }
-
-    override fun hashCode(): Int {
-        return id.hashCode()
-    }
-
-    fun hasTaskEditPrivileges(userID: String): Boolean {
-        if (isLeader(userID)) {
-            return true
-        }
-        return isManager(userID)
-    }
-
-    fun canManageManagers(userID: String): Boolean {
-        return isLeader(userID)
-    }
-
-    fun isLeader(userID: String): Boolean = leaderID == userID
-    fun isManager(userID: String): Boolean = managers?.contains(userID) == true
-
-    companion object {
-        const val TAVERN_ID = "00000000-0000-4000-A000-000000000000"
-    }
-
-    val hasActiveQuest: Boolean
-        get() {
-            return quest?.active ?: false
-        }
-
-    val gemCount: Int
-        get() {
-            return (balance * 4.0).toInt()
-        }
-}
+package com.habitrpg.android.habitica.models.social
+
+import com.google.gson.annotations.SerializedName
+import com.habitrpg.android.habitica.models.BaseMainObject
+import com.habitrpg.android.habitica.models.inventory.Quest
+import com.habitrpg.android.habitica.models.user.SubscriptionPlan
+import com.habitrpg.shared.habitica.models.tasks.TasksOrder
+import io.realm.RealmList
+import io.realm.RealmObject
+import io.realm.annotations.Ignore
+import io.realm.annotations.PrimaryKey
+
+open class Group : RealmObject(), BaseMainObject {
+    val isGroupPlan: Boolean
+        get() {
+            return purchased?.isActive == true
+        }
+    override val realmClass: Class<Group>
+        get() = Group::class.java
+    override val primaryIdentifier: String?
+        get() = id
+    override val primaryIdentifierName: String
+        get() = "id"
+
+    @SerializedName("_id")
+    @PrimaryKey
+    var id: String = ""
+    var balance: Double = 0.toDouble()
+    var description: String? = null
+    var summary: String? = null
+    var leaderID: String? = null
+    var leaderName: String? = null
+    var managers: RealmList<String>? = null
+    var name: String? = null
+    var memberCount: Int = 0
+    var type: String? = null
+    var logo: String? = null
+    var quest: Quest? = null
+    var privacy: String? = null
+    var challengeCount: Int = 0
+    var leaderMessage: String? = null
+    var leaderOnlyChallenges: Boolean = false
+    var leaderOnlyGetGems: Boolean = false
+    var categories: RealmList<GroupCategory>? = null
+    var purchased: SubscriptionPlan? = null
+
+    @Ignore
+    var tasksOrder: TasksOrder? = null
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) {
+            return true
+        }
+        val group = other as? Group
+        return id == group?.id
+    }
+
+    override fun hashCode(): Int {
+        return id.hashCode()
+    }
+
+    fun hasTaskEditPrivileges(userID: String): Boolean {
+        if (isLeader(userID)) {
+            return true
+        }
+        return isManager(userID)
+    }
+
+    fun canManageManagers(userID: String): Boolean {
+        return isLeader(userID)
+    }
+
+    fun isLeader(userID: String): Boolean = leaderID == userID
+
+    fun isManager(userID: String): Boolean = managers?.contains(userID) == true
+
+    companion object {
+        const val TAVERN_ID = "00000000-0000-4000-A000-000000000000"
+    }
+
+    val hasActiveQuest: Boolean
+        get() {
+            return quest?.active ?: false
+        }
+
+    val gemCount: Int
+        get() {
+            return (balance * 4.0).toInt()
+        }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/InboxConversation.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/InboxConversation.kt
index 4b82ce4de..8b805e8ba 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/InboxConversation.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/InboxConversation.kt
@@ -7,7 +7,6 @@ import io.realm.annotations.PrimaryKey
 import java.util.Date
 
 open class InboxConversation : RealmObject(), BaseObject {
-
     @PrimaryKey
     var combinedID: String = ""
     var uuid: String = ""
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/ChecklistItem.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/ChecklistItem.kt
index 40c4dd9bc..030ffd563 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/ChecklistItem.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/ChecklistItem.kt
@@ -1,77 +1,80 @@
-package com.habitrpg.android.habitica.models.tasks
-
-import android.os.Parcel
-import android.os.Parcelable
-import com.habitrpg.android.habitica.models.BaseMainObject
-import io.realm.RealmModel
-import io.realm.RealmObject
-import io.realm.annotations.PrimaryKey
-import java.util.UUID
-
-open class ChecklistItem : RealmObject, BaseMainObject, Parcelable {
-
-    override val realmClass: Class<ChecklistItem>
-        get() = ChecklistItem::class.java
-    override val primaryIdentifier: String?
-        get() = id
-    override val primaryIdentifierName: String
-        get() = "id"
-
-    @PrimaryKey
-    var id: String? = UUID.randomUUID().toString()
-    var text: String? = null
-    var completed: Boolean = false
-    var position: Int = 0
-
-    @JvmOverloads constructor(id: String? = null, text: String? = null, completed: Boolean = false) {
-        this.text = text
-        if (id?.isNotEmpty() == true) {
-            this.id = id
-        } else {
-            this.id = UUID.randomUUID().toString()
-        }
-        this.completed = completed
-    }
-
-    constructor(item: ChecklistItem) {
-        this.text = item.text
-        this.id = item.id
-        this.completed = item.completed
-    }
-
-    override fun describeContents(): Int {
-        return 0
-    }
-
-    override fun writeToParcel(dest: Parcel, flags: Int) {
-        dest.writeString(id)
-        dest.writeString(text)
-        dest.writeByte(if (completed) 1.toByte() else 0.toByte())
-        dest.writeInt(position)
-    }
-
-    companion object CREATOR : Parcelable.Creator<ChecklistItem>, RealmModel {
-        override fun createFromParcel(source: Parcel): ChecklistItem = ChecklistItem(source)
-
-        override fun newArray(size: Int): Array<ChecklistItem?> = arrayOfNulls(size)
-    }
-
-    constructor(source: Parcel) {
-        id = source.readString()
-        text = source.readString()
-        completed = source.readByte() == 1.toByte()
-        position = source.readInt()
-    }
-
-    override fun equals(other: Any?): Boolean {
-        return if (other is ChecklistItem) {
-            this.id == other.id
-        } else {
-            super.equals(other)
-        }
-    }
-
-    override fun hashCode(): Int {
-        return id?.hashCode() ?: 0
-    }
-}
+package com.habitrpg.android.habitica.models.tasks
+
+import android.os.Parcel
+import android.os.Parcelable
+import com.habitrpg.android.habitica.models.BaseMainObject
+import io.realm.RealmModel
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
+import java.util.UUID
+
+open class ChecklistItem : RealmObject, BaseMainObject, Parcelable {
+    override val realmClass: Class<ChecklistItem>
+        get() = ChecklistItem::class.java
+    override val primaryIdentifier: String?
+        get() = id
+    override val primaryIdentifierName: String
+        get() = "id"
+
+    @PrimaryKey
+    var id: String? = UUID.randomUUID().toString()
+    var text: String? = null
+    var completed: Boolean = false
+    var position: Int = 0
+
+    @JvmOverloads
+    constructor(id: String? = null, text: String? = null, completed: Boolean = false) {
+        this.text = text
+        if (id?.isNotEmpty() == true) {
+            this.id = id
+        } else {
+            this.id = UUID.randomUUID().toString()
+        }
+        this.completed = completed
+    }
+
+    constructor(item: ChecklistItem) {
+        this.text = item.text
+        this.id = item.id
+        this.completed = item.completed
+    }
+
+    override fun describeContents(): Int {
+        return 0
+    }
+
+    override fun writeToParcel(
+        dest: Parcel,
+        flags: Int,
+    ) {
+        dest.writeString(id)
+        dest.writeString(text)
+        dest.writeByte(if (completed) 1.toByte() else 0.toByte())
+        dest.writeInt(position)
+    }
+
+    companion object CREATOR : Parcelable.Creator<ChecklistItem>, RealmModel {
+        override fun createFromParcel(source: Parcel): ChecklistItem = ChecklistItem(source)
+
+        override fun newArray(size: Int): Array<ChecklistItem?> = arrayOfNulls(size)
+    }
+
+    constructor(source: Parcel) {
+        id = source.readString()
+        text = source.readString()
+        completed = source.readByte() == 1.toByte()
+        position = source.readInt()
+    }
+
+    override fun equals(other: Any?): Boolean {
+        return if (other is ChecklistItem) {
+            this.id == other.id
+        } else {
+            super.equals(other)
+        }
+    }
+
+    override fun hashCode(): Int {
+        return id?.hashCode() ?: 0
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Days.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Days.kt
index ec95d041c..00d2de2ea 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Days.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Days.kt
@@ -21,7 +21,10 @@ open class Days() : io.realm.RealmObject(), Parcelable {
     var s: Boolean = true
     var su: Boolean = true
 
-    override fun writeToParcel(dest: Parcel, flags: Int) {
+    override fun writeToParcel(
+        dest: Parcel,
+        flags: Int,
+    ) {
         dest.writeByte(if (m) 1.toByte() else 0.toByte())
         dest.writeByte(if (t) 1.toByte() else 0.toByte())
         dest.writeByte(if (w) 1.toByte() else 0.toByte())
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/RemindersItem.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/RemindersItem.kt
index cf7ed69cf..d0a2c3b28 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/RemindersItem.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/RemindersItem.kt
@@ -1,107 +1,113 @@
-package com.habitrpg.android.habitica.models.tasks
-
-import android.os.Parcel
-import android.os.Parcelable
-import io.realm.RealmObject
-import io.realm.annotations.PrimaryKey
-import java.time.Instant
-import java.time.LocalDateTime
-import java.time.ZoneId
-import java.time.ZonedDateTime
-import java.time.format.DateTimeFormatter
-import java.time.format.DateTimeFormatterBuilder
-import java.time.temporal.TemporalAccessor
-import java.util.UUID
-
-open class RemindersItem : RealmObject, Parcelable {
-    @PrimaryKey
-    var id: String? = null
-    var startDate: String? = null
-    var time: String? = null
-
-    // Use to store task type before a task is created
-    var type: String? = null
-
-    override fun describeContents(): Int {
-        return 0
-    }
-
-    override fun writeToParcel(dest: Parcel, flags: Int) {
-        dest.writeString(id)
-        dest.writeString(startDate)
-        dest.writeString(time)
-    }
-
-    companion object CREATOR : Parcelable.Creator<RemindersItem> {
-        override fun createFromParcel(source: Parcel): RemindersItem = RemindersItem(source)
-
-        override fun newArray(size: Int): Array<RemindersItem?> = arrayOfNulls(size)
-    }
-
-    constructor(source: Parcel) {
-        id = source.readString()
-        startDate = source.readString()
-        time = source.readString()
-    }
-
-    constructor() {
-        id = UUID.randomUUID().toString()
-    }
-
-    override fun equals(other: Any?): Boolean {
-        return if (other is RemindersItem) {
-            this.id == other.id
-        } else {
-            super.equals(other)
-        }
-    }
-
-    override fun hashCode(): Int {
-        return id?.hashCode() ?: 0
-    }
-
-    fun getZonedDateTime(): ZonedDateTime? {
-        if (time == null) {
-            return null
-        }
-        val formatter: DateTimeFormatter =
-            DateTimeFormatterBuilder().append(DateTimeFormatter.ISO_LOCAL_DATE)
-                .appendPattern("['T'][' ']")
-                .append(DateTimeFormatter.ISO_LOCAL_TIME)
-                .appendPattern("[XX]")
-                .toFormatter()
-
-        val parsed: TemporalAccessor = formatter.parseBest(
-            time,
-            ZonedDateTime::from,
-            LocalDateTime::from
-        )
-        return if (parsed is ZonedDateTime) {
-            parsed
-        } else {
-            val defaultZone: ZoneId = ZoneId.of("UTC")
-            (parsed as LocalDateTime).atZone(defaultZone)
-        }
-    }
-
-    fun getLocalZonedDateTimeInstant(): Instant? {
-        val formatter: DateTimeFormatter =
-            DateTimeFormatterBuilder().append(DateTimeFormatter.ISO_LOCAL_DATE)
-                .appendPattern("['T'][' ']")
-                .append(DateTimeFormatter.ISO_LOCAL_TIME)
-                .appendPattern("[XX]")
-                .toFormatter()
-
-        val parsed: TemporalAccessor = formatter.parseBest(
-            time,
-            ZonedDateTime::from,
-            LocalDateTime::from
-        )
-        return if (parsed is ZonedDateTime) {
-            parsed.withZoneSameLocal(ZoneId.systemDefault())?.toInstant()
-        } else {
-            val defaultZone: ZoneId = ZoneId.of("UTC")
-            (parsed as LocalDateTime).atZone(defaultZone).withZoneSameLocal(ZoneId.systemDefault())?.toInstant()
-        }
-    }
-}
+package com.habitrpg.android.habitica.models.tasks
+
+import android.os.Parcel
+import android.os.Parcelable
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
+import java.time.Instant
+import java.time.LocalDateTime
+import java.time.ZoneId
+import java.time.ZonedDateTime
+import java.time.format.DateTimeFormatter
+import java.time.format.DateTimeFormatterBuilder
+import java.time.temporal.TemporalAccessor
+import java.util.UUID
+
+open class RemindersItem : RealmObject, Parcelable {
+    @PrimaryKey
+    var id: String? = null
+    var startDate: String? = null
+    var time: String? = null
+
+    // Use to store task type before a task is created
+    var type: String? = null
+
+    override fun describeContents(): Int {
+        return 0
+    }
+
+    override fun writeToParcel(
+        dest: Parcel,
+        flags: Int,
+    ) {
+        dest.writeString(id)
+        dest.writeString(startDate)
+        dest.writeString(time)
+    }
+
+    companion object CREATOR : Parcelable.Creator<RemindersItem> {
+        override fun createFromParcel(source: Parcel): RemindersItem = RemindersItem(source)
+
+        override fun newArray(size: Int): Array<RemindersItem?> = arrayOfNulls(size)
+    }
+
+    constructor(source: Parcel) {
+        id = source.readString()
+        startDate = source.readString()
+        time = source.readString()
+    }
+
+    constructor() {
+        id = UUID.randomUUID().toString()
+    }
+
+    override fun equals(other: Any?): Boolean {
+        return if (other is RemindersItem) {
+            this.id == other.id
+        } else {
+            super.equals(other)
+        }
+    }
+
+    override fun hashCode(): Int {
+        return id?.hashCode() ?: 0
+    }
+
+    fun getZonedDateTime(): ZonedDateTime? {
+        if (time == null) {
+            return null
+        }
+        val formatter: DateTimeFormatter =
+            DateTimeFormatterBuilder().append(DateTimeFormatter.ISO_LOCAL_DATE)
+                .appendPattern("['T'][' ']")
+                .append(DateTimeFormatter.ISO_LOCAL_TIME)
+                .appendPattern("[XX]")
+                .toFormatter()
+
+        val parsed: TemporalAccessor =
+            formatter.parseBest(
+                time,
+                ZonedDateTime::from,
+                LocalDateTime::from,
+            )
+        return if (parsed is ZonedDateTime) {
+            parsed
+        } else {
+            val defaultZone: ZoneId = ZoneId.of("UTC")
+            (parsed as LocalDateTime).atZone(defaultZone)
+        }
+    }
+
+    fun getLocalZonedDateTimeInstant(): Instant? {
+        val formatter: DateTimeFormatter =
+            DateTimeFormatterBuilder().append(DateTimeFormatter.ISO_LOCAL_DATE)
+                .appendPattern("['T'][' ']")
+                .append(DateTimeFormatter.ISO_LOCAL_TIME)
+                .appendPattern("[XX]")
+                .toFormatter()
+
+        val parsed: TemporalAccessor =
+            formatter.parseBest(
+                time,
+                ZonedDateTime::from,
+                LocalDateTime::from,
+            )
+        return if (parsed is ZonedDateTime) {
+            parsed.withZoneSameLocal(ZoneId.systemDefault())?.toInstant()
+        } else {
+            val defaultZone: ZoneId = ZoneId.of("UTC")
+            (parsed as LocalDateTime).atZone(defaultZone).withZoneSameLocal(ZoneId.systemDefault())
+                ?.toInstant()
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt
index b2448866a..8881dd2ba 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt
@@ -1,697 +1,755 @@
-package com.habitrpg.android.habitica.models.tasks
-
-import android.os.Parcel
-import android.os.Parcelable
-import android.text.Spanned
-import com.google.gson.annotations.SerializedName
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.extensions.matchesRepeatDays
-import com.habitrpg.android.habitica.extensions.parseToZonedDateTime
-import com.habitrpg.android.habitica.extensions.toZonedDateTime
-import com.habitrpg.android.habitica.models.BaseMainObject
-import com.habitrpg.android.habitica.models.Tag
-import com.habitrpg.common.habitica.helpers.ExceptionHandler
-import com.habitrpg.common.habitica.helpers.MarkdownParser
-import com.habitrpg.shared.habitica.models.tasks.Attribute
-import com.habitrpg.shared.habitica.models.tasks.BaseTask
-import com.habitrpg.shared.habitica.models.tasks.Frequency
-import com.habitrpg.shared.habitica.models.tasks.TaskType
-import io.realm.RealmList
-import io.realm.RealmObject
-import io.realm.annotations.Ignore
-import io.realm.annotations.PrimaryKey
-import org.json.JSONArray
-import org.json.JSONException
-import java.time.DateTimeException
-import java.time.LocalDate
-import java.time.ZoneId
-import java.time.ZonedDateTime
-import java.time.temporal.ChronoUnit
-import java.util.Date
-
-open class Task : RealmObject, BaseMainObject, Parcelable, BaseTask {
-    override val realmClass: Class<Task>
-        get() = Task::class.java
-    override val primaryIdentifier: String?
-        get() = id
-    override val primaryIdentifierName: String
-        get() = "id"
-
-    @PrimaryKey
-    var combinedID: String? = null
-
-    @SerializedName("_id")
-    var id: String? = null
-        set(value) {
-            field = value
-            combinedID = id + ownerID
-        }
-    var ownerID: String = ""
-        set(value) {
-            field = value
-            combinedID = id + ownerID
-        }
-    var priority: Float = 0.0f
-    var text: String = ""
-    var notes: String? = null
-    override var type: TaskType?
-        get() = TaskType.from(typeValue)
-        set(value) { typeValue = value?.value }
-    private var typeValue: String? = null
-    var challengeID: String? = null
-    var challengeBroken: String? = null
-    var attribute: Attribute?
-        get() = Attribute.from(attributeValue)
-        set(value) { attributeValue = value?.value }
-    var attributeValue: String? = Attribute.STRENGTH.value
-    var value: Double = 0.0
-    var tags: RealmList<Tag>? = RealmList()
-    var dateCreated: Date? = null
-    var position: Int = 0
-    var group: TaskGroupPlan? = null
-
-    // Habits
-    var up: Boolean? = false
-    var down: Boolean? = false
-    override var counterUp: Int? = 0
-    override var counterDown: Int? = 0
-
-    // todos/dailies
-    override var completed: Boolean = false
-    var checklist: RealmList<ChecklistItem>? = RealmList()
-    var reminders: RealmList<RemindersItem>? = RealmList()
-
-    // dailies
-    var frequency: Frequency?
-        get() = Frequency.from(frequencyValue)
-        set(value) { frequencyValue = value?.value }
-    var frequencyValue: String? = null
-    var everyX: Int? = 0
-    override var streak: Int? = 0
-    var startDate: Date? = null
-    var repeat: Days? = null
-
-    // todos
-    @SerializedName("date")
-    var dueDate: Date? = null
-
-    @Ignore
-    var parsedText: Spanned? = null
-
-    @Ignore
-    var parsedNotes: Spanned? = null
-
-    override var isDue: Boolean? = null
-
-    var nextDue: RealmList<Date>? = null
-    var updatedAt: Date? = null
-    val isUpdatedToday: Boolean
-        get() {
-            val updatedAt = updatedAt ?: return false
-            return ZonedDateTime.ofInstant(updatedAt.toInstant(), ZoneId.systemDefault()).toLocalDate()
-                .equals(ZonedDateTime.now().withZoneSameLocal(ZoneId.systemDefault()).toLocalDate())
-        }
-
-    // Needed for offline creating/updating
-    var isSaving: Boolean = false
-    var hasErrored: Boolean = false
-    var isCreating: Boolean = false
-    var yesterDaily: Boolean = true
-
-    var daysOfMonthString: String? = null
-    var weeksOfMonthString: String? = null
-
-    @Ignore
-    private var daysOfMonth: List<Int>? = null
-
-    @Ignore
-    private var weeksOfMonth: List<Int>? = null
-
-    val completedChecklistCount: Int
-        get() = checklist?.count { it.completed } ?: 0
-
-    fun completed(byUserID: String?): Boolean {
-        return if (isGroupTask) {
-            group?.assignedUsersDetail?.firstOrNull { it.assignedUserID == byUserID }?.completed ?: completed
-        } else {
-            completed
-        }
-    }
-
-    fun completeForUser(userID: String?, completed: Boolean) {
-        if (isGroupTask && group?.assignedUsersDetail?.isNotEmpty() == true) {
-            group?.assignedUsersDetail?.firstOrNull { it.assignedUserID == userID }?.completed = completed
-            if (group?.assignedUsersDetail?.none { it.completed != completed } == true) {
-                this.completed = completed
-            }
-        } else {
-            this.completed = completed
-        }
-    }
-
-    fun isDisplayedActiveForUser(userID: String?): Boolean {
-        val isActive = ((isDue == true && type == TaskType.DAILY) || type == TaskType.TODO)
-        return isActive && !completed(userID)
-    }
-
-    fun isDueToday(): Boolean? {
-        val zonedDueDate = dueDate?.toZonedDateTime()
-        if (zonedDueDate != null) {
-            val day = ZonedDateTime.now().dayOfYear
-            val year = ZonedDateTime.now().year
-            return (zonedDueDate.dayOfYear == day) && (zonedDueDate.year == year)
-        }
-        return null
-    }
-
-    fun isDayOrMorePastDue(): Boolean? {
-        val zonedDueDate = dueDate?.toZonedDateTime()
-        return zonedDueDate?.toLocalDate()?.isBefore(LocalDate.now())
-    }
-
-    val streakString: String?
-        get() {
-            return if (counterUp != null && (counterUp ?: 0) > 0 && counterDown != null && (counterDown ?: 0) > 0) {
-                "+" + counterUp.toString() + " | -" + counterDown?.toString()
-            } else if (counterUp != null && (counterUp ?: 0) > 0) {
-                "+" + counterUp.toString()
-            } else if (counterDown != null && (counterDown ?: 0) > 0) {
-                "-" + counterDown.toString()
-            } else if ((streak ?: 0) > 0) {
-                return streak.toString()
-            } else {
-                null
-            }
-        }
-
-    val lightestTaskColor: Int
-        get() {
-            return when {
-                this.value < -20 -> return R.color.maroon_700
-                this.value < -10 -> return R.color.red_700
-                this.value < -1 -> return R.color.orange_700
-                this.value < 1 -> return R.color.yellow_700
-                this.value < 5 -> return R.color.green_700
-                this.value < 10 -> return R.color.teal_700
-                else -> R.color.blue_700
-            }
-        }
-
-    val extraExtraLightTaskColor: Int
-        get() {
-            return when {
-                this.value < -20 -> return R.color.maroon_600
-                this.value < -10 -> return R.color.red_600
-                this.value < -1 -> return R.color.orange_600
-                this.value < 1 -> return R.color.yellow_600
-                this.value < 5 -> return R.color.green_600
-                this.value < 10 -> return R.color.teal_600
-                else -> R.color.blue_600
-            }
-        }
-
-    val extraLightTaskColor: Int
-        get() {
-            return when {
-                this.value < -20 -> return R.color.maroon_500
-                this.value < -10 -> return R.color.red_500
-                this.value < -1 -> return R.color.orange_500
-                this.value < 1 -> return R.color.yellow_500
-                this.value < 5 -> return R.color.green_500
-                this.value < 10 -> return R.color.teal_500
-                else -> R.color.blue_500
-            }
-        }
-
-    val lightTaskColor: Int
-        get() {
-            return when {
-                this.value < -20 -> return R.color.maroon_100
-                this.value < -10 -> return R.color.red_100
-                this.value < -1 -> return R.color.orange_100
-                this.value < 1 -> return R.color.yellow_100
-                this.value < 5 -> return R.color.green_100
-                this.value < 10 -> return R.color.teal_100
-                else -> R.color.blue_100
-            }
-        }
-
-    val mediumTaskColor: Int
-        get() {
-            return when {
-                this.value < -20 -> return R.color.maroon_50
-                this.value < -10 -> return R.color.red_50
-                this.value < -1 -> return R.color.orange_50
-                this.value < 1 -> return R.color.yellow_10
-                this.value < 5 -> return R.color.green_50
-                this.value < 10 -> return R.color.teal_50
-                else -> R.color.blue_50
-            }
-        }
-
-    val darkTaskColor: Int
-        get() {
-            return when {
-                this.value < -20 -> return R.color.maroon_10
-                this.value < -10 -> return R.color.red_10
-                this.value < -1 -> return R.color.orange_10
-                this.value < 1 -> return R.color.yellow_5
-                this.value < 5 -> return R.color.green_10
-                this.value < 10 -> return R.color.teal_10
-                else -> R.color.blue_10
-            }
-        }
-
-    val extraDarkTaskColor: Int
-        get() {
-            return when {
-                this.value < -20 -> return R.color.maroon_1
-                this.value < -10 -> return R.color.red_1
-                this.value < -1 -> return R.color.orange_1
-                this.value < 1 -> return R.color.yellow_1
-                this.value < 5 -> return R.color.green_1
-                this.value < 10 -> return R.color.teal_1
-                else -> R.color.blue_1
-            }
-        }
-
-    val lowSaturationTaskColor: Int
-        get() {
-            return when {
-                this.value < -20 -> return R.color.maroon_sub_text
-                this.value < -10 -> return R.color.red_sub_text
-                this.value < -1 -> return R.color.orange_sub_text
-                this.value < 1 -> return R.color.yellow_sub_text
-                this.value < 5 -> return R.color.green_sub_text
-                this.value < 10 -> return R.color.teal_sub_text
-                else -> R.color.blue_sub_text
-            }
-        }
-
-    val extraExtraDarkTaskColor: Int
-        get() {
-            return when {
-                this.value < -20 -> return R.color.maroon_0
-                this.value < -10 -> return R.color.red_0
-                this.value < -1 -> return R.color.orange_0
-                this.value < 1 -> return R.color.yellow_0
-                this.value < 5 -> return R.color.green_0
-                this.value < 10 -> return R.color.teal_0
-                else -> R.color.blue_0
-            }
-        }
-
-    val darkestTaskColor: Int
-        get() {
-            return when {
-                this.value < -20 -> return R.color.maroon_00
-                this.value < -10 -> return R.color.red_00
-                this.value < -1 -> return R.color.orange_00
-                this.value < 1 -> return R.color.yellow_00
-                this.value < 5 -> return R.color.green_00
-                this.value < 10 -> return R.color.teal_00
-                else -> R.color.blue_00
-            }
-        }
-
-    val isChecklistDisplayActive: Boolean
-        get() = this.checklist?.size != this.completedChecklistCount
-
-    val isGroupTask: Boolean
-        get() = group?.groupID?.isNotBlank() == true
-
-    fun isAssignedToUser(userID: String): Boolean {
-        return group?.assignedUsers?.contains(userID) == true
-    }
-
-    val isPendingApproval: Boolean
-        get() = (group?.approvalRequired == true && group?.approvalRequested == true && group?.approvalApproved == false)
-
-    fun containsAllTagIds(tagIdList: List<String>): Boolean = tags?.mapTo(ArrayList()) { it.id }?.containsAll(tagIdList) ?: false
-
-    fun checkIfDue(): Boolean = isDue == true
-
-    /**
-     * Calculates a list of the next upcoming reminder occurrences based on the reminder's configuration.
-     *
-     * This method determines the next few occurrences of a reminder, taking into account its start date,
-     * frequency, repetition pattern, and other settings. It generates a list of ZonedDateTime instances,
-     * each representing a future point in time when the reminder is due.
-     *
-     * The method iterates starting from the reminder's start date and checks each day to see if it matches
-     * the criteria for triggering the reminder (like matching the specified days of the week, frequency, etc.).
-     * Once a matching date is found, it's added to the list with the specific time of the reminder.
-     *
-     * This is useful for scheduling reminders that need to occur multiple times in the future according
-     * to a specific pattern (e.g., every Monday and Wednesday at 10 AM).
-     *
-     * @param remindersItem The reminder item containing the configuration for calculating occurrences.
-     * @param occurrences The number of upcoming reminder occurrences to calculate.
-     * @return A list of ZonedDateTime instances, each representing an upcoming reminder occurrence.
-     *         Returns null if the reminder item is null or essential information for calculation is missing.
-     */
-    fun getNextReminderOccurrences(remindersItem: RemindersItem?, occurrences: Int): List<ZonedDateTime>? {
-        if (remindersItem == null) return null
-
-        val reminderTime = remindersItem.time?.parseToZonedDateTime() ?: return null
-        var dateTimeOccurenceToSchedule = ZonedDateTime.now().withZoneSameInstant(ZoneId.systemDefault())
-        val occurrencesList = mutableListOf<ZonedDateTime>()
-
-        // If the reminder is a todo, only schedule sole dueDate/time occurrence. Otherwise, schedule multiple occurrences in advance
-        if (this.type == TaskType.TODO) {
-            occurrencesList.add((remindersItem.getZonedDateTime() ?: this.dueDate?.toZonedDateTime())?.withHour(reminderTime.hour)?.withMinute(reminderTime.minute) ?: return null)
-            return occurrencesList
-        }
-        val now = ZonedDateTime.now().withZoneSameInstant(ZoneId.systemDefault())
-        var startDate = this.startDate?.toInstant()?.atZone(ZoneId.systemDefault()) ?: return null
-        val frequency = this.frequency ?: return null
-        val everyX = this.everyX ?: 1
-        if (everyX == 0) {
-            return null
-        }
-        val repeatDays = this.repeat
-        startDate = startDate.withHour(reminderTime.hour).withMinute(reminderTime.minute)
-
-        while (occurrencesList.size < occurrences) {
-            // Increment currentDate based on the frequency
-            dateTimeOccurenceToSchedule = when (frequency) {
-                Frequency.DAILY -> {
-                    dateTimeOccurenceToSchedule = if (dateTimeOccurenceToSchedule.isBefore(startDate)) {
-                        startDate
-                    } else {
-                        dateTimeOccurenceToSchedule.plusDays(everyX.toLong()).withHour(reminderTime.hour).withMinute(reminderTime.minute)
-                    }
-                    dateTimeOccurenceToSchedule
-                }
-                Frequency.WEEKLY -> {
-                    // Set to start date if current date is earlier
-                    if (dateTimeOccurenceToSchedule.isBefore(startDate)) {
-                        dateTimeOccurenceToSchedule = startDate
-                    } else if (repeatDays?.hasAnyDaySelected() == true) {
-
-                        var nextDueDate = dateTimeOccurenceToSchedule.withHour(reminderTime.hour).withMinute(reminderTime.minute)
-                        // If the next due date already happened for today, increment it by one day. Otherwise, it will be scheduled for today.
-                        if (nextDueDate.isBefore(now) && occurrencesList.size == 0) {
-                            nextDueDate = nextDueDate.plusDays(1)
-                        }
-
-                        // If the reminder being scheduled is not the first iteration of the reminder, increment it by one day
-                        if (occurrencesList.size > 0) {
-                            nextDueDate = nextDueDate.plusDays(1)
-                        }
-
-                        while (!nextDueDate.matchesRepeatDays(repeatDays)) {
-                            nextDueDate = nextDueDate.plusDays(1).withHour(reminderTime.hour).withMinute(reminderTime.minute)
-                        }
-                        // Calculate weeks since start and adjust for the correct interval
-                        val weeksSinceStart = ChronoUnit.WEEKS.between(startDate.toLocalDate(), nextDueDate.toLocalDate())
-                        if (weeksSinceStart % everyX != 0L) {
-                            val weeksToNextValidInterval = everyX - (weeksSinceStart % everyX)
-                            nextDueDate = nextDueDate.plusWeeks(weeksToNextValidInterval)
-                            // Find the exact next due day within the valid interval
-                            while (!nextDueDate.matchesRepeatDays(repeatDays)) {
-                                nextDueDate = nextDueDate.plusDays(1).withHour(reminderTime.hour).withMinute(reminderTime.minute)
-                            }
-                        }
-
-                        dateTimeOccurenceToSchedule = nextDueDate
-                    }
-                    // Set time to the reminder time
-                    dateTimeOccurenceToSchedule = dateTimeOccurenceToSchedule.withHour(reminderTime.hour).withMinute(reminderTime.minute)
-                    dateTimeOccurenceToSchedule
-                }
-
-                Frequency.MONTHLY -> {
-                    dateTimeOccurenceToSchedule = if (dateTimeOccurenceToSchedule.isBefore(startDate)) {
-                        startDate
-                    } else {
-                        dateTimeOccurenceToSchedule.plusMonths(everyX.toLong()).withDayOfMonth(startDate.dayOfMonth).withHour(reminderTime.hour).withMinute(reminderTime.minute)
-                    }
-                    dateTimeOccurenceToSchedule
-                }
-                Frequency.YEARLY -> {
-                    dateTimeOccurenceToSchedule = if (dateTimeOccurenceToSchedule.isBefore(startDate)) {
-                        startDate
-                    } else {
-                        dateTimeOccurenceToSchedule.plusYears(everyX.toLong()).withDayOfMonth(startDate.dayOfMonth).withMonth(startDate.monthValue).withHour(reminderTime.hour).withMinute(reminderTime.minute)
-                    }
-                    dateTimeOccurenceToSchedule
-                }
-            }
-
-            occurrencesList.add(dateTimeOccurenceToSchedule)
-        }
-
-
-        return occurrencesList
-    }
-
-    fun parseMarkdown() {
-        parsedText = MarkdownParser.parseMarkdown(text)
-        parsedNotes = MarkdownParser.parseMarkdown(notes)
-    }
-
-    fun markdownText(callback: (CharSequence) -> Unit): CharSequence {
-        if (this.parsedText != null) {
-            return this.parsedText ?: ""
-        }
-
-        MarkdownParser.parseMarkdownAsync(this.text) { parsedText ->
-            this.parsedText = parsedText
-            callback(parsedText)
-        }
-
-        return this.text
-    }
-
-    fun markdownNotes(callback: (CharSequence) -> Unit): CharSequence? {
-        if (parsedNotes != null) {
-            return parsedNotes
-        }
-
-        if (notes?.isNotEmpty() == true) {
-            MarkdownParser.parseMarkdownAsync(notes) { parsedText ->
-                parsedNotes = parsedText
-                callback(parsedText)
-            }
-        }
-        return notes
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (other == null) {
-            return false
-        }
-        return if (Task::class.java.isAssignableFrom(other.javaClass)) {
-            val otherTask = other as? Task
-            if (this.isValid && otherTask?.isValid == true) {
-                this.id == otherTask.id
-            } else {
-                false
-            }
-        } else {
-            super.equals(other)
-        }
-    }
-
-    fun isBeingEdited(task: Task): Boolean {
-        when {
-            text != task.text -> return true
-            notes != task.notes -> return true
-            reminders?.size != task.reminders?.size -> return true
-            checklist?.size != task.checklist?.size -> return true
-            reminders?.mapIndexed { index, remindersItem -> task.reminders?.get(index) != remindersItem }?.contains(true) == true -> return true
-            checklist?.mapIndexed { index, item -> task.checklist?.get(index) != item }?.contains(true) == true -> return true
-            priority != task.priority -> return true
-            attribute != task.attribute && attribute != null -> return true
-            tags != task.tags -> return true
-        }
-        when (type) {
-            TaskType.HABIT -> {
-                return when {
-                    up != task.up -> true
-                    down != task.down -> true
-                    frequency != task.frequency -> true
-                    counterUp != task.counterUp -> true
-                    counterDown != task.counterDown -> true
-                    else -> false
-                }
-            }
-            TaskType.DAILY -> {
-                return when {
-                    startDate != task.startDate -> true
-                    everyX != task.everyX -> true
-                    frequency != task.frequency -> true
-                    repeat != task.repeat -> true
-                    streak != task.streak -> true
-                    else -> false
-                }
-            }
-            TaskType.TODO -> {
-                return (dueDate != task.dueDate && task.dueDate != null)
-            }
-            TaskType.REWARD -> {
-                return value != task.value
-            }
-            else -> {
-                return false
-            }
-        }
-    }
-
-    override fun hashCode(): Int {
-        return id?.hashCode() ?: 0
-    }
-
-    override fun describeContents(): Int = 0
-
-    override fun writeToParcel(dest: Parcel, flags: Int) {
-        dest.writeString(this.ownerID)
-        dest.writeValue(this.priority)
-        dest.writeString(this.text)
-        dest.writeString(this.notes)
-        dest.writeString(this.attribute?.value)
-        dest.writeString(this.type?.value)
-        dest.writeDouble(this.value)
-        dest.writeList(this.tags as? List<*>)
-        dest.writeLong(this.dateCreated?.time ?: -1)
-        dest.writeInt(this.position)
-        dest.writeValue(this.up)
-        dest.writeValue(this.down)
-        dest.writeByte(if (this.completed) 1.toByte() else 0.toByte())
-        dest.writeList(this.checklist as? List<*>)
-        dest.writeList(this.reminders as? List<*>)
-        dest.writeString(this.frequency?.value)
-        dest.writeValue(this.everyX)
-        dest.writeString(this.daysOfMonthString)
-        dest.writeString(this.weeksOfMonthString)
-        dest.writeValue(this.streak)
-        dest.writeLong(this.startDate?.time ?: -1)
-        dest.writeParcelable(this.repeat, flags)
-        dest.writeLong(this.dueDate?.time ?: -1)
-        dest.writeString(this.id)
-        dest.writeInt(this.counterUp ?: 0)
-        dest.writeInt(this.counterDown ?: 0)
-    }
-
-    constructor()
-
-    protected constructor(`in`: Parcel) {
-        this.ownerID = `in`.readString() ?: ""
-        this.priority = `in`.readValue(Float::class.java.classLoader) as? Float ?: 0f
-        this.text = `in`.readString() ?: ""
-        this.notes = `in`.readString()
-        this.attribute = Attribute.from(`in`.readString() ?: "")
-        this.type = TaskType.from(`in`.readString() ?: "")
-        this.value = `in`.readDouble()
-        this.tags = RealmList()
-        `in`.readList(this.tags as List<*>, TaskTag::class.java.classLoader)
-        val tmpDateCreated = `in`.readLong()
-        this.dateCreated = if (tmpDateCreated == -1L) null else Date(tmpDateCreated)
-        this.position = `in`.readInt()
-        this.up = `in`.readValue(Boolean::class.java.classLoader) as? Boolean ?: false
-        this.down = `in`.readValue(Boolean::class.java.classLoader) as? Boolean ?: false
-        this.completed = `in`.readByte().toInt() != 0
-        this.checklist = RealmList()
-        `in`.readList(this.checklist as List<*>, ChecklistItem::class.java.classLoader)
-        this.reminders = RealmList()
-        `in`.readList(this.reminders as MutableList<Any?>, RemindersItem::class.java.classLoader)
-        this.frequency = Frequency.from(`in`.readString() ?: "")
-        this.everyX = `in`.readValue(Int::class.java.classLoader) as? Int ?: 1
-        this.daysOfMonthString = `in`.readString()
-        this.weeksOfMonthString = `in`.readString()
-        this.streak = `in`.readValue(Int::class.java.classLoader) as? Int ?: 0
-        val tmpStartDate = `in`.readLong()
-        this.startDate = if (tmpStartDate == -1L) null else Date(tmpStartDate)
-        this.repeat = `in`.readParcelable(Days::class.java.classLoader)
-        val tmpDuedate = `in`.readLong()
-        this.dueDate = if (tmpDuedate == -1L) null else Date(tmpDuedate)
-        this.id = `in`.readString()
-        this.counterUp = `in`.readInt()
-        this.counterDown = `in`.readInt()
-    }
-
-    fun setWeeksOfMonth(weeksOfMonth: List<Int>?) {
-        this.weeksOfMonth = weeksOfMonth
-        if ((weeksOfMonth?.size ?: 0) > 0) {
-            this.weeksOfMonthString = this.weeksOfMonth?.toString()
-        } else {
-            weeksOfMonthString = "[]"
-        }
-    }
-
-    fun getWeeksOfMonth(): List<Int>? {
-        if (weeksOfMonth == null) {
-            val weeksOfMonth = mutableListOf<Int>()
-            if (weeksOfMonthString != null) {
-                try {
-                    val obj = JSONArray(weeksOfMonthString)
-                    var i = 0
-                    while (i < obj.length()) {
-                        weeksOfMonth.add(obj.getInt(i))
-                        i += 1
-                    }
-                } catch (e: JSONException) {
-                    ExceptionHandler.reportError(e)
-                }
-            }
-            this.weeksOfMonth = weeksOfMonth.toList()
-        }
-        return weeksOfMonth
-    }
-
-    fun setDaysOfMonth(daysOfMonth: List<Int>?) {
-        this.daysOfMonth = daysOfMonth
-        if ((daysOfMonth?.size ?: 0) > 0) {
-            this.daysOfMonthString = this.daysOfMonth?.toString()
-        } else {
-            daysOfMonthString = "[]"
-        }
-    }
-
-    private fun Days.hasAnyDaySelected(): Boolean {
-        return m || t || w || th || f || s || su
-    }
-
-    fun getDaysOfMonth(): List<Int>? {
-        if (daysOfMonth == null) {
-            val daysOfMonth = mutableListOf<Int>()
-            if (daysOfMonthString != null) {
-                try {
-                    val obj = JSONArray(daysOfMonthString)
-                    var i = 0
-                    while (i < obj.length()) {
-                        daysOfMonth.add(obj.getInt(i))
-                        i += 1
-                    }
-                } catch (e: JSONException) {
-                    ExceptionHandler.reportError(e)
-                }
-            }
-            this.daysOfMonth = daysOfMonth
-        }
-
-        return daysOfMonth
-    }
-
-    companion object CREATOR : Parcelable.Creator<Task> {
-        override fun createFromParcel(source: Parcel): Task = Task(source)
-
-        override fun newArray(size: Int): Array<Task?> = arrayOfNulls(size)
-
-        const val FILTER_ALL = "all"
-        const val FILTER_WEAK = "weak"
-        const val FILTER_STRONG = "strong"
-        const val FILTER_ACTIVE = "active"
-        const val FILTER_GRAY = "gray"
-        const val FILTER_DATED = "dated"
-        const val FILTER_COMPLETED = "completed"
-
-        @JvmField
-        val CREATOR: Parcelable.Creator<Task> = object : Parcelable.Creator<Task> {
-            override fun createFromParcel(source: Parcel): Task = Task(source)
-
-            override fun newArray(size: Int): Array<Task?> = arrayOfNulls(size)
-        }
-    }
-}
+package com.habitrpg.android.habitica.models.tasks
+
+import android.os.Parcel
+import android.os.Parcelable
+import android.text.Spanned
+import com.google.gson.annotations.SerializedName
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.extensions.matchesRepeatDays
+import com.habitrpg.android.habitica.extensions.parseToZonedDateTime
+import com.habitrpg.android.habitica.extensions.toZonedDateTime
+import com.habitrpg.android.habitica.models.BaseMainObject
+import com.habitrpg.android.habitica.models.Tag
+import com.habitrpg.common.habitica.helpers.ExceptionHandler
+import com.habitrpg.common.habitica.helpers.MarkdownParser
+import com.habitrpg.shared.habitica.models.tasks.Attribute
+import com.habitrpg.shared.habitica.models.tasks.BaseTask
+import com.habitrpg.shared.habitica.models.tasks.Frequency
+import com.habitrpg.shared.habitica.models.tasks.TaskType
+import io.realm.RealmList
+import io.realm.RealmObject
+import io.realm.annotations.Ignore
+import io.realm.annotations.PrimaryKey
+import org.json.JSONArray
+import org.json.JSONException
+import java.time.LocalDate
+import java.time.ZoneId
+import java.time.ZonedDateTime
+import java.time.temporal.ChronoUnit
+import java.util.Date
+
+open class Task : RealmObject, BaseMainObject, Parcelable, BaseTask {
+    override val realmClass: Class<Task>
+        get() = Task::class.java
+    override val primaryIdentifier: String?
+        get() = id
+    override val primaryIdentifierName: String
+        get() = "id"
+
+    @PrimaryKey
+    var combinedID: String? = null
+
+    @SerializedName("_id")
+    var id: String? = null
+        set(value) {
+            field = value
+            combinedID = id + ownerID
+        }
+    var ownerID: String = ""
+        set(value) {
+            field = value
+            combinedID = id + ownerID
+        }
+    var priority: Float = 0.0f
+    var text: String = ""
+    var notes: String? = null
+    override var type: TaskType?
+        get() = TaskType.from(typeValue)
+        set(value) {
+            typeValue = value?.value
+        }
+    private var typeValue: String? = null
+    var challengeID: String? = null
+    var challengeBroken: String? = null
+    var attribute: Attribute?
+        get() = Attribute.from(attributeValue)
+        set(value) {
+            attributeValue = value?.value
+        }
+    var attributeValue: String? = Attribute.STRENGTH.value
+    var value: Double = 0.0
+    var tags: RealmList<Tag>? = RealmList()
+    var dateCreated: Date? = null
+    var position: Int = 0
+    var group: TaskGroupPlan? = null
+
+    // Habits
+    var up: Boolean? = false
+    var down: Boolean? = false
+    override var counterUp: Int? = 0
+    override var counterDown: Int? = 0
+
+    // todos/dailies
+    override var completed: Boolean = false
+    var checklist: RealmList<ChecklistItem>? = RealmList()
+    var reminders: RealmList<RemindersItem>? = RealmList()
+
+    // dailies
+    var frequency: Frequency?
+        get() = Frequency.from(frequencyValue)
+        set(value) {
+            frequencyValue = value?.value
+        }
+    var frequencyValue: String? = null
+    var everyX: Int? = 0
+    override var streak: Int? = 0
+    var startDate: Date? = null
+    var repeat: Days? = null
+
+    // todos
+    @SerializedName("date")
+    var dueDate: Date? = null
+
+    @Ignore
+    var parsedText: Spanned? = null
+
+    @Ignore
+    var parsedNotes: Spanned? = null
+
+    override var isDue: Boolean? = null
+
+    var nextDue: RealmList<Date>? = null
+    var updatedAt: Date? = null
+    val isUpdatedToday: Boolean
+        get() {
+            val updatedAt = updatedAt ?: return false
+            return ZonedDateTime.ofInstant(updatedAt.toInstant(), ZoneId.systemDefault())
+                .toLocalDate()
+                .equals(ZonedDateTime.now().withZoneSameLocal(ZoneId.systemDefault()).toLocalDate())
+        }
+
+    // Needed for offline creating/updating
+    var isSaving: Boolean = false
+    var hasErrored: Boolean = false
+    var isCreating: Boolean = false
+    var yesterDaily: Boolean = true
+
+    var daysOfMonthString: String? = null
+    var weeksOfMonthString: String? = null
+
+    @Ignore
+    private var daysOfMonth: List<Int>? = null
+
+    @Ignore
+    private var weeksOfMonth: List<Int>? = null
+
+    val completedChecklistCount: Int
+        get() = checklist?.count { it.completed } ?: 0
+
+    fun completed(byUserID: String?): Boolean {
+        return if (isGroupTask) {
+            group?.assignedUsersDetail?.firstOrNull { it.assignedUserID == byUserID }?.completed
+                ?: completed
+        } else {
+            completed
+        }
+    }
+
+    fun completeForUser(
+        userID: String?,
+        completed: Boolean,
+    ) {
+        if (isGroupTask && group?.assignedUsersDetail?.isNotEmpty() == true) {
+            group?.assignedUsersDetail?.firstOrNull { it.assignedUserID == userID }?.completed =
+                completed
+            if (group?.assignedUsersDetail?.none { it.completed != completed } == true) {
+                this.completed = completed
+            }
+        } else {
+            this.completed = completed
+        }
+    }
+
+    fun isDisplayedActiveForUser(userID: String?): Boolean {
+        val isActive = ((isDue == true && type == TaskType.DAILY) || type == TaskType.TODO)
+        return isActive && !completed(userID)
+    }
+
+    fun isDueToday(): Boolean? {
+        val zonedDueDate = dueDate?.toZonedDateTime()
+        if (zonedDueDate != null) {
+            val day = ZonedDateTime.now().dayOfYear
+            val year = ZonedDateTime.now().year
+            return (zonedDueDate.dayOfYear == day) && (zonedDueDate.year == year)
+        }
+        return null
+    }
+
+    fun isDayOrMorePastDue(): Boolean? {
+        val zonedDueDate = dueDate?.toZonedDateTime()
+        return zonedDueDate?.toLocalDate()?.isBefore(LocalDate.now())
+    }
+
+    val streakString: String?
+        get() {
+            return if (counterUp != null && (
+                    counterUp
+                        ?: 0
+                ) > 0 && counterDown != null && (counterDown ?: 0) > 0
+            ) {
+                "+" + counterUp.toString() + " | -" + counterDown?.toString()
+            } else if (counterUp != null && (counterUp ?: 0) > 0) {
+                "+" + counterUp.toString()
+            } else if (counterDown != null && (counterDown ?: 0) > 0) {
+                "-" + counterDown.toString()
+            } else if ((streak ?: 0) > 0) {
+                return streak.toString()
+            } else {
+                null
+            }
+        }
+
+    val lightestTaskColor: Int
+        get() {
+            return when {
+                this.value < -20 -> return R.color.maroon_700
+                this.value < -10 -> return R.color.red_700
+                this.value < -1 -> return R.color.orange_700
+                this.value < 1 -> return R.color.yellow_700
+                this.value < 5 -> return R.color.green_700
+                this.value < 10 -> return R.color.teal_700
+                else -> R.color.blue_700
+            }
+        }
+
+    val extraExtraLightTaskColor: Int
+        get() {
+            return when {
+                this.value < -20 -> return R.color.maroon_600
+                this.value < -10 -> return R.color.red_600
+                this.value < -1 -> return R.color.orange_600
+                this.value < 1 -> return R.color.yellow_600
+                this.value < 5 -> return R.color.green_600
+                this.value < 10 -> return R.color.teal_600
+                else -> R.color.blue_600
+            }
+        }
+
+    val extraLightTaskColor: Int
+        get() {
+            return when {
+                this.value < -20 -> return R.color.maroon_500
+                this.value < -10 -> return R.color.red_500
+                this.value < -1 -> return R.color.orange_500
+                this.value < 1 -> return R.color.yellow_500
+                this.value < 5 -> return R.color.green_500
+                this.value < 10 -> return R.color.teal_500
+                else -> R.color.blue_500
+            }
+        }
+
+    val lightTaskColor: Int
+        get() {
+            return when {
+                this.value < -20 -> return R.color.maroon_100
+                this.value < -10 -> return R.color.red_100
+                this.value < -1 -> return R.color.orange_100
+                this.value < 1 -> return R.color.yellow_100
+                this.value < 5 -> return R.color.green_100
+                this.value < 10 -> return R.color.teal_100
+                else -> R.color.blue_100
+            }
+        }
+
+    val mediumTaskColor: Int
+        get() {
+            return when {
+                this.value < -20 -> return R.color.maroon_50
+                this.value < -10 -> return R.color.red_50
+                this.value < -1 -> return R.color.orange_50
+                this.value < 1 -> return R.color.yellow_10
+                this.value < 5 -> return R.color.green_50
+                this.value < 10 -> return R.color.teal_50
+                else -> R.color.blue_50
+            }
+        }
+
+    val darkTaskColor: Int
+        get() {
+            return when {
+                this.value < -20 -> return R.color.maroon_10
+                this.value < -10 -> return R.color.red_10
+                this.value < -1 -> return R.color.orange_10
+                this.value < 1 -> return R.color.yellow_5
+                this.value < 5 -> return R.color.green_10
+                this.value < 10 -> return R.color.teal_10
+                else -> R.color.blue_10
+            }
+        }
+
+    val extraDarkTaskColor: Int
+        get() {
+            return when {
+                this.value < -20 -> return R.color.maroon_1
+                this.value < -10 -> return R.color.red_1
+                this.value < -1 -> return R.color.orange_1
+                this.value < 1 -> return R.color.yellow_1
+                this.value < 5 -> return R.color.green_1
+                this.value < 10 -> return R.color.teal_1
+                else -> R.color.blue_1
+            }
+        }
+
+    val lowSaturationTaskColor: Int
+        get() {
+            return when {
+                this.value < -20 -> return R.color.maroon_sub_text
+                this.value < -10 -> return R.color.red_sub_text
+                this.value < -1 -> return R.color.orange_sub_text
+                this.value < 1 -> return R.color.yellow_sub_text
+                this.value < 5 -> return R.color.green_sub_text
+                this.value < 10 -> return R.color.teal_sub_text
+                else -> R.color.blue_sub_text
+            }
+        }
+
+    val extraExtraDarkTaskColor: Int
+        get() {
+            return when {
+                this.value < -20 -> return R.color.maroon_0
+                this.value < -10 -> return R.color.red_0
+                this.value < -1 -> return R.color.orange_0
+                this.value < 1 -> return R.color.yellow_0
+                this.value < 5 -> return R.color.green_0
+                this.value < 10 -> return R.color.teal_0
+                else -> R.color.blue_0
+            }
+        }
+
+    val darkestTaskColor: Int
+        get() {
+            return when {
+                this.value < -20 -> return R.color.maroon_00
+                this.value < -10 -> return R.color.red_00
+                this.value < -1 -> return R.color.orange_00
+                this.value < 1 -> return R.color.yellow_00
+                this.value < 5 -> return R.color.green_00
+                this.value < 10 -> return R.color.teal_00
+                else -> R.color.blue_00
+            }
+        }
+
+    val isChecklistDisplayActive: Boolean
+        get() = this.checklist?.size != this.completedChecklistCount
+
+    val isGroupTask: Boolean
+        get() = group?.groupID?.isNotBlank() == true
+
+    fun isAssignedToUser(userID: String): Boolean {
+        return group?.assignedUsers?.contains(userID) == true
+    }
+
+    val isPendingApproval: Boolean
+        get() = (group?.approvalRequired == true && group?.approvalRequested == true && group?.approvalApproved == false)
+
+    fun containsAllTagIds(tagIdList: List<String>): Boolean =
+        tags?.mapTo(ArrayList()) { it.id }?.containsAll(tagIdList) ?: false
+
+    fun checkIfDue(): Boolean = isDue == true
+
+    /**
+     * Calculates a list of the next upcoming reminder occurrences based on the reminder's configuration.
+     *
+     * This method determines the next few occurrences of a reminder, taking into account its start date,
+     * frequency, repetition pattern, and other settings. It generates a list of ZonedDateTime instances,
+     * each representing a future point in time when the reminder is due.
+     *
+     * The method iterates starting from the reminder's start date and checks each day to see if it matches
+     * the criteria for triggering the reminder (like matching the specified days of the week, frequency, etc.).
+     * Once a matching date is found, it's added to the list with the specific time of the reminder.
+     *
+     * This is useful for scheduling reminders that need to occur multiple times in the future according
+     * to a specific pattern (e.g., every Monday and Wednesday at 10 AM).
+     *
+     * @param remindersItem The reminder item containing the configuration for calculating occurrences.
+     * @param occurrences The number of upcoming reminder occurrences to calculate.
+     * @return A list of ZonedDateTime instances, each representing an upcoming reminder occurrence.
+     *         Returns null if the reminder item is null or essential information for calculation is missing.
+     */
+    fun getNextReminderOccurrences(
+        remindersItem: RemindersItem?,
+        occurrences: Int,
+    ): List<ZonedDateTime>? {
+        if (remindersItem == null) return null
+
+        val reminderTime = remindersItem.time?.parseToZonedDateTime() ?: return null
+        var dateTimeOccurenceToSchedule =
+            ZonedDateTime.now().withZoneSameInstant(ZoneId.systemDefault())
+        val occurrencesList = mutableListOf<ZonedDateTime>()
+
+        // If the reminder is a todo, only schedule sole dueDate/time occurrence. Otherwise, schedule multiple occurrences in advance
+        if (this.type == TaskType.TODO) {
+            occurrencesList.add(
+                (remindersItem.getZonedDateTime() ?: this.dueDate?.toZonedDateTime())?.withHour(
+                    reminderTime.hour,
+                )?.withMinute(reminderTime.minute) ?: return null,
+            )
+            return occurrencesList
+        }
+        val now = ZonedDateTime.now().withZoneSameInstant(ZoneId.systemDefault())
+        var startDate = this.startDate?.toInstant()?.atZone(ZoneId.systemDefault()) ?: return null
+        val frequency = this.frequency ?: return null
+        val everyX = this.everyX ?: 1
+        if (everyX == 0) {
+            return null
+        }
+        val repeatDays = this.repeat
+        startDate = startDate.withHour(reminderTime.hour).withMinute(reminderTime.minute)
+
+        while (occurrencesList.size < occurrences) {
+            // Increment currentDate based on the frequency
+            dateTimeOccurenceToSchedule =
+                when (frequency) {
+                    Frequency.DAILY -> {
+                        dateTimeOccurenceToSchedule =
+                            if (dateTimeOccurenceToSchedule.isBefore(startDate)) {
+                                startDate
+                            } else {
+                                dateTimeOccurenceToSchedule.plusDays(everyX.toLong())
+                                    .withHour(reminderTime.hour).withMinute(reminderTime.minute)
+                            }
+                        dateTimeOccurenceToSchedule
+                    }
+
+                    Frequency.WEEKLY -> {
+                        // Set to start date if current date is earlier
+                        if (dateTimeOccurenceToSchedule.isBefore(startDate)) {
+                            dateTimeOccurenceToSchedule = startDate
+                        } else if (repeatDays?.hasAnyDaySelected() == true) {
+                            var nextDueDate =
+                                dateTimeOccurenceToSchedule.withHour(reminderTime.hour)
+                                    .withMinute(reminderTime.minute)
+                            // If the next due date already happened for today, increment it by one day. Otherwise, it will be scheduled for today.
+                            if (nextDueDate.isBefore(now) && occurrencesList.size == 0) {
+                                nextDueDate = nextDueDate.plusDays(1)
+                            }
+
+                            // If the reminder being scheduled is not the first iteration of the reminder, increment it by one day
+                            if (occurrencesList.size > 0) {
+                                nextDueDate = nextDueDate.plusDays(1)
+                            }
+
+                            while (!nextDueDate.matchesRepeatDays(repeatDays)) {
+                                nextDueDate =
+                                    nextDueDate.plusDays(1).withHour(reminderTime.hour)
+                                        .withMinute(reminderTime.minute)
+                            }
+                            // Calculate weeks since start and adjust for the correct interval
+                            val weeksSinceStart =
+                                ChronoUnit.WEEKS.between(
+                                    startDate.toLocalDate(),
+                                    nextDueDate.toLocalDate(),
+                                )
+                            if (weeksSinceStart % everyX != 0L) {
+                                val weeksToNextValidInterval = everyX - (weeksSinceStart % everyX)
+                                nextDueDate = nextDueDate.plusWeeks(weeksToNextValidInterval)
+                                // Find the exact next due day within the valid interval
+                                while (!nextDueDate.matchesRepeatDays(repeatDays)) {
+                                    nextDueDate =
+                                        nextDueDate.plusDays(1).withHour(reminderTime.hour)
+                                            .withMinute(reminderTime.minute)
+                                }
+                            }
+
+                            dateTimeOccurenceToSchedule = nextDueDate
+                        }
+                        // Set time to the reminder time
+                        dateTimeOccurenceToSchedule =
+                            dateTimeOccurenceToSchedule.withHour(reminderTime.hour)
+                                .withMinute(reminderTime.minute)
+                        dateTimeOccurenceToSchedule
+                    }
+
+                    Frequency.MONTHLY -> {
+                        dateTimeOccurenceToSchedule =
+                            if (dateTimeOccurenceToSchedule.isBefore(startDate)) {
+                                startDate
+                            } else {
+                                dateTimeOccurenceToSchedule.plusMonths(everyX.toLong())
+                                    .withDayOfMonth(startDate.dayOfMonth).withHour(reminderTime.hour)
+                                    .withMinute(reminderTime.minute)
+                            }
+                        dateTimeOccurenceToSchedule
+                    }
+
+                    Frequency.YEARLY -> {
+                        dateTimeOccurenceToSchedule =
+                            if (dateTimeOccurenceToSchedule.isBefore(startDate)) {
+                                startDate
+                            } else {
+                                dateTimeOccurenceToSchedule.plusYears(everyX.toLong())
+                                    .withDayOfMonth(startDate.dayOfMonth)
+                                    .withMonth(startDate.monthValue).withHour(reminderTime.hour)
+                                    .withMinute(reminderTime.minute)
+                            }
+                        dateTimeOccurenceToSchedule
+                    }
+                }
+
+            occurrencesList.add(dateTimeOccurenceToSchedule)
+        }
+
+        return occurrencesList
+    }
+
+    fun parseMarkdown() {
+        parsedText = MarkdownParser.parseMarkdown(text)
+        parsedNotes = MarkdownParser.parseMarkdown(notes)
+    }
+
+    fun markdownText(callback: (CharSequence) -> Unit): CharSequence {
+        if (this.parsedText != null) {
+            return this.parsedText ?: ""
+        }
+
+        MarkdownParser.parseMarkdownAsync(this.text) { parsedText ->
+            this.parsedText = parsedText
+            callback(parsedText)
+        }
+
+        return this.text
+    }
+
+    fun markdownNotes(callback: (CharSequence) -> Unit): CharSequence? {
+        if (parsedNotes != null) {
+            return parsedNotes
+        }
+
+        if (notes?.isNotEmpty() == true) {
+            MarkdownParser.parseMarkdownAsync(notes) { parsedText ->
+                parsedNotes = parsedText
+                callback(parsedText)
+            }
+        }
+        return notes
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (other == null) {
+            return false
+        }
+        return if (Task::class.java.isAssignableFrom(other.javaClass)) {
+            val otherTask = other as? Task
+            if (this.isValid && otherTask?.isValid == true) {
+                this.id == otherTask.id
+            } else {
+                false
+            }
+        } else {
+            super.equals(other)
+        }
+    }
+
+    fun isBeingEdited(task: Task): Boolean {
+        when {
+            text != task.text -> return true
+            notes != task.notes -> return true
+            reminders?.size != task.reminders?.size -> return true
+            checklist?.size != task.checklist?.size -> return true
+            reminders?.mapIndexed { index, remindersItem -> task.reminders?.get(index) != remindersItem }
+                ?.contains(true) == true -> return true
+
+            checklist?.mapIndexed { index, item -> task.checklist?.get(index) != item }
+                ?.contains(true) == true -> return true
+
+            priority != task.priority -> return true
+            attribute != task.attribute && attribute != null -> return true
+            tags != task.tags -> return true
+        }
+        when (type) {
+            TaskType.HABIT -> {
+                return when {
+                    up != task.up -> true
+                    down != task.down -> true
+                    frequency != task.frequency -> true
+                    counterUp != task.counterUp -> true
+                    counterDown != task.counterDown -> true
+                    else -> false
+                }
+            }
+
+            TaskType.DAILY -> {
+                return when {
+                    startDate != task.startDate -> true
+                    everyX != task.everyX -> true
+                    frequency != task.frequency -> true
+                    repeat != task.repeat -> true
+                    streak != task.streak -> true
+                    else -> false
+                }
+            }
+
+            TaskType.TODO -> {
+                return (dueDate != task.dueDate && task.dueDate != null)
+            }
+
+            TaskType.REWARD -> {
+                return value != task.value
+            }
+
+            else -> {
+                return false
+            }
+        }
+    }
+
+    override fun hashCode(): Int {
+        return id?.hashCode() ?: 0
+    }
+
+    override fun describeContents(): Int = 0
+
+    override fun writeToParcel(
+        dest: Parcel,
+        flags: Int,
+    ) {
+        dest.writeString(this.ownerID)
+        dest.writeValue(this.priority)
+        dest.writeString(this.text)
+        dest.writeString(this.notes)
+        dest.writeString(this.attribute?.value)
+        dest.writeString(this.type?.value)
+        dest.writeDouble(this.value)
+        dest.writeList(this.tags as? List<*>)
+        dest.writeLong(this.dateCreated?.time ?: -1)
+        dest.writeInt(this.position)
+        dest.writeValue(this.up)
+        dest.writeValue(this.down)
+        dest.writeByte(if (this.completed) 1.toByte() else 0.toByte())
+        dest.writeList(this.checklist as? List<*>)
+        dest.writeList(this.reminders as? List<*>)
+        dest.writeString(this.frequency?.value)
+        dest.writeValue(this.everyX)
+        dest.writeString(this.daysOfMonthString)
+        dest.writeString(this.weeksOfMonthString)
+        dest.writeValue(this.streak)
+        dest.writeLong(this.startDate?.time ?: -1)
+        dest.writeParcelable(this.repeat, flags)
+        dest.writeLong(this.dueDate?.time ?: -1)
+        dest.writeString(this.id)
+        dest.writeInt(this.counterUp ?: 0)
+        dest.writeInt(this.counterDown ?: 0)
+    }
+
+    constructor()
+
+    protected constructor(`in`: Parcel) {
+        this.ownerID = `in`.readString() ?: ""
+        this.priority = `in`.readValue(Float::class.java.classLoader) as? Float ?: 0f
+        this.text = `in`.readString() ?: ""
+        this.notes = `in`.readString()
+        this.attribute = Attribute.from(`in`.readString() ?: "")
+        this.type = TaskType.from(`in`.readString() ?: "")
+        this.value = `in`.readDouble()
+        this.tags = RealmList()
+        `in`.readList(this.tags as List<*>, TaskTag::class.java.classLoader)
+        val tmpDateCreated = `in`.readLong()
+        this.dateCreated = if (tmpDateCreated == -1L) null else Date(tmpDateCreated)
+        this.position = `in`.readInt()
+        this.up = `in`.readValue(Boolean::class.java.classLoader) as? Boolean ?: false
+        this.down = `in`.readValue(Boolean::class.java.classLoader) as? Boolean ?: false
+        this.completed = `in`.readByte().toInt() != 0
+        this.checklist = RealmList()
+        `in`.readList(this.checklist as List<*>, ChecklistItem::class.java.classLoader)
+        this.reminders = RealmList()
+        `in`.readList(this.reminders as MutableList<Any?>, RemindersItem::class.java.classLoader)
+        this.frequency = Frequency.from(`in`.readString() ?: "")
+        this.everyX = `in`.readValue(Int::class.java.classLoader) as? Int ?: 1
+        this.daysOfMonthString = `in`.readString()
+        this.weeksOfMonthString = `in`.readString()
+        this.streak = `in`.readValue(Int::class.java.classLoader) as? Int ?: 0
+        val tmpStartDate = `in`.readLong()
+        this.startDate = if (tmpStartDate == -1L) null else Date(tmpStartDate)
+        this.repeat = `in`.readParcelable(Days::class.java.classLoader)
+        val tmpDuedate = `in`.readLong()
+        this.dueDate = if (tmpDuedate == -1L) null else Date(tmpDuedate)
+        this.id = `in`.readString()
+        this.counterUp = `in`.readInt()
+        this.counterDown = `in`.readInt()
+    }
+
+    fun setWeeksOfMonth(weeksOfMonth: List<Int>?) {
+        this.weeksOfMonth = weeksOfMonth
+        if ((weeksOfMonth?.size ?: 0) > 0) {
+            this.weeksOfMonthString = this.weeksOfMonth?.toString()
+        } else {
+            weeksOfMonthString = "[]"
+        }
+    }
+
+    fun getWeeksOfMonth(): List<Int>? {
+        if (weeksOfMonth == null) {
+            val weeksOfMonth = mutableListOf<Int>()
+            if (weeksOfMonthString != null) {
+                try {
+                    val obj = JSONArray(weeksOfMonthString)
+                    var i = 0
+                    while (i < obj.length()) {
+                        weeksOfMonth.add(obj.getInt(i))
+                        i += 1
+                    }
+                } catch (e: JSONException) {
+                    ExceptionHandler.reportError(e)
+                }
+            }
+            this.weeksOfMonth = weeksOfMonth.toList()
+        }
+        return weeksOfMonth
+    }
+
+    fun setDaysOfMonth(daysOfMonth: List<Int>?) {
+        this.daysOfMonth = daysOfMonth
+        if ((daysOfMonth?.size ?: 0) > 0) {
+            this.daysOfMonthString = this.daysOfMonth?.toString()
+        } else {
+            daysOfMonthString = "[]"
+        }
+    }
+
+    private fun Days.hasAnyDaySelected(): Boolean {
+        return m || t || w || th || f || s || su
+    }
+
+    fun getDaysOfMonth(): List<Int>? {
+        if (daysOfMonth == null) {
+            val daysOfMonth = mutableListOf<Int>()
+            if (daysOfMonthString != null) {
+                try {
+                    val obj = JSONArray(daysOfMonthString)
+                    var i = 0
+                    while (i < obj.length()) {
+                        daysOfMonth.add(obj.getInt(i))
+                        i += 1
+                    }
+                } catch (e: JSONException) {
+                    ExceptionHandler.reportError(e)
+                }
+            }
+            this.daysOfMonth = daysOfMonth
+        }
+
+        return daysOfMonth
+    }
+
+    companion object CREATOR : Parcelable.Creator<Task> {
+        override fun createFromParcel(source: Parcel): Task = Task(source)
+
+        override fun newArray(size: Int): Array<Task?> = arrayOfNulls(size)
+
+        const val FILTER_ALL = "all"
+        const val FILTER_WEAK = "weak"
+        const val FILTER_STRONG = "strong"
+        const val FILTER_ACTIVE = "active"
+        const val FILTER_GRAY = "gray"
+        const val FILTER_DATED = "dated"
+        const val FILTER_COMPLETED = "completed"
+
+        @JvmField
+        val CREATOR: Parcelable.Creator<Task> =
+            object : Parcelable.Creator<Task> {
+                override fun createFromParcel(source: Parcel): Task = Task(source)
+
+                override fun newArray(size: Int): Array<Task?> = arrayOfNulls(size)
+            }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Buffs.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Buffs.kt
index 1ec5053c5..1763b5c5f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Buffs.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Buffs.kt
@@ -13,17 +13,27 @@ open class Buffs : RealmObject(), AvatarBuffs, BaseObject {
     override var per: Float? = null
 
     @SerializedName("int")
-    override var _int: Float? = null
+    override var intelligence: Float? = null
     override var seafoam: Boolean? = null
-        get() { return field ?: false }
+        get() {
+            return field ?: false
+        }
     override var spookySparkles: Boolean? = null
-        get() { return field ?: false }
+        get() {
+            return field ?: false
+        }
     override var shinySeed: Boolean? = null
-        get() { return field ?: false }
+        get() {
+            return field ?: false
+        }
     override var snowball: Boolean? = null
-        get() { return field ?: false }
+        get() {
+            return field ?: false
+        }
     override var streaks: Boolean? = null
-        get() { return field ?: false }
+        get() {
+            return field ?: false
+        }
 
     fun merge(stats: Buffs?) {
         if (stats == null) {
@@ -32,7 +42,7 @@ open class Buffs : RealmObject(), AvatarBuffs, BaseObject {
         con = if (stats.con != null) stats.con else con
         str = if (stats.str != null) stats.str else str
         per = if (stats.per != null) stats.per else per
-        _int = if (stats._int != null) stats._int else _int
+        intelligence = if (stats.intelligence != null) stats.intelligence else intelligence
         snowball = if (stats.snowball != null) stats.snowball else snowball
         streaks = if (stats.streaks != null) stats.streaks else streaks
         seafoam = if (stats.seafoam != null) stats.seafoam else seafoam
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Items.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Items.kt
index 3cf7384a7..093db7850 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Items.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Items.kt
@@ -1,74 +1,74 @@
-package com.habitrpg.android.habitica.models.user
-
-import com.habitrpg.android.habitica.models.BaseObject
-import com.habitrpg.shared.habitica.models.AvatarItems
-import io.realm.RealmList
-import io.realm.RealmObject
-import io.realm.annotations.RealmClass
-import java.util.Date
-
-@RealmClass(embedded = true)
-open class Items : RealmObject, BaseObject, AvatarItems {
-    fun setItemTypes() {
-        hatchingPotions?.forEach { it.itemType = "hatchingPotions" }
-        eggs?.forEach { it.itemType = "eggs" }
-        food?.forEach { it.itemType = "food" }
-        quests?.forEach { it.itemType = "quests" }
-        special?.forEach { it.itemType = "special" }
-    }
-
-    var eggs: RealmList<OwnedItem>? = null
-        set(value) {
-            field = value
-            field?.forEach { it.itemType = "eggs" }
-        }
-    var food: RealmList<OwnedItem>? = null
-        set(value) {
-            field = value
-            field?.forEach { it.itemType = "food" }
-        }
-    var hatchingPotions: RealmList<OwnedItem>? = null
-        set(value) {
-            field = value
-            field?.forEach { it.itemType = "hatchingPotions" }
-        }
-    var quests: RealmList<OwnedItem>? = null
-        set(value) {
-            field = value
-            field?.forEach { it.itemType = "quests" }
-        }
-    var special: RealmList<OwnedItem>? = null
-        set(value) {
-            field = value
-            field?.forEach { it.itemType = "special" }
-        }
-
-    var pets: RealmList<OwnedPet>? = null
-    var mounts: RealmList<OwnedMount>? = null
-    override var currentMount: String? = null
-    override var currentPet: String? = null
-    var lastDropCount: Int = 0
-    var lastDropDate: Date? = null
-
-    // private QuestContent quest;
-    override var gear: Gear? = null
-
-    constructor(currentMount: String, currentPet: String, lastDropCount: Int, lastDropDate: Date) {
-        this.currentMount = currentMount
-        this.currentPet = currentPet
-        this.lastDropCount = lastDropCount
-        this.lastDropDate = lastDropDate
-    }
-
-    constructor()
-
-    val hasTransformationItems: Boolean
-        get() {
-            return special?.any { transformationItem ->
-                transformationItem.key == ("seafoam") && transformationItem.numberOwned > 0 ||
-                    transformationItem.key == ("shinySeed") && transformationItem.numberOwned > 0 ||
-                    transformationItem.key == ("snowball") && transformationItem.numberOwned > 0 ||
-                    transformationItem.key == ("spookySparkles") && transformationItem.numberOwned > 0
-            } ?: false
-        }
-}
+package com.habitrpg.android.habitica.models.user
+
+import com.habitrpg.android.habitica.models.BaseObject
+import com.habitrpg.shared.habitica.models.AvatarItems
+import io.realm.RealmList
+import io.realm.RealmObject
+import io.realm.annotations.RealmClass
+import java.util.Date
+
+@RealmClass(embedded = true)
+open class Items : RealmObject, BaseObject, AvatarItems {
+    fun setItemTypes() {
+        hatchingPotions?.forEach { it.itemType = "hatchingPotions" }
+        eggs?.forEach { it.itemType = "eggs" }
+        food?.forEach { it.itemType = "food" }
+        quests?.forEach { it.itemType = "quests" }
+        special?.forEach { it.itemType = "special" }
+    }
+
+    var eggs: RealmList<OwnedItem>? = null
+        set(value) {
+            field = value
+            field?.forEach { it.itemType = "eggs" }
+        }
+    var food: RealmList<OwnedItem>? = null
+        set(value) {
+            field = value
+            field?.forEach { it.itemType = "food" }
+        }
+    var hatchingPotions: RealmList<OwnedItem>? = null
+        set(value) {
+            field = value
+            field?.forEach { it.itemType = "hatchingPotions" }
+        }
+    var quests: RealmList<OwnedItem>? = null
+        set(value) {
+            field = value
+            field?.forEach { it.itemType = "quests" }
+        }
+    var special: RealmList<OwnedItem>? = null
+        set(value) {
+            field = value
+            field?.forEach { it.itemType = "special" }
+        }
+
+    var pets: RealmList<OwnedPet>? = null
+    var mounts: RealmList<OwnedMount>? = null
+    override var currentMount: String? = null
+    override var currentPet: String? = null
+    var lastDropCount: Int = 0
+    var lastDropDate: Date? = null
+
+    // private QuestContent quest;
+    override var gear: Gear? = null
+
+    constructor(currentMount: String, currentPet: String, lastDropCount: Int, lastDropDate: Date) {
+        this.currentMount = currentMount
+        this.currentPet = currentPet
+        this.lastDropCount = lastDropCount
+        this.lastDropDate = lastDropDate
+    }
+
+    constructor()
+
+    val hasTransformationItems: Boolean
+        get() {
+            return special?.any { transformationItem ->
+                transformationItem.key == ("seafoam") && transformationItem.numberOwned > 0 ||
+                    transformationItem.key == ("shinySeed") && transformationItem.numberOwned > 0 ||
+                    transformationItem.key == ("snowball") && transformationItem.numberOwned > 0 ||
+                    transformationItem.key == ("spookySparkles") && transformationItem.numberOwned > 0
+            } ?: false
+        }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/OwnedItem.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/OwnedItem.kt
index 9acd6066c..23a56453e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/OwnedItem.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/OwnedItem.kt
@@ -6,7 +6,6 @@ import io.realm.annotations.RealmClass
 
 @RealmClass(embedded = true)
 open class OwnedItem : RealmObject(), BaseMainObject, OwnedObject {
-
     override val realmClass: Class<OwnedItem>
         get() = OwnedItem::class.java
     override val primaryIdentifier: String?
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/OwnedMount.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/OwnedMount.kt
index 2330bd411..8ce1cee3e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/OwnedMount.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/OwnedMount.kt
@@ -5,7 +5,6 @@ import io.realm.annotations.RealmClass
 
 @RealmClass(embedded = true)
 open class OwnedMount : RealmObject(), OwnedObject {
-
     override var userID: String? = null
     override var key: String? = null
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Stats.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Stats.kt
index 5a5ebe45f..4b7d3ba55 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Stats.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Stats.kt
@@ -56,10 +56,12 @@ open class Stats : RealmObject(), AvatarStats, BaseObject {
         if (stats == null) {
             return
         }
-        this.constitution = if (stats.constitution != null) stats.constitution else this.constitution
+        this.constitution =
+            if (stats.constitution != null) stats.constitution else this.constitution
         this.strength = if (stats.strength != null) stats.strength else this.strength
         this.per = if (stats.per != null) stats.per else this.per
-        this.intelligence = if (stats.intelligence != null) stats.intelligence else this.intelligence
+        this.intelligence =
+            if (stats.intelligence != null) stats.intelligence else this.intelligence
         this.training?.merge(stats.training)
         this.buffs?.merge(stats.buffs)
         this.points = if (stats.points != null) stats.points else this.points
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlan.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlan.kt
index 2ad1dad22..8b73dc9a0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlan.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlan.kt
@@ -81,11 +81,11 @@ open class SubscriptionPlan : RealmObject(), BaseObject {
         }
 
     companion object {
-        var PLANID_BASIC = "basic"
-        var PLANID_BASICEARNED = "basic_earned"
-        var PLANID_BASIC3MONTH = "basic_3mo"
-        var PLANID_BASIC6MONTH = "basic_6mo"
-        var PLANID_GOOGLE6MONTH = "google_6mo"
-        var PLANID_BASIC12MONTH = "basic_12mo"
+        const val PLANID_BASIC = "basic"
+        const val PLANID_BASICEARNED = "basic_earned"
+        const val PLANID_BASIC3MONTH = "basic_3mo"
+        const val PLANID_BASIC6MONTH = "basic_6mo"
+        const val PLANID_GOOGLE6MONTH = "google_6mo"
+        const val PLANID_BASIC12MONTH = "basic_12mo"
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Training.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Training.kt
index 307593a86..ef4580577 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Training.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Training.kt
@@ -12,7 +12,7 @@ open class Training : RealmObject(), BaseObject {
     var per: Float = 0f
 
     @SerializedName("int")
-    var _int: Float = 0f
+    var intelligence: Float = 0f
 
     fun merge(stats: Training?) {
         if (stats == null) {
@@ -21,6 +21,6 @@ open class Training : RealmObject(), BaseObject {
         con = stats.con
         str = stats.str
         per = stats.per
-        _int = stats._int
+        intelligence = stats.intelligence
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.kt
index b8fd5bef3..05313ec6d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.kt
@@ -21,7 +21,7 @@ import java.util.Date
 
 enum class Permission {
     MODERATOR,
-    USER_SUPPORT
+    USER_SUPPORT,
 }
 
 open class User : RealmObject(), BaseMainObject, Avatar, VersionedObject {
@@ -140,6 +140,7 @@ open class User : RealmObject(), BaseMainObject, Avatar, VersionedObject {
         }
 
     companion object {
-        val ONBOARDING_ACHIEVEMENT_KEYS = listOf("createdTask", "completedTask", "hatchedPet", "fedPet", "purchasedEquipment")
+        val ONBOARDING_ACHIEVEMENT_KEYS =
+            listOf("createdTask", "completedTask", "hatchedPet", "fedPet", "purchasedEquipment")
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/UserQuestStatus.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/UserQuestStatus.kt
index 7c4a000de..39cd6f1e0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/UserQuestStatus.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/UserQuestStatus.kt
@@ -4,5 +4,5 @@ enum class UserQuestStatus {
     NO_QUEST,
     QUEST_COLLECT,
     QUEST_BOSS,
-    QUEST_UNKNOWN
+    QUEST_UNKNOWN,
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/ApiModule.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/ApiModule.kt
index d8d6fd128..1499d714a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/ApiModule.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/ApiModule.kt
@@ -1,73 +1,75 @@
-package com.habitrpg.android.habitica.modules
-
-import android.content.Context
-import android.content.SharedPreferences
-import com.habitrpg.android.habitica.api.MaintenanceApiService
-import com.habitrpg.android.habitica.data.ApiClient
-import com.habitrpg.android.habitica.data.implementation.ApiClientImpl
-import com.habitrpg.android.habitica.data.implementation.ApiClientImpl.Companion.createGsonFactory
-import com.habitrpg.android.habitica.helpers.MainNotificationsManager
-import com.habitrpg.android.habitica.helpers.NotificationsManager
-import com.habitrpg.common.habitica.api.HostConfig
-import com.habitrpg.common.habitica.helpers.KeyHelper
-import dagger.Module
-import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.android.qualifiers.ApplicationContext
-import dagger.hilt.components.SingletonComponent
-import retrofit2.Retrofit
-import retrofit2.converter.gson.GsonConverterFactory
-import java.lang.ref.WeakReference
-import javax.inject.Singleton
-
-@InstallIn(SingletonComponent::class)
-@Module
-open class ApiModule {
-    @Provides
-    @Singleton
-    fun providesHostConfig(
-        sharedPreferences: SharedPreferences,
-        keyHelper: KeyHelper?,
-        @ApplicationContext context: Context
-    ): HostConfig {
-        return HostConfig(sharedPreferences, keyHelper, context)
-    }
-
-    @Provides
-    fun providesGsonConverterFactory(): GsonConverterFactory {
-        return createGsonFactory()
-    }
-
-    @Provides
-    @Singleton
-    fun providesPopupNotificationsManager(): NotificationsManager {
-        return MainNotificationsManager()
-    }
-
-    @Provides
-    @Singleton
-    fun providesApiHelper(
-        gsonConverter: GsonConverterFactory,
-        hostConfig: HostConfig,
-        notificationsManager: NotificationsManager,
-        @ApplicationContext context: Context
-    ): ApiClient {
-        val apiClient = ApiClientImpl(
-            gsonConverter,
-            hostConfig,
-            notificationsManager,
-            context
-        )
-        notificationsManager.apiClient = WeakReference(apiClient)
-        return apiClient
-    }
-
-    @Provides
-    fun providesMaintenanceApiService(gsonConverter: GsonConverterFactory): MaintenanceApiService {
-        val adapter = Retrofit.Builder()
-            .baseUrl("https://habitica-assets.s3.amazonaws.com/mobileApp/endpoint/")
-            .addConverterFactory(gsonConverter)
-            .build()
-        return adapter.create(MaintenanceApiService::class.java)
-    }
-}
+package com.habitrpg.android.habitica.modules
+
+import android.content.Context
+import android.content.SharedPreferences
+import com.habitrpg.android.habitica.api.MaintenanceApiService
+import com.habitrpg.android.habitica.data.ApiClient
+import com.habitrpg.android.habitica.data.implementation.ApiClientImpl
+import com.habitrpg.android.habitica.data.implementation.ApiClientImpl.Companion.createGsonFactory
+import com.habitrpg.android.habitica.helpers.MainNotificationsManager
+import com.habitrpg.android.habitica.helpers.NotificationsManager
+import com.habitrpg.common.habitica.api.HostConfig
+import com.habitrpg.common.habitica.helpers.KeyHelper
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+import java.lang.ref.WeakReference
+import javax.inject.Singleton
+
+@InstallIn(SingletonComponent::class)
+@Module
+open class ApiModule {
+    @Provides
+    @Singleton
+    fun providesHostConfig(
+        sharedPreferences: SharedPreferences,
+        keyHelper: KeyHelper?,
+        @ApplicationContext context: Context,
+    ): HostConfig {
+        return HostConfig(sharedPreferences, keyHelper, context)
+    }
+
+    @Provides
+    fun providesGsonConverterFactory(): GsonConverterFactory {
+        return createGsonFactory()
+    }
+
+    @Provides
+    @Singleton
+    fun providesPopupNotificationsManager(): NotificationsManager {
+        return MainNotificationsManager()
+    }
+
+    @Provides
+    @Singleton
+    fun providesApiHelper(
+        gsonConverter: GsonConverterFactory,
+        hostConfig: HostConfig,
+        notificationsManager: NotificationsManager,
+        @ApplicationContext context: Context,
+    ): ApiClient {
+        val apiClient =
+            ApiClientImpl(
+                gsonConverter,
+                hostConfig,
+                notificationsManager,
+                context,
+            )
+        notificationsManager.apiClient = WeakReference(apiClient)
+        return apiClient
+    }
+
+    @Provides
+    fun providesMaintenanceApiService(gsonConverter: GsonConverterFactory): MaintenanceApiService {
+        val adapter =
+            Retrofit.Builder()
+                .baseUrl("https://habitica-assets.s3.amazonaws.com/mobileApp/endpoint/")
+                .addConverterFactory(gsonConverter)
+                .build()
+        return adapter.create(MaintenanceApiService::class.java)
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/AppModule.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/AppModule.kt
index 61321766c..bf1bee64d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/AppModule.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/AppModule.kt
@@ -1,109 +1,118 @@
-package com.habitrpg.android.habitica.modules
-
-import android.content.Context
-import android.content.SharedPreferences
-import android.content.res.Resources
-import androidx.preference.PreferenceManager
-import com.habitrpg.android.habitica.BuildConfig
-import com.habitrpg.android.habitica.data.ApiClient
-import com.habitrpg.android.habitica.data.ContentRepository
-import com.habitrpg.android.habitica.helpers.AppConfigManager
-import com.habitrpg.android.habitica.helpers.ReviewManager
-import com.habitrpg.android.habitica.helpers.SoundFileLoader
-import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManager
-import com.habitrpg.common.habitica.helpers.KeyHelper
-import com.habitrpg.common.habitica.helpers.KeyHelper.Companion.getInstance
-import com.habitrpg.shared.habitica.HLogger
-import dagger.Module
-import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.android.qualifiers.ApplicationContext
-import dagger.hilt.components.SingletonComponent
-import java.io.IOException
-import java.security.KeyStore
-import java.security.KeyStoreException
-import java.security.NoSuchAlgorithmException
-import java.security.cert.CertificateException
-import javax.inject.Singleton
-
-@InstallIn(SingletonComponent::class)
-@Module
-class AppModule {
-    @Provides
-    @Singleton
-    fun provideSharedPreferences(@ApplicationContext context: Context): SharedPreferences {
-        return PreferenceManager.getDefaultSharedPreferences(context)
-    }
-
-    @Provides
-    fun provideKeyStore(): KeyStore? {
-        try {
-            val keyStore = KeyStore.getInstance("AndroidKeyStore")
-            keyStore.load(null)
-            return keyStore
-        } catch (e: KeyStoreException) {
-            HLogger.logException("KeyHelper", "Error initializing", e)
-        } catch (e: CertificateException) {
-            HLogger.logException("KeyHelper", "Error initializing", e)
-        } catch (e: NoSuchAlgorithmException) {
-            HLogger.logException("KeyHelper", "Error initializing", e)
-        } catch (e: IOException) {
-            HLogger.logException("KeyHelper", "Error initializing", e)
-        }
-        return null
-    }
-
-    @Provides
-    fun provideKeyHelper(
-        @ApplicationContext context: Context,
-        sharedPreferences: SharedPreferences,
-        keyStore: KeyStore?
-    ): KeyHelper? {
-        return if (keyStore == null) {
-            null
-        } else {
-            getInstance(context, sharedPreferences, keyStore)
-        }
-    }
-
-    @Provides
-    @Singleton
-    fun providesAuthenticationHandler(sharedPreferences: SharedPreferences): AuthenticationHandler {
-        return if (BuildConfig.DEBUG && BuildConfig.TEST_USER_ID.isNotEmpty()) {
-            AuthenticationHandler(BuildConfig.TEST_USER_ID)
-        } else {
-            AuthenticationHandler(sharedPreferences)
-        }
-    }
-
-    @Provides
-    fun providesResources(@ApplicationContext context: Context): Resources {
-        return context.resources
-    }
-
-    @Provides
-    fun providesSoundFileLoader(@ApplicationContext context: Context): SoundFileLoader {
-        return SoundFileLoader(context)
-    }
-
-    @Provides
-    @Singleton
-    fun pushNotificationManager(
-        apiClient: ApiClient,
-        sharedPreferences: SharedPreferences,
-        @ApplicationContext context: Context
-    ): PushNotificationManager {
-        return PushNotificationManager(apiClient, sharedPreferences, context)
-    }
-
-    @Provides
-    @Singleton
-    fun providesRemoteConfigManager(contentRepository: ContentRepository?): AppConfigManager {
-        return AppConfigManager(contentRepository)
-    }
-
-    @Provides
-    fun providesReviewManager(@ApplicationContext context: Context, configManager: AppConfigManager): ReviewManager {
-        return ReviewManager(context, configManager)
-    }
-}
+package com.habitrpg.android.habitica.modules
+
+import android.content.Context
+import android.content.SharedPreferences
+import android.content.res.Resources
+import androidx.preference.PreferenceManager
+import com.habitrpg.android.habitica.BuildConfig
+import com.habitrpg.android.habitica.data.ApiClient
+import com.habitrpg.android.habitica.data.ContentRepository
+import com.habitrpg.android.habitica.helpers.AppConfigManager
+import com.habitrpg.android.habitica.helpers.ReviewManager
+import com.habitrpg.android.habitica.helpers.SoundFileLoader
+import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManager
+import com.habitrpg.common.habitica.helpers.KeyHelper
+import com.habitrpg.common.habitica.helpers.KeyHelper.Companion.getInstance
+import com.habitrpg.shared.habitica.HLogger
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import java.io.IOException
+import java.security.KeyStore
+import java.security.KeyStoreException
+import java.security.NoSuchAlgorithmException
+import java.security.cert.CertificateException
+import javax.inject.Singleton
+
+@InstallIn(SingletonComponent::class)
+@Module
+class AppModule {
+    @Provides
+    @Singleton
+    fun provideSharedPreferences(
+        @ApplicationContext context: Context,
+    ): SharedPreferences {
+        return PreferenceManager.getDefaultSharedPreferences(context)
+    }
+
+    @Provides
+    fun provideKeyStore(): KeyStore? {
+        try {
+            val keyStore = KeyStore.getInstance("AndroidKeyStore")
+            keyStore.load(null)
+            return keyStore
+        } catch (e: KeyStoreException) {
+            HLogger.logException("KeyHelper", "Error initializing", e)
+        } catch (e: CertificateException) {
+            HLogger.logException("KeyHelper", "Error initializing", e)
+        } catch (e: NoSuchAlgorithmException) {
+            HLogger.logException("KeyHelper", "Error initializing", e)
+        } catch (e: IOException) {
+            HLogger.logException("KeyHelper", "Error initializing", e)
+        }
+        return null
+    }
+
+    @Provides
+    fun provideKeyHelper(
+        @ApplicationContext context: Context,
+        sharedPreferences: SharedPreferences,
+        keyStore: KeyStore?,
+    ): KeyHelper? {
+        return if (keyStore == null) {
+            null
+        } else {
+            getInstance(context, sharedPreferences, keyStore)
+        }
+    }
+
+    @Provides
+    @Singleton
+    fun providesAuthenticationHandler(sharedPreferences: SharedPreferences): AuthenticationHandler {
+        return if (BuildConfig.DEBUG && BuildConfig.TEST_USER_ID.isNotEmpty()) {
+            AuthenticationHandler(BuildConfig.TEST_USER_ID)
+        } else {
+            AuthenticationHandler(sharedPreferences)
+        }
+    }
+
+    @Provides
+    fun providesResources(
+        @ApplicationContext context: Context,
+    ): Resources {
+        return context.resources
+    }
+
+    @Provides
+    fun providesSoundFileLoader(
+        @ApplicationContext context: Context,
+    ): SoundFileLoader {
+        return SoundFileLoader(context)
+    }
+
+    @Provides
+    @Singleton
+    fun pushNotificationManager(
+        apiClient: ApiClient,
+        sharedPreferences: SharedPreferences,
+        @ApplicationContext context: Context,
+    ): PushNotificationManager {
+        return PushNotificationManager(apiClient, sharedPreferences, context)
+    }
+
+    @Provides
+    @Singleton
+    fun providesRemoteConfigManager(contentRepository: ContentRepository?): AppConfigManager {
+        return AppConfigManager(contentRepository)
+    }
+
+    @Provides
+    fun providesReviewManager(
+        @ApplicationContext context: Context,
+        configManager: AppConfigManager,
+    ): ReviewManager {
+        return ReviewManager(context, configManager)
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/RepositoryModule.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/RepositoryModule.kt
index 928e692fd..696ed5585 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/RepositoryModule.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/RepositoryModule.kt
@@ -31,13 +31,13 @@ open class RepositoryModule {
         contentLocalRepository: ContentLocalRepository,
         apiClient: ApiClient,
         @ApplicationContext context: Context,
-        authenticationHandler: AuthenticationHandler
+        authenticationHandler: AuthenticationHandler,
     ): ContentRepository {
         return ContentRepositoryImpl(
             contentLocalRepository,
             apiClient,
             context,
-            authenticationHandler
+            authenticationHandler,
         )
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/UserModule.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/UserModule.kt
index e05646d13..6bb47a744 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/UserModule.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/UserModule.kt
@@ -47,7 +47,7 @@ class UserModule {
     fun providesTaskAlarmManager(
         @ApplicationContext context: Context,
         taskRepository: TaskRepository,
-        authenticationHandler: AuthenticationHandler
+        authenticationHandler: AuthenticationHandler,
     ): TaskAlarmManager {
         return TaskAlarmManager(context, taskRepository, authenticationHandler)
     }
@@ -57,6 +57,6 @@ class UserModule {
     fun providesUserViewModel(
         authenticationHandler: AuthenticationHandler,
         userRepository: UserRepository,
-        socialRepository: SocialRepository
+        socialRepository: SocialRepository,
     ) = MainUserViewModel(authenticationHandler, userRepository, socialRepository)
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/UserRepositoryModule.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/UserRepositoryModule.kt
index b27cd90d7..f64f9938d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/UserRepositoryModule.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/UserRepositoryModule.kt
@@ -1,214 +1,221 @@
-package com.habitrpg.android.habitica.modules
-
-import android.content.Context
-import com.habitrpg.android.habitica.data.ApiClient
-import com.habitrpg.android.habitica.data.ChallengeRepository
-import com.habitrpg.android.habitica.data.CustomizationRepository
-import com.habitrpg.android.habitica.data.FAQRepository
-import com.habitrpg.android.habitica.data.InventoryRepository
-import com.habitrpg.android.habitica.data.SetupCustomizationRepository
-import com.habitrpg.android.habitica.data.SocialRepository
-import com.habitrpg.android.habitica.data.TagRepository
-import com.habitrpg.android.habitica.data.TaskRepository
-import com.habitrpg.android.habitica.data.TutorialRepository
-import com.habitrpg.android.habitica.data.UserRepository
-import com.habitrpg.android.habitica.data.implementation.ChallengeRepositoryImpl
-import com.habitrpg.android.habitica.data.implementation.CustomizationRepositoryImpl
-import com.habitrpg.android.habitica.data.implementation.FAQRepositoryImpl
-import com.habitrpg.android.habitica.data.implementation.InventoryRepositoryImpl
-import com.habitrpg.android.habitica.data.implementation.SetupCustomizationRepositoryImpl
-import com.habitrpg.android.habitica.data.implementation.SocialRepositoryImpl
-import com.habitrpg.android.habitica.data.implementation.TagRepositoryImpl
-import com.habitrpg.android.habitica.data.implementation.TaskRepositoryImpl
-import com.habitrpg.android.habitica.data.implementation.TutorialRepositoryImpl
-import com.habitrpg.android.habitica.data.implementation.UserRepositoryImpl
-import com.habitrpg.android.habitica.data.local.ChallengeLocalRepository
-import com.habitrpg.android.habitica.data.local.CustomizationLocalRepository
-import com.habitrpg.android.habitica.data.local.FAQLocalRepository
-import com.habitrpg.android.habitica.data.local.InventoryLocalRepository
-import com.habitrpg.android.habitica.data.local.SocialLocalRepository
-import com.habitrpg.android.habitica.data.local.TagLocalRepository
-import com.habitrpg.android.habitica.data.local.TaskLocalRepository
-import com.habitrpg.android.habitica.data.local.TutorialLocalRepository
-import com.habitrpg.android.habitica.data.local.UserLocalRepository
-import com.habitrpg.android.habitica.data.local.implementation.RealmChallengeLocalRepository
-import com.habitrpg.android.habitica.data.local.implementation.RealmCustomizationLocalRepository
-import com.habitrpg.android.habitica.data.local.implementation.RealmFAQLocalRepository
-import com.habitrpg.android.habitica.data.local.implementation.RealmInventoryLocalRepository
-import com.habitrpg.android.habitica.data.local.implementation.RealmSocialLocalRepository
-import com.habitrpg.android.habitica.data.local.implementation.RealmTagLocalRepository
-import com.habitrpg.android.habitica.data.local.implementation.RealmTaskLocalRepository
-import com.habitrpg.android.habitica.data.local.implementation.RealmTutorialLocalRepository
-import com.habitrpg.android.habitica.data.local.implementation.RealmUserLocalRepository
-import com.habitrpg.android.habitica.helpers.AppConfigManager
-import com.habitrpg.android.habitica.helpers.PurchaseHandler
-import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
-import dagger.Module
-import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.android.qualifiers.ApplicationContext
-import dagger.hilt.components.SingletonComponent
-import io.realm.Realm
-import javax.inject.Singleton
-
-@InstallIn(SingletonComponent::class)
-@Module
-class UserRepositoryModule {
-    @Provides
-    fun providesSetupCustomizationRepository(@ApplicationContext context: Context): SetupCustomizationRepository {
-        return SetupCustomizationRepositoryImpl(context)
-    }
-
-    @Provides
-    fun providesTaskLocalRepository(realm: Realm): TaskLocalRepository {
-        return RealmTaskLocalRepository(realm)
-    }
-
-    @Provides
-    fun providesTaskRepository(
-        localRepository: TaskLocalRepository,
-        apiClient: ApiClient,
-        authenticationHandler: AuthenticationHandler,
-        appConfigManager: AppConfigManager,
-    ): TaskRepository {
-        return TaskRepositoryImpl(
-            localRepository,
-            apiClient,
-            authenticationHandler,
-            appConfigManager
-        )
-    }
-
-    @Provides
-    fun providesTagLocalRepository(realm: Realm): TagLocalRepository {
-        return RealmTagLocalRepository(realm)
-    }
-
-    @Provides
-    fun providesTagRepository(
-        localRepository: TagLocalRepository,
-        apiClient: ApiClient,
-        authenticationHandler: AuthenticationHandler
-    ): TagRepository {
-        return TagRepositoryImpl(localRepository, apiClient, authenticationHandler)
-    }
-
-    @Provides
-    fun provideChallengeLocalRepository(realm: Realm): ChallengeLocalRepository {
-        return RealmChallengeLocalRepository(realm)
-    }
-
-    @Provides
-    fun providesChallengeRepository(
-        localRepository: ChallengeLocalRepository,
-        apiClient: ApiClient,
-        authenticationHandler: AuthenticationHandler
-    ): ChallengeRepository {
-        return ChallengeRepositoryImpl(localRepository, apiClient, authenticationHandler)
-    }
-
-    @Provides
-    fun providesUserLocalRepository(realm: Realm): UserLocalRepository {
-        return RealmUserLocalRepository(realm)
-    }
-
-    @Provides
-    fun providesUserRepository(
-        localRepository: UserLocalRepository,
-        apiClient: ApiClient,
-        authenticationHandler: AuthenticationHandler,
-        taskRepository: TaskRepository,
-        appConfigManager: AppConfigManager,
-    ): UserRepository {
-        return UserRepositoryImpl(
-            localRepository,
-            apiClient,
-            authenticationHandler,
-            taskRepository,
-            appConfigManager,
-        )
-    }
-
-    @Provides
-    fun providesSocialLocalRepository(realm: Realm): SocialLocalRepository {
-        return RealmSocialLocalRepository(realm)
-    }
-
-    @Provides
-    fun providesSocialRepository(
-        localRepository: SocialLocalRepository,
-        apiClient: ApiClient,
-        authenticationHandler: AuthenticationHandler
-    ): SocialRepository {
-        return SocialRepositoryImpl(localRepository, apiClient, authenticationHandler)
-    }
-
-    @Provides
-    fun providesInventoryLocalRepository(
-        realm: Realm
-    ): InventoryLocalRepository {
-        return RealmInventoryLocalRepository(realm)
-    }
-
-    @Provides
-    fun providesInventoryRepository(
-        localRepository: InventoryLocalRepository,
-        apiClient: ApiClient,
-        authenticationHandler: AuthenticationHandler,
-        remoteConfig: AppConfigManager
-    ): InventoryRepository {
-        return InventoryRepositoryImpl(localRepository, apiClient, authenticationHandler, remoteConfig)
-    }
-
-    @Provides
-    fun providesFAQLocalRepository(realm: Realm): FAQLocalRepository {
-        return RealmFAQLocalRepository(realm)
-    }
-
-    @Provides
-    fun providesFAQRepository(
-        localRepository: FAQLocalRepository,
-        apiClient: ApiClient,
-        authenticationHandler: AuthenticationHandler
-    ): FAQRepository {
-        return FAQRepositoryImpl(localRepository, apiClient, authenticationHandler)
-    }
-
-    @Provides
-    fun providesTutorialLocalRepository(realm: Realm): TutorialLocalRepository {
-        return RealmTutorialLocalRepository(realm)
-    }
-
-    @Provides
-    fun providesTutorialRepository(
-        localRepository: TutorialLocalRepository,
-        apiClient: ApiClient,
-        authenticationHandler: AuthenticationHandler
-    ): TutorialRepository {
-        return TutorialRepositoryImpl(localRepository, apiClient, authenticationHandler)
-    }
-
-    @Provides
-    fun providesCustomizationLocalRepository(realm: Realm): CustomizationLocalRepository {
-        return RealmCustomizationLocalRepository(realm)
-    }
-
-    @Provides
-    fun providesCustomizationRepository(
-        localRepository: CustomizationLocalRepository,
-        apiClient: ApiClient,
-        authenticationHandler: AuthenticationHandler
-    ): CustomizationRepository {
-        return CustomizationRepositoryImpl(localRepository, apiClient, authenticationHandler)
-    }
-
-    @Provides
-    @Singleton
-    fun providesPurchaseHandler(
-        @ApplicationContext context: Context,
-        apiClient: ApiClient,
-        userViewModel: MainUserViewModel
-    ): PurchaseHandler {
-        return PurchaseHandler(context, apiClient, userViewModel)
-    }
-}
+package com.habitrpg.android.habitica.modules
+
+import android.content.Context
+import com.habitrpg.android.habitica.data.ApiClient
+import com.habitrpg.android.habitica.data.ChallengeRepository
+import com.habitrpg.android.habitica.data.CustomizationRepository
+import com.habitrpg.android.habitica.data.FAQRepository
+import com.habitrpg.android.habitica.data.InventoryRepository
+import com.habitrpg.android.habitica.data.SetupCustomizationRepository
+import com.habitrpg.android.habitica.data.SocialRepository
+import com.habitrpg.android.habitica.data.TagRepository
+import com.habitrpg.android.habitica.data.TaskRepository
+import com.habitrpg.android.habitica.data.TutorialRepository
+import com.habitrpg.android.habitica.data.UserRepository
+import com.habitrpg.android.habitica.data.implementation.ChallengeRepositoryImpl
+import com.habitrpg.android.habitica.data.implementation.CustomizationRepositoryImpl
+import com.habitrpg.android.habitica.data.implementation.FAQRepositoryImpl
+import com.habitrpg.android.habitica.data.implementation.InventoryRepositoryImpl
+import com.habitrpg.android.habitica.data.implementation.SetupCustomizationRepositoryImpl
+import com.habitrpg.android.habitica.data.implementation.SocialRepositoryImpl
+import com.habitrpg.android.habitica.data.implementation.TagRepositoryImpl
+import com.habitrpg.android.habitica.data.implementation.TaskRepositoryImpl
+import com.habitrpg.android.habitica.data.implementation.TutorialRepositoryImpl
+import com.habitrpg.android.habitica.data.implementation.UserRepositoryImpl
+import com.habitrpg.android.habitica.data.local.ChallengeLocalRepository
+import com.habitrpg.android.habitica.data.local.CustomizationLocalRepository
+import com.habitrpg.android.habitica.data.local.FAQLocalRepository
+import com.habitrpg.android.habitica.data.local.InventoryLocalRepository
+import com.habitrpg.android.habitica.data.local.SocialLocalRepository
+import com.habitrpg.android.habitica.data.local.TagLocalRepository
+import com.habitrpg.android.habitica.data.local.TaskLocalRepository
+import com.habitrpg.android.habitica.data.local.TutorialLocalRepository
+import com.habitrpg.android.habitica.data.local.UserLocalRepository
+import com.habitrpg.android.habitica.data.local.implementation.RealmChallengeLocalRepository
+import com.habitrpg.android.habitica.data.local.implementation.RealmCustomizationLocalRepository
+import com.habitrpg.android.habitica.data.local.implementation.RealmFAQLocalRepository
+import com.habitrpg.android.habitica.data.local.implementation.RealmInventoryLocalRepository
+import com.habitrpg.android.habitica.data.local.implementation.RealmSocialLocalRepository
+import com.habitrpg.android.habitica.data.local.implementation.RealmTagLocalRepository
+import com.habitrpg.android.habitica.data.local.implementation.RealmTaskLocalRepository
+import com.habitrpg.android.habitica.data.local.implementation.RealmTutorialLocalRepository
+import com.habitrpg.android.habitica.data.local.implementation.RealmUserLocalRepository
+import com.habitrpg.android.habitica.helpers.AppConfigManager
+import com.habitrpg.android.habitica.helpers.PurchaseHandler
+import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import io.realm.Realm
+import javax.inject.Singleton
+
+@InstallIn(SingletonComponent::class)
+@Module
+class UserRepositoryModule {
+    @Provides
+    fun providesSetupCustomizationRepository(
+        @ApplicationContext context: Context,
+    ): SetupCustomizationRepository {
+        return SetupCustomizationRepositoryImpl(context)
+    }
+
+    @Provides
+    fun providesTaskLocalRepository(realm: Realm): TaskLocalRepository {
+        return RealmTaskLocalRepository(realm)
+    }
+
+    @Provides
+    fun providesTaskRepository(
+        localRepository: TaskLocalRepository,
+        apiClient: ApiClient,
+        authenticationHandler: AuthenticationHandler,
+        appConfigManager: AppConfigManager,
+    ): TaskRepository {
+        return TaskRepositoryImpl(
+            localRepository,
+            apiClient,
+            authenticationHandler,
+            appConfigManager,
+        )
+    }
+
+    @Provides
+    fun providesTagLocalRepository(realm: Realm): TagLocalRepository {
+        return RealmTagLocalRepository(realm)
+    }
+
+    @Provides
+    fun providesTagRepository(
+        localRepository: TagLocalRepository,
+        apiClient: ApiClient,
+        authenticationHandler: AuthenticationHandler,
+    ): TagRepository {
+        return TagRepositoryImpl(localRepository, apiClient, authenticationHandler)
+    }
+
+    @Provides
+    fun provideChallengeLocalRepository(realm: Realm): ChallengeLocalRepository {
+        return RealmChallengeLocalRepository(realm)
+    }
+
+    @Provides
+    fun providesChallengeRepository(
+        localRepository: ChallengeLocalRepository,
+        apiClient: ApiClient,
+        authenticationHandler: AuthenticationHandler,
+    ): ChallengeRepository {
+        return ChallengeRepositoryImpl(localRepository, apiClient, authenticationHandler)
+    }
+
+    @Provides
+    fun providesUserLocalRepository(realm: Realm): UserLocalRepository {
+        return RealmUserLocalRepository(realm)
+    }
+
+    @Provides
+    fun providesUserRepository(
+        localRepository: UserLocalRepository,
+        apiClient: ApiClient,
+        authenticationHandler: AuthenticationHandler,
+        taskRepository: TaskRepository,
+        appConfigManager: AppConfigManager,
+    ): UserRepository {
+        return UserRepositoryImpl(
+            localRepository,
+            apiClient,
+            authenticationHandler,
+            taskRepository,
+            appConfigManager,
+        )
+    }
+
+    @Provides
+    fun providesSocialLocalRepository(realm: Realm): SocialLocalRepository {
+        return RealmSocialLocalRepository(realm)
+    }
+
+    @Provides
+    fun providesSocialRepository(
+        localRepository: SocialLocalRepository,
+        apiClient: ApiClient,
+        authenticationHandler: AuthenticationHandler,
+    ): SocialRepository {
+        return SocialRepositoryImpl(localRepository, apiClient, authenticationHandler)
+    }
+
+    @Provides
+    fun providesInventoryLocalRepository(
+        realm: Realm,
+    ): InventoryLocalRepository {
+        return RealmInventoryLocalRepository(realm)
+    }
+
+    @Provides
+    fun providesInventoryRepository(
+        localRepository: InventoryLocalRepository,
+        apiClient: ApiClient,
+        authenticationHandler: AuthenticationHandler,
+        remoteConfig: AppConfigManager,
+    ): InventoryRepository {
+        return InventoryRepositoryImpl(
+            localRepository,
+            apiClient,
+            authenticationHandler,
+            remoteConfig,
+        )
+    }
+
+    @Provides
+    fun providesFAQLocalRepository(realm: Realm): FAQLocalRepository {
+        return RealmFAQLocalRepository(realm)
+    }
+
+    @Provides
+    fun providesFAQRepository(
+        localRepository: FAQLocalRepository,
+        apiClient: ApiClient,
+        authenticationHandler: AuthenticationHandler,
+    ): FAQRepository {
+        return FAQRepositoryImpl(localRepository, apiClient, authenticationHandler)
+    }
+
+    @Provides
+    fun providesTutorialLocalRepository(realm: Realm): TutorialLocalRepository {
+        return RealmTutorialLocalRepository(realm)
+    }
+
+    @Provides
+    fun providesTutorialRepository(
+        localRepository: TutorialLocalRepository,
+        apiClient: ApiClient,
+        authenticationHandler: AuthenticationHandler,
+    ): TutorialRepository {
+        return TutorialRepositoryImpl(localRepository, apiClient, authenticationHandler)
+    }
+
+    @Provides
+    fun providesCustomizationLocalRepository(realm: Realm): CustomizationLocalRepository {
+        return RealmCustomizationLocalRepository(realm)
+    }
+
+    @Provides
+    fun providesCustomizationRepository(
+        localRepository: CustomizationLocalRepository,
+        apiClient: ApiClient,
+        authenticationHandler: AuthenticationHandler,
+    ): CustomizationRepository {
+        return CustomizationRepositoryImpl(localRepository, apiClient, authenticationHandler)
+    }
+
+    @Provides
+    @Singleton
+    fun providesPurchaseHandler(
+        @ApplicationContext context: Context,
+        apiClient: ApiClient,
+        userViewModel: MainUserViewModel,
+    ): PurchaseHandler {
+        return PurchaseHandler(context, apiClient, userViewModel)
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/prefs/TimePreference.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/prefs/TimePreference.kt
index 4142fbd8e..c54df3532 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/prefs/TimePreference.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/prefs/TimePreference.kt
@@ -10,17 +10,22 @@ import java.util.Locale
 
 class TimePreference(ctxt: Context, attrs: AttributeSet?) : DialogPreference(ctxt, attrs) {
     private var timeval: String? = null
-    override fun onGetDefaultValue(a: TypedArray, index: Int): Any {
+
+    override fun onGetDefaultValue(
+        a: TypedArray,
+        index: Int,
+    ): Any {
         return a.getString(index)!!
     }
 
     override fun onSetInitialValue(defaultValue: Any?) {
         timeval = null
-        timeval = if (defaultValue == null) {
-            getPersistedString("19:00")
-        } else {
-            getPersistedString(defaultValue.toString())
-        }
+        timeval =
+            if (defaultValue == null) {
+                getPersistedString("19:00")
+            } else {
+                getPersistedString(defaultValue.toString())
+            }
         summary = timeval ?: ""
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/DeviceCommunicationService.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/DeviceCommunicationService.kt
index caa44e1c0..dde61030d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/DeviceCommunicationService.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/DeviceCommunicationService.kt
@@ -30,7 +30,10 @@ class DeviceCommunicationService : WearableListenerService() {
         }
     }
 
-    private fun openActivity(event: MessageEvent, activityClass: Class<*>) {
+    private fun openActivity(
+        event: MessageEvent,
+        activityClass: Class<*>,
+    ) {
         val intent = Intent(this, activityClass)
         intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
         startActivity(intent)
@@ -39,9 +42,10 @@ class DeviceCommunicationService : WearableListenerService() {
 
     private fun openTaskForm(event: MessageEvent) {
         val taskID = String(event.data)
-        val startIntent = Intent(this, TaskFormActivity::class.java).apply {
-            putExtra(TaskFormActivity.TASK_ID_KEY, taskID)
-        }
+        val startIntent =
+            Intent(this, TaskFormActivity::class.java).apply {
+                putExtra(TaskFormActivity.TASK_ID_KEY, taskID)
+            }
         startIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
         startActivity(startIntent)
         messageClient.sendMessage(event.sourceNodeId, "/action_completed", null)
@@ -51,7 +55,7 @@ class DeviceCommunicationService : WearableListenerService() {
         messageClient.sendMessage(
             event.sourceNodeId,
             "/auth",
-            "${hostConfig.userID}:${hostConfig.apiKey}".toByteArray()
+            "${hostConfig.userID}:${hostConfig.apiKey}".toByteArray(),
         )
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/LocalNotificationActionReceiver.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/LocalNotificationActionReceiver.kt
index 1d98334ed..e7b6016ac 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/LocalNotificationActionReceiver.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/LocalNotificationActionReceiver.kt
@@ -1,147 +1,159 @@
-package com.habitrpg.android.habitica.receivers
-
-import android.app.NotificationManager
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.text.Spannable
-import android.widget.Toast
-import androidx.core.app.NotificationManagerCompat
-import androidx.core.app.RemoteInput
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.data.ApiClient
-import com.habitrpg.android.habitica.data.SocialRepository
-import com.habitrpg.android.habitica.data.TaskRepository
-import com.habitrpg.android.habitica.data.UserRepository
-import com.habitrpg.android.habitica.interactors.NotifyUserUseCase
-import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.common.habitica.helpers.ExceptionHandler
-import com.habitrpg.common.habitica.helpers.launchCatching
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.MainScope
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class LocalNotificationActionReceiver : BroadcastReceiver() {
-    @Inject
-    lateinit var userRepository: UserRepository
-
-    @Inject
-    lateinit var socialRepository: SocialRepository
-
-    @Inject
-    lateinit var taskRepository: TaskRepository
-
-    @Inject
-    lateinit var apiClient: ApiClient
-
-    private var user: User? = null
-    private val groupID: String?
-        get() = intent?.extras?.getString("groupID")
-    private val senderID: String?
-        get() = intent?.extras?.getString("senderID")
-    private val taskID: String?
-        get() = intent?.extras?.getString("taskID")
-    private var context: Context? = null
-    private var intent: Intent? = null
-
-    override fun onReceive(context: Context, intent: Intent) {
-        this.intent = intent
-        this.context = context
-        handleLocalNotificationAction(intent.action)
-    }
-
-    private fun handleLocalNotificationAction(action: String?) {
-        val notificationManager =
-            this.context?.getSystemService(Context.NOTIFICATION_SERVICE) as? NotificationManager
-        notificationManager?.cancel(intent?.extras?.getInt("NOTIFICATION_ID") ?: -1)
-        when (action) {
-            context?.getString(R.string.accept_party_invite) -> {
-                groupID?.let {
-                    MainScope().launch(ExceptionHandler.coroutine()) {
-                        socialRepository.joinGroup(it)
-                    }
-                }
-            }
-            context?.getString(R.string.reject_party_invite) -> {
-                groupID?.let {
-                    MainScope().launchCatching {
-                        socialRepository.rejectGroupInvite(it)
-                    }
-                }
-            }
-            context?.getString(R.string.accept_quest_invite) -> {
-                MainScope().launchCatching {
-                    socialRepository.acceptQuest(user)
-                }
-            }
-            context?.getString(R.string.reject_quest_invite) -> {
-                MainScope().launchCatching {
-                    socialRepository.rejectQuest(user)
-                }
-            }
-            context?.getString(R.string.accept_guild_invite) -> {
-                groupID?.let {
-                    MainScope().launch(ExceptionHandler.coroutine()) {
-                        socialRepository.joinGroup(it)
-                    }
-                }
-            }
-            context?.getString(R.string.reject_guild_invite) -> {
-                groupID?.let {
-                    MainScope().launchCatching {
-                        socialRepository.rejectGroupInvite(it)
-                    }
-                }
-            }
-            context?.getString(R.string.group_message_reply) -> {
-                groupID?.let {
-                    getMessageText(context?.getString(R.string.group_message_reply))?.let { message ->
-                        MainScope().launchCatching {
-                            socialRepository.postGroupChat(it, message)
-                            context?.let { c ->
-                                NotificationManagerCompat.from(c).cancel(it.hashCode())
-                            }
-                        }
-                    }
-                }
-            }
-            context?.getString(R.string.inbox_message_reply) -> {
-                senderID?.let {
-                    getMessageText(context?.getString(R.string.inbox_message_reply))?.let { message ->
-                        MainScope().launch(ExceptionHandler.coroutine()) {
-                            socialRepository.postPrivateMessage(it, message)
-                        }
-                    }
-                }
-            }
-            context?.getString(R.string.complete_task_action) -> {
-                taskID?.let {
-                    MainScope().launch(ExceptionHandler.coroutine()) {
-                        taskRepository.taskChecked(null, it, up = true, force = false) {
-                            val pair = NotifyUserUseCase.getNotificationAndAddStatsToUserAsText(
-                                it.experienceDelta,
-                                it.healthDelta,
-                                it.goldDelta,
-                                it.manaDelta
-                            )
-                            showToast(pair.first)
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    private fun showToast(text: Spannable) {
-        val toast = Toast.makeText(context, text, Toast.LENGTH_LONG)
-        toast.show()
-    }
-
-    private fun getMessageText(key: String?): String? {
-        return intent?.let {
-            RemoteInput.getResultsFromIntent(it)?.getCharSequence(key)?.toString()
-        }
-    }
-}
+package com.habitrpg.android.habitica.receivers
+
+import android.app.NotificationManager
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.text.Spannable
+import android.widget.Toast
+import androidx.core.app.NotificationManagerCompat
+import androidx.core.app.RemoteInput
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.data.ApiClient
+import com.habitrpg.android.habitica.data.SocialRepository
+import com.habitrpg.android.habitica.data.TaskRepository
+import com.habitrpg.android.habitica.data.UserRepository
+import com.habitrpg.android.habitica.interactors.NotifyUserUseCase
+import com.habitrpg.android.habitica.models.user.User
+import com.habitrpg.common.habitica.helpers.ExceptionHandler
+import com.habitrpg.common.habitica.helpers.launchCatching
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class LocalNotificationActionReceiver : BroadcastReceiver() {
+    @Inject
+    lateinit var userRepository: UserRepository
+
+    @Inject
+    lateinit var socialRepository: SocialRepository
+
+    @Inject
+    lateinit var taskRepository: TaskRepository
+
+    @Inject
+    lateinit var apiClient: ApiClient
+
+    private var user: User? = null
+    private val groupID: String?
+        get() = intent?.extras?.getString("groupID")
+    private val senderID: String?
+        get() = intent?.extras?.getString("senderID")
+    private val taskID: String?
+        get() = intent?.extras?.getString("taskID")
+    private var context: Context? = null
+    private var intent: Intent? = null
+
+    override fun onReceive(
+        context: Context,
+        intent: Intent,
+    ) {
+        this.intent = intent
+        this.context = context
+        handleLocalNotificationAction(intent.action)
+    }
+
+    private fun handleLocalNotificationAction(action: String?) {
+        val notificationManager =
+            this.context?.getSystemService(Context.NOTIFICATION_SERVICE) as? NotificationManager
+        notificationManager?.cancel(intent?.extras?.getInt("NOTIFICATION_ID") ?: -1)
+        when (action) {
+            context?.getString(R.string.accept_party_invite) -> {
+                groupID?.let {
+                    MainScope().launch(ExceptionHandler.coroutine()) {
+                        socialRepository.joinGroup(it)
+                    }
+                }
+            }
+
+            context?.getString(R.string.reject_party_invite) -> {
+                groupID?.let {
+                    MainScope().launchCatching {
+                        socialRepository.rejectGroupInvite(it)
+                    }
+                }
+            }
+
+            context?.getString(R.string.accept_quest_invite) -> {
+                MainScope().launchCatching {
+                    socialRepository.acceptQuest(user)
+                }
+            }
+
+            context?.getString(R.string.reject_quest_invite) -> {
+                MainScope().launchCatching {
+                    socialRepository.rejectQuest(user)
+                }
+            }
+
+            context?.getString(R.string.accept_guild_invite) -> {
+                groupID?.let {
+                    MainScope().launch(ExceptionHandler.coroutine()) {
+                        socialRepository.joinGroup(it)
+                    }
+                }
+            }
+
+            context?.getString(R.string.reject_guild_invite) -> {
+                groupID?.let {
+                    MainScope().launchCatching {
+                        socialRepository.rejectGroupInvite(it)
+                    }
+                }
+            }
+
+            context?.getString(R.string.group_message_reply) -> {
+                groupID?.let {
+                    getMessageText(context?.getString(R.string.group_message_reply))?.let { message ->
+                        MainScope().launchCatching {
+                            socialRepository.postGroupChat(it, message)
+                            context?.let { c ->
+                                NotificationManagerCompat.from(c).cancel(it.hashCode())
+                            }
+                        }
+                    }
+                }
+            }
+
+            context?.getString(R.string.inbox_message_reply) -> {
+                senderID?.let {
+                    getMessageText(context?.getString(R.string.inbox_message_reply))?.let { message ->
+                        MainScope().launch(ExceptionHandler.coroutine()) {
+                            socialRepository.postPrivateMessage(it, message)
+                        }
+                    }
+                }
+            }
+
+            context?.getString(R.string.complete_task_action) -> {
+                taskID?.let {
+                    MainScope().launch(ExceptionHandler.coroutine()) {
+                        taskRepository.taskChecked(null, it, up = true, force = false) {
+                            val pair =
+                                NotifyUserUseCase.getNotificationAndAddStatsToUserAsText(
+                                    it.experienceDelta,
+                                    it.healthDelta,
+                                    it.goldDelta,
+                                    it.manaDelta,
+                                )
+                            showToast(pair.first)
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    private fun showToast(text: Spannable) {
+        val toast = Toast.makeText(context, text, Toast.LENGTH_LONG)
+        toast.show()
+    }
+
+    private fun getMessageText(key: String?): String? {
+        return intent?.let {
+            RemoteInput.getResultsFromIntent(it)?.getCharSequence(key)?.toString()
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/NotificationPublisher.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/NotificationPublisher.kt
index 94fa5c046..bbd89bdb6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/NotificationPublisher.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/NotificationPublisher.kt
@@ -29,7 +29,6 @@ import javax.inject.Inject
 // https://gist.github.com/BrandonSmith/6679223
 @AndroidEntryPoint
 class NotificationPublisher : BroadcastReceiver() {
-
     @Inject
     lateinit var taskRepository: TaskRepository
 
@@ -42,7 +41,10 @@ class NotificationPublisher : BroadcastReceiver() {
     private var wasInjected = false
     private var context: Context? = null
 
-    override fun onReceive(context: Context, intent: Intent) {
+    override fun onReceive(
+        context: Context,
+        intent: Intent,
+    ) {
         this.context = context
         if (!wasInjected) {
             wasInjected = true
@@ -59,7 +61,8 @@ class NotificationPublisher : BroadcastReceiver() {
         val checkDailies = intent.getBooleanExtra(CHECK_DAILIES, false)
         if (checkDailies) {
             MainScope().launchCatching {
-                val tasks = taskRepository.getTasks(TaskType.DAILY, null, emptyArray()).firstOrNull()
+                val tasks =
+                    taskRepository.getTasks(TaskType.DAILY, null, emptyArray()).firstOrNull()
                 val user = userRepository.getUser().firstOrNull()
                 var showNotifications = false
                 for (task in tasks ?: emptyList()) {
@@ -69,7 +72,10 @@ class NotificationPublisher : BroadcastReceiver() {
                     }
                 }
                 if (showNotifications) {
-                    notify(intent, buildNotification(wasInactive, user?.authentication?.timestamps?.createdAt))
+                    notify(
+                        intent,
+                        buildNotification(wasInactive, user?.authentication?.timestamps?.createdAt),
+                    )
                 }
             }
         } else {
@@ -77,13 +83,19 @@ class NotificationPublisher : BroadcastReceiver() {
         }
     }
 
-    private fun notify(intent: Intent, notification: Notification?) {
+    private fun notify(
+        intent: Intent,
+        notification: Notification?,
+    ) {
         val notificationManager = context?.let { NotificationManagerCompat.from(it) }
         val id = intent.getIntExtra(NOTIFICATION_ID, 0)
         notification?.let { notificationManager?.notify(id, it) }
     }
 
-    private fun buildNotification(wasInactive: Boolean, registrationDate: Date? = null): Notification? {
+    private fun buildNotification(
+        wasInactive: Boolean,
+        registrationDate: Date? = null,
+    ): Notification? {
         val thisContext = context ?: return null
         val notification: Notification
         val builder = NotificationCompat.Builder(thisContext, "default")
@@ -96,11 +108,11 @@ class NotificationPublisher : BroadcastReceiver() {
             val isSameDay = (
                 registrationCal.get(Calendar.YEAR) == todayCal.get(Calendar.YEAR) &&
                     registrationCal.get(Calendar.DAY_OF_YEAR) == todayCal.get(Calendar.DAY_OF_YEAR)
-                )
+            )
             val isPreviousDay = (
                 registrationCal.get(Calendar.YEAR) == todayCal.get(Calendar.YEAR) &&
                     registrationCal.get(Calendar.DAY_OF_YEAR) == (todayCal.get(Calendar.DAY_OF_YEAR) - 1)
-                )
+            )
             if (isSameDay) {
                 builder.setContentTitle(thisContext.getString(R.string.same_day_reminder_title))
                 notificationText = thisContext.getString(R.string.same_day_reminder_text)
@@ -122,12 +134,13 @@ class NotificationPublisher : BroadcastReceiver() {
 
         notificationIntent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP
 
-        val intent = PendingIntent.getActivity(
-            thisContext,
-            0,
-            notificationIntent,
-            withImmutableFlag(0)
-        )
+        val intent =
+            PendingIntent.getActivity(
+                thisContext,
+                0,
+                notificationIntent,
+                withImmutableFlag(0),
+            )
         builder.setContentIntent(intent)
 
         builder.color = ContextCompat.getColor(thisContext, R.color.brand_300)
@@ -135,7 +148,8 @@ class NotificationPublisher : BroadcastReceiver() {
         notification = builder.build()
         notification.defaults = notification.defaults or Notification.DEFAULT_LIGHTS
 
-        notification.flags = notification.flags or (Notification.FLAG_AUTO_CANCEL or Notification.FLAG_SHOW_LIGHTS)
+        notification.flags =
+            notification.flags or (Notification.FLAG_AUTO_CANCEL or Notification.FLAG_SHOW_LIGHTS)
         return notification
     }
 
@@ -157,7 +171,7 @@ class NotificationPublisher : BroadcastReceiver() {
     }
 
     companion object {
-        var NOTIFICATION_ID = "notification-id"
-        var CHECK_DAILIES = "check-dailies"
+        const val NOTIFICATION_ID = "notification-id"
+        const val CHECK_DAILIES = "check-dailies"
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskAlarmBootReceiver.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskAlarmBootReceiver.kt
index 91a5979a1..3d57ae3b5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskAlarmBootReceiver.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskAlarmBootReceiver.kt
@@ -1,34 +1,41 @@
-package com.habitrpg.android.habitica.receivers
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.content.SharedPreferences
-import com.habitrpg.android.habitica.helpers.TaskAlarmManager
-import com.habitrpg.common.habitica.helpers.ExceptionHandler
-import com.habitrpg.shared.habitica.HLogger
-import com.habitrpg.shared.habitica.LogLevel
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.MainScope
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class TaskAlarmBootReceiver : BroadcastReceiver() {
-
-    @Inject
-    lateinit var taskAlarmManager: TaskAlarmManager
-
-    @Inject
-    lateinit var sharedPreferences: SharedPreferences
-
-    override fun onReceive(context: Context, intent: Intent) {
-        if (intent.action != Intent.ACTION_BOOT_COMPLETED) {
-            return
-        }
-        MainScope().launch(ExceptionHandler.coroutine()) {
-            taskAlarmManager.scheduleAllSavedAlarms(sharedPreferences.getBoolean("preventDailyReminder", false))
-        }
-        HLogger.log(LogLevel.INFO, this::javaClass.name, "onReceive")
-    }
-}
+package com.habitrpg.android.habitica.receivers
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.SharedPreferences
+import com.habitrpg.android.habitica.helpers.TaskAlarmManager
+import com.habitrpg.common.habitica.helpers.ExceptionHandler
+import com.habitrpg.shared.habitica.HLogger
+import com.habitrpg.shared.habitica.LogLevel
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class TaskAlarmBootReceiver : BroadcastReceiver() {
+    @Inject
+    lateinit var taskAlarmManager: TaskAlarmManager
+
+    @Inject
+    lateinit var sharedPreferences: SharedPreferences
+
+    override fun onReceive(
+        context: Context,
+        intent: Intent,
+    ) {
+        if (intent.action != Intent.ACTION_BOOT_COMPLETED) {
+            return
+        }
+        MainScope().launch(ExceptionHandler.coroutine()) {
+            taskAlarmManager.scheduleAllSavedAlarms(
+                sharedPreferences.getBoolean(
+                    "preventDailyReminder",
+                    false,
+                ),
+            )
+        }
+        HLogger.log(LogLevel.INFO, this::javaClass.name, "onReceive")
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.kt
index c899c671a..50a7470ec 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.kt
@@ -1,100 +1,118 @@
-package com.habitrpg.android.habitica.receivers
-
-import android.app.Notification
-import android.app.PendingIntent
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.media.RingtoneManager
-import android.os.Build
-import androidx.core.app.NotificationCompat
-import androidx.core.app.NotificationManagerCompat
-import androidx.core.content.ContextCompat
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.data.TaskRepository
-import com.habitrpg.android.habitica.extensions.withImmutableFlag
-import com.habitrpg.android.habitica.helpers.TaskAlarmManager
-import com.habitrpg.android.habitica.models.tasks.Task
-import com.habitrpg.android.habitica.ui.activities.MainActivity
-import com.habitrpg.common.habitica.helpers.ExceptionHandler
-import com.habitrpg.shared.habitica.HLogger
-import com.habitrpg.shared.habitica.LogLevel
-import com.habitrpg.shared.habitica.models.tasks.TaskType
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.MainScope
-import kotlinx.coroutines.flow.firstOrNull
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class TaskReceiver : BroadcastReceiver() {
-
-    @Inject
-    lateinit var taskAlarmManager: TaskAlarmManager
-
-    @Inject
-    lateinit var taskRepository: TaskRepository
-
-    override fun onReceive(context: Context, intent: Intent) {
-        HLogger.log(LogLevel.INFO, this::javaClass.name, "onReceive")
-        val extras = intent.extras
-        if (extras != null) {
-            val taskId = extras.getString(TaskAlarmManager.TASK_ID_INTENT_KEY)
-            // This will set up the next reminders for dailies
-            if (taskId != null) {
-                taskAlarmManager.addAlarmForTaskId(taskId)
-            }
-
-            MainScope().launch(ExceptionHandler.coroutine()) {
-                val task = taskRepository.getTask(taskId ?: "").firstOrNull() ?: return@launch
-                if (task.isUpdatedToday && task.completed) {
-                    return@launch
-                }
-                createNotification(context, task)
-            }
-        }
-    }
-
-    private fun createNotification(context: Context, task: Task) {
-        val intent = Intent(context, MainActivity::class.java)
-        HLogger.log(LogLevel.INFO, this::javaClass.name, "Create Notification")
-
-        intent.putExtra("notificationIdentifier", "task_reminder")
-        val pendingIntent = PendingIntent.getActivity(context, System.currentTimeMillis().toInt(), intent, withImmutableFlag(0))
-        val soundUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION)
-
-        var notificationBuilder = NotificationCompat.Builder(context, "default")
-            .setSmallIcon(R.drawable.ic_gryphon_white)
-            .setColor(ContextCompat.getColor(context, R.color.brand_300))
-            .setContentTitle(task.text)
-            .setStyle(
-                NotificationCompat.BigTextStyle()
-                    .bigText(task.notes)
-            )
-            .setPriority(NotificationCompat.PRIORITY_MAX)
-            .setSound(soundUri)
-            .setAutoCancel(true)
-            .setContentIntent(pendingIntent)
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            notificationBuilder = notificationBuilder.setCategory(Notification.CATEGORY_REMINDER)
-        }
-
-        if (task.type == TaskType.DAILY || task.type == TaskType.TODO) {
-            val completeIntent = Intent(context, LocalNotificationActionReceiver::class.java).apply {
-                action = context.getString(R.string.complete_task_action)
-                putExtra("taskID", task.id)
-                putExtra("NOTIFICATION_ID", task.id.hashCode())
-            }
-            val pendingIntentComplete = PendingIntent.getBroadcast(
-                context,
-                task.id.hashCode(),
-                completeIntent,
-                withImmutableFlag(PendingIntent.FLAG_UPDATE_CURRENT)
-            )
-            notificationBuilder.addAction(0, context.getString(R.string.complete), pendingIntentComplete)
-        }
-        val notificationManager = NotificationManagerCompat.from(context)
-        notificationManager.notify(task.id.hashCode(), notificationBuilder.build())
-    }
-}
+package com.habitrpg.android.habitica.receivers
+
+import android.app.Notification
+import android.app.PendingIntent
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.media.RingtoneManager
+import android.os.Build
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import androidx.core.content.ContextCompat
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.data.TaskRepository
+import com.habitrpg.android.habitica.extensions.withImmutableFlag
+import com.habitrpg.android.habitica.helpers.TaskAlarmManager
+import com.habitrpg.android.habitica.models.tasks.Task
+import com.habitrpg.android.habitica.ui.activities.MainActivity
+import com.habitrpg.common.habitica.helpers.ExceptionHandler
+import com.habitrpg.shared.habitica.HLogger
+import com.habitrpg.shared.habitica.LogLevel
+import com.habitrpg.shared.habitica.models.tasks.TaskType
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class TaskReceiver : BroadcastReceiver() {
+    @Inject
+    lateinit var taskAlarmManager: TaskAlarmManager
+
+    @Inject
+    lateinit var taskRepository: TaskRepository
+
+    override fun onReceive(
+        context: Context,
+        intent: Intent,
+    ) {
+        HLogger.log(LogLevel.INFO, this::javaClass.name, "onReceive")
+        val extras = intent.extras
+        if (extras != null) {
+            val taskId = extras.getString(TaskAlarmManager.TASK_ID_INTENT_KEY)
+            // This will set up the next reminders for dailies
+            if (taskId != null) {
+                taskAlarmManager.addAlarmForTaskId(taskId)
+            }
+
+            MainScope().launch(ExceptionHandler.coroutine()) {
+                val task = taskRepository.getTask(taskId ?: "").firstOrNull() ?: return@launch
+                if (task.isUpdatedToday && task.completed) {
+                    return@launch
+                }
+                createNotification(context, task)
+            }
+        }
+    }
+
+    private fun createNotification(
+        context: Context,
+        task: Task,
+    ) {
+        val intent = Intent(context, MainActivity::class.java)
+        HLogger.log(LogLevel.INFO, this::javaClass.name, "Create Notification")
+
+        intent.putExtra("notificationIdentifier", "task_reminder")
+        val pendingIntent =
+            PendingIntent.getActivity(
+                context,
+                System.currentTimeMillis().toInt(),
+                intent,
+                withImmutableFlag(0),
+            )
+        val soundUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION)
+
+        var notificationBuilder =
+            NotificationCompat.Builder(context, "default")
+                .setSmallIcon(R.drawable.ic_gryphon_white)
+                .setColor(ContextCompat.getColor(context, R.color.brand_300))
+                .setContentTitle(task.text)
+                .setStyle(
+                    NotificationCompat.BigTextStyle()
+                        .bigText(task.notes),
+                )
+                .setPriority(NotificationCompat.PRIORITY_MAX)
+                .setSound(soundUri)
+                .setAutoCancel(true)
+                .setContentIntent(pendingIntent)
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            notificationBuilder = notificationBuilder.setCategory(Notification.CATEGORY_REMINDER)
+        }
+
+        if (task.type == TaskType.DAILY || task.type == TaskType.TODO) {
+            val completeIntent =
+                Intent(context, LocalNotificationActionReceiver::class.java).apply {
+                    action = context.getString(R.string.complete_task_action)
+                    putExtra("taskID", task.id)
+                    putExtra("NOTIFICATION_ID", task.id.hashCode())
+                }
+            val pendingIntentComplete =
+                PendingIntent.getBroadcast(
+                    context,
+                    task.id.hashCode(),
+                    completeIntent,
+                    withImmutableFlag(PendingIntent.FLAG_UPDATE_CURRENT),
+                )
+            notificationBuilder.addAction(
+                0,
+                context.getString(R.string.complete),
+                pendingIntentComplete,
+            )
+        }
+        val notificationManager = NotificationManagerCompat.from(context)
+        notificationManager.notify(task.id.hashCode(), notificationBuilder.build())
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/GemPurchaseOptionsView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/GemPurchaseOptionsView.kt
index 514b675e9..b8073ac42 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/GemPurchaseOptionsView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/GemPurchaseOptionsView.kt
@@ -9,17 +9,18 @@ import com.habitrpg.android.habitica.databinding.PurchaseGemViewBinding
 import com.habitrpg.common.habitica.extensions.layoutInflater
 
 class GemPurchaseOptionsView(context: Context, attrs: AttributeSet) : FrameLayout(context, attrs) {
-
-    var binding: PurchaseGemViewBinding = PurchaseGemViewBinding.inflate(context.layoutInflater, this, true)
+    var binding: PurchaseGemViewBinding =
+        PurchaseGemViewBinding.inflate(context.layoutInflater, this, true)
     var sku: ProductDetails? = null
 
     init {
-        val a = context.theme.obtainStyledAttributes(
-            attrs,
-            R.styleable.GemPurchaseOptionsView,
-            0,
-            0
-        )
+        val a =
+            context.theme.obtainStyledAttributes(
+                attrs,
+                R.styleable.GemPurchaseOptionsView,
+                0,
+                0,
+            )
 
         binding.gemAmount.text = a.getText(R.styleable.GemPurchaseOptionsView_gemAmount)
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/RoundedFrameLayout.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/RoundedFrameLayout.kt
index 209aa0bf0..5a6a2ac6d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/RoundedFrameLayout.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/RoundedFrameLayout.kt
@@ -8,23 +8,24 @@ import android.util.AttributeSet
 import android.widget.FrameLayout
 import androidx.core.graphics.toRectF
 
-class RoundedFrameLayout @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
-) : FrameLayout(context, attrs, defStyleAttr) {
+class RoundedFrameLayout
+    @JvmOverloads
+    constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0,
+    ) : FrameLayout(context, attrs, defStyleAttr) {
+        var radius = 4f
+        var isCirclular = true
+        val clipPath = Path()
+        val bounds = Rect()
 
-    var radius = 4f
-    var isCirclular = true
-    val clipPath = Path()
-    val bounds = Rect()
-
-    override fun onDraw(canvas: Canvas) {
-        clipPath.reset()
-        val radius = if (isCirclular) (height / 2).toFloat() else radius
-        canvas.getClipBounds(bounds)
-        clipPath.addRoundRect(bounds.toRectF(), radius, radius, Path.Direction.CW)
-        canvas.clipPath(clipPath)
-        super.onDraw(canvas)
+        override fun onDraw(canvas: Canvas) {
+            clipPath.reset()
+            val radius = if (isCirclular) (height / 2).toFloat() else radius
+            canvas.getClipBounds(bounds)
+            clipPath.addRoundRect(bounds.toRectF(), radius, radius, Path.Direction.CW)
+            canvas.clipPath(clipPath)
+            super.onDraw(canvas)
+        }
     }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SpeechBubbleView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SpeechBubbleView.kt
index dab19a26b..afff384cd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SpeechBubbleView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SpeechBubbleView.kt
@@ -8,17 +8,20 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.SpeechbubbleBinding
 import com.habitrpg.common.habitica.extensions.layoutInflater
 
-class SpeechBubbleView(context: Context, attrs: AttributeSet) : FrameLayout(context, attrs), View.OnClickListener {
+class SpeechBubbleView(context: Context, attrs: AttributeSet) :
+    FrameLayout(context, attrs),
+    View.OnClickListener {
     internal var binding = SpeechbubbleBinding.inflate(context.layoutInflater, this, true)
     private var showNextListener: ShowNextListener? = null
 
     init {
-        val attributes = context.theme.obtainStyledAttributes(
-            attrs,
-            R.styleable.SpeechBubbleView,
-            0,
-            0
-        )
+        val attributes =
+            context.theme.obtainStyledAttributes(
+                attrs,
+                R.styleable.SpeechBubbleView,
+                0,
+                0,
+            )
 
         binding.namePlate.text = attributes.getString(R.styleable.SpeechBubbleView_namePlate)
         binding.textView.text = attributes.getString(R.styleable.SpeechBubbleView_text)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/TutorialView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/TutorialView.kt
index 8d1079dfb..2e6798a1c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/TutorialView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/TutorialView.kt
@@ -1,103 +1,107 @@
-package com.habitrpg.android.habitica.ui
-
-import android.content.Context
-import android.view.View
-import android.view.ViewGroup
-import android.widget.FrameLayout
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.databinding.OverlayTutorialBinding
-import com.habitrpg.common.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.models.TutorialStep
-import com.habitrpg.common.habitica.extensions.layoutInflater
-
-class TutorialView(
-    context: Context,
-    val step: TutorialStep,
-    private val onReaction: OnTutorialReaction
-) : FrameLayout(context) {
-    private val binding = OverlayTutorialBinding.inflate(context.layoutInflater, this, true)
-    private var tutorialTexts: List<String> = emptyList()
-    private var currentTextIndex: Int = 0
-
-    private val isDisplayingLastStep: Boolean
-        get() = currentTextIndex == tutorialTexts.size - 1
-
-    init {
-        binding.speechBubbleView.setConfirmationButtonVisibility(View.GONE)
-        binding.speechBubbleView.setShowNextListener(object : SpeechBubbleView.ShowNextListener {
-            override fun showNextStep() {
-                displayNextTutorialText()
-            }
-        })
-
-        binding.speechBubbleView.binding.completeButton.setOnClickListener { completeButtonClicked() }
-        binding.speechBubbleView.binding.dismissButton.setOnClickListener { dismissButtonClicked() }
-        binding.background.setOnClickListener { backgroundClicked() }
-
-        if (step.linkFAQ) {
-            binding.speechBubbleView.binding.dismissButton.setText(R.string.visit_faq)
-        }
-    }
-
-    fun setTutorialText(text: String) {
-        binding.speechBubbleView.animateText(text)
-        binding.speechBubbleView.setConfirmationButtonVisibility(View.VISIBLE)
-    }
-
-    fun setTutorialTexts(texts: List<String>) {
-        if (texts.size == 1) {
-            setTutorialText(texts.first())
-            return
-        }
-        tutorialTexts = texts
-        currentTextIndex = -1
-        displayNextTutorialText()
-    }
-
-    fun setCanBeDeferred(canBeDeferred: Boolean) {
-        binding.speechBubbleView.binding.dismissButton.visibility = if (canBeDeferred) View.VISIBLE else View.GONE
-    }
-
-    private fun displayNextTutorialText() {
-        currentTextIndex++
-        if (currentTextIndex < tutorialTexts.size) {
-            binding.speechBubbleView.animateText(tutorialTexts[currentTextIndex])
-            if (isDisplayingLastStep) {
-                binding.speechBubbleView.setConfirmationButtonVisibility(View.VISIBLE)
-                binding.speechBubbleView.setHasMoreContent(false)
-            } else {
-                binding.speechBubbleView.setHasMoreContent(true)
-            }
-        } else {
-            onReaction.onTutorialCompleted(step)
-        }
-    }
-
-    private fun completeButtonClicked() {
-        onReaction.onTutorialCompleted(step)
-        post {
-            (parent as? ViewGroup)?.removeView(this)
-        }
-    }
-
-    private fun dismissButtonClicked() {
-        post {
-            (parent as? ViewGroup)?.removeView(this)
-        }
-        if (step.linkFAQ) {
-            onReaction.onTutorialCompleted(step)
-            MainNavigationController.navigate(R.id.FAQOverviewFragment)
-        } else {
-            onReaction.onTutorialDeferred(step)
-        }
-    }
-
-    private fun backgroundClicked() {
-        binding.speechBubbleView.onClick(binding.speechBubbleView)
-    }
-
-    interface OnTutorialReaction {
-        fun onTutorialCompleted(step: TutorialStep)
-        fun onTutorialDeferred(step: TutorialStep)
-    }
-}
+package com.habitrpg.android.habitica.ui
+
+import android.content.Context
+import android.view.View
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.OverlayTutorialBinding
+import com.habitrpg.android.habitica.models.TutorialStep
+import com.habitrpg.common.habitica.extensions.layoutInflater
+import com.habitrpg.common.habitica.helpers.MainNavigationController
+
+class TutorialView(
+    context: Context,
+    val step: TutorialStep,
+    private val onReaction: OnTutorialReaction,
+) : FrameLayout(context) {
+    private val binding = OverlayTutorialBinding.inflate(context.layoutInflater, this, true)
+    private var tutorialTexts: List<String> = emptyList()
+    private var currentTextIndex: Int = 0
+
+    private val isDisplayingLastStep: Boolean
+        get() = currentTextIndex == tutorialTexts.size - 1
+
+    init {
+        binding.speechBubbleView.setConfirmationButtonVisibility(View.GONE)
+        binding.speechBubbleView.setShowNextListener(
+            object : SpeechBubbleView.ShowNextListener {
+                override fun showNextStep() {
+                    displayNextTutorialText()
+                }
+            },
+        )
+
+        binding.speechBubbleView.binding.completeButton.setOnClickListener { completeButtonClicked() }
+        binding.speechBubbleView.binding.dismissButton.setOnClickListener { dismissButtonClicked() }
+        binding.background.setOnClickListener { backgroundClicked() }
+
+        if (step.linkFAQ) {
+            binding.speechBubbleView.binding.dismissButton.setText(R.string.visit_faq)
+        }
+    }
+
+    fun setTutorialText(text: String) {
+        binding.speechBubbleView.animateText(text)
+        binding.speechBubbleView.setConfirmationButtonVisibility(View.VISIBLE)
+    }
+
+    fun setTutorialTexts(texts: List<String>) {
+        if (texts.size == 1) {
+            setTutorialText(texts.first())
+            return
+        }
+        tutorialTexts = texts
+        currentTextIndex = -1
+        displayNextTutorialText()
+    }
+
+    fun setCanBeDeferred(canBeDeferred: Boolean) {
+        binding.speechBubbleView.binding.dismissButton.visibility =
+            if (canBeDeferred) View.VISIBLE else View.GONE
+    }
+
+    private fun displayNextTutorialText() {
+        currentTextIndex++
+        if (currentTextIndex < tutorialTexts.size) {
+            binding.speechBubbleView.animateText(tutorialTexts[currentTextIndex])
+            if (isDisplayingLastStep) {
+                binding.speechBubbleView.setConfirmationButtonVisibility(View.VISIBLE)
+                binding.speechBubbleView.setHasMoreContent(false)
+            } else {
+                binding.speechBubbleView.setHasMoreContent(true)
+            }
+        } else {
+            onReaction.onTutorialCompleted(step)
+        }
+    }
+
+    private fun completeButtonClicked() {
+        onReaction.onTutorialCompleted(step)
+        post {
+            (parent as? ViewGroup)?.removeView(this)
+        }
+    }
+
+    private fun dismissButtonClicked() {
+        post {
+            (parent as? ViewGroup)?.removeView(this)
+        }
+        if (step.linkFAQ) {
+            onReaction.onTutorialCompleted(step)
+            MainNavigationController.navigate(R.id.FAQOverviewFragment)
+        } else {
+            onReaction.onTutorialDeferred(step)
+        }
+    }
+
+    private fun backgroundClicked() {
+        binding.speechBubbleView.onClick(binding.speechBubbleView)
+    }
+
+    interface OnTutorialReaction {
+        fun onTutorialCompleted(step: TutorialStep)
+
+        fun onTutorialDeferred(step: TutorialStep)
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AddTaskWidgetActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AddTaskWidgetActivity.kt
index 27177e06b..e18f1c7a8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AddTaskWidgetActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AddTaskWidgetActivity.kt
@@ -1,80 +1,89 @@
-package com.habitrpg.android.habitica.ui.activities
-
-import android.app.Activity
-import android.appwidget.AppWidgetManager
-import android.content.Intent
-import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.content.edit
-import androidx.preference.PreferenceManager
-import com.habitrpg.android.habitica.databinding.WidgetConfigureAddTaskBinding
-import com.habitrpg.android.habitica.widget.AddTaskWidgetProvider
-import com.habitrpg.shared.habitica.models.tasks.TaskType
-import dagger.hilt.android.AndroidEntryPoint
-
-@AndroidEntryPoint
-class AddTaskWidgetActivity : AppCompatActivity() {
-
-    private var widgetId: Int = 0
-
-    private lateinit var binding: WidgetConfigureAddTaskBinding
-
-    public override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setResult(Activity.RESULT_CANCELED)
-        binding = WidgetConfigureAddTaskBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-
-        val intent = intent
-        val extras = intent.extras
-        if (extras != null) {
-            widgetId = extras.getInt(AppWidgetManager.EXTRA_APPWIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID)
-        }
-
-        // If this activity was started with an intent without an app widget ID,
-        // finish with an error.
-        if (widgetId == AppWidgetManager.INVALID_APPWIDGET_ID) {
-            finish()
-        }
-
-        binding.addHabitButton.setOnClickListener { addHabitSelected() }
-        binding.addDailyButton.setOnClickListener { addDailySelected() }
-        binding.addTodoButton.setOnClickListener { addToDoSelected() }
-        binding.addRewardButton.setOnClickListener { addRewardSelected() }
-    }
-
-    private fun addHabitSelected() {
-        finishWithSelection(TaskType.HABIT)
-    }
-
-    private fun addDailySelected() {
-        finishWithSelection(TaskType.DAILY)
-    }
-
-    private fun addToDoSelected() {
-        finishWithSelection(TaskType.TODO)
-    }
-
-    private fun addRewardSelected() {
-        finishWithSelection(TaskType.REWARD)
-    }
-
-    private fun finishWithSelection(selectedTaskType: TaskType) {
-        storeSelectedTaskType(selectedTaskType)
-
-        val resultValue = Intent()
-        resultValue.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, widgetId)
-        setResult(Activity.RESULT_OK, resultValue)
-        finish()
-
-        val intent = Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE, null, this, AddTaskWidgetProvider::class.java)
-        intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, intArrayOf(widgetId))
-        sendBroadcast(intent)
-    }
-
-    private fun storeSelectedTaskType(selectedTaskType: TaskType) {
-        PreferenceManager.getDefaultSharedPreferences(this).edit {
-            putString("add_task_widget_$widgetId", selectedTaskType.value)
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.activities
+
+import android.app.Activity
+import android.appwidget.AppWidgetManager
+import android.content.Intent
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.edit
+import androidx.preference.PreferenceManager
+import com.habitrpg.android.habitica.databinding.WidgetConfigureAddTaskBinding
+import com.habitrpg.android.habitica.widget.AddTaskWidgetProvider
+import com.habitrpg.shared.habitica.models.tasks.TaskType
+import dagger.hilt.android.AndroidEntryPoint
+
+@AndroidEntryPoint
+class AddTaskWidgetActivity : AppCompatActivity() {
+    private var widgetId: Int = 0
+
+    private lateinit var binding: WidgetConfigureAddTaskBinding
+
+    public override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setResult(Activity.RESULT_CANCELED)
+        binding = WidgetConfigureAddTaskBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        val intent = intent
+        val extras = intent.extras
+        if (extras != null) {
+            widgetId =
+                extras.getInt(
+                    AppWidgetManager.EXTRA_APPWIDGET_ID,
+                    AppWidgetManager.INVALID_APPWIDGET_ID,
+                )
+        }
+
+        // If this activity was started with an intent without an app widget ID,
+        // finish with an error.
+        if (widgetId == AppWidgetManager.INVALID_APPWIDGET_ID) {
+            finish()
+        }
+
+        binding.addHabitButton.setOnClickListener { addHabitSelected() }
+        binding.addDailyButton.setOnClickListener { addDailySelected() }
+        binding.addTodoButton.setOnClickListener { addToDoSelected() }
+        binding.addRewardButton.setOnClickListener { addRewardSelected() }
+    }
+
+    private fun addHabitSelected() {
+        finishWithSelection(TaskType.HABIT)
+    }
+
+    private fun addDailySelected() {
+        finishWithSelection(TaskType.DAILY)
+    }
+
+    private fun addToDoSelected() {
+        finishWithSelection(TaskType.TODO)
+    }
+
+    private fun addRewardSelected() {
+        finishWithSelection(TaskType.REWARD)
+    }
+
+    private fun finishWithSelection(selectedTaskType: TaskType) {
+        storeSelectedTaskType(selectedTaskType)
+
+        val resultValue = Intent()
+        resultValue.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, widgetId)
+        setResult(Activity.RESULT_OK, resultValue)
+        finish()
+
+        val intent =
+            Intent(
+                AppWidgetManager.ACTION_APPWIDGET_UPDATE,
+                null,
+                this,
+                AddTaskWidgetProvider::class.java,
+            )
+        intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, intArrayOf(widgetId))
+        sendBroadcast(intent)
+    }
+
+    private fun storeSelectedTaskType(selectedTaskType: TaskType) {
+        PreferenceManager.getDefaultSharedPreferences(this).edit {
+            putString("add_task_widget_$widgetId", selectedTaskType.value)
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AdventureGuideActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AdventureGuideActivity.kt
index 371b8b51b..6039cecbf 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AdventureGuideActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AdventureGuideActivity.kt
@@ -44,20 +44,22 @@ class AdventureGuideActivity : BaseActivity() {
 
         setupToolbar(binding.toolbar)
 
-        achievementTitles = mapOf(
-            Pair("createdTask", getString(R.string.create_task_title)),
-            Pair("completedTask", getString(R.string.complete_task_title)),
-            Pair("hatchedPet", getString(R.string.hatch_pet_title)),
-            Pair("fedPet", getString(R.string.feedPet_title)),
-            Pair("purchasedEquipment", getString(R.string.purchase_equipment_title))
-        )
-        achievementDescriptions = mapOf(
-            Pair("createdTask", getString(R.string.create_task_description)),
-            Pair("completedTask", getString(R.string.complete_task_description)),
-            Pair("hatchedPet", getString(R.string.hatch_pet_description)),
-            Pair("fedPet", getString(R.string.feedPet_description)),
-            Pair("purchasedEquipment", getString(R.string.purchase_equipment_description))
-        )
+        achievementTitles =
+            mapOf(
+                Pair("createdTask", getString(R.string.create_task_title)),
+                Pair("completedTask", getString(R.string.complete_task_title)),
+                Pair("hatchedPet", getString(R.string.hatch_pet_title)),
+                Pair("fedPet", getString(R.string.feedPet_title)),
+                Pair("purchasedEquipment", getString(R.string.purchase_equipment_title)),
+            )
+        achievementDescriptions =
+            mapOf(
+                Pair("createdTask", getString(R.string.create_task_description)),
+                Pair("completedTask", getString(R.string.complete_task_description)),
+                Pair("hatchedPet", getString(R.string.hatch_pet_description)),
+                Pair("fedPet", getString(R.string.feedPet_description)),
+                Pair("purchasedEquipment", getString(R.string.purchase_equipment_description)),
+            )
 
         val descriptionText = getString(R.string.adventure_guide_description_new)
         binding.descriptionView.setText(descriptionText.fromHtml(), TextView.BufferType.SPANNABLE)
@@ -90,28 +92,59 @@ class AdventureGuideActivity : BaseActivity() {
         }
 
         if (completed > 0) {
-            binding.progressTextview.text = getString(R.string.percent_completed, ((completed / achievements.size.toFloat()) * 100).toInt())
+            binding.progressTextview.text =
+                getString(
+                    R.string.percent_completed,
+                    ((completed / achievements.size.toFloat()) * 100).toInt(),
+                )
         }
 
         binding.achievementContainer.removeAllViews()
         for (achievement in achievements) {
-            val itemBinding = AdventureGuideItemBinding.inflate(layoutInflater, binding.achievementContainer, true)
+            val itemBinding =
+                AdventureGuideItemBinding.inflate(
+                    layoutInflater,
+                    binding.achievementContainer,
+                    true,
+                )
             itemBinding.titleView.text = achievementTitles[achievement.key]
             itemBinding.descriptionView.text = achievementDescriptions[achievement.key]
 
-            val iconName = if (achievement.earned) {
-                "achievement-" + achievement.key + "2x"
-            } else {
-                "achievement-unearned2x"
-            }
+            val iconName =
+                if (achievement.earned) {
+                    "achievement-" + achievement.key + "2x"
+                } else {
+                    "achievement-unearned2x"
+                }
             itemBinding.iconView.loadImage(iconName)
             if (achievement.earned) {
-                itemBinding.titleView.paintFlags = itemBinding.titleView.paintFlags or Paint.STRIKE_THRU_TEXT_FLAG
-                itemBinding.titleView.setTextColor(ContextCompat.getColor(this, R.color.text_ternary))
-                itemBinding.descriptionView.setTextColor(ContextCompat.getColor(this, R.color.text_ternary))
+                itemBinding.titleView.paintFlags =
+                    itemBinding.titleView.paintFlags or Paint.STRIKE_THRU_TEXT_FLAG
+                itemBinding.titleView.setTextColor(
+                    ContextCompat.getColor(
+                        this,
+                        R.color.text_ternary,
+                    ),
+                )
+                itemBinding.descriptionView.setTextColor(
+                    ContextCompat.getColor(
+                        this,
+                        R.color.text_ternary,
+                    ),
+                )
             } else {
-                itemBinding.titleView.setTextColor(ContextCompat.getColor(this, R.color.text_primary))
-                itemBinding.descriptionView.setTextColor(ContextCompat.getColor(this, R.color.text_primary))
+                itemBinding.titleView.setTextColor(
+                    ContextCompat.getColor(
+                        this,
+                        R.color.text_primary,
+                    ),
+                )
+                itemBinding.descriptionView.setTextColor(
+                    ContextCompat.getColor(
+                        this,
+                        R.color.text_primary,
+                    ),
+                )
                 itemBinding.iconView.alpha = 0.5f
             }
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ArmoireActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ArmoireActivity.kt
index bd5818e28..c8df6fa13 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ArmoireActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ArmoireActivity.kt
@@ -13,7 +13,6 @@ import androidx.lifecycle.lifecycleScope
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.databinding.ActivityArmoireBinding
-import com.habitrpg.common.habitica.extensions.observeOnce
 import com.habitrpg.android.habitica.helpers.AdHandler
 import com.habitrpg.android.habitica.helpers.AdType
 import com.habitrpg.android.habitica.helpers.Analytics
@@ -26,12 +25,13 @@ import com.habitrpg.android.habitica.ui.fragments.purchases.EventOutcomeSubscrip
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import com.habitrpg.android.habitica.ui.views.ads.AdButton
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaBottomSheetDialog
-import com.habitrpg.common.habitica.views.HabiticaCircularProgressView
 import com.habitrpg.common.habitica.extensions.dpToPx
 import com.habitrpg.common.habitica.extensions.loadImage
+import com.habitrpg.common.habitica.extensions.observeOnce
 import com.habitrpg.common.habitica.helpers.Animations
 import com.habitrpg.common.habitica.helpers.ExceptionHandler
 import com.habitrpg.common.habitica.helpers.launchCatching
+import com.habitrpg.common.habitica.views.HabiticaCircularProgressView
 import com.plattysoft.leonids.ParticleSystem
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.MainScope
@@ -43,7 +43,6 @@ import javax.inject.Inject
 
 @AndroidEntryPoint
 class ArmoireActivity : BaseActivity() {
-
     private var equipmentKey: String? = null
     private var gold: Double? = null
     private var hasAnimatedChanges: Boolean = false
@@ -93,12 +92,13 @@ class ArmoireActivity : BaseActivity() {
         }
 
         if (appConfigManager.enableArmoireAds()) {
-            val handler = AdHandler(this, AdType.ARMOIRE) {
-                if (!it) {
-                    return@AdHandler
+            val handler =
+                AdHandler(this, AdType.ARMOIRE) {
+                    if (!it) {
+                        return@AdHandler
+                    }
+                    giveUserArmoire()
                 }
-                giveUserArmoire()
-            }
             handler.prepare {
                 if (it && binding.adButton.state == AdButton.State.LOADING) {
                     binding.adButton.state = AdButton.State.READY
@@ -144,10 +144,14 @@ class ArmoireActivity : BaseActivity() {
 
         binding.subscribeModalButton.setOnClickListener {
             Analytics.sendEvent("View armoire sub CTA", EventCategory.BEHAVIOUR, HitType.EVENT)
-            val subscriptionBottomSheet = EventOutcomeSubscriptionBottomSheetFragment().apply {
-                eventType = EVENT_ARMOIRE_OPENED
-            }
-            subscriptionBottomSheet.show(supportFragmentManager, EventOutcomeSubscriptionBottomSheetFragment.TAG)
+            val subscriptionBottomSheet =
+                EventOutcomeSubscriptionBottomSheetFragment().apply {
+                    eventType = EVENT_ARMOIRE_OPENED
+                }
+            subscriptionBottomSheet.show(
+                supportFragmentManager,
+                EventOutcomeSubscriptionBottomSheetFragment.TAG,
+            )
         }
 
         binding.closeButton.setOnClickListener {
@@ -224,7 +228,7 @@ class ArmoireActivity : BaseActivity() {
                 buyResponse.armoire["type"] ?: "",
                 buyResponse.armoire["dropKey"] ?: "",
                 buyResponse.armoire["dropText"] ?: "",
-                buyResponse.armoire["value"] ?: ""
+                buyResponse.armoire["value"] ?: "",
             )
             hasAnimatedChanges = false
             gold = null
@@ -267,7 +271,7 @@ class ArmoireActivity : BaseActivity() {
                 createParticles(container, R.drawable.confetti_yellow)
                 createParticles(container, R.drawable.confetti_purple)
             },
-            500
+            500,
         )
 
         binding.iconView.startAnimation(Animations.bobbingAnimation())
@@ -297,12 +301,15 @@ class ArmoireActivity : BaseActivity() {
         hasAnimatedChanges = true
     }
 
-    private fun createParticles(container: FrameLayout, resource: Int) {
+    private fun createParticles(
+        container: FrameLayout,
+        resource: Int,
+    ) {
         ParticleSystem(
             container,
             30,
             ContextCompat.getDrawable(this, resource),
-            6000
+            6000,
         )
             .setRotationSpeed(144f)
             .setScaleRange(1.0f, 1.6f)
@@ -311,18 +318,26 @@ class ArmoireActivity : BaseActivity() {
             .emitWithGravity(binding.confettiAnchor, Gravity.TOP, 15, 2000)
     }
 
-    fun configure(type: String, key: String, text: String, value: String? = "") {
-        binding.titleView.text = text.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() }
+    fun configure(
+        type: String,
+        key: String,
+        text: String,
+        value: String? = "",
+    ) {
+        binding.titleView.text =
+            text.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() }
         binding.equipButton.visibility = if (type == "gear") View.VISIBLE else View.GONE
         when (type) {
             "gear" -> {
                 binding.subtitleView.text = getString(R.string.armoireEquipment_new)
                 binding.iconView.loadImage("shop_$key")
             }
+
             "food" -> {
                 binding.subtitleView.text = getString(R.string.armoireFood_new)
                 binding.iconView.loadImage("Pet_Food_$key")
             }
+
             else -> {
                 @SuppressLint("SetTextI18n")
                 binding.titleView.text = "+$value ${binding.titleView.text}"
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.kt
index 1ecde81ab..4a56b1e5b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.kt
@@ -47,7 +47,6 @@ import java.io.OutputStream
 import java.util.Date
 import javax.inject.Inject
 
-
 abstract class BaseActivity : AppCompatActivity() {
     @Inject
     lateinit var notificationsManager: NotificationsManager
@@ -68,7 +67,10 @@ abstract class BaseActivity : AppCompatActivity() {
     protected abstract fun getLayoutResId(): Int?
 
     open fun getContentView(layoutResId: Int? = getLayoutResId()): View {
-        return (getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater).inflate(layoutResId ?: 0, null)
+        return (getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater).inflate(
+            layoutResId ?: 0,
+            null,
+        )
     }
 
     private val habiticaApplication: HabiticaApplication
@@ -84,11 +86,12 @@ abstract class BaseActivity : AppCompatActivity() {
         val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this)
         val languageHelper = LanguageHelper(sharedPreferences.getString("language", "en"))
         resources.forceLocale(this, languageHelper.locale)
-        delegate.localNightMode = when (sharedPreferences.getString("theme_mode", "system")) {
-            "light" -> AppCompatDelegate.MODE_NIGHT_NO
-            "dark" -> AppCompatDelegate.MODE_NIGHT_YES
-            else -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
-        }
+        delegate.localNightMode =
+            when (sharedPreferences.getString("theme_mode", "system")) {
+                "light" -> AppCompatDelegate.MODE_NIGHT_NO
+                "dark" -> AppCompatDelegate.MODE_NIGHT_YES
+                else -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
+            }
         isNightMode = isUsingNightModeResources()
         loadTheme(sharedPreferences)
 
@@ -99,7 +102,11 @@ abstract class BaseActivity : AppCompatActivity() {
         }
         lifecycleScope.launchCatching {
             notificationsManager.displayNotificationEvents.collect {
-                if (ShowNotificationInteractor(this@BaseActivity, lifecycleScope).handleNotification(it)) {
+                if (ShowNotificationInteractor(
+                        this@BaseActivity,
+                        lifecycleScope,
+                    ).handleNotification(it)
+                ) {
                     lifecycleScope.launch(ExceptionHandler.coroutine()) {
                         userRepository.retrieveUser(false, true)
                     }
@@ -136,7 +143,10 @@ abstract class BaseActivity : AppCompatActivity() {
         return super.onOptionsItemSelected(item)
     }
 
-    internal open fun loadTheme(sharedPreferences: SharedPreferences, forced: Boolean = false) {
+    internal open fun loadTheme(
+        sharedPreferences: SharedPreferences,
+        forced: Boolean = false,
+    ) {
         val theme = forcedTheme ?: sharedPreferences.getString("theme_name", "purple")
         if (theme != currentTheme || forced) {
             if (forcedIsNight ?: isNightMode) {
@@ -150,7 +160,7 @@ abstract class BaseActivity : AppCompatActivity() {
                         "teal" -> R.style.MainAppTheme_Teal_Dark
                         "blue" -> R.style.MainAppTheme_Blue_Dark
                         else -> R.style.MainAppTheme_Dark
-                    }
+                    },
                 )
             } else {
                 setTheme(
@@ -163,16 +173,17 @@ abstract class BaseActivity : AppCompatActivity() {
                         "teal" -> R.style.MainAppTheme_Teal
                         "blue" -> R.style.MainAppTheme_Blue
                         else -> R.style.MainAppTheme
-                    }
+                    },
                 )
             }
         }
 
-        window.navigationBarColor = if (forcedIsNight ?: isNightMode) {
-            ContextCompat.getColor(this, R.color.system_bars)
-        } else {
-            getThemeColor(R.attr.colorPrimaryDark)
-        }
+        window.navigationBarColor =
+            if (forcedIsNight ?: isNightMode) {
+                ContextCompat.getColor(this, R.color.system_bars)
+            } else {
+                getThemeColor(R.attr.colorPrimaryDark)
+            }
         if (!(forcedIsNight ?: isNightMode)) {
             window.updateStatusBarColor(getThemeColor(R.attr.headerBackgroundColor), true)
         }
@@ -222,19 +233,38 @@ abstract class BaseActivity : AppCompatActivity() {
         }
     }
 
-    open fun showConnectionProblem(errorCount: Int, title: String?, message: String, isFromUserInput: Boolean) {
+    open fun showConnectionProblem(
+        errorCount: Int,
+        title: String?,
+        message: String,
+        isFromUserInput: Boolean,
+    ) {
         val alert = HabiticaAlertDialog(this)
         alert.setTitle(title)
         alert.setMessage(message)
-        alert.addButton(android.R.string.ok, isPrimary = true, isDestructive = false, function = null)
+        alert.addButton(
+            android.R.string.ok,
+            isPrimary = true,
+            isDestructive = false,
+            function = null,
+        )
         alert.enqueue()
     }
 
     open fun hideConnectionProblem() {
     }
 
-    fun shareContent(identifier: String, message: String?, image: Bitmap? = null) {
-        Analytics.sendEvent("shared", EventCategory.BEHAVIOUR, HitType.EVENT, mapOf("identifier" to identifier))
+    fun shareContent(
+        identifier: String,
+        message: String?,
+        image: Bitmap? = null,
+    ) {
+        Analytics.sendEvent(
+            "shared",
+            EventCategory.BEHAVIOUR,
+            HitType.EVENT,
+            mapOf("identifier" to identifier),
+        )
         val sharingIntent = Intent(Intent.ACTION_SEND)
         sharingIntent.type = "image/*"
         if (message?.isNotBlank() == true) {
@@ -251,7 +281,7 @@ abstract class BaseActivity : AppCompatActivity() {
                     contentValues.put(MediaStore.MediaColumns.MIME_TYPE, "image/png")
                     contentValues.put(
                         MediaStore.MediaColumns.RELATIVE_PATH,
-                        Environment.DIRECTORY_PICTURES
+                        Environment.DIRECTORY_PICTURES,
                     )
                     uri =
                         resolver.insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, contentValues)
@@ -271,7 +301,6 @@ abstract class BaseActivity : AppCompatActivity() {
             }
             startActivity(Intent.createChooser(sharingIntent, getString(R.string.share_using)))
         } catch (_: FileNotFoundException) {
-
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BirthdayActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BirthdayActivity.kt
index 3617be509..ca35f7ee1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BirthdayActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BirthdayActivity.kt
@@ -63,9 +63,7 @@ import com.habitrpg.android.habitica.helpers.Analytics
 import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.helpers.EventCategory
 import com.habitrpg.android.habitica.helpers.HitType
-import com.habitrpg.common.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.helpers.PurchaseHandler
-import com.habitrpg.common.habitica.theme.HabiticaTheme
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import com.habitrpg.android.habitica.ui.views.CurrencyText
 import com.habitrpg.android.habitica.ui.views.HabiticaButton
@@ -73,7 +71,9 @@ import com.habitrpg.android.habitica.ui.views.PixelArtView
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.android.habitica.ui.views.insufficientCurrency.InsufficientGemsDialog
 import com.habitrpg.common.habitica.extensions.DataBindingUtils
+import com.habitrpg.common.habitica.helpers.MainNavigationController
 import com.habitrpg.common.habitica.helpers.launchCatching
+import com.habitrpg.common.habitica.theme.HabiticaTheme
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.delay
@@ -132,7 +132,12 @@ class BirthdayActivity : BaseActivity() {
                         }) {
                             if ((userViewModel.user.value?.gemCount ?: 0) < 60) {
                                 val dialog = InsufficientGemsDialog(this@BirthdayActivity, 3)
-                                Analytics.sendEvent("show insufficient gems modal", EventCategory.BEHAVIOUR, HitType.EVENT, mapOf("reason" to "birthday"))
+                                Analytics.sendEvent(
+                                    "show insufficient gems modal",
+                                    EventCategory.BEHAVIOUR,
+                                    HitType.EVENT,
+                                    mapOf("reason" to "birthday"),
+                                )
                                 dialog.show()
                                 return@launchCatching
                             }
@@ -141,12 +146,12 @@ class BirthdayActivity : BaseActivity() {
                             dialog.setTitle(
                                 getString(
                                     R.string.purchase_gryphatrice_confirmation,
-                                    60
-                                )
+                                    60,
+                                ),
                             )
                             dialog.addButton(
                                 getString(R.string.buy_for_x, "60 Gems"),
-                                true
+                                true,
                             ) { _, _ ->
                                 lifecycleScope.launchCatching {
                                     purchaseWithGems()
@@ -157,7 +162,7 @@ class BirthdayActivity : BaseActivity() {
                             }
                             dialog.show()
                         }
-                    }
+                    },
                 ) {
                     lifecycleScope.launchCatching {
                         inventoryRepository.equip("pet", "Gryphatrice-Jubilant")
@@ -198,15 +203,17 @@ class BirthdayActivity : BaseActivity() {
 fun BirthdayTitle(text: String) {
     Row(
         verticalAlignment = Alignment.CenterVertically,
-        modifier = Modifier
-            .fillMaxWidth()
-            .padding(top = 20.dp, bottom = 8.dp)
+        modifier =
+            Modifier
+                .fillMaxWidth()
+                .padding(top = 20.dp, bottom = 8.dp),
     ) {
         Box(
-            modifier = Modifier
-                .height(1.dp)
-                .weight(1f)
-                .background(colorResource(id = R.color.brand_50))
+            modifier =
+                Modifier
+                    .height(1.dp)
+                    .weight(1f)
+                    .background(colorResource(id = R.color.brand_50)),
         )
         Image(painterResource(id = R.drawable.birthday_textdeco_left), null)
         Text(
@@ -214,14 +221,15 @@ fun BirthdayTitle(text: String) {
             fontSize = 16.sp,
             color = Color.White,
             fontWeight = FontWeight.Bold,
-            modifier = Modifier.padding(horizontal = 16.dp)
+            modifier = Modifier.padding(horizontal = 16.dp),
         )
         Image(painterResource(id = R.drawable.birthday_textdeco_right), null)
         Box(
-            modifier = Modifier
-                .height(1.dp)
-                .weight(1f)
-                .background(colorResource(id = R.color.brand_50))
+            modifier =
+                Modifier
+                    .height(1.dp)
+                    .weight(1f)
+                    .background(colorResource(id = R.color.brand_50)),
         )
     }
 }
@@ -237,7 +245,7 @@ fun BirthdayActivityView(
     endDate: Date,
     onPurchaseClick: () -> Unit,
     onGemPurchaseClick: () -> Unit,
-    onEquipClick: () -> Unit
+    onEquipClick: () -> Unit,
 ) {
     val activity = LocalContext.current as? Activity
     val dateFormat = SimpleDateFormat("MMM dd", java.util.Locale.getDefault())
@@ -256,20 +264,21 @@ fun BirthdayActivityView(
     }
 
     Scaffold(
-        scaffoldState = scaffoldState
+        scaffoldState = scaffoldState,
     ) { padding ->
         Column(
             horizontalAlignment = Alignment.CenterHorizontally,
-            modifier = Modifier
-                .background(
-                    Brush.verticalGradient(
-                        Pair(0.0f, colorResource(id = R.color.brand_300)),
-                        Pair(1.0f, colorResource(id = R.color.brand_200))
+            modifier =
+                Modifier
+                    .background(
+                        Brush.verticalGradient(
+                            Pair(0.0f, colorResource(id = R.color.brand_300)),
+                            Pair(1.0f, colorResource(id = R.color.brand_200)),
+                        ),
                     )
-                )
-                .fillMaxWidth()
-                .verticalScroll(rememberScrollState())
-                .padding(padding)
+                    .fillMaxWidth()
+                    .verticalScroll(rememberScrollState())
+                    .padding(padding),
         ) {
             Button(
                 onClick = {
@@ -281,55 +290,57 @@ fun BirthdayActivityView(
                 },
                 colors = ButtonDefaults.textButtonColors(contentColor = textColor),
                 elevation = ButtonDefaults.elevation(0.dp, 0.dp),
-                modifier = Modifier.align(Alignment.Start)
+                modifier = Modifier.align(Alignment.Start),
             ) {
                 Image(
                     painterResource(R.drawable.arrow_back),
                     stringResource(R.string.action_back),
-                    colorFilter = ColorFilter.tint(
-                        textColor
-                    )
+                    colorFilter =
+                        ColorFilter.tint(
+                            textColor,
+                        ),
                 )
             }
             Column(
                 horizontalAlignment = Alignment.CenterHorizontally,
-                modifier = Modifier
-                    .padding(horizontal = 20.dp)
-                    .fillMaxWidth()
+                modifier =
+                    Modifier
+                        .padding(horizontal = 20.dp)
+                        .fillMaxWidth(),
             ) {
                 Image(
                     painterResource(R.drawable.birthday_header),
                     null,
-                    Modifier.padding(bottom = 8.dp)
+                    Modifier.padding(bottom = 8.dp),
                 )
                 Row(verticalAlignment = Alignment.CenterVertically) {
                     Image(painterResource(R.drawable.birthday_gifts), null)
                     Column(
                         horizontalAlignment = Alignment.CenterHorizontally,
-                        modifier = Modifier.padding(horizontal = 22.dp)
+                        modifier = Modifier.padding(horizontal = 22.dp),
                     ) {
                         Text(
                             stringResource(id = R.string.limited_event).toUpperCase(Locale.current),
                             fontSize = 12.sp,
                             color = specialTextColor,
-                            fontWeight = FontWeight.Bold
+                            fontWeight = FontWeight.Bold,
                         )
                         Text(
                             stringResource(
                                 R.string.x_to_y,
                                 dateFormat.format(startDate),
-                                dateFormat.format(endDate)
+                                dateFormat.format(endDate),
                             ),
                             fontSize = 12.sp,
                             color = textColor,
-                            fontWeight = FontWeight.Bold
+                            fontWeight = FontWeight.Bold,
                         )
                     }
                     // right image should be flipped
                     Image(
                         painterResource(id = R.drawable.birthday_gifts),
                         null,
-                        modifier = Modifier.scale(-1f, 1f)
+                        modifier = Modifier.scale(-1f, 1f),
                     )
                 }
                 Text(
@@ -338,26 +349,27 @@ fun BirthdayActivityView(
                     color = specialTextColor,
                     fontWeight = FontWeight.SemiBold,
                     textAlign = TextAlign.Center,
-                    modifier = Modifier.padding(top = 22.dp)
+                    modifier = Modifier.padding(top = 22.dp),
                 )
                 BirthdayTitle(stringResource(id = R.string.animated_gryphatrice_pet))
                 Box(
                     contentAlignment = Alignment.Center,
-                    modifier = Modifier
-                        .padding(vertical = 20.dp)
-                        .size(161.dp, 129.dp)
-                        .background(colorResource(R.color.brand_50), RoundedCornerShape(8.dp))
+                    modifier =
+                        Modifier
+                            .padding(vertical = 20.dp)
+                            .size(161.dp, 129.dp)
+                            .background(colorResource(R.color.brand_50), RoundedCornerShape(8.dp)),
                 ) {
                     PixelArtView(
                         imageName = "stable_Pet-Gryphatrice-Jubilant",
-                        Modifier.size(104.dp)
+                        Modifier.size(104.dp),
                     )
                 }
                 Text(
                     stringResource(R.string.limited_edition).toUpperCase(Locale.current),
                     fontSize = 12.sp,
                     color = specialTextColor,
-                    fontWeight = FontWeight.Bold
+                    fontWeight = FontWeight.Bold,
                 )
                 Text(
                     stringResource(R.string.gryphatrice_description),
@@ -365,14 +377,14 @@ fun BirthdayActivityView(
                     color = textColor,
                     textAlign = TextAlign.Center,
                     lineHeight = 20.sp,
-                    modifier = Modifier.padding(bottom = 16.dp)
+                    modifier = Modifier.padding(bottom = 16.dp),
                 )
                 if (hasGryphatrice) {
                     Text(
                         stringResource(R.string.thanks_for_support),
                         fontSize = 12.sp,
                         color = textColor,
-                        fontWeight = FontWeight.SemiBold
+                        fontWeight = FontWeight.SemiBold,
                     )
                     HabiticaButton(
                         Color.White,
@@ -380,11 +392,11 @@ fun BirthdayActivityView(
                         {
                             onEquipClick()
                         },
-                        modifier = Modifier.padding(top = 20.dp)
+                        modifier = Modifier.padding(top = 20.dp),
                     ) {
                         Text(
                             stringResource(if (hasEquipped) R.string.unequip else R.string.equip),
-                            fontSize = 18.sp
+                            fontSize = 18.sp,
                         )
                     }
                 } else if (isPurchasing) {
@@ -401,7 +413,7 @@ fun BirthdayActivityView(
                                 append("60 Gems")
                             }
                         },
-                        color = Color.White
+                        color = Color.White,
                     )
                     HabiticaButton(
                         Color.White,
@@ -409,7 +421,7 @@ fun BirthdayActivityView(
                         {
                             onPurchaseClick()
                         },
-                        modifier = Modifier.padding(top = 20.dp)
+                        modifier = Modifier.padding(top = 20.dp),
                     ) {
                         Text(stringResource(R.string.buy_for_x, price), fontSize = 18.sp)
                     }
@@ -419,11 +431,11 @@ fun BirthdayActivityView(
                         {
                             onGemPurchaseClick()
                         },
-                        modifier = Modifier.padding(top = 20.dp)
+                        modifier = Modifier.padding(top = 20.dp),
                     ) {
                         Row(
                             verticalAlignment = Alignment.CenterVertically,
-                            horizontalArrangement = Arrangement.spacedBy(4.dp)
+                            horizontalArrangement = Arrangement.spacedBy(4.dp),
                         ) {
                             Text(stringResource(R.string.buy_for), fontSize = 18.sp)
                             CurrencyText(currency = "gems", value = 60, fontSize = 18.sp)
@@ -436,7 +448,7 @@ fun BirthdayActivityView(
                     fontSize = 16.sp,
                     color = textColor,
                     textAlign = TextAlign.Center,
-                    lineHeight = 20.sp
+                    lineHeight = 20.sp,
                 )
                 PotionGrid()
                 HabiticaButton(
@@ -449,7 +461,7 @@ fun BirthdayActivityView(
                             MainNavigationController.navigate(R.id.marketFragment)
                         }
                     },
-                    modifier = Modifier.padding(top = 20.dp)
+                    modifier = Modifier.padding(top = 20.dp),
                 ) {
                     Text(stringResource(R.string.visit_the_market), fontSize = 18.sp)
                 }
@@ -459,73 +471,74 @@ fun BirthdayActivityView(
                     fontSize = 16.sp,
                     color = textColor,
                     textAlign = TextAlign.Center,
-                    lineHeight = 20.sp
+                    lineHeight = 20.sp,
                 )
                 Column(
                     verticalArrangement = Arrangement.spacedBy(14.dp),
-                    modifier = Modifier.padding(vertical = 20.dp)
+                    modifier = Modifier.padding(vertical = 20.dp),
                 ) {
                     Row(
                         horizontalArrangement = Arrangement.spacedBy(14.dp),
-                        modifier = Modifier.fillMaxWidth()
+                        modifier = Modifier.fillMaxWidth(),
                     ) {
                         FourFreeItem(
                             day = 1,
                             title = stringResource(R.string.a_party_robe),
                             imageName = "birthday10_robes",
-                            modifier = Modifier.weight(1f)
+                            modifier = Modifier.weight(1f),
                         )
                         FourFreeItem(
                             day = 1,
                             title = stringResource(R.string.twenty_gems),
                             image = painterResource(R.drawable.birthday_gems),
-                            modifier = Modifier.weight(1f)
+                            modifier = Modifier.weight(1f),
                         )
                     }
                     Row(
                         horizontalArrangement = Arrangement.spacedBy(14.dp),
-                        modifier = Modifier.fillMaxWidth()
+                        modifier = Modifier.fillMaxWidth(),
                     ) {
                         FourFreeItem(
                             day = 5,
                             title = stringResource(R.string.birthday_set),
                             imageName = "birthday10_hero",
-                            modifier = Modifier.weight(1f)
+                            modifier = Modifier.weight(1f),
                         )
                         FourFreeItem(
                             day = 10,
                             title = stringResource(R.string.background),
                             imageName = "birthday10_background",
-                            modifier = Modifier.weight(1f)
+                            modifier = Modifier.weight(1f),
                         )
                     }
                 }
             }
             Column(
                 horizontalAlignment = Alignment.CenterHorizontally,
-                modifier = Modifier
-                    .padding(top = 20.dp)
-                    .background(colorResource(R.color.brand_50))
-                    .padding(horizontal = 20.dp)
-                    .padding(top = 20.dp, bottom = 60.dp)
+                modifier =
+                    Modifier
+                        .padding(top = 20.dp)
+                        .background(colorResource(R.color.brand_50))
+                        .padding(horizontal = 20.dp)
+                        .padding(top = 20.dp, bottom = 60.dp),
             ) {
                 Text(
                     stringResource(R.string.limitations),
                     fontSize = 16.sp,
                     color = colorResource(R.color.brand_600),
                     fontWeight = FontWeight.Bold,
-                    textAlign = TextAlign.Center
+                    textAlign = TextAlign.Center,
                 )
                 Text(
                     stringResource(
                         R.string.birthday_limitations,
                         complexDateFormat.format(startDate),
-                        complexDateFormat.format(endDate)
+                        complexDateFormat.format(endDate),
                     ),
                     fontSize = 14.sp,
                     color = colorResource(R.color.brand_600),
                     lineHeight = 20.sp,
-                    textAlign = TextAlign.Center
+                    textAlign = TextAlign.Center,
                 )
             }
         }
@@ -534,22 +547,23 @@ fun BirthdayActivityView(
 
 @Composable
 fun PotionGrid() {
-    val potions = listOf(
-        "Porcelain",
-        "Vampire",
-        "Aquatic",
-        "StainedGlass",
-        "Celestial",
-        "Glow",
-        "AutumnLeaf",
-        "SandSculpture",
-        "Peppermint",
-        "Shimmer"
-    ).windowed(4, 4, true)
+    val potions =
+        listOf(
+            "Porcelain",
+            "Vampire",
+            "Aquatic",
+            "StainedGlass",
+            "Celestial",
+            "Glow",
+            "AutumnLeaf",
+            "SandSculpture",
+            "Peppermint",
+            "Shimmer",
+        ).windowed(4, 4, true)
     Column(
         verticalArrangement = Arrangement.spacedBy(8.dp),
         horizontalAlignment = Alignment.CenterHorizontally,
-        modifier = Modifier.padding(top = 20.dp)
+        modifier = Modifier.padding(top = 20.dp),
     ) {
         for (potionGroup in potions) {
             Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
@@ -557,14 +571,16 @@ fun PotionGrid() {
                     Box(
                         Modifier
                             .size(68.dp)
-                            .background(colorResource(R.color.brand_50), RoundedCornerShape(8.dp))
+                            .background(colorResource(R.color.brand_50), RoundedCornerShape(8.dp)),
                     ) {
                         AsyncImage(
-                            model = DataBindingUtils.BASE_IMAGE_URL + DataBindingUtils.getFullFilename(
-                                "Pet_HatchingPotion_$potion"
-                            ),
+                            model =
+                                DataBindingUtils.BASE_IMAGE_URL +
+                                    DataBindingUtils.getFullFilename(
+                                        "Pet_HatchingPotion_$potion",
+                                    ),
                             null,
-                            Modifier.size(68.dp)
+                            Modifier.size(68.dp),
                         )
                     }
                 }
@@ -579,26 +595,28 @@ fun FourFreeItem(
     title: String,
     modifier: Modifier = Modifier,
     imageName: String? = null,
-    image: Painter? = null
+    image: Painter? = null,
 ) {
     Column(
         horizontalAlignment = Alignment.CenterHorizontally,
         verticalArrangement = Arrangement.spacedBy(18.dp),
-        modifier = modifier
-            .background(colorResource(R.color.brand_50), HabiticaTheme.shapes.medium)
-            .padding(16.dp)
+        modifier =
+            modifier
+                .background(colorResource(R.color.brand_50), HabiticaTheme.shapes.medium)
+                .padding(16.dp),
     ) {
         Text(
             stringResource(R.string.day_x, day).uppercase(),
             color = colorResource(R.color.yellow_50),
             fontSize = 12.sp,
-            fontWeight = FontWeight.Bold
+            fontWeight = FontWeight.Bold,
         )
         Box(
             contentAlignment = Alignment.Center,
-            modifier = Modifier
-                .size(121.dp, 84.dp)
-                .background(colorResource(R.color.brand_100), HabiticaTheme.shapes.medium)
+            modifier =
+                Modifier
+                    .size(121.dp, 84.dp)
+                    .background(colorResource(R.color.brand_100), HabiticaTheme.shapes.medium),
         ) {
             if (image != null) {
                 Image(image, null)
@@ -606,7 +624,7 @@ fun FourFreeItem(
                 PixelArtView(
                     imageName,
                     Modifier
-                        .size(84.dp)
+                        .size(84.dp),
                 )
             }
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt
index f4aa32721..9a2611f65 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt
@@ -49,7 +49,6 @@ import javax.inject.Inject
 
 @AndroidEntryPoint
 class ChallengeFormActivity : BaseActivity() {
-
     private lateinit var binding: ActivityCreateChallengeBinding
 
     @Inject
@@ -138,11 +137,12 @@ class ChallengeFormActivity : BaseActivity() {
                 savingInProgress = false
                 ExceptionHandler.reportError(it)
             }) {
-                val challenge = if (editMode) {
-                    updateChallenge()
-                } else {
-                    createChallenge()
-                }
+                val challenge =
+                    if (editMode) {
+                        updateChallenge()
+                    } else {
+                        createChallenge()
+                    }
 
                 challengeId = challenge?.id
                 challengeRepository.retrieveChallenges(0, true)
@@ -155,8 +155,8 @@ class ChallengeFormActivity : BaseActivity() {
                         delay(500L)
                         MainNavigationController.navigate(
                             ChallengesOverviewFragmentDirections.openChallengeDetail(
-                                challengeId ?: ""
-                            )
+                                challengeId ?: "",
+                            ),
                         )
                     }
                 }
@@ -232,7 +232,7 @@ class ChallengeFormActivity : BaseActivity() {
             this,
             "",
             openTaskDisabled = false,
-            taskActionsDisabled = true
+            taskActionsDisabled = true,
         ).also { challengeTasks = it }
 
         challengeTasks.onTaskOpen = {
@@ -302,11 +302,12 @@ class ChallengeFormActivity : BaseActivity() {
             inputValue = "0"
         }
 
-        val currentVal = try {
-            Integer.parseInt(inputValue)
-        } catch (_: NumberFormatException) {
-            0
-        }
+        val currentVal =
+            try {
+                Integer.parseInt(inputValue)
+            } catch (_: NumberFormatException) {
+                0
+            }
 
         // 0 is Tavern
         val selectedLocation = binding.challengeLocationSpinner.selectedItemPosition
@@ -345,14 +346,16 @@ class ChallengeFormActivity : BaseActivity() {
 
         locationAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
         lifecycleScope.launch(ExceptionHandler.coroutine()) {
-            val groups = socialRepository.getUserGroups("guild").firstOrNull()?.toMutableList()
-                ?: return@launch
+            val groups =
+                socialRepository.getUserGroups("guild").firstOrNull()?.toMutableList()
+                    ?: return@launch
             val partyID = userRepository.getUser().firstOrNull()?.party?.id
-            val party = if (partyID?.isNotBlank() == true) {
-                socialRepository.retrieveGroup(partyID)
-            } else {
-                null
-            }
+            val party =
+                if (partyID?.isNotBlank() == true) {
+                    socialRepository.retrieveGroup(partyID)
+                } else {
+                    null
+                }
             if (groups.firstOrNull { it.id == "00000000-0000-4000-A000-000000000000" } == null) {
                 val tavern = Group()
                 tavern.id = "00000000-0000-4000-A000-000000000000"
@@ -373,12 +376,12 @@ class ChallengeFormActivity : BaseActivity() {
                     adapterView: AdapterView<*>,
                     view: View?,
                     i: Int,
-                    l: Long
+                    l: Long,
                 ) {
                     checkPrizeAndMinimumForTavern()
                 }
 
-                override fun onNothingSelected(adapterView: AdapterView<*>) { /* no-on */
+                override fun onNothingSelected(adapterView: AdapterView<*>) { // no-on
                 }
             }
         binding.createChallengePrize.setOnKeyListener { _, _, _ ->
@@ -402,16 +405,18 @@ class ChallengeFormActivity : BaseActivity() {
             }
         }
 
-        binding.createChallengeTaskList.addOnItemTouchListener(object :
+        binding.createChallengeTaskList.addOnItemTouchListener(
+            object :
                 androidx.recyclerview.widget.RecyclerView.SimpleOnItemTouchListener() {
                 override fun onInterceptTouchEvent(
                     rv: androidx.recyclerview.widget.RecyclerView,
-                    e: MotionEvent
+                    e: MotionEvent,
                 ): Boolean {
                     // Stop only scrolling.
                     return rv.scrollState == androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_DRAGGING
                 }
-            })
+            },
+        )
         binding.createChallengeTaskList.adapter = challengeTasks
         binding.createChallengeTaskList.layoutManager =
             androidx.recyclerview.widget.LinearLayoutManager(this)
@@ -450,7 +455,10 @@ class ChallengeFormActivity : BaseActivity() {
         }
     }
 
-    private fun openNewTaskActivity(type: TaskType?, task: Task?) {
+    private fun openNewTaskActivity(
+        type: TaskType?,
+        task: Task?,
+    ) {
         val bundle = Bundle()
 
         bundle.putString(TaskFormActivity.TASK_TYPE_KEY, type?.value ?: "")
@@ -505,18 +513,22 @@ class ChallengeFormActivity : BaseActivity() {
             taskList,
             ArrayList(addedTasks.values),
             ArrayList(updatedTasks.values),
-            ArrayList(removedTasks.keys)
+            ArrayList(removedTasks.keys),
         )
     }
 
-    private fun addOrUpdateTaskInList(task: Task, isExistingTask: Boolean = false) {
+    private fun addOrUpdateTaskInList(
+        task: Task,
+        isExistingTask: Boolean = false,
+    ) {
         if (!challengeTasks.replaceTask(task)) {
-            val taskAbove = when (task.type) {
-                TaskType.HABIT -> addHabit
-                TaskType.DAILY -> addDaily
-                TaskType.TODO -> addTodo
-                else -> addReward
-            }
+            val taskAbove =
+                when (task.type) {
+                    TaskType.HABIT -> addHabit
+                    TaskType.DAILY -> addDaily
+                    TaskType.TODO -> addTodo
+                    else -> addReward
+                }
             if (!isExistingTask) {
                 // If the task is new we create a unique id for it
                 // Doing it we solve the issue #1278
@@ -542,14 +554,21 @@ class ChallengeFormActivity : BaseActivity() {
 
     private class GroupArrayAdapter(context: Context) :
         ArrayAdapter<Group>(context, android.R.layout.simple_spinner_item) {
-
-        override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
+        override fun getView(
+            position: Int,
+            convertView: View?,
+            parent: ViewGroup,
+        ): View {
             val checkedTextView = super.getView(position, convertView, parent) as? TextView
             checkedTextView?.text = getItem(position)?.name
             return checkedTextView ?: View(context)
         }
 
-        override fun getDropDownView(position: Int, convertView: View?, parent: ViewGroup): View {
+        override fun getDropDownView(
+            position: Int,
+            convertView: View?,
+            parent: ViewGroup,
+        ): View {
             val checkedTextView =
                 super.getDropDownView(position, convertView, parent) as? AppCompatCheckedTextView
             checkedTextView?.text = getItem(position)?.name
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt
index 7b2834e75..a7a457cb6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt
@@ -1,311 +1,373 @@
-package com.habitrpg.android.habitica.ui.activities
-
-import android.graphics.drawable.BitmapDrawable
-import android.graphics.drawable.Drawable
-import android.os.Bundle
-import android.view.Menu
-import android.view.MenuItem
-import android.view.View
-import android.widget.TextView
-import androidx.core.content.ContextCompat
-import androidx.lifecycle.lifecycleScope
-import androidx.navigation.navArgs
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.databinding.ActivityClassSelectionBinding
-import com.habitrpg.common.habitica.extensions.observeOnce
-import com.habitrpg.android.habitica.helpers.ReviewManager
-import com.habitrpg.common.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.models.user.Gear
-import com.habitrpg.android.habitica.models.user.Items
-import com.habitrpg.android.habitica.models.user.Outfit
-import com.habitrpg.android.habitica.models.user.Preferences
-import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
-import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaProgressDialog
-import com.habitrpg.common.habitica.helpers.ExceptionHandler
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class ClassSelectionActivity : BaseActivity() {
-
-    @Inject
-    lateinit var userViewModel: MainUserViewModel
-
-    @Inject
-    lateinit var reviewManager: ReviewManager
-
-    private lateinit var binding: ActivityClassSelectionBinding
-    private var currentClass: String? = null
-    private var newClass: String = "healer"
-        set(value) {
-            field = value
-            when (value) {
-                "healer" -> healerSelected()
-                "wizard" -> mageSelected()
-                "mage" -> mageSelected()
-                "rogue" -> rogueSelected()
-                "warrior" -> warriorSelected()
-            }
-        }
-    private var className: String? = null
-        set(value) {
-            field = value
-            binding.selectedTitleTextView.text = getString(R.string.x_class, className)
-            binding.selectedButton.text = getString(R.string.become_x, className)
-        }
-    private var isClassSelected: Boolean = false
-    private var classWasUnset: Boolean? = false
-    private var shouldFinish: Boolean? = false
-
-    private var progressDialog: HabiticaProgressDialog? = null
-
-    override fun getLayoutResId(): Int {
-        return R.layout.activity_class_selection
-    }
-
-    override fun getContentView(layoutResId: Int?): View {
-        binding = ActivityClassSelectionBinding.inflate(layoutInflater)
-        return binding.root
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setSupportActionBar(binding.toolbar)
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
-        supportActionBar?.setDisplayShowHomeEnabled(true)
-
-        val args = navArgs<ClassSelectionActivityArgs>().value
-        isClassSelected = args.isClassSelected
-        currentClass = args.className
-        newClass = currentClass ?: "healer"
-
-        userViewModel.user.observe(this) {
-            it?.preferences?.let { preferences ->
-                val unmanagedPrefs = userRepository.getUnmanagedCopy(preferences)
-                unmanagedPrefs.costume = false
-                setAvatarViews(unmanagedPrefs)
-            }
-        }
-
-        binding.healerWrapper.setOnClickListener { newClass = "healer" }
-        binding.mageWrapper.setOnClickListener { newClass = "mage" }
-        binding.rogueWrapper.setOnClickListener { newClass = "rogue" }
-        binding.warriorWrapper.setOnClickListener { newClass = "warrior" }
-        binding.selectedButton.setOnClickListener { displayConfirmationDialogForClass() }
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        menuInflater.inflate(R.menu.class_selection, menu)
-        return true
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            R.id.opt_out -> optOutSelected()
-        }
-        return super.onOptionsItemSelected(item)
-    }
-
-    private fun setAvatarViews(preferences: Preferences) {
-        val healerOutfit = Outfit()
-        healerOutfit.armor = "armor_healer_5"
-        healerOutfit.head = "head_healer_5"
-        healerOutfit.shield = "shield_healer_5"
-        healerOutfit.weapon = "weapon_healer_6"
-        val healer = this.makeUser(preferences, healerOutfit)
-        binding.healerAvatarView.setAvatar(healer)
-        val healerIcon = BitmapDrawable(resources, HabiticaIconsHelper.imageOfHealerLightBg())
-        binding.healerButton.setCompoundDrawablesWithIntrinsicBounds(healerIcon, null, null, null)
-
-        val mageOutfit = Outfit()
-        mageOutfit.armor = "armor_wizard_5"
-        mageOutfit.head = "head_wizard_5"
-        mageOutfit.weapon = "weapon_wizard_6"
-        val mage = this.makeUser(preferences, mageOutfit)
-        binding.mageAvatarView.setAvatar(mage)
-        val mageIcon = BitmapDrawable(resources, HabiticaIconsHelper.imageOfMageLightBg())
-        binding.mageButton.setCompoundDrawablesWithIntrinsicBounds(mageIcon, null, null, null)
-
-        val rogueOutfit = Outfit()
-        rogueOutfit.armor = "armor_rogue_5"
-        rogueOutfit.head = "head_rogue_5"
-        rogueOutfit.shield = "shield_rogue_6"
-        rogueOutfit.weapon = "weapon_rogue_6"
-        val rogue = this.makeUser(preferences, rogueOutfit)
-        binding.rogueAvatarView.setAvatar(rogue)
-        val rogueIcon = BitmapDrawable(resources, HabiticaIconsHelper.imageOfRogueLightBg())
-        binding.rogueButton.setCompoundDrawablesWithIntrinsicBounds(rogueIcon, null, null, null)
-
-        val warriorOutfit = Outfit()
-        warriorOutfit.armor = "armor_warrior_5"
-        warriorOutfit.head = "head_warrior_5"
-        warriorOutfit.shield = "shield_warrior_5"
-        warriorOutfit.weapon = "weapon_warrior_6"
-        val warrior = this.makeUser(preferences, warriorOutfit)
-        binding.warriorAvatarView.setAvatar(warrior)
-        val warriorIcon = BitmapDrawable(resources, HabiticaIconsHelper.imageOfWarriorLightBg())
-        binding.warriorButton.setCompoundDrawablesWithIntrinsicBounds(warriorIcon, null, null, null)
-    }
-
-    private fun makeUser(preferences: Preferences, outfit: Outfit): User {
-        val user = User()
-        user.preferences = preferences
-        user.items = Items()
-        user.items?.gear = Gear()
-        user.items?.gear?.equipped = outfit
-        return user
-    }
-
-    private fun healerSelected() {
-        className = getString(R.string.healer)
-        binding.selectedDescriptionTextView.text = getString(R.string.healer_description)
-        binding.selectedWrapperView.setBackgroundColor(ContextCompat.getColor(this, R.color.yellow_100))
-        binding.selectedTitleTextView.setTextColor(ContextCompat.getColor(this, R.color.dark_brown))
-        binding.selectedDescriptionTextView.setTextColor(ContextCompat.getColor(this, R.color.dark_brown))
-        binding.selectedButton.setBackgroundResource(R.drawable.layout_rounded_bg_yellow_10)
-        updateButtonBackgrounds(binding.healerButton, ContextCompat.getDrawable(this, R.drawable.layout_rounded_bg_window_yellow_border))
-    }
-
-    private fun mageSelected() {
-        className = getString(R.string.mage)
-        binding.selectedDescriptionTextView.text = getString(R.string.mage_description)
-        binding.selectedWrapperView.setBackgroundColor(ContextCompat.getColor(this, R.color.blue_10))
-        binding.selectedTitleTextView.setTextColor(ContextCompat.getColor(this, R.color.white))
-        binding.selectedDescriptionTextView.setTextColor(ContextCompat.getColor(this, R.color.white))
-        binding.selectedButton.setBackgroundResource(R.drawable.layout_rounded_bg_gray_alpha)
-        updateButtonBackgrounds(binding.mageButton, ContextCompat.getDrawable(this, R.drawable.layout_rounded_bg_window_blue_border))
-    }
-
-    private fun rogueSelected() {
-        className = getString(R.string.rogue)
-        binding.selectedDescriptionTextView.text = getString(R.string.rogue_description)
-        binding.selectedWrapperView.setBackgroundColor(ContextCompat.getColor(this, R.color.brand_200))
-        binding.selectedTitleTextView.setTextColor(ContextCompat.getColor(this, R.color.white))
-        binding.selectedDescriptionTextView.setTextColor(ContextCompat.getColor(this, R.color.white))
-        binding.selectedButton.setBackgroundResource(R.drawable.layout_rounded_bg_gray_alpha)
-        updateButtonBackgrounds(binding.rogueButton, ContextCompat.getDrawable(this, R.drawable.layout_rounded_bg_window_brand_border))
-    }
-
-    private fun warriorSelected() {
-        className = getString(R.string.warrior)
-        binding.selectedDescriptionTextView.text = getString(R.string.warrior_description)
-        binding.selectedWrapperView.setBackgroundColor(ContextCompat.getColor(this, R.color.maroon_50))
-        binding.selectedTitleTextView.setTextColor(ContextCompat.getColor(this, R.color.white))
-        binding.selectedDescriptionTextView.setTextColor(ContextCompat.getColor(this, R.color.white))
-        binding.selectedButton.setBackgroundResource(R.drawable.layout_rounded_bg_gray_alpha)
-        updateButtonBackgrounds(binding.warriorButton, ContextCompat.getDrawable(this, R.drawable.layout_rounded_bg_window_red_border))
-    }
-
-    private fun updateButtonBackgrounds(selectedButton: TextView, background: Drawable?) {
-        val deselectedBackground = ContextCompat.getDrawable(this, R.drawable.layout_rounded_bg_window)
-        binding.healerButton.background = if (binding.healerButton == selectedButton) background else deselectedBackground
-        binding.mageButton.background = if (binding.mageButton == selectedButton) background else deselectedBackground
-        binding.rogueButton.background = if (binding.rogueButton == selectedButton) background else deselectedBackground
-        binding.warriorButton.background = if (binding.warriorButton == selectedButton) background else deselectedBackground
-    }
-
-    private fun optOutSelected() {
-        val alert = HabiticaAlertDialog(this)
-        alert.setTitle(getString(R.string.opt_out_confirmation))
-        alert.setMessage(getString(R.string.opt_out_description))
-        alert.addButton(R.string.opt_out_class, true, true) { _, _ ->
-            lifecycleScope.launch(ExceptionHandler.coroutine()) {
-                // Set Player to have no class, and opt out
-                classWasUnset
-                optOutOfClasses()
-            }
-        }
-        alert.addButton(R.string.close, false)
-        alert.show()
-    }
-
-    private fun displayConfirmationDialogForClass() {
-        if (isClassSelected) {
-            val alert = HabiticaAlertDialog(this)
-            alert.setTitle(getString(R.string.change_class_selected_confirmation, className))
-            alert.setMessage(getString(R.string.change_class_confirmation_message))
-            alert.addButton(R.string.choose_class, true) { _, _ ->
-                selectClass(newClass)
-            }
-            alert.addButton(R.string.dialog_go_back, false)
-            alert.show()
-        } else {
-            val alert = HabiticaAlertDialog(this)
-            alert.setTitle(getString(R.string.class_confirmation, className))
-            alert.addButton(R.string.choose_class, true) { _, _ -> selectClass(newClass) }
-            alert.addButton(R.string.dialog_go_back, false)
-            alert.show()
-        }
-    }
-
-    private fun displayClassChanged(selectedClass: String) {
-        val alert = HabiticaAlertDialog(this)
-        alert.setTitle(getString(R.string.class_changed, className))
-        alert.setMessage(getString(R.string.class_changed_description, className))
-        alert.addButton(getString(R.string.complete_tutorial), true) { _, _ -> dismiss() }
-        alert.addButton(getString(R.string.learn_more), false) { _, _ ->
-            dismiss()
-            MainNavigationController.navigate(R.id.FAQOverviewFragment)
-        }
-        alert.setOnCancelListener {
-            dismiss()
-        }
-        alert.enqueue()
-    }
-
-    private fun optOutOfClasses() {
-        shouldFinish = true
-        this.displayProgressDialog(getString(R.string.opting_out_progress))
-        lifecycleScope.launch(ExceptionHandler.coroutine()) {
-            userRepository.disableClasses()
-            dismiss()
-        }
-    }
-
-    private fun selectClass(selectedClass: String) {
-        shouldFinish = true
-        val chosenClass = if (selectedClass == "mage") "wizard" else selectedClass
-        if (isClassSelected) {
-            val dialog = this.displayProgressDialog(getString(R.string.changing_class_progress))
-            lifecycleScope.launch(Dispatchers.Main) {
-                userRepository.changeClass(chosenClass)
-                dialog.hide()
-                displayClassChanged(chosenClass)
-            }
-        } else {
-            val dialog = this.displayProgressDialog(getString(R.string.choosing_class_progress))
-            lifecycleScope.launch(Dispatchers.Main) {
-                userRepository.changeClass(chosenClass)
-                dialog.hide()
-                displayClassChanged(chosenClass)
-            }
-        }
-
-        // After class change was successful, check for in-app review eligibility the following check-in
-        checkForReviewPromptAfterClassSelection()
-    }
-
-    private fun displayProgressDialog(progressText: String): HabiticaProgressDialog {
-        return HabiticaProgressDialog.show(this, progressText, 300)
-    }
-
-    private fun dismiss() {
-        if (shouldFinish == true) {
-            progressDialog?.dismiss()
-            finish()
-        }
-    }
-
-    private fun checkForReviewPromptAfterClassSelection() {
-        userViewModel.user.observeOnce(this) { user ->
-            user?.loginIncentives?.let { totalCheckins ->
-                reviewManager.requestReview(this, totalCheckins)
-            }
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.activities
+
+import android.graphics.drawable.BitmapDrawable
+import android.graphics.drawable.Drawable
+import android.os.Bundle
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import android.widget.TextView
+import androidx.core.content.ContextCompat
+import androidx.lifecycle.lifecycleScope
+import androidx.navigation.navArgs
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.ActivityClassSelectionBinding
+import com.habitrpg.android.habitica.helpers.ReviewManager
+import com.habitrpg.android.habitica.models.user.Gear
+import com.habitrpg.android.habitica.models.user.Items
+import com.habitrpg.android.habitica.models.user.Outfit
+import com.habitrpg.android.habitica.models.user.Preferences
+import com.habitrpg.android.habitica.models.user.User
+import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
+import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaProgressDialog
+import com.habitrpg.common.habitica.extensions.observeOnce
+import com.habitrpg.common.habitica.helpers.ExceptionHandler
+import com.habitrpg.common.habitica.helpers.MainNavigationController
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class ClassSelectionActivity : BaseActivity() {
+    @Inject
+    lateinit var userViewModel: MainUserViewModel
+
+    @Inject
+    lateinit var reviewManager: ReviewManager
+
+    private lateinit var binding: ActivityClassSelectionBinding
+    private var currentClass: String? = null
+    private var newClass: String = "healer"
+        set(value) {
+            field = value
+            when (value) {
+                "healer" -> healerSelected()
+                "wizard" -> mageSelected()
+                "mage" -> mageSelected()
+                "rogue" -> rogueSelected()
+                "warrior" -> warriorSelected()
+            }
+        }
+    private var className: String? = null
+        set(value) {
+            field = value
+            binding.selectedTitleTextView.text = getString(R.string.x_class, className)
+            binding.selectedButton.text = getString(R.string.become_x, className)
+        }
+    private var isClassSelected: Boolean = false
+    private var classWasUnset: Boolean? = false
+    private var shouldFinish: Boolean? = false
+
+    private var progressDialog: HabiticaProgressDialog? = null
+
+    override fun getLayoutResId(): Int {
+        return R.layout.activity_class_selection
+    }
+
+    override fun getContentView(layoutResId: Int?): View {
+        binding = ActivityClassSelectionBinding.inflate(layoutInflater)
+        return binding.root
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setSupportActionBar(binding.toolbar)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        supportActionBar?.setDisplayShowHomeEnabled(true)
+
+        val args = navArgs<ClassSelectionActivityArgs>().value
+        isClassSelected = args.isClassSelected
+        currentClass = args.className
+        newClass = currentClass ?: "healer"
+
+        userViewModel.user.observe(this) {
+            it?.preferences?.let { preferences ->
+                val unmanagedPrefs = userRepository.getUnmanagedCopy(preferences)
+                unmanagedPrefs.costume = false
+                setAvatarViews(unmanagedPrefs)
+            }
+        }
+
+        binding.healerWrapper.setOnClickListener { newClass = "healer" }
+        binding.mageWrapper.setOnClickListener { newClass = "mage" }
+        binding.rogueWrapper.setOnClickListener { newClass = "rogue" }
+        binding.warriorWrapper.setOnClickListener { newClass = "warrior" }
+        binding.selectedButton.setOnClickListener { displayConfirmationDialogForClass() }
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        menuInflater.inflate(R.menu.class_selection, menu)
+        return true
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+            R.id.opt_out -> optOutSelected()
+        }
+        return super.onOptionsItemSelected(item)
+    }
+
+    private fun setAvatarViews(preferences: Preferences) {
+        val healerOutfit = Outfit()
+        healerOutfit.armor = "armor_healer_5"
+        healerOutfit.head = "head_healer_5"
+        healerOutfit.shield = "shield_healer_5"
+        healerOutfit.weapon = "weapon_healer_6"
+        val healer = this.makeUser(preferences, healerOutfit)
+        binding.healerAvatarView.setAvatar(healer)
+        val healerIcon = BitmapDrawable(resources, HabiticaIconsHelper.imageOfHealerLightBg())
+        binding.healerButton.setCompoundDrawablesWithIntrinsicBounds(healerIcon, null, null, null)
+
+        val mageOutfit = Outfit()
+        mageOutfit.armor = "armor_wizard_5"
+        mageOutfit.head = "head_wizard_5"
+        mageOutfit.weapon = "weapon_wizard_6"
+        val mage = this.makeUser(preferences, mageOutfit)
+        binding.mageAvatarView.setAvatar(mage)
+        val mageIcon = BitmapDrawable(resources, HabiticaIconsHelper.imageOfMageLightBg())
+        binding.mageButton.setCompoundDrawablesWithIntrinsicBounds(mageIcon, null, null, null)
+
+        val rogueOutfit = Outfit()
+        rogueOutfit.armor = "armor_rogue_5"
+        rogueOutfit.head = "head_rogue_5"
+        rogueOutfit.shield = "shield_rogue_6"
+        rogueOutfit.weapon = "weapon_rogue_6"
+        val rogue = this.makeUser(preferences, rogueOutfit)
+        binding.rogueAvatarView.setAvatar(rogue)
+        val rogueIcon = BitmapDrawable(resources, HabiticaIconsHelper.imageOfRogueLightBg())
+        binding.rogueButton.setCompoundDrawablesWithIntrinsicBounds(rogueIcon, null, null, null)
+
+        val warriorOutfit = Outfit()
+        warriorOutfit.armor = "armor_warrior_5"
+        warriorOutfit.head = "head_warrior_5"
+        warriorOutfit.shield = "shield_warrior_5"
+        warriorOutfit.weapon = "weapon_warrior_6"
+        val warrior = this.makeUser(preferences, warriorOutfit)
+        binding.warriorAvatarView.setAvatar(warrior)
+        val warriorIcon = BitmapDrawable(resources, HabiticaIconsHelper.imageOfWarriorLightBg())
+        binding.warriorButton.setCompoundDrawablesWithIntrinsicBounds(warriorIcon, null, null, null)
+    }
+
+    private fun makeUser(
+        preferences: Preferences,
+        outfit: Outfit,
+    ): User {
+        val user = User()
+        user.preferences = preferences
+        user.items = Items()
+        user.items?.gear = Gear()
+        user.items?.gear?.equipped = outfit
+        return user
+    }
+
+    private fun healerSelected() {
+        className = getString(R.string.healer)
+        binding.selectedDescriptionTextView.text = getString(R.string.healer_description)
+        binding.selectedWrapperView.setBackgroundColor(
+            ContextCompat.getColor(
+                this,
+                R.color.yellow_100,
+            ),
+        )
+        binding.selectedTitleTextView.setTextColor(ContextCompat.getColor(this, R.color.dark_brown))
+        binding.selectedDescriptionTextView.setTextColor(
+            ContextCompat.getColor(
+                this,
+                R.color.dark_brown,
+            ),
+        )
+        binding.selectedButton.setBackgroundResource(R.drawable.layout_rounded_bg_yellow_10)
+        updateButtonBackgrounds(
+            binding.healerButton,
+            ContextCompat.getDrawable(this, R.drawable.layout_rounded_bg_window_yellow_border),
+        )
+    }
+
+    private fun mageSelected() {
+        className = getString(R.string.mage)
+        binding.selectedDescriptionTextView.text = getString(R.string.mage_description)
+        binding.selectedWrapperView.setBackgroundColor(
+            ContextCompat.getColor(
+                this,
+                R.color.blue_10,
+            ),
+        )
+        binding.selectedTitleTextView.setTextColor(ContextCompat.getColor(this, R.color.white))
+        binding.selectedDescriptionTextView.setTextColor(
+            ContextCompat.getColor(
+                this,
+                R.color.white,
+            ),
+        )
+        binding.selectedButton.setBackgroundResource(R.drawable.layout_rounded_bg_gray_alpha)
+        updateButtonBackgrounds(
+            binding.mageButton,
+            ContextCompat.getDrawable(this, R.drawable.layout_rounded_bg_window_blue_border),
+        )
+    }
+
+    private fun rogueSelected() {
+        className = getString(R.string.rogue)
+        binding.selectedDescriptionTextView.text = getString(R.string.rogue_description)
+        binding.selectedWrapperView.setBackgroundColor(
+            ContextCompat.getColor(
+                this,
+                R.color.brand_200,
+            ),
+        )
+        binding.selectedTitleTextView.setTextColor(ContextCompat.getColor(this, R.color.white))
+        binding.selectedDescriptionTextView.setTextColor(
+            ContextCompat.getColor(
+                this,
+                R.color.white,
+            ),
+        )
+        binding.selectedButton.setBackgroundResource(R.drawable.layout_rounded_bg_gray_alpha)
+        updateButtonBackgrounds(
+            binding.rogueButton,
+            ContextCompat.getDrawable(this, R.drawable.layout_rounded_bg_window_brand_border),
+        )
+    }
+
+    private fun warriorSelected() {
+        className = getString(R.string.warrior)
+        binding.selectedDescriptionTextView.text = getString(R.string.warrior_description)
+        binding.selectedWrapperView.setBackgroundColor(
+            ContextCompat.getColor(
+                this,
+                R.color.maroon_50,
+            ),
+        )
+        binding.selectedTitleTextView.setTextColor(ContextCompat.getColor(this, R.color.white))
+        binding.selectedDescriptionTextView.setTextColor(
+            ContextCompat.getColor(
+                this,
+                R.color.white,
+            ),
+        )
+        binding.selectedButton.setBackgroundResource(R.drawable.layout_rounded_bg_gray_alpha)
+        updateButtonBackgrounds(
+            binding.warriorButton,
+            ContextCompat.getDrawable(this, R.drawable.layout_rounded_bg_window_red_border),
+        )
+    }
+
+    private fun updateButtonBackgrounds(
+        selectedButton: TextView,
+        background: Drawable?,
+    ) {
+        val deselectedBackground =
+            ContextCompat.getDrawable(this, R.drawable.layout_rounded_bg_window)
+        binding.healerButton.background =
+            if (binding.healerButton == selectedButton) background else deselectedBackground
+        binding.mageButton.background =
+            if (binding.mageButton == selectedButton) background else deselectedBackground
+        binding.rogueButton.background =
+            if (binding.rogueButton == selectedButton) background else deselectedBackground
+        binding.warriorButton.background =
+            if (binding.warriorButton == selectedButton) background else deselectedBackground
+    }
+
+    private fun optOutSelected() {
+        val alert = HabiticaAlertDialog(this)
+        alert.setTitle(getString(R.string.opt_out_confirmation))
+        alert.setMessage(getString(R.string.opt_out_description))
+        alert.addButton(R.string.opt_out_class, true, true) { _, _ ->
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                // Set Player to have no class, and opt out
+                classWasUnset
+                optOutOfClasses()
+            }
+        }
+        alert.addButton(R.string.close, false)
+        alert.show()
+    }
+
+    private fun displayConfirmationDialogForClass() {
+        if (isClassSelected) {
+            val alert = HabiticaAlertDialog(this)
+            alert.setTitle(getString(R.string.change_class_selected_confirmation, className))
+            alert.setMessage(getString(R.string.change_class_confirmation_message))
+            alert.addButton(R.string.choose_class, true) { _, _ ->
+                selectClass(newClass)
+            }
+            alert.addButton(R.string.dialog_go_back, false)
+            alert.show()
+        } else {
+            val alert = HabiticaAlertDialog(this)
+            alert.setTitle(getString(R.string.class_confirmation, className))
+            alert.addButton(R.string.choose_class, true) { _, _ -> selectClass(newClass) }
+            alert.addButton(R.string.dialog_go_back, false)
+            alert.show()
+        }
+    }
+
+    private fun displayClassChanged(selectedClass: String) {
+        val alert = HabiticaAlertDialog(this)
+        alert.setTitle(getString(R.string.class_changed, className))
+        alert.setMessage(getString(R.string.class_changed_description, className))
+        alert.addButton(getString(R.string.complete_tutorial), true) { _, _ -> dismiss() }
+        alert.addButton(getString(R.string.learn_more), false) { _, _ ->
+            dismiss()
+            MainNavigationController.navigate(R.id.FAQOverviewFragment)
+        }
+        alert.setOnCancelListener {
+            dismiss()
+        }
+        alert.enqueue()
+    }
+
+    private fun optOutOfClasses() {
+        shouldFinish = true
+        this.displayProgressDialog(getString(R.string.opting_out_progress))
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.disableClasses()
+            dismiss()
+        }
+    }
+
+    private fun selectClass(selectedClass: String) {
+        shouldFinish = true
+        val chosenClass = if (selectedClass == "mage") "wizard" else selectedClass
+        if (isClassSelected) {
+            val dialog = this.displayProgressDialog(getString(R.string.changing_class_progress))
+            lifecycleScope.launch(Dispatchers.Main) {
+                userRepository.changeClass(chosenClass)
+                dialog.hide()
+                displayClassChanged(chosenClass)
+            }
+        } else {
+            val dialog = this.displayProgressDialog(getString(R.string.choosing_class_progress))
+            lifecycleScope.launch(Dispatchers.Main) {
+                userRepository.changeClass(chosenClass)
+                dialog.hide()
+                displayClassChanged(chosenClass)
+            }
+        }
+
+        // After class change was successful, check for in-app review eligibility the following check-in
+        checkForReviewPromptAfterClassSelection()
+    }
+
+    private fun displayProgressDialog(progressText: String): HabiticaProgressDialog {
+        return HabiticaProgressDialog.show(this, progressText, 300)
+    }
+
+    private fun dismiss() {
+        if (shouldFinish == true) {
+            progressDialog?.dismiss()
+            finish()
+        }
+    }
+
+    private fun checkForReviewPromptAfterClassSelection() {
+        userViewModel.user.observeOnce(this) { user ->
+            user?.loginIncentives?.let { totalCheckins ->
+                reviewManager.requestReview(this, totalCheckins)
+            }
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/DeathActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/DeathActivity.kt
index 3b9b87708..9d81f63c9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/DeathActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/DeathActivity.kt
@@ -32,7 +32,6 @@ import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.databinding.ActivityDeathBinding
 import com.habitrpg.android.habitica.extensions.DateUtils
 import com.habitrpg.android.habitica.extensions.getShortRemainingString
-import com.habitrpg.common.habitica.extensions.observeOnce
 import com.habitrpg.android.habitica.helpers.AdHandler
 import com.habitrpg.android.habitica.helpers.AdType
 import com.habitrpg.android.habitica.helpers.Analytics
@@ -46,6 +45,7 @@ import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
 import com.habitrpg.android.habitica.ui.views.SnackbarActivity
 import com.habitrpg.android.habitica.ui.views.ads.AdButton
 import com.habitrpg.common.habitica.extensions.fromHtml
+import com.habitrpg.common.habitica.extensions.observeOnce
 import com.habitrpg.common.habitica.helpers.Animations
 import com.habitrpg.common.habitica.helpers.ExceptionHandler
 import com.habitrpg.common.habitica.helpers.launchCatching
@@ -85,19 +85,25 @@ class DeathActivity : BaseActivity(), SnackbarActivity {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         userViewModel.user.observeOnce(this) { user ->
-            binding.lossDescription.text = getString(R.string.faint_loss_description, (user?.stats?.lvl ?: 2).toInt() - 1, user?.stats?.gp?.toInt()).fromHtml()
+            binding.lossDescription.text =
+                getString(
+                    R.string.faint_loss_description,
+                    (user?.stats?.lvl ?: 2).toInt() - 1,
+                    user?.stats?.gp?.toInt(),
+                ).fromHtml()
         }
 
         if (appConfigManager.enableFaintAds()) {
-            val handler = AdHandler(this, AdType.FAINT) {
-                if (!it) {
-                    return@AdHandler
+            val handler =
+                AdHandler(this, AdType.FAINT) {
+                    if (!it) {
+                        return@AdHandler
+                    }
+                    lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                        userRepository.updateUser("stats.hp", 1)
+                        finish()
+                    }
                 }
-                lifecycleScope.launch(ExceptionHandler.coroutine()) {
-                    userRepository.updateUser("stats.hp", 1)
-                    finish()
-                }
-            }
             handler.prepare {
                 if (it && binding.adButton.state == AdButton.State.LOADING) {
                     binding.adButton.state = AdButton.State.READY
@@ -129,7 +135,11 @@ class DeathActivity : BaseActivity(), SnackbarActivity {
                             date.add(Calendar.DAY_OF_MONTH, 1)
                             val midnight = date.time
                             while (true) {
-                                binding.subscriberBenefitUsedView.text = getString(R.string.subscriber_benefit_used_faint, midnight.getShortRemainingString())
+                                binding.subscriberBenefitUsedView.text =
+                                    getString(
+                                        R.string.subscriber_benefit_used_faint,
+                                        midnight.getShortRemainingString(),
+                                    )
                                 delay(1000L)
                             }
                         }
@@ -142,11 +152,20 @@ class DeathActivity : BaseActivity(), SnackbarActivity {
                     binding.reviveSubscriberWrapper.visibility = View.GONE
                     binding.unsubbedWrapper.visibility = View.VISIBLE
                     binding.subscribeModalButton.setOnClickListener {
-                        Analytics.sendEvent("View death sub CTA", EventCategory.BEHAVIOUR, HitType.EVENT)
-                        val subscriptionBottomSheet = EventOutcomeSubscriptionBottomSheetFragment().apply {
-                            eventType = EventOutcomeSubscriptionBottomSheetFragment.EVENT_DEATH_SCREEN
-                        }
-                        subscriptionBottomSheet.show(supportFragmentManager, EventOutcomeSubscriptionBottomSheetFragment.TAG)
+                        Analytics.sendEvent(
+                            "View death sub CTA",
+                            EventCategory.BEHAVIOUR,
+                            HitType.EVENT,
+                        )
+                        val subscriptionBottomSheet =
+                            EventOutcomeSubscriptionBottomSheetFragment().apply {
+                                eventType =
+                                    EventOutcomeSubscriptionBottomSheetFragment.EVENT_DEATH_SCREEN
+                            }
+                        subscriptionBottomSheet.show(
+                            supportFragmentManager,
+                            EventOutcomeSubscriptionBottomSheetFragment.TAG,
+                        )
                     }
                 }
             }
@@ -160,47 +179,56 @@ class DeathActivity : BaseActivity(), SnackbarActivity {
             var isUsingBenefit by remember { mutableStateOf(false) }
             HabiticaTheme {
                 if (isUsingBenefit) {
-                    Box(contentAlignment = Alignment.Center, modifier = Modifier.fillMaxWidth().height(60.dp)) {
+                    Box(
+                        contentAlignment = Alignment.Center,
+                        modifier =
+                            Modifier
+                                .fillMaxWidth()
+                                .height(60.dp),
+                    ) {
                         CircularProgressIndicator()
                     }
                 } else {
                     Box(
                         contentAlignment = Alignment.Center,
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .height(60.dp)
-                            .clickable {
-                                isUsingBenefit = true
-                                Analytics.sendEvent(
-                                    "second chance perk",
-                                    EventCategory.BEHAVIOUR,
-                                    HitType.EVENT
-                                )
-                                sharedPreferences.edit {
-                                    putLong("last_sub_revive", Date().time)
-                                }
-                                lifecycleScope.launch(ExceptionHandler.coroutine()) {
-                                    userRepository.updateUser("stats.hp", 1)
-                                    MainScope().launchCatching {
-                                        delay(1000)
-                                        (HabiticaBaseApplication.getInstance(this@DeathActivity)?.currentActivity?.get() as? SnackbarActivity)?.let { activity ->
-                                            HabiticaSnackbar.showSnackbar(
-                                                activity.snackbarContainer(),
-                                                getString(R.string.subscriber_benefit_success_faint),
-                                                HabiticaSnackbar.SnackbarDisplayType.SUBSCRIBER_BENEFIT,
-                                                isSubscriberBenefit = true,
-                                                duration = 2500
-                                            )
-                                        }
+                        modifier =
+                            Modifier
+                                .fillMaxWidth()
+                                .height(60.dp)
+                                .clickable {
+                                    isUsingBenefit = true
+                                    Analytics.sendEvent(
+                                        "second chance perk",
+                                        EventCategory.BEHAVIOUR,
+                                        HitType.EVENT,
+                                    )
+                                    sharedPreferences.edit {
+                                        putLong("last_sub_revive", Date().time)
                                     }
-                                    finish()
-                                }
-                            }
+                                    lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                                        userRepository.updateUser("stats.hp", 1)
+                                        MainScope().launchCatching {
+                                            delay(1000)
+                                            (HabiticaBaseApplication.getInstance(this@DeathActivity)?.currentActivity?.get() as? SnackbarActivity)?.let { activity ->
+                                                HabiticaSnackbar.showSnackbar(
+                                                    activity.snackbarContainer(),
+                                                    getString(R.string.subscriber_benefit_success_faint),
+                                                    HabiticaSnackbar.SnackbarDisplayType.SUBSCRIBER_BENEFIT,
+                                                    isSubscriberBenefit = true,
+                                                    duration = 2500,
+                                                )
+                                            }
+                                        }
+                                        finish()
+                                    }
+                                },
                     ) {
-                        Text(stringResource(R.string.subscriber_button_faint),
+                        Text(
+                            stringResource(R.string.subscriber_button_faint),
                             fontSize = 16.sp,
                             fontWeight = FontWeight.Medium,
-                            textAlign = TextAlign.Center)
+                            textAlign = TextAlign.Center,
+                        )
                     }
                 }
             }
@@ -218,7 +246,7 @@ class DeathActivity : BaseActivity(), SnackbarActivity {
                             HabiticaSnackbar.showSnackbar(
                                 activity.snackbarContainer(),
                                 getString(R.string.revive_broken_equipment, brokenItem.text),
-                                HabiticaSnackbar.SnackbarDisplayType.BLACK
+                                HabiticaSnackbar.SnackbarDisplayType.BLACK,
                             )
                         }
                     }
@@ -244,14 +272,19 @@ class DeathActivity : BaseActivity(), SnackbarActivity {
             binding.confettiContainer,
             14,
             BitmapDrawable(resources, HabiticaIconsHelper.imageOfGold()),
-            5000
+            5000,
         )
             .setInitialRotationRange(0, 200)
             .setScaleRange(0.5f, 0.8f)
             .setSpeedRange(0.01f, 0.03f)
             .setFadeOut(4000, AccelerateInterpolator())
             .setSpeedModuleAndAngleRange(0.01f, 0.03f, startAngle, startAngle + 80)
-            .emit(binding.root.width / 2, positionArray[1] + (binding.heartView.height / 2), 3, 6000)
+            .emit(
+                binding.root.width / 2,
+                positionArray[1] + (binding.heartView.height / 2),
+                3,
+                6000,
+            )
     }
 
     @SuppressLint("MissingSuperCall")
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FixCharacterValuesActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FixCharacterValuesActivity.kt
index 27d086e09..6c7528828 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FixCharacterValuesActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FixCharacterValuesActivity.kt
@@ -9,17 +9,16 @@ import android.widget.EditText
 import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.ActivityFixcharacterBinding
-import com.habitrpg.common.habitica.extensions.setTintWith
 import com.habitrpg.android.habitica.models.user.Stats
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
+import com.habitrpg.common.habitica.extensions.setTintWith
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
 @AndroidEntryPoint
 class FixCharacterValuesActivity : BaseActivity() {
-
     private lateinit var binding: ActivityFixcharacterBinding
 
     @Inject
@@ -42,23 +41,23 @@ class FixCharacterValuesActivity : BaseActivity() {
 
         setIconBackground(
             binding.healthIconBackgroundView,
-            ContextCompat.getColor(this, R.color.red_500)
+            ContextCompat.getColor(this, R.color.red_500),
         )
         setIconBackground(
             binding.experienceIconBackgroundView,
-            ContextCompat.getColor(this, R.color.yellow_500)
+            ContextCompat.getColor(this, R.color.yellow_500),
         )
         setIconBackground(
             binding.manaIconBackgroundView,
-            ContextCompat.getColor(this, R.color.blue_500)
+            ContextCompat.getColor(this, R.color.blue_500),
         )
         setIconBackground(
             binding.goldIconBackgroundView,
-            ContextCompat.getColor(this, R.color.yellow_500)
+            ContextCompat.getColor(this, R.color.yellow_500),
         )
         setIconBackground(
             binding.streakIconBackgroundView,
-            ContextCompat.getColor(this, R.color.separator)
+            ContextCompat.getColor(this, R.color.separator),
         )
 
         binding.healthIconView.setImageBitmap(HabiticaIconsHelper.imageOfHeartLightBg())
@@ -113,35 +112,41 @@ class FixCharacterValuesActivity : BaseActivity() {
             Stats.WARRIOR -> {
                 setIconBackground(
                     binding.levelIconBackgroundView,
-                    ContextCompat.getColor(this, R.color.red_500)
+                    ContextCompat.getColor(this, R.color.red_500),
                 )
                 binding.levelIconView.setImageBitmap(HabiticaIconsHelper.imageOfWarriorLightBg())
             }
+
             Stats.MAGE -> {
                 setIconBackground(
                     binding.levelIconBackgroundView,
-                    ContextCompat.getColor(this, R.color.blue_500)
+                    ContextCompat.getColor(this, R.color.blue_500),
                 )
                 binding.levelIconView.setImageBitmap(HabiticaIconsHelper.imageOfMageLightBg())
             }
+
             Stats.HEALER -> {
                 setIconBackground(
                     binding.levelIconBackgroundView,
-                    ContextCompat.getColor(this, R.color.yellow_500)
+                    ContextCompat.getColor(this, R.color.yellow_500),
                 )
                 binding.levelIconView.setImageBitmap(HabiticaIconsHelper.imageOfHealerLightBg())
             }
+
             Stats.ROGUE -> {
                 setIconBackground(
                     binding.levelIconBackgroundView,
-                    ContextCompat.getColor(this, R.color.brand_500)
+                    ContextCompat.getColor(this, R.color.brand_500),
                 )
                 binding.levelIconView.setImageBitmap(HabiticaIconsHelper.imageOfRogueLightBg())
             }
         }
     }
 
-    private fun setIconBackground(view: View, color: Int) {
+    private fun setIconBackground(
+        view: View,
+        color: Int,
+    ) {
         val backgroundDrawable = ContextCompat.getDrawable(this, R.drawable.layout_rounded_bg)
         backgroundDrawable?.setTintWith(color, PorterDuff.Mode.MULTIPLY)
         backgroundDrawable?.alpha = 50
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 4218517eb..9d27382c3 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
@@ -1,807 +1,841 @@
-package com.habitrpg.android.habitica.ui.activities
-
-import android.annotation.SuppressLint
-import android.content.ClipData
-import android.content.ClipboardManager
-import android.content.SharedPreferences
-import android.graphics.Typeface
-import android.os.Build
-import android.os.Bundle
-import android.text.method.LinkMovementMethod
-import android.view.Menu
-import android.view.MenuItem
-import android.view.View
-import android.view.ViewGroup
-import android.widget.TableLayout
-import android.widget.TableRow
-import android.widget.TextView
-import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.mutableStateOf
-import androidx.core.content.ContextCompat
-import androidx.core.os.bundleOf
-import androidx.core.view.MenuCompat
-import androidx.core.view.isVisible
-import androidx.lifecycle.lifecycleScope
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.data.ApiClient
-import com.habitrpg.android.habitica.data.InventoryRepository
-import com.habitrpg.android.habitica.data.SocialRepository
-import com.habitrpg.android.habitica.databinding.ActivityFullProfileBinding
-import com.habitrpg.android.habitica.extensions.addCancelButton
-import com.habitrpg.android.habitica.helpers.AppConfigManager
-import com.habitrpg.android.habitica.helpers.ReviewManager
-import com.habitrpg.android.habitica.helpers.UserStatComputer
-import com.habitrpg.android.habitica.interactors.ShareAvatarUseCase
-import com.habitrpg.android.habitica.models.Achievement
-import com.habitrpg.android.habitica.models.inventory.Equipment
-import com.habitrpg.android.habitica.models.members.Member
-import com.habitrpg.android.habitica.models.user.Outfit
-import com.habitrpg.android.habitica.models.user.Permission
-import com.habitrpg.android.habitica.models.user.Stats
-import com.habitrpg.android.habitica.ui.adapter.social.AchievementProfileAdapter
-import com.habitrpg.android.habitica.ui.fragments.ReportBottomSheetFragment
-import com.habitrpg.android.habitica.ui.views.AppHeaderView
-import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
-import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.SnackbarDisplayType
-import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import com.habitrpg.common.habitica.extensions.loadImage
-import com.habitrpg.common.habitica.helpers.MainNavigationController
-import com.habitrpg.common.habitica.helpers.RecyclerViewState
-import com.habitrpg.common.habitica.helpers.launchCatching
-import com.habitrpg.common.habitica.helpers.setMarkdown
-import com.habitrpg.common.habitica.theme.HabiticaTheme
-import com.habitrpg.common.habitica.views.PixelArtView
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.MainScope
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.launch
-import java.text.SimpleDateFormat
-import javax.inject.Inject
-import kotlin.math.floor
-import kotlin.math.min
-
-@AndroidEntryPoint
-class FullProfileActivity : BaseActivity() {
-    private var blocks: List<String> = listOf()
-    private var isModerator = false
-    private var isUserSupport = false
-    private var member: MutableState<Member?> = mutableStateOf(null)
-
-    @Inject
-    lateinit var inventoryRepository: InventoryRepository
-
-    @Inject
-    lateinit var apiClient: ApiClient
-
-    @Inject
-    lateinit var socialRepository: SocialRepository
-
-    @Inject
-    lateinit var sharedPrefs: SharedPreferences
-
-    @Inject
-    lateinit var reviewManager: ReviewManager
-
-    @Inject
-    lateinit var configManager: AppConfigManager
-
-    private var userID = ""
-    private var username: String? = null
-    private var userDisplayName: String? = null
-    private var attributeStrSum = 0f
-    private var attributeIntSum = 0f
-    private var attributeConSum = 0f
-    private var attributePerSum = 0f
-    private var attributeDetailsHidden = true
-    private val attributeRows = ArrayList<TableRow>()
-    private val dateFormatter = SimpleDateFormat.getDateInstance()
-    private lateinit var binding: ActivityFullProfileBinding
-
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setupToolbar(binding.toolbar)
-
-        userID = intent?.extras?.getString("userID", "") ?: ""
-        if (userID.isEmpty()) {
-            userID = intent?.data?.path?.removePrefix("/profile/") ?: ""
-        }
-
-        setTitle(R.string.profile_loading_data)
-
-        binding.avatarWithBars.setContent {
-            HabiticaTheme {
-                AppHeaderView(member.value, isMyProfile = false, onMemberRowClicked = {}, onClassSelectionClicked = {}, configManager = configManager)
-            }
-        }
-
-        attributeRows.clear()
-        binding.attributesCardView.setOnClickListener { toggleAttributeDetails() }
-
-        binding.sendMessageButton.setOnClickListener { showSendMessageToUserDialog() }
-        binding.giftGemsButton.setOnClickListener {
-            MainNavigationController.navigate(
-                R.id.giftGemsActivity,
-                bundleOf(Pair("userID", userID), Pair("username", null))
-            )
-        }
-        binding.giftSubscriptionButton.setOnClickListener {
-            MainNavigationController.navigate(
-                R.id.giftSubscriptionActivity,
-                bundleOf(Pair("userID", userID), Pair("username", null))
-            )
-        }
-        lifecycleScope.launchCatching {
-            userRepository.getUser()
-                .collect {
-                    blocks = it?.inbox?.blocks ?: listOf()
-                    binding.blockedDisclaimerView.visibility =
-                        if (isUserBlocked()) View.VISIBLE else View.GONE
-
-                    isUserSupport = it?.hasPermission(Permission.USER_SUPPORT) == true
-                    isModerator = it?.hasPermission(Permission.MODERATOR) == true
-                    if (isModerator || isUserSupport) {
-                        binding.adminStatusView.isVisible = true
-                        refresh(true)
-                    }
-                    invalidateOptionsMenu()
-
-
-                }
-        }
-        lifecycleScope.launchCatching {
-            refresh(false)
-        }
-    }
-
-    private suspend fun refresh(fromHall: Boolean) {
-        val member = socialRepository.retrieveMember(userID, fromHall)
-        if (member != null && !fromHall) {
-            updateView(member)
-            this.member.value = member
-            if (isMyProfile() && member.loginIncentives > 10) {
-                reviewManager.requestReview(this@FullProfileActivity, member.loginIncentives)
-            }
-        } else if (member != null) {
-            updateAccountStatus(member)
-        }
-    }
-
-    override fun onDestroy() {
-        inventoryRepository.close()
-        super.onDestroy()
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        val inflater = menuInflater
-        inflater.inflate(R.menu.menu_full_profile, menu)
-        MenuCompat.setGroupDividerEnabled(menu, true)
-        val blockItem = menu.findItem(R.id.block_user)
-        val shareItem = menu.findItem(R.id.share_avatar)
-
-        if (isMyProfile()) {
-            blockItem.isVisible = false
-            shareItem.isVisible = true
-        } else {
-            blockItem.isVisible = true
-            shareItem.isVisible = false
-        }
-
-        if (isUserBlocked()) {
-            blockItem?.title = getString(R.string.unblock_user)
-        } else {
-            blockItem?.title = getString(R.string.block)
-        }
-        menu.setGroupVisible(R.id.admin_items, isModerator)
-        if (isModerator || isUserSupport) {
-            menu.findItem(R.id.ban_user)?.title = getString(
-                if (member.value?.authentication?.blocked == true) {
-                    R.string.unban_user
-                } else {
-                    R.string.ban_user
-                }
-            )
-            menu.findItem(R.id.shadow_mute_user)?.title = getString(
-                if (member.value?.flags?.chatShadowMuted == true) {
-                    R.string.unshadowmute_user
-                } else {
-                    R.string.shadow_mute_user
-                }
-            )
-            menu.findItem(R.id.mute_user)?.title = getString(
-                if (member.value?.flags?.chatRevoked == true) {
-                    R.string.unmute_user
-                } else {
-                    R.string.mute_user
-                }
-            )
-        }
-        return super.onCreateOptionsMenu(menu)
-    }
-
-    private fun isMyProfile(): Boolean {
-        return sharedPrefs.getString("UserID", "") == userID
-    }
-
-    private fun isUserBlocked(): Boolean {
-        return blocks.contains(userID)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        return when (item.itemId) {
-            android.R.id.home -> {
-                finish()
-                true
-            }
-            R.id.copy_username -> {
-                val clipboard =
-                    this.getSystemService(CLIPBOARD_SERVICE) as? ClipboardManager
-                val clip = ClipData.newPlainText(username, username)
-                clipboard?.setPrimaryClip(clip)
-                if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.S_V2) {
-                    HabiticaSnackbar.showSnackbar(
-                        this@FullProfileActivity.binding.scrollView.getChildAt(0) as ViewGroup,
-                        String.format(getString(R.string.username_copied), userDisplayName),
-                        SnackbarDisplayType.NORMAL
-                    )
-                }
-                true
-            }
-            R.id.copy_userid -> {
-                val clipboard =
-                    this.getSystemService(CLIPBOARD_SERVICE) as? ClipboardManager
-                val clip = ClipData.newPlainText(userID, userID)
-                clipboard?.setPrimaryClip(clip)
-                if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.S_V2) {
-                    HabiticaSnackbar.showSnackbar(
-                        this@FullProfileActivity.binding.scrollView.getChildAt(0) as ViewGroup,
-                        String.format(getString(R.string.id_copied), userDisplayName),
-                        SnackbarDisplayType.NORMAL
-                    )
-                }
-                true
-            }
-            R.id.block_user -> {
-                if (blocks.contains(userID)) {
-                    useBlock()
-                } else {
-                    showBlockDialog()
-                }
-                true
-            }
-            R.id.report_player -> {
-                showReportUserBottomSheet(
-                    userIdBeingReported = userID,
-                    usernameBeingReported = username ?: "",
-                    userDisplayName = userDisplayName ?: ""
-                )
-                true
-            }
-            R.id.ban_user -> {
-                banUser()
-                true
-            }
-            R.id.shadow_mute_user -> {
-                shadowMuteUser()
-                true
-            }
-            R.id.mute_user -> {
-                muteUser()
-                true
-            }
-            R.id.share_avatar -> {
-                member.value?.let {
-                    val usecase = ShareAvatarUseCase()
-                    lifecycleScope.launchCatching {
-                        usecase.callInteractor(
-                                ShareAvatarUseCase.RequestValues(
-                                    this@FullProfileActivity,
-                                    it,
-                                    "Check out my avatar on Habitica!",
-                                    "avatar_profile"
-                                )
-                        )
-                    }
-                }
-                true
-            }
-            else -> super.onOptionsItemSelected(item)
-        }
-    }
-
-    private fun muteUser() {
-        val isMuted = member.value?.flags?.chatRevoked == true
-        val alert = HabiticaAlertDialog(this)
-        if (isMuted) {
-            alert.setTitle(R.string.unmute_user_confirm)
-        } else {
-            alert.setTitle(R.string.mute_user_confirm)
-        }
-        alert.addButton(R.string.yes, isPrimary = true, isDestructive = true) { _, _ ->
-            lifecycleScope.launchCatching {
-                val flagsMap = mapOf("chatRevoked" to !isMuted)
-                val updateData = mapOf("flags" to flagsMap)
-                member.value?.id?.let { socialRepository.updateMember(it, updateData) }
-                refresh(true)
-                invalidateOptionsMenu()
-            }
-        }
-        alert.show()
-    }
-
-    private fun shadowMuteUser() {
-        val isShadowMuted = member.value?.flags?.chatShadowMuted == true
-        val alert = HabiticaAlertDialog(this)
-        if (isShadowMuted) {
-            alert.setTitle(R.string.unshadowmute_user_confirm)
-        } else {
-            alert.setTitle(R.string.shadowmute_user_confirm)
-        }
-        alert.addButton(R.string.yes, isPrimary = true, isDestructive = true) { _, _ ->
-            lifecycleScope.launchCatching {
-                val flagsMap = mapOf("chatShadowMuted" to !isShadowMuted)
-                val updateData = mapOf("flags" to flagsMap)
-                member.value?.id?.let { socialRepository.updateMember(it, updateData) }
-                refresh(true)
-                invalidateOptionsMenu()
-            }
-        }
-        alert.show()
-    }
-
-    private fun showReportUserBottomSheet(userIdBeingReported : String, usernameBeingReported: String, userDisplayName: String) {
-        val reportBottomSheetFragment = ReportBottomSheetFragment.newInstance(
-            reportType = ReportBottomSheetFragment.REPORT_TYPE_USER,
-            profileName = usernameBeingReported,
-            displayName = userDisplayName,
-            messageId = "",
-            messageText = "",
-            groupId = "",
-            userIdBeingReported = userIdBeingReported,
-            sourceView = this::class.simpleName ?: ""
-        )
-
-        reportBottomSheetFragment.show(supportFragmentManager, ReportBottomSheetFragment.TAG)
-    }
-
-    private fun banUser() {
-        val isBanned = member.value?.authentication?.blocked == true
-        val alert = HabiticaAlertDialog(this)
-        if (isBanned) {
-            alert.setTitle(R.string.unban_user_confirm)
-        } else {
-            alert.setTitle(R.string.ban_user_confirm)
-        }
-        alert.addButton(R.string.yes, isPrimary = true, isDestructive = true) { _, _ ->
-            lifecycleScope.launchCatching {
-                val flagsMap = mapOf("blocked" to !isBanned)
-                val updateData = mapOf("auth" to flagsMap)
-                member.value?.id?.let { socialRepository.updateMember(it, updateData) }
-                refresh(true)
-                invalidateOptionsMenu()
-            }
-        }
-        alert.show()
-    }
-
-    private fun useBlock() {
-        lifecycleScope.launchCatching {
-            socialRepository.blockMember(userID)
-            userRepository.retrieveUser(false, true)
-            invalidateOptionsMenu()
-        }
-    }
-
-    private fun showBlockDialog() {
-        val dialog = HabiticaAlertDialog(this)
-        dialog.setTitle(getString(R.string.block_user_title, userDisplayName))
-        dialog.setMessage(R.string.block_user_description)
-        dialog.addButton(R.string.block, isPrimary = true, isDestructive = true) { _, _ ->
-            useBlock()
-        }
-        dialog.addCancelButton()
-        dialog.show()
-    }
-
-    private fun showSendMessageToUserDialog() {
-        finish()
-        MainScope().launch(context = Dispatchers.Main) {
-            delay(500L)
-            MainNavigationController.navigate(
-                R.id.inboxMessageListFragment,
-                bundleOf(Pair("username", username), Pair("userID", userID))
-            )
-        }
-    }
-
-    private fun updateView(user: Member) {
-        val profile = user.profile ?: return
-
-        updatePetsMountsView(user)
-        userDisplayName = profile.name
-        username = user.username
-
-        title = profile.name
-        supportActionBar?.subtitle = user.formattedUsername
-
-        val imageUrl = profile.imageUrl
-        if (imageUrl.isNullOrEmpty()) {
-            binding.profileImage.visibility = View.GONE
-        }
-
-        val blurbText = profile.blurb
-        if (!blurbText.isNullOrEmpty()) {
-            binding.blurbTextView.setMarkdown(blurbText)
-            binding.blurbTextView.movementMethod = LinkMovementMethod.getInstance()
-        }
-
-        user.authentication?.timestamps?.createdAt?.let {
-            binding.joinedView.text = dateFormatter.format(it)
-        }
-        user.authentication?.timestamps?.lastLoggedIn?.let {
-            binding.lastLoginView.text = dateFormatter.format(it)
-        }
-        binding.totalCheckinsView.text = user.loginIncentives.toString()
-
-        lifecycleScope.launchCatching {
-            loadItemDataByOutfit(user.equipped).collect { gear -> gotGear(gear, user) }
-        }
-
-        if (user.preferences?.costume == true) {
-            lifecycleScope.launchCatching {
-                loadItemDataByOutfit(user.costume).collect { gotCostume(it) }
-            }
-        } else {
-            binding.costumeCard.visibility = View.GONE
-        }
-
-        // Load the members achievements now
-        lifecycleScope.launchCatching {
-            val achievements = socialRepository.getMemberAchievements(userID)
-            fillAchievements(achievements)
-        }
-    }
-
-    private fun updatePetsMountsView(user: Member) {
-        binding.petsFoundCount.text = user.petsFoundCount.toString()
-        binding.mountsTamedCount.text = user.mountsTamedCount.toString()
-
-        if (user.currentPet?.isNotBlank() == true) binding.currentPetDrawee.loadImage("Pet-" + user.currentPet)
-        if (user.currentMount?.isNotBlank() == true) binding.currentMountDrawee.loadImage("Mount_Icon_" + user.currentMount)
-    }
-
-    private fun updateAccountStatus(member: Member) {
-        val status = mutableListOf<String>()
-        if (member.authentication?.blocked == true) status.add("Banned")
-        if (member.flags?.chatShadowMuted == true) status.add("Shadow Muted")
-        if (member.flags?.chatRevoked == true) status.add("Muted")
-        if (status.isNotEmpty()) {
-            binding.adminStatusTextview.text = status.joinToString(", ")
-            binding.adminStatusTextview.setTextColor(ContextCompat.getColor(this, R.color.text_red))
-        } else {
-            binding.adminStatusTextview.text = getString(R.string.regular_access)
-            binding.adminStatusTextview.setTextColor(ContextCompat.getColor(this, R.color.text_green))
-        }
-    }
-
-// endregion
-
-// region Attributes
-
-    private fun fillAchievements(achievements: List<Achievement>?) {
-        if (achievements == null) {
-            return
-        }
-        val items = ArrayList<Any>()
-
-        fillAchievements(
-            R.string.basic_achievements,
-            achievements.filter { it.category == "basic" },
-            items
-        )
-        fillAchievements(
-            R.string.seasonal_achievements,
-            achievements.filter { it.category == "seasonal" },
-            items
-        )
-        fillAchievements(
-            R.string.special_achievements,
-            achievements.filter { it.category == "special" },
-            items
-        )
-
-        val adapter = AchievementProfileAdapter()
-        adapter.setItemList(items)
-
-        val layoutManager = androidx.recyclerview.widget.GridLayoutManager(this, 3)
-        layoutManager.spanSizeLookup =
-            object : androidx.recyclerview.widget.GridLayoutManager.SpanSizeLookup() {
-                override fun getSpanSize(position: Int): Int {
-                    return if (adapter.getItemViewType(position) == 0) {
-                        layoutManager.spanCount
-                    } else {
-                        1
-                    }
-                }
-            }
-        binding.achievementGroupList.layoutManager = layoutManager
-        binding.achievementGroupList.adapter = adapter
-
-        binding.achievementGroupList.state = RecyclerViewState.DISPLAYING_DATA
-    }
-
-    private fun fillAchievements(
-        labelID: Int,
-        achievements: List<Achievement>,
-        targetList: MutableList<Any>
-    ) {
-        // Order by ID first
-        val achievementList = ArrayList(achievements)
-        achievementList.sortWith { achievement, t1 ->
-            achievement.index.toDouble().compareTo(t1.index.toDouble())
-        }
-
-        targetList.add(getString(labelID))
-        targetList.addAll(achievementList)
-    }
-
-    private fun getFloorValueString(`val`: Float, roundDown: Boolean): String {
-        return if (roundDown) {
-            floor(`val`.toDouble()).toString()
-        } else {
-            if (`val`.toDouble() == 0.0) {
-                "0"
-            } else {
-                `val`.toString()
-            }
-        }
-    }
-
-    private fun getFloorValue(value: Float, roundDown: Boolean): Float {
-        return if (roundDown) {
-            floor(value.toDouble()).toFloat()
-        } else {
-            value
-        }
-    }
-
-    private fun addEquipmentRow(
-        table: TableLayout,
-        gearKey: String?,
-        text: String?,
-        stats: String?
-    ) {
-        val gearRow =
-            layoutInflater.inflate(R.layout.profile_gear_tablerow, table, false) as? TableRow
-
-        val draweeView = gearRow?.findViewById<PixelArtView>(R.id.gear_drawee)
-
-        draweeView?.loadImage("shop_$gearKey")
-
-        val keyTextView = gearRow?.findViewById<TextView>(R.id.tableRowTextView1)
-        keyTextView?.text = text
-
-        val valueTextView = gearRow?.findViewById<TextView>(R.id.tableRowTextView2)
-
-        if (stats?.isNotEmpty() == true) {
-            valueTextView?.text = stats
-        } else {
-            valueTextView?.visibility = View.GONE
-        }
-
-        table.addView(gearRow)
-    }
-
-    private fun addLevelAttributes(user: Member) {
-        val byLevelStat = min((user.stats?.lvl ?: 0) / 2.0f, 50f)
-        addAttributeRow(
-            getString(R.string.profile_level),
-            byLevelStat,
-            byLevelStat,
-            byLevelStat,
-            byLevelStat,
-            roundDown = true,
-            isSummary = false
-        )
-    }
-
-    private fun loadItemDataByOutfit(outfit: Outfit?): Flow<List<Equipment>> {
-        val outfitList = ArrayList<String>()
-        if (outfit != null) {
-            outfitList.add(outfit.armor)
-            outfitList.add(outfit.back)
-            outfitList.add(outfit.body)
-            outfitList.add(outfit.eyeWear)
-            outfitList.add(outfit.head)
-            outfitList.add(outfit.headAccessory)
-            outfitList.add(outfit.shield)
-            outfitList.add(outfit.weapon)
-        }
-        return inventoryRepository.getEquipment(outfitList)
-    }
-
-    private fun gotGear(equipmentList: List<Equipment>, user: Member) {
-        val userStatComputer = UserStatComputer()
-        val statsRows = userStatComputer.computeClassBonus(equipmentList, user)
-
-        binding.equipmentTableLayout.removeAllViews()
-        for (index in 1 until binding.attributesTableLayout.childCount) {
-            val child = binding.attributesTableLayout.getChildAt(index) ?: continue
-            if (child.isAttachedToWindow) {
-                binding.attributesTableLayout.removeViewAt(index)
-            }
-        }
-
-        addLevelAttributes(user)
-
-        for (row in statsRows) {
-            if (row is UserStatComputer.EquipmentRow) {
-                addEquipmentRow(binding.equipmentTableLayout, row.gearKey, row.text, row.stats)
-            } else if (row is UserStatComputer.AttributeRow) {
-                addAttributeRow(
-                    getString(row.labelId),
-                    row.strVal,
-                    row.intVal,
-                    row.conVal,
-                    row.perVal,
-                    row.roundDown,
-                    row.summary
-                )
-            }
-        }
-
-        user.stats?.let { addNormalAddBuffAttributes(it) }
-    }
-
-    private fun gotCostume(obj: List<Equipment>) {
-        // fill costume table
-        binding.costumeTableLayout.removeAllViews()
-        for (i in obj) {
-            addEquipmentRow(binding.costumeTableLayout, i.key, i.text, "")
-        }
-    }
-
-    private fun addNormalAddBuffAttributes(stats: Stats) {
-        val buffs = stats.buffs
-
-        addAttributeRow(
-            getString(R.string.profile_allocated),
-            stats.strength?.toFloat() ?: 0f,
-            stats.intelligence?.toFloat() ?: 0f,
-            stats.constitution?.toFloat() ?: 0f,
-            stats.per?.toFloat() ?: 0f,
-            roundDown = true,
-            isSummary = false
-        )
-        addAttributeRow(
-            getString(R.string.buffs),
-            buffs?.str
-                ?: 0f,
-            buffs?._int ?: 0f,
-            buffs?.con ?: 0f,
-            buffs?.per ?: 0f,
-            roundDown = true,
-            isSummary = false
-        )
-
-        // Summary row
-        addAttributeRow(
-            "",
-            attributeStrSum,
-            attributeIntSum,
-            attributeConSum,
-            attributePerSum,
-            roundDown = false,
-            isSummary = true
-        )
-    }
-
-    private fun addAttributeRow(
-        label: String,
-        strVal: Float,
-        intVal: Float,
-        conVal: Float,
-        perVal: Float,
-        roundDown: Boolean,
-        isSummary: Boolean
-    ) {
-        val tableRow = layoutInflater.inflate(
-            R.layout.profile_attributetablerow,
-            binding.attributesTableLayout,
-            false
-        ) as? TableRow ?: return
-        val keyTextView = tableRow.findViewById<TextView>(R.id.tv_attribute_type)
-        keyTextView?.text = label
-
-        val strTextView = tableRow.findViewById<TextView>(R.id.tv_attribute_str)
-        strTextView?.text = getFloorValueString(strVal, roundDown)
-
-        val intTextView = tableRow.findViewById<TextView>(R.id.tv_attribute_int)
-        intTextView?.text = getFloorValueString(intVal, roundDown)
-
-        val conTextView = tableRow.findViewById<TextView>(R.id.tv_attribute_con)
-        conTextView?.text = getFloorValueString(conVal, roundDown)
-
-        val perTextView = tableRow.findViewById<TextView>(R.id.tv_attribute_per)
-        perTextView?.text = getFloorValueString(perVal, roundDown)
-
-        if (isSummary) {
-            strTextView?.setTypeface(null, Typeface.BOLD)
-            intTextView?.setTypeface(null, Typeface.BOLD)
-            conTextView?.setTypeface(null, Typeface.BOLD)
-            perTextView?.setTypeface(null, Typeface.BOLD)
-        } else {
-            attributeStrSum += getFloorValue(strVal, roundDown)
-            attributeIntSum += getFloorValue(intVal, roundDown)
-            attributeConSum += getFloorValue(conVal, roundDown)
-            attributePerSum += getFloorValue(perVal, roundDown)
-            attributeRows.add(tableRow)
-            tableRow.visibility = if (attributeDetailsHidden) View.GONE else View.VISIBLE
-        }
-
-        binding.attributesTableLayout.addView(tableRow)
-    }
-
-    private fun toggleAttributeDetails() {
-        attributeDetailsHidden = !attributeDetailsHidden
-
-        binding.attributesCollapseIcon.setImageDrawable(
-            ContextCompat.getDrawable(
-                this,
-                if (attributeDetailsHidden) {
-                    R.drawable.ic_keyboard_arrow_right_black_24dp
-                } else {
-                    R.drawable.ic_keyboard_arrow_down_black_24dp
-                }
-            )
-        )
-
-        for (row in attributeRows) {
-            row.visibility = if (attributeDetailsHidden) View.GONE else View.VISIBLE
-        }
-    }
-
-// endregion
-
-// region Navigation
-
-    override fun onSupportNavigateUp(): Boolean {
-        finish()
-        return true
-    }
-
-    @SuppressLint("MissingSuperCall")
-    override fun onBackPressed() {
-        finish()
-    }
-
-// endregion
-
-// region BaseActivity-Overrides
-
-    override fun getLayoutResId(): Int {
-        return R.layout.activity_full_profile
-    }
-
-    override fun getContentView(layoutResId: Int?): View {
-        binding = ActivityFullProfileBinding.inflate(layoutInflater)
-        return binding.root
-    }
-
-    companion object {
-
-        fun open(userId: String) {
-            if (userId == "system") {
-                return
-            }
-            val bundle = Bundle()
-            bundle.putString("userID", userId)
-            MainNavigationController.navigate(R.id.fullProfileActivity, bundle)
-        }
-    }
-
-// endregion
-    // endregion
-}
+package com.habitrpg.android.habitica.ui.activities
+
+import android.annotation.SuppressLint
+import android.content.ClipData
+import android.content.ClipboardManager
+import android.content.SharedPreferences
+import android.graphics.Typeface
+import android.os.Build
+import android.os.Bundle
+import android.text.method.LinkMovementMethod
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TableLayout
+import android.widget.TableRow
+import android.widget.TextView
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.mutableStateOf
+import androidx.core.content.ContextCompat
+import androidx.core.os.bundleOf
+import androidx.core.view.MenuCompat
+import androidx.core.view.isVisible
+import androidx.lifecycle.lifecycleScope
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.data.ApiClient
+import com.habitrpg.android.habitica.data.InventoryRepository
+import com.habitrpg.android.habitica.data.SocialRepository
+import com.habitrpg.android.habitica.databinding.ActivityFullProfileBinding
+import com.habitrpg.android.habitica.extensions.addCancelButton
+import com.habitrpg.android.habitica.helpers.AppConfigManager
+import com.habitrpg.android.habitica.helpers.ReviewManager
+import com.habitrpg.android.habitica.helpers.UserStatComputer
+import com.habitrpg.android.habitica.interactors.ShareAvatarUseCase
+import com.habitrpg.android.habitica.models.Achievement
+import com.habitrpg.android.habitica.models.inventory.Equipment
+import com.habitrpg.android.habitica.models.members.Member
+import com.habitrpg.android.habitica.models.user.Outfit
+import com.habitrpg.android.habitica.models.user.Permission
+import com.habitrpg.android.habitica.models.user.Stats
+import com.habitrpg.android.habitica.ui.adapter.social.AchievementProfileAdapter
+import com.habitrpg.android.habitica.ui.fragments.ReportBottomSheetFragment
+import com.habitrpg.android.habitica.ui.views.AppHeaderView
+import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
+import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.SnackbarDisplayType
+import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
+import com.habitrpg.common.habitica.extensions.loadImage
+import com.habitrpg.common.habitica.helpers.MainNavigationController
+import com.habitrpg.common.habitica.helpers.RecyclerViewState
+import com.habitrpg.common.habitica.helpers.launchCatching
+import com.habitrpg.common.habitica.helpers.setMarkdown
+import com.habitrpg.common.habitica.theme.HabiticaTheme
+import com.habitrpg.common.habitica.views.PixelArtView
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.launch
+import java.text.SimpleDateFormat
+import javax.inject.Inject
+import kotlin.math.floor
+import kotlin.math.min
+
+@AndroidEntryPoint
+class FullProfileActivity : BaseActivity() {
+    private var blocks: List<String> = listOf()
+    private var isModerator = false
+    private var isUserSupport = false
+    private var member: MutableState<Member?> = mutableStateOf(null)
+
+    @Inject
+    lateinit var inventoryRepository: InventoryRepository
+
+    @Inject
+    lateinit var apiClient: ApiClient
+
+    @Inject
+    lateinit var socialRepository: SocialRepository
+
+    @Inject
+    lateinit var sharedPrefs: SharedPreferences
+
+    @Inject
+    lateinit var reviewManager: ReviewManager
+
+    @Inject
+    lateinit var configManager: AppConfigManager
+
+    private var userID = ""
+    private var username: String? = null
+    private var userDisplayName: String? = null
+    private var attributeStrSum = 0f
+    private var attributeIntSum = 0f
+    private var attributeConSum = 0f
+    private var attributePerSum = 0f
+    private var attributeDetailsHidden = true
+    private val attributeRows = ArrayList<TableRow>()
+    private val dateFormatter = SimpleDateFormat.getDateInstance()
+    private lateinit var binding: ActivityFullProfileBinding
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setupToolbar(binding.toolbar)
+
+        userID = intent?.extras?.getString("userID", "") ?: ""
+        if (userID.isEmpty()) {
+            userID = intent?.data?.path?.removePrefix("/profile/") ?: ""
+        }
+
+        setTitle(R.string.profile_loading_data)
+
+        binding.avatarWithBars.setContent {
+            HabiticaTheme {
+                AppHeaderView(
+                    member.value,
+                    isMyProfile = false,
+                    onMemberRowClicked = {},
+                    onClassSelectionClicked = {},
+                    configManager = configManager,
+                )
+            }
+        }
+
+        attributeRows.clear()
+        binding.attributesCardView.setOnClickListener { toggleAttributeDetails() }
+
+        binding.sendMessageButton.setOnClickListener { showSendMessageToUserDialog() }
+        binding.giftGemsButton.setOnClickListener {
+            MainNavigationController.navigate(
+                R.id.giftGemsActivity,
+                bundleOf(Pair("userID", userID), Pair("username", null)),
+            )
+        }
+        binding.giftSubscriptionButton.setOnClickListener {
+            MainNavigationController.navigate(
+                R.id.giftSubscriptionActivity,
+                bundleOf(Pair("userID", userID), Pair("username", null)),
+            )
+        }
+        lifecycleScope.launchCatching {
+            userRepository.getUser()
+                .collect {
+                    blocks = it?.inbox?.blocks ?: listOf()
+                    binding.blockedDisclaimerView.visibility =
+                        if (isUserBlocked()) View.VISIBLE else View.GONE
+
+                    isUserSupport = it?.hasPermission(Permission.USER_SUPPORT) == true
+                    isModerator = it?.hasPermission(Permission.MODERATOR) == true
+                    if (isModerator || isUserSupport) {
+                        binding.adminStatusView.isVisible = true
+                        refresh(true)
+                    }
+                    invalidateOptionsMenu()
+                }
+        }
+        lifecycleScope.launchCatching {
+            refresh(false)
+        }
+    }
+
+    private suspend fun refresh(fromHall: Boolean) {
+        val member = socialRepository.retrieveMember(userID, fromHall)
+        if (member != null && !fromHall) {
+            updateView(member)
+            this.member.value = member
+            if (isMyProfile() && member.loginIncentives > 10) {
+                reviewManager.requestReview(this@FullProfileActivity, member.loginIncentives)
+            }
+        } else if (member != null) {
+            updateAccountStatus(member)
+        }
+    }
+
+    override fun onDestroy() {
+        inventoryRepository.close()
+        super.onDestroy()
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        val inflater = menuInflater
+        inflater.inflate(R.menu.menu_full_profile, menu)
+        MenuCompat.setGroupDividerEnabled(menu, true)
+        val blockItem = menu.findItem(R.id.block_user)
+        val shareItem = menu.findItem(R.id.share_avatar)
+
+        if (isMyProfile()) {
+            blockItem.isVisible = false
+            shareItem.isVisible = true
+        } else {
+            blockItem.isVisible = true
+            shareItem.isVisible = false
+        }
+
+        if (isUserBlocked()) {
+            blockItem?.title = getString(R.string.unblock_user)
+        } else {
+            blockItem?.title = getString(R.string.block)
+        }
+        menu.setGroupVisible(R.id.admin_items, isModerator)
+        if (isModerator || isUserSupport) {
+            menu.findItem(R.id.ban_user)?.title =
+                getString(
+                    if (member.value?.authentication?.blocked == true) {
+                        R.string.unban_user
+                    } else {
+                        R.string.ban_user
+                    },
+                )
+            menu.findItem(R.id.shadow_mute_user)?.title =
+                getString(
+                    if (member.value?.flags?.chatShadowMuted == true) {
+                        R.string.unshadowmute_user
+                    } else {
+                        R.string.shadow_mute_user
+                    },
+                )
+            menu.findItem(R.id.mute_user)?.title =
+                getString(
+                    if (member.value?.flags?.chatRevoked == true) {
+                        R.string.unmute_user
+                    } else {
+                        R.string.mute_user
+                    },
+                )
+        }
+        return super.onCreateOptionsMenu(menu)
+    }
+
+    private fun isMyProfile(): Boolean {
+        return sharedPrefs.getString("UserID", "") == userID
+    }
+
+    private fun isUserBlocked(): Boolean {
+        return blocks.contains(userID)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return when (item.itemId) {
+            android.R.id.home -> {
+                finish()
+                true
+            }
+
+            R.id.copy_username -> {
+                val clipboard =
+                    this.getSystemService(CLIPBOARD_SERVICE) as? ClipboardManager
+                val clip = ClipData.newPlainText(username, username)
+                clipboard?.setPrimaryClip(clip)
+                if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.S_V2) {
+                    HabiticaSnackbar.showSnackbar(
+                        this@FullProfileActivity.binding.scrollView.getChildAt(0) as ViewGroup,
+                        String.format(getString(R.string.username_copied), userDisplayName),
+                        SnackbarDisplayType.NORMAL,
+                    )
+                }
+                true
+            }
+
+            R.id.copy_userid -> {
+                val clipboard =
+                    this.getSystemService(CLIPBOARD_SERVICE) as? ClipboardManager
+                val clip = ClipData.newPlainText(userID, userID)
+                clipboard?.setPrimaryClip(clip)
+                if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.S_V2) {
+                    HabiticaSnackbar.showSnackbar(
+                        this@FullProfileActivity.binding.scrollView.getChildAt(0) as ViewGroup,
+                        String.format(getString(R.string.id_copied), userDisplayName),
+                        SnackbarDisplayType.NORMAL,
+                    )
+                }
+                true
+            }
+
+            R.id.block_user -> {
+                if (blocks.contains(userID)) {
+                    useBlock()
+                } else {
+                    showBlockDialog()
+                }
+                true
+            }
+
+            R.id.report_player -> {
+                showReportUserBottomSheet(
+                    userIdBeingReported = userID,
+                    usernameBeingReported = username ?: "",
+                    userDisplayName = userDisplayName ?: "",
+                )
+                true
+            }
+
+            R.id.ban_user -> {
+                banUser()
+                true
+            }
+
+            R.id.shadow_mute_user -> {
+                shadowMuteUser()
+                true
+            }
+
+            R.id.mute_user -> {
+                muteUser()
+                true
+            }
+
+            R.id.share_avatar -> {
+                member.value?.let {
+                    val usecase = ShareAvatarUseCase()
+                    lifecycleScope.launchCatching {
+                        usecase.callInteractor(
+                            ShareAvatarUseCase.RequestValues(
+                                this@FullProfileActivity,
+                                it,
+                                "Check out my avatar on Habitica!",
+                                "avatar_profile",
+                            ),
+                        )
+                    }
+                }
+                true
+            }
+
+            else -> super.onOptionsItemSelected(item)
+        }
+    }
+
+    private fun muteUser() {
+        val isMuted = member.value?.flags?.chatRevoked == true
+        val alert = HabiticaAlertDialog(this)
+        if (isMuted) {
+            alert.setTitle(R.string.unmute_user_confirm)
+        } else {
+            alert.setTitle(R.string.mute_user_confirm)
+        }
+        alert.addButton(R.string.yes, isPrimary = true, isDestructive = true) { _, _ ->
+            lifecycleScope.launchCatching {
+                val flagsMap = mapOf("chatRevoked" to !isMuted)
+                val updateData = mapOf("flags" to flagsMap)
+                member.value?.id?.let { socialRepository.updateMember(it, updateData) }
+                refresh(true)
+                invalidateOptionsMenu()
+            }
+        }
+        alert.show()
+    }
+
+    private fun shadowMuteUser() {
+        val isShadowMuted = member.value?.flags?.chatShadowMuted == true
+        val alert = HabiticaAlertDialog(this)
+        if (isShadowMuted) {
+            alert.setTitle(R.string.unshadowmute_user_confirm)
+        } else {
+            alert.setTitle(R.string.shadowmute_user_confirm)
+        }
+        alert.addButton(R.string.yes, isPrimary = true, isDestructive = true) { _, _ ->
+            lifecycleScope.launchCatching {
+                val flagsMap = mapOf("chatShadowMuted" to !isShadowMuted)
+                val updateData = mapOf("flags" to flagsMap)
+                member.value?.id?.let { socialRepository.updateMember(it, updateData) }
+                refresh(true)
+                invalidateOptionsMenu()
+            }
+        }
+        alert.show()
+    }
+
+    private fun showReportUserBottomSheet(
+        userIdBeingReported: String,
+        usernameBeingReported: String,
+        userDisplayName: String,
+    ) {
+        val reportBottomSheetFragment =
+            ReportBottomSheetFragment.newInstance(
+                reportType = ReportBottomSheetFragment.REPORT_TYPE_USER,
+                profileName = usernameBeingReported,
+                displayName = userDisplayName,
+                messageId = "",
+                messageText = "",
+                groupId = "",
+                userIdBeingReported = userIdBeingReported,
+                sourceView = this::class.simpleName ?: "",
+            )
+
+        reportBottomSheetFragment.show(supportFragmentManager, ReportBottomSheetFragment.TAG)
+    }
+
+    private fun banUser() {
+        val isBanned = member.value?.authentication?.blocked == true
+        val alert = HabiticaAlertDialog(this)
+        if (isBanned) {
+            alert.setTitle(R.string.unban_user_confirm)
+        } else {
+            alert.setTitle(R.string.ban_user_confirm)
+        }
+        alert.addButton(R.string.yes, isPrimary = true, isDestructive = true) { _, _ ->
+            lifecycleScope.launchCatching {
+                val flagsMap = mapOf("blocked" to !isBanned)
+                val updateData = mapOf("auth" to flagsMap)
+                member.value?.id?.let { socialRepository.updateMember(it, updateData) }
+                refresh(true)
+                invalidateOptionsMenu()
+            }
+        }
+        alert.show()
+    }
+
+    private fun useBlock() {
+        lifecycleScope.launchCatching {
+            socialRepository.blockMember(userID)
+            userRepository.retrieveUser(false, true)
+            invalidateOptionsMenu()
+        }
+    }
+
+    private fun showBlockDialog() {
+        val dialog = HabiticaAlertDialog(this)
+        dialog.setTitle(getString(R.string.block_user_title, userDisplayName))
+        dialog.setMessage(R.string.block_user_description)
+        dialog.addButton(R.string.block, isPrimary = true, isDestructive = true) { _, _ ->
+            useBlock()
+        }
+        dialog.addCancelButton()
+        dialog.show()
+    }
+
+    private fun showSendMessageToUserDialog() {
+        finish()
+        MainScope().launch(context = Dispatchers.Main) {
+            delay(500L)
+            MainNavigationController.navigate(
+                R.id.inboxMessageListFragment,
+                bundleOf(Pair("username", username), Pair("userID", userID)),
+            )
+        }
+    }
+
+    private fun updateView(user: Member) {
+        val profile = user.profile ?: return
+
+        updatePetsMountsView(user)
+        userDisplayName = profile.name
+        username = user.username
+
+        title = profile.name
+        supportActionBar?.subtitle = user.formattedUsername
+
+        val imageUrl = profile.imageUrl
+        if (imageUrl.isNullOrEmpty()) {
+            binding.profileImage.visibility = View.GONE
+        }
+
+        val blurbText = profile.blurb
+        if (!blurbText.isNullOrEmpty()) {
+            binding.blurbTextView.setMarkdown(blurbText)
+            binding.blurbTextView.movementMethod = LinkMovementMethod.getInstance()
+        }
+
+        user.authentication?.timestamps?.createdAt?.let {
+            binding.joinedView.text = dateFormatter.format(it)
+        }
+        user.authentication?.timestamps?.lastLoggedIn?.let {
+            binding.lastLoginView.text = dateFormatter.format(it)
+        }
+        binding.totalCheckinsView.text = user.loginIncentives.toString()
+
+        lifecycleScope.launchCatching {
+            loadItemDataByOutfit(user.equipped).collect { gear -> gotGear(gear, user) }
+        }
+
+        if (user.preferences?.costume == true) {
+            lifecycleScope.launchCatching {
+                loadItemDataByOutfit(user.costume).collect { gotCostume(it) }
+            }
+        } else {
+            binding.costumeCard.visibility = View.GONE
+        }
+
+        // Load the members achievements now
+        lifecycleScope.launchCatching {
+            val achievements = socialRepository.getMemberAchievements(userID)
+            fillAchievements(achievements)
+        }
+    }
+
+    private fun updatePetsMountsView(user: Member) {
+        binding.petsFoundCount.text = user.petsFoundCount.toString()
+        binding.mountsTamedCount.text = user.mountsTamedCount.toString()
+
+        if (user.currentPet?.isNotBlank() == true) binding.currentPetDrawee.loadImage("Pet-" + user.currentPet)
+        if (user.currentMount?.isNotBlank() == true) binding.currentMountDrawee.loadImage("Mount_Icon_" + user.currentMount)
+    }
+
+    private fun updateAccountStatus(member: Member) {
+        val status = mutableListOf<String>()
+        if (member.authentication?.blocked == true) status.add("Banned")
+        if (member.flags?.chatShadowMuted == true) status.add("Shadow Muted")
+        if (member.flags?.chatRevoked == true) status.add("Muted")
+        if (status.isNotEmpty()) {
+            binding.adminStatusTextview.text = status.joinToString(", ")
+            binding.adminStatusTextview.setTextColor(ContextCompat.getColor(this, R.color.text_red))
+        } else {
+            binding.adminStatusTextview.text = getString(R.string.regular_access)
+            binding.adminStatusTextview.setTextColor(
+                ContextCompat.getColor(
+                    this,
+                    R.color.text_green,
+                ),
+            )
+        }
+    }
+
+// endregion
+
+// region Attributes
+
+    private fun fillAchievements(achievements: List<Achievement>?) {
+        if (achievements == null) {
+            return
+        }
+        val items = ArrayList<Any>()
+
+        fillAchievements(
+            R.string.basic_achievements,
+            achievements.filter { it.category == "basic" },
+            items,
+        )
+        fillAchievements(
+            R.string.seasonal_achievements,
+            achievements.filter { it.category == "seasonal" },
+            items,
+        )
+        fillAchievements(
+            R.string.special_achievements,
+            achievements.filter { it.category == "special" },
+            items,
+        )
+
+        val adapter = AchievementProfileAdapter()
+        adapter.setItemList(items)
+
+        val layoutManager = androidx.recyclerview.widget.GridLayoutManager(this, 3)
+        layoutManager.spanSizeLookup =
+            object : androidx.recyclerview.widget.GridLayoutManager.SpanSizeLookup() {
+                override fun getSpanSize(position: Int): Int {
+                    return if (adapter.getItemViewType(position) == 0) {
+                        layoutManager.spanCount
+                    } else {
+                        1
+                    }
+                }
+            }
+        binding.achievementGroupList.layoutManager = layoutManager
+        binding.achievementGroupList.adapter = adapter
+
+        binding.achievementGroupList.state = RecyclerViewState.DISPLAYING_DATA
+    }
+
+    private fun fillAchievements(
+        labelID: Int,
+        achievements: List<Achievement>,
+        targetList: MutableList<Any>,
+    ) {
+        // Order by ID first
+        val achievementList = ArrayList(achievements)
+        achievementList.sortWith { achievement, t1 ->
+            achievement.index.toDouble().compareTo(t1.index.toDouble())
+        }
+
+        targetList.add(getString(labelID))
+        targetList.addAll(achievementList)
+    }
+
+    private fun getFloorValueString(
+        `val`: Float,
+        roundDown: Boolean,
+    ): String {
+        return if (roundDown) {
+            floor(`val`.toDouble()).toString()
+        } else {
+            if (`val`.toDouble() == 0.0) {
+                "0"
+            } else {
+                `val`.toString()
+            }
+        }
+    }
+
+    private fun getFloorValue(
+        value: Float,
+        roundDown: Boolean,
+    ): Float {
+        return if (roundDown) {
+            floor(value.toDouble()).toFloat()
+        } else {
+            value
+        }
+    }
+
+    private fun addEquipmentRow(
+        table: TableLayout,
+        gearKey: String?,
+        text: String?,
+        stats: String?,
+    ) {
+        val gearRow =
+            layoutInflater.inflate(R.layout.profile_gear_tablerow, table, false) as? TableRow
+
+        val draweeView = gearRow?.findViewById<PixelArtView>(R.id.gear_drawee)
+
+        draweeView?.loadImage("shop_$gearKey")
+
+        val keyTextView = gearRow?.findViewById<TextView>(R.id.tableRowTextView1)
+        keyTextView?.text = text
+
+        val valueTextView = gearRow?.findViewById<TextView>(R.id.tableRowTextView2)
+
+        if (stats?.isNotEmpty() == true) {
+            valueTextView?.text = stats
+        } else {
+            valueTextView?.visibility = View.GONE
+        }
+
+        table.addView(gearRow)
+    }
+
+    private fun addLevelAttributes(user: Member) {
+        val byLevelStat = min((user.stats?.lvl ?: 0) / 2.0f, 50f)
+        addAttributeRow(
+            getString(R.string.profile_level),
+            byLevelStat,
+            byLevelStat,
+            byLevelStat,
+            byLevelStat,
+            roundDown = true,
+            isSummary = false,
+        )
+    }
+
+    private fun loadItemDataByOutfit(outfit: Outfit?): Flow<List<Equipment>> {
+        val outfitList = ArrayList<String>()
+        if (outfit != null) {
+            outfitList.add(outfit.armor)
+            outfitList.add(outfit.back)
+            outfitList.add(outfit.body)
+            outfitList.add(outfit.eyeWear)
+            outfitList.add(outfit.head)
+            outfitList.add(outfit.headAccessory)
+            outfitList.add(outfit.shield)
+            outfitList.add(outfit.weapon)
+        }
+        return inventoryRepository.getEquipment(outfitList)
+    }
+
+    private fun gotGear(
+        equipmentList: List<Equipment>,
+        user: Member,
+    ) {
+        val userStatComputer = UserStatComputer()
+        val statsRows = userStatComputer.computeClassBonus(equipmentList, user)
+
+        binding.equipmentTableLayout.removeAllViews()
+        for (index in 1 until binding.attributesTableLayout.childCount) {
+            val child = binding.attributesTableLayout.getChildAt(index) ?: continue
+            if (child.isAttachedToWindow) {
+                binding.attributesTableLayout.removeViewAt(index)
+            }
+        }
+
+        addLevelAttributes(user)
+
+        for (row in statsRows) {
+            if (row is UserStatComputer.EquipmentRow) {
+                addEquipmentRow(binding.equipmentTableLayout, row.gearKey, row.text, row.stats)
+            } else if (row is UserStatComputer.AttributeRow) {
+                addAttributeRow(
+                    getString(row.labelId),
+                    row.strVal,
+                    row.intVal,
+                    row.conVal,
+                    row.perVal,
+                    row.roundDown,
+                    row.summary,
+                )
+            }
+        }
+
+        user.stats?.let { addNormalAddBuffAttributes(it) }
+    }
+
+    private fun gotCostume(obj: List<Equipment>) {
+        // fill costume table
+        binding.costumeTableLayout.removeAllViews()
+        for (i in obj) {
+            addEquipmentRow(binding.costumeTableLayout, i.key, i.text, "")
+        }
+    }
+
+    private fun addNormalAddBuffAttributes(stats: Stats) {
+        val buffs = stats.buffs
+
+        addAttributeRow(
+            getString(R.string.profile_allocated),
+            stats.strength?.toFloat() ?: 0f,
+            stats.intelligence?.toFloat() ?: 0f,
+            stats.constitution?.toFloat() ?: 0f,
+            stats.per?.toFloat() ?: 0f,
+            roundDown = true,
+            isSummary = false,
+        )
+        addAttributeRow(
+            getString(R.string.buffs),
+            buffs?.str
+                ?: 0f,
+            buffs?.intelligence ?: 0f,
+            buffs?.con ?: 0f,
+            buffs?.per ?: 0f,
+            roundDown = true,
+            isSummary = false,
+        )
+
+        // Summary row
+        addAttributeRow(
+            "",
+            attributeStrSum,
+            attributeIntSum,
+            attributeConSum,
+            attributePerSum,
+            roundDown = false,
+            isSummary = true,
+        )
+    }
+
+    private fun addAttributeRow(
+        label: String,
+        strVal: Float,
+        intVal: Float,
+        conVal: Float,
+        perVal: Float,
+        roundDown: Boolean,
+        isSummary: Boolean,
+    ) {
+        val tableRow =
+            layoutInflater.inflate(
+                R.layout.profile_attributetablerow,
+                binding.attributesTableLayout,
+                false,
+            ) as? TableRow ?: return
+        val keyTextView = tableRow.findViewById<TextView>(R.id.tv_attribute_type)
+        keyTextView?.text = label
+
+        val strTextView = tableRow.findViewById<TextView>(R.id.tv_attribute_str)
+        strTextView?.text = getFloorValueString(strVal, roundDown)
+
+        val intTextView = tableRow.findViewById<TextView>(R.id.tv_attribute_int)
+        intTextView?.text = getFloorValueString(intVal, roundDown)
+
+        val conTextView = tableRow.findViewById<TextView>(R.id.tv_attribute_con)
+        conTextView?.text = getFloorValueString(conVal, roundDown)
+
+        val perTextView = tableRow.findViewById<TextView>(R.id.tv_attribute_per)
+        perTextView?.text = getFloorValueString(perVal, roundDown)
+
+        if (isSummary) {
+            strTextView?.setTypeface(null, Typeface.BOLD)
+            intTextView?.setTypeface(null, Typeface.BOLD)
+            conTextView?.setTypeface(null, Typeface.BOLD)
+            perTextView?.setTypeface(null, Typeface.BOLD)
+        } else {
+            attributeStrSum += getFloorValue(strVal, roundDown)
+            attributeIntSum += getFloorValue(intVal, roundDown)
+            attributeConSum += getFloorValue(conVal, roundDown)
+            attributePerSum += getFloorValue(perVal, roundDown)
+            attributeRows.add(tableRow)
+            tableRow.visibility = if (attributeDetailsHidden) View.GONE else View.VISIBLE
+        }
+
+        binding.attributesTableLayout.addView(tableRow)
+    }
+
+    private fun toggleAttributeDetails() {
+        attributeDetailsHidden = !attributeDetailsHidden
+
+        binding.attributesCollapseIcon.setImageDrawable(
+            ContextCompat.getDrawable(
+                this,
+                if (attributeDetailsHidden) {
+                    R.drawable.ic_keyboard_arrow_right_black_24dp
+                } else {
+                    R.drawable.ic_keyboard_arrow_down_black_24dp
+                },
+            ),
+        )
+
+        for (row in attributeRows) {
+            row.visibility = if (attributeDetailsHidden) View.GONE else View.VISIBLE
+        }
+    }
+
+// endregion
+
+// region Navigation
+
+    override fun onSupportNavigateUp(): Boolean {
+        finish()
+        return true
+    }
+
+    @SuppressLint("MissingSuperCall")
+    override fun onBackPressed() {
+        finish()
+    }
+
+// endregion
+
+// region BaseActivity-Overrides
+
+    override fun getLayoutResId(): Int {
+        return R.layout.activity_full_profile
+    }
+
+    override fun getContentView(layoutResId: Int?): View {
+        binding = ActivityFullProfileBinding.inflate(layoutInflater)
+        return binding.root
+    }
+
+    companion object {
+        fun open(userId: String) {
+            if (userId == "system") {
+                return
+            }
+            val bundle = Bundle()
+            bundle.putString("userID", userId)
+            MainNavigationController.navigate(R.id.fullProfileActivity, bundle)
+        }
+    }
+
+// endregion
+    // endregion
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GemPurchaseActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GemPurchaseActivity.kt
index c49231c96..041ecbf77 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GemPurchaseActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GemPurchaseActivity.kt
@@ -10,7 +10,6 @@ import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
 class GemPurchaseActivity : PurchaseActivity() {
-
     override fun getLayoutResId(): Int {
         return R.layout.activity_gem_purchase
     }
@@ -37,11 +36,12 @@ class GemPurchaseActivity : PurchaseActivity() {
     }
 
     private fun createFragment(showSubscription: Boolean) {
-        val fragment = if (showSubscription) {
-            SubscriptionFragment()
-        } else {
-            GemsPurchaseFragment()
-        }
+        val fragment =
+            if (showSubscription) {
+                SubscriptionFragment()
+            } else {
+                GemsPurchaseFragment()
+            }
         supportFragmentManager
             .beginTransaction()
             .replace(R.id.fragment_container, fragment as Fragment)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftGemsActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftGemsActivity.kt
index fe3f66b7e..4caf1e2a5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftGemsActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftGemsActivity.kt
@@ -27,7 +27,6 @@ import javax.inject.Inject
 
 @AndroidEntryPoint
 class GiftGemsActivity : PurchaseActivity() {
-
     private lateinit var binding: ActivityGiftGemsBinding
 
     internal val currencyView: CurrencyView by lazy {
@@ -93,9 +92,11 @@ class GiftGemsActivity : PurchaseActivity() {
 
         setViewPagerAdapter()
 
-        lifecycleScope.launch(ExceptionHandler.coroutine {
-            showMemberLoadingErrorDialog()
-        }) {
+        lifecycleScope.launch(
+            ExceptionHandler.coroutine {
+                showMemberLoadingErrorDialog()
+            },
+        ) {
             val member = socialRepository.retrieveMember(giftedUsername ?: giftedUserID)
             if (member == null) {
                 showMemberLoadingErrorDialog()
@@ -121,34 +122,36 @@ class GiftGemsActivity : PurchaseActivity() {
     }
 
     private fun setViewPagerAdapter() {
-        val statePagerAdapter = object : FragmentStateAdapter(supportFragmentManager, lifecycle) {
-            override fun createFragment(position: Int): Fragment {
-                return if (position == 0) {
-                    val fragment = GiftPurchaseGemsFragment()
-                    fragment.setPurchaseHandler(purchaseHandler)
-                    fragment.setupCheckout()
-                    purchaseFragment = fragment
-                    purchaseFragment?.giftedMember = giftedMember
-                    fragment
-                } else {
-                    val fragment = GiftBalanceGemsFragment()
-                    balanceFragment = fragment
-                    balanceFragment?.giftedMember = giftedMember
-                    fragment
+        val statePagerAdapter =
+            object : FragmentStateAdapter(supportFragmentManager, lifecycle) {
+                override fun createFragment(position: Int): Fragment {
+                    return if (position == 0) {
+                        val fragment = GiftPurchaseGemsFragment()
+                        fragment.setPurchaseHandler(purchaseHandler)
+                        fragment.setupCheckout()
+                        purchaseFragment = fragment
+                        purchaseFragment?.giftedMember = giftedMember
+                        fragment
+                    } else {
+                        val fragment = GiftBalanceGemsFragment()
+                        balanceFragment = fragment
+                        balanceFragment?.giftedMember = giftedMember
+                        fragment
+                    }
+                }
+
+                override fun getItemCount(): Int {
+                    return 2
                 }
             }
-
-            override fun getItemCount(): Int {
-                return 2
-            }
-        }
         binding.viewPager.adapter = statePagerAdapter
         TabLayoutMediator(binding.tabLayout, binding.viewPager) { tab, position ->
-            tab.text = when (position) {
-                0 -> getString(R.string.purchase)
-                1 -> getString(R.string.from_balance)
-                else -> ""
-            }
+            tab.text =
+                when (position) {
+                    0 -> getString(R.string.purchase)
+                    1 -> getString(R.string.from_balance)
+                    else -> ""
+                }
         }.attach()
         statePagerAdapter.notifyDataSetChanged()
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftSubscriptionActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftSubscriptionActivity.kt
index 5b40f4f5a..ded143e02 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftSubscriptionActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftSubscriptionActivity.kt
@@ -26,7 +26,6 @@ import javax.inject.Inject
 
 @AndroidEntryPoint
 class GiftSubscriptionActivity : PurchaseActivity() {
-
     private lateinit var binding: ActivityGiftSubscriptionBinding
 
     @Inject
@@ -85,15 +84,17 @@ class GiftSubscriptionActivity : PurchaseActivity() {
         }
 
         if (giftedUsername?.isNotBlank() == true) {
-            binding.usernameTextView.text = "@${giftedUsername}"
+            binding.usernameTextView.text = "@$giftedUsername"
         }
 
         binding.subscriptionButton.setOnClickListener {
             selectedSubscriptionSku?.let { sku -> purchaseSubscription(sku) }
         }
-        lifecycleScope.launch(ExceptionHandler.coroutine {
-            showMemberLoadingErrorDialog()
-        }) {
+        lifecycleScope.launch(
+            ExceptionHandler.coroutine {
+                showMemberLoadingErrorDialog()
+            },
+        ) {
             val member = socialRepository.retrieveMember(giftedUsername ?: giftedUserID)
             if (member == null) {
                 showMemberLoadingErrorDialog()
@@ -131,10 +132,12 @@ class GiftSubscriptionActivity : PurchaseActivity() {
                 for (sku in skus) {
                     updateButtonLabel(sku)
                 }
-                skus.minByOrNull { it.oneTimePurchaseOfferDetails?.priceAmountMicros ?: 0 }?.let { selectSubscription(it) }
+                skus.minByOrNull { it.oneTimePurchaseOfferDetails?.priceAmountMicros ?: 0 }
+                    ?.let { selectSubscription(it) }
             }
         }
     }
+
     private fun updateButtonLabel(sku: ProductDetails) {
         val matchingView = buttonForSku(sku)
         if (matchingView != null) {
@@ -160,10 +163,10 @@ class GiftSubscriptionActivity : PurchaseActivity() {
 
     private fun buttonForSku(sku: String?): SubscriptionOptionView? {
         return when (sku) {
-            PurchaseTypes.Subscription1MonthNoRenew -> binding.subscription1MonthView
-            PurchaseTypes.Subscription3MonthNoRenew -> binding.subscription3MonthView
-            PurchaseTypes.Subscription6MonthNoRenew -> binding.subscription6MonthView
-            PurchaseTypes.Subscription12MonthNoRenew -> binding.subscription12MonthView
+            PurchaseTypes.SUBSCRIPTION_1_MONTH_NORENEW -> binding.subscription1MonthView
+            PurchaseTypes.SUBSCRIPTION_3_MONTH_NORENEW -> binding.subscription3MonthView
+            PurchaseTypes.SUBSCRIPTION_6_MONTH_NORENEW -> binding.subscription6MonthView
+            PurchaseTypes.SUBSCRIPTION_12_MONTH_NORENEW -> binding.subscription12MonthView
             else -> null
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupFormActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupFormActivity.kt
index 141199984..63b2a54b0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupFormActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupFormActivity.kt
@@ -14,7 +14,6 @@ import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
 class GroupFormActivity : BaseActivity() {
-
     private lateinit var binding: ActivityGroupFormBinding
     private var groupID: String? = null
     private var groupType: String? = null
@@ -96,7 +95,10 @@ class GroupFormActivity : BaseActivity() {
         val bundle = Bundle()
         bundle.putString("name", name)
         bundle.putString("groupType", groupType)
-        bundle.putString("description", MarkdownParser.parseCompiled(binding.groupDescriptionEditText.text.toString()))
+        bundle.putString(
+            "description",
+            MarkdownParser.parseCompiled(binding.groupDescriptionEditText.text.toString()),
+        )
         bundle.putBoolean("leaderOnlyChallenges", binding.leaderCreateChallengeSwitch.isChecked)
         bundle.putString("leader", this.groupLeader)
         resultIntent.putExtras(bundle)
@@ -106,7 +108,6 @@ class GroupFormActivity : BaseActivity() {
     }
 
     companion object {
-
         const val GROUP_FORM_ACTIVITY = 11
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupInviteActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupInviteActivity.kt
index b66c27f90..612487568 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupInviteActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupInviteActivity.kt
@@ -1,106 +1,109 @@
-package com.habitrpg.android.habitica.ui.activities
-
-import android.app.Activity
-import android.content.Intent
-import android.os.Bundle
-import android.view.Menu
-import android.view.MenuItem
-import android.view.View
-import androidx.fragment.app.Fragment
-import androidx.viewpager2.adapter.FragmentStateAdapter
-import com.google.android.material.tabs.TabLayoutMediator
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.data.SocialRepository
-import com.habitrpg.android.habitica.databinding.ActivityPartyInviteBinding
-import com.habitrpg.android.habitica.ui.fragments.social.party.PartyInviteFragment
-import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard
-import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class GroupInviteActivity : BaseActivity() {
-
-    private lateinit var binding: ActivityPartyInviteBinding
-
-    @Inject
-    lateinit var socialRepository: SocialRepository
-
-    internal var fragments: MutableList<PartyInviteFragment> = ArrayList()
-
-    override fun getLayoutResId(): Int {
-        return R.layout.activity_party_invite
-    }
-
-    override fun getContentView(layoutResId: Int?): View {
-        binding = ActivityPartyInviteBinding.inflate(layoutInflater)
-        return binding.root
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setupToolbar(findViewById(R.id.toolbar))
-        binding.viewPager.currentItem = 0
-
-        supportActionBar?.title = null
-
-        setViewPagerAdapter()
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        menuInflater.inflate(R.menu.menu_party_invite, menu)
-        return super.onCreateOptionsMenu(menu)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        return when (item.itemId) {
-            R.id.action_send_invites -> {
-                setResult(Activity.RESULT_OK, createResultIntent())
-                dismissKeyboard()
-                true
-            }
-            android.R.id.home -> {
-                onBackPressed()
-                true
-            }
-            else -> super.onOptionsItemSelected(item)
-        }
-    }
-
-    private fun createResultIntent(): Intent {
-        val intent = Intent()
-        if (fragments.size == 0) return intent
-        return intent
-    }
-
-    private fun setViewPagerAdapter() {
-        val fragmentManager = supportFragmentManager
-
-        val statePagerAdapter = object : FragmentStateAdapter(fragmentManager, lifecycle) {
-            override fun createFragment(position: Int): Fragment {
-                val fragment = PartyInviteFragment()
-                fragments.add(fragment)
-                return fragment
-            }
-
-            override fun getItemCount(): Int {
-                return 2
-            }
-        }
-        binding.viewPager.adapter = statePagerAdapter
-        TabLayoutMediator(binding.tabLayout, binding.viewPager) { tab, position ->
-            tab.text = when (position) {
-                0 -> getString(R.string.invite_existing_users)
-                1 -> getString(R.string.by_email)
-                else -> ""
-            }
-        }.attach()
-        statePagerAdapter.notifyDataSetChanged()
-    }
-
-    companion object {
-        const val RESULT_SEND_INVITES = 100
-        const val USER_IDS_KEY = "userIDs"
-        const val IS_EMAIL_KEY = "isEmail"
-        const val EMAILS_KEY = "emails"
-    }
-}
+package com.habitrpg.android.habitica.ui.activities
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Bundle
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import androidx.fragment.app.Fragment
+import androidx.viewpager2.adapter.FragmentStateAdapter
+import com.google.android.material.tabs.TabLayoutMediator
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.data.SocialRepository
+import com.habitrpg.android.habitica.databinding.ActivityPartyInviteBinding
+import com.habitrpg.android.habitica.ui.fragments.social.party.PartyInviteFragment
+import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard
+import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class GroupInviteActivity : BaseActivity() {
+    private lateinit var binding: ActivityPartyInviteBinding
+
+    @Inject
+    lateinit var socialRepository: SocialRepository
+
+    internal var fragments: MutableList<PartyInviteFragment> = ArrayList()
+
+    override fun getLayoutResId(): Int {
+        return R.layout.activity_party_invite
+    }
+
+    override fun getContentView(layoutResId: Int?): View {
+        binding = ActivityPartyInviteBinding.inflate(layoutInflater)
+        return binding.root
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setupToolbar(findViewById(R.id.toolbar))
+        binding.viewPager.currentItem = 0
+
+        supportActionBar?.title = null
+
+        setViewPagerAdapter()
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        menuInflater.inflate(R.menu.menu_party_invite, menu)
+        return super.onCreateOptionsMenu(menu)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return when (item.itemId) {
+            R.id.action_send_invites -> {
+                setResult(Activity.RESULT_OK, createResultIntent())
+                dismissKeyboard()
+                true
+            }
+
+            android.R.id.home -> {
+                onBackPressed()
+                true
+            }
+
+            else -> super.onOptionsItemSelected(item)
+        }
+    }
+
+    private fun createResultIntent(): Intent {
+        val intent = Intent()
+        if (fragments.size == 0) return intent
+        return intent
+    }
+
+    private fun setViewPagerAdapter() {
+        val fragmentManager = supportFragmentManager
+
+        val statePagerAdapter =
+            object : FragmentStateAdapter(fragmentManager, lifecycle) {
+                override fun createFragment(position: Int): Fragment {
+                    val fragment = PartyInviteFragment()
+                    fragments.add(fragment)
+                    return fragment
+                }
+
+                override fun getItemCount(): Int {
+                    return 2
+                }
+            }
+        binding.viewPager.adapter = statePagerAdapter
+        TabLayoutMediator(binding.tabLayout, binding.viewPager) { tab, position ->
+            tab.text =
+                when (position) {
+                    0 -> getString(R.string.invite_existing_users)
+                    1 -> getString(R.string.by_email)
+                    else -> ""
+                }
+        }.attach()
+        statePagerAdapter.notifyDataSetChanged()
+    }
+
+    companion object {
+        const val RESULT_SEND_INVITES = 100
+        const val USER_IDS_KEY = "userIDs"
+        const val IS_EMAIL_KEY = "isEmail"
+        const val EMAILS_KEY = "emails"
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GuidelinesActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GuidelinesActivity.kt
index aa288374f..6e666afc7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GuidelinesActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GuidelinesActivity.kt
@@ -25,24 +25,35 @@ class GuidelinesActivity : BaseActivity() {
         setupToolbar(findViewById(R.id.toolbar))
 
         val client = OkHttpClient()
-        val request = Request.Builder().url("https://s3.amazonaws.com/habitica-assets/mobileApp/endpoint/community-guidelines.md").build()
-        client.newCall(request).enqueue(object : Callback {
-            override fun onFailure(call: Call, e: IOException) {
-                ExceptionHandler.reportError(e)
-            }
-
-            @Throws(IOException::class)
-            override fun onResponse(call: Call, response: Response) {
-                val `in` = response.body?.byteStream()
-                val reader = BufferedReader(InputStreamReader(`in`))
-                val text = reader.readText()
-                response.body?.close()
-
-                findViewById<TextView>(R.id.text_view).post {
-                    findViewById<TextView>(R.id.text_view).setMarkdown(text)
+        val request =
+            Request.Builder()
+                .url("https://s3.amazonaws.com/habitica-assets/mobileApp/endpoint/community-guidelines.md")
+                .build()
+        client.newCall(request).enqueue(
+            object : Callback {
+                override fun onFailure(
+                    call: Call,
+                    e: IOException,
+                ) {
+                    ExceptionHandler.reportError(e)
                 }
-            }
-        })
+
+                @Throws(IOException::class)
+                override fun onResponse(
+                    call: Call,
+                    response: Response,
+                ) {
+                    val `in` = response.body?.byteStream()
+                    val reader = BufferedReader(InputStreamReader(`in`))
+                    val text = reader.readText()
+                    response.body?.close()
+
+                    findViewById<TextView>(R.id.text_view).post {
+                        findViewById<TextView>(R.id.text_view).setMarkdown(text)
+                    }
+                }
+            },
+        )
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/HabitButtonWidgetActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/HabitButtonWidgetActivity.kt
index 8680cd0cc..88f208225 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/HabitButtonWidgetActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/HabitButtonWidgetActivity.kt
@@ -1,103 +1,115 @@
-package com.habitrpg.android.habitica.ui.activities
-
-import android.app.Activity
-import android.appwidget.AppWidgetManager
-import android.content.Intent
-import android.os.Bundle
-import android.view.View
-import androidx.core.content.edit
-import androidx.preference.PreferenceManager
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.data.TaskRepository
-import com.habitrpg.android.habitica.databinding.WidgetConfigureHabitButtonBinding
-import com.habitrpg.android.habitica.ui.adapter.SkillTasksRecyclerViewAdapter
-import com.habitrpg.android.habitica.widget.HabitButtonWidgetProvider
-import com.habitrpg.common.habitica.helpers.ExceptionHandler
-import com.habitrpg.shared.habitica.models.tasks.TaskType
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.SupervisorJob
-import kotlinx.coroutines.flow.firstOrNull
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class HabitButtonWidgetActivity : BaseActivity() {
-    private val job = SupervisorJob()
-
-    private lateinit var binding: WidgetConfigureHabitButtonBinding
-
-    @Inject
-    lateinit var taskRepository: TaskRepository
-
-    private var widgetId: Int = 0
-    private var adapter: SkillTasksRecyclerViewAdapter? = null
-
-    override fun getLayoutResId(): Int {
-        return R.layout.widget_configure_habit_button
-    }
-
-    override fun getContentView(layoutResId: Int?): View {
-        binding = WidgetConfigureHabitButtonBinding.inflate(layoutInflater)
-        return binding.root
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        val intent = intent
-        val extras = intent.extras
-        if (extras != null) {
-            widgetId = extras.getInt(AppWidgetManager.EXTRA_APPWIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID)
-        }
-
-        // If this activity was started with an intent without an app widget ID,
-        // finish with an error.
-        if (widgetId == AppWidgetManager.INVALID_APPWIDGET_ID) {
-            finish()
-        }
-
-        var layoutManager: LinearLayoutManager? = binding.recyclerView.layoutManager as? LinearLayoutManager
-
-        if (layoutManager == null) {
-            layoutManager = LinearLayoutManager(this)
-
-            binding.recyclerView.layoutManager = layoutManager
-        }
-
-        adapter = SkillTasksRecyclerViewAdapter()
-        adapter?.onTaskSelection = {
-            taskSelected(it.id)
-        }
-        binding.recyclerView.adapter = adapter
-
-        CoroutineScope(Dispatchers.Main + job).launch(ExceptionHandler.coroutine()) {
-            adapter?.data = taskRepository.getTasks(TaskType.HABIT, includedGroupIDs = emptyArray()).firstOrNull() ?: listOf()
-        }
-    }
-
-    private fun taskSelected(taskId: String?) {
-        finishWithSelection(taskId)
-    }
-
-    private fun finishWithSelection(selectedTaskId: String?) {
-        storeSelectedTaskId(selectedTaskId)
-
-        val resultValue = Intent()
-        resultValue.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, widgetId)
-        setResult(Activity.RESULT_OK, resultValue)
-        finish()
-
-        val intent = Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE, null, this, HabitButtonWidgetProvider::class.java)
-        intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, intArrayOf(widgetId))
-        sendBroadcast(intent)
-    }
-
-    private fun storeSelectedTaskId(selectedTaskId: String?) {
-        PreferenceManager.getDefaultSharedPreferences(this).edit {
-            putString("habit_button_widget_$widgetId", selectedTaskId)
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.activities
+
+import android.app.Activity
+import android.appwidget.AppWidgetManager
+import android.content.Intent
+import android.os.Bundle
+import android.view.View
+import androidx.core.content.edit
+import androidx.preference.PreferenceManager
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.data.TaskRepository
+import com.habitrpg.android.habitica.databinding.WidgetConfigureHabitButtonBinding
+import com.habitrpg.android.habitica.ui.adapter.SkillTasksRecyclerViewAdapter
+import com.habitrpg.android.habitica.widget.HabitButtonWidgetProvider
+import com.habitrpg.common.habitica.helpers.ExceptionHandler
+import com.habitrpg.shared.habitica.models.tasks.TaskType
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class HabitButtonWidgetActivity : BaseActivity() {
+    private val job = SupervisorJob()
+
+    private lateinit var binding: WidgetConfigureHabitButtonBinding
+
+    @Inject
+    lateinit var taskRepository: TaskRepository
+
+    private var widgetId: Int = 0
+    private var adapter: SkillTasksRecyclerViewAdapter? = null
+
+    override fun getLayoutResId(): Int {
+        return R.layout.widget_configure_habit_button
+    }
+
+    override fun getContentView(layoutResId: Int?): View {
+        binding = WidgetConfigureHabitButtonBinding.inflate(layoutInflater)
+        return binding.root
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val intent = intent
+        val extras = intent.extras
+        if (extras != null) {
+            widgetId =
+                extras.getInt(
+                    AppWidgetManager.EXTRA_APPWIDGET_ID,
+                    AppWidgetManager.INVALID_APPWIDGET_ID,
+                )
+        }
+
+        // If this activity was started with an intent without an app widget ID,
+        // finish with an error.
+        if (widgetId == AppWidgetManager.INVALID_APPWIDGET_ID) {
+            finish()
+        }
+
+        var layoutManager: LinearLayoutManager? =
+            binding.recyclerView.layoutManager as? LinearLayoutManager
+
+        if (layoutManager == null) {
+            layoutManager = LinearLayoutManager(this)
+
+            binding.recyclerView.layoutManager = layoutManager
+        }
+
+        adapter = SkillTasksRecyclerViewAdapter()
+        adapter?.onTaskSelection = {
+            taskSelected(it.id)
+        }
+        binding.recyclerView.adapter = adapter
+
+        CoroutineScope(Dispatchers.Main + job).launch(ExceptionHandler.coroutine()) {
+            adapter?.data = taskRepository.getTasks(TaskType.HABIT, includedGroupIDs = emptyArray())
+                .firstOrNull() ?: listOf()
+        }
+    }
+
+    private fun taskSelected(taskId: String?) {
+        finishWithSelection(taskId)
+    }
+
+    private fun finishWithSelection(selectedTaskId: String?) {
+        storeSelectedTaskId(selectedTaskId)
+
+        val resultValue = Intent()
+        resultValue.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, widgetId)
+        setResult(Activity.RESULT_OK, resultValue)
+        finish()
+
+        val intent =
+            Intent(
+                AppWidgetManager.ACTION_APPWIDGET_UPDATE,
+                null,
+                this,
+                HabitButtonWidgetProvider::class.java,
+            )
+        intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, intArrayOf(widgetId))
+        sendBroadcast(intent)
+    }
+
+    private fun storeSelectedTaskId(selectedTaskId: String?) {
+        PreferenceManager.getDefaultSharedPreferences(this).edit {
+            putString("habit_button_widget_$widgetId", selectedTaskId)
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/IntroActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/IntroActivity.kt
index 45950003e..a13397057 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/IntroActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/IntroActivity.kt
@@ -1,140 +1,179 @@
-package com.habitrpg.android.habitica.ui.activities
-
-import android.content.Intent
-import android.os.Bundle
-import android.view.View
-import android.view.ViewGroup
-import android.view.WindowManager
-import androidx.core.content.ContextCompat
-import androidx.core.content.res.ResourcesCompat
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentManager
-import androidx.fragment.app.FragmentStatePagerAdapter
-import androidx.lifecycle.lifecycleScope
-import androidx.viewpager.widget.ViewPager
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.data.ContentRepository
-import com.habitrpg.android.habitica.databinding.ActivityIntroBinding
-import com.habitrpg.android.habitica.ui.fragments.setup.IntroFragment
-import com.habitrpg.common.habitica.helpers.ExceptionHandler
-import com.viewpagerindicator.IconPagerAdapter
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class IntroActivity : BaseActivity(), View.OnClickListener, ViewPager.OnPageChangeListener {
-
-    private lateinit var binding: ActivityIntroBinding
-
-    @Inject
-    lateinit var contentRepository: ContentRepository
-
-    override fun getLayoutResId(): Int {
-        return R.layout.activity_intro
-    }
-
-    override fun getContentView(layoutResId: Int?): View {
-        binding = ActivityIntroBinding.inflate(layoutInflater)
-        return binding.root
-    }
-
-    public override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        setupIntro()
-        binding.viewPagerIndicator.setViewPager(binding.viewPager)
-
-        binding.skipButton.setOnClickListener(this)
-        binding.finishButton.setOnClickListener(this)
-
-        lifecycleScope.launch(ExceptionHandler.coroutine()) {
-            contentRepository.retrieveContent()
-        }
-
-        window.statusBarColor = ContextCompat.getColor(this, R.color.black_20_alpha)
-        window.addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS)
-    }
-
-    private fun setupIntro() {
-        binding.viewPager.adapter = PagerAdapter(supportFragmentManager)
-
-        binding.viewPager.addOnPageChangeListener(this)
-    }
-
-    override fun onClick(v: View) {
-        finishIntro()
-    }
-
-    private fun finishIntro() {
-        val intent = Intent(this, LoginActivity::class.java)
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK)
-
-        this.startActivity(intent)
-        overridePendingTransition(0, R.anim.activity_fade_out)
-        finish()
-    }
-
-    override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) { /* no-on */ }
-
-    override fun onPageSelected(position: Int) {
-        if (position == 2) {
-            binding.finishButton.visibility = View.VISIBLE
-        } else {
-            binding.finishButton.visibility = View.GONE
-        }
-    }
-
-    override fun onPageScrollStateChanged(state: Int) { /* no-on */ }
-
-    private inner class PagerAdapter(fm: FragmentManager) : FragmentStatePagerAdapter(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT), IconPagerAdapter {
-
-        override fun getItem(position: Int): Fragment {
-            val fragment = IntroFragment()
-            configureFragment(fragment, position)
-            return fragment
-        }
-
-        override fun getIconResId(index: Int): Int {
-            return R.drawable.indicator_diamond
-        }
-
-        override fun getCount(): Int {
-            return 3
-        }
-
-        override fun instantiateItem(container: ViewGroup, position: Int): Any {
-            val item = super.instantiateItem(container, position)
-            if (item is IntroFragment) {
-                configureFragment(item, position)
-            }
-            return item
-        }
-    }
-
-    private fun configureFragment(fragment: IntroFragment, position: Int) {
-        when (position) {
-            0 -> {
-                fragment.setImage(ResourcesCompat.getDrawable(resources, R.drawable.intro_1, null))
-                fragment.setSubtitle(getString(R.string.intro_1_subtitle))
-                fragment.setTitleImage(ResourcesCompat.getDrawable(resources, R.drawable.intro_1_title, null))
-                fragment.setDescription(getString(R.string.intro_1_description, getString(R.string.habitica_user_count)))
-                fragment.setBackgroundColor(ContextCompat.getColor(this@IntroActivity, R.color.brand_300))
-            }
-            1 -> {
-                fragment.setImage(ResourcesCompat.getDrawable(resources, R.drawable.intro_2, null))
-                fragment.setSubtitle(getString(R.string.intro_2_subtitle))
-                fragment.setTitle(getString(R.string.intro_2_title))
-                fragment.setDescription(getString(R.string.intro_2_description))
-                fragment.setBackgroundColor(ContextCompat.getColor(this@IntroActivity, R.color.blue_10))
-            }
-            2 -> {
-                fragment.setImage(ResourcesCompat.getDrawable(resources, R.drawable.intro_3, null))
-                fragment.setSubtitle(getString(R.string.intro_3_subtitle))
-                fragment.setTitle(getString(R.string.intro_3_title))
-                fragment.setDescription(getString(R.string.intro_3_description))
-                fragment.setBackgroundColor(ContextCompat.getColor(this@IntroActivity, R.color.red_100))
-            }
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.activities
+
+import android.content.Intent
+import android.os.Bundle
+import android.view.View
+import android.view.ViewGroup
+import android.view.WindowManager
+import androidx.core.content.ContextCompat
+import androidx.core.content.res.ResourcesCompat
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.FragmentStatePagerAdapter
+import androidx.lifecycle.lifecycleScope
+import androidx.viewpager.widget.ViewPager
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.data.ContentRepository
+import com.habitrpg.android.habitica.databinding.ActivityIntroBinding
+import com.habitrpg.android.habitica.ui.fragments.setup.IntroFragment
+import com.habitrpg.common.habitica.helpers.ExceptionHandler
+import com.viewpagerindicator.IconPagerAdapter
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class IntroActivity : BaseActivity(), View.OnClickListener, ViewPager.OnPageChangeListener {
+    private lateinit var binding: ActivityIntroBinding
+
+    @Inject
+    lateinit var contentRepository: ContentRepository
+
+    override fun getLayoutResId(): Int {
+        return R.layout.activity_intro
+    }
+
+    override fun getContentView(layoutResId: Int?): View {
+        binding = ActivityIntroBinding.inflate(layoutInflater)
+        return binding.root
+    }
+
+    public override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        setupIntro()
+        binding.viewPagerIndicator.setViewPager(binding.viewPager)
+
+        binding.skipButton.setOnClickListener(this)
+        binding.finishButton.setOnClickListener(this)
+
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            contentRepository.retrieveContent()
+        }
+
+        window.statusBarColor = ContextCompat.getColor(this, R.color.black_20_alpha)
+        window.addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS)
+    }
+
+    private fun setupIntro() {
+        binding.viewPager.adapter = PagerAdapter(supportFragmentManager)
+
+        binding.viewPager.addOnPageChangeListener(this)
+    }
+
+    override fun onClick(v: View) {
+        finishIntro()
+    }
+
+    private fun finishIntro() {
+        val intent = Intent(this, LoginActivity::class.java)
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK)
+
+        this.startActivity(intent)
+        overridePendingTransition(0, R.anim.activity_fade_out)
+        finish()
+    }
+
+    override fun onPageScrolled(
+        position: Int,
+        positionOffset: Float,
+        positionOffsetPixels: Int,
+    ) { // no-on
+    }
+
+    override fun onPageSelected(position: Int) {
+        if (position == 2) {
+            binding.finishButton.visibility = View.VISIBLE
+        } else {
+            binding.finishButton.visibility = View.GONE
+        }
+    }
+
+    override fun onPageScrollStateChanged(state: Int) { // no-on
+    }
+
+    private inner class PagerAdapter(fm: FragmentManager) :
+        FragmentStatePagerAdapter(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT), IconPagerAdapter {
+        override fun getItem(position: Int): Fragment {
+            val fragment = IntroFragment()
+            configureFragment(fragment, position)
+            return fragment
+        }
+
+        override fun getIconResId(index: Int): Int {
+            return R.drawable.indicator_diamond
+        }
+
+        override fun getCount(): Int {
+            return 3
+        }
+
+        override fun instantiateItem(
+            container: ViewGroup,
+            position: Int,
+        ): Any {
+            val item = super.instantiateItem(container, position)
+            if (item is IntroFragment) {
+                configureFragment(item, position)
+            }
+            return item
+        }
+    }
+
+    private fun configureFragment(
+        fragment: IntroFragment,
+        position: Int,
+    ) {
+        when (position) {
+            0 -> {
+                fragment.setImage(ResourcesCompat.getDrawable(resources, R.drawable.intro_1, null))
+                fragment.setSubtitle(getString(R.string.intro_1_subtitle))
+                fragment.setTitleImage(
+                    ResourcesCompat.getDrawable(
+                        resources,
+                        R.drawable.intro_1_title,
+                        null,
+                    ),
+                )
+                fragment.setDescription(
+                    getString(
+                        R.string.intro_1_description,
+                        getString(R.string.habitica_user_count),
+                    ),
+                )
+                fragment.setBackgroundColor(
+                    ContextCompat.getColor(
+                        this@IntroActivity,
+                        R.color.brand_300,
+                    ),
+                )
+            }
+
+            1 -> {
+                fragment.setImage(ResourcesCompat.getDrawable(resources, R.drawable.intro_2, null))
+                fragment.setSubtitle(getString(R.string.intro_2_subtitle))
+                fragment.setTitle(getString(R.string.intro_2_title))
+                fragment.setDescription(getString(R.string.intro_2_description))
+                fragment.setBackgroundColor(
+                    ContextCompat.getColor(
+                        this@IntroActivity,
+                        R.color.blue_10,
+                    ),
+                )
+            }
+
+            2 -> {
+                fragment.setImage(ResourcesCompat.getDrawable(resources, R.drawable.intro_3, null))
+                fragment.setSubtitle(getString(R.string.intro_3_subtitle))
+                fragment.setTitle(getString(R.string.intro_3_title))
+                fragment.setDescription(getString(R.string.intro_3_description))
+                fragment.setBackgroundColor(
+                    ContextCompat.getColor(
+                        this@IntroActivity,
+                        R.color.red_100,
+                    ),
+                )
+            }
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.kt
index c995ea20a..378c77494 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.kt
@@ -1,502 +1,556 @@
-package com.habitrpg.android.habitica.ui.activities
-
-import android.accounts.AccountManager
-import android.animation.Animator
-import android.animation.AnimatorListenerAdapter
-import android.animation.AnimatorSet
-import android.animation.ObjectAnimator
-import android.animation.ValueAnimator
-import android.app.Activity
-import android.content.Intent
-import android.content.SharedPreferences
-import android.os.Build
-import android.os.Bundle
-import android.text.InputType
-import android.text.SpannableString
-import android.text.method.LinkMovementMethod
-import android.text.style.UnderlineSpan
-import android.view.MenuItem
-import android.view.View
-import android.view.Window
-import android.view.WindowManager
-import android.view.inputmethod.EditorInfo
-import android.widget.EditText
-import android.widget.LinearLayout
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.core.content.ContextCompat
-import androidx.lifecycle.lifecycleScope
-import androidx.preference.PreferenceManager
-import com.google.android.gms.tasks.Tasks
-import com.google.android.gms.wearable.CapabilityClient
-import com.google.android.gms.wearable.MessageClient
-import com.google.android.gms.wearable.Wearable
-import com.google.firebase.analytics.FirebaseAnalytics
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.data.ApiClient
-import com.habitrpg.android.habitica.databinding.ActivityLoginBinding
-import com.habitrpg.android.habitica.extensions.addCancelButton
-import com.habitrpg.android.habitica.extensions.addOkButton
-import com.habitrpg.android.habitica.extensions.updateStatusBarColor
-import com.habitrpg.android.habitica.helpers.Analytics
-import com.habitrpg.android.habitica.helpers.AppConfigManager
-import com.habitrpg.android.habitica.helpers.EventCategory
-import com.habitrpg.android.habitica.helpers.HitType
-import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard
-import com.habitrpg.android.habitica.ui.viewmodels.AuthenticationViewModel
-import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import com.habitrpg.common.habitica.helpers.ExceptionHandler
-import com.habitrpg.common.habitica.helpers.launchCatching
-import com.habitrpg.common.habitica.models.auth.UserAuthResponse
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class LoginActivity : BaseActivity() {
-
-    private lateinit var binding: ActivityLoginBinding
-
-    @Inject
-    lateinit var apiClient: ApiClient
-
-    @Inject
-    lateinit var sharedPrefs: SharedPreferences
-
-    @Inject
-    lateinit var configManager: AppConfigManager
-
-    @Inject
-    lateinit var viewModel: AuthenticationViewModel
-
-    private var isRegistering: Boolean = false
-    private var isShowingForm: Boolean = false
-
-    private val loginClick = View.OnClickListener {
-        binding.PBAsyncTask.visibility = View.VISIBLE
-        if (isRegistering) {
-            registerWithPassword()
-        } else {
-            loginWithPassword()
-        }
-    }
-
-    private fun loginWithPassword() {
-        val username: String = binding.username.text.toString().trim { it <= ' ' }
-        val password: String = binding.password.text.toString()
-        if (username.isEmpty() || password.isEmpty()) {
-            showValidationError(R.string.login_validation_error_fieldsmissing)
-            return
-        }
-        lifecycleScope.launch(
-            ExceptionHandler.coroutine {
-                hideProgress()
-                ExceptionHandler.reportError(it)
-            }
-        ) {
-            val response = apiClient.connectUser(username, password)
-            if (response != null) {
-                handleAuthResponse(response)
-            } else {
-                hideProgress()
-            }
-        }
-    }
-
-    private fun registerWithPassword() {
-        val username: String = binding.username.text.toString().trim { it <= ' ' }
-        val email: String = binding.email.text.toString().trim { it <= ' ' }
-        val password: String = binding.password.text.toString()
-        val confirmPassword: String = binding.confirmPassword.text.toString()
-        if (username.isEmpty() || password.isEmpty() || email.isEmpty() || confirmPassword.isEmpty()) {
-            showValidationError(R.string.login_validation_error_fieldsmissing)
-            return
-        }
-        if (password.length < configManager.minimumPasswordLength()) {
-            showValidationError(
-                getString(
-                    R.string.password_too_short,
-                    configManager.minimumPasswordLength()
-                )
-            )
-            return
-        }
-        lifecycleScope.launch(
-            ExceptionHandler.coroutine {
-                hideProgress()
-                ExceptionHandler.reportError(it)
-            }
-        ) {
-            val response = apiClient.registerUser(username, email, password, confirmPassword)
-            if (response != null) {
-                handleAuthResponse(response)
-            } else {
-                hideProgress()
-            }
-        }
-    }
-
-    override fun getLayoutResId(): Int {
-        return R.layout.activity_login
-    }
-
-    override fun getContentView(layoutResId: Int?): View {
-        binding = ActivityLoginBinding.inflate(layoutInflater)
-        return binding.root
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        window.requestFeature(Window.FEATURE_ACTION_BAR)
-        super.onCreate(savedInstanceState)
-        supportActionBar?.hide()
-        // Set default values to avoid null-responses when requesting unedited settings
-        PreferenceManager.setDefaultValues(this, R.xml.preferences_fragment, false)
-
-        binding.loginBtn.setOnClickListener(loginClick)
-
-        val content = SpannableString(binding.forgotPassword.text)
-        content.setSpan(UnderlineSpan(), 0, content.length, 0)
-        binding.forgotPassword.text = content
-        binding.privacyPolicy.movementMethod = LinkMovementMethod.getInstance()
-
-        this.isRegistering = true
-
-        val additionalData = HashMap<String, Any>()
-        additionalData["page"] = this.javaClass.simpleName
-
-        binding.backgroundContainer.post { binding.backgroundContainer.scrollTo(0, binding.backgroundContainer.bottom) }
-        binding.backgroundContainer.isScrollable = false
-
-        window.statusBarColor = ContextCompat.getColor(this, R.color.black_20_alpha)
-        window.addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS)
-
-        binding.newGameButton.setOnClickListener { newGameButtonClicked() }
-        binding.showLoginButton.setOnClickListener { showLoginButtonClicked() }
-        binding.backButton.setOnClickListener { backButtonClicked() }
-        binding.forgotPassword.setOnClickListener { onForgotPasswordClicked() }
-        binding.googleLoginButton.setOnClickListener {
-            binding.googleLoginProgress.visibility = View.VISIBLE
-            viewModel.handleGoogleLogin(this, pickAccountResult)
-        }
-    }
-
-    override fun loadTheme(sharedPreferences: SharedPreferences, forced: Boolean) {
-        super.loadTheme(sharedPreferences, forced)
-        window.updateStatusBarColor(R.color.black_20_alpha, false)
-    }
-
-    override fun onBackPressed() {
-        if (isShowingForm) {
-            hideForm()
-        } else {
-            super.onBackPressed()
-        }
-    }
-
-    private fun resetLayout() {
-        if (this.isRegistering) {
-            if (binding.email.visibility == View.GONE) {
-                show(binding.email)
-            }
-            if (binding.confirmPassword.visibility == View.GONE) {
-                show(binding.confirmPassword)
-            }
-        } else {
-            if (binding.email.visibility == View.VISIBLE) {
-                hide(binding.email)
-            }
-            if (binding.confirmPassword.visibility == View.VISIBLE) {
-                hide(binding.confirmPassword)
-            }
-        }
-    }
-
-    private fun startMainActivity() {
-        val intent = Intent(this@LoginActivity, MainActivity::class.java)
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK)
-        startActivity(intent)
-        finish()
-    }
-
-    private fun startSetupActivity() {
-        val intent = Intent(this@LoginActivity, SetupActivity::class.java)
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK)
-        startActivity(intent)
-        finish()
-    }
-
-    private fun toggleRegistering() {
-        this.isRegistering = (!this.isRegistering)
-        this.setRegistering()
-    }
-
-    private fun setRegistering() {
-        if (this.isRegistering) {
-            binding.loginBtn.text = getString(R.string.register_btn)
-            binding.username.setHint(R.string.username)
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                binding.username.setAutofillHints("newUsername")
-                binding.password.setAutofillHints("newPassword")
-            }
-            binding.password.imeOptions = EditorInfo.IME_ACTION_NEXT
-            binding.googleLoginButton.setText(R.string.register_btn_google)
-        } else {
-            binding.loginBtn.text = getString(R.string.login_btn)
-            binding.username.setHint(R.string.email_username)
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                binding.username.setAutofillHints("username")
-                binding.password.setAutofillHints("password")
-            }
-            binding.password.imeOptions = EditorInfo.IME_ACTION_DONE
-            binding.googleLoginButton.setText(R.string.login_btn_google)
-        }
-        this.resetLayout()
-    }
-
-    private fun handleAuthResponse(response: UserAuthResponse) {
-        viewModel.handleAuthResponse(response)
-        try {
-            val messageClient: MessageClient = Wearable.getMessageClient(this)
-            val capabilityClient: CapabilityClient = Wearable.getCapabilityClient(this)
-            lifecycleScope.launch(Dispatchers.IO) {
-                try {
-                    val info = Tasks.await(
-                        capabilityClient.getCapability(
-                            "receive_message",
-                            CapabilityClient.FILTER_REACHABLE
-                        )
-                    )
-                    info.nodes.forEach {
-                        Tasks.await(
-                            messageClient.sendMessage(
-                                it.id,
-                                "/auth",
-                                "${response.id}:${response.apiToken}".toByteArray()
-                            )
-                        )
-                    }
-                } catch (e: Exception) {
-                    // Wearable API is not available on this device.
-                }
-            }
-        } catch (e: Exception) {
-            // Wearable API is not available on this device.
-        }
-        handleAuthResponse(response.newUser)
-    }
-
-    private fun handleAuthResponse(isNew: Boolean) {
-        hideProgress()
-        dismissKeyboard()
-
-        if (isRegistering) {
-            FirebaseAnalytics.getInstance(this).logEvent("user_registered", null)
-        }
-        lifecycleScope.launch(ExceptionHandler.coroutine()) {
-            userRepository.retrieveUser(true, true)
-            if (isNew) {
-                startSetupActivity()
-            } else {
-                startMainActivity()
-                Analytics.sendEvent("login", EventCategory.BEHAVIOUR, HitType.EVENT)
-            }
-        }
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            R.id.action_toggleRegistering -> toggleRegistering()
-        }
-        return super.onOptionsItemSelected(item)
-    }
-
-    private fun hideProgress() {
-        runOnUiThread {
-            binding.googleLoginProgress.visibility = View.GONE
-            binding.PBAsyncTask.visibility = View.GONE
-        }
-    }
-
-    private fun showValidationError(resourceMessageString: Int) {
-        showValidationError(getString(resourceMessageString))
-    }
-
-    private fun showValidationError(message: String) {
-        binding.PBAsyncTask.visibility = View.GONE
-        val alert = HabiticaAlertDialog(this)
-        alert.setTitle(R.string.login_validation_error_title)
-        alert.setMessage(message)
-        alert.addOkButton()
-        alert.show()
-    }
-
-    private val pickAccountResult = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-        if (it.resultCode == Activity.RESULT_OK) {
-            viewModel.googleEmail = it?.data?.getStringExtra(AccountManager.KEY_ACCOUNT_NAME)
-            viewModel.handleGoogleLoginResult(this, recoverFromPlayServicesErrorResult) { isNew ->
-                handleAuthResponse(isNew)
-            }
-        } else {
-            binding.googleLoginProgress.visibility = View.GONE
-        }
-    }
-
-    private val recoverFromPlayServicesErrorResult = registerForActivityResult(
-        ActivityResultContracts.StartActivityForResult()
-    ) {
-        if (it.resultCode != Activity.RESULT_CANCELED) {
-            viewModel.handleGoogleLoginResult(this, null) { isNew ->
-                handleAuthResponse(isNew)
-            }
-        }
-    }
-
-    private fun newGameButtonClicked() {
-        isRegistering = true
-        showForm()
-        setRegistering()
-    }
-
-    private fun showLoginButtonClicked() {
-        isRegistering = false
-        showForm()
-        setRegistering()
-    }
-
-    private fun backButtonClicked() {
-        if (isShowingForm) {
-            hideForm()
-        }
-    }
-
-    private fun showForm() {
-        isShowingForm = true
-        val panAnimation = ObjectAnimator.ofInt(binding.backgroundContainer, "scrollY", 0).setDuration(1000)
-        val newGameAlphaAnimation = ObjectAnimator.ofFloat(binding.newGameButton, View.ALPHA, 0.toFloat())
-        val showLoginAlphaAnimation = ObjectAnimator.ofFloat(binding.showLoginButton, View.ALPHA, 0.toFloat())
-        val scaleLogoAnimation = ValueAnimator.ofInt(binding.logoView.measuredHeight, (binding.logoView.measuredHeight * 0.75).toInt())
-        scaleLogoAnimation.addUpdateListener { valueAnimator ->
-            val value = valueAnimator.animatedValue as? Int ?: 0
-            val layoutParams = binding.logoView.layoutParams
-            layoutParams.height = value
-            binding.logoView.layoutParams = layoutParams
-        }
-        if (isRegistering) {
-            newGameAlphaAnimation.startDelay = 600
-            newGameAlphaAnimation.duration = 400
-            showLoginAlphaAnimation.duration = 400
-            newGameAlphaAnimation.addListener(object : AnimatorListenerAdapter() {
-                override fun onAnimationEnd(animation: Animator) {
-                    binding.newGameButton.visibility = View.GONE
-                    binding.showLoginButton.visibility = View.GONE
-                    binding.loginScrollview.visibility = View.VISIBLE
-                    binding.loginScrollview.alpha = 1f
-                }
-            })
-        } else {
-            showLoginAlphaAnimation.startDelay = 600
-            showLoginAlphaAnimation.duration = 400
-            newGameAlphaAnimation.duration = 400
-            showLoginAlphaAnimation.addListener(object : AnimatorListenerAdapter() {
-                override fun onAnimationEnd(animation: Animator) {
-                    binding.newGameButton.visibility = View.GONE
-                    binding.showLoginButton.visibility = View.GONE
-                    binding.loginScrollview.visibility = View.VISIBLE
-                    binding.loginScrollview.alpha = 1f
-                }
-            })
-        }
-        val backAlphaAnimation = ObjectAnimator.ofFloat(binding.backButton, View.ALPHA, 1.toFloat()).setDuration(800)
-        val showAnimation = AnimatorSet()
-        showAnimation.playTogether(panAnimation, newGameAlphaAnimation, showLoginAlphaAnimation, scaleLogoAnimation)
-        showAnimation.play(backAlphaAnimation).after(panAnimation)
-        for (i in 0 until binding.formWrapper.childCount) {
-            val view = binding.formWrapper.getChildAt(i)
-            view.alpha = 0f
-            val animator = ObjectAnimator.ofFloat(view, View.ALPHA, 1.toFloat()).setDuration(400)
-            animator.startDelay = (100 * i).toLong()
-            showAnimation.play(animator).after(panAnimation)
-        }
-
-        showAnimation.start()
-    }
-
-    private fun hideForm() {
-        isShowingForm = false
-        val panAnimation = ObjectAnimator.ofInt(binding.backgroundContainer, "scrollY", binding.backgroundContainer.bottom).setDuration(1000)
-        val newGameAlphaAnimation = ObjectAnimator.ofFloat(binding.newGameButton, View.ALPHA, 1.toFloat()).setDuration(700)
-        val showLoginAlphaAnimation = ObjectAnimator.ofFloat(binding.showLoginButton, View.ALPHA, 1.toFloat()).setDuration(700)
-        val scaleLogoAnimation = ValueAnimator.ofInt(binding.logoView.measuredHeight, (binding.logoView.measuredHeight * 1.333333).toInt())
-        scaleLogoAnimation.addUpdateListener { valueAnimator ->
-            val value = valueAnimator.animatedValue as? Int
-            val layoutParams = binding.logoView.layoutParams
-            layoutParams.height = value ?: 0
-            binding.logoView.layoutParams = layoutParams
-        }
-        showLoginAlphaAnimation.startDelay = 300
-        val scrollViewAlphaAnimation = ObjectAnimator.ofFloat(binding.loginScrollview, View.ALPHA, 0.toFloat()).setDuration(800)
-        scrollViewAlphaAnimation.addListener(object : AnimatorListenerAdapter() {
-            override fun onAnimationEnd(animation: Animator) {
-                binding.newGameButton.visibility = View.VISIBLE
-                binding.showLoginButton.visibility = View.VISIBLE
-                binding.loginScrollview.visibility = View.INVISIBLE
-            }
-        })
-        val backAlphaAnimation = ObjectAnimator.ofFloat(binding.backButton, View.ALPHA, 0.toFloat()).setDuration(800)
-        val showAnimation = AnimatorSet()
-        showAnimation.playTogether(panAnimation, scrollViewAlphaAnimation, backAlphaAnimation, scaleLogoAnimation)
-        showAnimation.play(newGameAlphaAnimation).after(scrollViewAlphaAnimation)
-        showAnimation.play(showLoginAlphaAnimation).after(scrollViewAlphaAnimation)
-        showAnimation.start()
-        dismissKeyboard()
-    }
-
-    private fun onForgotPasswordClicked() {
-        val input = EditText(this)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            input.setAutofillHints(EditText.AUTOFILL_HINT_EMAIL_ADDRESS)
-        }
-        input.inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS
-        input.hint = getString(R.string.forgot_password_hint_example)
-        input.textSize = 16f
-        val lp = LinearLayout.LayoutParams(
-            LinearLayout.LayoutParams.MATCH_PARENT,
-            LinearLayout.LayoutParams.MATCH_PARENT
-        )
-        input.layoutParams = lp
-        val alertDialog = HabiticaAlertDialog(this)
-        alertDialog.setTitle(R.string.forgot_password_title)
-        alertDialog.setMessage(R.string.forgot_password_description)
-        alertDialog.setAdditionalContentView(input)
-        alertDialog.addButton(R.string.send, true) { _, _ ->
-            lifecycleScope.launchCatching {
-                userRepository.sendPasswordResetEmail(input.text.toString())
-                showPasswordEmailConfirmation()
-            }
-        }
-        alertDialog.addCancelButton()
-        alertDialog.show()
-    }
-
-    private fun showPasswordEmailConfirmation() {
-        val alert = HabiticaAlertDialog(this)
-        alert.setMessage(R.string.forgot_password_confirmation)
-        alert.addOkButton()
-        alert.show()
-    }
-
-    override fun finish() {
-        dismissKeyboard()
-        super.finish()
-    }
-
-    companion object {
-        fun show(v: View) {
-            v.visibility = View.VISIBLE
-        }
-
-        fun hide(v: View) {
-            v.visibility = View.GONE
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.activities
+
+import android.accounts.AccountManager
+import android.animation.Animator
+import android.animation.AnimatorListenerAdapter
+import android.animation.AnimatorSet
+import android.animation.ObjectAnimator
+import android.animation.ValueAnimator
+import android.app.Activity
+import android.content.Intent
+import android.content.SharedPreferences
+import android.os.Build
+import android.os.Bundle
+import android.text.InputType
+import android.text.SpannableString
+import android.text.method.LinkMovementMethod
+import android.text.style.UnderlineSpan
+import android.view.MenuItem
+import android.view.View
+import android.view.Window
+import android.view.WindowManager
+import android.view.inputmethod.EditorInfo
+import android.widget.EditText
+import android.widget.LinearLayout
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.core.content.ContextCompat
+import androidx.lifecycle.lifecycleScope
+import androidx.preference.PreferenceManager
+import com.google.android.gms.tasks.Tasks
+import com.google.android.gms.wearable.CapabilityClient
+import com.google.android.gms.wearable.MessageClient
+import com.google.android.gms.wearable.Wearable
+import com.google.firebase.analytics.FirebaseAnalytics
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.data.ApiClient
+import com.habitrpg.android.habitica.databinding.ActivityLoginBinding
+import com.habitrpg.android.habitica.extensions.addCancelButton
+import com.habitrpg.android.habitica.extensions.addOkButton
+import com.habitrpg.android.habitica.extensions.updateStatusBarColor
+import com.habitrpg.android.habitica.helpers.Analytics
+import com.habitrpg.android.habitica.helpers.AppConfigManager
+import com.habitrpg.android.habitica.helpers.EventCategory
+import com.habitrpg.android.habitica.helpers.HitType
+import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard
+import com.habitrpg.android.habitica.ui.viewmodels.AuthenticationViewModel
+import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
+import com.habitrpg.common.habitica.helpers.ExceptionHandler
+import com.habitrpg.common.habitica.helpers.launchCatching
+import com.habitrpg.common.habitica.models.auth.UserAuthResponse
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class LoginActivity : BaseActivity() {
+    private lateinit var binding: ActivityLoginBinding
+
+    @Inject
+    lateinit var apiClient: ApiClient
+
+    @Inject
+    lateinit var sharedPrefs: SharedPreferences
+
+    @Inject
+    lateinit var configManager: AppConfigManager
+
+    @Inject
+    lateinit var viewModel: AuthenticationViewModel
+
+    private var isRegistering: Boolean = false
+    private var isShowingForm: Boolean = false
+
+    private val loginClick =
+        View.OnClickListener {
+            binding.PBAsyncTask.visibility = View.VISIBLE
+            if (isRegistering) {
+                registerWithPassword()
+            } else {
+                loginWithPassword()
+            }
+        }
+
+    private fun loginWithPassword() {
+        val username: String = binding.username.text.toString().trim { it <= ' ' }
+        val password: String = binding.password.text.toString()
+        if (username.isEmpty() || password.isEmpty()) {
+            showValidationError(R.string.login_validation_error_fieldsmissing)
+            return
+        }
+        lifecycleScope.launch(
+            ExceptionHandler.coroutine {
+                hideProgress()
+                ExceptionHandler.reportError(it)
+            },
+        ) {
+            val response = apiClient.connectUser(username, password)
+            if (response != null) {
+                handleAuthResponse(response)
+            } else {
+                hideProgress()
+            }
+        }
+    }
+
+    private fun registerWithPassword() {
+        val username: String = binding.username.text.toString().trim { it <= ' ' }
+        val email: String = binding.email.text.toString().trim { it <= ' ' }
+        val password: String = binding.password.text.toString()
+        val confirmPassword: String = binding.confirmPassword.text.toString()
+        if (username.isEmpty() || password.isEmpty() || email.isEmpty() || confirmPassword.isEmpty()) {
+            showValidationError(R.string.login_validation_error_fieldsmissing)
+            return
+        }
+        if (password.length < configManager.minimumPasswordLength()) {
+            showValidationError(
+                getString(
+                    R.string.password_too_short,
+                    configManager.minimumPasswordLength(),
+                ),
+            )
+            return
+        }
+        lifecycleScope.launch(
+            ExceptionHandler.coroutine {
+                hideProgress()
+                ExceptionHandler.reportError(it)
+            },
+        ) {
+            val response = apiClient.registerUser(username, email, password, confirmPassword)
+            if (response != null) {
+                handleAuthResponse(response)
+            } else {
+                hideProgress()
+            }
+        }
+    }
+
+    override fun getLayoutResId(): Int {
+        return R.layout.activity_login
+    }
+
+    override fun getContentView(layoutResId: Int?): View {
+        binding = ActivityLoginBinding.inflate(layoutInflater)
+        return binding.root
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        window.requestFeature(Window.FEATURE_ACTION_BAR)
+        super.onCreate(savedInstanceState)
+        supportActionBar?.hide()
+        // Set default values to avoid null-responses when requesting unedited settings
+        PreferenceManager.setDefaultValues(this, R.xml.preferences_fragment, false)
+
+        binding.loginBtn.setOnClickListener(loginClick)
+
+        val content = SpannableString(binding.forgotPassword.text)
+        content.setSpan(UnderlineSpan(), 0, content.length, 0)
+        binding.forgotPassword.text = content
+        binding.privacyPolicy.movementMethod = LinkMovementMethod.getInstance()
+
+        this.isRegistering = true
+
+        val additionalData = HashMap<String, Any>()
+        additionalData["page"] = this.javaClass.simpleName
+
+        binding.backgroundContainer.post {
+            binding.backgroundContainer.scrollTo(
+                0,
+                binding.backgroundContainer.bottom,
+            )
+        }
+        binding.backgroundContainer.isScrollable = false
+
+        window.statusBarColor = ContextCompat.getColor(this, R.color.black_20_alpha)
+        window.addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS)
+
+        binding.newGameButton.setOnClickListener { newGameButtonClicked() }
+        binding.showLoginButton.setOnClickListener { showLoginButtonClicked() }
+        binding.backButton.setOnClickListener { backButtonClicked() }
+        binding.forgotPassword.setOnClickListener { onForgotPasswordClicked() }
+        binding.googleLoginButton.setOnClickListener {
+            binding.googleLoginProgress.visibility = View.VISIBLE
+            viewModel.handleGoogleLogin(this, pickAccountResult)
+        }
+    }
+
+    override fun loadTheme(
+        sharedPreferences: SharedPreferences,
+        forced: Boolean,
+    ) {
+        super.loadTheme(sharedPreferences, forced)
+        window.updateStatusBarColor(R.color.black_20_alpha, false)
+    }
+
+    override fun onBackPressed() {
+        if (isShowingForm) {
+            hideForm()
+        } else {
+            super.onBackPressed()
+        }
+    }
+
+    private fun resetLayout() {
+        if (this.isRegistering) {
+            if (binding.email.visibility == View.GONE) {
+                show(binding.email)
+            }
+            if (binding.confirmPassword.visibility == View.GONE) {
+                show(binding.confirmPassword)
+            }
+        } else {
+            if (binding.email.visibility == View.VISIBLE) {
+                hide(binding.email)
+            }
+            if (binding.confirmPassword.visibility == View.VISIBLE) {
+                hide(binding.confirmPassword)
+            }
+        }
+    }
+
+    private fun startMainActivity() {
+        val intent = Intent(this@LoginActivity, MainActivity::class.java)
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK)
+        startActivity(intent)
+        finish()
+    }
+
+    private fun startSetupActivity() {
+        val intent = Intent(this@LoginActivity, SetupActivity::class.java)
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK)
+        startActivity(intent)
+        finish()
+    }
+
+    private fun toggleRegistering() {
+        this.isRegistering = (!this.isRegistering)
+        this.setRegistering()
+    }
+
+    private fun setRegistering() {
+        if (this.isRegistering) {
+            binding.loginBtn.text = getString(R.string.register_btn)
+            binding.username.setHint(R.string.username)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                binding.username.setAutofillHints("newUsername")
+                binding.password.setAutofillHints("newPassword")
+            }
+            binding.password.imeOptions = EditorInfo.IME_ACTION_NEXT
+            binding.googleLoginButton.setText(R.string.register_btn_google)
+        } else {
+            binding.loginBtn.text = getString(R.string.login_btn)
+            binding.username.setHint(R.string.email_username)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                binding.username.setAutofillHints("username")
+                binding.password.setAutofillHints("password")
+            }
+            binding.password.imeOptions = EditorInfo.IME_ACTION_DONE
+            binding.googleLoginButton.setText(R.string.login_btn_google)
+        }
+        this.resetLayout()
+    }
+
+    private fun handleAuthResponse(response: UserAuthResponse) {
+        viewModel.handleAuthResponse(response)
+        try {
+            val messageClient: MessageClient = Wearable.getMessageClient(this)
+            val capabilityClient: CapabilityClient = Wearable.getCapabilityClient(this)
+            lifecycleScope.launch(Dispatchers.IO) {
+                try {
+                    val info =
+                        Tasks.await(
+                            capabilityClient.getCapability(
+                                "receive_message",
+                                CapabilityClient.FILTER_REACHABLE,
+                            ),
+                        )
+                    info.nodes.forEach {
+                        Tasks.await(
+                            messageClient.sendMessage(
+                                it.id,
+                                "/auth",
+                                "${response.id}:${response.apiToken}".toByteArray(),
+                            ),
+                        )
+                    }
+                } catch (e: Exception) {
+                    // Wearable API is not available on this device.
+                }
+            }
+        } catch (e: Exception) {
+            // Wearable API is not available on this device.
+        }
+        handleAuthResponse(response.newUser)
+    }
+
+    private fun handleAuthResponse(isNew: Boolean) {
+        hideProgress()
+        dismissKeyboard()
+
+        if (isRegistering) {
+            FirebaseAnalytics.getInstance(this).logEvent("user_registered", null)
+        }
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.retrieveUser(true, true)
+            if (isNew) {
+                startSetupActivity()
+            } else {
+                startMainActivity()
+                Analytics.sendEvent("login", EventCategory.BEHAVIOUR, HitType.EVENT)
+            }
+        }
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+            R.id.action_toggleRegistering -> toggleRegistering()
+        }
+        return super.onOptionsItemSelected(item)
+    }
+
+    private fun hideProgress() {
+        runOnUiThread {
+            binding.googleLoginProgress.visibility = View.GONE
+            binding.PBAsyncTask.visibility = View.GONE
+        }
+    }
+
+    private fun showValidationError(resourceMessageString: Int) {
+        showValidationError(getString(resourceMessageString))
+    }
+
+    private fun showValidationError(message: String) {
+        binding.PBAsyncTask.visibility = View.GONE
+        val alert = HabiticaAlertDialog(this)
+        alert.setTitle(R.string.login_validation_error_title)
+        alert.setMessage(message)
+        alert.addOkButton()
+        alert.show()
+    }
+
+    private val pickAccountResult =
+        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+            if (it.resultCode == Activity.RESULT_OK) {
+                viewModel.googleEmail = it?.data?.getStringExtra(AccountManager.KEY_ACCOUNT_NAME)
+                viewModel.handleGoogleLoginResult(
+                    this,
+                    recoverFromPlayServicesErrorResult,
+                ) { isNew ->
+                    handleAuthResponse(isNew)
+                }
+            } else {
+                binding.googleLoginProgress.visibility = View.GONE
+            }
+        }
+
+    private val recoverFromPlayServicesErrorResult =
+        registerForActivityResult(
+            ActivityResultContracts.StartActivityForResult(),
+        ) {
+            if (it.resultCode != Activity.RESULT_CANCELED) {
+                viewModel.handleGoogleLoginResult(this, null) { isNew ->
+                    handleAuthResponse(isNew)
+                }
+            }
+        }
+
+    private fun newGameButtonClicked() {
+        isRegistering = true
+        showForm()
+        setRegistering()
+    }
+
+    private fun showLoginButtonClicked() {
+        isRegistering = false
+        showForm()
+        setRegistering()
+    }
+
+    private fun backButtonClicked() {
+        if (isShowingForm) {
+            hideForm()
+        }
+    }
+
+    private fun showForm() {
+        isShowingForm = true
+        val panAnimation =
+            ObjectAnimator.ofInt(binding.backgroundContainer, "scrollY", 0).setDuration(1000)
+        val newGameAlphaAnimation =
+            ObjectAnimator.ofFloat(binding.newGameButton, View.ALPHA, 0.toFloat())
+        val showLoginAlphaAnimation =
+            ObjectAnimator.ofFloat(binding.showLoginButton, View.ALPHA, 0.toFloat())
+        val scaleLogoAnimation =
+            ValueAnimator.ofInt(
+                binding.logoView.measuredHeight,
+                (binding.logoView.measuredHeight * 0.75).toInt(),
+            )
+        scaleLogoAnimation.addUpdateListener { valueAnimator ->
+            val value = valueAnimator.animatedValue as? Int ?: 0
+            val layoutParams = binding.logoView.layoutParams
+            layoutParams.height = value
+            binding.logoView.layoutParams = layoutParams
+        }
+        if (isRegistering) {
+            newGameAlphaAnimation.startDelay = 600
+            newGameAlphaAnimation.duration = 400
+            showLoginAlphaAnimation.duration = 400
+            newGameAlphaAnimation.addListener(
+                object : AnimatorListenerAdapter() {
+                    override fun onAnimationEnd(animation: Animator) {
+                        binding.newGameButton.visibility = View.GONE
+                        binding.showLoginButton.visibility = View.GONE
+                        binding.loginScrollview.visibility = View.VISIBLE
+                        binding.loginScrollview.alpha = 1f
+                    }
+                },
+            )
+        } else {
+            showLoginAlphaAnimation.startDelay = 600
+            showLoginAlphaAnimation.duration = 400
+            newGameAlphaAnimation.duration = 400
+            showLoginAlphaAnimation.addListener(
+                object : AnimatorListenerAdapter() {
+                    override fun onAnimationEnd(animation: Animator) {
+                        binding.newGameButton.visibility = View.GONE
+                        binding.showLoginButton.visibility = View.GONE
+                        binding.loginScrollview.visibility = View.VISIBLE
+                        binding.loginScrollview.alpha = 1f
+                    }
+                },
+            )
+        }
+        val backAlphaAnimation =
+            ObjectAnimator.ofFloat(binding.backButton, View.ALPHA, 1.toFloat()).setDuration(800)
+        val showAnimation = AnimatorSet()
+        showAnimation.playTogether(
+            panAnimation,
+            newGameAlphaAnimation,
+            showLoginAlphaAnimation,
+            scaleLogoAnimation,
+        )
+        showAnimation.play(backAlphaAnimation).after(panAnimation)
+        for (i in 0 until binding.formWrapper.childCount) {
+            val view = binding.formWrapper.getChildAt(i)
+            view.alpha = 0f
+            val animator = ObjectAnimator.ofFloat(view, View.ALPHA, 1.toFloat()).setDuration(400)
+            animator.startDelay = (100 * i).toLong()
+            showAnimation.play(animator).after(panAnimation)
+        }
+
+        showAnimation.start()
+    }
+
+    private fun hideForm() {
+        isShowingForm = false
+        val panAnimation =
+            ObjectAnimator.ofInt(
+                binding.backgroundContainer,
+                "scrollY",
+                binding.backgroundContainer.bottom,
+            ).setDuration(1000)
+        val newGameAlphaAnimation =
+            ObjectAnimator.ofFloat(binding.newGameButton, View.ALPHA, 1.toFloat()).setDuration(700)
+        val showLoginAlphaAnimation =
+            ObjectAnimator.ofFloat(binding.showLoginButton, View.ALPHA, 1.toFloat())
+                .setDuration(700)
+        val scaleLogoAnimation =
+            ValueAnimator.ofInt(
+                binding.logoView.measuredHeight,
+                (binding.logoView.measuredHeight * 1.333333).toInt(),
+            )
+        scaleLogoAnimation.addUpdateListener { valueAnimator ->
+            val value = valueAnimator.animatedValue as? Int
+            val layoutParams = binding.logoView.layoutParams
+            layoutParams.height = value ?: 0
+            binding.logoView.layoutParams = layoutParams
+        }
+        showLoginAlphaAnimation.startDelay = 300
+        val scrollViewAlphaAnimation =
+            ObjectAnimator.ofFloat(binding.loginScrollview, View.ALPHA, 0.toFloat())
+                .setDuration(800)
+        scrollViewAlphaAnimation.addListener(
+            object : AnimatorListenerAdapter() {
+                override fun onAnimationEnd(animation: Animator) {
+                    binding.newGameButton.visibility = View.VISIBLE
+                    binding.showLoginButton.visibility = View.VISIBLE
+                    binding.loginScrollview.visibility = View.INVISIBLE
+                }
+            },
+        )
+        val backAlphaAnimation =
+            ObjectAnimator.ofFloat(binding.backButton, View.ALPHA, 0.toFloat()).setDuration(800)
+        val showAnimation = AnimatorSet()
+        showAnimation.playTogether(
+            panAnimation,
+            scrollViewAlphaAnimation,
+            backAlphaAnimation,
+            scaleLogoAnimation,
+        )
+        showAnimation.play(newGameAlphaAnimation).after(scrollViewAlphaAnimation)
+        showAnimation.play(showLoginAlphaAnimation).after(scrollViewAlphaAnimation)
+        showAnimation.start()
+        dismissKeyboard()
+    }
+
+    private fun onForgotPasswordClicked() {
+        val input = EditText(this)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            input.setAutofillHints(EditText.AUTOFILL_HINT_EMAIL_ADDRESS)
+        }
+        input.inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS
+        input.hint = getString(R.string.forgot_password_hint_example)
+        input.textSize = 16f
+        val lp =
+            LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.MATCH_PARENT,
+                LinearLayout.LayoutParams.MATCH_PARENT,
+            )
+        input.layoutParams = lp
+        val alertDialog = HabiticaAlertDialog(this)
+        alertDialog.setTitle(R.string.forgot_password_title)
+        alertDialog.setMessage(R.string.forgot_password_description)
+        alertDialog.setAdditionalContentView(input)
+        alertDialog.addButton(R.string.send, true) { _, _ ->
+            lifecycleScope.launchCatching {
+                userRepository.sendPasswordResetEmail(input.text.toString())
+                showPasswordEmailConfirmation()
+            }
+        }
+        alertDialog.addCancelButton()
+        alertDialog.show()
+    }
+
+    private fun showPasswordEmailConfirmation() {
+        val alert = HabiticaAlertDialog(this)
+        alert.setMessage(R.string.forgot_password_confirmation)
+        alert.addOkButton()
+        alert.show()
+    }
+
+    override fun finish() {
+        dismissKeyboard()
+        super.finish()
+    }
+
+    companion object {
+        fun show(v: View) {
+            v.visibility = View.VISIBLE
+        }
+
+        fun hide(v: View) {
+            v.visibility = View.GONE
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
index bfddc3412..d33661ea0 100755
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
@@ -49,8 +49,6 @@ import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.data.TaskRepository
 import com.habitrpg.android.habitica.databinding.ActivityMainBinding
 import com.habitrpg.android.habitica.extensions.hideKeyboard
-import com.habitrpg.common.habitica.extensions.observeOnce
-import com.habitrpg.common.habitica.extensions.setScaledPadding
 import com.habitrpg.android.habitica.extensions.updateStatusBarColor
 import com.habitrpg.android.habitica.helpers.Analytics
 import com.habitrpg.android.habitica.helpers.AppConfigManager
@@ -70,11 +68,9 @@ import com.habitrpg.android.habitica.models.user.UserQuestStatus
 import com.habitrpg.android.habitica.ui.TutorialView
 import com.habitrpg.android.habitica.ui.fragments.NavigationDrawerFragment
 import com.habitrpg.android.habitica.ui.theme.colors
-import com.habitrpg.common.habitica.theme.HabiticaTheme
 import com.habitrpg.android.habitica.ui.viewmodels.MainActivityViewModel
 import com.habitrpg.android.habitica.ui.viewmodels.NotificationsViewModel
 import com.habitrpg.android.habitica.ui.views.AppHeaderView
-import com.habitrpg.common.habitica.views.ComposableAvatarView
 import com.habitrpg.android.habitica.ui.views.GroupPlanMemberList
 import com.habitrpg.android.habitica.ui.views.HabiticaButton
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
@@ -90,10 +86,14 @@ import com.habitrpg.common.habitica.extensions.DataBindingUtils
 import com.habitrpg.common.habitica.extensions.dpToPx
 import com.habitrpg.common.habitica.extensions.getThemeColor
 import com.habitrpg.common.habitica.extensions.isUsingNightModeResources
+import com.habitrpg.common.habitica.extensions.observeOnce
+import com.habitrpg.common.habitica.extensions.setScaledPadding
 import com.habitrpg.common.habitica.helpers.ExceptionHandler
 import com.habitrpg.common.habitica.helpers.MainNavigationController
 import com.habitrpg.common.habitica.helpers.launchCatching
+import com.habitrpg.common.habitica.theme.HabiticaTheme
 import com.habitrpg.common.habitica.views.AvatarView
+import com.habitrpg.common.habitica.views.ComposableAvatarView
 import com.habitrpg.shared.habitica.models.responses.MaintenanceResponse
 import com.habitrpg.shared.habitica.models.responses.TaskScoringResult
 import dagger.hilt.android.AndroidEntryPoint
@@ -169,15 +169,16 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
     private var userQuestStatus = UserQuestStatus.NO_QUEST
     private var lastNotificationOpen: Long? = null
 
-    private val notificationPermissionLauncher = registerForActivityResult(
-        ActivityResultContracts.RequestPermission()
-    ) { granted ->
-        if (granted) {
-            viewModel.pushNotificationManager.addPushDeviceUsingStoredToken()
-        } else {
-            viewModel.updateAllowPushNotifications(false)
+    private val notificationPermissionLauncher =
+        registerForActivityResult(
+            ActivityResultContracts.RequestPermission(),
+        ) { granted ->
+            if (granted) {
+                viewModel.pushNotificationManager.addPushDeviceUsingStoredToken()
+            } else {
+                viewModel.updateAllowPushNotifications(false)
+            }
         }
-    }
 
     private val classSelectionResult =
         registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
@@ -240,51 +241,57 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
             supportFragmentManager.findFragmentById(R.id.navigation_drawer) as? NavigationDrawerFragment
         drawerFragment?.setUp(R.id.navigation_drawer, drawerLayout, notificationsViewModel)
 
-        drawerToggle = object : ActionBarDrawerToggle(
-            this,
-            drawerLayout,
-            R.string.navigation_drawer_open,
-            R.string.navigation_drawer_close
-        ) {}
+        drawerToggle =
+            object : ActionBarDrawerToggle(
+                this,
+                drawerLayout,
+                R.string.navigation_drawer_open,
+                R.string.navigation_drawer_close,
+            ) {}
         // Set the drawer toggle as the DrawerListener
         drawerToggle?.let { drawerLayout.addDrawerListener(it) }
-        drawerLayout.addDrawerListener(object : DrawerLayout.DrawerListener {
-            private var isOpeningDrawer: Boolean? = null
+        drawerLayout.addDrawerListener(
+            object : DrawerLayout.DrawerListener {
+                private var isOpeningDrawer: Boolean? = null
 
-            override fun onDrawerSlide(drawerView: View, slideOffset: Float) {
-                if (!isUsingNightModeResources()) {
-                    if (slideOffset < 0.5f && isOpeningDrawer == null) {
-                        window.updateStatusBarColor(getThemeColor(R.attr.colorPrimaryDark), false)
-                        isOpeningDrawer = true
-                    } else if (slideOffset > 0.5f && isOpeningDrawer == null) {
-                        window.updateStatusBarColor(
-                            getThemeColor(R.attr.headerBackgroundColor),
-                            true
-                        )
-                        isOpeningDrawer = false
+                override fun onDrawerSlide(
+                    drawerView: View,
+                    slideOffset: Float,
+                ) {
+                    if (!isUsingNightModeResources()) {
+                        if (slideOffset < 0.5f && isOpeningDrawer == null) {
+                            window.updateStatusBarColor(getThemeColor(R.attr.colorPrimaryDark), false)
+                            isOpeningDrawer = true
+                        } else if (slideOffset > 0.5f && isOpeningDrawer == null) {
+                            window.updateStatusBarColor(
+                                getThemeColor(R.attr.headerBackgroundColor),
+                                true,
+                            )
+                            isOpeningDrawer = false
+                        }
                     }
                 }
-            }
 
-            override fun onDrawerOpened(drawerView: View) {
-                hideKeyboard()
-                if (!isUsingNightModeResources()) {
-                    window.updateStatusBarColor(getThemeColor(R.attr.colorPrimaryDark), false)
+                override fun onDrawerOpened(drawerView: View) {
+                    hideKeyboard()
+                    if (!isUsingNightModeResources()) {
+                        window.updateStatusBarColor(getThemeColor(R.attr.colorPrimaryDark), false)
+                    }
+                    isOpeningDrawer = null
+                    drawerFragment?.updatePromo()
                 }
-                isOpeningDrawer = null
-                drawerFragment?.updatePromo()
-            }
 
-            override fun onDrawerClosed(drawerView: View) {
-                if (!isUsingNightModeResources()) {
-                    window.updateStatusBarColor(getThemeColor(R.attr.headerBackgroundColor), true)
+                override fun onDrawerClosed(drawerView: View) {
+                    if (!isUsingNightModeResources()) {
+                        window.updateStatusBarColor(getThemeColor(R.attr.headerBackgroundColor), true)
+                    }
+                    isOpeningDrawer = null
                 }
-                isOpeningDrawer = null
-            }
 
-            override fun onDrawerStateChanged(newState: Int) {
-            }
-        })
+                override fun onDrawerStateChanged(newState: Int) {
+                }
+            },
+        )
 
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         supportActionBar?.setHomeButtonEnabled(true)
@@ -295,7 +302,7 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
             HabiticaTheme {
                 val user by viewModel.user.observeAsState(null)
                 val teamPlan by viewModel.userViewModel.currentTeamPlan.collectAsStateLifecycleAware(
-                    null
+                    null,
                 )
                 val teamPlanMembers by viewModel.userViewModel.currentTeamPlanMembers.observeAsState()
                 val canShowTeamHeader: Boolean by viewModel.canShowTeamPlanHeader
@@ -309,9 +316,12 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
                             Column(
                                 horizontalAlignment = Alignment.CenterHorizontally,
                                 verticalArrangement = Arrangement.spacedBy(4.dp),
-                                modifier = Modifier.padding(22.dp)
+                                modifier = Modifier.padding(22.dp),
                             ) {
-                                ComposableAvatarView(avatar = user, configManager = appConfigManager)
+                                ComposableAvatarView(
+                                    avatar = user,
+                                    configManager = appConfigManager,
+                                )
                                 Column(
                                     horizontalAlignment = Alignment.CenterHorizontally,
                                     verticalArrangement = Arrangement.spacedBy(15.dp),
@@ -322,8 +332,13 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
                                         modifier = Modifier.height(48.dp),
                                         onClick = {
                                             dismiss()
-                                            MainNavigationController.navigate(MainNavDirections.openProfileActivity(user?.id ?: ""))
-                                        }) {
+                                            MainNavigationController.navigate(
+                                                MainNavDirections.openProfileActivity(
+                                                    user?.id ?: "",
+                                                ),
+                                            )
+                                        },
+                                    ) {
                                         Text(stringResource(id = R.string.open_profile))
                                     }
 
@@ -334,7 +349,8 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
                                         onClick = {
                                             dismiss()
                                             MainNavigationController.navigate(R.id.avatarOverviewFragment)
-                                        }) {
+                                        },
+                                    ) {
                                         Text(stringResource(id = R.string.customize_avatar))
                                     }
 
@@ -352,12 +368,13 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
                                                             this@MainActivity,
                                                             it,
                                                             "Check out my avatar on Habitica!",
-                                                            "avatar_bottomsheet"
-                                                        )
+                                                            "avatar_bottomsheet",
+                                                        ),
                                                     )
                                                 }
                                             }
-                                        }) {
+                                        },
+                                    ) {
                                         Text(stringResource(id = R.string.share_avatar))
                                     }
                                 }
@@ -367,7 +384,7 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
                     onMemberRowClicked = {
                         showAsBottomSheet { onClose ->
                             val group by viewModel.userViewModel.currentTeamPlanGroup.collectAsState(
-                                null
+                                null,
                             )
                             val members by viewModel.userViewModel.currentTeamPlanMembers.observeAsState()
                             GroupPlanMemberList(members, group, appConfigManager) {
@@ -384,7 +401,7 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
                         intent.putExtras(bundle)
                         classSelectionResult.launch(intent)
                     },
-                    configManager = appConfigManager
+                    configManager = appConfigManager,
                 )
             }
         }
@@ -400,7 +417,10 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
         binding.content.toolbarTitle.text = getString(titleId)
     }
 
-    private fun updateToolbarTitle(destination: NavDestination, arguments: Bundle?) {
+    private fun updateToolbarTitle(
+        destination: NavDestination,
+        arguments: Bundle?,
+    ) {
         viewModel.getToolbarTitle(destination.id, destination.label, arguments?.getString("type")) {
             title = it
         }
@@ -416,11 +436,12 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
     private fun setupNotifications() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             val channelId = "default"
-            val channel = NotificationChannel(
-                channelId,
-                "Habitica Notifications",
-                NotificationManager.IMPORTANCE_DEFAULT
-            )
+            val channel =
+                NotificationChannel(
+                    channelId,
+                    "Habitica Notifications",
+                    NotificationManager.IMPORTANCE_DEFAULT,
+                )
             val manager = getSystemService(NotificationManager::class.java)
             manager?.createNotificationChannel(channel)
         }
@@ -433,7 +454,7 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
                     0,
                     0,
                     0,
-                    binding.content.bottomNavigation.barHeight + 12.dpToPx(this)
+                    binding.content.bottomNavigation.barHeight + 12.dpToPx(this),
                 )
             } else {
                 snackbarContainer.setPadding(0, 0, 0, 0)
@@ -481,7 +502,7 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
         navigationController.addOnDestinationChangedListener { _, destination, arguments ->
             updateToolbarTitle(
                 destination,
-                arguments
+                arguments,
             )
         }
 
@@ -504,9 +525,10 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
         }
         resumeFromActivity = false
 
-        if ((intent.hasExtra("notificationIdentifier") || intent.hasExtra("openURL")) && lastNotificationOpen != intent.getLongExtra(
+        if ((intent.hasExtra("notificationIdentifier") || intent.hasExtra("openURL")) && lastNotificationOpen !=
+            intent.getLongExtra(
                 "notificationTimeStamp",
-                0
+                0,
             )
         ) {
             lastNotificationOpen = intent.getLongExtra("notificationTimeStamp", 0)
@@ -518,7 +540,7 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
                     "open notification",
                     EventCategory.BEHAVIOUR,
                     HitType.EVENT,
-                    additionalData
+                    additionalData,
                 )
             }
             retrieveUser(true)
@@ -553,7 +575,10 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
         super.startActivity(intent)
     }
 
-    override fun startActivity(intent: Intent?, options: Bundle?) {
+    override fun startActivity(
+        intent: Intent?,
+        options: Bundle?,
+    ) {
         resumeFromActivity = true
         super.startActivity(intent, options)
     }
@@ -568,8 +593,9 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
     private fun updateWidget(widgetClass: Class<*>) {
         val intent = Intent(this, widgetClass)
         intent.action = AppWidgetManager.ACTION_APPWIDGET_UPDATE
-        val ids = AppWidgetManager.getInstance(application)
-            .getAppWidgetIds(ComponentName(application, widgetClass))
+        val ids =
+            AppWidgetManager.getInstance(application)
+                .getAppWidgetIds(ComponentName(application, widgetClass))
         intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, ids)
         sendBroadcast(intent)
     }
@@ -602,7 +628,11 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
                         inventoryRepository.getQuestContent(user.party?.quest?.completed ?: "")
                             .firstOrNull()
                     if (questContent != null) {
-                        QuestCompletedDialog.showWithQuest(this@MainActivity, questContent, userRepository)
+                        QuestCompletedDialog.showWithQuest(
+                            this@MainActivity,
+                            questContent,
+                            userRepository,
+                        )
                     }
                     viewModel.updateUser("party.quest.completed", "")
                 }
@@ -644,10 +674,11 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
 
     internal fun displayTaskScoringResponse(data: TaskScoringResult?) {
         if (viewModel.user.value != null && data != null) {
-            val damageValue = when (userQuestStatus) {
-                UserQuestStatus.QUEST_BOSS -> data.questDamage
-                else -> 0.0
-            }
+            val damageValue =
+                when (userQuestStatus) {
+                    UserQuestStatus.QUEST_BOSS -> data.questDamage
+                    else -> 0.0
+                }
             lifecycleScope.launchCatching {
                 notifyUserUseCase.callInteractor(
                     NotifyUserUseCase.RequestValues(
@@ -660,8 +691,8 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
                         data.manaDelta,
                         damageValue,
                         data.hasLeveledUp,
-                        data.level
-                    )
+                        data.level,
+                    ),
                 )
             }
         }
@@ -673,8 +704,8 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
                     data,
                     this@MainActivity,
                     snackbarContainer,
-                    showItemsFound
-                )
+                    showItemsFound,
+                ),
             )
         }
     }
@@ -696,7 +727,10 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
         }
     }
 
-    override fun onKeyUp(keyCode: Int, event: KeyEvent): Boolean {
+    override fun onKeyUp(
+        keyCode: Int,
+        event: KeyEvent,
+    ): Boolean {
         if (keyCode == KeyEvent.KEYCODE_MENU) {
             drawerFragment?.openDrawer()
             return true
@@ -709,7 +743,11 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
         viewModel.retrieveUser(forced)
     }
 
-    fun displayTutorialStep(step: TutorialStep, texts: List<String>, canBeDeferred: Boolean) {
+    fun displayTutorialStep(
+        step: TutorialStep,
+        texts: List<String>,
+        canBeDeferred: Boolean,
+    ) {
         val view = TutorialView(this, step, viewModel)
         view.setTutorialTexts(texts)
         view.setCanBeDeferred(canBeDeferred)
@@ -746,7 +784,7 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
 
     private fun createMaintenanceIntent(
         maintenanceResponse: MaintenanceResponse,
-        isDeprecationNotice: Boolean
+        isDeprecationNotice: Boolean,
     ): Intent {
         val intent = Intent(this, MaintenanceActivity::class.java)
         val data = Bundle()
@@ -764,9 +802,18 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
 
     private var errorJob: Job? = null
 
-    override fun showConnectionProblem(errorCount: Int, title: String?, message: String, isFromUserInput: Boolean) {
+    override fun showConnectionProblem(
+        errorCount: Int,
+        title: String?,
+        message: String,
+        isFromUserInput: Boolean,
+    ) {
         if (errorCount == 1 && !isFromUserInput) {
-            showSnackbar(title = title, content = message, displayType = HabiticaSnackbar.SnackbarDisplayType.FAILURE)
+            showSnackbar(
+                title = title,
+                content = message,
+                displayType = HabiticaSnackbar.SnackbarDisplayType.FAILURE,
+            )
         } else if (title != null) {
             super.showConnectionProblem(errorCount, title, message, isFromUserInput)
         } else {
@@ -776,10 +823,11 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
             }
             binding.content.connectionIssueView.visibility = View.VISIBLE
             binding.content.connectionIssueTextview.text = message
-            errorJob = lifecycleScope.launch(Dispatchers.Main) {
-                delay(1.toDuration(DurationUnit.MINUTES))
-                binding.content.connectionIssueView.visibility = View.GONE
-            }
+            errorJob =
+                lifecycleScope.launch(Dispatchers.Main) {
+                    delay(1.toDuration(DurationUnit.MINUTES))
+                    binding.content.connectionIssueView.visibility = View.GONE
+                }
         }
     }
 
@@ -807,5 +855,4 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
     private fun checkForReviewPrompt(user: User) {
         reviewManager.requestReview(this, user.loginIncentives)
     }
-
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MaintenanceActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MaintenanceActivity.kt
index 26941cbee..edc4cf005 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MaintenanceActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MaintenanceActivity.kt
@@ -1,82 +1,86 @@
-package com.habitrpg.android.habitica.ui.activities
-
-import android.content.Intent
-import android.os.Bundle
-import android.text.method.LinkMovementMethod
-import android.view.View
-import androidx.core.net.toUri
-import androidx.lifecycle.lifecycleScope
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.api.MaintenanceApiService
-import com.habitrpg.android.habitica.data.ApiClient
-import com.habitrpg.android.habitica.databinding.ActivityMaintenanceBinding
-import com.habitrpg.common.habitica.helpers.launchCatching
-import com.habitrpg.common.habitica.helpers.setMarkdown
-import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class MaintenanceActivity : BaseActivity() {
-
-    private lateinit var binding: ActivityMaintenanceBinding
-
-    @Inject
-    lateinit var maintenanceService: MaintenanceApiService
-
-    @Inject
-    lateinit var apiClient: ApiClient
-
-    private var isDeprecationNotice: Boolean = false
-
-    override fun getLayoutResId(): Int {
-        return R.layout.activity_maintenance
-    }
-
-    override fun getContentView(layoutResId: Int?): View {
-        binding = ActivityMaintenanceBinding.inflate(layoutInflater)
-        return binding.root
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        val data = intent.extras ?: return
-
-        binding.titleTextView.text = data.getString("title")
-
-        @Suppress("DEPRECATION")
-        binding.imageView.setImageURI(data.getString("imageUrl")?.toUri())
-        binding.descriptionTextView.setMarkdown(data.getString("description"))
-        binding.descriptionTextView.movementMethod = LinkMovementMethod.getInstance()
-
-        isDeprecationNotice = data.getBoolean("deprecationNotice")
-        if (isDeprecationNotice) {
-            binding.playStoreButton.visibility = View.VISIBLE
-        } else {
-            binding.playStoreButton.visibility = View.GONE
-        }
-
-        binding.playStoreButton.setOnClickListener { openInPlayStore() }
-    }
-
-    override fun onResume() {
-        super.onResume()
-        if (!isDeprecationNotice) {
-            lifecycleScope.launchCatching {
-                val maintenanceResponse = maintenanceService.getMaintenanceStatus()
-                if (maintenanceResponse?.activeMaintenance == false) {
-                    finish()
-                }
-            }
-        }
-    }
-
-    private fun openInPlayStore() {
-        val appPackageName = packageName
-        try {
-            startActivity(Intent(Intent.ACTION_VIEW, "market://details?id=$appPackageName".toUri()))
-        } catch (anfe: android.content.ActivityNotFoundException) {
-            startActivity(Intent(Intent.ACTION_VIEW, "https://play.google.com/store/apps/details?id=$appPackageName".toUri()))
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.activities
+
+import android.content.Intent
+import android.os.Bundle
+import android.text.method.LinkMovementMethod
+import android.view.View
+import androidx.core.net.toUri
+import androidx.lifecycle.lifecycleScope
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.api.MaintenanceApiService
+import com.habitrpg.android.habitica.data.ApiClient
+import com.habitrpg.android.habitica.databinding.ActivityMaintenanceBinding
+import com.habitrpg.common.habitica.helpers.launchCatching
+import com.habitrpg.common.habitica.helpers.setMarkdown
+import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class MaintenanceActivity : BaseActivity() {
+    private lateinit var binding: ActivityMaintenanceBinding
+
+    @Inject
+    lateinit var maintenanceService: MaintenanceApiService
+
+    @Inject
+    lateinit var apiClient: ApiClient
+
+    private var isDeprecationNotice: Boolean = false
+
+    override fun getLayoutResId(): Int {
+        return R.layout.activity_maintenance
+    }
+
+    override fun getContentView(layoutResId: Int?): View {
+        binding = ActivityMaintenanceBinding.inflate(layoutInflater)
+        return binding.root
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val data = intent.extras ?: return
+
+        binding.titleTextView.text = data.getString("title")
+
+        @Suppress("DEPRECATION")
+        binding.imageView.setImageURI(data.getString("imageUrl")?.toUri())
+        binding.descriptionTextView.setMarkdown(data.getString("description"))
+        binding.descriptionTextView.movementMethod = LinkMovementMethod.getInstance()
+
+        isDeprecationNotice = data.getBoolean("deprecationNotice")
+        if (isDeprecationNotice) {
+            binding.playStoreButton.visibility = View.VISIBLE
+        } else {
+            binding.playStoreButton.visibility = View.GONE
+        }
+
+        binding.playStoreButton.setOnClickListener { openInPlayStore() }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        if (!isDeprecationNotice) {
+            lifecycleScope.launchCatching {
+                val maintenanceResponse = maintenanceService.getMaintenanceStatus()
+                if (maintenanceResponse?.activeMaintenance == false) {
+                    finish()
+                }
+            }
+        }
+    }
+
+    private fun openInPlayStore() {
+        val appPackageName = packageName
+        try {
+            startActivity(Intent(Intent.ACTION_VIEW, "market://details?id=$appPackageName".toUri()))
+        } catch (anfe: android.content.ActivityNotFoundException) {
+            startActivity(
+                Intent(
+                    Intent.ACTION_VIEW,
+                    "https://play.google.com/store/apps/details?id=$appPackageName".toUri(),
+                ),
+            )
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt
index 01837aa15..4c9dea404 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt
@@ -21,14 +21,14 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.databinding.ActivityNotificationsBinding
-import com.habitrpg.common.habitica.extensions.fadeInAnimation
-import com.habitrpg.common.habitica.extensions.flash
-import com.habitrpg.common.habitica.extensions.observeOnce
 import com.habitrpg.android.habitica.helpers.HapticFeedbackManager
 import com.habitrpg.android.habitica.models.inventory.QuestContent
 import com.habitrpg.android.habitica.ui.viewmodels.NotificationsViewModel
+import com.habitrpg.common.habitica.extensions.fadeInAnimation
+import com.habitrpg.common.habitica.extensions.flash
 import com.habitrpg.common.habitica.extensions.fromHtml
 import com.habitrpg.common.habitica.extensions.loadImage
+import com.habitrpg.common.habitica.extensions.observeOnce
 import com.habitrpg.common.habitica.helpers.ExceptionHandler
 import com.habitrpg.common.habitica.helpers.launchCatching
 import com.habitrpg.common.habitica.models.Notification
@@ -55,8 +55,9 @@ import kotlinx.coroutines.withContext
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class NotificationsActivity : BaseActivity(), androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener {
-
+class NotificationsActivity :
+    BaseActivity(),
+    androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener {
     private lateinit var binding: ActivityNotificationsBinding
 
     @Inject
@@ -101,9 +102,9 @@ class NotificationsActivity : BaseActivity(), androidx.swiperefreshlayout.widget
             viewModel.getNotifications()
                 .debounce(250)
                 .collect {
-                setNotifications(it)
-                viewModel.markNotificationsAsSeen(it)
-            }
+                    setNotifications(it)
+                    viewModel.markNotificationsAsSeen(it)
+                }
         }
 
         lifecycleScope.launchCatching {
@@ -155,33 +156,57 @@ class NotificationsActivity : BaseActivity(), androidx.swiperefreshlayout.widget
     private fun displayNoNotificationsView() {
         binding.notificationItems.removeAllViewsInLayout()
         binding.notificationItems.showDividers = LinearLayout.SHOW_DIVIDER_NONE
-        binding.notificationItems.addView(inflater?.inflate(R.layout.no_notifications, binding.notificationItems, false))
+        binding.notificationItems.addView(
+            inflater?.inflate(
+                R.layout.no_notifications,
+                binding.notificationItems,
+                false,
+            ),
+        )
         binding.progressView.isVisible = false
     }
 
-
     private fun displayNotificationsListView(notifications: List<Notification>) {
-        binding.notificationItems.showDividers = LinearLayout.SHOW_DIVIDER_MIDDLE or LinearLayout.SHOW_DIVIDER_END
+        binding.notificationItems.showDividers =
+            LinearLayout.SHOW_DIVIDER_MIDDLE or LinearLayout.SHOW_DIVIDER_END
 
         lifecycleScope.launch(ExceptionHandler.coroutine()) {
-            val currentViews = mutableSetOf<View>().apply {
-                addAll(binding.notificationItems.children)
-            }
-            notifications.forEach {
-                val item: View? = when (it.type) {
-                    Notification.Type.NEW_CHAT_MESSAGE.type -> createNewChatMessageNotification(it)
-                    Notification.Type.NEW_STUFF.type -> createNewStuffNotification(it)
-                    Notification.Type.UNALLOCATED_STATS_POINTS.type -> createUnallocatedStatsNotification(it)
-                    Notification.Type.NEW_MYSTERY_ITEMS.type -> createMysteryItemsNotification(it)
-                    Notification.Type.GROUP_TASK_NEEDS_WORK.type -> createGroupTaskNeedsWorkNotification(it)
-                    Notification.Type.GROUP_TASK_APPROVED.type -> createGroupTaskApprovedNotification(it)
-                    Notification.Type.GROUP_TASK_REQUIRES_APPROVAL.type -> createGroupTaskNeedsApprovalNotification(it)
-                    Notification.Type.PARTY_INVITATION.type -> createPartyInvitationNotification(it)
-                    Notification.Type.QUEST_INVITATION.type -> createQuestInvitationNotification(it)
-                    Notification.Type.ITEM_RECEIVED.type -> createItemReceivedNotification(it)
-                    Notification.Type.GUILD_INVITATION.type -> createGuildInvitationNotification(it)
-                    else -> null
+            val currentViews =
+                mutableSetOf<View>().apply {
+                    addAll(binding.notificationItems.children)
                 }
+            notifications.forEach {
+                val item: View? =
+                    when (it.type) {
+                        Notification.Type.NEW_CHAT_MESSAGE.type -> createNewChatMessageNotification(it)
+                        Notification.Type.NEW_STUFF.type -> createNewStuffNotification(it)
+                        Notification.Type.UNALLOCATED_STATS_POINTS.type ->
+                            createUnallocatedStatsNotification(
+                                it,
+                            )
+
+                        Notification.Type.NEW_MYSTERY_ITEMS.type -> createMysteryItemsNotification(it)
+                        Notification.Type.GROUP_TASK_NEEDS_WORK.type ->
+                            createGroupTaskNeedsWorkNotification(
+                                it,
+                            )
+
+                        Notification.Type.GROUP_TASK_APPROVED.type ->
+                            createGroupTaskApprovedNotification(
+                                it,
+                            )
+
+                        Notification.Type.GROUP_TASK_REQUIRES_APPROVAL.type ->
+                            createGroupTaskNeedsApprovalNotification(
+                                it,
+                            )
+
+                        Notification.Type.PARTY_INVITATION.type -> createPartyInvitationNotification(it)
+                        Notification.Type.QUEST_INVITATION.type -> createQuestInvitationNotification(it)
+                        Notification.Type.ITEM_RECEIVED.type -> createItemReceivedNotification(it)
+                        Notification.Type.GUILD_INVITATION.type -> createGuildInvitationNotification(it)
+                        else -> null
+                    }
 
                 item?.let { view ->
                     if (!currentViews.removeIf { it.tag == view.tag }) {
@@ -217,11 +242,12 @@ class NotificationsActivity : BaseActivity(), androidx.swiperefreshlayout.widget
 
     private fun createNewChatMessageNotification(notification: Notification): View? {
         val data = notification.data as? NewChatMessageData
-        val stringId = if (viewModel.isPartyMessage(data)) R.string.new_msg_party else R.string.new_msg_guild
+        val stringId =
+            if (viewModel.isPartyMessage(data)) R.string.new_msg_party else R.string.new_msg_guild
 
         return createDismissableNotificationItem(
             notification,
-            fromHtml(getString(stringId, data?.group?.name))
+            fromHtml(getString(stringId, data?.group?.name)),
         )
     }
 
@@ -230,34 +256,36 @@ class NotificationsActivity : BaseActivity(), androidx.swiperefreshlayout.widget
         return createDismissableNotificationItem(
             notification,
             fromHtml("<b>" + data?.title + "</b><br>" + data?.text),
-            imageName = data?.icon
+            imageName = data?.icon,
         )
     }
 
     private var baileyNewsNotification: Notification? = null
 
-    private suspend fun createNewStuffNotification(notification: Notification): View? = withContext(Dispatchers.IO) {
-        var baileyNotification = notification
-        val data = notification.data as? NewStuffData
-        val text = if (data?.title != null) {
-            fromHtml("<b>" + getString(R.string.new_bailey_update) + "</b><br>" + data.title)
-        } else {
-            baileyNotification = baileyNewsNotification ?: userRepository.getNewsNotification() ?: notification
-            baileyNewsNotification = baileyNotification
-            val baileyNewsData = baileyNotification.data as? NewStuffData
-            fromHtml("<b>" + getString(R.string.new_bailey_update) + "</b><br>" + baileyNewsData?.title)
-        }
-        baileyNotification.id = notification.id
+    private suspend fun createNewStuffNotification(notification: Notification): View? =
+        withContext(Dispatchers.IO) {
+            var baileyNotification = notification
+            val data = notification.data as? NewStuffData
+            val text =
+                if (data?.title != null) {
+                    fromHtml("<b>" + getString(R.string.new_bailey_update) + "</b><br>" + data.title)
+                } else {
+                    baileyNotification =
+                        baileyNewsNotification ?: userRepository.getNewsNotification() ?: notification
+                    baileyNewsNotification = baileyNotification
+                    val baileyNewsData = baileyNotification.data as? NewStuffData
+                    fromHtml("<b>" + getString(R.string.new_bailey_update) + "</b><br>" + baileyNewsData?.title)
+                }
+            baileyNotification.id = notification.id
 
-        return@withContext withContext(Dispatchers.Main) {
-            createDismissableNotificationItem(
-                baileyNotification,
-                text,
-                R.drawable.notifications_bailey
-            )
+            return@withContext withContext(Dispatchers.Main) {
+                createDismissableNotificationItem(
+                    baileyNotification,
+                    text,
+                    R.drawable.notifications_bailey,
+                )
+            }
         }
-    }
-
 
     private fun createUnallocatedStatsNotification(notification: Notification): View? {
         val level = userLvl ?: return null
@@ -267,7 +295,7 @@ class NotificationsActivity : BaseActivity(), androidx.swiperefreshlayout.widget
             createDismissableNotificationItem(
                 notification,
                 fromHtml(getString(R.string.unallocated_stats_points, data?.points.toString())),
-                R.drawable.notification_stat_sparkles
+                R.drawable.notification_stat_sparkles,
             )
         } else {
             null
@@ -278,7 +306,7 @@ class NotificationsActivity : BaseActivity(), androidx.swiperefreshlayout.widget
         return createDismissableNotificationItem(
             notification,
             fromHtml(getString(R.string.new_subscriber_item)),
-            R.drawable.notification_mystery_item
+            R.drawable.notification_mystery_item,
         )
     }
 
@@ -290,7 +318,7 @@ class NotificationsActivity : BaseActivity(), androidx.swiperefreshlayout.widget
             notification,
             fromHtml(message),
             null,
-            textColor = R.color.yellow_5
+            textColor = R.color.yellow_5,
         )
     }
 
@@ -302,7 +330,7 @@ class NotificationsActivity : BaseActivity(), androidx.swiperefreshlayout.widget
             notification,
             fromHtml(message),
             null,
-            textColor = R.color.green_10
+            textColor = R.color.green_10,
         )
     }
 
@@ -310,10 +338,11 @@ class NotificationsActivity : BaseActivity(), androidx.swiperefreshlayout.widget
         val data = notification.data as? GroupTaskRequiresApprovalData
         val message = convertGroupMessageHtml(data?.message ?: "")
 
-        val item = createActionableNotificationItem(
-            notification,
-            fromHtml(message)
-        )
+        val item =
+            createActionableNotificationItem(
+                notification,
+                fromHtml(message),
+            )
         // Hide for now
         item?.visibility = View.GONE
         return item
@@ -337,7 +366,7 @@ class NotificationsActivity : BaseActivity(), androidx.swiperefreshlayout.widget
         messageText: CharSequence,
         imageResourceId: Int? = null,
         imageName: String? = null,
-        textColor: Int? = null
+        textColor: Int? = null,
     ): View? {
         val item = inflater?.inflate(R.layout.notification_item, binding.notificationItems, false)
         item?.tag = notification.id
@@ -382,37 +411,51 @@ class NotificationsActivity : BaseActivity(), androidx.swiperefreshlayout.widget
         return item
     }
 
-    private suspend fun createPartyInvitationNotification(notification: Notification): View? = withContext(ExceptionHandler.coroutine()) {
-        val data = notification.data as? PartyInvitationData
-        val inviterId = data?.invitation?.inviter
-        if (inviterId != null) {
-            val inviter = socialRepository.retrieveMember(inviterId, fromHall = false)
-            return@withContext createActionableNotificationItem(
-                notification,
-                fromHtml(getString(R.string.invited_to_party_notification, data.invitation?.name, inviter?.formattedUsername)),
-                openable = true,
-                inviterId
-            )
-        } else {
-            return@withContext null
+    private suspend fun createPartyInvitationNotification(notification: Notification): View? =
+        withContext(ExceptionHandler.coroutine()) {
+            val data = notification.data as? PartyInvitationData
+            val inviterId = data?.invitation?.inviter
+            if (inviterId != null) {
+                val inviter = socialRepository.retrieveMember(inviterId, fromHall = false)
+                return@withContext createActionableNotificationItem(
+                    notification,
+                    fromHtml(
+                        getString(
+                            R.string.invited_to_party_notification,
+                            data.invitation?.name,
+                            inviter?.formattedUsername,
+                        ),
+                    ),
+                    openable = true,
+                    inviterId,
+                )
+            } else {
+                return@withContext null
+            }
         }
-    }
 
-    private suspend fun createGuildInvitationNotification(notification: Notification): View? = withContext(ExceptionHandler.coroutine()) {
-        val data = notification.data as? GuildInvitationData
-        val inviterId = data?.invitation?.inviter
-        if (inviterId != null) {
-            val inviter = socialRepository.retrieveMember(inviterId, fromHall = false)
-            return@withContext createActionableNotificationItem(
-                notification,
-                fromHtml(getString(R.string.invited_to_guild_notification, data.invitation?.name, inviter?.formattedUsername)),
-                openable = true,
-                inviterId
-            )
-        } else {
-            return@withContext null
+    private suspend fun createGuildInvitationNotification(notification: Notification): View? =
+        withContext(ExceptionHandler.coroutine()) {
+            val data = notification.data as? GuildInvitationData
+            val inviterId = data?.invitation?.inviter
+            if (inviterId != null) {
+                val inviter = socialRepository.retrieveMember(inviterId, fromHall = false)
+                return@withContext createActionableNotificationItem(
+                    notification,
+                    fromHtml(
+                        getString(
+                            R.string.invited_to_guild_notification,
+                            data.invitation?.name,
+                            inviter?.formattedUsername,
+                        ),
+                    ),
+                    openable = true,
+                    inviterId,
+                )
+            } else {
+                return@withContext null
+            }
         }
-    }
 
     private fun createQuestInvitationNotification(notification: Notification): View? {
         val data = notification.data as? QuestInvitationData
@@ -423,7 +466,8 @@ class NotificationsActivity : BaseActivity(), androidx.swiperefreshlayout.widget
         view?.visibility = View.GONE
 
         lifecycleScope.launch(ExceptionHandler.coroutine()) {
-            val questContent = inventoryRepository.getQuestContent(data?.questKey ?: "").firstOrNull()
+            val questContent =
+                inventoryRepository.getQuestContent(data?.questKey ?: "").firstOrNull()
             if (questContent != null) {
                 updateQuestInvitationView(view, questContent)
             }
@@ -432,7 +476,10 @@ class NotificationsActivity : BaseActivity(), androidx.swiperefreshlayout.widget
         return view
     }
 
-    private fun updateQuestInvitationView(view: View?, questContent: QuestContent) {
+    private fun updateQuestInvitationView(
+        view: View?,
+        questContent: QuestContent,
+    ) {
         val messageTextView = view?.findViewById(R.id.message_text) as? TextView
         messageTextView?.text = fromHtml(getString(R.string.invited_to_quest, questContent.text))
 
@@ -466,9 +513,14 @@ class NotificationsActivity : BaseActivity(), androidx.swiperefreshlayout.widget
         notification: Notification,
         messageText: CharSequence,
         openable: Boolean = false,
-        inviterId: String? = null
+        inviterId: String? = null,
     ): View? {
-        val item = inflater?.inflate(R.layout.notification_item_actionable, binding.notificationItems, false)
+        val item =
+            inflater?.inflate(
+                R.layout.notification_item_actionable,
+                binding.notificationItems,
+                false,
+            )
         item?.tag = notification.id
 
         if (openable) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PrefsActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PrefsActivity.kt
index a5b8e9757..f8ea2be8a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PrefsActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PrefsActivity.kt
@@ -13,8 +13,10 @@ import com.habitrpg.android.habitica.ui.views.SnackbarActivity
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
-class PrefsActivity : BaseActivity(), PreferenceFragmentCompat.OnPreferenceStartScreenCallback, SnackbarActivity {
-
+class PrefsActivity :
+    BaseActivity(),
+    PreferenceFragmentCompat.OnPreferenceStartScreenCallback,
+    SnackbarActivity {
     override fun getLayoutResId(): Int = R.layout.activity_prefs
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -37,7 +39,7 @@ class PrefsActivity : BaseActivity(), PreferenceFragmentCompat.OnPreferenceStart
 
     override fun onPreferenceStartScreen(
         preferenceFragment: PreferenceFragmentCompat,
-        preferenceScreen: PreferenceScreen
+        preferenceScreen: PreferenceScreen,
     ): Boolean {
         val fragment = createNextPage(preferenceScreen)
         if (fragment != null) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ReportMessageActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ReportMessageActivity.kt
index 78a060920..cc7add713 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ReportMessageActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ReportMessageActivity.kt
@@ -24,7 +24,6 @@ import javax.inject.Inject
 
 @AndroidEntryPoint
 class ReportMessageActivity : BaseActivity() {
-
     private lateinit var binding: ActivityReportMessageBinding
 
     @Inject
@@ -57,20 +56,28 @@ class ReportMessageActivity : BaseActivity() {
         binding.reportExplanationTextview.setMarkdown(getString(R.string.report_explanation))
 
         BottomSheetBehavior.from<View>(binding.bottomSheet)
-            .addBottomSheetCallback(object : BottomSheetBehavior.BottomSheetCallback() {
-                @SuppressLint("SwitchIntDef")
-                override fun onStateChanged(bottomSheet: View, newState: Int) {
-                    when (newState) {
-                        BottomSheetBehavior.STATE_HIDDEN -> finish()
-                        BottomSheetBehavior.STATE_EXPANDED -> setStatusBarDim(false)
-                        else -> setStatusBarDim(true)
+            .addBottomSheetCallback(
+                object : BottomSheetBehavior.BottomSheetCallback() {
+                    @SuppressLint("SwitchIntDef")
+                    override fun onStateChanged(
+                        bottomSheet: View,
+                        newState: Int,
+                    ) {
+                        when (newState) {
+                            BottomSheetBehavior.STATE_HIDDEN -> finish()
+                            BottomSheetBehavior.STATE_EXPANDED -> setStatusBarDim(false)
+                            else -> setStatusBarDim(true)
+                        }
                     }
-                }
 
-                override fun onSlide(bottomSheet: View, slideOffset: Float) {
-                    // no op
-                }
-            })
+                    override fun onSlide(
+                        bottomSheet: View,
+                        slideOffset: Float,
+                    ) {
+                        // no op
+                    }
+                },
+            )
 
         val args = navArgs<ReportMessageActivityArgs>().value
         messageID = args.messageID
@@ -96,9 +103,13 @@ class ReportMessageActivity : BaseActivity() {
             lifecycleScope.launch(
                 ExceptionHandler.coroutine {
                     isReporting = false
-                }
+                },
             ) {
-                socialRepository.flagMessage(messageID ?: "", binding.additionalInfoEdittext.text.toString(), groupID)
+                socialRepository.flagMessage(
+                    messageID ?: "",
+                    binding.additionalInfoEdittext.text.toString(),
+                    groupID,
+                )
                 finish()
             }
         }
@@ -132,6 +143,7 @@ class ReportMessageActivity : BaseActivity() {
         // Fetch the current flags.
         val lFlags = window.decorView.systemUiVisibility
         // Update the SystemUiVisibility dependening on whether we want a Light or Dark theme.
-        window.decorView.systemUiVisibility = if (isDark) lFlags and View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR.inv() else lFlags or View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
+        window.decorView.systemUiVisibility =
+            if (isDark) lFlags and View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR.inv() else lFlags or View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt
index ff9672254..43b1ff4d7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt
@@ -1,311 +1,335 @@
-package com.habitrpg.android.habitica.ui.activities
-
-import android.content.Context
-import android.content.Intent
-import android.graphics.drawable.Drawable
-import android.os.Build
-import android.os.Bundle
-import android.view.View
-import android.view.ViewGroup
-import android.view.WindowInsetsController
-import android.view.inputmethod.InputMethodManager
-import androidx.appcompat.content.res.AppCompatResources
-import androidx.core.content.ContextCompat
-import androidx.core.content.edit
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentManager
-import androidx.fragment.app.FragmentPagerAdapter
-import androidx.lifecycle.lifecycleScope
-import androidx.preference.PreferenceManager
-import androidx.viewpager.widget.ViewPager
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.data.ApiClient
-import com.habitrpg.android.habitica.data.InventoryRepository
-import com.habitrpg.android.habitica.data.TaskRepository
-import com.habitrpg.android.habitica.databinding.ActivitySetupBinding
-import com.habitrpg.android.habitica.helpers.Analytics
-import com.habitrpg.android.habitica.helpers.EventCategory
-import com.habitrpg.android.habitica.helpers.HitType
-import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.android.habitica.ui.fragments.setup.AvatarSetupFragment
-import com.habitrpg.android.habitica.ui.fragments.setup.TaskSetupFragment
-import com.habitrpg.android.habitica.ui.fragments.setup.WelcomeFragment
-import com.habitrpg.common.habitica.extensions.isUsingNightModeResources
-import com.habitrpg.common.habitica.helpers.ExceptionHandler
-import com.habitrpg.common.habitica.helpers.launchCatching
-import com.viewpagerindicator.IconPagerAdapter
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.FlowPreview
-import kotlinx.coroutines.flow.debounce
-import kotlinx.coroutines.launch
-import java.util.Calendar
-import java.util.Locale
-import javax.inject.Inject
-import kotlin.time.Duration.Companion.milliseconds
-
-@AndroidEntryPoint
-class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
-
-    private lateinit var binding: ActivitySetupBinding
-
-    @Inject
-    lateinit var apiClient: ApiClient
-
-    @Inject
-    lateinit var inventoryRepository: InventoryRepository
-
-    @Inject
-    lateinit var taskRepository: TaskRepository
-
-    internal var welcomeFragment: WelcomeFragment? = null
-    internal var avatarSetupFragment: AvatarSetupFragment? = null
-    internal var taskSetupFragment: TaskSetupFragment? = null
-    internal var user: User? = null
-    private var completedSetup = false
-    private var createdTasks = false
-
-    private val isLastPage: Boolean
-        get() = binding.viewPager.adapter == null || binding.viewPager.currentItem == (binding.viewPager.adapter?.count ?: 0) - 1
-
-    override fun getLayoutResId(): Int {
-        return R.layout.activity_setup
-    }
-
-    override fun getContentView(layoutResId: Int?): View {
-        binding = ActivitySetupBinding.inflate(layoutInflater)
-        return binding.root
-    }
-
-    @OptIn(FlowPreview::class)
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        lifecycleScope.launch(ExceptionHandler.coroutine()) {
-            userRepository.getUser()
-                .debounce(500.milliseconds)
-                .collect { onUserReceived(it) }
-        }
-        lifecycleScope.launch(ExceptionHandler.coroutine()) {
-            userRepository.retrieveUser(true, true)
-        }
-        val additionalData = HashMap<String, Any>()
-        additionalData["status"] = "displayed"
-        Analytics.sendEvent("setup", EventCategory.BEHAVIOUR, HitType.EVENT, additionalData)
-
-        val currentDeviceLanguage = Locale.getDefault().language
-        for (language in resources.getStringArray(R.array.LanguageValues)) {
-            if (language == currentDeviceLanguage) {
-                lifecycleScope.launchCatching {
-                    apiClient.registrationLanguage(currentDeviceLanguage)
-                }
-            }
-        }
-
-        binding.viewPager.disableFading = true
-
-        binding.previousButton.setOnClickListener { previousClicked() }
-        binding.nextButton.setOnClickListener { nextClicked() }
-
-        if (this.isUsingNightModeResources()) {
-            window.statusBarColor = ContextCompat.getColor(this, R.color.black_20_alpha)
-
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                window.insetsController?.setSystemBarsAppearance(
-                    0,
-                    WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS
-                )
-            } else {
-                @Suppress("DEPRECATION")
-                window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
-            }
-        }
-
-
-    }
-
-    override fun onDestroy() {
-        userRepository.close()
-        super.onDestroy()
-    }
-
-    private fun setupViewpager() {
-        val fragmentManager = supportFragmentManager
-
-        binding.viewPager.adapter = ViewPageAdapter(fragmentManager)
-
-        binding.viewPager.addOnPageChangeListener(this)
-        binding.viewPagerIndicator.setViewPager(binding.viewPager)
-    }
-
-    private fun nextClicked() {
-        val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this)
-        sharedPreferences.edit {
-            putString("FirstDayOfTheWeek", Calendar.getInstance().firstDayOfWeek.toString())
-        }
-        if (isLastPage) {
-            if (this.taskSetupFragment == null) {
-                return
-            }
-            if (createdTasks) {
-                onUserReceived(user)
-                return
-            }
-            val newTasks = this.taskSetupFragment?.createSampleTasks()
-            this.completedSetup = true
-            createdTasks = true
-            newTasks?.let {
-                lifecycleScope.launchCatching {
-                    taskRepository.createTasks(it)
-                }
-            }
-        } else if (binding.viewPager.currentItem == 0) {
-            confirmNames(welcomeFragment?.displayName ?: "", welcomeFragment?.username ?: "")
-
-            val imm = getSystemService(Context.INPUT_METHOD_SERVICE) as? InputMethodManager
-            imm?.hideSoftInputFromWindow(currentFocus?.windowToken, 0)
-        }
-        binding.viewPager.currentItem = binding.viewPager.currentItem + 1
-    }
-
-    private fun previousClicked() {
-        binding.viewPager.currentItem = binding.viewPager.currentItem - 1
-    }
-
-    private fun setPreviousButtonEnabled(enabled: Boolean) {
-        val leftDrawable: Drawable?
-        if (enabled) {
-            binding.previousButton.setText(R.string.action_back)
-            leftDrawable = AppCompatResources.getDrawable(this, R.drawable.back_arrow_enabled)
-        } else {
-            binding.previousButton.text = null
-            leftDrawable = AppCompatResources.getDrawable(this, R.drawable.back_arrow_disabled)
-        }
-        binding.previousButton.setCompoundDrawablesWithIntrinsicBounds(leftDrawable, null, null, null)
-    }
-
-    private fun setNextButtonEnabled(enabled: Boolean) {
-        binding.nextButton.isEnabled = enabled
-        val rightDrawable = AppCompatResources.getDrawable(this, R.drawable.forward_arrow_enabled)
-        if (enabled) {
-            binding.nextButton.setTextColor(ContextCompat.getColor(this, R.color.white))
-            rightDrawable?.alpha = 255
-        } else {
-            binding.nextButton.setTextColor(ContextCompat.getColor(this, R.color.white_50_alpha))
-            rightDrawable?.alpha = 127
-        }
-        binding.nextButton.setCompoundDrawablesWithIntrinsicBounds(null, null, rightDrawable, null)
-    }
-
-    override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) = Unit
-
-    override fun onPageSelected(position: Int) {
-        when {
-            position == 0 -> {
-                this.setPreviousButtonEnabled(false)
-                binding.nextButton.text = this.getString(R.string.next_button)
-            }
-            isLastPage -> {
-                this.setPreviousButtonEnabled(true)
-                binding.nextButton.text = this.getString(R.string.finish)
-            }
-            else -> {
-                this.setPreviousButtonEnabled(true)
-                binding.nextButton.text = this.getString(R.string.next_button)
-            }
-        }
-    }
-
-    override fun onPageScrollStateChanged(state: Int) = Unit
-
-    private var hasCompleted = false
-    private fun onUserReceived(user: User?) {
-        if (completedSetup && !hasCompleted) {
-            val additionalData = HashMap<String, Any>()
-            additionalData["status"] = "completed"
-            Analytics.sendEvent("setup", EventCategory.BEHAVIOUR, HitType.EVENT, additionalData)
-            hasCompleted = true
-            lifecycleScope.launchCatching {
-                userRepository.updateUser("flags.welcomed", true)
-                userRepository.retrieveUser(true, true)
-                startMainActivity()
-            }
-            return
-        }
-        this.user = user
-        if (binding.viewPager.adapter == null) {
-            setupViewpager()
-        }
-        avatarSetupFragment?.setUser(user)
-        taskSetupFragment?.setUser(user)
-    }
-
-    private fun startMainActivity() {
-        val intent = Intent(this@SetupActivity, MainActivity::class.java)
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK)
-        startActivity(intent)
-        finish()
-    }
-
-    private fun confirmNames(displayName: String, username: String) {
-        lifecycleScope.launch(ExceptionHandler.coroutine()) {
-            userRepository.updateUser("profile.name", displayName)
-            userRepository.updateLoginName(username)
-        }
-    }
-
-    private inner class ViewPageAdapter(fm: FragmentManager) : FragmentPagerAdapter(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT), IconPagerAdapter {
-
-        override fun getItem(position: Int): Fragment {
-            return when (position) {
-                1 -> {
-                    val fragment = AvatarSetupFragment()
-                    fragment.activity = this@SetupActivity
-                    fragment.setUser(user)
-                    fragment.width = binding.viewPager.width
-                    avatarSetupFragment = fragment
-                    fragment
-                }
-                2 -> {
-                    val fragment = TaskSetupFragment()
-                    fragment.setUser(user)
-                    taskSetupFragment = fragment
-                    fragment
-                }
-                else -> {
-                    val fragment = WelcomeFragment()
-                    welcomeFragment = fragment
-                    welcomeFragment?.onNameValid = { setNextButtonEnabled(it == true) }
-                    fragment
-                }
-            }
-        }
-
-        override fun instantiateItem(container: ViewGroup, position: Int): Any {
-            val item = super.instantiateItem(container, position)
-            when (item) {
-                is AvatarSetupFragment -> {
-                    avatarSetupFragment = item
-                    item.activity = this@SetupActivity
-                    item.setUser(user)
-                    item.width = binding.viewPager.width
-                }
-                is TaskSetupFragment -> {
-                    taskSetupFragment = item
-                    item.setUser(user)
-                }
-                is WelcomeFragment -> {
-                    welcomeFragment = item
-                    item.onNameValid = { setNextButtonEnabled(it == true) }
-                }
-            }
-            return item
-        }
-
-        override fun getCount(): Int {
-            return 3
-        }
-
-        override fun getIconResId(index: Int): Int {
-            return R.drawable.indicator_diamond
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.activities
+
+import android.content.Context
+import android.content.Intent
+import android.graphics.drawable.Drawable
+import android.os.Build
+import android.os.Bundle
+import android.view.View
+import android.view.ViewGroup
+import android.view.WindowInsetsController
+import android.view.inputmethod.InputMethodManager
+import androidx.appcompat.content.res.AppCompatResources
+import androidx.core.content.ContextCompat
+import androidx.core.content.edit
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.FragmentPagerAdapter
+import androidx.lifecycle.lifecycleScope
+import androidx.preference.PreferenceManager
+import androidx.viewpager.widget.ViewPager
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.data.ApiClient
+import com.habitrpg.android.habitica.data.InventoryRepository
+import com.habitrpg.android.habitica.data.TaskRepository
+import com.habitrpg.android.habitica.databinding.ActivitySetupBinding
+import com.habitrpg.android.habitica.helpers.Analytics
+import com.habitrpg.android.habitica.helpers.EventCategory
+import com.habitrpg.android.habitica.helpers.HitType
+import com.habitrpg.android.habitica.models.user.User
+import com.habitrpg.android.habitica.ui.fragments.setup.AvatarSetupFragment
+import com.habitrpg.android.habitica.ui.fragments.setup.TaskSetupFragment
+import com.habitrpg.android.habitica.ui.fragments.setup.WelcomeFragment
+import com.habitrpg.common.habitica.extensions.isUsingNightModeResources
+import com.habitrpg.common.habitica.helpers.ExceptionHandler
+import com.habitrpg.common.habitica.helpers.launchCatching
+import com.viewpagerindicator.IconPagerAdapter
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.flow.debounce
+import kotlinx.coroutines.launch
+import java.util.Calendar
+import java.util.Locale
+import javax.inject.Inject
+import kotlin.time.Duration.Companion.milliseconds
+
+@AndroidEntryPoint
+class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
+    private lateinit var binding: ActivitySetupBinding
+
+    @Inject
+    lateinit var apiClient: ApiClient
+
+    @Inject
+    lateinit var inventoryRepository: InventoryRepository
+
+    @Inject
+    lateinit var taskRepository: TaskRepository
+
+    internal var welcomeFragment: WelcomeFragment? = null
+    internal var avatarSetupFragment: AvatarSetupFragment? = null
+    internal var taskSetupFragment: TaskSetupFragment? = null
+    internal var user: User? = null
+    private var completedSetup = false
+    private var createdTasks = false
+
+    private val isLastPage: Boolean
+        get() =
+            binding.viewPager.adapter == null || binding.viewPager.currentItem == (
+                binding.viewPager.adapter?.count
+                    ?: 0
+            ) - 1
+
+    override fun getLayoutResId(): Int {
+        return R.layout.activity_setup
+    }
+
+    override fun getContentView(layoutResId: Int?): View {
+        binding = ActivitySetupBinding.inflate(layoutInflater)
+        return binding.root
+    }
+
+    @OptIn(FlowPreview::class)
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.getUser()
+                .debounce(500.milliseconds)
+                .collect { onUserReceived(it) }
+        }
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.retrieveUser(true, true)
+        }
+        val additionalData = HashMap<String, Any>()
+        additionalData["status"] = "displayed"
+        Analytics.sendEvent("setup", EventCategory.BEHAVIOUR, HitType.EVENT, additionalData)
+
+        val currentDeviceLanguage = Locale.getDefault().language
+        for (language in resources.getStringArray(R.array.LanguageValues)) {
+            if (language == currentDeviceLanguage) {
+                lifecycleScope.launchCatching {
+                    apiClient.registrationLanguage(currentDeviceLanguage)
+                }
+            }
+        }
+
+        binding.viewPager.disableFading = true
+
+        binding.previousButton.setOnClickListener { previousClicked() }
+        binding.nextButton.setOnClickListener { nextClicked() }
+
+        if (this.isUsingNightModeResources()) {
+            window.statusBarColor = ContextCompat.getColor(this, R.color.black_20_alpha)
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                window.insetsController?.setSystemBarsAppearance(
+                    0,
+                    WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS,
+                )
+            } else {
+                @Suppress("DEPRECATION")
+                window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
+            }
+        }
+    }
+
+    override fun onDestroy() {
+        userRepository.close()
+        super.onDestroy()
+    }
+
+    private fun setupViewpager() {
+        val fragmentManager = supportFragmentManager
+
+        binding.viewPager.adapter = ViewPageAdapter(fragmentManager)
+
+        binding.viewPager.addOnPageChangeListener(this)
+        binding.viewPagerIndicator.setViewPager(binding.viewPager)
+    }
+
+    private fun nextClicked() {
+        val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this)
+        sharedPreferences.edit {
+            putString("FirstDayOfTheWeek", Calendar.getInstance().firstDayOfWeek.toString())
+        }
+        if (isLastPage) {
+            if (this.taskSetupFragment == null) {
+                return
+            }
+            if (createdTasks) {
+                onUserReceived(user)
+                return
+            }
+            val newTasks = this.taskSetupFragment?.createSampleTasks()
+            this.completedSetup = true
+            createdTasks = true
+            newTasks?.let {
+                lifecycleScope.launchCatching {
+                    taskRepository.createTasks(it)
+                }
+            }
+        } else if (binding.viewPager.currentItem == 0) {
+            confirmNames(welcomeFragment?.displayName ?: "", welcomeFragment?.username ?: "")
+
+            val imm = getSystemService(Context.INPUT_METHOD_SERVICE) as? InputMethodManager
+            imm?.hideSoftInputFromWindow(currentFocus?.windowToken, 0)
+        }
+        binding.viewPager.currentItem = binding.viewPager.currentItem + 1
+    }
+
+    private fun previousClicked() {
+        binding.viewPager.currentItem = binding.viewPager.currentItem - 1
+    }
+
+    private fun setPreviousButtonEnabled(enabled: Boolean) {
+        val leftDrawable: Drawable?
+        if (enabled) {
+            binding.previousButton.setText(R.string.action_back)
+            leftDrawable = AppCompatResources.getDrawable(this, R.drawable.back_arrow_enabled)
+        } else {
+            binding.previousButton.text = null
+            leftDrawable = AppCompatResources.getDrawable(this, R.drawable.back_arrow_disabled)
+        }
+        binding.previousButton.setCompoundDrawablesWithIntrinsicBounds(
+            leftDrawable,
+            null,
+            null,
+            null,
+        )
+    }
+
+    private fun setNextButtonEnabled(enabled: Boolean) {
+        binding.nextButton.isEnabled = enabled
+        val rightDrawable = AppCompatResources.getDrawable(this, R.drawable.forward_arrow_enabled)
+        if (enabled) {
+            binding.nextButton.setTextColor(ContextCompat.getColor(this, R.color.white))
+            rightDrawable?.alpha = 255
+        } else {
+            binding.nextButton.setTextColor(ContextCompat.getColor(this, R.color.white_50_alpha))
+            rightDrawable?.alpha = 127
+        }
+        binding.nextButton.setCompoundDrawablesWithIntrinsicBounds(null, null, rightDrawable, null)
+    }
+
+    override fun onPageScrolled(
+        position: Int,
+        positionOffset: Float,
+        positionOffsetPixels: Int,
+    ) =
+        Unit
+
+    override fun onPageSelected(position: Int) {
+        when {
+            position == 0 -> {
+                this.setPreviousButtonEnabled(false)
+                binding.nextButton.text = this.getString(R.string.next_button)
+            }
+
+            isLastPage -> {
+                this.setPreviousButtonEnabled(true)
+                binding.nextButton.text = this.getString(R.string.finish)
+            }
+
+            else -> {
+                this.setPreviousButtonEnabled(true)
+                binding.nextButton.text = this.getString(R.string.next_button)
+            }
+        }
+    }
+
+    override fun onPageScrollStateChanged(state: Int) = Unit
+
+    private var hasCompleted = false
+
+    private fun onUserReceived(user: User?) {
+        if (completedSetup && !hasCompleted) {
+            val additionalData = HashMap<String, Any>()
+            additionalData["status"] = "completed"
+            Analytics.sendEvent("setup", EventCategory.BEHAVIOUR, HitType.EVENT, additionalData)
+            hasCompleted = true
+            lifecycleScope.launchCatching {
+                userRepository.updateUser("flags.welcomed", true)
+                userRepository.retrieveUser(true, true)
+                startMainActivity()
+            }
+            return
+        }
+        this.user = user
+        if (binding.viewPager.adapter == null) {
+            setupViewpager()
+        }
+        avatarSetupFragment?.setUser(user)
+        taskSetupFragment?.setUser(user)
+    }
+
+    private fun startMainActivity() {
+        val intent = Intent(this@SetupActivity, MainActivity::class.java)
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK)
+        startActivity(intent)
+        finish()
+    }
+
+    private fun confirmNames(
+        displayName: String,
+        username: String,
+    ) {
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.updateUser("profile.name", displayName)
+            userRepository.updateLoginName(username)
+        }
+    }
+
+    private inner class ViewPageAdapter(fm: FragmentManager) :
+        FragmentPagerAdapter(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT), IconPagerAdapter {
+        override fun getItem(position: Int): Fragment {
+            return when (position) {
+                1 -> {
+                    val fragment = AvatarSetupFragment()
+                    fragment.activity = this@SetupActivity
+                    fragment.setUser(user)
+                    fragment.width = binding.viewPager.width
+                    avatarSetupFragment = fragment
+                    fragment
+                }
+
+                2 -> {
+                    val fragment = TaskSetupFragment()
+                    fragment.setUser(user)
+                    taskSetupFragment = fragment
+                    fragment
+                }
+
+                else -> {
+                    val fragment = WelcomeFragment()
+                    welcomeFragment = fragment
+                    welcomeFragment?.onNameValid = { setNextButtonEnabled(it == true) }
+                    fragment
+                }
+            }
+        }
+
+        override fun instantiateItem(
+            container: ViewGroup,
+            position: Int,
+        ): Any {
+            val item = super.instantiateItem(container, position)
+            when (item) {
+                is AvatarSetupFragment -> {
+                    avatarSetupFragment = item
+                    item.activity = this@SetupActivity
+                    item.setUser(user)
+                    item.width = binding.viewPager.width
+                }
+
+                is TaskSetupFragment -> {
+                    taskSetupFragment = item
+                    item.setUser(user)
+                }
+
+                is WelcomeFragment -> {
+                    welcomeFragment = item
+                    item.onNameValid = { setNextButtonEnabled(it == true) }
+                }
+            }
+            return item
+        }
+
+        override fun getCount(): Int {
+            return 3
+        }
+
+        override fun getIconResId(index: Int): Int {
+            return R.drawable.indicator_diamond
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.kt
index f173eefd1..b731df440 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.kt
@@ -1,93 +1,95 @@
-package com.habitrpg.android.habitica.ui.activities
-
-import android.app.Activity
-import android.content.Intent
-import android.os.Bundle
-import android.util.SparseArray
-import android.view.MenuItem
-import android.view.View
-import androidx.fragment.app.Fragment
-import androidx.viewpager2.adapter.FragmentStateAdapter
-import com.google.android.material.tabs.TabLayoutMediator
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.data.TaskRepository
-import com.habitrpg.android.habitica.databinding.ActivitySkillTasksBinding
-import com.habitrpg.android.habitica.models.tasks.Task
-import com.habitrpg.android.habitica.ui.fragments.skills.SkillTasksRecyclerViewFragment
-import com.habitrpg.shared.habitica.models.tasks.TaskType
-import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class SkillTasksActivity : BaseActivity() {
-    private lateinit var binding: ActivitySkillTasksBinding
-
-    @Inject
-    lateinit var taskRepository: TaskRepository
-
-    internal var viewFragmentsDictionary = SparseArray<SkillTasksRecyclerViewFragment>()
-
-    override fun getLayoutResId(): Int {
-        return R.layout.activity_skill_tasks
-    }
-
-    public override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setupToolbar(findViewById(R.id.toolbar))
-        loadTaskLists()
-    }
-
-    override fun getContentView(layoutResId: Int?): View {
-        binding = ActivitySkillTasksBinding.inflate(layoutInflater)
-        return binding.root
-    }
-
-    private fun loadTaskLists() {
-        val statePagerAdapter = object : FragmentStateAdapter(supportFragmentManager, lifecycle) {
-
-            override fun createFragment(position: Int): Fragment {
-                val fragment = SkillTasksRecyclerViewFragment()
-                fragment.taskType = when (position) {
-                    0 -> TaskType.HABIT
-                    1 -> TaskType.DAILY
-                    else -> TaskType.TODO
-                }
-                fragment.onTaskSelection = {
-                    taskSelected(it)
-                }
-                viewFragmentsDictionary.put(position, fragment)
-                return fragment
-            }
-
-            override fun getItemCount(): Int {
-                return 3
-            }
-        }
-        binding.viewPager.adapter = statePagerAdapter
-        TabLayoutMediator(binding.tabLayout, binding.viewPager) { tab, position ->
-            tab.text = when (position) {
-                0 -> getString(R.string.habits)
-                1 -> getString(R.string.dailies)
-                2 -> getString(R.string.todos)
-                else -> ""
-            }
-        }.attach()
-        statePagerAdapter.notifyDataSetChanged()
-    }
-
-    fun taskSelected(task: Task) {
-        val resultIntent = Intent()
-        resultIntent.putExtra("taskID", task.id)
-        setResult(Activity.RESULT_OK, resultIntent)
-        finish()
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        return if (item.itemId == android.R.id.home) {
-            onBackPressed()
-            true
-        } else {
-            super.onOptionsItemSelected(item)
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.activities
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Bundle
+import android.util.SparseArray
+import android.view.MenuItem
+import android.view.View
+import androidx.fragment.app.Fragment
+import androidx.viewpager2.adapter.FragmentStateAdapter
+import com.google.android.material.tabs.TabLayoutMediator
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.data.TaskRepository
+import com.habitrpg.android.habitica.databinding.ActivitySkillTasksBinding
+import com.habitrpg.android.habitica.models.tasks.Task
+import com.habitrpg.android.habitica.ui.fragments.skills.SkillTasksRecyclerViewFragment
+import com.habitrpg.shared.habitica.models.tasks.TaskType
+import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class SkillTasksActivity : BaseActivity() {
+    private lateinit var binding: ActivitySkillTasksBinding
+
+    @Inject
+    lateinit var taskRepository: TaskRepository
+
+    internal var viewFragmentsDictionary = SparseArray<SkillTasksRecyclerViewFragment>()
+
+    override fun getLayoutResId(): Int {
+        return R.layout.activity_skill_tasks
+    }
+
+    public override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setupToolbar(findViewById(R.id.toolbar))
+        loadTaskLists()
+    }
+
+    override fun getContentView(layoutResId: Int?): View {
+        binding = ActivitySkillTasksBinding.inflate(layoutInflater)
+        return binding.root
+    }
+
+    private fun loadTaskLists() {
+        val statePagerAdapter =
+            object : FragmentStateAdapter(supportFragmentManager, lifecycle) {
+                override fun createFragment(position: Int): Fragment {
+                    val fragment = SkillTasksRecyclerViewFragment()
+                    fragment.taskType =
+                        when (position) {
+                            0 -> TaskType.HABIT
+                            1 -> TaskType.DAILY
+                            else -> TaskType.TODO
+                        }
+                    fragment.onTaskSelection = {
+                        taskSelected(it)
+                    }
+                    viewFragmentsDictionary.put(position, fragment)
+                    return fragment
+                }
+
+                override fun getItemCount(): Int {
+                    return 3
+                }
+            }
+        binding.viewPager.adapter = statePagerAdapter
+        TabLayoutMediator(binding.tabLayout, binding.viewPager) { tab, position ->
+            tab.text =
+                when (position) {
+                    0 -> getString(R.string.habits)
+                    1 -> getString(R.string.dailies)
+                    2 -> getString(R.string.todos)
+                    else -> ""
+                }
+        }.attach()
+        statePagerAdapter.notifyDataSetChanged()
+    }
+
+    fun taskSelected(task: Task) {
+        val resultIntent = Intent()
+        resultIntent.putExtra("taskID", task.id)
+        setResult(Activity.RESULT_OK, resultIntent)
+        finish()
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return if (item.itemId == android.R.id.home) {
+            onBackPressed()
+            true
+        } else {
+            super.onOptionsItemSelected(item)
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
index 107fbe530..f1bcad846 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
@@ -54,7 +54,6 @@ import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard
 import com.habitrpg.android.habitica.ui.theme.colors
 import com.habitrpg.android.habitica.ui.theme.textPrimaryFor
 import com.habitrpg.android.habitica.ui.theme.windowBackgroundFor
-import com.habitrpg.common.habitica.theme.HabiticaTheme
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import com.habitrpg.android.habitica.ui.viewmodels.TaskFormViewModel
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
@@ -67,6 +66,7 @@ import com.habitrpg.android.habitica.ui.views.tasks.form.TaskDifficultySelector
 import com.habitrpg.android.habitica.ui.views.tasks.form.TaskFormSelector
 import com.habitrpg.common.habitica.extensions.dpToPx
 import com.habitrpg.common.habitica.extensions.getThemeColor
+import com.habitrpg.common.habitica.theme.HabiticaTheme
 import com.habitrpg.shared.habitica.models.tasks.Attribute
 import com.habitrpg.shared.habitica.models.tasks.Frequency
 import com.habitrpg.shared.habitica.models.tasks.HabitResetOption
@@ -83,9 +83,6 @@ import javax.inject.Inject
 
 @AndroidEntryPoint
 class TaskFormActivity : BaseActivity() {
-
-
-
     private val viewModel: TaskFormViewModel by viewModels()
 
     private lateinit var binding: ActivityTaskFormBinding
@@ -121,32 +118,34 @@ class TaskFormActivity : BaseActivity() {
 
     private var challenge: Challenge? = null
 
-    private val notificationPermissionLauncher = registerForActivityResult(
-        ActivityResultContracts.RequestPermission()
-    ) { granted ->
-        if (granted) {
-            pushNotificationManager.addPushDeviceUsingStoredToken()
-        } else {
-            // If user denies notification settings originally - they must manually enable it through notification settings.
-            val alert = HabiticaAlertDialog(this)
-            alert.setTitle(R.string.push_notification_system_settings_title)
-            alert.setMessage(R.string.push_notification_system_settings_description)
-            alert.addButton(R.string.settings, isPrimary = true, isDestructive = false) { _, _ ->
-                val notifSettingIntent: Intent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                    Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS)
-                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                        .putExtra(Settings.EXTRA_APP_PACKAGE, applicationContext?.packageName)
-                } else {
-                    return@addButton
+    private val notificationPermissionLauncher =
+        registerForActivityResult(
+            ActivityResultContracts.RequestPermission(),
+        ) { granted ->
+            if (granted) {
+                pushNotificationManager.addPushDeviceUsingStoredToken()
+            } else {
+                // If user denies notification settings originally - they must manually enable it through notification settings.
+                val alert = HabiticaAlertDialog(this)
+                alert.setTitle(R.string.push_notification_system_settings_title)
+                alert.setMessage(R.string.push_notification_system_settings_description)
+                alert.addButton(R.string.settings, isPrimary = true, isDestructive = false) { _, _ ->
+                    val notifSettingIntent: Intent =
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                            Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS)
+                                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                .putExtra(Settings.EXTRA_APP_PACKAGE, applicationContext?.packageName)
+                        } else {
+                            return@addButton
+                        }
+                    startActivity(notifSettingIntent)
                 }
-                startActivity(notifSettingIntent)
+                alert.addButton(R.string.cancel, false) { _, _ ->
+                    alert.dismiss()
+                }
+                alert.show()
             }
-            alert.addButton(R.string.cancel, false) { _, _ ->
-                alert.dismiss()
-            }
-            alert.show()
         }
-    }
 
     private var isCreating = true
     private var isChallengeTask = false
@@ -192,27 +191,32 @@ class TaskFormActivity : BaseActivity() {
 
         val taskId = bundle.getString(TASK_ID_KEY)
         groupID = bundle.getString(GROUP_ID_KEY)
-        forcedTheme = if (taskId != null) {
-            val taskValue = bundle.getDouble(TASK_VALUE_KEY)
-            when {
-                taskValue < -20 -> "maroon"
-                taskValue < -10 -> "red"
-                taskValue < -1 -> "orange"
-                taskValue < 1 -> "yellow"
-                taskValue < 5 -> "green"
-                taskValue < 10 -> "teal"
-                else -> "blue"
+        forcedTheme =
+            if (taskId != null) {
+                val taskValue = bundle.getDouble(TASK_VALUE_KEY)
+                when {
+                    taskValue < -20 -> "maroon"
+                    taskValue < -10 -> "red"
+                    taskValue < -1 -> "orange"
+                    taskValue < 1 -> "yellow"
+                    taskValue < 5 -> "green"
+                    taskValue < 10 -> "teal"
+                    else -> "blue"
+                }
+            } else {
+                "taskform"
             }
-        } else {
-            "taskform"
-        }
         super.onCreate(savedInstanceState)
 
         setSupportActionBar(binding.toolbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         supportActionBar?.setDisplayShowHomeEnabled(true)
         if (forcedTheme == "taskform" || forcedTheme == "maroon") {
-            ToolbarColorHelper.colorizeToolbar(binding.toolbar, this, ContextCompat.getColor(this, R.color.white))
+            ToolbarColorHelper.colorizeToolbar(
+                binding.toolbar,
+                this,
+                ContextCompat.getColor(this, R.color.white),
+            )
         }
         tintColor = getThemeColor(R.attr.taskFormTint)
         val upperTintColor =
@@ -243,15 +247,17 @@ class TaskFormActivity : BaseActivity() {
         binding.textEditText.addTextChangedListener(
             OnChangeTextWatcher { _, _, _, _ ->
                 checkCanSave()
-            }
+            },
         )
-        binding.textEditText.onFocusChangeListener = View.OnFocusChangeListener { _, isFocused ->
-            binding.textInputLayout.alpha = if (isFocused) 0.8f else 0.6f
-            window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE)
-        }
-        binding.notesEditText.onFocusChangeListener = View.OnFocusChangeListener { _, isFocused ->
-            binding.notesInputLayout.alpha = if (isFocused) 0.8f else 0.6f
-        }
+        binding.textEditText.onFocusChangeListener =
+            View.OnFocusChangeListener { _, isFocused ->
+                binding.textInputLayout.alpha = if (isFocused) 0.8f else 0.6f
+                window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE)
+            }
+        binding.notesEditText.onFocusChangeListener =
+            View.OnFocusChangeListener { _, isFocused ->
+                binding.notesInputLayout.alpha = if (isFocused) 0.8f else 0.6f
+            }
         binding.scrollView.setOnTouchListener { view, event ->
             userScrolled =
                 view == binding.scrollView && (event.action == MotionEvent.ACTION_SCROLL || event.action == MotionEvent.ACTION_MOVE)
@@ -276,7 +282,8 @@ class TaskFormActivity : BaseActivity() {
                     fillForm(task)
                     task.challengeID?.let { challengeID ->
                         lifecycleScope.launch(Dispatchers.Main) {
-                            val challenge = challengeRepository.retrieveChallenge(challengeID) ?: return@launch
+                            val challenge =
+                                challengeRepository.retrieveChallenge(challengeID) ?: return@launch
                             this@TaskFormActivity.challenge = challenge
                             binding.challengeNameView.text =
                                 getString(R.string.challenge_task_name, challenge.name)
@@ -286,28 +293,32 @@ class TaskFormActivity : BaseActivity() {
                     }
                 }
             }
+
             bundle.containsKey(PARCELABLE_TASK) -> {
                 isCreating = false
-                task = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                    bundle.getParcelable(PARCELABLE_TASK, Task::class.java)
-                } else {
-                    @Suppress("DEPRECATION")
-                    bundle.getParcelable(PARCELABLE_TASK)
-                }
+                task =
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                        bundle.getParcelable(PARCELABLE_TASK, Task::class.java)
+                    } else {
+                        @Suppress("DEPRECATION")
+                        bundle.getParcelable(PARCELABLE_TASK)
+                    }
                 task?.let { fillForm(it) }
             }
+
             else -> {
-                title = getString(
-                    R.string.create_task,
+                title =
                     getString(
-                        when (taskType) {
-                            TaskType.DAILY -> R.string.daily
-                            TaskType.TODO -> R.string.todo
-                            TaskType.REWARD -> R.string.reward
-                            else -> R.string.habit
-                        }
+                        R.string.create_task,
+                        getString(
+                            when (taskType) {
+                                TaskType.DAILY -> R.string.daily
+                                TaskType.TODO -> R.string.todo
+                                TaskType.REWARD -> R.string.reward
+                                else -> R.string.habit
+                            },
+                        ),
                     )
-                )
                 initialTaskInstance = configureTask(Task())
             }
         }
@@ -330,7 +341,7 @@ class TaskFormActivity : BaseActivity() {
                             }
                         },
                         configManager = configManager,
-                        showEditButton = true
+                        showEditButton = true,
                     )
                 }
             }
@@ -353,7 +364,7 @@ class TaskFormActivity : BaseActivity() {
             HabiticaTheme {
                 TaskDifficultySelector(
                     viewModel.taskDifficulty.value,
-                    onSelect = { viewModel.taskDifficulty.value = it }
+                    onSelect = { viewModel.taskDifficulty.value = it },
                 )
             }
         }
@@ -364,8 +375,14 @@ class TaskFormActivity : BaseActivity() {
                     HabitScoringSelector(
                         viewModel.habitScoringPositive.value,
                         viewModel.habitScoringNegative.value,
-                        { viewModel.habitScoringPositive.value = !viewModel.habitScoringPositive.value },
-                        { viewModel.habitScoringNegative.value = !viewModel.habitScoringNegative.value }
+                        {
+                            viewModel.habitScoringPositive.value =
+                                !viewModel.habitScoringPositive.value
+                        },
+                        {
+                            viewModel.habitScoringNegative.value =
+                                !viewModel.habitScoringNegative.value
+                        },
                     )
                 }
             }
@@ -377,10 +394,10 @@ class TaskFormActivity : BaseActivity() {
                         listOf(
                             LabeledValue(getString(R.string.repeat_daily), HabitResetOption.DAILY),
                             LabeledValue(getString(R.string.weekly), HabitResetOption.WEEKLY),
-                            LabeledValue(getString(R.string.monthly), HabitResetOption.MONTHLY)
+                            LabeledValue(getString(R.string.monthly), HabitResetOption.MONTHLY),
                         ),
                         { viewModel.habitResetOption.value = it },
-                        columnSize = 3
+                        columnSize = 3,
                     )
                 }
             }
@@ -394,9 +411,9 @@ class TaskFormActivity : BaseActivity() {
                         LabeledValue(getString(R.string.strength), Attribute.STRENGTH),
                         LabeledValue(getString(R.string.constitution), Attribute.CONSTITUTION),
                         LabeledValue(getString(R.string.intelligence), Attribute.INTELLIGENCE),
-                        LabeledValue(getString(R.string.perception), Attribute.PERCEPTION)
+                        LabeledValue(getString(R.string.perception), Attribute.PERCEPTION),
                     ),
-                    { viewModel.selectedAttribute.value = it }
+                    { viewModel.selectedAttribute.value = it },
                 )
             }
         }
@@ -409,7 +426,10 @@ class TaskFormActivity : BaseActivity() {
         super.onResume()
     }
 
-    override fun loadTheme(sharedPreferences: SharedPreferences, forced: Boolean) {
+    override fun loadTheme(
+        sharedPreferences: SharedPreferences,
+        forced: Boolean,
+    ) {
         super.loadTheme(sharedPreferences, forced)
         val upperTintColor =
             if (forcedTheme == "taskform") getThemeColor(R.attr.taskFormTint) else getThemeColor(R.attr.colorAccent)
@@ -553,15 +573,18 @@ class TaskFormActivity : BaseActivity() {
                 otherTagList.add(it)
             }
         }
-        val challengesTagTitle = Tag().apply {
-            name = getString(R.string.challenge_tags)
-        }
-        val groupsTagTitle = Tag().apply {
-            name = getString(R.string.group_tags)
-        }
-        val otherTagTitle = Tag().apply {
-            name = getString(R.string.your_tags)
-        }
+        val challengesTagTitle =
+            Tag().apply {
+                name = getString(R.string.challenge_tags)
+            }
+        val groupsTagTitle =
+            Tag().apply {
+                name = getString(R.string.group_tags)
+            }
+        val otherTagTitle =
+            Tag().apply {
+                name = getString(R.string.your_tags)
+            }
         if (challengeTagList.isNotEmpty()) {
             sortedTagList.add(challengesTagTitle)
             sortedTagList.addAll(challengeTagList)
@@ -641,6 +664,7 @@ class TaskFormActivity : BaseActivity() {
                     binding.adjustStreakWrapper.visibility = View.GONE
                 }
             }
+
             TaskType.DAILY -> {
                 binding.taskSchedulingControls.startDate = task.startDate ?: Date()
                 binding.taskSchedulingControls.everyX = task.everyX ?: 1
@@ -650,6 +674,7 @@ class TaskFormActivity : BaseActivity() {
                 binding.habitAdjustPositiveStreakView.setText((task.streak ?: 0).toString())
                 binding.taskSchedulingControls.frequency = task.frequency ?: Frequency.DAILY
             }
+
             TaskType.TODO -> binding.taskSchedulingControls.dueDate = task.dueDate
             TaskType.REWARD -> binding.rewardValue.value = task.value
         }
@@ -684,13 +709,14 @@ class TaskFormActivity : BaseActivity() {
     private fun updateTagViewsColors() {
         binding.tagsWrapper.children.forEach { view ->
             val tagView = view as? AppCompatCheckBox
-            val colorStateList = ColorStateList(
-                arrayOf(
-                    intArrayOf(-android.R.attr.state_checked), // unchecked
-                    intArrayOf(android.R.attr.state_checked) // checked
-                ),
-                intArrayOf(getThemeColor(R.attr.colorTintedBackgroundOffset), tintColor)
-            )
+            val colorStateList =
+                ColorStateList(
+                    arrayOf(
+                        intArrayOf(-android.R.attr.state_checked), // unchecked
+                        intArrayOf(android.R.attr.state_checked), // checked
+                    ),
+                    intArrayOf(getThemeColor(R.attr.colorTintedBackgroundOffset), tintColor),
+                )
             tagView?.buttonTintList = colorStateList
         }
     }
@@ -780,10 +806,11 @@ class TaskFormActivity : BaseActivity() {
         val resultIntent = Intent()
         resultIntent.putExtra(TASK_TYPE_KEY, taskType.value)
 
-        val assignChanges = mapOf(
-            "assign" to mutableListOf<String>(),
-            "unassign" to mutableListOf()
-        )
+        val assignChanges =
+            mapOf(
+                "assign" to mutableListOf<String>(),
+                "unassign" to mutableListOf(),
+            )
         if (groupID != null && thisTask.group?.groupID == null) {
             thisTask.group = TaskGroupPlan()
             thisTask.group?.groupID = groupID
@@ -821,7 +848,7 @@ class TaskFormActivity : BaseActivity() {
                 setResult(Activity.RESULT_OK, resultIntent)
                 finish()
             },
-            500
+            500,
         )
     }
 
@@ -867,8 +894,9 @@ class TaskFormActivity : BaseActivity() {
 
     private fun showChallengeDeleteTask() {
         lifecycleScope.launch(Dispatchers.Main) {
-            val tasks = taskRepository.getTasksForChallenge(task?.challengeID).firstOrNull()
-                ?: return@launch
+            val tasks =
+                taskRepository.getTasksForChallenge(task?.challengeID).firstOrNull()
+                    ?: return@launch
             val taskCount = tasks.size
             val alert = HabiticaAlertDialog(this@TaskFormActivity)
             alert.setTitle(getString(R.string.delete_challenge_task_title))
@@ -876,13 +904,13 @@ class TaskFormActivity : BaseActivity() {
                 getString(
                     R.string.delete_challenge_task_description,
                     taskCount,
-                    challenge?.name ?: ""
-                )
+                    challenge?.name ?: "",
+                ),
             )
             alert.addButton(
                 R.string.leave_delete_task,
                 isPrimary = true,
-                isDestructive = true
+                isDestructive = true,
             ) { _, _ ->
                 challenge?.let {
                     lifecycleScope.launch(Dispatchers.Main) {
@@ -895,7 +923,7 @@ class TaskFormActivity : BaseActivity() {
             alert.addButton(
                 getString(R.string.leave_delete_x_tasks, taskCount),
                 isPrimary = false,
-                isDestructive = true
+                isDestructive = true,
             ) { _, _ ->
                 challenge?.let {
                     lifecycleScope.launch(Dispatchers.Main) {
@@ -915,20 +943,21 @@ class TaskFormActivity : BaseActivity() {
             return
         }
         lifecycleScope.launch(Dispatchers.Main) {
-            val tasks = taskRepository.getTasksForChallenge(task.challengeID).firstOrNull()
-                ?: return@launch
+            val tasks =
+                taskRepository.getTasksForChallenge(task.challengeID).firstOrNull()
+                    ?: return@launch
             val taskCount = tasks.size
             val dialog = HabiticaAlertDialog(this@TaskFormActivity)
             dialog.setTitle(R.string.broken_challenge)
             dialog.setMessage(
                 getString(
                     R.string.broken_challenge_description,
-                    taskCount
-                )
+                    taskCount,
+                ),
             )
             dialog.addButton(
                 getString(R.string.keep_x_tasks, taskCount),
-                true
+                true,
             ) { _, _ ->
                 lifecycleScope.launch(Dispatchers.Main) {
                     taskRepository.unlinkAllTasks(task.challengeID, "keep-all")
@@ -938,7 +967,7 @@ class TaskFormActivity : BaseActivity() {
             dialog.addButton(
                 getString(R.string.delete_x_tasks, taskCount),
                 isPrimary = false,
-                isDestructive = true
+                isDestructive = true,
             ) { _, _ ->
                 lifecycleScope.launch(Dispatchers.Main) {
                     taskRepository.unlinkAllTasks(task.challengeID, "remove-all")
@@ -975,7 +1004,7 @@ class TaskFormActivity : BaseActivity() {
                         assignedIDs.add(it)
                     }
                 },
-                onClose
+                onClose,
             )
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskSummaryActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskSummaryActivity.kt
index ca9a2b2ed..27b6f067e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskSummaryActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskSummaryActivity.kt
@@ -48,7 +48,6 @@ import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.data.TaskRepository
 import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.helpers.AppConfigManager
-import com.habitrpg.common.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.helpers.TaskDescriptionBuilder
 import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.ui.theme.colors
@@ -57,12 +56,13 @@ import com.habitrpg.android.habitica.ui.theme.primaryBackgroundFor
 import com.habitrpg.android.habitica.ui.theme.textPrimaryFor
 import com.habitrpg.android.habitica.ui.theme.textSecondaryFor
 import com.habitrpg.android.habitica.ui.theme.windowBackgroundFor
-import com.habitrpg.common.habitica.theme.HabiticaTheme
 import com.habitrpg.android.habitica.ui.viewmodels.BaseViewModel
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import com.habitrpg.android.habitica.ui.views.CompletedAt
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.UserRow
+import com.habitrpg.common.habitica.helpers.MainNavigationController
+import com.habitrpg.common.habitica.theme.HabiticaTheme
 import com.habitrpg.shared.habitica.models.tasks.TaskType
 import dagger.hilt.android.AndroidEntryPoint
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -72,22 +72,24 @@ import java.util.Date
 import javax.inject.Inject
 
 @HiltViewModel
-class TaskSummaryViewModel @Inject constructor(
-    savedStateHandle: SavedStateHandle,
-    userRepository: UserRepository,
-    userViewModel: MainUserViewModel,
-    val taskRepository: TaskRepository,
-    val socialRepository: SocialRepository,
-    val configManager: AppConfigManager
-) : BaseViewModel(userRepository, userViewModel) {
-    val taskID: String = savedStateHandle[TaskFormActivity.TASK_ID_KEY] ?: ""
+class TaskSummaryViewModel
+    @Inject
+    constructor(
+        savedStateHandle: SavedStateHandle,
+        userRepository: UserRepository,
+        userViewModel: MainUserViewModel,
+        val taskRepository: TaskRepository,
+        val socialRepository: SocialRepository,
+        val configManager: AppConfigManager,
+    ) : BaseViewModel(userRepository, userViewModel) {
+        val taskID: String = savedStateHandle[TaskFormActivity.TASK_ID_KEY] ?: ""
 
-    val task = taskRepository.getTask(taskID).asLiveData()
+        val task = taskRepository.getTask(taskID).asLiveData()
 
-    fun getMember(userID: String?): Flow<Member?> {
-        return socialRepository.getMember(userID)
+        fun getMember(userID: String?): Flow<Member?> {
+            return socialRepository.getMember(userID)
+        }
     }
-}
 
 @AndroidEntryPoint
 class TaskSummaryActivity : BaseActivity() {
@@ -115,13 +117,14 @@ fun TaskSummaryView(viewModel: TaskSummaryViewModel) {
 
     if (task != null) {
         val darkestColor = HabiticaTheme.colors.textPrimaryFor(task)
-        val topTextColor = if ((task?.value ?: 0.0) >= -20) {
-            colorResource(
-                task?.extraDarkTaskColor ?: R.color.white
-            )
-        } else {
-            Color.White
-        }
+        val topTextColor =
+            if ((task?.value ?: 0.0) >= -20) {
+                colorResource(
+                    task?.extraDarkTaskColor ?: R.color.white,
+                )
+            } else {
+                Color.White
+            }
         val systemUiController = rememberSystemUiController()
         val statusBarColor = HabiticaTheme.colors.primaryBackgroundFor(task)
         val lightestColor = HabiticaTheme.colors.contentBackgroundFor(task)
@@ -133,7 +136,7 @@ fun TaskSummaryView(viewModel: TaskSummaryViewModel) {
         Column(Modifier.background(statusBarColor)) {
             Row(
                 verticalAlignment = Alignment.CenterVertically,
-                modifier = Modifier.padding(vertical = 2.dp)
+                modifier = Modifier.padding(vertical = 2.dp),
             ) {
                 Button(
                     onClick = {
@@ -144,14 +147,15 @@ fun TaskSummaryView(viewModel: TaskSummaryViewModel) {
                         MainNavigationController.navigateBack()
                     },
                     colors = ButtonDefaults.textButtonColors(contentColor = darkestColor),
-                    elevation = ButtonDefaults.elevation(0.dp, 0.dp)
+                    elevation = ButtonDefaults.elevation(0.dp, 0.dp),
                 ) {
                     Image(
                         painterResource(R.drawable.arrow_back),
                         stringResource(R.string.action_back),
-                        colorFilter = ColorFilter.tint(
-                            topTextColor
-                        )
+                        colorFilter =
+                            ColorFilter.tint(
+                                topTextColor,
+                            ),
                     )
                 }
                 Text(
@@ -159,7 +163,7 @@ fun TaskSummaryView(viewModel: TaskSummaryViewModel) {
                     fontSize = 18.sp,
                     fontWeight = FontWeight.Medium,
                     color = topTextColor,
-                    modifier = Modifier.padding(start = 0.dp)
+                    modifier = Modifier.padding(start = 0.dp),
                 )
             }
             Column(
@@ -167,25 +171,25 @@ fun TaskSummaryView(viewModel: TaskSummaryViewModel) {
                     .shadow(16.dp)
                     .background(
                         lightestColor,
-                        RoundedCornerShape(topStart = 12.dp, topEnd = 12.dp)
+                        RoundedCornerShape(topStart = 12.dp, topEnd = 12.dp),
                     )
                     .padding(20.dp, 5.dp)
                     .fillMaxWidth()
-                    .fillMaxHeight()
+                    .fillMaxHeight(),
             ) {
                 Text(
                     stringResource(R.string.title),
                     fontSize = 16.sp,
                     color = darkestColor,
                     fontWeight = FontWeight.Medium,
-                    modifier = titleModifier
+                    modifier = titleModifier,
                 )
                 Text(
                     task?.text ?: "",
                     fontSize = 16.sp,
                     color = darkestColor,
                     fontWeight = FontWeight.Normal,
-                    modifier = textModifier
+                    modifier = textModifier,
                 )
                 if (task?.notes?.isNotBlank() == true) {
                     Text(
@@ -193,14 +197,14 @@ fun TaskSummaryView(viewModel: TaskSummaryViewModel) {
                         fontSize = 16.sp,
                         color = darkestColor,
                         fontWeight = FontWeight.Medium,
-                        modifier = titleModifier
+                        modifier = titleModifier,
                     )
                     Text(
                         task?.notes ?: "",
                         fontSize = 16.sp,
                         color = darkestColor,
                         fontWeight = FontWeight.Normal,
-                        modifier = textModifier
+                        modifier = textModifier,
                     )
                 }
                 if (task?.type != TaskType.REWARD) {
@@ -209,14 +213,14 @@ fun TaskSummaryView(viewModel: TaskSummaryViewModel) {
                         fontSize = 16.sp,
                         color = darkestColor,
                         fontWeight = FontWeight.Medium,
-                        modifier = titleModifier
+                        modifier = titleModifier,
                     )
                     Text(
                         task?.let { taskDescriptionBuilder.describe(it) }!!.makeBoldComposable(),
                         fontSize = 16.sp,
                         color = darkestColor,
                         fontWeight = FontWeight.Normal,
-                        modifier = textModifier
+                        modifier = textModifier,
                     )
                 }
                 if (task?.type == TaskType.REWARD) {
@@ -225,25 +229,26 @@ fun TaskSummaryView(viewModel: TaskSummaryViewModel) {
                         fontSize = 16.sp,
                         color = darkestColor,
                         fontWeight = FontWeight.Medium,
-                        modifier = titleModifier.padding(bottom = 4.dp)
+                        modifier = titleModifier.padding(bottom = 4.dp),
                     )
                     Row(
                         horizontalArrangement = Arrangement.spacedBy(12.dp),
-                        modifier = Modifier
-                            .padding(vertical = 4.dp)
-                            .background(
-                                HabiticaTheme.colors.windowBackgroundFor(task),
-                                MaterialTheme.shapes.medium
-                            )
-                            .padding(15.dp)
-                            .fillMaxWidth()
+                        modifier =
+                            Modifier
+                                .padding(vertical = 4.dp)
+                                .background(
+                                    HabiticaTheme.colors.windowBackgroundFor(task),
+                                    MaterialTheme.shapes.medium,
+                                )
+                                .padding(15.dp)
+                                .fillMaxWidth(),
                     ) {
                         Image(HabiticaIconsHelper.imageOfGold().asImageBitmap(), null)
                         Text(
                             "${task?.value}",
                             fontSize = 16.sp,
                             fontWeight = FontWeight.Medium,
-                            color = darkestColor
+                            color = darkestColor,
                         )
                     }
                 }
@@ -254,7 +259,7 @@ fun TaskSummaryView(viewModel: TaskSummaryViewModel) {
                             fontSize = 16.sp,
                             color = darkestColor,
                             fontWeight = FontWeight.Medium,
-                            modifier = titleModifier.padding(bottom = 4.dp)
+                            modifier = titleModifier.padding(bottom = 4.dp),
                         )
                         for (item in checklist) {
                             Text(
@@ -262,14 +267,15 @@ fun TaskSummaryView(viewModel: TaskSummaryViewModel) {
                                 fontSize = 16.sp,
                                 fontWeight = FontWeight.Medium,
                                 color = darkestColor,
-                                modifier = Modifier
-                                    .padding(vertical = 4.dp)
-                                    .background(
-                                        HabiticaTheme.colors.windowBackgroundFor(task),
-                                        MaterialTheme.shapes.medium
-                                    )
-                                    .padding(15.dp)
-                                    .fillMaxWidth()
+                                modifier =
+                                    Modifier
+                                        .padding(vertical = 4.dp)
+                                        .background(
+                                            HabiticaTheme.colors.windowBackgroundFor(task),
+                                            MaterialTheme.shapes.medium,
+                                        )
+                                        .padding(15.dp)
+                                        .fillMaxWidth(),
                             )
                         }
                     }
@@ -280,7 +286,7 @@ fun TaskSummaryView(viewModel: TaskSummaryViewModel) {
                         fontSize = 16.sp,
                         color = darkestColor,
                         fontWeight = FontWeight.Medium,
-                        modifier = titleModifier.padding(bottom = 4.dp)
+                        modifier = titleModifier.padding(bottom = 4.dp),
                     )
                     for (item in task?.group?.assignedUsersDetail ?: emptyList()) {
                         val member = viewModel.getMember(item.assignedUserID).collectAsState(null)
@@ -291,22 +297,23 @@ fun TaskSummaryView(viewModel: TaskSummaryViewModel) {
                                 .padding(vertical = 4.dp)
                                 .background(
                                     HabiticaTheme.colors.windowBackgroundFor(task),
-                                    MaterialTheme.shapes.medium
+                                    MaterialTheme.shapes.medium,
                                 )
                                 .padding(15.dp, 12.dp)
                                 .heightIn(min = 24.dp)
                                 .fillMaxWidth(),
                             color = darkestColor,
                             configManager = viewModel.configManager,
-                            extraContent = if (item.completed) {
-                                (
-                                    {
-                                        CompletedAt(item.completedDate)
-                                    }
+                            extraContent =
+                                if (item.completed) {
+                                    (
+                                        {
+                                            CompletedAt(item.completedDate)
+                                        }
                                     )
-                            } else {
-                                null
-                            }
+                                } else {
+                                    null
+                                },
                         )
                     }
                     task?.group?.assignedUsersDetail?.find { it.assignedUserID == viewModel.userViewModel.userID }
@@ -319,11 +326,11 @@ fun TaskSummaryView(viewModel: TaskSummaryViewModel) {
                             stringResource(
                                 R.string.assigned_to_you_by,
                                 it.assigningUsername ?: "",
-                                formatter.format(it.assignedDate ?: Date())
+                                formatter.format(it.assignedDate ?: Date()),
                             ),
                             fontSize = 14.sp,
                             color = HabiticaTheme.colors.textSecondaryFor(task),
-                            modifier = Modifier.padding(horizontal = 12.dp, vertical = 10.dp)
+                            modifier = Modifier.padding(horizontal = 12.dp, vertical = 10.dp),
                         )
                     }
                 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/AchievementsAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/AchievementsAdapter.kt
index db7930608..c14cc3d7c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/AchievementsAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/AchievementsAdapter.kt
@@ -16,26 +16,32 @@ import com.habitrpg.common.habitica.extensions.loadImage
 import com.habitrpg.common.habitica.views.PixelArtView
 
 class AchievementsAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
-
     var useGridLayout: Boolean = false
     var entries = listOf<Any>()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int,
+    ): RecyclerView.ViewHolder {
         return when (viewType) {
             0 -> SectionViewHolder(parent.inflate(R.layout.achievement_section_header))
             3 -> QuestAchievementViewHolder(parent.inflate(R.layout.achievement_quest_item))
             4 -> ChallengeAchievementViewHolder(parent.inflate(R.layout.achievement_challenge_item))
-            else -> AchievementViewHolder(
-                if (useGridLayout) {
-                    parent.inflate(R.layout.achievement_grid_item)
-                } else {
-                    parent.inflate(R.layout.achievement_list_item)
-                }
-            )
+            else ->
+                AchievementViewHolder(
+                    if (useGridLayout) {
+                        parent.inflate(R.layout.achievement_grid_item)
+                    } else {
+                        parent.inflate(R.layout.achievement_list_item)
+                    },
+                )
         }
     }
 
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+    override fun onBindViewHolder(
+        holder: RecyclerView.ViewHolder,
+        position: Int,
+    ) {
         when (val entry = entries[position]) {
             is Achievement -> (holder as? AchievementViewHolder)?.bind(entry)
             is QuestAchievement -> (holder as? QuestAchievementViewHolder)?.bind(entry)
@@ -71,7 +77,9 @@ class AchievementsAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
         }
     }
 
-    class AchievementViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), View.OnClickListener {
+    class AchievementViewHolder(itemView: View) :
+        RecyclerView.ViewHolder(itemView),
+        View.OnClickListener {
         private var achievement: Achievement? = null
 
         private val achievementContainer: ViewGroup?
@@ -91,11 +99,12 @@ class AchievementsAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
         fun bind(achievement: Achievement) {
             this.achievement = achievement
-            val iconName = if (achievement.earned) {
-                achievement.icon + "2x"
-            } else {
-                "achievement-unearned2x"
-            }
+            val iconName =
+                if (achievement.earned) {
+                    achievement.icon + "2x"
+                } else {
+                    "achievement-unearned2x"
+                }
             achievementIconView.loadImage(iconName)
             achievementTitleView.text = achievement.title
             achievementDescriptionView?.text = achievement.text
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/BaseRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/BaseRecyclerViewAdapter.kt
index 1f9e52ae8..5e43fb147 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/BaseRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/BaseRecyclerViewAdapter.kt
@@ -6,10 +6,9 @@ import com.habitrpg.android.habitica.models.BaseMainObject
 
 open class DiffCallback<T : BaseMainObject>(
     protected val oldList: List<BaseMainObject>,
-    protected val newList: List<BaseMainObject>
+    protected val newList: List<BaseMainObject>,
 ) :
     DiffUtil.Callback() {
-
     override fun getOldListSize(): Int {
         return oldList.size
     }
@@ -18,20 +17,29 @@ open class DiffCallback<T : BaseMainObject>(
         return newList.size
     }
 
-    override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
+    override fun areItemsTheSame(
+        oldItemPosition: Int,
+        newItemPosition: Int,
+    ): Boolean {
         return oldList[oldItemPosition].primaryIdentifier == newList[newItemPosition].primaryIdentifier
     }
 
-    override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
+    override fun areContentsTheSame(
+        oldItemPosition: Int,
+        newItemPosition: Int,
+    ): Boolean {
         val oldItem = oldList[oldItemPosition]
         val newItem = newList[newItemPosition]
         return oldItem == newItem
     }
 }
 
-abstract class BaseRecyclerViewAdapter<T : BaseMainObject, VH : RecyclerView.ViewHolder> : RecyclerView.Adapter<VH>() {
-
-    open fun getDiffCallback(oldList: List<T>, newList: List<T>): DiffCallback<T>? {
+abstract class BaseRecyclerViewAdapter<T : BaseMainObject, VH : RecyclerView.ViewHolder> :
+    RecyclerView.Adapter<VH>() {
+    open fun getDiffCallback(
+        oldList: List<T>,
+        newList: List<T>,
+    ): DiffCallback<T>? {
         return null
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationEquipmentRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationEquipmentRecyclerViewAdapter.kt
index 66dcb087f..786dd4e0a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationEquipmentRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationEquipmentRecyclerViewAdapter.kt
@@ -11,16 +11,16 @@ import androidx.core.os.bundleOf
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.CustomizationGridItemBinding
 import com.habitrpg.android.habitica.databinding.DialogPurchaseCustomizationBinding
-import com.habitrpg.common.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.models.inventory.CustomizationSet
 import com.habitrpg.android.habitica.models.inventory.Equipment
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.common.habitica.extensions.loadImage
+import com.habitrpg.common.habitica.helpers.MainNavigationController
 import com.habitrpg.common.habitica.views.PixelArtView
 
-class CustomizationEquipmentRecyclerViewAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>() {
-
+class CustomizationEquipmentRecyclerViewAdapter :
+    androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>() {
     var gemBalance: Int? = null
     var equipmentList: MutableList<Equipment> =
         ArrayList()
@@ -37,7 +37,10 @@ class CustomizationEquipmentRecyclerViewAdapter : androidx.recyclerview.widget.R
     var onSelect: ((Equipment) -> Unit)? = null
     var onUnlock: ((Equipment) -> Unit)? = null
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder {
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int,
+    ): androidx.recyclerview.widget.RecyclerView.ViewHolder {
         val viewID: Int = R.layout.customization_grid_item
 
         val view = LayoutInflater.from(parent.context).inflate(viewID, parent, false)
@@ -46,7 +49,7 @@ class CustomizationEquipmentRecyclerViewAdapter : androidx.recyclerview.widget.R
 
     override fun onBindViewHolder(
         holder: androidx.recyclerview.widget.RecyclerView.ViewHolder,
-        position: Int
+        position: Int,
     ) {
         (holder as EquipmentViewHolder).bind(equipmentList[position])
     }
@@ -71,8 +74,8 @@ class CustomizationEquipmentRecyclerViewAdapter : androidx.recyclerview.widget.R
         this.notifyDataSetChanged()
     }
 
-    internal inner class EquipmentViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView), View.OnClickListener {
-
+    internal inner class EquipmentViewHolder(itemView: View) :
+        androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView), View.OnClickListener {
         private val binding = CustomizationGridItemBinding.bind(itemView)
         var equipment: Equipment? = null
 
@@ -94,29 +97,39 @@ class CustomizationEquipmentRecyclerViewAdapter : androidx.recyclerview.widget.R
             } else {
                 binding.buyButton.visibility = View.VISIBLE
                 binding.priceLabel.currency = "gems"
-                binding.priceLabel.value = if (equipment.gearSet == "animal") {
-                    2.0
-                } else {
-                    equipment.value
-                }
+                binding.priceLabel.value =
+                    if (equipment.gearSet == "animal") {
+                        2.0
+                    } else {
+                        equipment.value
+                    }
             }
 
             if (activeEquipment == equipment.key || (activeEquipment?.contains("base_0") == true && equipment.key?.isNotBlank() != true)) {
-                binding.wrapper.background = ContextCompat.getDrawable(itemView.context, R.drawable.layout_rounded_bg_window_tint_border)
+                binding.wrapper.background =
+                    ContextCompat.getDrawable(
+                        itemView.context,
+                        R.drawable.layout_rounded_bg_window_tint_border,
+                    )
             } else {
-                binding.wrapper.background = ContextCompat.getDrawable(itemView.context, R.drawable.layout_rounded_bg_window)
+                binding.wrapper.background =
+                    ContextCompat.getDrawable(itemView.context, R.drawable.layout_rounded_bg_window)
             }
         }
 
         override fun onClick(v: View) {
-            val itemValue = if (equipment?.gearSet == "animal") {
-                2.0
-            } else {
-                equipment?.value
-            }
+            val itemValue =
+                if (equipment?.gearSet == "animal") {
+                    2.0
+                } else {
+                    equipment?.value
+                }
             if (equipment?.owned != true && (itemValue ?: 0.0) > 0.0) {
                 val dialogContent = LinearLayout(itemView.context)
-                DialogPurchaseCustomizationBinding.inflate(LayoutInflater.from(itemView.context), dialogContent)
+                DialogPurchaseCustomizationBinding.inflate(
+                    LayoutInflater.from(itemView.context),
+                    dialogContent,
+                )
 
                 val imageView = dialogContent.findViewById<PixelArtView>(R.id.imageView)
                 imageView.loadImage("shop_" + this.equipment?.key)
@@ -125,7 +138,7 @@ class CustomizationEquipmentRecyclerViewAdapter : androidx.recyclerview.widget.R
                 priceLabel?.text = itemValue.toString()
 
                 (dialogContent.findViewById<View>(R.id.gem_icon) as? ImageView)?.setImageBitmap(
-                    HabiticaIconsHelper.imageOfGem()
+                    HabiticaIconsHelper.imageOfGem(),
                 )
 
                 val dialog = HabiticaAlertDialog(itemView.context)
@@ -134,7 +147,7 @@ class CustomizationEquipmentRecyclerViewAdapter : androidx.recyclerview.widget.R
                         if ((itemValue ?: 0.0) > it) {
                             MainNavigationController.navigate(
                                 R.id.gemPurchaseActivity,
-                                bundleOf(Pair("openSubscription", false))
+                                bundleOf(Pair("openSubscription", false)),
                             )
                             return@addButton
                         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.kt
index 0e356d5a7..ca13a1c33 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.kt
@@ -1,298 +1,338 @@
-package com.habitrpg.android.habitica.ui.adapter
-
-import android.content.Context
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.core.content.ContextCompat
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.databinding.CustomizationGridItemBinding
-import com.habitrpg.android.habitica.databinding.CustomizationSectionFooterBinding
-import com.habitrpg.android.habitica.databinding.CustomizationSectionHeaderBinding
-import com.habitrpg.android.habitica.models.inventory.Customization
-import com.habitrpg.android.habitica.models.inventory.CustomizationSet
-import com.habitrpg.android.habitica.models.shops.ShopItem
-import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import com.habitrpg.common.habitica.extensions.dpToPx
-import com.habitrpg.common.habitica.extensions.loadImage
-import com.habitrpg.common.habitica.helpers.MainNavigationController
-import com.habitrpg.common.habitica.views.AvatarView
-import com.habitrpg.shared.habitica.models.Avatar
-import java.util.Date
-import java.util.EnumMap
-import kotlin.math.min
-
-class CustomizationRecyclerViewAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>() {
-
-    var userSize: String? = null
-    var hairColor: String? = null
-    var avatar: Avatar? = null
-    var customizationType: String? = null
-    var gemBalance = 0
-    var columnCount = 1
-    var unsortedCustomizations: List<Customization> = ArrayList()
-    private var customizationList: MutableList<Any> = ArrayList()
-    var additionalSetItems: List<Customization> = ArrayList()
-    var activeCustomization: String? = null
-
-    var ownedCustomizations: List<String> = listOf()
-    private var pinnedItemKeys: List<String> = ArrayList()
-
-    var onCustomizationSelected: ((Customization) -> Unit)? = null
-    var onShowPurchaseDialog: ((ShopItem) -> Unit)? = null
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder {
-        return when (viewType) {
-            0 -> {
-                val view = LayoutInflater.from(parent.context)
-                    .inflate(R.layout.customization_section_header, parent, false)
-                SectionViewHolder(view)
-            }
-            1 -> {
-                val view = LayoutInflater.from(parent.context)
-                    .inflate(R.layout.customization_section_footer, parent, false)
-                SectionFooterViewHolder(view)
-            }
-            else -> {
-                val viewID: Int = if (customizationType == "background") {
-                    R.layout.customization_grid_background_item
-                } else {
-                    R.layout.customization_grid_item
-                }
-
-                val view = LayoutInflater.from(parent.context).inflate(viewID, parent, false)
-                CustomizationViewHolder(view)
-            }
-        }
-    }
-
-    override fun onBindViewHolder(
-        holder: androidx.recyclerview.widget.RecyclerView.ViewHolder,
-        position: Int
-    ) {
-        val obj = customizationList[position]
-        if (getItemViewType(position) == 0) {
-            (holder as SectionViewHolder).bind(obj as CustomizationSet)
-        } else if (getItemViewType(position) == 1) {
-            (holder as SectionFooterViewHolder).bind(obj as CustomizationSet)
-            val count = min(columnCount, obj.customizations.size)
-            holder.buttonWidth = (count * 76.dpToPx(holder.itemView.context)) + ((count - 1) * 12.dpToPx(holder.itemView.context))
-            holder.additionalSetItems = additionalSetItems.filter { it.purchasable && (it.price ?: 0) > 0 }
-        } else {
-            (holder as CustomizationViewHolder).bind(customizationList[position] as Customization)
-        }
-    }
-
-    override fun getItemCount(): Int {
-        return customizationList.size
-    }
-
-    override fun getItemViewType(position: Int): Int {
-        if (customizationList.size <= position) return 0
-        return if (this.customizationList[position] is CustomizationSet &&
-            (position == (customizationList.size - 1) || (position < customizationList.size && customizationList[position + 1] is CustomizationSet))
-        ) {
-            1
-        } else if (this.customizationList[position] is CustomizationSet) {
-            0
-        } else {
-            2
-        }
-    }
-
-    fun setCustomizations(newCustomizationList: List<Customization>) {
-        unsortedCustomizations = newCustomizationList
-        this.customizationList = ArrayList()
-        var lastSet = CustomizationSet()
-        val today = Date()
-        for (customization in newCustomizationList) {
-            val isOwned = ownedCustomizations.contains(customization.id)
-            val isUsable = customization.isUsable(isOwned)
-            if (customization.availableFrom != null || customization.availableUntil != null) {
-                if ((
-                    (
-                        customization.availableFrom?.compareTo(today)
-                            ?: 0
-                        ) > 0 || (
-                        customization.availableUntil?.compareTo(today)
-                            ?: 0
-                        ) < 0
-                    ) && !isUsable
-                ) {
-                    continue
-                }
-            }
-            if (customization.identifier?.contains("birthday_bash") == true && !isOwned) {
-                continue
-            }
-            if (customization.customizationSet != null && customization.customizationSet != lastSet.identifier) {
-                if (lastSet.hasPurchasable && lastSet.price > 0) {
-                    customizationList.add(lastSet)
-                }
-                val set = CustomizationSet()
-                set.identifier = customization.customizationSet
-                set.text = customization.customizationSetName
-                set.price = customization.setPrice ?: 0
-                set.hasPurchasable = true
-                lastSet = set
-                customizationList.add(set)
-            }
-            customizationList.add(customization)
-            lastSet.customizations.add(customization)
-            if (isUsable && lastSet.hasPurchasable) {
-                lastSet.ownedCustomizations.add(customization)
-                if (!lastSet.isSetDeal()) {
-                    lastSet.hasPurchasable = false
-                }
-            }
-        }
-        if (lastSet.hasPurchasable) {
-            customizationList.add(lastSet)
-        }
-        this.notifyDataSetChanged()
-    }
-
-    fun setPinnedItemKeys(pinnedItemKeys: List<String>) {
-        this.pinnedItemKeys = pinnedItemKeys
-        if (customizationList.size > 0) this.notifyDataSetChanged()
-    }
-
-    internal inner class CustomizationViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView), View.OnClickListener {
-
-        private val binding = CustomizationGridItemBinding.bind(itemView)
-        var customization: Customization? = null
-
-        init {
-            itemView.setOnClickListener(this)
-        }
-
-        fun bind(customization: Customization) {
-            this.customization = customization
-
-            val imageName = customization.getIconName(userSize, hairColor)
-            if (imageName != null) {
-                binding.imageView.loadImage(imageName)
-            } else {
-                binding.imageView.bitmap = null
-                binding.imageView.tag = null
-                binding.imageView.setImageResource(R.drawable.empty_slot)
-            }
-
-            if (customization.isUsable(ownedCustomizations.contains(customization.id))) {
-                binding.buyButton.visibility = View.GONE
-            } else {
-                binding.buyButton.visibility = View.VISIBLE
-                if (customization.customizationSet?.contains("timeTravel") == true) {
-                    binding.priceLabel.currency = "hourglasses"
-                } else {
-                    binding.priceLabel.currency = "gems"
-                }
-                binding.priceLabel.value = customization.price?.toDouble() ?: 0.0
-            }
-            val identifier = if (customization.type == "chair") "chair_${customization.identifier}" else customization.identifier
-            if (activeCustomization == identifier) {
-                binding.wrapper.background = ContextCompat.getDrawable(itemView.context, R.drawable.layout_rounded_bg_window_tint_border)
-            } else {
-                binding.wrapper.background = ContextCompat.getDrawable(itemView.context, R.drawable.layout_rounded_bg_window)
-            }
-        }
-
-        override fun onClick(v: View) {
-            if (customization?.isValid != true) {
-                return
-            }
-            if (customization?.isUsable(ownedCustomizations.contains(customization?.id)) == false) {
-                if (customization?.customizationSet?.contains("timeTravel") == true) {
-                    val dialog = HabiticaAlertDialog(itemView.context)
-                    dialog.setMessage(R.string.purchase_from_timetravel_shop)
-                    dialog.addButton(R.string.go_shopping, true) { _, _ ->
-                        MainNavigationController.navigate(R.id.timeTravelersShopFragment)
-                    }
-                    dialog.addButton(R.string.reward_dialog_dismiss, false)
-                    dialog.show()
-                } else {
-                    customization?.let {
-                        onShowPurchaseDialog?.invoke(ShopItem.fromCustomization(it, userSize, hairColor))
-                    }
-                }
-                return
-            }
-
-            if (customization?.type != "background" && customization?.identifier == activeCustomization) {
-                return
-            }
-
-            if (customization?.type == "background") {
-                val alert = HabiticaAlertDialog(context = itemView.context)
-                val purchasedCustomizationView: View = LayoutInflater.from(itemView.context).inflate(R.layout.purchased_equip_dialog, null)
-                val layerMap = EnumMap<AvatarView.LayerType, String>(AvatarView.LayerType::class.java)
-                avatar?.let { avatar ->
-                    layerMap[AvatarView.LayerType.BACKGROUND] = customization?.let { ShopItem.fromCustomization(it, userSize, hairColor).imageName }
-                    purchasedCustomizationView.findViewById<AvatarView>(R.id.avatar_view).setAvatar(avatar, layerMap)
-                }
-                alert.setAdditionalContentView(purchasedCustomizationView)
-                alert.setTitle(customization?.text)
-                alert.setMessage(customization?.notes)
-                alert.addButton(R.string.equip, true) { _, _ ->
-                    customization?.let {
-                        onCustomizationSelected?.invoke(it)
-                    }
-                }
-                alert.addButton(R.string.close, false) { _, _ ->
-                    alert.dismiss()
-                }
-                alert.show()
-            } else {
-                customization?.let {
-                    onCustomizationSelected?.invoke(it)
-                }
-            }
-        }
-    }
-
-    internal inner class SectionViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView) {
-
-        private val binding = CustomizationSectionHeaderBinding.bind(itemView)
-
-        fun bind(set: CustomizationSet) {
-            binding.label.text = set.text
-        }
-    }
-
-    internal inner class SectionFooterViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView), View.OnClickListener {
-
-        private val binding = CustomizationSectionFooterBinding.bind(itemView)
-        var context: Context = itemView.context
-        private var set: CustomizationSet? = null
-        var additionalSetItems: List<Customization>? = null
-
-        var buttonWidth: Int
-            get() = binding.purchaseSetButton.width
-            set(value) {
-                val params = binding.purchaseSetButton.layoutParams
-                params.width = value
-                binding.purchaseSetButton.layoutParams = params
-            }
-
-        init {
-            binding.purchaseSetButton.setOnClickListener(this)
-        }
-
-        fun bind(set: CustomizationSet) {
-            this.set = set
-            if (set.hasPurchasable && set.identifier?.contains("timeTravel") != true) {
-                binding.purchaseSetButton.visibility = View.VISIBLE
-                binding.setPriceLabel.value = set.price.toDouble()
-                binding.setPriceLabel.currency = "gems"
-            } else {
-                binding.purchaseSetButton.visibility = View.GONE
-            }
-        }
-
-        override fun onClick(v: View) {
-            set?.let {
-                onShowPurchaseDialog?.invoke(ShopItem.fromCustomizationSet(it, additionalSetItems, userSize, hairColor))
-            }
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.adapter
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.content.ContextCompat
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.CustomizationGridItemBinding
+import com.habitrpg.android.habitica.databinding.CustomizationSectionFooterBinding
+import com.habitrpg.android.habitica.databinding.CustomizationSectionHeaderBinding
+import com.habitrpg.android.habitica.models.inventory.Customization
+import com.habitrpg.android.habitica.models.inventory.CustomizationSet
+import com.habitrpg.android.habitica.models.shops.ShopItem
+import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
+import com.habitrpg.common.habitica.extensions.dpToPx
+import com.habitrpg.common.habitica.extensions.loadImage
+import com.habitrpg.common.habitica.helpers.MainNavigationController
+import com.habitrpg.common.habitica.views.AvatarView
+import com.habitrpg.shared.habitica.models.Avatar
+import java.util.Date
+import java.util.EnumMap
+import kotlin.math.min
+
+class CustomizationRecyclerViewAdapter :
+    androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>() {
+    var userSize: String? = null
+    var hairColor: String? = null
+    var avatar: Avatar? = null
+    var customizationType: String? = null
+    var gemBalance = 0
+    var columnCount = 1
+    var unsortedCustomizations: List<Customization> = ArrayList()
+    private var customizationList: MutableList<Any> = ArrayList()
+    var additionalSetItems: List<Customization> = ArrayList()
+    var activeCustomization: String? = null
+
+    var ownedCustomizations: List<String> = listOf()
+    private var pinnedItemKeys: List<String> = ArrayList()
+
+    var onCustomizationSelected: ((Customization) -> Unit)? = null
+    var onShowPurchaseDialog: ((ShopItem) -> Unit)? = null
+
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int,
+    ): androidx.recyclerview.widget.RecyclerView.ViewHolder {
+        return when (viewType) {
+            0 -> {
+                val view =
+                    LayoutInflater.from(parent.context)
+                        .inflate(R.layout.customization_section_header, parent, false)
+                SectionViewHolder(view)
+            }
+
+            1 -> {
+                val view =
+                    LayoutInflater.from(parent.context)
+                        .inflate(R.layout.customization_section_footer, parent, false)
+                SectionFooterViewHolder(view)
+            }
+
+            else -> {
+                val viewID: Int =
+                    if (customizationType == "background") {
+                        R.layout.customization_grid_background_item
+                    } else {
+                        R.layout.customization_grid_item
+                    }
+
+                val view = LayoutInflater.from(parent.context).inflate(viewID, parent, false)
+                CustomizationViewHolder(view)
+            }
+        }
+    }
+
+    override fun onBindViewHolder(
+        holder: androidx.recyclerview.widget.RecyclerView.ViewHolder,
+        position: Int,
+    ) {
+        val obj = customizationList[position]
+        if (getItemViewType(position) == 0) {
+            (holder as SectionViewHolder).bind(obj as CustomizationSet)
+        } else if (getItemViewType(position) == 1) {
+            (holder as SectionFooterViewHolder).bind(obj as CustomizationSet)
+            val count = min(columnCount, obj.customizations.size)
+            holder.buttonWidth =
+                (count * 76.dpToPx(holder.itemView.context)) + ((count - 1) * 12.dpToPx(holder.itemView.context))
+            holder.additionalSetItems =
+                additionalSetItems.filter { it.purchasable && (it.price ?: 0) > 0 }
+        } else {
+            (holder as CustomizationViewHolder).bind(customizationList[position] as Customization)
+        }
+    }
+
+    override fun getItemCount(): Int {
+        return customizationList.size
+    }
+
+    override fun getItemViewType(position: Int): Int {
+        if (customizationList.size <= position) return 0
+        return if (this.customizationList[position] is CustomizationSet &&
+            (position == (customizationList.size - 1) || (position < customizationList.size && customizationList[position + 1] is CustomizationSet))
+        ) {
+            1
+        } else if (this.customizationList[position] is CustomizationSet) {
+            0
+        } else {
+            2
+        }
+    }
+
+    fun setCustomizations(newCustomizationList: List<Customization>) {
+        unsortedCustomizations = newCustomizationList
+        this.customizationList = ArrayList()
+        var lastSet = CustomizationSet()
+        val today = Date()
+        for (customization in newCustomizationList) {
+            val isOwned = ownedCustomizations.contains(customization.id)
+            val isUsable = customization.isUsable(isOwned)
+            if (customization.availableFrom != null || customization.availableUntil != null) {
+                if ((
+                        (
+                            customization.availableFrom?.compareTo(today)
+                                ?: 0
+                        ) > 0 || (
+                            customization.availableUntil?.compareTo(today)
+                                ?: 0
+                        ) < 0
+                    ) && !isUsable
+                ) {
+                    continue
+                }
+            }
+            if (customization.identifier?.contains("birthday_bash") == true && !isOwned) {
+                continue
+            }
+            if (customization.customizationSet != null && customization.customizationSet != lastSet.identifier) {
+                if (lastSet.hasPurchasable && lastSet.price > 0) {
+                    customizationList.add(lastSet)
+                }
+                val set = CustomizationSet()
+                set.identifier = customization.customizationSet
+                set.text = customization.customizationSetName
+                set.price = customization.setPrice ?: 0
+                set.hasPurchasable = true
+                lastSet = set
+                customizationList.add(set)
+            }
+            customizationList.add(customization)
+            lastSet.customizations.add(customization)
+            if (isUsable && lastSet.hasPurchasable) {
+                lastSet.ownedCustomizations.add(customization)
+                if (!lastSet.isSetDeal()) {
+                    lastSet.hasPurchasable = false
+                }
+            }
+        }
+        if (lastSet.hasPurchasable) {
+            customizationList.add(lastSet)
+        }
+        this.notifyDataSetChanged()
+    }
+
+    fun setPinnedItemKeys(pinnedItemKeys: List<String>) {
+        this.pinnedItemKeys = pinnedItemKeys
+        if (customizationList.size > 0) this.notifyDataSetChanged()
+    }
+
+    internal inner class CustomizationViewHolder(itemView: View) :
+        androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView), View.OnClickListener {
+        private val binding = CustomizationGridItemBinding.bind(itemView)
+        var customization: Customization? = null
+
+        init {
+            itemView.setOnClickListener(this)
+        }
+
+        fun bind(customization: Customization) {
+            this.customization = customization
+
+            val imageName = customization.getIconName(userSize, hairColor)
+            if (imageName != null) {
+                binding.imageView.loadImage(imageName)
+            } else {
+                binding.imageView.bitmap = null
+                binding.imageView.tag = null
+                binding.imageView.setImageResource(R.drawable.empty_slot)
+            }
+
+            if (customization.isUsable(ownedCustomizations.contains(customization.id))) {
+                binding.buyButton.visibility = View.GONE
+            } else {
+                binding.buyButton.visibility = View.VISIBLE
+                if (customization.customizationSet?.contains("timeTravel") == true) {
+                    binding.priceLabel.currency = "hourglasses"
+                } else {
+                    binding.priceLabel.currency = "gems"
+                }
+                binding.priceLabel.value = customization.price?.toDouble() ?: 0.0
+            }
+            val identifier =
+                if (customization.type == "chair") "chair_${customization.identifier}" else customization.identifier
+            if (activeCustomization == identifier) {
+                binding.wrapper.background =
+                    ContextCompat.getDrawable(
+                        itemView.context,
+                        R.drawable.layout_rounded_bg_window_tint_border,
+                    )
+            } else {
+                binding.wrapper.background =
+                    ContextCompat.getDrawable(itemView.context, R.drawable.layout_rounded_bg_window)
+            }
+        }
+
+        override fun onClick(v: View) {
+            if (customization?.isValid != true) {
+                return
+            }
+            if (customization?.isUsable(ownedCustomizations.contains(customization?.id)) == false) {
+                if (customization?.customizationSet?.contains("timeTravel") == true) {
+                    val dialog = HabiticaAlertDialog(itemView.context)
+                    dialog.setMessage(R.string.purchase_from_timetravel_shop)
+                    dialog.addButton(R.string.go_shopping, true) { _, _ ->
+                        MainNavigationController.navigate(R.id.timeTravelersShopFragment)
+                    }
+                    dialog.addButton(R.string.reward_dialog_dismiss, false)
+                    dialog.show()
+                } else {
+                    customization?.let {
+                        onShowPurchaseDialog?.invoke(
+                            ShopItem.fromCustomization(
+                                it,
+                                userSize,
+                                hairColor,
+                            ),
+                        )
+                    }
+                }
+                return
+            }
+
+            if (customization?.type != "background" && customization?.identifier == activeCustomization) {
+                return
+            }
+
+            if (customization?.type == "background") {
+                val alert = HabiticaAlertDialog(context = itemView.context)
+                val purchasedCustomizationView: View =
+                    LayoutInflater.from(itemView.context)
+                        .inflate(R.layout.purchased_equip_dialog, null)
+                val layerMap =
+                    EnumMap<AvatarView.LayerType, String>(AvatarView.LayerType::class.java)
+                avatar?.let { avatar ->
+                    layerMap[AvatarView.LayerType.BACKGROUND] =
+                        customization?.let {
+                            ShopItem.fromCustomization(
+                                it,
+                                userSize,
+                                hairColor,
+                            ).imageName
+                        }
+                    purchasedCustomizationView.findViewById<AvatarView>(R.id.avatar_view)
+                        .setAvatar(avatar, layerMap)
+                }
+                alert.setAdditionalContentView(purchasedCustomizationView)
+                alert.setTitle(customization?.text)
+                alert.setMessage(customization?.notes)
+                alert.addButton(R.string.equip, true) { _, _ ->
+                    customization?.let {
+                        onCustomizationSelected?.invoke(it)
+                    }
+                }
+                alert.addButton(R.string.close, false) { _, _ ->
+                    alert.dismiss()
+                }
+                alert.show()
+            } else {
+                customization?.let {
+                    onCustomizationSelected?.invoke(it)
+                }
+            }
+        }
+    }
+
+    internal inner class SectionViewHolder(itemView: View) :
+        androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView) {
+        private val binding = CustomizationSectionHeaderBinding.bind(itemView)
+
+        fun bind(set: CustomizationSet) {
+            binding.label.text = set.text
+        }
+    }
+
+    internal inner class SectionFooterViewHolder(itemView: View) :
+        androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView), View.OnClickListener {
+        private val binding = CustomizationSectionFooterBinding.bind(itemView)
+        var context: Context = itemView.context
+        private var set: CustomizationSet? = null
+        var additionalSetItems: List<Customization>? = null
+
+        var buttonWidth: Int
+            get() = binding.purchaseSetButton.width
+            set(value) {
+                val params = binding.purchaseSetButton.layoutParams
+                params.width = value
+                binding.purchaseSetButton.layoutParams = params
+            }
+
+        init {
+            binding.purchaseSetButton.setOnClickListener(this)
+        }
+
+        fun bind(set: CustomizationSet) {
+            this.set = set
+            if (set.hasPurchasable && set.identifier?.contains("timeTravel") != true) {
+                binding.purchaseSetButton.visibility = View.VISIBLE
+                binding.setPriceLabel.value = set.price.toDouble()
+                binding.setPriceLabel.currency = "gems"
+            } else {
+                binding.purchaseSetButton.visibility = View.GONE
+            }
+        }
+
+        override fun onClick(v: View) {
+            set?.let {
+                onShowPurchaseDialog?.invoke(
+                    ShopItem.fromCustomizationSet(
+                        it,
+                        additionalSetItems,
+                        userSize,
+                        hairColor,
+                    ),
+                )
+            }
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/NavigationDrawerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/NavigationDrawerAdapter.kt
index e9303c6ed..9aa019c72 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/NavigationDrawerAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/NavigationDrawerAdapter.kt
@@ -20,8 +20,8 @@ import com.habitrpg.android.habitica.ui.views.promo.SubscriptionBuyGemsPromoView
 import com.habitrpg.common.habitica.extensions.dpToPx
 import java.util.Date
 
-class NavigationDrawerAdapter(tintColor: Int, backgroundTintColor: Int) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
-
+class NavigationDrawerAdapter(tintColor: Int, backgroundTintColor: Int) :
+    RecyclerView.Adapter<RecyclerView.ViewHolder>() {
     var tintColor: Int = tintColor
         set(value) {
             field = value
@@ -59,6 +59,7 @@ class NavigationDrawerAdapter(tintColor: Int, backgroundTintColor: Int) : Recycl
 
     private fun getItemPosition(identifier: String): Int =
         items.indexOfFirst { it.identifier == identifier }
+
     private fun getVisibleItemPosition(identifier: String): Int =
         items.filter { it.isVisible }.indexOfFirst { it.identifier == identifier }
 
@@ -74,7 +75,10 @@ class NavigationDrawerAdapter(tintColor: Int, backgroundTintColor: Int) : Recycl
         notifyDataSetChanged()
     }
 
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+    override fun onBindViewHolder(
+        holder: RecyclerView.ViewHolder,
+        position: Int,
+    ) {
         val drawerItem = getItem(position)
         when {
             getItemViewType(position) == 0 -> {
@@ -83,10 +87,12 @@ class NavigationDrawerAdapter(tintColor: Int, backgroundTintColor: Int) : Recycl
                 itemHolder?.bind(drawerItem, drawerItem.transitionId == selectedItem)
                 itemHolder?.itemView?.setOnClickListener { itemSelectedEvents?.invoke(drawerItem) }
             }
+
             getItemViewType(position) == 1 -> {
                 (holder as? SectionHeaderViewHolder)?.backgroundTintColor = backgroundTintColor
                 (holder as? SectionHeaderViewHolder)?.bind(drawerItem)
             }
+
             getItemViewType(position) == 5 -> {
                 activePromo?.let { promo ->
                     (holder as? PromoMenuViewHolder)?.bind(promo)
@@ -95,6 +101,7 @@ class NavigationDrawerAdapter(tintColor: Int, backgroundTintColor: Int) : Recycl
                     }
                 }
             }
+
             getItemViewType(position) == 6 -> {
                 currentEvent?.end?.let {
                     (holder.itemView as? ComposeView)?.setContent {
@@ -120,24 +127,31 @@ class NavigationDrawerAdapter(tintColor: Int, backgroundTintColor: Int) : Recycl
         }
     }
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int,
+    ): RecyclerView.ViewHolder {
         return when (viewType) {
             2 -> {
                 val itemView = SubscriptionBuyGemsPromoView(parent.context)
-                itemView.layoutParams = ViewGroup.LayoutParams(
-                    ViewGroup.LayoutParams.MATCH_PARENT,
-                    148.dpToPx(parent.context)
-                )
+                itemView.layoutParams =
+                    ViewGroup.LayoutParams(
+                        ViewGroup.LayoutParams.MATCH_PARENT,
+                        148.dpToPx(parent.context),
+                    )
                 SubscriptionBuyGemsPromoViewHolder(itemView)
             }
+
             5 -> {
                 val promoView = PromoMenuView(parent.context)
-                promoView.layoutParams = ViewGroup.LayoutParams(
-                    ViewGroup.LayoutParams.MATCH_PARENT,
-                    118.dpToPx(parent.context)
-                )
+                promoView.layoutParams =
+                    ViewGroup.LayoutParams(
+                        ViewGroup.LayoutParams.MATCH_PARENT,
+                        118.dpToPx(parent.context),
+                    )
                 PromoMenuViewHolder(promoView)
             }
+
             6 -> ComposableViewHolder(ComposeView(parent.context))
             1 -> SectionHeaderViewHolder(parent.inflate(R.layout.drawer_main_section_header))
             else -> DrawerItemViewHolder(parent.inflate(R.layout.drawer_main_item))
@@ -145,7 +159,6 @@ class NavigationDrawerAdapter(tintColor: Int, backgroundTintColor: Int) : Recycl
     }
 
     class DrawerItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-
         var tintColor: Int = 0
 
         private val titleTextView: TextView? = itemView.findViewById(R.id.titleTextView)
@@ -153,16 +166,34 @@ class NavigationDrawerAdapter(tintColor: Int, backgroundTintColor: Int) : Recycl
         private val bubbleView: View? = itemView.findViewById(R.id.bubble_view)
         private val additionalInfoView: TextView? = itemView.findViewById(R.id.additionalInfoView)
 
-        fun bind(drawerItem: HabiticaDrawerItem, isSelected: Boolean) {
+        fun bind(
+            drawerItem: HabiticaDrawerItem,
+            isSelected: Boolean,
+        ) {
             titleTextView?.text = drawerItem.text
 
             if (isSelected) {
-                itemView.setBackgroundColor(ContextCompat.getColor(itemView.context, R.color.content_background_offset))
+                itemView.setBackgroundColor(
+                    ContextCompat.getColor(
+                        itemView.context,
+                        R.color.content_background_offset,
+                    ),
+                )
                 itemView.background.alpha = 69
                 titleTextView?.setTextColor(tintColor)
             } else {
-                itemView.setBackgroundColor(ContextCompat.getColor(itemView.context, R.color.content_background))
-                titleTextView?.setTextColor(ContextCompat.getColor(itemView.context, R.color.text_primary))
+                itemView.setBackgroundColor(
+                    ContextCompat.getColor(
+                        itemView.context,
+                        R.color.content_background,
+                    ),
+                )
+                titleTextView?.setTextColor(
+                    ContextCompat.getColor(
+                        itemView.context,
+                        R.color.text_primary,
+                    ),
+                )
             }
 
             if (drawerItem.pillText != null) {
@@ -175,7 +206,10 @@ class NavigationDrawerAdapter(tintColor: Int, backgroundTintColor: Int) : Recycl
                     val pR = pillView.paddingRight
                     val pB = pillView.paddingBottom
 
-                    pillView.background = drawerItem.pillBackground ?: ContextCompat.getDrawable(itemView.context, R.drawable.pill_bg_purple_200)
+                    pillView.background = drawerItem.pillBackground ?: ContextCompat.getDrawable(
+                        itemView.context,
+                        R.drawable.pill_bg_purple_200,
+                    )
                     pillView.setTextColor(ContextCompat.getColor(itemView.context, R.color.white))
                     pillView.setPadding(pL, pT, pR, pB)
                 }
@@ -196,7 +230,6 @@ class NavigationDrawerAdapter(tintColor: Int, backgroundTintColor: Int) : Recycl
     }
 
     class SectionHeaderViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-
         var backgroundTintColor: Int = 0
 
         fun bind(drawerItem: HabiticaDrawerItem) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SimpleSpinnerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SimpleSpinnerAdapter.kt
index 0576dfd1e..4c00d11f6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SimpleSpinnerAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SimpleSpinnerAdapter.kt
@@ -8,15 +8,27 @@ import android.widget.TextView
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.extensions.inflate
 
-class SimpleSpinnerAdapter(context: Context, resource: Int) : ArrayAdapter<CharSequence>(context, resource, R.id.textView, context.resources.getTextArray(resource)) {
-
-    override fun getDropDownView(position: Int, convertView: View?, parent: ViewGroup): View {
-        val view = parent.inflate(R.layout.spinner_item, false) ?: View(context)
+class SimpleSpinnerAdapter(context: Context, resource: Int) : ArrayAdapter<CharSequence>(
+    context,
+    resource,
+    R.id.textView,
+    context.resources.getTextArray(resource),
+) {
+    override fun getDropDownView(
+        position: Int,
+        convertView: View?,
+        parent: ViewGroup,
+    ): View {
+        val view = parent.inflate(R.layout.spinner_item, false)
         (view as? TextView)?.text = getItem(position)
         return view
     }
 
-    override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
+    override fun getView(
+        position: Int,
+        convertView: View?,
+        parent: ViewGroup,
+    ): View {
         val view = convertView ?: parent.inflate(android.R.layout.simple_spinner_item, false)
         (view as? TextView)?.text = getItem(position)
         return view
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.kt
index 2496b7fdf..90ccbdda9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.kt
@@ -1,64 +1,78 @@
-package com.habitrpg.android.habitica.ui.adapter
-
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.core.content.ContextCompat
-import androidx.recyclerview.widget.RecyclerView
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.databinding.SkillTaskItemCardBinding
-import com.habitrpg.android.habitica.models.tasks.Task
-import java.util.UUID
-
-class SkillTasksRecyclerViewAdapter : BaseRecyclerViewAdapter<Task, SkillTasksRecyclerViewAdapter.TaskViewHolder>() {
-
-    var onTaskSelection: ((Task) -> Unit)? = null
-
-    override fun getItemId(position: Int): Long {
-        val task = getItem(position)
-        if (task?.id?.length == 36) {
-            return UUID.fromString(task.id).mostSignificantBits
-        }
-        return UUID.randomUUID().mostSignificantBits
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): TaskViewHolder {
-        val view = LayoutInflater.from(parent.context)
-            .inflate(R.layout.skill_task_item_card, parent, false)
-        return TaskViewHolder(view)
-    }
-
-    override fun onBindViewHolder(holder: TaskViewHolder, position: Int) {
-        holder.bindHolder(data[position])
-    }
-
-    inner class TaskViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), View.OnClickListener {
-        private val binding = SkillTaskItemCardBinding.bind(itemView)
-        var task: Task? = null
-
-        init {
-            itemView.setOnClickListener(this)
-            itemView.isClickable = true
-        }
-
-        internal fun bindHolder(task: Task) {
-            this.task = task
-            binding.titleTextView.text = task.markdownText { binding.titleTextView.text = it }
-            if (task.notes?.isEmpty() == true) {
-                binding.notesTextView.visibility = View.GONE
-            } else {
-                binding.notesTextView.visibility = View.VISIBLE
-                binding.notesTextView.text = task.markdownNotes { binding.notesTextView.text = it }
-            }
-            binding.rightBorderView.setBackgroundColor(ContextCompat.getColor(itemView.context, task.lightTaskColor))
-        }
-
-        override fun onClick(v: View) {
-            if (v == itemView) {
-                task?.let {
-                    onTaskSelection?.invoke(it)
-                }
-            }
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.adapter
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.RecyclerView
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.SkillTaskItemCardBinding
+import com.habitrpg.android.habitica.models.tasks.Task
+import java.util.UUID
+
+class SkillTasksRecyclerViewAdapter :
+    BaseRecyclerViewAdapter<Task, SkillTasksRecyclerViewAdapter.TaskViewHolder>() {
+    var onTaskSelection: ((Task) -> Unit)? = null
+
+    override fun getItemId(position: Int): Long {
+        val task = getItem(position)
+        if (task?.id?.length == 36) {
+            return UUID.fromString(task.id).mostSignificantBits
+        }
+        return UUID.randomUUID().mostSignificantBits
+    }
+
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int,
+    ): TaskViewHolder {
+        val view =
+            LayoutInflater.from(parent.context)
+                .inflate(R.layout.skill_task_item_card, parent, false)
+        return TaskViewHolder(view)
+    }
+
+    override fun onBindViewHolder(
+        holder: TaskViewHolder,
+        position: Int,
+    ) {
+        holder.bindHolder(data[position])
+    }
+
+    inner class TaskViewHolder(itemView: View) :
+        RecyclerView.ViewHolder(itemView),
+        View.OnClickListener {
+        private val binding = SkillTaskItemCardBinding.bind(itemView)
+        var task: Task? = null
+
+        init {
+            itemView.setOnClickListener(this)
+            itemView.isClickable = true
+        }
+
+        internal fun bindHolder(task: Task) {
+            this.task = task
+            binding.titleTextView.text = task.markdownText { binding.titleTextView.text = it }
+            if (task.notes?.isEmpty() == true) {
+                binding.notesTextView.visibility = View.GONE
+            } else {
+                binding.notesTextView.visibility = View.VISIBLE
+                binding.notesTextView.text = task.markdownNotes { binding.notesTextView.text = it }
+            }
+            binding.rightBorderView.setBackgroundColor(
+                ContextCompat.getColor(
+                    itemView.context,
+                    task.lightTaskColor,
+                ),
+            )
+        }
+
+        override fun onClick(v: View) {
+            if (v == itemView) {
+                task?.let {
+                    onTaskSelection?.invoke(it)
+                }
+            }
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillsRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillsRecyclerViewAdapter.kt
index f11bf9992..e6c2d92ea 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillsRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillsRecyclerViewAdapter.kt
@@ -1,137 +1,199 @@
-package com.habitrpg.android.habitica.ui.adapter
-
-import android.content.Context
-import android.graphics.drawable.BitmapDrawable
-import android.graphics.drawable.Drawable
-import android.view.View
-import android.view.ViewGroup
-import androidx.core.content.ContextCompat
-import androidx.recyclerview.widget.RecyclerView
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.databinding.SkillListItemBinding
-import com.habitrpg.android.habitica.extensions.inflate
-import com.habitrpg.android.habitica.models.Skill
-import com.habitrpg.android.habitica.models.user.OwnedItem
-import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import com.habitrpg.common.habitica.extensions.isUsingNightModeResources
-import com.habitrpg.common.habitica.extensions.loadImage
-import io.realm.RealmList
-
-class SkillsRecyclerViewAdapter : RecyclerView.Adapter<SkillsRecyclerViewAdapter.SkillViewHolder>() {
-
-    var onUseSkill: ((Skill) -> Unit)? = null
-
-    var mana: Double = 0.0
-        set(value) {
-            field = value
-            notifyDataSetChanged()
-        }
-    var level: Int = 0
-        set(value) {
-            field = value
-            notifyDataSetChanged()
-        }
-    var specialItems: RealmList<OwnedItem>? = null
-        set(value) {
-            field = value
-            notifyDataSetChanged()
-        }
-    private var skillList: List<Skill> = emptyList()
-
-    fun setSkillList(skillList: List<Skill>) {
-        this.skillList = skillList
-        this.notifyDataSetChanged()
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SkillViewHolder {
-        return SkillViewHolder(parent.inflate(R.layout.skill_list_item))
-    }
-
-    override fun onBindViewHolder(holder: SkillViewHolder, position: Int) {
-        holder.bind(skillList[position])
-    }
-
-    override fun getItemCount(): Int {
-        return skillList.size
-    }
-
-    inner class SkillViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), View.OnClickListener {
-        private val binding = SkillListItemBinding.bind(itemView)
-        private val magicDrawable: Drawable
-        private val lockDrawable: Drawable
-
-        var skill: Skill? = null
-
-        var context: Context = itemView.context
-
-        init {
-            binding.buttonWrapper.setOnClickListener(this)
-            magicDrawable = BitmapDrawable(context.resources, HabiticaIconsHelper.imageOfMagic())
-            lockDrawable = BitmapDrawable(context.resources, HabiticaIconsHelper.imageOfLocked(ContextCompat.getColor(context, R.color.text_dimmed)))
-        }
-
-        fun bind(skill: Skill) {
-            this.skill = skill
-            binding.skillText.text = skill.text
-            binding.skillNotes.text = skill.notes
-
-            binding.skillText.setTextColor(ContextCompat.getColor(context, R.color.text_primary))
-            binding.skillNotes.setTextColor(ContextCompat.getColor(context, R.color.text_ternary))
-            binding.skillNotes.visibility = View.VISIBLE
-            binding.priceLabel.visibility = View.VISIBLE
-
-            if ("special" == skill.habitClass) {
-                binding.countLabel.visibility = View.VISIBLE
-                binding.countLabel.text = getOwnedCount(skill.key).toString()
-                binding.priceLabel.setText(R.string.skill_transformation_use)
-                if (context.isUsingNightModeResources()) {
-                    binding.priceLabel.setTextColor(ContextCompat.getColor(context, R.color.brand_500))
-                } else {
-                    binding.priceLabel.setTextColor(ContextCompat.getColor(context, R.color.color_accent))
-                }
-                binding.buttonIconView.setImageDrawable(null)
-                binding.buttonWrapper.setBackgroundColor(ContextCompat.getColor(context, R.color.offset_background))
-                binding.buttonIconView.alpha = 1.0f
-                binding.priceLabel.alpha = 1.0f
-            } else {
-                binding.countLabel.visibility = View.GONE
-                binding.priceLabel.text = skill.mana?.toString()
-                if (context.isUsingNightModeResources()) {
-                    binding.priceLabel.setTextColor(ContextCompat.getColor(context, R.color.blue_500))
-                } else {
-                    binding.priceLabel.setTextColor(ContextCompat.getColor(context, R.color.blue_10))
-                }
-                binding.buttonIconView.setImageDrawable(magicDrawable)
-
-                if ((skill.mana ?: 0) > mana) {
-                    binding.buttonWrapper.setBackgroundColor(ContextCompat.getColor(context, R.color.offset_background))
-                    binding.buttonIconView.alpha = 0.3f
-                    binding.priceLabel.alpha = 0.3f
-                } else {
-                    binding.buttonWrapper.setBackgroundColor(ContextCompat.getColor(context, R.color.blue_500_24))
-                    binding.buttonIconView.alpha = 1.0f
-                    binding.priceLabel.alpha = 1.0f
-                }
-                if ((skill.lvl ?: 0) > level) {
-                    binding.buttonWrapper.setBackgroundColor(ContextCompat.getColor(context, R.color.offset_background))
-                    binding.skillText.setTextColor(ContextCompat.getColor(context, R.color.text_dimmed))
-                    binding.skillText.text = context.getString(R.string.skill_unlocks_at, skill.lvl)
-                    binding.skillNotes.visibility = View.GONE
-                    binding.buttonIconView.setImageDrawable(lockDrawable)
-                    binding.priceLabel.visibility = View.GONE
-                }
-            }
-            binding.skillImage.loadImage("shop_" + skill.key)
-        }
-
-        override fun onClick(v: View) {
-            if ((skill?.lvl ?: 0) <= level) {
-                skill?.let { onUseSkill?.invoke(it) }
-            }
-        }
-
-        private fun getOwnedCount(key: String): Int {
-            return specialItems?.firstOrNull { it.key == key }?.numberOwned ?: 0
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.adapter
+
+import android.content.Context
+import android.graphics.drawable.BitmapDrawable
+import android.graphics.drawable.Drawable
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.RecyclerView
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.SkillListItemBinding
+import com.habitrpg.android.habitica.extensions.inflate
+import com.habitrpg.android.habitica.models.Skill
+import com.habitrpg.android.habitica.models.user.OwnedItem
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
+import com.habitrpg.common.habitica.extensions.isUsingNightModeResources
+import com.habitrpg.common.habitica.extensions.loadImage
+import io.realm.RealmList
+
+class SkillsRecyclerViewAdapter :
+    RecyclerView.Adapter<SkillsRecyclerViewAdapter.SkillViewHolder>() {
+    var onUseSkill: ((Skill) -> Unit)? = null
+
+    var mana: Double = 0.0
+        set(value) {
+            field = value
+            notifyDataSetChanged()
+        }
+    var level: Int = 0
+        set(value) {
+            field = value
+            notifyDataSetChanged()
+        }
+    var specialItems: RealmList<OwnedItem>? = null
+        set(value) {
+            field = value
+            notifyDataSetChanged()
+        }
+    private var skillList: List<Skill> = emptyList()
+
+    fun setSkillList(skillList: List<Skill>) {
+        this.skillList = skillList
+        this.notifyDataSetChanged()
+    }
+
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int,
+    ): SkillViewHolder {
+        return SkillViewHolder(parent.inflate(R.layout.skill_list_item))
+    }
+
+    override fun onBindViewHolder(
+        holder: SkillViewHolder,
+        position: Int,
+    ) {
+        holder.bind(skillList[position])
+    }
+
+    override fun getItemCount(): Int {
+        return skillList.size
+    }
+
+    inner class SkillViewHolder(itemView: View) :
+        RecyclerView.ViewHolder(itemView),
+        View.OnClickListener {
+        private val binding = SkillListItemBinding.bind(itemView)
+        private val magicDrawable: Drawable
+        private val lockDrawable: Drawable
+
+        var skill: Skill? = null
+
+        var context: Context = itemView.context
+
+        init {
+            binding.buttonWrapper.setOnClickListener(this)
+            magicDrawable = BitmapDrawable(context.resources, HabiticaIconsHelper.imageOfMagic())
+            lockDrawable =
+                BitmapDrawable(
+                    context.resources,
+                    HabiticaIconsHelper.imageOfLocked(
+                        ContextCompat.getColor(
+                            context,
+                            R.color.text_dimmed,
+                        ),
+                    ),
+                )
+        }
+
+        fun bind(skill: Skill) {
+            this.skill = skill
+            binding.skillText.text = skill.text
+            binding.skillNotes.text = skill.notes
+
+            binding.skillText.setTextColor(ContextCompat.getColor(context, R.color.text_primary))
+            binding.skillNotes.setTextColor(ContextCompat.getColor(context, R.color.text_ternary))
+            binding.skillNotes.visibility = View.VISIBLE
+            binding.priceLabel.visibility = View.VISIBLE
+
+            if ("special" == skill.habitClass) {
+                binding.countLabel.visibility = View.VISIBLE
+                binding.countLabel.text = getOwnedCount(skill.key).toString()
+                binding.priceLabel.setText(R.string.skill_transformation_use)
+                if (context.isUsingNightModeResources()) {
+                    binding.priceLabel.setTextColor(
+                        ContextCompat.getColor(
+                            context,
+                            R.color.brand_500,
+                        ),
+                    )
+                } else {
+                    binding.priceLabel.setTextColor(
+                        ContextCompat.getColor(
+                            context,
+                            R.color.color_accent,
+                        ),
+                    )
+                }
+                binding.buttonIconView.setImageDrawable(null)
+                binding.buttonWrapper.setBackgroundColor(
+                    ContextCompat.getColor(
+                        context,
+                        R.color.offset_background,
+                    ),
+                )
+                binding.buttonIconView.alpha = 1.0f
+                binding.priceLabel.alpha = 1.0f
+            } else {
+                binding.countLabel.visibility = View.GONE
+                binding.priceLabel.text = skill.mana?.toString()
+                if (context.isUsingNightModeResources()) {
+                    binding.priceLabel.setTextColor(
+                        ContextCompat.getColor(
+                            context,
+                            R.color.blue_500,
+                        ),
+                    )
+                } else {
+                    binding.priceLabel.setTextColor(
+                        ContextCompat.getColor(
+                            context,
+                            R.color.blue_10,
+                        ),
+                    )
+                }
+                binding.buttonIconView.setImageDrawable(magicDrawable)
+
+                if ((skill.mana ?: 0) > mana) {
+                    binding.buttonWrapper.setBackgroundColor(
+                        ContextCompat.getColor(
+                            context,
+                            R.color.offset_background,
+                        ),
+                    )
+                    binding.buttonIconView.alpha = 0.3f
+                    binding.priceLabel.alpha = 0.3f
+                } else {
+                    binding.buttonWrapper.setBackgroundColor(
+                        ContextCompat.getColor(
+                            context,
+                            R.color.blue_500_24,
+                        ),
+                    )
+                    binding.buttonIconView.alpha = 1.0f
+                    binding.priceLabel.alpha = 1.0f
+                }
+                if ((skill.lvl ?: 0) > level) {
+                    binding.buttonWrapper.setBackgroundColor(
+                        ContextCompat.getColor(
+                            context,
+                            R.color.offset_background,
+                        ),
+                    )
+                    binding.skillText.setTextColor(
+                        ContextCompat.getColor(
+                            context,
+                            R.color.text_dimmed,
+                        ),
+                    )
+                    binding.skillText.text = context.getString(R.string.skill_unlocks_at, skill.lvl)
+                    binding.skillNotes.visibility = View.GONE
+                    binding.buttonIconView.setImageDrawable(lockDrawable)
+                    binding.priceLabel.visibility = View.GONE
+                }
+            }
+            binding.skillImage.loadImage("shop_" + skill.key)
+        }
+
+        override fun onClick(v: View) {
+            if ((skill?.lvl ?: 0) <= level) {
+                skill?.let { onUseSkill?.invoke(it) }
+            }
+        }
+
+        private fun getOwnedCount(key: String): Int {
+            return specialItems?.firstOrNull { it.key == key }?.numberOwned ?: 0
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/EquipmentRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/EquipmentRecyclerViewAdapter.kt
index 953b1afba..43667eb96 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/EquipmentRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/EquipmentRecyclerViewAdapter.kt
@@ -1,93 +1,121 @@
-package com.habitrpg.android.habitica.ui.adapter.inventory
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.graphics.drawable.BitmapDrawable
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.TextView
-import androidx.core.content.ContextCompat
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.databinding.GearListItemBinding
-import com.habitrpg.android.habitica.models.inventory.Equipment
-import com.habitrpg.android.habitica.ui.adapter.BaseRecyclerViewAdapter
-import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import com.habitrpg.common.habitica.extensions.loadImage
-
-class EquipmentRecyclerViewAdapter : BaseRecyclerViewAdapter<Equipment, EquipmentRecyclerViewAdapter.GearViewHolder>() {
-
-    var equippedGear: String? = null
-    var isCostume: Boolean? = null
-    var type: String? = null
-
-    var onEquip: ((String) -> Unit)? = null
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): GearViewHolder {
-        val view = LayoutInflater.from(parent.context).inflate(R.layout.gear_list_item, parent, false)
-        return GearViewHolder(view)
-    }
-
-    override fun onBindViewHolder(holder: GearViewHolder, position: Int) {
-        holder.bind(data[position])
-    }
-
-    inner class GearViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView) {
-        private val binding = GearListItemBinding.bind(itemView)
-
-        var gear: Equipment? = null
-        var context: Context = itemView.context
-
-        init {
-            context = itemView.context
-            binding.twoHandedView.setCompoundDrawablesWithIntrinsicBounds(BitmapDrawable(context.resources, HabiticaIconsHelper.imageOfTwoHandedIcon()), null, null, null)
-            itemView.setOnClickListener {
-                val key = gear?.key
-                if (key != null) {
-                    onEquip?.invoke(key)
-                    equippedGear = if (key == equippedGear) {
-                        type + "_base_0"
-                    } else {
-                        key
-                    }
-                    notifyDataSetChanged()
-                }
-            }
-        }
-
-        fun bind(gear: Equipment) {
-            this.gear = gear
-            binding.gearText.text = this.gear?.text
-            binding.gearNotes.text = this.gear?.notes
-
-            if (gear.key == equippedGear) {
-                binding.equippedIndicator.visibility = View.VISIBLE
-                binding.gearContainer.setBackgroundColor(ContextCompat.getColor(context, R.color.lightly_tinted_background))
-                binding.gearIconBackgroundView.background = ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_content)
-            } else {
-                binding.equippedIndicator.visibility = View.GONE
-                binding.gearContainer.setBackgroundResource(R.drawable.selection_highlight)
-                binding.gearIconBackgroundView.background = ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_window)
-            }
-            binding.twoHandedView.visibility = if (gear.twoHanded) View.VISIBLE else View.GONE
-            binding.gearImage.loadImage("shop_" + gear.key)
-
-            set(binding.strLabel, binding.strValue, gear.str)
-            set(binding.conLabel, binding.conValue, gear.con)
-            set(binding.intLabel, binding.intValue, gear._int)
-            set(binding.perLabel, binding.perValue, gear.per)
-        }
-
-        private fun set(label: TextView, valueTextView: TextView, value: Int) {
-            if (value > 0) {
-                label.visibility = View.VISIBLE
-                valueTextView.visibility = View.VISIBLE
-                @SuppressLint("SetTextI18n")
-                valueTextView.text = "+$value"
-            } else {
-                label.visibility = View.GONE
-                valueTextView.visibility = View.GONE
-            }
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.adapter.inventory
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.graphics.drawable.BitmapDrawable
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.core.content.ContextCompat
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.GearListItemBinding
+import com.habitrpg.android.habitica.models.inventory.Equipment
+import com.habitrpg.android.habitica.ui.adapter.BaseRecyclerViewAdapter
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
+import com.habitrpg.common.habitica.extensions.loadImage
+
+class EquipmentRecyclerViewAdapter :
+    BaseRecyclerViewAdapter<Equipment, EquipmentRecyclerViewAdapter.GearViewHolder>() {
+    var equippedGear: String? = null
+    var isCostume: Boolean? = null
+    var type: String? = null
+
+    var onEquip: ((String) -> Unit)? = null
+
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int,
+    ): GearViewHolder {
+        val view =
+            LayoutInflater.from(parent.context).inflate(R.layout.gear_list_item, parent, false)
+        return GearViewHolder(view)
+    }
+
+    override fun onBindViewHolder(
+        holder: GearViewHolder,
+        position: Int,
+    ) {
+        holder.bind(data[position])
+    }
+
+    inner class GearViewHolder(itemView: View) :
+        androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView) {
+        private val binding = GearListItemBinding.bind(itemView)
+
+        var gear: Equipment? = null
+        var context: Context = itemView.context
+
+        init {
+            context = itemView.context
+            binding.twoHandedView.setCompoundDrawablesWithIntrinsicBounds(
+                BitmapDrawable(
+                    context.resources,
+                    HabiticaIconsHelper.imageOfTwoHandedIcon(),
+                ),
+                null,
+                null,
+                null,
+            )
+            itemView.setOnClickListener {
+                val key = gear?.key
+                if (key != null) {
+                    onEquip?.invoke(key)
+                    equippedGear =
+                        if (key == equippedGear) {
+                            type + "_base_0"
+                        } else {
+                            key
+                        }
+                    notifyDataSetChanged()
+                }
+            }
+        }
+
+        fun bind(gear: Equipment) {
+            this.gear = gear
+            binding.gearText.text = this.gear?.text
+            binding.gearNotes.text = this.gear?.notes
+
+            if (gear.key == equippedGear) {
+                binding.equippedIndicator.visibility = View.VISIBLE
+                binding.gearContainer.setBackgroundColor(
+                    ContextCompat.getColor(
+                        context,
+                        R.color.lightly_tinted_background,
+                    ),
+                )
+                binding.gearIconBackgroundView.background =
+                    ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_content)
+            } else {
+                binding.equippedIndicator.visibility = View.GONE
+                binding.gearContainer.setBackgroundResource(R.drawable.selection_highlight)
+                binding.gearIconBackgroundView.background =
+                    ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_window)
+            }
+            binding.twoHandedView.visibility = if (gear.twoHanded) View.VISIBLE else View.GONE
+            binding.gearImage.loadImage("shop_" + gear.key)
+
+            set(binding.strLabel, binding.strValue, gear.str)
+            set(binding.conLabel, binding.conValue, gear.con)
+            set(binding.intLabel, binding.intValue, gear.intelligence)
+            set(binding.perLabel, binding.perValue, gear.per)
+        }
+
+        private fun set(
+            label: TextView,
+            valueTextView: TextView,
+            value: Int,
+        ) {
+            if (value > 0) {
+                label.visibility = View.VISIBLE
+                valueTextView.visibility = View.VISIBLE
+                @SuppressLint("SetTextI18n")
+                valueTextView.text = "+$value"
+            } else {
+                label.visibility = View.GONE
+                valueTextView.visibility = View.GONE
+            }
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/HabiticaClassArrayAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/HabiticaClassArrayAdapter.kt
index 983c8e243..fb86b4448 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/HabiticaClassArrayAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/HabiticaClassArrayAdapter.kt
@@ -12,15 +12,32 @@ import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.android.habitica.models.user.Stats
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 
-class HabiticaClassArrayAdapter(context: Context, resource: Int, objects: List<CharSequence>) : ArrayAdapter<CharSequence>(context, resource, R.id.textView, objects) {
+class HabiticaClassArrayAdapter(context: Context, resource: Int, objects: List<CharSequence>) :
+    ArrayAdapter<CharSequence>(context, resource, R.id.textView, objects) {
+    override fun getDropDownView(
+        position: Int,
+        convertView: View?,
+        parent: ViewGroup?,
+    ): View =
+        createView(
+            position,
+            convertView ?: parent?.inflate(R.layout.class_spinner_dropdown_item, false),
+        )
 
-    override fun getDropDownView(position: Int, convertView: View?, parent: ViewGroup?): View =
-        createView(position, convertView ?: parent?.inflate(R.layout.class_spinner_dropdown_item, false))
+    override fun getView(
+        position: Int,
+        convertView: View?,
+        parent: ViewGroup,
+    ): View =
+        createView(
+            position,
+            convertView ?: parent.inflate(R.layout.class_spinner_dropdown_item_selected, false),
+        )
 
-    override fun getView(position: Int, convertView: View?, parent: ViewGroup): View =
-        createView(position, convertView ?: parent.inflate(R.layout.class_spinner_dropdown_item_selected, false))
-
-    private fun createView(position: Int, row: View?): View {
+    private fun createView(
+        position: Int,
+        row: View?,
+    ): View {
         val textView: TextView? = row?.findViewById(R.id.textView)
         val imageView: ImageView? = row?.findViewById(R.id.classIconView)
 
@@ -30,21 +47,25 @@ class HabiticaClassArrayAdapter(context: Context, resource: Int, objects: List<C
                 textView?.setTextColor(ContextCompat.getColor(context, R.color.text_red))
                 imageView?.setImageBitmap(HabiticaIconsHelper.imageOfWarriorLightBg())
             }
+
             Stats.MAGE -> {
                 textView?.text = context.getString(R.string.mage)
                 textView?.setTextColor(ContextCompat.getColor(context, R.color.text_blue))
                 imageView?.setImageBitmap(HabiticaIconsHelper.imageOfMageLightBg())
             }
+
             Stats.HEALER -> {
                 textView?.text = context.getString(R.string.healer)
                 textView?.setTextColor(ContextCompat.getColor(context, R.color.text_yellow))
                 imageView?.setImageBitmap(HabiticaIconsHelper.imageOfHealerLightBg())
             }
+
             Stats.ROGUE -> {
                 textView?.text = context.getString(R.string.rogue)
                 textView?.setTextColor(ContextCompat.getColor(context, R.color.text_brand))
                 imageView?.setImageBitmap(HabiticaIconsHelper.imageOfRogueLightBg())
             }
+
             else -> {
                 textView?.text = context.getString(R.string.classless)
                 textView?.setTextColor(ContextCompat.getColor(context, R.color.text_primary))
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.kt
index 241924d1e..15605d447 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.kt
@@ -1,297 +1,331 @@
-package com.habitrpg.android.habitica.ui.adapter.inventory
-
-import android.content.Context
-import android.content.res.Resources
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.DialogFragment
-import androidx.recyclerview.widget.RecyclerView
-import androidx.recyclerview.widget.RecyclerView.ViewHolder
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.databinding.ItemItemBinding
-import com.habitrpg.android.habitica.databinding.ShopAdBinding
-import com.habitrpg.android.habitica.models.BaseMainObject
-import com.habitrpg.android.habitica.models.inventory.Egg
-import com.habitrpg.android.habitica.models.inventory.Food
-import com.habitrpg.android.habitica.models.inventory.HatchingPotion
-import com.habitrpg.android.habitica.models.inventory.Item
-import com.habitrpg.android.habitica.models.inventory.Pet
-import com.habitrpg.android.habitica.models.inventory.QuestContent
-import com.habitrpg.android.habitica.models.inventory.SpecialItem
-import com.habitrpg.android.habitica.models.user.OwnedItem
-import com.habitrpg.android.habitica.models.user.OwnedPet
-import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.android.habitica.ui.adapter.BaseRecyclerViewAdapter
-import com.habitrpg.android.habitica.ui.menu.BottomSheetMenu
-import com.habitrpg.android.habitica.ui.menu.BottomSheetMenuItem
-import com.habitrpg.android.habitica.ui.views.dialogs.DetailDialog
-import com.habitrpg.common.habitica.extensions.layoutInflater
-import com.habitrpg.common.habitica.extensions.loadImage
-import com.habitrpg.common.habitica.extensions.localizedCapitalizeWithSpaces
-import com.habitrpg.common.habitica.helpers.setMarkdown
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Locale
-
-class ItemRecyclerAdapter(val context: Context) : BaseRecyclerViewAdapter<BaseMainObject, ViewHolder>() {
-    var user: User? = null
-    var isHatching: Boolean = false
-    var isFeeding: Boolean = false
-    var hatchingItem: Item? = null
-    var feedingPet: Pet? = null
-    var fragment: DialogFragment? = null
-    var itemType = ""
-    var itemText = ""
-    private var existingPets: List<Pet>? = null
-    private var ownedPets: Map<String, OwnedPet>? = null
-    var items: Map<String, Item>? = null
-        set(value) {
-            field = value
-            notifyDataSetChanged()
-        }
-
-    var onSellItem: ((OwnedItem) -> Unit)? = null
-    var onQuestInvitation: ((QuestContent) -> Unit)? = null
-    var onOpenMysteryItem: ((Item) -> Unit)? = null
-    var onStartHatching: ((Item) -> Unit)? = null
-    var onHatchPet: ((HatchingPotion, Egg) -> Unit)? = null
-    var onFeedPet: ((Food) -> Unit)? = null
-    var onCreateNewParty: (() -> Unit)? = null
-    var onUseSpecialItem: ((SpecialItem) -> Unit)? = null
-    var onOpenShop: (() -> Unit)? = null
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        return if (viewType == 0) {
-            ItemViewHolder(ItemItemBinding.inflate(context.layoutInflater, parent, false))
-        } else {
-            ShopAdViewHolder(ShopAdBinding.inflate(context.layoutInflater, parent, false))
-        }
-    }
-
-    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        if (position < data.size) {
-            val ownedItem = data[position] as OwnedItem
-            (holder as? ItemViewHolder)?.bind(ownedItem, items?.get(ownedItem.key))
-        } else {
-            val typedHolder = (holder as? ShopAdViewHolder) ?: return
-            if (itemType == "quests") {
-                typedHolder.binding.imageView.setImageResource(R.drawable.icon_quests)
-                typedHolder.binding.titleView.text = context.getString(R.string.quests_footer_title)
-                typedHolder.binding.descriptionView.setMarkdown(context.getString(R.string.quests_footer_description))
-            } else {
-                typedHolder.binding.imageView.setImageResource(R.drawable.icon_shops)
-                typedHolder.binding.titleView.text = context.getString(R.string.item_footer_title, itemText)
-                typedHolder.binding.descriptionView.setMarkdown(when (itemType) {
-                    "eggs" -> context.getString(R.string.eggs_footer_description)
-                    "food" -> context.getString(R.string.food_footer_description)
-                    "hatchingPotions" -> context.getString(R.string.hatchingPotions_footer_description)
-                    else -> ""
-                })
-            }
-            typedHolder.itemView.setOnClickListener {
-                onOpenShop?.invoke()
-            }
-        }
-    }
-
-    override fun getItemCount(): Int {
-        val actualCount = super.getItemCount()
-        return actualCount + if (itemType == "special" || actualCount == 0 || itemType == "") 0 else 1
-    }
-
-    override fun getItemViewType(position: Int): Int {
-        return if (position < data.size) {
-            0
-        } else {
-            -1
-        }
-    }
-
-    fun setExistingPets(pets: List<Pet>) {
-        existingPets = pets
-        notifyDataSetChanged()
-    }
-
-    fun setOwnedPets(ownedPets: Map<String, OwnedPet>) {
-        this.ownedPets = ownedPets
-        notifyDataSetChanged()
-    }
-
-    inner class ShopAdViewHolder(val binding: ShopAdBinding): ViewHolder(binding.root)
-
-    inner class ItemViewHolder(val binding: ItemItemBinding) : ViewHolder(binding.root), View.OnClickListener {
-        private var ownedItem: OwnedItem? = null
-        var item: Item? = null
-
-        var resources: Resources = itemView.resources
-
-        private val canHatch: Boolean
-            get() {
-                val petKey: String = if (item is Egg) {
-                    item?.key + "-" + hatchingItem?.key
-                } else {
-                    hatchingItem?.key + "-" + item?.key
-                }
-                val pet = existingPets?.firstOrNull { it.key == petKey && it.type != "special" }
-                return pet != null && (ownedPets?.get(pet.key)?.trained ?: 0) <= 0
-            }
-
-        init {
-            itemView.setOnClickListener(this)
-        }
-
-        fun bind(ownedItem: OwnedItem, item: Item?) {
-            this.ownedItem = ownedItem
-            this.item = item
-            binding.titleTextView.text = item?.text ?: ownedItem.key?.localizedCapitalizeWithSpaces()
-            binding.ownedTextView.text = ownedItem.numberOwned.toString()
-
-            val disabled = if (isHatching) {
-                !this.canHatch
-            } else {
-                false
-            }
-            val imageName = if (item != null) {
-                getImageName(item = item)
-            } else {
-                getImageName(ownedItem = ownedItem)
-            }
-            binding.imageView.loadImage(imageName)
-
-            var alpha = 1.0f
-            if (disabled) {
-                alpha = 0.3f
-            }
-            binding.imageView.alpha = alpha
-            binding.titleTextView.alpha = alpha
-            binding.ownedTextView.alpha = alpha
-        }
-
-        private fun getImageName(
-            item: Item? = null,
-            ownedItem: OwnedItem? = null
-        ): String {
-            if (ownedItem != null && ownedItem.itemType == "special") {
-                return "shop_" + ownedItem.key
-            }
-
-            return when (item) {
-                is QuestContent -> {
-                    "inventory_quest_scroll_" + item.key
-                }
-                is SpecialItem -> {
-                    // Mystery Item (Inventory Present)
-                    val sdf = SimpleDateFormat("MM", Locale.getDefault())
-                    val month = sdf.format(Date())
-                    "inventory_present_$month"
-                }
-                else -> {
-                    val type = when (item?.type) {
-                        "eggs" -> "Egg"
-                        "food" -> "Food"
-                        "hatchingPotions" -> "HatchingPotion"
-                        else -> ""
-                    }
-                    "Pet_" + type + "_" + item?.key
-                }
-            }
-        }
-
-        override fun onClick(v: View) {
-            val context = context
-            if (!isHatching && !isFeeding) {
-                val menu = BottomSheetMenu(context)
-                menu.setTitle(item?.text)
-                val imageName = if (item != null) {
-                    getImageName(item = item)
-                } else {
-                    getImageName(ownedItem = ownedItem)
-                }
-                menu.setImage(imageName)
-                if (item !is QuestContent && item !is SpecialItem && ownedItem?.itemType != "special") {
-                    menu.addMenuItem(BottomSheetMenuItem(resources.getString(R.string.sell_no_price), true, "gold", item?.value?.toDouble() ?: 0.0))
-                }
-                if (item is Egg) {
-                    menu.addMenuItem(BottomSheetMenuItem(resources.getString(R.string.hatch_with_potion)))
-                } else if (item is HatchingPotion) {
-                    menu.addMenuItem(BottomSheetMenuItem(resources.getString(R.string.hatch_egg)))
-                } else if (item is QuestContent) {
-                    menu.addMenuItem(BottomSheetMenuItem(resources.getString(R.string.details)))
-                    if (user?.hasParty == true) {
-                        menu.addMenuItem(BottomSheetMenuItem(resources.getString(R.string.invite_party)))
-                    } else {
-                        menu.addMenuItem(BottomSheetMenuItem(resources.getString(R.string.create_new_party)))
-                    }
-                } else if (item is SpecialItem) {
-                    val specialItem = item as SpecialItem
-                    if (specialItem.isMysteryItem && (ownedItem?.numberOwned ?: 0) > 0) {
-                        menu.addMenuItem(BottomSheetMenuItem(resources.getString(R.string.open)))
-                    }
-                } else if (ownedItem?.itemType == "special") {
-                    if ((ownedItem?.numberOwned ?: 0) > 0) {
-                        menu.addMenuItem(BottomSheetMenuItem(resources.getString(R.string.use_item)))
-                    }
-                }
-                menu.setSelectionRunnable { index ->
-                    if (item == null && ownedItem != null) {
-                        // Special items that are not Mystery Item
-                        val specialItem = SpecialItem()
-                        ownedItem?.key?.let { key ->
-                            specialItem.key = key
-                            specialItem.text = key.localizedCapitalizeWithSpaces()
-                        }
-                        onUseSpecialItem?.invoke(specialItem)
-                        return@setSelectionRunnable
-                    }
-                    item?.let { selectedItem ->
-                        if (!(selectedItem is QuestContent || selectedItem is SpecialItem || ownedItem?.itemType == "special") && index == 0) {
-                            ownedItem?.let { selectedOwnedItem -> onSellItem?.invoke(selectedOwnedItem) }
-                            return@let
-                        }
-                        when (selectedItem) {
-                            is Egg -> item?.let { onStartHatching?.invoke(it) }
-                            is HatchingPotion -> onStartHatching?.invoke(selectedItem)
-                            is QuestContent -> {
-                                if (index == 0) {
-                                    val dialog = DetailDialog(context)
-                                    dialog.quest = selectedItem
-                                    dialog.show()
-                                } else {
-                                    if (user?.hasParty == true) {
-                                        onQuestInvitation?.invoke(selectedItem)
-                                    } else {
-                                        onCreateNewParty?.invoke()
-                                    }
-                                }
-                            }
-                            is SpecialItem ->
-                                if (item?.key == "inventory_present") {
-                                    onOpenMysteryItem?.invoke(selectedItem)
-                                }
-                        }
-                    }
-                }
-                menu.show()
-            } else if (isHatching) {
-                if (!this.canHatch) {
-                    return
-                }
-                item?.let { firstItem ->
-                    if (firstItem is Egg) {
-                        (hatchingItem as? HatchingPotion)?.let { potion ->
-                            onHatchPet?.invoke(potion, firstItem)
-                        }
-                    } else if (firstItem is HatchingPotion) {
-                        (hatchingItem as? Egg)?.let { egg ->
-                            onHatchPet?.invoke(firstItem, egg)
-                        }
-                    }
-                    return@let
-                }
-            } else if (isFeeding) {
-                (item as Food?)?.let { onFeedPet?.invoke(it) }
-                fragment?.dismiss()
-            }
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.adapter.inventory
+
+import android.content.Context
+import android.content.res.Resources
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.DialogFragment
+import androidx.recyclerview.widget.RecyclerView.ViewHolder
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.ItemItemBinding
+import com.habitrpg.android.habitica.databinding.ShopAdBinding
+import com.habitrpg.android.habitica.models.BaseMainObject
+import com.habitrpg.android.habitica.models.inventory.Egg
+import com.habitrpg.android.habitica.models.inventory.Food
+import com.habitrpg.android.habitica.models.inventory.HatchingPotion
+import com.habitrpg.android.habitica.models.inventory.Item
+import com.habitrpg.android.habitica.models.inventory.Pet
+import com.habitrpg.android.habitica.models.inventory.QuestContent
+import com.habitrpg.android.habitica.models.inventory.SpecialItem
+import com.habitrpg.android.habitica.models.user.OwnedItem
+import com.habitrpg.android.habitica.models.user.OwnedPet
+import com.habitrpg.android.habitica.models.user.User
+import com.habitrpg.android.habitica.ui.adapter.BaseRecyclerViewAdapter
+import com.habitrpg.android.habitica.ui.menu.BottomSheetMenu
+import com.habitrpg.android.habitica.ui.menu.BottomSheetMenuItem
+import com.habitrpg.android.habitica.ui.views.dialogs.DetailDialog
+import com.habitrpg.common.habitica.extensions.layoutInflater
+import com.habitrpg.common.habitica.extensions.loadImage
+import com.habitrpg.common.habitica.extensions.localizedCapitalizeWithSpaces
+import com.habitrpg.common.habitica.helpers.setMarkdown
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+
+class ItemRecyclerAdapter(val context: Context) :
+    BaseRecyclerViewAdapter<BaseMainObject, ViewHolder>() {
+    var user: User? = null
+    var isHatching: Boolean = false
+    var isFeeding: Boolean = false
+    var hatchingItem: Item? = null
+    var feedingPet: Pet? = null
+    var fragment: DialogFragment? = null
+    var itemType = ""
+    var itemText = ""
+    private var existingPets: List<Pet>? = null
+    private var ownedPets: Map<String, OwnedPet>? = null
+    var items: Map<String, Item>? = null
+        set(value) {
+            field = value
+            notifyDataSetChanged()
+        }
+
+    var onSellItem: ((OwnedItem) -> Unit)? = null
+    var onQuestInvitation: ((QuestContent) -> Unit)? = null
+    var onOpenMysteryItem: ((Item) -> Unit)? = null
+    var onStartHatching: ((Item) -> Unit)? = null
+    var onHatchPet: ((HatchingPotion, Egg) -> Unit)? = null
+    var onFeedPet: ((Food) -> Unit)? = null
+    var onCreateNewParty: (() -> Unit)? = null
+    var onUseSpecialItem: ((SpecialItem) -> Unit)? = null
+    var onOpenShop: (() -> Unit)? = null
+
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int,
+    ): ViewHolder {
+        return if (viewType == 0) {
+            ItemViewHolder(ItemItemBinding.inflate(context.layoutInflater, parent, false))
+        } else {
+            ShopAdViewHolder(ShopAdBinding.inflate(context.layoutInflater, parent, false))
+        }
+    }
+
+    override fun onBindViewHolder(
+        holder: ViewHolder,
+        position: Int,
+    ) {
+        if (position < data.size) {
+            val ownedItem = data[position] as OwnedItem
+            (holder as? ItemViewHolder)?.bind(ownedItem, items?.get(ownedItem.key))
+        } else {
+            val typedHolder = (holder as? ShopAdViewHolder) ?: return
+            if (itemType == "quests") {
+                typedHolder.binding.imageView.setImageResource(R.drawable.icon_quests)
+                typedHolder.binding.titleView.text = context.getString(R.string.quests_footer_title)
+                typedHolder.binding.descriptionView.setMarkdown(context.getString(R.string.quests_footer_description))
+            } else {
+                typedHolder.binding.imageView.setImageResource(R.drawable.icon_shops)
+                typedHolder.binding.titleView.text =
+                    context.getString(R.string.item_footer_title, itemText)
+                typedHolder.binding.descriptionView.setMarkdown(
+                    when (itemType) {
+                        "eggs" -> context.getString(R.string.eggs_footer_description)
+                        "food" -> context.getString(R.string.food_footer_description)
+                        "hatchingPotions" -> context.getString(R.string.hatchingPotions_footer_description)
+                        else -> ""
+                    },
+                )
+            }
+            typedHolder.itemView.setOnClickListener {
+                onOpenShop?.invoke()
+            }
+        }
+    }
+
+    override fun getItemCount(): Int {
+        val actualCount = super.getItemCount()
+        return actualCount + if (itemType == "special" || actualCount == 0 || itemType == "") 0 else 1
+    }
+
+    override fun getItemViewType(position: Int): Int {
+        return if (position < data.size) {
+            0
+        } else {
+            -1
+        }
+    }
+
+    fun setExistingPets(pets: List<Pet>) {
+        existingPets = pets
+        notifyDataSetChanged()
+    }
+
+    fun setOwnedPets(ownedPets: Map<String, OwnedPet>) {
+        this.ownedPets = ownedPets
+        notifyDataSetChanged()
+    }
+
+    inner class ShopAdViewHolder(val binding: ShopAdBinding) : ViewHolder(binding.root)
+
+    inner class ItemViewHolder(val binding: ItemItemBinding) :
+        ViewHolder(binding.root),
+        View.OnClickListener {
+        private var ownedItem: OwnedItem? = null
+        var item: Item? = null
+
+        var resources: Resources = itemView.resources
+
+        private val canHatch: Boolean
+            get() {
+                val petKey: String =
+                    if (item is Egg) {
+                        item?.key + "-" + hatchingItem?.key
+                    } else {
+                        hatchingItem?.key + "-" + item?.key
+                    }
+                val pet = existingPets?.firstOrNull { it.key == petKey && it.type != "special" }
+                return pet != null && (ownedPets?.get(pet.key)?.trained ?: 0) <= 0
+            }
+
+        init {
+            itemView.setOnClickListener(this)
+        }
+
+        fun bind(
+            ownedItem: OwnedItem,
+            item: Item?,
+        ) {
+            this.ownedItem = ownedItem
+            this.item = item
+            binding.titleTextView.text =
+                item?.text ?: ownedItem.key?.localizedCapitalizeWithSpaces()
+            binding.ownedTextView.text = ownedItem.numberOwned.toString()
+
+            val disabled =
+                if (isHatching) {
+                    !this.canHatch
+                } else {
+                    false
+                }
+            val imageName =
+                if (item != null) {
+                    getImageName(item = item)
+                } else {
+                    getImageName(ownedItem = ownedItem)
+                }
+            binding.imageView.loadImage(imageName)
+
+            var alpha = 1.0f
+            if (disabled) {
+                alpha = 0.3f
+            }
+            binding.imageView.alpha = alpha
+            binding.titleTextView.alpha = alpha
+            binding.ownedTextView.alpha = alpha
+        }
+
+        private fun getImageName(
+            item: Item? = null,
+            ownedItem: OwnedItem? = null,
+        ): String {
+            if (ownedItem != null && ownedItem.itemType == "special") {
+                return "shop_" + ownedItem.key
+            }
+
+            return when (item) {
+                is QuestContent -> {
+                    "inventory_quest_scroll_" + item.key
+                }
+
+                is SpecialItem -> {
+                    // Mystery Item (Inventory Present)
+                    val sdf = SimpleDateFormat("MM", Locale.getDefault())
+                    val month = sdf.format(Date())
+                    "inventory_present_$month"
+                }
+
+                else -> {
+                    val type =
+                        when (item?.type) {
+                            "eggs" -> "Egg"
+                            "food" -> "Food"
+                            "hatchingPotions" -> "HatchingPotion"
+                            else -> ""
+                        }
+                    "Pet_" + type + "_" + item?.key
+                }
+            }
+        }
+
+        override fun onClick(v: View) {
+            val context = context
+            if (!isHatching && !isFeeding) {
+                val menu = BottomSheetMenu(context)
+                menu.setTitle(item?.text)
+                val imageName =
+                    if (item != null) {
+                        getImageName(item = item)
+                    } else {
+                        getImageName(ownedItem = ownedItem)
+                    }
+                menu.setImage(imageName)
+                if (item !is QuestContent && item !is SpecialItem && ownedItem?.itemType != "special") {
+                    menu.addMenuItem(
+                        BottomSheetMenuItem(
+                            resources.getString(R.string.sell_no_price),
+                            true,
+                            "gold",
+                            item?.value?.toDouble() ?: 0.0,
+                        ),
+                    )
+                }
+                if (item is Egg) {
+                    menu.addMenuItem(BottomSheetMenuItem(resources.getString(R.string.hatch_with_potion)))
+                } else if (item is HatchingPotion) {
+                    menu.addMenuItem(BottomSheetMenuItem(resources.getString(R.string.hatch_egg)))
+                } else if (item is QuestContent) {
+                    menu.addMenuItem(BottomSheetMenuItem(resources.getString(R.string.details)))
+                    if (user?.hasParty == true) {
+                        menu.addMenuItem(BottomSheetMenuItem(resources.getString(R.string.invite_party)))
+                    } else {
+                        menu.addMenuItem(BottomSheetMenuItem(resources.getString(R.string.create_new_party)))
+                    }
+                } else if (item is SpecialItem) {
+                    val specialItem = item as SpecialItem
+                    if (specialItem.isMysteryItem && (ownedItem?.numberOwned ?: 0) > 0) {
+                        menu.addMenuItem(BottomSheetMenuItem(resources.getString(R.string.open)))
+                    }
+                } else if (ownedItem?.itemType == "special") {
+                    if ((ownedItem?.numberOwned ?: 0) > 0) {
+                        menu.addMenuItem(BottomSheetMenuItem(resources.getString(R.string.use_item)))
+                    }
+                }
+                menu.setSelectionRunnable { index ->
+                    if (item == null && ownedItem != null) {
+                        // Special items that are not Mystery Item
+                        val specialItem = SpecialItem()
+                        ownedItem?.key?.let { key ->
+                            specialItem.key = key
+                            specialItem.text = key.localizedCapitalizeWithSpaces()
+                        }
+                        onUseSpecialItem?.invoke(specialItem)
+                        return@setSelectionRunnable
+                    }
+                    item?.let { selectedItem ->
+                        if (!(selectedItem is QuestContent || selectedItem is SpecialItem || ownedItem?.itemType == "special") && index == 0) {
+                            ownedItem?.let { selectedOwnedItem ->
+                                onSellItem?.invoke(
+                                    selectedOwnedItem,
+                                )
+                            }
+                            return@let
+                        }
+                        when (selectedItem) {
+                            is Egg -> item?.let { onStartHatching?.invoke(it) }
+                            is HatchingPotion -> onStartHatching?.invoke(selectedItem)
+                            is QuestContent -> {
+                                if (index == 0) {
+                                    val dialog = DetailDialog(context)
+                                    dialog.quest = selectedItem
+                                    dialog.show()
+                                } else {
+                                    if (user?.hasParty == true) {
+                                        onQuestInvitation?.invoke(selectedItem)
+                                    } else {
+                                        onCreateNewParty?.invoke()
+                                    }
+                                }
+                            }
+
+                            is SpecialItem ->
+                                if (item?.key == "inventory_present") {
+                                    onOpenMysteryItem?.invoke(selectedItem)
+                                }
+                        }
+                    }
+                }
+                menu.show()
+            } else if (isHatching) {
+                if (!this.canHatch) {
+                    return
+                }
+                item?.let { firstItem ->
+                    if (firstItem is Egg) {
+                        (hatchingItem as? HatchingPotion)?.let { potion ->
+                            onHatchPet?.invoke(potion, firstItem)
+                        }
+                    } else if (firstItem is HatchingPotion) {
+                        (hatchingItem as? Egg)?.let { egg ->
+                            onHatchPet?.invoke(firstItem, egg)
+                        }
+                    }
+                    return@let
+                }
+            } else if (isFeeding) {
+                (item as Food?)?.let { onFeedPet?.invoke(it) }
+                fragment?.dismiss()
+            }
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.kt
index 2fef47148..af9aa2481 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.kt
@@ -1,51 +1,61 @@
-package com.habitrpg.android.habitica.ui.adapter.inventory
-
-import android.view.ViewGroup
-import com.habitrpg.android.habitica.models.inventory.Mount
-import com.habitrpg.android.habitica.models.inventory.StableSection
-import com.habitrpg.android.habitica.models.user.OwnedMount
-import com.habitrpg.android.habitica.ui.viewHolders.MountViewHolder
-import com.habitrpg.android.habitica.ui.viewHolders.SectionViewHolder
-
-class MountDetailRecyclerAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>() {
-    var onEquip: ((String) -> Unit)? = null
-    private var ownedMounts: Map<String, OwnedMount>? = null
-
-    var currentMount: String? = null
-        set(value) {
-            field = value
-            notifyDataSetChanged()
-        }
-
-    private var itemList: List<Any> = ArrayList()
-
-    fun setItemList(itemList: List<Any>) {
-        this.itemList = itemList
-        this.notifyDataSetChanged()
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder =
-        when (viewType) {
-            1 -> SectionViewHolder(parent)
-            else -> MountViewHolder(parent, onEquip)
-        }
-
-    override fun onBindViewHolder(
-        holder: androidx.recyclerview.widget.RecyclerView.ViewHolder,
-        position: Int
-    ) {
-        when (val obj = this.itemList[position]) {
-            is StableSection -> (holder as? SectionViewHolder)?.bind(obj)
-            is Mount -> (holder as? MountViewHolder)?.bind(obj, ownedMounts?.get(obj.key ?: "")?.owned == true, currentMount)
-        }
-    }
-
-    override fun getItemViewType(position: Int): Int = if (itemList.size > position && itemList[position] is StableSection) 1 else 2
-
-    override fun getItemCount(): Int = itemList.size
-
-    fun setOwnedMounts(ownedMounts: Map<String, OwnedMount>) {
-        this.ownedMounts = ownedMounts
-        notifyDataSetChanged()
-    }
-}
+package com.habitrpg.android.habitica.ui.adapter.inventory
+
+import android.view.ViewGroup
+import com.habitrpg.android.habitica.models.inventory.Mount
+import com.habitrpg.android.habitica.models.inventory.StableSection
+import com.habitrpg.android.habitica.models.user.OwnedMount
+import com.habitrpg.android.habitica.ui.viewHolders.MountViewHolder
+import com.habitrpg.android.habitica.ui.viewHolders.SectionViewHolder
+
+class MountDetailRecyclerAdapter :
+    androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>() {
+    var onEquip: ((String) -> Unit)? = null
+    private var ownedMounts: Map<String, OwnedMount>? = null
+
+    var currentMount: String? = null
+        set(value) {
+            field = value
+            notifyDataSetChanged()
+        }
+
+    private var itemList: List<Any> = ArrayList()
+
+    fun setItemList(itemList: List<Any>) {
+        this.itemList = itemList
+        this.notifyDataSetChanged()
+    }
+
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int,
+    ): androidx.recyclerview.widget.RecyclerView.ViewHolder =
+        when (viewType) {
+            1 -> SectionViewHolder(parent)
+            else -> MountViewHolder(parent, onEquip)
+        }
+
+    override fun onBindViewHolder(
+        holder: androidx.recyclerview.widget.RecyclerView.ViewHolder,
+        position: Int,
+    ) {
+        when (val obj = this.itemList[position]) {
+            is StableSection -> (holder as? SectionViewHolder)?.bind(obj)
+            is Mount ->
+                (holder as? MountViewHolder)?.bind(
+                    obj,
+                    ownedMounts?.get(obj.key)?.owned == true,
+                    currentMount,
+                )
+        }
+    }
+
+    override fun getItemViewType(position: Int): Int =
+        if (itemList.size > position && itemList[position] is StableSection) 1 else 2
+
+    override fun getItemCount(): Int = itemList.size
+
+    fun setOwnedMounts(ownedMounts: Map<String, OwnedMount>) {
+        this.ownedMounts = ownedMounts
+        notifyDataSetChanged()
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.kt
index dceb4b8d0..bf326de2c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.kt
@@ -1,211 +1,226 @@
-package com.habitrpg.android.habitica.ui.adapter.inventory
-
-import android.view.View
-import android.view.ViewGroup
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.databinding.CanHatchItemBinding
-import com.habitrpg.android.habitica.extensions.inflate
-import com.habitrpg.android.habitica.models.inventory.Animal
-import com.habitrpg.android.habitica.models.inventory.Egg
-import com.habitrpg.android.habitica.models.inventory.Food
-import com.habitrpg.android.habitica.models.inventory.HatchingPotion
-import com.habitrpg.android.habitica.models.inventory.Mount
-import com.habitrpg.android.habitica.models.inventory.Pet
-import com.habitrpg.android.habitica.models.inventory.StableSection
-import com.habitrpg.android.habitica.models.user.OwnedItem
-import com.habitrpg.android.habitica.models.user.OwnedMount
-import com.habitrpg.android.habitica.models.user.OwnedPet
-import com.habitrpg.android.habitica.ui.viewHolders.PetViewHolder
-import com.habitrpg.android.habitica.ui.viewHolders.SectionViewHolder
-import com.habitrpg.android.habitica.ui.views.dialogs.PetSuggestHatchDialog
-import com.habitrpg.common.habitica.extensions.loadImage
-import com.habitrpg.common.habitica.helpers.Animations
-import com.habitrpg.shared.habitica.models.responses.FeedResponse
-
-class PetDetailRecyclerAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>() {
-    var onFeed: (suspend (Pet, Food?) -> FeedResponse?)? = null
-    var onEquip: ((String) -> Unit)? = null
-    private var existingMounts: List<Mount>? = null
-    private var ownedPets: Map<String, OwnedPet>? = null
-    private var ownedMounts: Map<String, OwnedMount>? = null
-    private var ownedItems: Map<String, OwnedItem>? = null
-    var currentPet: String? = null
-        set(value) {
-            field = value
-            notifyDataSetChanged()
-        }
-    private var ownsSaddles: Boolean = false
-
-    private var itemList: List<Any> = ArrayList()
-
-    fun setItemList(itemList: List<Any>) {
-        this.itemList = itemList
-        this.notifyDataSetChanged()
-    }
-
-    var animalIngredientsRetriever: ((Animal, ((Pair<Egg?, HatchingPotion?>) -> Unit)) -> Unit)? = null
-
-    private fun canRaiseToMount(pet: Pet): Boolean {
-        if (pet.type == "special") return false
-        for (mount in existingMounts ?: emptyList()) {
-            if (mount.key == pet.key) {
-                return !(ownedMounts?.get(mount.key)?.owned ?: false)
-            }
-        }
-        return false
-    }
-
-    private fun eggCount(pet: Pet): Int {
-        return ownedItems?.get(pet.animal + "-eggs")?.numberOwned ?: 0
-    }
-    private fun potionCount(pet: Pet): Int {
-        return ownedItems?.get(pet.color + "-hatchingPotions")?.numberOwned ?: 0
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder =
-        when (viewType) {
-            1 -> SectionViewHolder(parent)
-            2 -> CanHatchViewHolder(parent, animalIngredientsRetriever)
-            else -> PetViewHolder(parent, onEquip, onFeed, animalIngredientsRetriever)
-        }
-
-    override fun onBindViewHolder(
-        holder: androidx.recyclerview.widget.RecyclerView.ViewHolder,
-        position: Int
-    ) {
-        when (val obj = this.itemList[position]) {
-            is StableSection -> {
-                (holder as? SectionViewHolder)?.bind(obj)
-            }
-            is Pet -> {
-                val trained = ownedPets?.get(obj.key ?: "")?.trained ?: 0
-                val eggCount = eggCount(obj)
-                val potionCount = potionCount(obj)
-                if (trained <= 0 && eggCount > 0 && potionCount > 0) {
-                    (holder as? CanHatchViewHolder)?.bind(
-                        obj,
-                        eggCount,
-                        potionCount,
-                        ownedItems?.get(obj.animal + "-eggs") != null,
-                        ownedItems?.get(obj.color + "-hatchingPotions") != null,
-                        ownedMounts?.containsKey(obj.key) == true
-                    )
-                } else {
-                    (holder as? PetViewHolder)?.bind(
-                        obj,
-                        trained,
-                        eggCount,
-                        potionCount,
-                        canRaiseToMount(obj),
-                        ownsSaddles,
-                        ownedItems?.get(obj.animal + "-eggs") != null,
-                        ownedItems?.get(obj.color + "-hatchingPotions") != null,
-                        ownedMounts?.containsKey(obj.key) == true,
-                        currentPet
-                    )
-                }
-            }
-        }
-    }
-
-    override fun getItemViewType(position: Int): Int {
-        if (itemList.size <= position) return 3
-        return if (itemList[position] is StableSection) {
-            1
-        } else {
-            val pet = itemList[position] as Pet
-            if ((
-                ownedPets?.get(pet.key)?.trained
-                    ?: 0
-                ) <= 0 && eggCount(pet) > 0 && potionCount(pet) > 0
-            ) {
-                2
-            } else {
-                3
-            }
-        }
-    }
-
-    override fun getItemCount(): Int = itemList.size
-
-    fun setExistingMounts(existingMounts: List<Mount>) {
-        this.existingMounts = existingMounts
-    }
-
-    fun setOwnedMounts(ownedMounts: Map<String, OwnedMount>) {
-        this.ownedMounts = ownedMounts
-        notifyDataSetChanged()
-    }
-
-    fun setOwnedPets(ownedPets: Map<String, OwnedPet>) {
-        this.ownedPets = ownedPets
-        notifyDataSetChanged()
-    }
-
-    fun setOwnedItems(ownedItems: Map<String, OwnedItem>) {
-        this.ownedItems = ownedItems
-        ownsSaddles = if (ownedItems.containsKey("Saddle-food")) (ownedItems["Saddle-food"]?.numberOwned ?: 0) > 0 else false
-        notifyDataSetChanged()
-    }
-
-    class CanHatchViewHolder(
-        parent: ViewGroup,
-        private val ingredientsReceiver: ((Animal, ((Pair<Egg?, HatchingPotion?>) -> Unit)) -> Unit)?
-    ) : androidx.recyclerview.widget.RecyclerView.ViewHolder(parent.inflate(R.layout.can_hatch_item)),
-        View.OnClickListener {
-        private var binding = CanHatchItemBinding.bind(itemView)
-
-        private var hasMount: Boolean = false
-        private var hasUnlockedPotion: Boolean = false
-        private var hasUnlockedEgg: Boolean = false
-        private var eggCount: Int = 0
-        private var potionCount: Int = 0
-        private var animal: Pet? = null
-
-        init {
-            itemView.setOnClickListener(this)
-        }
-
-        fun bind(
-            item: Pet,
-            eggCount: Int,
-            potionCount: Int,
-            hasUnlockedEgg: Boolean,
-            hasUnlockedPotion: Boolean,
-            hasMount: Boolean
-        ) {
-            this.animal = item
-            this.eggCount = eggCount
-            this.potionCount = potionCount
-            this.hasUnlockedEgg = hasUnlockedEgg
-            this.hasUnlockedPotion = hasUnlockedPotion
-            this.hasMount = hasMount
-
-            binding.eggView.loadImage("Pet_Egg_${item.animal}")
-            binding.hatchingPotionView.loadImage("Pet_HatchingPotion_${item.color}")
-
-            binding.eggView.startAnimation(Animations.bobbingAnimation(4f))
-            binding.hatchingPotionView.startAnimation(Animations.bobbingAnimation(-4f))
-        }
-
-        override fun onClick(p0: View?) {
-            val context = itemView.context
-            val dialog = PetSuggestHatchDialog(context)
-            animal?.let {
-                ingredientsReceiver?.invoke(it) { ingredients ->
-                    dialog.configure(
-                        it,
-                        ingredients.first,
-                        ingredients.second,
-                        eggCount,
-                        potionCount,
-                        hasUnlockedEgg,
-                        hasUnlockedPotion,
-                        hasMount
-                    )
-                    dialog.show()
-                }
-            }
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.adapter.inventory
+
+import android.view.View
+import android.view.ViewGroup
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.CanHatchItemBinding
+import com.habitrpg.android.habitica.extensions.inflate
+import com.habitrpg.android.habitica.models.inventory.Animal
+import com.habitrpg.android.habitica.models.inventory.Egg
+import com.habitrpg.android.habitica.models.inventory.Food
+import com.habitrpg.android.habitica.models.inventory.HatchingPotion
+import com.habitrpg.android.habitica.models.inventory.Mount
+import com.habitrpg.android.habitica.models.inventory.Pet
+import com.habitrpg.android.habitica.models.inventory.StableSection
+import com.habitrpg.android.habitica.models.user.OwnedItem
+import com.habitrpg.android.habitica.models.user.OwnedMount
+import com.habitrpg.android.habitica.models.user.OwnedPet
+import com.habitrpg.android.habitica.ui.viewHolders.PetViewHolder
+import com.habitrpg.android.habitica.ui.viewHolders.SectionViewHolder
+import com.habitrpg.android.habitica.ui.views.dialogs.PetSuggestHatchDialog
+import com.habitrpg.common.habitica.extensions.loadImage
+import com.habitrpg.common.habitica.helpers.Animations
+import com.habitrpg.shared.habitica.models.responses.FeedResponse
+
+class PetDetailRecyclerAdapter :
+    androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>() {
+    var onFeed: (suspend (Pet, Food?) -> FeedResponse?)? = null
+    var onEquip: ((String) -> Unit)? = null
+    private var existingMounts: List<Mount>? = null
+    private var ownedPets: Map<String, OwnedPet>? = null
+    private var ownedMounts: Map<String, OwnedMount>? = null
+    private var ownedItems: Map<String, OwnedItem>? = null
+    var currentPet: String? = null
+        set(value) {
+            field = value
+            notifyDataSetChanged()
+        }
+    private var ownsSaddles: Boolean = false
+
+    private var itemList: List<Any> = ArrayList()
+
+    fun setItemList(itemList: List<Any>) {
+        this.itemList = itemList
+        this.notifyDataSetChanged()
+    }
+
+    var animalIngredientsRetriever: ((Animal, ((Pair<Egg?, HatchingPotion?>) -> Unit)) -> Unit)? =
+        null
+
+    private fun canRaiseToMount(pet: Pet): Boolean {
+        if (pet.type == "special") return false
+        for (mount in existingMounts ?: emptyList()) {
+            if (mount.key == pet.key) {
+                return !(ownedMounts?.get(mount.key)?.owned ?: false)
+            }
+        }
+        return false
+    }
+
+    private fun eggCount(pet: Pet): Int {
+        return ownedItems?.get(pet.animal + "-eggs")?.numberOwned ?: 0
+    }
+
+    private fun potionCount(pet: Pet): Int {
+        return ownedItems?.get(pet.color + "-hatchingPotions")?.numberOwned ?: 0
+    }
+
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int,
+    ): androidx.recyclerview.widget.RecyclerView.ViewHolder =
+        when (viewType) {
+            1 -> SectionViewHolder(parent)
+            2 -> CanHatchViewHolder(parent, animalIngredientsRetriever)
+            else -> PetViewHolder(parent, onEquip, onFeed, animalIngredientsRetriever)
+        }
+
+    override fun onBindViewHolder(
+        holder: androidx.recyclerview.widget.RecyclerView.ViewHolder,
+        position: Int,
+    ) {
+        when (val obj = this.itemList[position]) {
+            is StableSection -> {
+                (holder as? SectionViewHolder)?.bind(obj)
+            }
+
+            is Pet -> {
+                val trained = ownedPets?.get(obj.key)?.trained ?: 0
+                val eggCount = eggCount(obj)
+                val potionCount = potionCount(obj)
+                if (trained <= 0 && eggCount > 0 && potionCount > 0) {
+                    (holder as? CanHatchViewHolder)?.bind(
+                        obj,
+                        eggCount,
+                        potionCount,
+                        ownedItems?.get(obj.animal + "-eggs") != null,
+                        ownedItems?.get(obj.color + "-hatchingPotions") != null,
+                        ownedMounts?.containsKey(obj.key) == true,
+                    )
+                } else {
+                    (holder as? PetViewHolder)?.bind(
+                        obj,
+                        trained,
+                        eggCount,
+                        potionCount,
+                        canRaiseToMount(obj),
+                        ownsSaddles,
+                        ownedItems?.get(obj.animal + "-eggs") != null,
+                        ownedItems?.get(obj.color + "-hatchingPotions") != null,
+                        ownedMounts?.containsKey(obj.key) == true,
+                        currentPet,
+                    )
+                }
+            }
+        }
+    }
+
+    override fun getItemViewType(position: Int): Int {
+        if (itemList.size <= position) return 3
+        return if (itemList[position] is StableSection) {
+            1
+        } else {
+            val pet = itemList[position] as Pet
+            if ((
+                    ownedPets?.get(pet.key)?.trained
+                        ?: 0
+                ) <= 0 && eggCount(pet) > 0 && potionCount(pet) > 0
+            ) {
+                2
+            } else {
+                3
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = itemList.size
+
+    fun setExistingMounts(existingMounts: List<Mount>) {
+        this.existingMounts = existingMounts
+    }
+
+    fun setOwnedMounts(ownedMounts: Map<String, OwnedMount>) {
+        this.ownedMounts = ownedMounts
+        notifyDataSetChanged()
+    }
+
+    fun setOwnedPets(ownedPets: Map<String, OwnedPet>) {
+        this.ownedPets = ownedPets
+        notifyDataSetChanged()
+    }
+
+    fun setOwnedItems(ownedItems: Map<String, OwnedItem>) {
+        this.ownedItems = ownedItems
+        ownsSaddles =
+            if (ownedItems.containsKey("Saddle-food")) {
+                (
+                    ownedItems["Saddle-food"]?.numberOwned
+                        ?: 0
+                ) > 0
+            } else {
+                false
+            }
+        notifyDataSetChanged()
+    }
+
+    class CanHatchViewHolder(
+        parent: ViewGroup,
+        private val ingredientsReceiver: ((Animal, ((Pair<Egg?, HatchingPotion?>) -> Unit)) -> Unit)?,
+    ) : androidx.recyclerview.widget.RecyclerView.ViewHolder(parent.inflate(R.layout.can_hatch_item)),
+        View.OnClickListener {
+        private var binding = CanHatchItemBinding.bind(itemView)
+
+        private var hasMount: Boolean = false
+        private var hasUnlockedPotion: Boolean = false
+        private var hasUnlockedEgg: Boolean = false
+        private var eggCount: Int = 0
+        private var potionCount: Int = 0
+        private var animal: Pet? = null
+
+        init {
+            itemView.setOnClickListener(this)
+        }
+
+        fun bind(
+            item: Pet,
+            eggCount: Int,
+            potionCount: Int,
+            hasUnlockedEgg: Boolean,
+            hasUnlockedPotion: Boolean,
+            hasMount: Boolean,
+        ) {
+            this.animal = item
+            this.eggCount = eggCount
+            this.potionCount = potionCount
+            this.hasUnlockedEgg = hasUnlockedEgg
+            this.hasUnlockedPotion = hasUnlockedPotion
+            this.hasMount = hasMount
+
+            binding.eggView.loadImage("Pet_Egg_${item.animal}")
+            binding.hatchingPotionView.loadImage("Pet_HatchingPotion_${item.color}")
+
+            binding.eggView.startAnimation(Animations.bobbingAnimation(4f))
+            binding.hatchingPotionView.startAnimation(Animations.bobbingAnimation(-4f))
+        }
+
+        override fun onClick(p0: View?) {
+            val context = itemView.context
+            val dialog = PetSuggestHatchDialog(context)
+            animal?.let {
+                ingredientsReceiver?.invoke(it) { ingredients ->
+                    dialog.configure(
+                        it,
+                        ingredients.first,
+                        ingredients.second,
+                        eggCount,
+                        potionCount,
+                        hasUnlockedEgg,
+                        hasUnlockedPotion,
+                        hasMount,
+                    )
+                    dialog.show()
+                }
+            }
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt
index 4988bb700..984ef47d3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt
@@ -1,322 +1,375 @@
-package com.habitrpg.android.habitica.ui.adapter.inventory
-
-import android.content.Context
-import android.text.method.LinkMovementMethod
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Button
-import android.widget.TextView
-import androidx.recyclerview.widget.RecyclerView.ViewHolder
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.databinding.ShopArmoireGearBinding
-import com.habitrpg.android.habitica.databinding.ShopHeaderBinding
-import com.habitrpg.android.habitica.extensions.inflate
-import com.habitrpg.android.habitica.helpers.Analytics
-import com.habitrpg.android.habitica.helpers.EventCategory
-import com.habitrpg.android.habitica.helpers.HitType
-import com.habitrpg.android.habitica.models.shops.Shop
-import com.habitrpg.android.habitica.models.shops.ShopCategory
-import com.habitrpg.android.habitica.models.shops.ShopItem
-import com.habitrpg.android.habitica.models.user.OwnedItem
-import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.android.habitica.ui.activities.MainActivity
-import com.habitrpg.android.habitica.ui.viewHolders.SectionViewHolder
-import com.habitrpg.android.habitica.ui.viewHolders.ShopItemViewHolder
-import com.habitrpg.android.habitica.ui.views.getTranslatedClassName
-import com.habitrpg.android.habitica.ui.views.insufficientCurrency.InsufficientGemsDialog
-import com.habitrpg.common.habitica.extensions.fromHtml
-import com.habitrpg.common.habitica.extensions.loadImage
-import com.habitrpg.common.habitica.helpers.MainNavigationController
-
-class ShopRecyclerAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<ViewHolder>() {
-
-    var completedQuests: List<String?> = emptyList()
-    var armoireCount: Int = 0
-    var onNeedsRefresh: (() -> Unit)? = null
-    var onShowPurchaseDialog: ((ShopItem, Boolean) -> Unit)? = null
-
-    private val items: MutableList<Any> = ArrayList()
-    private var shopIdentifier: String? = null
-    private var ownedItems: Map<String, OwnedItem> = HashMap()
-    var armoireItem: ShopItem? = null
-
-    var changeClassEvents: ((String) -> Unit)? = null
-
-    var shopSpriteSuffix: String? = null
-        set(value) {
-            field = value
-            if (items.size > 0) {
-                notifyItemChanged(0)
-            }
-        }
-    var context: Context? = null
-    var mainActivity: MainActivity? = null
-    var user: User? = null
-        set(value) {
-            field = value
-            if (items.size > 0) {
-                this.notifyDataSetChanged()
-            }
-        }
-    private var pinnedItemKeys: List<String> = ArrayList()
-
-    var gearCategories: MutableList<ShopCategory> = ArrayList()
-        set(value) {
-            field = value
-            notifyDataSetChanged()
-        }
-
-    internal var selectedGearCategory: String = ""
-        set(value) {
-            field = value
-            if (field != "" && items.size > 0) {
-                notifyDataSetChanged()
-            }
-        }
-
-    private val emptyViewResource: Int
-        get() = when (this.shopIdentifier) {
-            Shop.SEASONAL_SHOP -> R.layout.empty_view_seasonal_shop
-            Shop.TIME_TRAVELERS_SHOP -> R.layout.empty_view_timetravelers
-            else -> R.layout.simple_textview
-        }
-
-    fun setShop(shop: Shop?) {
-        if (shop == null) {
-            return
-        }
-        shopIdentifier = shop.identifier
-        items.clear()
-        items.add(shop)
-        for (category in shop.categories) {
-            if (category.items.size > 0) {
-                items.add(category)
-                for (item in category.items) {
-                    item.categoryIdentifier = category.identifier
-                    items.add(item)
-                }
-            }
-        }
-        notifyDataSetChanged()
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder =
-        when (viewType) {
-            0 -> ShopHeaderViewHolder(parent)
-            1 -> SectionViewHolder(parent.inflate(R.layout.shop_section_header))
-            2 -> EmptyStateViewHolder(parent.inflate(emptyViewResource))
-            3 -> {
-                val viewHolder = ArmoireGearViewHolder(parent.inflate(R.layout.shop_armoire_gear))
-                viewHolder.itemView.setOnClickListener {
-                    armoireItem?.let { it1 -> onShowPurchaseDialog?.invoke(it1, true) }
-                }
-                viewHolder
-            }
-            else -> {
-                val view = parent.inflate(R.layout.row_shopitem)
-                val viewHolder = ShopItemViewHolder(view)
-                viewHolder.shopIdentifier = shopIdentifier
-                viewHolder.onNeedsRefresh = onNeedsRefresh
-                viewHolder.onShowPurchaseDialog = onShowPurchaseDialog
-                viewHolder
-            }
-        }
-
-    @Suppress("ReturnCount")
-    override fun onBindViewHolder(
-        holder: ViewHolder,
-        position: Int
-    ) {
-        val obj = getItem(position)
-        if (obj != null) {
-            when (obj) {
-                is Shop -> (holder as? ShopHeaderViewHolder)?.bind(obj, shopSpriteSuffix)
-                is ShopCategory -> {
-                    val sectionHolder = holder as? SectionViewHolder ?: return
-                    sectionHolder.bind(obj.text)
-                    if (gearCategories.contains(obj)) {
-                        context?.let { context ->
-                            val adapter = HabiticaClassArrayAdapter(context, R.layout.class_spinner_dropdown_item, gearCategories.map { it.identifier })
-                            sectionHolder.spinnerAdapter = adapter
-                            sectionHolder.selectedItem = gearCategories.indexOf(obj)
-                            sectionHolder.spinnerSelectionChanged = {
-                                if (selectedGearCategory != gearCategories[holder.selectedItem].identifier) {
-                                    selectedGearCategory = gearCategories[holder.selectedItem].identifier
-                                }
-                            }
-                            if (user?.stats?.habitClass != obj.identifier && obj.identifier != "none") {
-                                if (user?.hasClass == true) {
-                                    sectionHolder.switchClassButton?.setOnClickListener {
-                                        if ((user?.gemCount ?: 0) >= 3) {
-                                            changeClassEvents?.invoke(selectedGearCategory)
-                                        } else {
-                                            mainActivity?.let { activity ->
-                                                val dialog = InsufficientGemsDialog(activity, 3)
-                                                Analytics.sendEvent("show insufficient gems modal", EventCategory.BEHAVIOUR, HitType.EVENT, mapOf("reason" to "class change"))
-                                                dialog.show()
-                                            }
-                                        }
-                                    }
-                                    sectionHolder.switchClassButton?.visibility = View.VISIBLE
-                                    sectionHolder.switchClassLabel?.text = context.getString(R.string.change_class_to_x, getTranslatedClassName(context.resources, selectedGearCategory))
-                                    sectionHolder.switchClassDescription?.text = context.getString(R.string.unlock_gear_and_skills, getTranslatedClassName(context.resources, selectedGearCategory))
-                                    sectionHolder.switchClassCurrency?.value = 3.0
-                                } else {
-                                    sectionHolder.switchClassButton?.visibility = View.GONE
-                                }
-                            } else {
-                                sectionHolder.switchClassButton?.visibility = View.GONE
-                            }
-                        }
-                    } else {
-                        sectionHolder.spinnerAdapter = null
-                        sectionHolder.notesView?.visibility = View.GONE
-                    }
-                }
-                is ShopItem -> {
-                    val itemHolder = holder as? ShopItemViewHolder ?: return
-                    val numberOwned = ownedItems[obj.key + "-" + obj.purchaseType]?.numberOwned ?: 0
-                    itemHolder.bind(obj, obj.canAfford(user, 1), numberOwned)
-                    itemHolder.isPinned = pinnedItemKeys.contains(obj.key)
-                    itemHolder.isCompleted = completedQuests.contains(obj.key)
-                }
-                is String -> (holder as? EmptyStateViewHolder)?.text = obj
-                is Pair<*, *> -> (holder as? ArmoireGearViewHolder)?.bind(obj.first as? String ?: "", obj.second as? Int ?: 0)
-            }
-        }
-    }
-
-    @Suppress("ReturnCount")
-    private fun getItem(position: Int): Any? {
-        if (items.size == 0) {
-            return null
-        }
-        if (position == 0) {
-            return items[0]
-        }
-        if (position <= getGearItemCount()) {
-            val selectedGearCategory = getSelectedShopCategory()
-            return when {
-                position == 1 -> {
-                    selectedGearCategory?.text = context?.getString(R.string.class_equipment) ?: ""
-                    selectedGearCategory
-                }
-                (selectedGearCategory?.items?.size ?: 0) <= position - 2 -> return Pair(
-                    context?.resources?.let { getTranslatedClassName(it, selectedGearCategory?.identifier) } ?: selectedGearCategory?.identifier,
-                    armoireCount
-                )
-                else -> selectedGearCategory?.items?.get(position - 2)
-            }
-        } else {
-            val itemPosition = position - getGearItemCount()
-            if (itemPosition > items.size - 1) {
-                return null
-            }
-            return items[itemPosition]
-        }
-    }
-
-    override fun getItemViewType(position: Int): Int = when (getItem(position)) {
-        is Shop -> 0
-        is ShopCategory -> 1
-        is Pair<*, *> -> 3
-        is ShopItem -> 4
-        else -> 2
-    }
-
-    override fun getItemCount(): Int {
-        val size = items.size + getGearItemCount()
-        return if (size == 1) {
-            2
-        } else {
-            size
-        }
-    }
-
-    private fun getGearItemCount(): Int {
-        return if (selectedGearCategory == "") {
-            0
-        } else {
-            val selectedCategory: ShopCategory? = getSelectedShopCategory()
-            if (selectedCategory != null) {
-                if (selectedCategory.items.size == 0) {
-                    2
-                } else {
-                    selectedCategory.items.size + 1
-                }
-            } else {
-                0
-            }
-        }
-    }
-
-    private fun getSelectedShopCategory() =
-        gearCategories.firstOrNull { selectedGearCategory == it.identifier }
-
-    fun setOwnedItems(ownedItems: Map<String, OwnedItem>) {
-        this.ownedItems = ownedItems
-        if (items.size > 0) {
-            this.notifyDataSetChanged()
-        }
-    }
-
-    fun setPinnedItemKeys(pinnedItemKeys: List<String>) {
-        this.pinnedItemKeys = pinnedItemKeys
-        if (items.size > 0) {
-            this.notifyDataSetChanged()
-        }
-    }
-
-    internal class ShopHeaderViewHolder(parent: ViewGroup) : ViewHolder(parent.inflate(R.layout.shop_header)) {
-        private val binding = ShopHeaderBinding.bind(itemView)
-
-        init {
-            binding.descriptionView.movementMethod = LinkMovementMethod.getInstance()
-        }
-
-        fun bind(shop: Shop, shopSpriteSuffix: String?) {
-            binding.npcBannerView.shopSpriteSuffix = shopSpriteSuffix
-            binding.npcBannerView.identifier = shop.identifier
-
-            binding.descriptionView.text = shop.notes.fromHtml()
-            binding.namePlate.setText(shop.npcNameResource)
-        }
-    }
-
-    class EmptyStateViewHolder(view: View) : ViewHolder(view) {
-        private val subscribeButton: Button? = itemView.findViewById(R.id.subscribeButton)
-        private val textView: TextView? = itemView.findViewById(R.id.textView)
-
-        init {
-            subscribeButton?.setOnClickListener { MainNavigationController.navigate(R.id.gemPurchaseActivity) }
-        }
-
-        var text: String? = null
-            set(value) {
-                field = value
-                textView?.text = field
-            }
-    }
-
-    class ArmoireGearViewHolder(view: View) : ViewHolder(view) {
-        private val binding = ShopArmoireGearBinding.bind(view)
-
-        init {
-            binding.currencyView.value = 100.0
-            binding.iconView.loadImage("shop_armoire")
-        }
-
-        fun bind(className: String, armoireCount: Int) {
-            binding.titleView.text = itemView.context.getString(R.string.shop_armoire_title, className)
-            if (armoireCount > 0) {
-                binding.descriptionView.text = itemView.context.getString(R.string.shop_armoire_description, armoireCount)
-                binding.footerLayout.visibility = View.VISIBLE
-                binding.iconView.visibility = View.VISIBLE
-            } else {
-                binding.descriptionView.text = itemView.context.getString(R.string.shop_armoire_empty_description)
-                binding.footerLayout.visibility = View.INVISIBLE
-                binding.iconView.visibility = View.GONE
-            }
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.adapter.inventory
+
+import android.content.Context
+import android.text.method.LinkMovementMethod
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView.ViewHolder
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.ShopArmoireGearBinding
+import com.habitrpg.android.habitica.databinding.ShopHeaderBinding
+import com.habitrpg.android.habitica.extensions.inflate
+import com.habitrpg.android.habitica.helpers.Analytics
+import com.habitrpg.android.habitica.helpers.EventCategory
+import com.habitrpg.android.habitica.helpers.HitType
+import com.habitrpg.android.habitica.models.shops.Shop
+import com.habitrpg.android.habitica.models.shops.ShopCategory
+import com.habitrpg.android.habitica.models.shops.ShopItem
+import com.habitrpg.android.habitica.models.user.OwnedItem
+import com.habitrpg.android.habitica.models.user.User
+import com.habitrpg.android.habitica.ui.activities.MainActivity
+import com.habitrpg.android.habitica.ui.viewHolders.SectionViewHolder
+import com.habitrpg.android.habitica.ui.viewHolders.ShopItemViewHolder
+import com.habitrpg.android.habitica.ui.views.getTranslatedClassName
+import com.habitrpg.android.habitica.ui.views.insufficientCurrency.InsufficientGemsDialog
+import com.habitrpg.common.habitica.extensions.fromHtml
+import com.habitrpg.common.habitica.extensions.loadImage
+import com.habitrpg.common.habitica.helpers.MainNavigationController
+
+class ShopRecyclerAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<ViewHolder>() {
+    var completedQuests: List<String?> = emptyList()
+    var armoireCount: Int = 0
+    var onNeedsRefresh: (() -> Unit)? = null
+    var onShowPurchaseDialog: ((ShopItem, Boolean) -> Unit)? = null
+
+    private val items: MutableList<Any> = ArrayList()
+    private var shopIdentifier: String? = null
+    private var ownedItems: Map<String, OwnedItem> = HashMap()
+    var armoireItem: ShopItem? = null
+
+    var changeClassEvents: ((String) -> Unit)? = null
+
+    var shopSpriteSuffix: String? = null
+        set(value) {
+            field = value
+            if (items.size > 0) {
+                notifyItemChanged(0)
+            }
+        }
+    var context: Context? = null
+    var mainActivity: MainActivity? = null
+    var user: User? = null
+        set(value) {
+            field = value
+            if (items.size > 0) {
+                this.notifyDataSetChanged()
+            }
+        }
+    private var pinnedItemKeys: List<String> = ArrayList()
+
+    var gearCategories: MutableList<ShopCategory> = ArrayList()
+        set(value) {
+            field = value
+            notifyDataSetChanged()
+        }
+
+    internal var selectedGearCategory: String = ""
+        set(value) {
+            field = value
+            if (field != "" && items.size > 0) {
+                notifyDataSetChanged()
+            }
+        }
+
+    private val emptyViewResource: Int
+        get() =
+            when (this.shopIdentifier) {
+                Shop.SEASONAL_SHOP -> R.layout.empty_view_seasonal_shop
+                Shop.TIME_TRAVELERS_SHOP -> R.layout.empty_view_timetravelers
+                else -> R.layout.simple_textview
+            }
+
+    fun setShop(shop: Shop?) {
+        if (shop == null) {
+            return
+        }
+        shopIdentifier = shop.identifier
+        items.clear()
+        items.add(shop)
+        for (category in shop.categories) {
+            if (category.items.size > 0) {
+                items.add(category)
+                for (item in category.items) {
+                    item.categoryIdentifier = category.identifier
+                    items.add(item)
+                }
+            }
+        }
+        notifyDataSetChanged()
+    }
+
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int,
+    ): ViewHolder =
+        when (viewType) {
+            0 -> ShopHeaderViewHolder(parent)
+            1 -> SectionViewHolder(parent.inflate(R.layout.shop_section_header))
+            2 -> EmptyStateViewHolder(parent.inflate(emptyViewResource))
+            3 -> {
+                val viewHolder = ArmoireGearViewHolder(parent.inflate(R.layout.shop_armoire_gear))
+                viewHolder.itemView.setOnClickListener {
+                    armoireItem?.let { it1 -> onShowPurchaseDialog?.invoke(it1, true) }
+                }
+                viewHolder
+            }
+
+            else -> {
+                val view = parent.inflate(R.layout.row_shopitem)
+                val viewHolder = ShopItemViewHolder(view)
+                viewHolder.shopIdentifier = shopIdentifier
+                viewHolder.onNeedsRefresh = onNeedsRefresh
+                viewHolder.onShowPurchaseDialog = onShowPurchaseDialog
+                viewHolder
+            }
+        }
+
+    @Suppress("ReturnCount")
+    override fun onBindViewHolder(
+        holder: ViewHolder,
+        position: Int,
+    ) {
+        val obj = getItem(position)
+        if (obj != null) {
+            when (obj) {
+                is Shop -> (holder as? ShopHeaderViewHolder)?.bind(obj, shopSpriteSuffix)
+                is ShopCategory -> {
+                    val sectionHolder = holder as? SectionViewHolder ?: return
+                    sectionHolder.bind(obj.text)
+                    if (gearCategories.contains(obj)) {
+                        context?.let { context ->
+                            val adapter =
+                                HabiticaClassArrayAdapter(
+                                    context,
+                                    R.layout.class_spinner_dropdown_item,
+                                    gearCategories.map { it.identifier },
+                                )
+                            sectionHolder.spinnerAdapter = adapter
+                            sectionHolder.selectedItem = gearCategories.indexOf(obj)
+                            sectionHolder.spinnerSelectionChanged = {
+                                if (selectedGearCategory != gearCategories[holder.selectedItem].identifier) {
+                                    selectedGearCategory =
+                                        gearCategories[holder.selectedItem].identifier
+                                }
+                            }
+                            if (user?.stats?.habitClass != obj.identifier && obj.identifier != "none") {
+                                if (user?.hasClass == true) {
+                                    sectionHolder.switchClassButton?.setOnClickListener {
+                                        if ((user?.gemCount ?: 0) >= 3) {
+                                            changeClassEvents?.invoke(selectedGearCategory)
+                                        } else {
+                                            mainActivity?.let { activity ->
+                                                val dialog = InsufficientGemsDialog(activity, 3)
+                                                Analytics.sendEvent(
+                                                    "show insufficient gems modal",
+                                                    EventCategory.BEHAVIOUR,
+                                                    HitType.EVENT,
+                                                    mapOf("reason" to "class change"),
+                                                )
+                                                dialog.show()
+                                            }
+                                        }
+                                    }
+                                    sectionHolder.switchClassButton?.visibility = View.VISIBLE
+                                    sectionHolder.switchClassLabel?.text =
+                                        context.getString(
+                                            R.string.change_class_to_x,
+                                            getTranslatedClassName(
+                                                context.resources,
+                                                selectedGearCategory,
+                                            ),
+                                        )
+                                    sectionHolder.switchClassDescription?.text =
+                                        context.getString(
+                                            R.string.unlock_gear_and_skills,
+                                            getTranslatedClassName(
+                                                context.resources,
+                                                selectedGearCategory,
+                                            ),
+                                        )
+                                    sectionHolder.switchClassCurrency?.value = 3.0
+                                } else {
+                                    sectionHolder.switchClassButton?.visibility = View.GONE
+                                }
+                            } else {
+                                sectionHolder.switchClassButton?.visibility = View.GONE
+                            }
+                        }
+                    } else {
+                        sectionHolder.spinnerAdapter = null
+                        sectionHolder.notesView?.visibility = View.GONE
+                    }
+                }
+
+                is ShopItem -> {
+                    val itemHolder = holder as? ShopItemViewHolder ?: return
+                    val numberOwned = ownedItems[obj.key + "-" + obj.purchaseType]?.numberOwned ?: 0
+                    itemHolder.bind(obj, obj.canAfford(user, 1), numberOwned)
+                    itemHolder.isPinned = pinnedItemKeys.contains(obj.key)
+                    itemHolder.isCompleted = completedQuests.contains(obj.key)
+                }
+
+                is String -> (holder as? EmptyStateViewHolder)?.text = obj
+                is Pair<*, *> ->
+                    (holder as? ArmoireGearViewHolder)?.bind(
+                        obj.first as? String ?: "",
+                        obj.second as? Int ?: 0,
+                    )
+            }
+        }
+    }
+
+    @Suppress("ReturnCount")
+    private fun getItem(position: Int): Any? {
+        if (items.size == 0) {
+            return null
+        }
+        if (position == 0) {
+            return items[0]
+        }
+        if (position <= getGearItemCount()) {
+            val selectedGearCategory = getSelectedShopCategory()
+            return when {
+                position == 1 -> {
+                    selectedGearCategory?.text = context?.getString(R.string.class_equipment) ?: ""
+                    selectedGearCategory
+                }
+
+                (selectedGearCategory?.items?.size ?: 0) <= position - 2 -> return Pair(
+                    context?.resources?.let {
+                        getTranslatedClassName(
+                            it,
+                            selectedGearCategory?.identifier,
+                        )
+                    } ?: selectedGearCategory?.identifier,
+                    armoireCount,
+                )
+
+                else -> selectedGearCategory?.items?.get(position - 2)
+            }
+        } else {
+            val itemPosition = position - getGearItemCount()
+            if (itemPosition > items.size - 1) {
+                return null
+            }
+            return items[itemPosition]
+        }
+    }
+
+    override fun getItemViewType(position: Int): Int =
+        when (getItem(position)) {
+            is Shop -> 0
+            is ShopCategory -> 1
+            is Pair<*, *> -> 3
+            is ShopItem -> 4
+            else -> 2
+        }
+
+    override fun getItemCount(): Int {
+        val size = items.size + getGearItemCount()
+        return if (size == 1) {
+            2
+        } else {
+            size
+        }
+    }
+
+    private fun getGearItemCount(): Int {
+        return if (selectedGearCategory == "") {
+            0
+        } else {
+            val selectedCategory: ShopCategory? = getSelectedShopCategory()
+            if (selectedCategory != null) {
+                if (selectedCategory.items.size == 0) {
+                    2
+                } else {
+                    selectedCategory.items.size + 1
+                }
+            } else {
+                0
+            }
+        }
+    }
+
+    private fun getSelectedShopCategory() =
+        gearCategories.firstOrNull { selectedGearCategory == it.identifier }
+
+    fun setOwnedItems(ownedItems: Map<String, OwnedItem>) {
+        this.ownedItems = ownedItems
+        if (items.size > 0) {
+            this.notifyDataSetChanged()
+        }
+    }
+
+    fun setPinnedItemKeys(pinnedItemKeys: List<String>) {
+        this.pinnedItemKeys = pinnedItemKeys
+        if (items.size > 0) {
+            this.notifyDataSetChanged()
+        }
+    }
+
+    internal class ShopHeaderViewHolder(parent: ViewGroup) :
+        ViewHolder(parent.inflate(R.layout.shop_header)) {
+        private val binding = ShopHeaderBinding.bind(itemView)
+
+        init {
+            binding.descriptionView.movementMethod = LinkMovementMethod.getInstance()
+        }
+
+        fun bind(
+            shop: Shop,
+            shopSpriteSuffix: String?,
+        ) {
+            binding.npcBannerView.shopSpriteSuffix = shopSpriteSuffix
+            binding.npcBannerView.identifier = shop.identifier
+
+            binding.descriptionView.text = shop.notes.fromHtml()
+            binding.namePlate.setText(shop.npcNameResource)
+        }
+    }
+
+    class EmptyStateViewHolder(view: View) : ViewHolder(view) {
+        private val subscribeButton: Button? = itemView.findViewById(R.id.subscribeButton)
+        private val textView: TextView? = itemView.findViewById(R.id.textView)
+
+        init {
+            subscribeButton?.setOnClickListener { MainNavigationController.navigate(R.id.gemPurchaseActivity) }
+        }
+
+        var text: String? = null
+            set(value) {
+                field = value
+                textView?.text = field
+            }
+    }
+
+    class ArmoireGearViewHolder(view: View) : ViewHolder(view) {
+        private val binding = ShopArmoireGearBinding.bind(view)
+
+        init {
+            binding.currencyView.value = 100.0
+            binding.iconView.loadImage("shop_armoire")
+        }
+
+        fun bind(
+            className: String,
+            armoireCount: Int,
+        ) {
+            binding.titleView.text =
+                itemView.context.getString(R.string.shop_armoire_title, className)
+            if (armoireCount > 0) {
+                binding.descriptionView.text =
+                    itemView.context.getString(R.string.shop_armoire_description, armoireCount)
+                binding.footerLayout.visibility = View.VISIBLE
+                binding.iconView.visibility = View.VISIBLE
+            } else {
+                binding.descriptionView.text =
+                    itemView.context.getString(R.string.shop_armoire_empty_description)
+                binding.footerLayout.visibility = View.INVISIBLE
+                binding.iconView.visibility = View.GONE
+            }
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.kt
index aa5452b96..941207881 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.kt
@@ -1,280 +1,330 @@
-package com.habitrpg.android.habitica.ui.adapter.inventory
-
-import android.view.View
-import android.view.ViewGroup
-import android.widget.TextView
-import androidx.core.content.ContextCompat
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.databinding.ShopHeaderBinding
-import com.habitrpg.android.habitica.extensions.inflate
-import com.habitrpg.common.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.models.inventory.Animal
-import com.habitrpg.android.habitica.models.inventory.Egg
-import com.habitrpg.android.habitica.models.inventory.Food
-import com.habitrpg.android.habitica.models.inventory.HatchingPotion
-import com.habitrpg.android.habitica.models.inventory.Mount
-import com.habitrpg.android.habitica.models.inventory.Pet
-import com.habitrpg.android.habitica.models.inventory.StableSection
-import com.habitrpg.android.habitica.models.user.OwnedItem
-import com.habitrpg.android.habitica.models.user.OwnedMount
-import com.habitrpg.android.habitica.models.user.OwnedPet
-import com.habitrpg.android.habitica.ui.fragments.inventory.stable.StableFragmentDirections
-import com.habitrpg.android.habitica.ui.viewHolders.MountViewHolder
-import com.habitrpg.android.habitica.ui.viewHolders.PetViewHolder
-import com.habitrpg.android.habitica.ui.viewHolders.SectionViewHolder
-import com.habitrpg.common.habitica.extensions.loadImage
-import com.habitrpg.common.habitica.views.PixelArtView
-import com.habitrpg.shared.habitica.models.responses.FeedResponse
-
-class StableRecyclerAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
-
-    var shopSpriteSuffix: String? = null
-    private var eggs: Map<String, Egg> = mapOf()
-    var animalIngredientsRetriever: ((Animal, ((Pair<Egg?, HatchingPotion?>) -> Unit)) -> Unit)? = null
-    var onFeed: (suspend (Pet, Food?) -> FeedResponse?)? = null
-    var itemType: String? = null
-    var currentPet: String? = null
-        set(value) {
-            field = value
-            notifyDataSetChanged()
-        }
-    var currentMount: String? = null
-        set(value) {
-            field = value
-            notifyDataSetChanged()
-        }
-    var onEquip: ((String) -> Unit)? = null
-    private var existingMounts: List<Mount>? = null
-    private var ownedPets: Map<String, OwnedPet>? = null
-    private var ownedMounts: Map<String, OwnedMount>? = null
-    private var ownedItems: Map<String, OwnedItem>? = null
-    private var ownsSaddles: Boolean = false
-    private var itemList: List<Any> = ArrayList()
-
-    private fun canRaiseToMount(pet: Pet): Boolean {
-        if (pet.type == "special") return false
-        for (mount in existingMounts ?: emptyList()) {
-            if (mount.key == pet.key) {
-                return !(ownedMounts?.get(mount.key)?.owned ?: false)
-            }
-        }
-        return false
-    }
-
-    private fun eggCount(pet: Pet): Int {
-        return ownedItems?.get(pet.animal + "-eggs")?.numberOwned ?: 0
-    }
-
-    private fun potionCount(pet: Pet): Int {
-        return ownedItems?.get(pet.color + "-hatchingPotions")?.numberOwned ?: 0
-    }
-
-    fun setOwnedPets(ownedPets: Map<String, OwnedPet>) {
-        this.ownedPets = ownedPets
-        notifyDataSetChanged()
-    }
-
-    fun setOwnedMounts(ownedMounts: Map<String, OwnedMount>) {
-        this.ownedMounts = ownedMounts
-        notifyDataSetChanged()
-    }
-
-    fun setOwnedItems(ownedItems: Map<String, OwnedItem>) {
-        this.ownedItems = ownedItems
-        ownsSaddles = if (ownedItems.containsKey("Saddle-food")) (ownedItems["Saddle-food"]?.numberOwned ?: 0) > 0 else false
-        notifyDataSetChanged()
-    }
-
-    fun setExistingMounts(existingMounts: List<Mount>) {
-        this.existingMounts = existingMounts
-        notifyDataSetChanged()
-    }
-
-    fun setItemList(itemList: List<Any>) {
-        this.itemList = itemList
-        notifyDataSetChanged()
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder =
-        when (viewType) {
-            1 -> SectionViewHolder(parent)
-            4 -> StableViewHolder(parent.inflate(R.layout.pet_overview_item))
-            5 -> StableViewHolder(parent.inflate(R.layout.mount_overview_item))
-            2 -> PetViewHolder(parent, onEquip, onFeed, animalIngredientsRetriever)
-            22 -> PetDetailRecyclerAdapter.CanHatchViewHolder(parent, animalIngredientsRetriever)
-            3 -> MountViewHolder(parent, onEquip)
-            else -> StableHeaderViewHolder(parent)
-        }
-
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        when (val item = this.itemList[position]) {
-            "header" -> (holder as? StableHeaderViewHolder)?.bind()
-            is StableSection -> {
-                if (item.key == "drop") {
-                    val params = holder.itemView.layoutParams as GridLayoutManager.LayoutParams
-                    params.topMargin = -50
-                    holder.itemView.layoutParams = params
-                }
-                (holder as? SectionViewHolder)?.bind(item)
-            }
-            is Animal -> {
-                val isIndividualAnimal = item.type == "special" || item.type == "wacky"
-                if (isIndividualAnimal) {
-                    if (item is Pet) {
-                        val trained = ownedPets?.get(item.key ?: "")?.trained ?: 0
-                        val eggCount = eggCount(item)
-                        val potionCount = potionCount(item)
-                        if (trained <= 0 && eggCount > 0 && potionCount > 0) {
-                            (holder as? PetDetailRecyclerAdapter.CanHatchViewHolder)?.bind(
-                                item,
-                                eggCount,
-                                potionCount,
-                                ownedItems?.get(item.animal + "-eggs") != null,
-                                ownedItems?.get(item.color + "-hatchingPotions") != null,
-                                ownedMounts?.containsKey(item.key) == true
-                            )
-                        } else {
-                            (holder as? PetViewHolder)?.bind(
-                                item,
-                                trained,
-                                eggCount,
-                                potionCount,
-                                canRaiseToMount(item),
-                                ownsSaddles,
-                                ownedItems?.get(item.animal + "-eggs") != null,
-                                ownedItems?.get(item.color + "-hatchingPotions") != null,
-                                ownedMounts?.containsKey(item.key) == true,
-                                currentPet
-                            )
-                        }
-                    } else if (item is Mount) {
-                        (holder as? MountViewHolder)?.bind(item, item.numberOwned > 0, currentMount)
-                    }
-                    return
-                }
-                (holder as? StableViewHolder)?.bind(item)
-            }
-        }
-    }
-
-    override fun getItemViewType(position: Int): Int {
-        if (itemList.size <= position) { return 0 }
-        val item = itemList[position]
-        return if (item == "header") {
-            0
-        } else if (item is StableSection) {
-            1
-        } else if (item is Animal) {
-            val isIndividualAnimal = item.type == "special" || item.type == "wacky"
-            if (isIndividualAnimal) {
-                if (item is Pet) {
-                    if ((
-                        ownedPets?.get(item.key ?: "")?.trained
-                            ?: 0
-                        ) <= 0 && eggCount(item) > 0 && potionCount(item) > 0
-                    ) {
-                        22
-                    } else {
-                        2
-                    }
-                } else {
-                    3
-                }
-            } else {
-                if (item is Pet) {
-                    4
-                } else {
-                    5
-                }
-            }
-        } else {
-            0
-        }
-    }
-
-    override fun getItemCount(): Int = itemList.size
-
-    fun setEggs(eggs: Map<String, Egg>) {
-        this.eggs = eggs
-        notifyDataSetChanged()
-    }
-
-    internal inner class StableHeaderViewHolder(parent: ViewGroup) : RecyclerView.ViewHolder(parent.inflate(R.layout.shop_header)) {
-        private var binding: ShopHeaderBinding = ShopHeaderBinding.bind(itemView)
-
-        init {
-            binding.root.setBackgroundColor(ContextCompat.getColor(itemView.context, R.color.window_background))
-        }
-
-        fun bind() {
-            binding.npcBannerView.shopSpriteSuffix = shopSpriteSuffix ?: ""
-            binding.npcBannerView.identifier = "stable"
-            binding.namePlate.setText(R.string.stable_owner)
-            binding.descriptionView.visibility = View.GONE
-        }
-    }
-
-    internal inner class StableViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), View.OnClickListener {
-        private var animal: Animal? = null
-
-        private val imageView: PixelArtView = itemView.findViewById(R.id.imageView)
-        private val titleView: TextView = itemView.findViewById(R.id.titleTextView)
-        private val ownedTextView: TextView = itemView.findViewById(R.id.ownedTextView)
-
-        init {
-            itemView.setOnClickListener(this)
-        }
-
-        fun bind(item: Animal) {
-            this.animal = item
-            val context = itemView.context
-            val egg = eggs[item.animal]
-            titleView.text = if (egg != null) {
-                if (item.type == "drop" || itemType == "mounts") egg.mountText else egg.text
-            } else {
-                item.animal
-            }
-            ownedTextView.visibility = View.VISIBLE
-
-            val imageName = if (itemType == "pets") {
-                "Pet_Egg_" + item.animal
-            } else {
-                "Mount_Icon_" + item.animal + "-Base"
-            }
-
-            this.ownedTextView.text = context.getString(R.string.pet_ownership_fraction, item.numberOwned, item.totalNumber)
-            this.ownedTextView.background = ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_shopitem_price)
-
-            this.ownedTextView.setTextColor(ContextCompat.getColor(context, R.color.text_ternary))
-
-            ownedTextView.visibility = View.VISIBLE
-            imageView.loadImage(imageName)
-
-            val alpha = if (item.numberOwned <= 0 && (ownedItems?.containsKey(item.animal + "-eggs") != true || itemType == "mounts")) 0.2f else 1.0f
-            this.imageView.alpha = alpha
-            this.titleView.alpha = alpha
-            this.ownedTextView.alpha = alpha
-
-            if (item.numberOwned == item.totalNumber) {
-                this.ownedTextView.background = ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_animalitem_complete)
-                this.ownedTextView.setTextColor(ContextCompat.getColor(context, R.color.white))
-            }
-
-            itemView.contentDescription = "${titleView.text} ${ownedTextView.text}"
-        }
-
-        override fun onClick(v: View) {
-            val animal = this.animal
-            if (animal != null) {
-                val color = if (animal.type == "special") animal.color else null
-                if (itemType == "pets") {
-                    MainNavigationController.navigate(StableFragmentDirections.openPetDetail(animal.animal, animal.type ?: "", color))
-                } else {
-                    MainNavigationController.navigate(StableFragmentDirections.openMountDetail(animal.animal, animal.type ?: "", color))
-                }
-            }
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.adapter.inventory
+
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.ShopHeaderBinding
+import com.habitrpg.android.habitica.extensions.inflate
+import com.habitrpg.android.habitica.models.inventory.Animal
+import com.habitrpg.android.habitica.models.inventory.Egg
+import com.habitrpg.android.habitica.models.inventory.Food
+import com.habitrpg.android.habitica.models.inventory.HatchingPotion
+import com.habitrpg.android.habitica.models.inventory.Mount
+import com.habitrpg.android.habitica.models.inventory.Pet
+import com.habitrpg.android.habitica.models.inventory.StableSection
+import com.habitrpg.android.habitica.models.user.OwnedItem
+import com.habitrpg.android.habitica.models.user.OwnedMount
+import com.habitrpg.android.habitica.models.user.OwnedPet
+import com.habitrpg.android.habitica.ui.fragments.inventory.stable.StableFragmentDirections
+import com.habitrpg.android.habitica.ui.viewHolders.MountViewHolder
+import com.habitrpg.android.habitica.ui.viewHolders.PetViewHolder
+import com.habitrpg.android.habitica.ui.viewHolders.SectionViewHolder
+import com.habitrpg.common.habitica.extensions.loadImage
+import com.habitrpg.common.habitica.helpers.MainNavigationController
+import com.habitrpg.common.habitica.views.PixelArtView
+import com.habitrpg.shared.habitica.models.responses.FeedResponse
+
+class StableRecyclerAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+    var shopSpriteSuffix: String? = null
+    private var eggs: Map<String, Egg> = mapOf()
+    var animalIngredientsRetriever: ((Animal, ((Pair<Egg?, HatchingPotion?>) -> Unit)) -> Unit)? =
+        null
+    var onFeed: (suspend (Pet, Food?) -> FeedResponse?)? = null
+    var itemType: String? = null
+    var currentPet: String? = null
+        set(value) {
+            field = value
+            notifyDataSetChanged()
+        }
+    var currentMount: String? = null
+        set(value) {
+            field = value
+            notifyDataSetChanged()
+        }
+    var onEquip: ((String) -> Unit)? = null
+    private var existingMounts: List<Mount>? = null
+    private var ownedPets: Map<String, OwnedPet>? = null
+    private var ownedMounts: Map<String, OwnedMount>? = null
+    private var ownedItems: Map<String, OwnedItem>? = null
+    private var ownsSaddles: Boolean = false
+    private var itemList: List<Any> = ArrayList()
+
+    private fun canRaiseToMount(pet: Pet): Boolean {
+        if (pet.type == "special") return false
+        for (mount in existingMounts ?: emptyList()) {
+            if (mount.key == pet.key) {
+                return !(ownedMounts?.get(mount.key)?.owned ?: false)
+            }
+        }
+        return false
+    }
+
+    private fun eggCount(pet: Pet): Int {
+        return ownedItems?.get(pet.animal + "-eggs")?.numberOwned ?: 0
+    }
+
+    private fun potionCount(pet: Pet): Int {
+        return ownedItems?.get(pet.color + "-hatchingPotions")?.numberOwned ?: 0
+    }
+
+    fun setOwnedPets(ownedPets: Map<String, OwnedPet>) {
+        this.ownedPets = ownedPets
+        notifyDataSetChanged()
+    }
+
+    fun setOwnedMounts(ownedMounts: Map<String, OwnedMount>) {
+        this.ownedMounts = ownedMounts
+        notifyDataSetChanged()
+    }
+
+    fun setOwnedItems(ownedItems: Map<String, OwnedItem>) {
+        this.ownedItems = ownedItems
+        ownsSaddles =
+            if (ownedItems.containsKey("Saddle-food")) {
+                (
+                    ownedItems["Saddle-food"]?.numberOwned
+                        ?: 0
+                ) > 0
+            } else {
+                false
+            }
+        notifyDataSetChanged()
+    }
+
+    fun setExistingMounts(existingMounts: List<Mount>) {
+        this.existingMounts = existingMounts
+        notifyDataSetChanged()
+    }
+
+    fun setItemList(itemList: List<Any>) {
+        this.itemList = itemList
+        notifyDataSetChanged()
+    }
+
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int,
+    ): RecyclerView.ViewHolder =
+        when (viewType) {
+            1 -> SectionViewHolder(parent)
+            4 -> StableViewHolder(parent.inflate(R.layout.pet_overview_item))
+            5 -> StableViewHolder(parent.inflate(R.layout.mount_overview_item))
+            2 -> PetViewHolder(parent, onEquip, onFeed, animalIngredientsRetriever)
+            22 -> PetDetailRecyclerAdapter.CanHatchViewHolder(parent, animalIngredientsRetriever)
+            3 -> MountViewHolder(parent, onEquip)
+            else -> StableHeaderViewHolder(parent)
+        }
+
+    override fun onBindViewHolder(
+        holder: RecyclerView.ViewHolder,
+        position: Int,
+    ) {
+        when (val item = this.itemList[position]) {
+            "header" -> (holder as? StableHeaderViewHolder)?.bind()
+            is StableSection -> {
+                if (item.key == "drop") {
+                    val params = holder.itemView.layoutParams as GridLayoutManager.LayoutParams
+                    params.topMargin = -50
+                    holder.itemView.layoutParams = params
+                }
+                (holder as? SectionViewHolder)?.bind(item)
+            }
+
+            is Animal -> {
+                val isIndividualAnimal = item.type == "special" || item.type == "wacky"
+                if (isIndividualAnimal) {
+                    if (item is Pet) {
+                        val trained = ownedPets?.get(item.key)?.trained ?: 0
+                        val eggCount = eggCount(item)
+                        val potionCount = potionCount(item)
+                        if (trained <= 0 && eggCount > 0 && potionCount > 0) {
+                            (holder as? PetDetailRecyclerAdapter.CanHatchViewHolder)?.bind(
+                                item,
+                                eggCount,
+                                potionCount,
+                                ownedItems?.get(item.animal + "-eggs") != null,
+                                ownedItems?.get(item.color + "-hatchingPotions") != null,
+                                ownedMounts?.containsKey(item.key) == true,
+                            )
+                        } else {
+                            (holder as? PetViewHolder)?.bind(
+                                item,
+                                trained,
+                                eggCount,
+                                potionCount,
+                                canRaiseToMount(item),
+                                ownsSaddles,
+                                ownedItems?.get(item.animal + "-eggs") != null,
+                                ownedItems?.get(item.color + "-hatchingPotions") != null,
+                                ownedMounts?.containsKey(item.key) == true,
+                                currentPet,
+                            )
+                        }
+                    } else if (item is Mount) {
+                        (holder as? MountViewHolder)?.bind(item, item.numberOwned > 0, currentMount)
+                    }
+                    return
+                }
+                (holder as? StableViewHolder)?.bind(item)
+            }
+        }
+    }
+
+    override fun getItemViewType(position: Int): Int {
+        if (itemList.size <= position) {
+            return 0
+        }
+        val item = itemList[position]
+        return if (item == "header") {
+            0
+        } else if (item is StableSection) {
+            1
+        } else if (item is Animal) {
+            val isIndividualAnimal = item.type == "special" || item.type == "wacky"
+            if (isIndividualAnimal) {
+                if (item is Pet) {
+                    if ((
+                            ownedPets?.get(item.key)?.trained
+                                ?: 0
+                        ) <= 0 && eggCount(item) > 0 && potionCount(item) > 0
+                    ) {
+                        22
+                    } else {
+                        2
+                    }
+                } else {
+                    3
+                }
+            } else {
+                if (item is Pet) {
+                    4
+                } else {
+                    5
+                }
+            }
+        } else {
+            0
+        }
+    }
+
+    override fun getItemCount(): Int = itemList.size
+
+    fun setEggs(eggs: Map<String, Egg>) {
+        this.eggs = eggs
+        notifyDataSetChanged()
+    }
+
+    internal inner class StableHeaderViewHolder(parent: ViewGroup) :
+        RecyclerView.ViewHolder(parent.inflate(R.layout.shop_header)) {
+        private var binding: ShopHeaderBinding = ShopHeaderBinding.bind(itemView)
+
+        init {
+            binding.root.setBackgroundColor(
+                ContextCompat.getColor(
+                    itemView.context,
+                    R.color.window_background,
+                ),
+            )
+        }
+
+        fun bind() {
+            binding.npcBannerView.shopSpriteSuffix = shopSpriteSuffix ?: ""
+            binding.npcBannerView.identifier = "stable"
+            binding.namePlate.setText(R.string.stable_owner)
+            binding.descriptionView.visibility = View.GONE
+        }
+    }
+
+    internal inner class StableViewHolder(itemView: View) :
+        RecyclerView.ViewHolder(itemView),
+        View.OnClickListener {
+        private var animal: Animal? = null
+
+        private val imageView: PixelArtView = itemView.findViewById(R.id.imageView)
+        private val titleView: TextView = itemView.findViewById(R.id.titleTextView)
+        private val ownedTextView: TextView = itemView.findViewById(R.id.ownedTextView)
+
+        init {
+            itemView.setOnClickListener(this)
+        }
+
+        fun bind(item: Animal) {
+            this.animal = item
+            val context = itemView.context
+            val egg = eggs[item.animal]
+            titleView.text =
+                if (egg != null) {
+                    if (item.type == "drop" || itemType == "mounts") egg.mountText else egg.text
+                } else {
+                    item.animal
+                }
+            ownedTextView.visibility = View.VISIBLE
+
+            val imageName =
+                if (itemType == "pets") {
+                    "Pet_Egg_" + item.animal
+                } else {
+                    "Mount_Icon_" + item.animal + "-Base"
+                }
+
+            this.ownedTextView.text =
+                context.getString(
+                    R.string.pet_ownership_fraction,
+                    item.numberOwned,
+                    item.totalNumber,
+                )
+            this.ownedTextView.background =
+                ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_shopitem_price)
+
+            this.ownedTextView.setTextColor(ContextCompat.getColor(context, R.color.text_ternary))
+
+            ownedTextView.visibility = View.VISIBLE
+            imageView.loadImage(imageName)
+
+            val alpha =
+                if (item.numberOwned <= 0 && (ownedItems?.containsKey(item.animal + "-eggs") != true || itemType == "mounts")) 0.2f else 1.0f
+            this.imageView.alpha = alpha
+            this.titleView.alpha = alpha
+            this.ownedTextView.alpha = alpha
+
+            if (item.numberOwned == item.totalNumber) {
+                this.ownedTextView.background =
+                    ContextCompat.getDrawable(
+                        context,
+                        R.drawable.layout_rounded_bg_animalitem_complete,
+                    )
+                this.ownedTextView.setTextColor(ContextCompat.getColor(context, R.color.white))
+            }
+
+            itemView.contentDescription = "${titleView.text} ${ownedTextView.text}"
+        }
+
+        override fun onClick(v: View) {
+            val animal = this.animal
+            if (animal != null) {
+                val color = if (animal.type == "special") animal.color else null
+                if (itemType == "pets") {
+                    MainNavigationController.navigate(
+                        StableFragmentDirections.openPetDetail(
+                            animal.animal,
+                            animal.type ?: "",
+                            color,
+                        ),
+                    )
+                } else {
+                    MainNavigationController.navigate(
+                        StableFragmentDirections.openMountDetail(
+                            animal.animal,
+                            animal.type ?: "",
+                            color,
+                        ),
+                    )
+                }
+            }
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/CustomizationSetupAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/CustomizationSetupAdapter.kt
index 5779d5efe..08f316987 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/CustomizationSetupAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/CustomizationSetupAdapter.kt
@@ -1,129 +1,177 @@
-package com.habitrpg.android.habitica.ui.adapter.setup
-
-import android.graphics.PorterDuff
-import android.view.View
-import android.view.ViewGroup
-import androidx.core.content.ContextCompat
-import androidx.recyclerview.widget.RecyclerView
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.data.SetupCustomizationRepository
-import com.habitrpg.android.habitica.databinding.SetupCustomizationItemBinding
-import com.habitrpg.android.habitica.extensions.inflate
-import com.habitrpg.common.habitica.extensions.setTintWith
-import com.habitrpg.android.habitica.models.SetupCustomization
-import com.habitrpg.android.habitica.models.user.User
-
-internal class CustomizationSetupAdapter : RecyclerView.Adapter<CustomizationSetupAdapter.CustomizationViewHolder>() {
-
-    var userSize: String? = null
-    var user: User? = null
-    private var customizationList: List<SetupCustomization> = emptyList()
-
-    var onEquipGear: ((String) -> Unit)? = null
-    var onUpdateUser: ((Map<String, Any>) -> Unit)? = null
-
-    fun setCustomizationList(newCustomizationList: List<SetupCustomization>) {
-        this.customizationList = newCustomizationList
-        this.notifyDataSetChanged()
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CustomizationViewHolder {
-        return CustomizationViewHolder(parent.inflate(R.layout.setup_customization_item))
-    }
-
-    override fun onBindViewHolder(holder: CustomizationViewHolder, position: Int) {
-        holder.bind(customizationList[position])
-    }
-
-    override fun getItemCount(): Int {
-        return customizationList.size
-    }
-
-    private fun isCustomizationActive(customization: SetupCustomization): Boolean {
-        val prefs = this.user?.preferences ?: return false
-        return when (customization.category) {
-            SetupCustomizationRepository.CATEGORY_BODY -> {
-                when (customization.subcategory) {
-                    SetupCustomizationRepository.SUBCATEGORY_SIZE -> customization.key == prefs.size
-                    SetupCustomizationRepository.SUBCATEGORY_SHIRT -> customization.key == prefs.shirt
-                    else -> false
-                }
-            }
-            SetupCustomizationRepository.CATEGORY_SKIN -> customization.key == prefs.skin
-            SetupCustomizationRepository.CATEGORY_HAIR -> {
-                when (customization.subcategory) {
-                    SetupCustomizationRepository.SUBCATEGORY_BANGS -> Integer.parseInt(customization.key) == prefs.hair?.bangs
-                    SetupCustomizationRepository.SUBCATEGORY_PONYTAIL -> Integer.parseInt(customization.key) == prefs.hair?.base
-                    SetupCustomizationRepository.SUBCATEGORY_COLOR -> customization.key == prefs.hair?.color
-                    SetupCustomizationRepository.SUBCATEGORY_FLOWER -> Integer.parseInt(customization.key) == prefs.hair?.flower
-                    else -> false
-                }
-            }
-            SetupCustomizationRepository.CATEGORY_EXTRAS -> {
-                when (customization.subcategory) {
-                    SetupCustomizationRepository.SUBCATEGORY_GLASSES -> customization.key == this.user?.items?.gear?.equipped?.eyeWear || "eyewear_base_0" == this.user?.items?.gear?.equipped?.eyeWear && customization.key.isEmpty()
-                    SetupCustomizationRepository.SUBCATEGORY_FLOWER -> Integer.parseInt(customization.key) == prefs.hair?.flower
-                    SetupCustomizationRepository.SUBCATEGORY_WHEELCHAIR -> "chair_" + customization.key == prefs.chair || customization.key == prefs.chair || customization.key == "none" && prefs.chair == null
-                    else -> false
-                }
-            }
-            else -> false
-        }
-    }
-
-    internal inner class CustomizationViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), View.OnClickListener {
-        private val binding = SetupCustomizationItemBinding.bind(itemView)
-
-        var customization: SetupCustomization? = null
-
-        init {
-            itemView.setOnClickListener(this)
-        }
-
-        fun bind(customization: SetupCustomization) {
-            this.customization = customization
-
-            when {
-                customization.drawableId != null -> binding.imageView.setImageResource(customization.drawableId ?: 0)
-                customization.colorId != null -> {
-                    val drawable = ContextCompat.getDrawable(itemView.context, R.drawable.setup_customization_circle)
-                    drawable?.setTintWith(ContextCompat.getColor(itemView.context, customization.colorId ?: 0), PorterDuff.Mode.MULTIPLY)
-                    binding.imageView.setImageDrawable(drawable)
-                }
-                else -> binding.imageView.setImageDrawable(null)
-            }
-            binding.textView.text = customization.text
-            if ("0" != customization.key && "flower" == customization.subcategory) {
-                if (isCustomizationActive(customization)) {
-                    binding.imageView.setBackgroundResource(R.drawable.setup_customization_flower_bg_selected)
-                } else {
-                    binding.imageView.setBackgroundResource(R.drawable.setup_customization_flower_bg)
-                }
-            } else {
-                if (isCustomizationActive(customization)) {
-                    binding.imageView.setBackgroundResource(R.drawable.setup_customization_bg_selected)
-                    binding.textView.setTextColor(ContextCompat.getColor(itemView.context, R.color.white))
-                } else {
-                    binding.imageView.setBackgroundResource(R.drawable.setup_customization_bg)
-                    binding.textView.setTextColor(ContextCompat.getColor(itemView.context, R.color.white_50_alpha))
-                }
-            }
-        }
-
-        override fun onClick(v: View) {
-            customization?.let { selectedCustomization ->
-                if (selectedCustomization.path == "glasses") {
-                    val key = selectedCustomization.key.ifEmpty {
-                        user?.items?.gear?.equipped?.eyeWear
-                    }
-                    key?.let { onEquipGear?.invoke(it) }
-                } else {
-                    val updateData = HashMap<String, Any>()
-                    val updatePath = "preferences." + selectedCustomization.path
-                    updateData[updatePath] = selectedCustomization.key
-                    onUpdateUser?.invoke(updateData)
-                }
-            }
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.adapter.setup
+
+import android.graphics.PorterDuff
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.RecyclerView
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.data.SetupCustomizationRepository
+import com.habitrpg.android.habitica.databinding.SetupCustomizationItemBinding
+import com.habitrpg.android.habitica.extensions.inflate
+import com.habitrpg.android.habitica.models.SetupCustomization
+import com.habitrpg.android.habitica.models.user.User
+import com.habitrpg.common.habitica.extensions.setTintWith
+
+internal class CustomizationSetupAdapter :
+    RecyclerView.Adapter<CustomizationSetupAdapter.CustomizationViewHolder>() {
+    var userSize: String? = null
+    var user: User? = null
+    private var customizationList: List<SetupCustomization> = emptyList()
+
+    var onEquipGear: ((String) -> Unit)? = null
+    var onUpdateUser: ((Map<String, Any>) -> Unit)? = null
+
+    fun setCustomizationList(newCustomizationList: List<SetupCustomization>) {
+        this.customizationList = newCustomizationList
+        this.notifyDataSetChanged()
+    }
+
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int,
+    ): CustomizationViewHolder {
+        return CustomizationViewHolder(parent.inflate(R.layout.setup_customization_item))
+    }
+
+    override fun onBindViewHolder(
+        holder: CustomizationViewHolder,
+        position: Int,
+    ) {
+        holder.bind(customizationList[position])
+    }
+
+    override fun getItemCount(): Int {
+        return customizationList.size
+    }
+
+    private fun isCustomizationActive(customization: SetupCustomization): Boolean {
+        val prefs = this.user?.preferences ?: return false
+        return when (customization.category) {
+            SetupCustomizationRepository.CATEGORY_BODY -> {
+                when (customization.subcategory) {
+                    SetupCustomizationRepository.SUBCATEGORY_SIZE -> customization.key == prefs.size
+                    SetupCustomizationRepository.SUBCATEGORY_SHIRT -> customization.key == prefs.shirt
+                    else -> false
+                }
+            }
+
+            SetupCustomizationRepository.CATEGORY_SKIN -> customization.key == prefs.skin
+            SetupCustomizationRepository.CATEGORY_HAIR -> {
+                when (customization.subcategory) {
+                    SetupCustomizationRepository.SUBCATEGORY_BANGS -> Integer.parseInt(customization.key) == prefs.hair?.bangs
+                    SetupCustomizationRepository.SUBCATEGORY_PONYTAIL ->
+                        Integer.parseInt(
+                            customization.key,
+                        ) == prefs.hair?.base
+
+                    SetupCustomizationRepository.SUBCATEGORY_COLOR -> customization.key == prefs.hair?.color
+                    SetupCustomizationRepository.SUBCATEGORY_FLOWER ->
+                        Integer.parseInt(
+                            customization.key,
+                        ) == prefs.hair?.flower
+
+                    else -> false
+                }
+            }
+
+            SetupCustomizationRepository.CATEGORY_EXTRAS -> {
+                when (customization.subcategory) {
+                    SetupCustomizationRepository.SUBCATEGORY_GLASSES -> customization.key == this.user?.items?.gear?.equipped?.eyeWear || "eyewear_base_0" == this.user?.items?.gear?.equipped?.eyeWear && customization.key.isEmpty()
+                    SetupCustomizationRepository.SUBCATEGORY_FLOWER ->
+                        Integer.parseInt(
+                            customization.key,
+                        ) == prefs.hair?.flower
+
+                    SetupCustomizationRepository.SUBCATEGORY_WHEELCHAIR -> "chair_" + customization.key == prefs.chair || customization.key == prefs.chair || customization.key == "none" && prefs.chair == null
+                    else -> false
+                }
+            }
+
+            else -> false
+        }
+    }
+
+    internal inner class CustomizationViewHolder(itemView: View) :
+        RecyclerView.ViewHolder(itemView), View.OnClickListener {
+        private val binding = SetupCustomizationItemBinding.bind(itemView)
+
+        var customization: SetupCustomization? = null
+
+        init {
+            itemView.setOnClickListener(this)
+        }
+
+        fun bind(customization: SetupCustomization) {
+            this.customization = customization
+
+            when {
+                customization.drawableId != null ->
+                    binding.imageView.setImageResource(
+                        customization.drawableId ?: 0,
+                    )
+
+                customization.colorId != null -> {
+                    val drawable =
+                        ContextCompat.getDrawable(
+                            itemView.context,
+                            R.drawable.setup_customization_circle,
+                        )
+                    drawable?.setTintWith(
+                        ContextCompat.getColor(
+                            itemView.context,
+                            customization.colorId ?: 0,
+                        ),
+                        PorterDuff.Mode.MULTIPLY,
+                    )
+                    binding.imageView.setImageDrawable(drawable)
+                }
+
+                else -> binding.imageView.setImageDrawable(null)
+            }
+            binding.textView.text = customization.text
+            if ("0" != customization.key && "flower" == customization.subcategory) {
+                if (isCustomizationActive(customization)) {
+                    binding.imageView.setBackgroundResource(R.drawable.setup_customization_flower_bg_selected)
+                } else {
+                    binding.imageView.setBackgroundResource(R.drawable.setup_customization_flower_bg)
+                }
+            } else {
+                if (isCustomizationActive(customization)) {
+                    binding.imageView.setBackgroundResource(R.drawable.setup_customization_bg_selected)
+                    binding.textView.setTextColor(
+                        ContextCompat.getColor(
+                            itemView.context,
+                            R.color.white,
+                        ),
+                    )
+                } else {
+                    binding.imageView.setBackgroundResource(R.drawable.setup_customization_bg)
+                    binding.textView.setTextColor(
+                        ContextCompat.getColor(
+                            itemView.context,
+                            R.color.white_50_alpha,
+                        ),
+                    )
+                }
+            }
+        }
+
+        override fun onClick(v: View) {
+            customization?.let { selectedCustomization ->
+                if (selectedCustomization.path == "glasses") {
+                    val key =
+                        selectedCustomization.key.ifEmpty {
+                            user?.items?.gear?.equipped?.eyeWear
+                        }
+                    key?.let { onEquipGear?.invoke(it) }
+                } else {
+                    val updateData = HashMap<String, Any>()
+                    val updatePath = "preferences." + selectedCustomization.path
+                    updateData[updatePath] = selectedCustomization.key
+                    onUpdateUser?.invoke(updateData)
+                }
+            }
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/TaskSetupAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/TaskSetupAdapter.kt
index 25e770fc5..ce207cd12 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/TaskSetupAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/TaskSetupAdapter.kt
@@ -1,82 +1,101 @@
-package com.habitrpg.android.habitica.ui.adapter.setup
-
-import android.content.Context
-import android.graphics.PorterDuff
-import android.graphics.drawable.Drawable
-import android.view.View
-import android.view.ViewGroup
-import android.widget.TextView
-import androidx.core.content.ContextCompat
-import androidx.recyclerview.widget.RecyclerView
-import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.extensions.inflate
-import com.habitrpg.common.habitica.extensions.setTintWith
-
-class TaskSetupAdapter : RecyclerView.Adapter<TaskSetupAdapter.TaskViewHolder>() {
-
-    var checkedList: MutableList<Boolean> = mutableListOf()
-    private var taskList: List<List<String>> = emptyList()
-
-    fun setTaskList(taskList: List<List<String>>) {
-        this.taskList = taskList
-        this.checkedList = ArrayList()
-        for (ignored in this.taskList) {
-            this.checkedList.add(false)
-        }
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): TaskViewHolder {
-        return TaskViewHolder(parent.inflate(R.layout.task_setup_item))
-    }
-
-    override fun onBindViewHolder(holder: TaskViewHolder, position: Int) {
-        holder.bind(this.taskList[position], this.checkedList[position])
-    }
-
-    override fun getItemCount(): Int {
-        return this.taskList.size
-    }
-
-    inner class TaskViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), View.OnClickListener {
-
-        private val icon: Drawable?
-        private val textView: TextView = itemView.findViewById(R.id.textView)
-
-        private var taskGroup: List<String>? = null
-        private var isChecked: Boolean? = null
-
-        var context: Context = itemView.context
-
-        init {
-            itemView.setOnClickListener(this)
-
-            icon = VectorDrawableCompat.create(context.resources, R.drawable.ic_check_white_18dp, null)
-            icon?.setTintWith(ContextCompat.getColor(context, R.color.brand_100), PorterDuff.Mode.MULTIPLY)
-        }
-
-        fun bind(taskGroup: List<String>, isChecked: Boolean?) {
-            this.taskGroup = taskGroup
-            this.isChecked = isChecked
-
-            taskGroup.let {
-                textView.text = it[0]
-            }
-            if (this.isChecked == true) {
-                this.textView.setCompoundDrawablesWithIntrinsicBounds(icon, null, null, null)
-                textView.background.setTintWith(ContextCompat.getColor(context, R.color.white), PorterDuff.Mode.MULTIPLY)
-                textView.setTextColor(ContextCompat.getColor(context, R.color.brand_100))
-            } else {
-                this.textView.setCompoundDrawablesWithIntrinsicBounds(null, null, null, null)
-                textView.background.setTintWith(ContextCompat.getColor(context, R.color.brand_100), PorterDuff.Mode.MULTIPLY)
-                textView.setTextColor(ContextCompat.getColor(context, R.color.white))
-            }
-        }
-
-        override fun onClick(v: View) {
-            val position = this.bindingAdapterPosition
-            checkedList[position] = !checkedList[position]
-            notifyItemChanged(position)
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.adapter.setup
+
+import android.content.Context
+import android.graphics.PorterDuff
+import android.graphics.drawable.Drawable
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.RecyclerView
+import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.extensions.inflate
+import com.habitrpg.common.habitica.extensions.setTintWith
+
+class TaskSetupAdapter : RecyclerView.Adapter<TaskSetupAdapter.TaskViewHolder>() {
+    var checkedList: MutableList<Boolean> = mutableListOf()
+    private var taskList: List<List<String>> = emptyList()
+
+    fun setTaskList(taskList: List<List<String>>) {
+        this.taskList = taskList
+        this.checkedList = ArrayList()
+        for (ignored in this.taskList) {
+            this.checkedList.add(false)
+        }
+    }
+
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int,
+    ): TaskViewHolder {
+        return TaskViewHolder(parent.inflate(R.layout.task_setup_item))
+    }
+
+    override fun onBindViewHolder(
+        holder: TaskViewHolder,
+        position: Int,
+    ) {
+        holder.bind(this.taskList[position], this.checkedList[position])
+    }
+
+    override fun getItemCount(): Int {
+        return this.taskList.size
+    }
+
+    inner class TaskViewHolder(itemView: View) :
+        RecyclerView.ViewHolder(itemView),
+        View.OnClickListener {
+        private val icon: Drawable?
+        private val textView: TextView = itemView.findViewById(R.id.textView)
+
+        private var taskGroup: List<String>? = null
+        private var isChecked: Boolean? = null
+
+        var context: Context = itemView.context
+
+        init {
+            itemView.setOnClickListener(this)
+
+            icon =
+                VectorDrawableCompat.create(context.resources, R.drawable.ic_check_white_18dp, null)
+            icon?.setTintWith(
+                ContextCompat.getColor(context, R.color.brand_100),
+                PorterDuff.Mode.MULTIPLY,
+            )
+        }
+
+        fun bind(
+            taskGroup: List<String>,
+            isChecked: Boolean?,
+        ) {
+            this.taskGroup = taskGroup
+            this.isChecked = isChecked
+
+            taskGroup.let {
+                textView.text = it[0]
+            }
+            if (this.isChecked == true) {
+                this.textView.setCompoundDrawablesWithIntrinsicBounds(icon, null, null, null)
+                textView.background.setTintWith(
+                    ContextCompat.getColor(context, R.color.white),
+                    PorterDuff.Mode.MULTIPLY,
+                )
+                textView.setTextColor(ContextCompat.getColor(context, R.color.brand_100))
+            } else {
+                this.textView.setCompoundDrawablesWithIntrinsicBounds(null, null, null, null)
+                textView.background.setTintWith(
+                    ContextCompat.getColor(context, R.color.brand_100),
+                    PorterDuff.Mode.MULTIPLY,
+                )
+                textView.setTextColor(ContextCompat.getColor(context, R.color.white))
+            }
+        }
+
+        override fun onClick(v: View) {
+            val position = this.bindingAdapterPosition
+            checkedList[position] = !checkedList[position]
+            notifyItemChanged(position)
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/AchievementProfileAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/AchievementProfileAdapter.kt
index 882a91107..7c2bc9882 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/AchievementProfileAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/AchievementProfileAdapter.kt
@@ -1,85 +1,92 @@
-package com.habitrpg.android.habitica.ui.adapter.social
-
-import android.view.View
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.databinding.ProfileAchievementItemBinding
-import com.habitrpg.android.habitica.extensions.inflate
-import com.habitrpg.android.habitica.models.Achievement
-import com.habitrpg.android.habitica.ui.activities.MainActivity
-import com.habitrpg.android.habitica.ui.viewHolders.SectionViewHolder
-import com.habitrpg.android.habitica.ui.views.dialogs.AchievementDetailDialog
-import com.habitrpg.common.habitica.extensions.loadImage
-
-class AchievementProfileAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
-
-    var itemType: String? = null
-    var activity: MainActivity? = null
-    private var itemList: List<Any> = emptyList()
-
-    fun setItemList(itemList: List<Any>) {
-        this.itemList = itemList
-        this.notifyDataSetChanged()
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        return if (viewType == 0) {
-            SectionViewHolder(parent.inflate(R.layout.profile_achievement_category))
-        } else {
-            AchievementViewHolder(parent.inflate(R.layout.profile_achievement_item))
-        }
-    }
-
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        val obj = this.itemList[position]
-        if (obj.javaClass == String::class.java) {
-            (holder as? SectionViewHolder)?.bind(obj as String)
-        } else {
-            (holder as? AchievementViewHolder)?.bind(itemList[position] as Achievement)
-        }
-    }
-
-    override fun getItemViewType(position: Int): Int {
-        if (itemList.size <= position) return 0
-        return if (this.itemList[position].javaClass == String::class.java) {
-            0
-        } else {
-            1
-        }
-    }
-
-    override fun getItemCount(): Int {
-        return itemList.size
-    }
-
-    internal class AchievementViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), View.OnClickListener {
-        private val binding = ProfileAchievementItemBinding.bind(itemView)
-        private var achievement: Achievement? = null
-
-        init {
-            itemView.isClickable = true
-            itemView.setOnClickListener(this)
-        }
-
-        fun bind(item: Achievement) {
-            binding.achievementDrawee.loadImage((if (!item.earned) "achievement-unearned" else item.icon) + "2x")
-
-            this.achievement = item
-            binding.achievementText.text = item.title
-
-            if (item.optionalCount == null || item.optionalCount == 0) {
-                binding.achievementCountLabel.visibility = View.GONE
-            } else {
-                binding.achievementCountLabel.visibility = View.VISIBLE
-                binding.achievementCountLabel.text = item.optionalCount.toString()
-            }
-        }
-
-        override fun onClick(view: View) {
-            achievement?.let {
-                AchievementDetailDialog(it, itemView.context).show()
-            }
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.adapter.social
+
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.ProfileAchievementItemBinding
+import com.habitrpg.android.habitica.extensions.inflate
+import com.habitrpg.android.habitica.models.Achievement
+import com.habitrpg.android.habitica.ui.activities.MainActivity
+import com.habitrpg.android.habitica.ui.viewHolders.SectionViewHolder
+import com.habitrpg.android.habitica.ui.views.dialogs.AchievementDetailDialog
+import com.habitrpg.common.habitica.extensions.loadImage
+
+class AchievementProfileAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+    var itemType: String? = null
+    var activity: MainActivity? = null
+    private var itemList: List<Any> = emptyList()
+
+    fun setItemList(itemList: List<Any>) {
+        this.itemList = itemList
+        this.notifyDataSetChanged()
+    }
+
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int,
+    ): RecyclerView.ViewHolder {
+        return if (viewType == 0) {
+            SectionViewHolder(parent.inflate(R.layout.profile_achievement_category))
+        } else {
+            AchievementViewHolder(parent.inflate(R.layout.profile_achievement_item))
+        }
+    }
+
+    override fun onBindViewHolder(
+        holder: RecyclerView.ViewHolder,
+        position: Int,
+    ) {
+        val obj = this.itemList[position]
+        if (obj.javaClass == String::class.java) {
+            (holder as? SectionViewHolder)?.bind(obj as String)
+        } else {
+            (holder as? AchievementViewHolder)?.bind(itemList[position] as Achievement)
+        }
+    }
+
+    override fun getItemViewType(position: Int): Int {
+        if (itemList.size <= position) return 0
+        return if (this.itemList[position].javaClass == String::class.java) {
+            0
+        } else {
+            1
+        }
+    }
+
+    override fun getItemCount(): Int {
+        return itemList.size
+    }
+
+    internal class AchievementViewHolder(itemView: View) :
+        RecyclerView.ViewHolder(itemView),
+        View.OnClickListener {
+        private val binding = ProfileAchievementItemBinding.bind(itemView)
+        private var achievement: Achievement? = null
+
+        init {
+            itemView.isClickable = true
+            itemView.setOnClickListener(this)
+        }
+
+        fun bind(item: Achievement) {
+            binding.achievementDrawee.loadImage((if (!item.earned) "achievement-unearned" else item.icon) + "2x")
+
+            this.achievement = item
+            binding.achievementText.text = item.title
+
+            if (item.optionalCount == null || item.optionalCount == 0) {
+                binding.achievementCountLabel.visibility = View.GONE
+            } else {
+                binding.achievementCountLabel.visibility = View.VISIBLE
+                binding.achievementCountLabel.text = item.optionalCount.toString()
+            }
+        }
+
+        override fun onClick(view: View) {
+            achievement?.let {
+                AchievementDetailDialog(it, itemView.context).show()
+            }
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.kt
index a4f526aac..3fe4cd85f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.kt
@@ -16,20 +16,29 @@ import io.realm.OrderedRealmCollection
 
 class ChallengesListViewAdapter(
     private val viewUserChallengesOnly: Boolean,
-    private val userId: String
+    private val userId: String,
 ) : BaseRecyclerViewAdapter<Challenge, ChallengesListViewAdapter.ChallengeViewHolder>() {
     private var unfilteredData: List<Challenge>? = null
     private var challengeMemberships: List<ChallengeMembership>? = null
 
     var onOpenChallengeFragment: ((String) -> Unit)? = null
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ChallengeViewHolder {
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int,
+    ): ChallengeViewHolder {
         return ChallengeViewHolder(parent.inflate(R.layout.challenge_item), viewUserChallengesOnly)
     }
 
-    override fun onBindViewHolder(holder: ChallengeViewHolder, position: Int) {
+    override fun onBindViewHolder(
+        holder: ChallengeViewHolder,
+        position: Int,
+    ) {
         data[position].let { challenge ->
-            holder.bind(challenge, challengeMemberships?.first { challenge.id == it.challengeID } != null)
+            holder.bind(
+                challenge,
+                challengeMemberships?.first { challenge.id == it.challengeID } != null,
+            )
             holder.itemView.setOnClickListener {
                 if (challenge.isManaged && challenge.isValid) {
                     challenge.id?.let {
@@ -61,11 +70,12 @@ class ChallengesListViewAdapter(
         }
 
         if (filterOptions.showOwned != filterOptions.notOwned) {
-            query = if (filterOptions.showOwned) {
-                query?.equalTo("leaderId", userId)
-            } else {
-                query?.notEqualTo("leaderId", userId)
-            }
+            query =
+                if (filterOptions.showOwned) {
+                    query?.equalTo("leaderId", userId)
+                } else {
+                    query?.notEqualTo("leaderId", userId)
+                }
         }
 
         query?.let {
@@ -75,7 +85,7 @@ class ChallengesListViewAdapter(
 
     class ChallengeViewHolder internal constructor(
         itemView: View,
-        private val viewUserChallengesOnly: Boolean
+        private val viewUserChallengesOnly: Boolean,
     ) : RecyclerView.ViewHolder(itemView) {
         private val binding = ChallengeItemBinding.bind(itemView)
 
@@ -85,13 +95,17 @@ class ChallengesListViewAdapter(
             binding.gemIcon.setImageBitmap(HabiticaIconsHelper.imageOfGem())
         }
 
-        fun bind(challenge: Challenge, isParticipating: Boolean) {
+        fun bind(
+            challenge: Challenge,
+            isParticipating: Boolean,
+        ) {
             this.challenge = challenge
 
             binding.challengeName.text = EmojiParser.parseEmojis(challenge.name?.trim { it <= ' ' })
             binding.challengeShorttext.text = challenge.summary
 
-            binding.officialChallengeView.visibility = if (challenge.official) View.VISIBLE else View.GONE
+            binding.officialChallengeView.visibility =
+                if (challenge.official) View.VISIBLE else View.GONE
 
             if (viewUserChallengesOnly) {
                 binding.isJoinedLabel.visibility = View.GONE
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.kt
index 37a0e20d1..b8bb54082 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.kt
@@ -1,131 +1,152 @@
-package com.habitrpg.android.habitica.ui.adapter.social
-
-import android.util.Log
-import android.view.View
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.databinding.SystemChatMessageBinding
-import com.habitrpg.android.habitica.extensions.inflate
-import com.habitrpg.android.habitica.models.BaseMainObject
-import com.habitrpg.android.habitica.models.social.ChatMessage
-import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.android.habitica.ui.adapter.BaseRecyclerViewAdapter
-import com.habitrpg.android.habitica.ui.adapter.DiffCallback
-import com.habitrpg.android.habitica.ui.viewHolders.ChatRecyclerMessageViewHolder
-
-class ChatDiffCallback(oldList: List<BaseMainObject>, newList: List<BaseMainObject>) :
-    DiffCallback<ChatMessage>(oldList, newList) {
-    override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
-        return oldList[oldItemPosition].primaryIdentifier == newList[newItemPosition].primaryIdentifier
-    }
-
-    override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
-        val oldItem = oldList[oldItemPosition] as ChatMessage
-        val newItem = newList[newItemPosition] as ChatMessage
-        Log.d("Compare", "${oldItem.id}-${oldItem.likeCount} , ${newItem.id}-${newItem.likeCount}")
-        return oldItem.likeCount == newItem.likeCount && oldItem.id == newItem.id
-    }
-}
-
-class ChatRecyclerViewAdapter(user: User?, private val isTavern: Boolean) : BaseRecyclerViewAdapter<ChatMessage, RecyclerView.ViewHolder>() {
-    internal var user = user
-        set(value) {
-            field = value
-            uuid = user?.id ?: ""
-        }
-    private var uuid: String = ""
-    private var expandedMessageId: String? = null
-
-    var onMessageLike: ((ChatMessage) -> Unit)? = null
-    var onOpenProfile: ((String) -> Unit)? = null
-    var onDeleteMessage: ((ChatMessage) -> Unit)? = null
-    var onFlagMessage: ((ChatMessage) -> Unit)? = null
-    var onReply: ((String) -> Unit)? = null
-    var onCopyMessage: ((ChatMessage) -> Unit)? = null
-
-    override fun getDiffCallback(
-        oldList: List<ChatMessage>,
-        newList: List<ChatMessage>
-    ): DiffCallback<ChatMessage> {
-        return ChatDiffCallback(oldList, newList)
-    }
-
-    init {
-        this.uuid = user?.id ?: ""
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        return if (viewType == 0) {
-            SystemChatMessageViewHolder(parent.inflate(R.layout.system_chat_message))
-        } else {
-            ChatRecyclerMessageViewHolder(parent.inflate(R.layout.chat_item), uuid, isTavern)
-        }
-    }
-
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        if (data[position].isSystemMessage) {
-            val sysChatHolder = holder as? SystemChatMessageViewHolder ?: return
-            val message = data[position]
-            sysChatHolder.bind(
-                message,
-                expandedMessageId == data[position].id
-            )
-            sysChatHolder.onShouldExpand = { expandMessage(message, position) }
-        } else {
-            val chatHolder = holder as? ChatRecyclerMessageViewHolder ?: return
-            val message = data[position]
-            chatHolder.bind(
-                message,
-                uuid,
-                user,
-                expandedMessageId == message.id
-            )
-            chatHolder.onShouldExpand = { expandMessage(message, position) }
-            chatHolder.onLikeMessage = onMessageLike
-            chatHolder.onOpenProfile = onOpenProfile
-            chatHolder.onReply = onReply
-            chatHolder.onCopyMessage = onCopyMessage
-            chatHolder.onFlagMessage = onFlagMessage
-            chatHolder.onDeleteMessage = onDeleteMessage
-        }
-    }
-
-    override fun getItemViewType(position: Int): Int {
-        if (data.size <= position) return 0
-        return if (data[position].isSystemMessage) 0 else 1
-    }
-
-    private fun expandMessage(message: ChatMessage, position: Int?) {
-        expandedMessageId = if (expandedMessageId == message.id) {
-            null
-        } else {
-            message.id
-        }
-        notifyItemChanged(position ?: data.indexOf(message))
-    }
-}
-
-class SystemChatMessageViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-    private val dateTime = java.text.SimpleDateFormat.getDateTimeInstance()
-    val binding = SystemChatMessageBinding.bind(itemView)
-
-    var onShouldExpand: (() -> Unit)? = null
-
-    init {
-        binding.textView.setOnClickListener {
-            onShouldExpand?.invoke()
-        }
-    }
-
-    fun bind(chatMessage: ChatMessage?, isExpanded: Boolean) {
-        binding.textView.text = chatMessage?.text?.removePrefix("`")?.removeSuffix("`")
-        binding.systemMessageTimestamp.text = chatMessage?.timestamp?.let { java.util.Date(it) }
-            ?.let { dateTime.format(it) }
-        if (isExpanded) {
-            binding.systemMessageTimestamp.visibility = View.VISIBLE
-        } else {
-            binding.systemMessageTimestamp.visibility = View.GONE
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.adapter.social
+
+import android.util.Log
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.SystemChatMessageBinding
+import com.habitrpg.android.habitica.extensions.inflate
+import com.habitrpg.android.habitica.models.BaseMainObject
+import com.habitrpg.android.habitica.models.social.ChatMessage
+import com.habitrpg.android.habitica.models.user.User
+import com.habitrpg.android.habitica.ui.adapter.BaseRecyclerViewAdapter
+import com.habitrpg.android.habitica.ui.adapter.DiffCallback
+import com.habitrpg.android.habitica.ui.viewHolders.ChatRecyclerMessageViewHolder
+
+class ChatDiffCallback(oldList: List<BaseMainObject>, newList: List<BaseMainObject>) :
+    DiffCallback<ChatMessage>(oldList, newList) {
+    override fun areItemsTheSame(
+        oldItemPosition: Int,
+        newItemPosition: Int,
+    ): Boolean {
+        return oldList[oldItemPosition].primaryIdentifier == newList[newItemPosition].primaryIdentifier
+    }
+
+    override fun areContentsTheSame(
+        oldItemPosition: Int,
+        newItemPosition: Int,
+    ): Boolean {
+        val oldItem = oldList[oldItemPosition] as ChatMessage
+        val newItem = newList[newItemPosition] as ChatMessage
+        Log.d("Compare", "${oldItem.id}-${oldItem.likeCount} , ${newItem.id}-${newItem.likeCount}")
+        return oldItem.likeCount == newItem.likeCount && oldItem.id == newItem.id
+    }
+}
+
+class ChatRecyclerViewAdapter(user: User?, private val isTavern: Boolean) :
+    BaseRecyclerViewAdapter<ChatMessage, RecyclerView.ViewHolder>() {
+    internal var user = user
+        set(value) {
+            field = value
+            uuid = user?.id ?: ""
+        }
+    private var uuid: String = ""
+    private var expandedMessageId: String? = null
+
+    var onMessageLike: ((ChatMessage) -> Unit)? = null
+    var onOpenProfile: ((String) -> Unit)? = null
+    var onDeleteMessage: ((ChatMessage) -> Unit)? = null
+    var onFlagMessage: ((ChatMessage) -> Unit)? = null
+    var onReply: ((String) -> Unit)? = null
+    var onCopyMessage: ((ChatMessage) -> Unit)? = null
+
+    override fun getDiffCallback(
+        oldList: List<ChatMessage>,
+        newList: List<ChatMessage>,
+    ): DiffCallback<ChatMessage> {
+        return ChatDiffCallback(oldList, newList)
+    }
+
+    init {
+        this.uuid = user?.id ?: ""
+    }
+
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int,
+    ): RecyclerView.ViewHolder {
+        return if (viewType == 0) {
+            SystemChatMessageViewHolder(parent.inflate(R.layout.system_chat_message))
+        } else {
+            ChatRecyclerMessageViewHolder(parent.inflate(R.layout.chat_item), uuid, isTavern)
+        }
+    }
+
+    override fun onBindViewHolder(
+        holder: RecyclerView.ViewHolder,
+        position: Int,
+    ) {
+        if (data[position].isSystemMessage) {
+            val sysChatHolder = holder as? SystemChatMessageViewHolder ?: return
+            val message = data[position]
+            sysChatHolder.bind(
+                message,
+                expandedMessageId == data[position].id,
+            )
+            sysChatHolder.onShouldExpand = { expandMessage(message, position) }
+        } else {
+            val chatHolder = holder as? ChatRecyclerMessageViewHolder ?: return
+            val message = data[position]
+            chatHolder.bind(
+                message,
+                uuid,
+                user,
+                expandedMessageId == message.id,
+            )
+            chatHolder.onShouldExpand = { expandMessage(message, position) }
+            chatHolder.onLikeMessage = onMessageLike
+            chatHolder.onOpenProfile = onOpenProfile
+            chatHolder.onReply = onReply
+            chatHolder.onCopyMessage = onCopyMessage
+            chatHolder.onFlagMessage = onFlagMessage
+            chatHolder.onDeleteMessage = onDeleteMessage
+        }
+    }
+
+    override fun getItemViewType(position: Int): Int {
+        if (data.size <= position) return 0
+        return if (data[position].isSystemMessage) 0 else 1
+    }
+
+    private fun expandMessage(
+        message: ChatMessage,
+        position: Int?,
+    ) {
+        expandedMessageId =
+            if (expandedMessageId == message.id) {
+                null
+            } else {
+                message.id
+            }
+        notifyItemChanged(position ?: data.indexOf(message))
+    }
+}
+
+class SystemChatMessageViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+    private val dateTime = java.text.SimpleDateFormat.getDateTimeInstance()
+    val binding = SystemChatMessageBinding.bind(itemView)
+
+    var onShouldExpand: (() -> Unit)? = null
+
+    init {
+        binding.textView.setOnClickListener {
+            onShouldExpand?.invoke()
+        }
+    }
+
+    fun bind(
+        chatMessage: ChatMessage?,
+        isExpanded: Boolean,
+    ) {
+        binding.textView.text = chatMessage?.text?.removePrefix("`")?.removeSuffix("`")
+        binding.systemMessageTimestamp.text =
+            chatMessage?.timestamp?.let { java.util.Date(it) }
+                ?.let { dateTime.format(it) }
+        if (isExpanded) {
+            binding.systemMessageTimestamp.visibility = View.VISIBLE
+        } else {
+            binding.systemMessageTimestamp.visibility = View.GONE
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/InboxAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/InboxAdapter.kt
index 64d703935..855ec0c6d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/InboxAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/InboxAdapter.kt
@@ -1,7 +1,7 @@
 package com.habitrpg.android.habitica.ui.adapter.social
 
 import android.view.ViewGroup
-import androidx.paging.PagedListAdapter
+import androidx.paging.PagingDataAdapter
 import androidx.recyclerview.widget.DiffUtil
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.extensions.inflate
@@ -12,10 +12,9 @@ import com.habitrpg.android.habitica.ui.viewHolders.ChatRecyclerIntroViewHolder
 import com.habitrpg.android.habitica.ui.viewHolders.ChatRecyclerMessageViewHolder
 import com.habitrpg.android.habitica.ui.viewHolders.ChatRecyclerViewHolder
 
-class InboxAdapter(private var user: User?) : PagedListAdapter<ChatMessage, ChatRecyclerViewHolder>(DIFF_CALLBACK) {
+class InboxAdapter(private var user: User?) :
+    PagingDataAdapter<ChatMessage, ChatRecyclerViewHolder>(DIFF_CALLBACK) {
     internal var replyToUser: Member? = null
-    private val FIRST_MESSAGE = 0
-    private val NORMAL_MESSAGE = 1
 
     private var expandedMessageId: String? = null
     var onOpenProfile: ((String) -> Unit)? = null
@@ -40,15 +39,24 @@ class InboxAdapter(private var user: User?) : PagedListAdapter<ChatMessage, Chat
         return if (isPositionIntroMessage(position)) ChatMessage() else super.getItem(position)
     }
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ChatRecyclerViewHolder {
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int,
+    ): ChatRecyclerViewHolder {
         return if (viewType == FIRST_MESSAGE) {
-            ChatRecyclerIntroViewHolder(parent.inflate(R.layout.tavern_chat_intro_item), replyToUser?.id ?: "")
+            ChatRecyclerIntroViewHolder(
+                parent.inflate(R.layout.tavern_chat_intro_item),
+                replyToUser?.id ?: "",
+            )
         } else {
             ChatRecyclerMessageViewHolder(parent.inflate(R.layout.chat_item), user?.id ?: "", false)
         }
     }
 
-    override fun onBindViewHolder(holder: ChatRecyclerViewHolder, position: Int) {
+    override fun onBindViewHolder(
+        holder: ChatRecyclerViewHolder,
+        position: Int,
+    ) {
         val firstMessage: Boolean = getItemViewType(position) == FIRST_MESSAGE
         if (firstMessage) {
             val introHolder = holder as ChatRecyclerIntroViewHolder
@@ -61,7 +69,7 @@ class InboxAdapter(private var user: User?) : PagedListAdapter<ChatMessage, Chat
                 message,
                 user?.id ?: "",
                 user,
-                expandedMessageId == message.id
+                expandedMessageId == message.id,
             )
             messageHolder.onShouldExpand = { expandMessage(message.id, position) }
             messageHolder.onOpenProfile = onOpenProfile
@@ -72,32 +80,40 @@ class InboxAdapter(private var user: User?) : PagedListAdapter<ChatMessage, Chat
         }
     }
 
-    private fun expandMessage(id: String, position: Int) {
+    private fun expandMessage(
+        id: String,
+        position: Int,
+    ) {
         if (isPositionIntroMessage(position)) {
             return
         }
-        expandedMessageId = if (expandedMessageId == id) {
-            null
-        } else {
-            id
-        }
+        expandedMessageId =
+            if (expandedMessageId == id) {
+                null
+            } else {
+                id
+            }
         notifyItemChanged(position)
     }
 
     companion object {
-        private val DIFF_CALLBACK = object :
-            DiffUtil.ItemCallback<ChatMessage>() {
-            // Concert details may have changed if reloaded from the database,
-            // but ID is fixed.
-            override fun areItemsTheSame(
-                oldConcert: ChatMessage,
-                newConcert: ChatMessage
-            ) = oldConcert.id == newConcert.id
+        private const val FIRST_MESSAGE = 0
+        private const val NORMAL_MESSAGE = 1
 
-            override fun areContentsTheSame(
-                oldConcert: ChatMessage,
-                newConcert: ChatMessage
-            ) = oldConcert.text == newConcert.text
-        }
+        private val DIFF_CALLBACK =
+            object :
+                DiffUtil.ItemCallback<ChatMessage>() {
+                // Concert details may have changed if reloaded from the database,
+                // but ID is fixed.
+                override fun areItemsTheSame(
+                    oldConcert: ChatMessage,
+                    newConcert: ChatMessage,
+                ) = oldConcert.id == newConcert.id
+
+                override fun areContentsTheSame(
+                    oldConcert: ChatMessage,
+                    newConcert: ChatMessage,
+                ) = oldConcert.text == newConcert.text
+            }
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PartyMemberRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PartyMemberRecyclerViewAdapter.kt
index d1dc3267f..388ab195b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PartyMemberRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PartyMemberRecyclerViewAdapter.kt
@@ -1,26 +1,31 @@
-package com.habitrpg.android.habitica.ui.adapter.social
-
-import android.view.ViewGroup
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.extensions.inflate
-import com.habitrpg.android.habitica.models.members.Member
-import com.habitrpg.android.habitica.ui.adapter.BaseRecyclerViewAdapter
-import com.habitrpg.android.habitica.ui.viewHolders.GroupMemberViewHolder
-
-class PartyMemberRecyclerViewAdapter : BaseRecyclerViewAdapter<Member, GroupMemberViewHolder>() {
-
-    var leaderID: String? = null
-
-    var onUserClicked: ((String) -> Unit)? = null
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): GroupMemberViewHolder {
-        return GroupMemberViewHolder(parent.inflate(R.layout.party_member))
-    }
-
-    override fun onBindViewHolder(holder: GroupMemberViewHolder, position: Int) {
-        holder.bind(data[position], leaderID, null)
-        holder.onClickEvent = {
-            onUserClicked?.invoke(data[position].id)
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.adapter.social
+
+import android.view.ViewGroup
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.extensions.inflate
+import com.habitrpg.android.habitica.models.members.Member
+import com.habitrpg.android.habitica.ui.adapter.BaseRecyclerViewAdapter
+import com.habitrpg.android.habitica.ui.viewHolders.GroupMemberViewHolder
+
+class PartyMemberRecyclerViewAdapter : BaseRecyclerViewAdapter<Member, GroupMemberViewHolder>() {
+    var leaderID: String? = null
+
+    var onUserClicked: ((String) -> Unit)? = null
+
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int,
+    ): GroupMemberViewHolder {
+        return GroupMemberViewHolder(parent.inflate(R.layout.party_member))
+    }
+
+    override fun onBindViewHolder(
+        holder: GroupMemberViewHolder,
+        position: Int,
+    ) {
+        holder.bind(data[position], leaderID, null)
+        holder.onClickEvent = {
+            onUserClicked?.invoke(data[position].id)
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengesFilterRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengesFilterRecyclerViewAdapter.kt
index 9eed6e944..e07b288d9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengesFilterRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengesFilterRecyclerViewAdapter.kt
@@ -1,49 +1,59 @@
-package com.habitrpg.android.habitica.ui.adapter.social.challenges
-
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.databinding.DialogChallengeFilterGroupItemBinding
-import com.habitrpg.android.habitica.models.social.Group
-
-class ChallengesFilterRecyclerViewAdapter(entries: List<Group>) : RecyclerView.Adapter<ChallengesFilterRecyclerViewAdapter.ChallengeViewHolder>() {
-
-    private val entries: List<Group>
-    val checkedEntries: MutableList<Group> = mutableListOf()
-
-    init {
-        this.entries = ArrayList(entries)
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ChallengeViewHolder {
-        val view = LayoutInflater.from(parent.context)
-            .inflate(R.layout.dialog_challenge_filter_group_item, parent, false)
-        return ChallengeViewHolder(view)
-    }
-
-    override fun onBindViewHolder(holder: ChallengeViewHolder, position: Int) {
-        holder.bind(entries[position], checkedEntries)
-    }
-
-    override fun getItemCount(): Int {
-        return entries.size
-    }
-
-    class ChallengeViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        private val binding = DialogChallengeFilterGroupItemBinding.bind(itemView)
-
-        fun bind(group: Group, checkedEntries: MutableList<Group>) {
-            binding.root.text = group.name
-            binding.root.isChecked = checkedEntries.contains(group)
-            binding.root.setOnCheckedChangeListener { _, isChecked ->
-                if (isChecked && !checkedEntries.contains(group)) {
-                    checkedEntries.add(group)
-                } else if (!isChecked && checkedEntries.contains(group)) {
-                    checkedEntries.remove(group)
-                }
-            }
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.adapter.social.challenges
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.DialogChallengeFilterGroupItemBinding
+import com.habitrpg.android.habitica.models.social.Group
+
+class ChallengesFilterRecyclerViewAdapter(entries: List<Group>) :
+    RecyclerView.Adapter<ChallengesFilterRecyclerViewAdapter.ChallengeViewHolder>() {
+    private val entries: List<Group>
+    val checkedEntries: MutableList<Group> = mutableListOf()
+
+    init {
+        this.entries = ArrayList(entries)
+    }
+
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int,
+    ): ChallengeViewHolder {
+        val view =
+            LayoutInflater.from(parent.context)
+                .inflate(R.layout.dialog_challenge_filter_group_item, parent, false)
+        return ChallengeViewHolder(view)
+    }
+
+    override fun onBindViewHolder(
+        holder: ChallengeViewHolder,
+        position: Int,
+    ) {
+        holder.bind(entries[position], checkedEntries)
+    }
+
+    override fun getItemCount(): Int {
+        return entries.size
+    }
+
+    class ChallengeViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+        private val binding = DialogChallengeFilterGroupItemBinding.bind(itemView)
+
+        fun bind(
+            group: Group,
+            checkedEntries: MutableList<Group>,
+        ) {
+            binding.root.text = group.name
+            binding.root.isChecked = checkedEntries.contains(group)
+            binding.root.setOnCheckedChangeListener { _, isChecked ->
+                if (isChecked && !checkedEntries.contains(group)) {
+                    checkedEntries.add(group)
+                } else if (!isChecked && checkedEntries.contains(group)) {
+                    checkedEntries.remove(group)
+                }
+            }
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/BaseTasksRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/BaseTasksRecyclerViewAdapter.kt
index a51d3f53b..f1fd2c63a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/BaseTasksRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/BaseTasksRecyclerViewAdapter.kt
@@ -1,82 +1,88 @@
-package com.habitrpg.android.habitica.ui.adapter.tasks
-
-import android.content.Context
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import com.habitrpg.android.habitica.models.tasks.Task
-import com.habitrpg.android.habitica.ui.adapter.BaseRecyclerViewAdapter
-import com.habitrpg.android.habitica.ui.viewHolders.BindableViewHolder
-import com.habitrpg.android.habitica.ui.viewmodels.TasksViewModel
-import com.habitrpg.shared.habitica.models.tasks.TaskType
-
-abstract class BaseTasksRecyclerViewAdapter<VH : BindableViewHolder<Task>>(
-    var taskType: TaskType,
-    private val viewModel: TasksViewModel,
-    private val layoutResource: Int,
-    newContext: Context,
-    private val userID: String?
-) : BaseRecyclerViewAdapter<Task, VH>() {
-    protected var content: MutableList<Task>? = null
-    protected var filteredContent: MutableList<Task>? = null
-    internal var context: Context = newContext.applicationContext
-
-    init {
-        this.filteredContent = ArrayList()
-    }
-
-    override fun onBindViewHolder(holder: VH, position: Int) {
-        val item = filteredContent?.get(position)
-        if (item != null) {
-            holder.bind(item, position, "normal")
-        }
-    }
-
-    override fun getItemId(position: Int): Long {
-        val task = filteredContent?.get(position)
-        return task?.id?.hashCode()?.toLong() ?: 0
-    }
-
-    override fun getItemCount(): Int = filteredContent?.size ?: 0
-
-    internal fun getContentView(parent: ViewGroup): View = getContentView(parent, layoutResource)
-
-    protected fun getContentView(parent: ViewGroup, layoutResource: Int): View =
-        LayoutInflater.from(parent.context).inflate(layoutResource, parent, false)
-
-    private fun updateTask(task: Task) {
-        if (taskType != task.type) {
-            return
-        }
-        var i = 0
-        while (i < (this.content?.size ?: 0)) {
-            if (content?.get(i)?.id == task.id) {
-                break
-            }
-            ++i
-        }
-        if (i < (content?.size ?: 0)) {
-            content?.set(i, task)
-        }
-        filter()
-    }
-
-    fun filter() {
-        if (this.viewModel.filterCount(taskType) == 0) {
-            filteredContent = content
-        } else {
-            filteredContent = ArrayList()
-            content?.let {
-                filteredContent?.addAll(this.viewModel.filter(it))
-            }
-        }
-
-        this.notifyDataSetChanged()
-    }
-
-    fun setTasks(tasks: List<Task>) {
-        this.content = ArrayList()
-        this.content?.addAll(tasks)
-        filter()
-    }
-}
+package com.habitrpg.android.habitica.ui.adapter.tasks
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.habitrpg.android.habitica.models.tasks.Task
+import com.habitrpg.android.habitica.ui.adapter.BaseRecyclerViewAdapter
+import com.habitrpg.android.habitica.ui.viewHolders.BindableViewHolder
+import com.habitrpg.android.habitica.ui.viewmodels.TasksViewModel
+import com.habitrpg.shared.habitica.models.tasks.TaskType
+
+abstract class BaseTasksRecyclerViewAdapter<VH : BindableViewHolder<Task>>(
+    var taskType: TaskType,
+    private val viewModel: TasksViewModel,
+    private val layoutResource: Int,
+    newContext: Context,
+    private val userID: String?,
+) : BaseRecyclerViewAdapter<Task, VH>() {
+    protected var content: MutableList<Task>? = null
+    protected var filteredContent: MutableList<Task>? = null
+    internal var context: Context = newContext.applicationContext
+
+    init {
+        this.filteredContent = ArrayList()
+    }
+
+    override fun onBindViewHolder(
+        holder: VH,
+        position: Int,
+    ) {
+        val item = filteredContent?.get(position)
+        if (item != null) {
+            holder.bind(item, position, "normal")
+        }
+    }
+
+    override fun getItemId(position: Int): Long {
+        val task = filteredContent?.get(position)
+        return task?.id?.hashCode()?.toLong() ?: 0
+    }
+
+    override fun getItemCount(): Int = filteredContent?.size ?: 0
+
+    internal fun getContentView(parent: ViewGroup): View = getContentView(parent, layoutResource)
+
+    protected fun getContentView(
+        parent: ViewGroup,
+        layoutResource: Int,
+    ): View =
+        LayoutInflater.from(parent.context).inflate(layoutResource, parent, false)
+
+    private fun updateTask(task: Task) {
+        if (taskType != task.type) {
+            return
+        }
+        var i = 0
+        while (i < (this.content?.size ?: 0)) {
+            if (content?.get(i)?.id == task.id) {
+                break
+            }
+            ++i
+        }
+        if (i < (content?.size ?: 0)) {
+            content?.set(i, task)
+        }
+        filter()
+    }
+
+    fun filter() {
+        if (this.viewModel.filterCount(taskType) == 0) {
+            filteredContent = content
+        } else {
+            filteredContent = ArrayList()
+            content?.let {
+                filteredContent?.addAll(this.viewModel.filter(it))
+            }
+        }
+
+        this.notifyDataSetChanged()
+    }
+
+    fun setTasks(tasks: List<Task>) {
+        this.content = ArrayList()
+        this.content?.addAll(tasks)
+        filter()
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.kt
index eca730ce2..5d473a4e0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.kt
@@ -1,143 +1,153 @@
-package com.habitrpg.android.habitica.ui.adapter.tasks
-
-import android.graphics.drawable.BitmapDrawable
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ProgressBar
-import android.widget.TextView
-import androidx.recyclerview.widget.RecyclerView
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.databinding.AdventureGuideMenuBannerBinding
-import com.habitrpg.android.habitica.models.tasks.ChecklistItem
-import com.habitrpg.android.habitica.models.tasks.Task
-import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.android.habitica.ui.adapter.BaseRecyclerViewAdapter
-import com.habitrpg.android.habitica.ui.viewHolders.tasks.BaseTaskViewHolder
-import com.habitrpg.android.habitica.ui.viewmodels.TasksViewModel
-import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import com.habitrpg.common.habitica.extensions.dpToPx
-import com.habitrpg.common.habitica.extensions.layoutInflater
-import com.habitrpg.shared.habitica.models.responses.TaskDirection
-import io.realm.OrderedRealmCollection
-
-abstract class RealmBaseTasksRecyclerViewAdapter(
-    private val layoutResource: Int,
-    val viewModel: TasksViewModel
-) : BaseRecyclerViewAdapter<Task, RecyclerView.ViewHolder>(), TaskRecyclerViewAdapter {
-    private var unfilteredData: List<Task>? = null
-    override var showAdventureGuide = false
-        set(value) {
-            if (field == value) return
-            field = value
-            notifyDataSetChanged()
-        }
-    override var user: User? = null
-        set(value) {
-            field = value
-            notifyDataSetChanged()
-        }
-
-    override var taskDisplayMode: String = "standard"
-        set(value) {
-            if (field != value) {
-                field = value
-                notifyDataSetChanged()
-            }
-        }
-
-    override var errorButtonEvents: ((String) -> Unit)? = null
-    override var taskScoreEvents: ((Task, TaskDirection) -> Unit)? = null
-    override var checklistItemScoreEvents: ((Task, ChecklistItem) -> Unit)? = null
-    override var taskOpenEvents: ((Task, View) -> Unit)? = null
-    override var brokenTaskEvents: ((Task) -> Unit)? = null
-    override var adventureGuideOpenEvents: ((Boolean) -> Unit)? = null
-
-    override fun getItemId(index: Int): Long = index.toLong()
-
-    override fun updateUnfilteredData(data: List<Task>?) {
-        unfilteredData = data
-        this.data = data ?: emptyList()
-        filter()
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        val binding = AdventureGuideMenuBannerBinding.inflate(parent.context.layoutInflater, parent, false)
-        return AdventureGuideViewHolder(binding.root)
-    }
-
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        val item = getItem(position)
-        if (item != null && holder is BaseTaskViewHolder) {
-            holder.userID = user?.id
-            holder.isLocked = !viewModel.canScoreTask(item)
-            holder.bind(item, position, taskDisplayMode, viewModel.ownerID.value)
-            holder.errorButtonClicked = {
-                errorButtonEvents?.invoke("")
-            }
-        } else if (holder is AdventureGuideViewHolder) {
-            holder.itemView.setOnClickListener { adventureGuideOpenEvents?.invoke(true) }
-            user?.let { holder.update(it) }
-        }
-    }
-
-    override fun getItemCount(): Int {
-        return data.size + if (showAdventureGuide) 1 else 0
-    }
-
-    override fun getItem(position: Int): Task? {
-        if (showAdventureGuide && position == 0) {
-            return null
-        } else if (showAdventureGuide) {
-            return super.getItem(position - 1)
-        }
-        return super.getItem(position)
-    }
-
-    override fun getItemViewType(position: Int): Int {
-        if (showAdventureGuide && position == 0) return 1
-        return super.getItemViewType(position)
-    }
-
-    internal fun getContentView(parent: ViewGroup): View = getContentView(parent, layoutResource)
-
-    private fun getContentView(parent: ViewGroup, layoutResource: Int): View =
-        LayoutInflater.from(parent.context).inflate(layoutResource, parent, false)
-
-    final override fun filter() {
-        val unfilteredData = this.unfilteredData ?: return
-
-        if (unfilteredData is OrderedRealmCollection) {
-            val query = viewModel.createQuery(unfilteredData)
-            if (query != null) {
-                data = query.findAll()
-            }
-        } else {
-            data = unfilteredData
-        }
-    }
-}
-
-class AdventureGuideViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-
-    private var progressBar: ProgressBar = itemView.findViewById(R.id.progress_bar)
-    private var countView: TextView = itemView.findViewById(R.id.count_view)
-
-    init {
-        itemView.findViewById<TextView>(R.id.gold_textview).setCompoundDrawablesWithIntrinsicBounds(
-            BitmapDrawable(itemView.resources, HabiticaIconsHelper.imageOfGold()),
-            null,
-            null,
-            null
-        )
-        itemView.findViewById<TextView>(R.id.gold_textview).compoundDrawablePadding = 4.dpToPx(itemView.context)
-    }
-
-    fun update(user: User) {
-        val achievements = user.onboardingAchievements
-        val completed = achievements.count { it.earned }
-        progressBar.max = achievements.size
-        progressBar.progress = completed
-        countView.text = "$completed / ${achievements.size}"
-    }
-}
+package com.habitrpg.android.habitica.ui.adapter.tasks
+
+import android.graphics.drawable.BitmapDrawable
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ProgressBar
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.AdventureGuideMenuBannerBinding
+import com.habitrpg.android.habitica.models.tasks.ChecklistItem
+import com.habitrpg.android.habitica.models.tasks.Task
+import com.habitrpg.android.habitica.models.user.User
+import com.habitrpg.android.habitica.ui.adapter.BaseRecyclerViewAdapter
+import com.habitrpg.android.habitica.ui.viewHolders.tasks.BaseTaskViewHolder
+import com.habitrpg.android.habitica.ui.viewmodels.TasksViewModel
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
+import com.habitrpg.common.habitica.extensions.dpToPx
+import com.habitrpg.common.habitica.extensions.layoutInflater
+import com.habitrpg.shared.habitica.models.responses.TaskDirection
+import io.realm.OrderedRealmCollection
+
+abstract class RealmBaseTasksRecyclerViewAdapter(
+    private val layoutResource: Int,
+    val viewModel: TasksViewModel,
+) : BaseRecyclerViewAdapter<Task, RecyclerView.ViewHolder>(), TaskRecyclerViewAdapter {
+    private var unfilteredData: List<Task>? = null
+    override var showAdventureGuide = false
+        set(value) {
+            if (field == value) return
+            field = value
+            notifyDataSetChanged()
+        }
+    override var user: User? = null
+        set(value) {
+            field = value
+            notifyDataSetChanged()
+        }
+
+    override var taskDisplayMode: String = "standard"
+        set(value) {
+            if (field != value) {
+                field = value
+                notifyDataSetChanged()
+            }
+        }
+
+    override var errorButtonEvents: ((String) -> Unit)? = null
+    override var taskScoreEvents: ((Task, TaskDirection) -> Unit)? = null
+    override var checklistItemScoreEvents: ((Task, ChecklistItem) -> Unit)? = null
+    override var taskOpenEvents: ((Task, View) -> Unit)? = null
+    override var brokenTaskEvents: ((Task) -> Unit)? = null
+    override var adventureGuideOpenEvents: ((Boolean) -> Unit)? = null
+
+    override fun getItemId(index: Int): Long = index.toLong()
+
+    override fun updateUnfilteredData(data: List<Task>?) {
+        unfilteredData = data
+        this.data = data ?: emptyList()
+        filter()
+    }
+
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int,
+    ): RecyclerView.ViewHolder {
+        val binding =
+            AdventureGuideMenuBannerBinding.inflate(parent.context.layoutInflater, parent, false)
+        return AdventureGuideViewHolder(binding.root)
+    }
+
+    override fun onBindViewHolder(
+        holder: RecyclerView.ViewHolder,
+        position: Int,
+    ) {
+        val item = getItem(position)
+        if (item != null && holder is BaseTaskViewHolder) {
+            holder.userID = user?.id
+            holder.isLocked = !viewModel.canScoreTask(item)
+            holder.bind(item, position, taskDisplayMode, viewModel.ownerID.value)
+            holder.errorButtonClicked = {
+                errorButtonEvents?.invoke("")
+            }
+        } else if (holder is AdventureGuideViewHolder) {
+            holder.itemView.setOnClickListener { adventureGuideOpenEvents?.invoke(true) }
+            user?.let { holder.update(it) }
+        }
+    }
+
+    override fun getItemCount(): Int {
+        return data.size + if (showAdventureGuide) 1 else 0
+    }
+
+    override fun getItem(position: Int): Task? {
+        if (showAdventureGuide && position == 0) {
+            return null
+        } else if (showAdventureGuide) {
+            return super.getItem(position - 1)
+        }
+        return super.getItem(position)
+    }
+
+    override fun getItemViewType(position: Int): Int {
+        if (showAdventureGuide && position == 0) return 1
+        return super.getItemViewType(position)
+    }
+
+    internal fun getContentView(parent: ViewGroup): View = getContentView(parent, layoutResource)
+
+    private fun getContentView(
+        parent: ViewGroup,
+        layoutResource: Int,
+    ): View =
+        LayoutInflater.from(parent.context).inflate(layoutResource, parent, false)
+
+    final override fun filter() {
+        val unfilteredData = this.unfilteredData ?: return
+
+        if (unfilteredData is OrderedRealmCollection) {
+            val query = viewModel.createQuery(unfilteredData)
+            if (query != null) {
+                data = query.findAll()
+            }
+        } else {
+            data = unfilteredData
+        }
+    }
+}
+
+class AdventureGuideViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+    private var progressBar: ProgressBar = itemView.findViewById(R.id.progress_bar)
+    private var countView: TextView = itemView.findViewById(R.id.count_view)
+
+    init {
+        itemView.findViewById<TextView>(R.id.gold_textview).setCompoundDrawablesWithIntrinsicBounds(
+            BitmapDrawable(itemView.resources, HabiticaIconsHelper.imageOfGold()),
+            null,
+            null,
+            null,
+        )
+        itemView.findViewById<TextView>(R.id.gold_textview).compoundDrawablePadding =
+            4.dpToPx(itemView.context)
+    }
+
+    fun update(user: User) {
+        val achievements = user.onboardingAchievements
+        val completed = achievements.count { it.earned }
+        progressBar.max = achievements.size
+        progressBar.progress = completed
+        countView.text = "$completed / ${achievements.size}"
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/TaskRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/TaskRecyclerViewAdapter.kt
index fd240c504..b59891aef 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/TaskRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/TaskRecyclerViewAdapter.kt
@@ -17,8 +17,13 @@ interface TaskRecyclerViewAdapter {
 
     fun filter()
 
-    fun notifyItemMoved(adapterPosition: Int, adapterPosition1: Int)
+    fun notifyItemMoved(
+        adapterPosition: Int,
+        adapterPosition1: Int,
+    )
+
     fun notifyDataSetChanged()
+
     fun getItemViewType(position: Int): Int
 
     fun updateUnfilteredData(data: List<Task>?)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AboutFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AboutFragment.kt
index c6b04feed..b527a7861 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AboutFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AboutFragment.kt
@@ -14,15 +14,14 @@ import com.google.firebase.analytics.FirebaseAnalytics
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.FragmentAboutBinding
 import com.habitrpg.android.habitica.helpers.AppConfigManager
-import com.habitrpg.common.habitica.helpers.MainNavigationController
 import com.habitrpg.common.habitica.extensions.DataBindingUtils
+import com.habitrpg.common.habitica.helpers.MainNavigationController
 import com.plattysoft.leonids.ParticleSystem
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
 @AndroidEntryPoint
 class AboutFragment : BaseMainFragment<FragmentAboutBinding>() {
-
     @Inject
     lateinit var appConfigManager: AppConfigManager
 
@@ -39,14 +38,17 @@ class AboutFragment : BaseMainFragment<FragmentAboutBinding>() {
         startActivity(intent)
     }
 
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentAboutBinding {
+    override fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+    ): FragmentAboutBinding {
         return FragmentAboutBinding.inflate(layoutInflater, container, false)
     }
 
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View? {
         this.hidesToolbar = true
         return super.onCreateView(inflater, container, savedInstanceState)
@@ -58,15 +60,24 @@ class AboutFragment : BaseMainFragment<FragmentAboutBinding>() {
         binding?.versionInfo?.setOnClickListener {
             versionNumberTappedCount += 1
             when (versionNumberTappedCount) {
-                1 -> context?.let { context ->
-                    Toast.makeText(context, "Oh! You tapped me!", Toast.LENGTH_SHORT).show()
-                }
-                in 5..7 -> context?.let { context ->
-                    Toast.makeText(context, "Only ${8 - versionNumberTappedCount} taps left!", Toast.LENGTH_SHORT).show()
-                }
+                1 ->
+                    context?.let { context ->
+                        Toast.makeText(context, "Oh! You tapped me!", Toast.LENGTH_SHORT).show()
+                    }
+
+                in 5..7 ->
+                    context?.let { context ->
+                        Toast.makeText(
+                            context,
+                            "Only ${8 - versionNumberTappedCount} taps left!",
+                            Toast.LENGTH_SHORT,
+                        ).show()
+                    }
+
                 8 -> {
                     context?.let { context ->
-                        Toast.makeText(context, "You were blessed with cats!", Toast.LENGTH_SHORT).show()
+                        Toast.makeText(context, "You were blessed with cats!", Toast.LENGTH_SHORT)
+                            .show()
                     }
                     doTheThing()
                 }
@@ -77,7 +88,10 @@ class AboutFragment : BaseMainFragment<FragmentAboutBinding>() {
     private val versionName: String by lazy {
         try {
             @Suppress("DEPRECATION")
-            mainActivity?.packageManager?.getPackageInfo(mainActivity?.packageName ?: "", 0)?.versionName ?: ""
+            mainActivity?.packageManager?.getPackageInfo(
+                mainActivity?.packageName ?: "",
+                0,
+            )?.versionName ?: ""
         } catch (e: PackageManager.NameNotFoundException) {
             ""
         }
@@ -86,20 +100,31 @@ class AboutFragment : BaseMainFragment<FragmentAboutBinding>() {
     private val versionCode: Int by lazy {
         try {
             @Suppress("DEPRECATION")
-            mainActivity?.packageManager?.getPackageInfo(mainActivity?.packageName ?: "", 0)?.versionCode ?: 0
+            mainActivity?.packageManager?.getPackageInfo(
+                mainActivity?.packageName ?: "",
+                0,
+            )?.versionCode ?: 0
         } catch (e: PackageManager.NameNotFoundException) {
             0
         }
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
         super.onViewCreated(view, savedInstanceState)
 
         binding?.versionInfo?.text = getString(R.string.version_info, versionName, versionCode)
 
         if (appConfigManager.lastVersionCode() > versionCode) {
             binding?.updateAvailableWrapper?.visibility = View.VISIBLE
-            binding?.updateAvailableTextview?.text = getString(R.string.update_available, appConfigManager.lastVersionNumber(), appConfigManager.lastVersionCode())
+            binding?.updateAvailableTextview?.text =
+                getString(
+                    R.string.update_available,
+                    appConfigManager.lastVersionNumber(),
+                    appConfigManager.lastVersionCode(),
+                )
         } else {
             binding?.updateAvailableWrapper?.visibility = View.GONE
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AchievementsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AchievementsFragment.kt
index 940ebdf20..ffedac6b6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AchievementsFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AchievementsFragment.kt
@@ -27,8 +27,9 @@ import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class AchievementsFragment : BaseMainFragment<FragmentRefreshRecyclerviewBinding>(), SwipeRefreshLayout.OnRefreshListener {
-
+class AchievementsFragment :
+    BaseMainFragment<FragmentRefreshRecyclerviewBinding>(),
+    SwipeRefreshLayout.OnRefreshListener {
     @Inject
     lateinit var inventoryRepository: InventoryRepository
 
@@ -37,7 +38,10 @@ class AchievementsFragment : BaseMainFragment<FragmentRefreshRecyclerviewBinding
 
     override var binding: FragmentRefreshRecyclerviewBinding? = null
 
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentRefreshRecyclerviewBinding {
+    override fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+    ): FragmentRefreshRecyclerviewBinding {
         return FragmentRefreshRecyclerviewBinding.inflate(inflater, container, false)
     }
 
@@ -53,7 +57,7 @@ class AchievementsFragment : BaseMainFragment<FragmentRefreshRecyclerviewBinding
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View? {
         hidesToolbar = true
         adapter = AchievementsAdapter()
@@ -71,78 +75,90 @@ class AchievementsFragment : BaseMainFragment<FragmentRefreshRecyclerviewBinding
         super.onSaveInstanceState(outState)
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
         super.onViewCreated(view, savedInstanceState)
 
         val layoutManager = GridLayoutManager(mainActivity, 2)
         binding?.recyclerView?.layoutManager = layoutManager
         binding?.recyclerView?.adapter = adapter
         adapter.useGridLayout = useGridLayout
-        context?.let { binding?.recyclerView?.background = ColorDrawable(ContextCompat.getColor(it, R.color.content_background)) }
+        context?.let {
+            binding?.recyclerView?.background =
+                ColorDrawable(ContextCompat.getColor(it, R.color.content_background))
+        }
 
-        layoutManager.spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() {
-            override fun getSpanSize(position: Int): Int {
-                return if (adapter.getItemViewType(position) == 1) {
-                    1
-                } else {
-                    2
+        layoutManager.spanSizeLookup =
+            object : GridLayoutManager.SpanSizeLookup() {
+                override fun getSpanSize(position: Int): Int {
+                    return if (adapter.getItemViewType(position) == 1) {
+                        1
+                    } else {
+                        2
+                    }
                 }
             }
-        }
 
         binding?.refreshLayout?.setOnRefreshListener(this)
 
         lifecycleScope.launch(ExceptionHandler.coroutine()) {
-            userRepository.getAchievements().combine(userRepository.getQuestAchievements()) { achievements, questAchievements ->
-                return@combine Pair(achievements, questAchievements)
-            }.combine(
-                userRepository.getQuestAchievements()
-                    .map { it.mapNotNull { achievement -> achievement.questKey } }
-                    .map { inventoryRepository.getQuestContent(it).firstOrNull() }
-            ) { achievements, content ->
-                Pair(achievements, content)
-            }.collect {
-                val achievements = it.first.first
-                val entries = mutableListOf<Any>()
-                var lastCategory = ""
-                achievements.forEach { achievement ->
-                    val categoryIdentifier = achievement.category ?: ""
-                    if (categoryIdentifier != lastCategory) {
-                        val category = Pair(
-                            categoryIdentifier,
-                            achievements.count { check ->
-                                check.category == categoryIdentifier && check.earned
-                            }
-                        )
-                        entries.add(category)
-                        lastCategory = categoryIdentifier
+            userRepository.getAchievements()
+                .combine(userRepository.getQuestAchievements()) { achievements, questAchievements ->
+                    return@combine Pair(achievements, questAchievements)
+                }.combine(
+                    userRepository.getQuestAchievements()
+                        .map { it.mapNotNull { achievement -> achievement.questKey } }
+                        .map { inventoryRepository.getQuestContent(it).firstOrNull() },
+                ) { achievements, content ->
+                    Pair(achievements, content)
+                }.collect {
+                    val achievements = it.first.first
+                    val entries = mutableListOf<Any>()
+                    var lastCategory = ""
+                    achievements.forEach { achievement ->
+                        val categoryIdentifier = achievement.category ?: ""
+                        if (categoryIdentifier != lastCategory) {
+                            val category =
+                                Pair(
+                                    categoryIdentifier,
+                                    achievements.count { check ->
+                                        check.category == categoryIdentifier && check.earned
+                                    },
+                                )
+                            entries.add(category)
+                            lastCategory = categoryIdentifier
+                        }
+                        entries.add(achievement)
                     }
-                    entries.add(achievement)
-                }
-                val questAchievements = it.first.second
-                entries.add(Pair("Quests completed", questAchievements.size))
-                entries.addAll(
-                    questAchievements.map { achievement ->
-                        val questContent = it.second?.firstOrNull { achievement.questKey == it.key }
-                        achievement.title = questContent?.text
-                        achievement
+                    val questAchievements = it.first.second
+                    entries.add(Pair("Quests completed", questAchievements.size))
+                    entries.addAll(
+                        questAchievements.map { achievement ->
+                            val questContent = it.second?.firstOrNull { achievement.questKey == it.key }
+                            achievement.title = questContent?.text
+                            achievement
+                        },
+                    )
+
+                    val user = userViewModel.user.value
+                    val challengeAchievementCount = user?.challengeAchievements?.size ?: 0
+                    if (challengeAchievementCount > 0) {
+                        entries.add(Pair("Challenges won", challengeAchievementCount))
+                        user?.challengeAchievements?.let { it1 -> entries.addAll(it1) }
                     }
-                )
 
-                val user = userViewModel.user.value
-                val challengeAchievementCount = user?.challengeAchievements?.size ?: 0
-                if (challengeAchievementCount > 0) {
-                    entries.add(Pair("Challenges won", challengeAchievementCount))
-                    user?.challengeAchievements?.let { it1 -> entries.addAll(it1) }
+                    adapter.entries = entries
+                    adapter.notifyDataSetChanged()
                 }
-
-                adapter.entries = entries
-                adapter.notifyDataSetChanged()
-            }
         }
     }
 
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+    override fun onCreateOptionsMenu(
+        menu: Menu,
+        inflater: MenuInflater,
+    ) {
         if (useGridLayout) {
             val menuItem = menu.add(R.string.switch_to_list_view)
             menuID = menuItem?.itemId ?: 0
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseDialogFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseDialogFragment.kt
index 95f0bc436..7fb3a3449 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseDialogFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseDialogFragment.kt
@@ -18,7 +18,6 @@ import kotlin.time.DurationUnit
 import kotlin.time.toDuration
 
 abstract class BaseDialogFragment<VB : ViewBinding> : BottomSheetDialogFragment() {
-
     var isModal: Boolean = false
     abstract var binding: VB?
 
@@ -32,12 +31,15 @@ abstract class BaseDialogFragment<VB : ViewBinding> : BottomSheetDialogFragment(
     open val displayedClassName: String?
         get() = this.javaClass.simpleName
 
-    abstract fun createBinding(inflater: LayoutInflater, container: ViewGroup?): VB
+    abstract fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+    ): VB
 
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View? {
         Analytics.sendNavigationEvent(this.javaClass.simpleName)
 
@@ -61,7 +63,7 @@ abstract class BaseDialogFragment<VB : ViewBinding> : BottomSheetDialogFragment(
                         mainActivity.displayTutorialStep(
                             step,
                             tutorialTexts,
-                            tutorialCanBeDeferred
+                            tutorialCanBeDeferred,
                         )
                     }
                 }
@@ -77,7 +79,9 @@ abstract class BaseDialogFragment<VB : ViewBinding> : BottomSheetDialogFragment(
     override fun onDestroy() {
         try {
             tutorialRepository.close()
-        } catch (exception: UninitializedPropertyAccessException) { /* no-on */ }
+        } catch (exception: UninitializedPropertyAccessException) {
+            // no-on
+        }
         super.onDestroy()
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.kt
index 9ad62c4ab..5b7d5c2e7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.kt
@@ -1,82 +1,86 @@
-package com.habitrpg.android.habitica.ui.fragments
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.Fragment
-import androidx.lifecycle.lifecycleScope
-import androidx.viewbinding.ViewBinding
-import com.habitrpg.android.habitica.data.TutorialRepository
-import com.habitrpg.android.habitica.ui.activities.MainActivity
-import com.habitrpg.common.habitica.helpers.launchCatching
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.firstOrNull
-import javax.inject.Inject
-import kotlin.time.DurationUnit
-import kotlin.time.toDuration
-
-abstract class BaseFragment<VB : ViewBinding> : Fragment() {
-
-    var isModal: Boolean = false
-    abstract var binding: VB?
-
-    @Inject
-    lateinit var tutorialRepository: TutorialRepository
-
-    var tutorialStepIdentifier: String? = null
-    protected var tutorialCanBeDeferred = true
-    var tutorialTexts: List<String> = ArrayList()
-
-    var shouldInitializeComponent = true
-
-    open val displayedClassName: String?
-        get() = this.javaClass.simpleName
-
-    abstract fun createBinding(inflater: LayoutInflater, container: ViewGroup?): VB
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        binding = createBinding(inflater, container)
-        return binding?.root
-    }
-
-    override fun onResume() {
-        super.onResume()
-        showTutorialIfNeeded()
-    }
-
-    private fun showTutorialIfNeeded() {
-        tutorialStepIdentifier?.let { identifier ->
-            lifecycleScope.launchCatching {
-                val step = tutorialRepository.getTutorialStep(identifier).firstOrNull()
-                delay(1.toDuration(DurationUnit.SECONDS))
-                if (step?.isValid == true && step.isManaged && step.shouldDisplay) {
-                    val mainActivity = activity as? MainActivity ?: return@launchCatching
-                    mainActivity.displayTutorialStep(
-                        step,
-                        tutorialTexts,
-                        tutorialCanBeDeferred
-                    )
-                }
-            }
-        }
-    }
-
-    override fun onDestroyView() {
-        binding = null
-        super.onDestroyView()
-    }
-
-    override fun onDestroy() {
-        try {
-            tutorialRepository.close()
-        } catch (exception: UninitializedPropertyAccessException) { /* no-on */ }
-        super.onDestroy()
-    }
-
-    open fun addToBackStack(): Boolean = true
-}
+package com.habitrpg.android.habitica.ui.fragments
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
+import androidx.viewbinding.ViewBinding
+import com.habitrpg.android.habitica.data.TutorialRepository
+import com.habitrpg.android.habitica.ui.activities.MainActivity
+import com.habitrpg.common.habitica.helpers.launchCatching
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.firstOrNull
+import javax.inject.Inject
+import kotlin.time.DurationUnit
+import kotlin.time.toDuration
+
+abstract class BaseFragment<VB : ViewBinding> : Fragment() {
+    var isModal: Boolean = false
+    abstract var binding: VB?
+
+    @Inject
+    lateinit var tutorialRepository: TutorialRepository
+
+    var tutorialStepIdentifier: String? = null
+    protected var tutorialCanBeDeferred = true
+    var tutorialTexts: List<String> = ArrayList()
+
+    var shouldInitializeComponent = true
+
+    open val displayedClassName: String?
+        get() = this.javaClass.simpleName
+
+    abstract fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+    ): VB
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?,
+    ): View? {
+        binding = createBinding(inflater, container)
+        return binding?.root
+    }
+
+    override fun onResume() {
+        super.onResume()
+        showTutorialIfNeeded()
+    }
+
+    private fun showTutorialIfNeeded() {
+        tutorialStepIdentifier?.let { identifier ->
+            lifecycleScope.launchCatching {
+                val step = tutorialRepository.getTutorialStep(identifier).firstOrNull()
+                delay(1.toDuration(DurationUnit.SECONDS))
+                if (step?.isValid == true && step.isManaged && step.shouldDisplay) {
+                    val mainActivity = activity as? MainActivity ?: return@launchCatching
+                    mainActivity.displayTutorialStep(
+                        step,
+                        tutorialTexts,
+                        tutorialCanBeDeferred,
+                    )
+                }
+            }
+        }
+    }
+
+    override fun onDestroyView() {
+        binding = null
+        super.onDestroyView()
+    }
+
+    override fun onDestroy() {
+        try {
+            tutorialRepository.close()
+        } catch (exception: UninitializedPropertyAccessException) {
+            // no-on
+        }
+        super.onDestroy()
+    }
+
+    open fun addToBackStack(): Boolean = true
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.kt
index 9d97a135c..1ffa6257c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.kt
@@ -1,138 +1,145 @@
-package com.habitrpg.android.habitica.ui.fragments
-
-import android.graphics.PorterDuff
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
-import android.view.View
-import android.view.ViewGroup
-import androidx.core.os.bundleOf
-import androidx.viewbinding.ViewBinding
-import com.google.android.material.appbar.AppBarLayout
-import com.google.android.material.tabs.TabLayout
-import com.google.firebase.analytics.FirebaseAnalytics
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.data.UserRepository
-import com.habitrpg.android.habitica.helpers.SoundManager
-import com.habitrpg.android.habitica.ui.activities.MainActivity
-import com.habitrpg.android.habitica.ui.helpers.ToolbarColorHelper
-import com.habitrpg.common.habitica.extensions.getThemeColor
-import javax.inject.Inject
-
-abstract class BaseMainFragment<VB : ViewBinding> : BaseFragment<VB>() {
-    @Inject
-    lateinit var userRepository: UserRepository
-
-    @Inject
-    lateinit var soundManager: SoundManager
-
-    protected var showsBackButton: Boolean = false
-
-    open val mainActivity get() = activity as? MainActivity
-    val tabLayout get() = mainActivity?.binding?.content?.detailTabs
-    val collapsingToolbar get() = mainActivity?.binding?.content?.toolbar
-    val toolbarAccessoryContainer get() = mainActivity?.binding?.content?.toolbarAccessoryContainer
-    val bottomNavigation get() = mainActivity?.binding?.content?.bottomNavigation
-    var usesTabLayout: Boolean = false
-        set(value) {
-            field = value
-            updateTabLayoutVisibility()
-        }
-    var hidesToolbar: Boolean = false
-    var usesBottomNavigation = false
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        if (this.usesBottomNavigation) {
-            bottomNavigation?.visibility = View.VISIBLE
-        } else {
-            bottomNavigation?.visibility = View.GONE
-        }
-
-        setHasOptionsMenu(true)
-
-        tabLayout?.removeAllTabs()
-        updateTabLayoutVisibility()
-        updateToolbarInteractivity()
-
-        if (hidesToolbar) {
-            hideToolbar()
-            disableToolbarScrolling()
-        } else {
-            showToolbar()
-            enableToolbarScrolling()
-        }
-        context?.let {
-            FirebaseAnalytics.getInstance(it).logEvent("fragment_view", bundleOf(Pair("fragment", this::class.java.canonicalName)))
-        }
-
-        return super.onCreateView(inflater, container, savedInstanceState)
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        binding = null
-    }
-
-    override fun onResume() {
-        super.onResume()
-        mainActivity?.showBackButton = showsBackButton
-        mainActivity?.supportActionBar?.setDisplayHomeAsUpEnabled(true)
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        super.onCreateOptionsMenu(menu, inflater)
-        mainActivity?.toolbar?.let { ToolbarColorHelper.colorizeToolbar(it, mainActivity) }
-        updateToolbarInteractivity()
-    }
-
-    var isTitleInteractive = false
-
-    open fun updateToolbarInteractivity() {
-        mainActivity?.updateToolbarInteractivity(isTitleInteractive)
-    }
-
-    private fun updateTabLayoutVisibility() {
-        if (this.usesTabLayout) {
-            tabLayout?.visibility = View.VISIBLE
-            tabLayout?.tabMode = TabLayout.MODE_FIXED
-        } else {
-            tabLayout?.visibility = View.GONE
-        }
-    }
-
-    override fun onDestroy() {
-        userRepository.close()
-        super.onDestroy()
-    }
-
-    private fun hideToolbar() {
-        mainActivity?.binding?.content?.headerView?.visibility = View.GONE
-    }
-
-    private fun showToolbar() {
-        mainActivity?.binding?.content?.headerView?.visibility = View.VISIBLE
-    }
-
-    private fun disableToolbarScrolling() {
-        val params = collapsingToolbar?.layoutParams as? AppBarLayout.LayoutParams
-        params?.scrollFlags = 0
-    }
-
-    private fun enableToolbarScrolling() {
-        val params = collapsingToolbar?.layoutParams as? AppBarLayout.LayoutParams
-        params?.scrollFlags = AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL or AppBarLayout.LayoutParams.SCROLL_FLAG_EXIT_UNTIL_COLLAPSED
-    }
-
-    protected fun tintMenuIcon(item: MenuItem?) {
-        context?.getThemeColor(R.attr.headerTextColor)?.let {
-            item?.icon?.setTint(it)
-            item?.icon?.setTintMode(PorterDuff.Mode.MULTIPLY)
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments
+
+import android.graphics.PorterDuff
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.os.bundleOf
+import androidx.viewbinding.ViewBinding
+import com.google.android.material.appbar.AppBarLayout
+import com.google.android.material.tabs.TabLayout
+import com.google.firebase.analytics.FirebaseAnalytics
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.data.UserRepository
+import com.habitrpg.android.habitica.helpers.SoundManager
+import com.habitrpg.android.habitica.ui.activities.MainActivity
+import com.habitrpg.android.habitica.ui.helpers.ToolbarColorHelper
+import com.habitrpg.common.habitica.extensions.getThemeColor
+import javax.inject.Inject
+
+abstract class BaseMainFragment<VB : ViewBinding> : BaseFragment<VB>() {
+    @Inject
+    lateinit var userRepository: UserRepository
+
+    @Inject
+    lateinit var soundManager: SoundManager
+
+    protected var showsBackButton: Boolean = false
+
+    open val mainActivity get() = activity as? MainActivity
+    val tabLayout get() = mainActivity?.binding?.content?.detailTabs
+    val collapsingToolbar get() = mainActivity?.binding?.content?.toolbar
+    val toolbarAccessoryContainer get() = mainActivity?.binding?.content?.toolbarAccessoryContainer
+    val bottomNavigation get() = mainActivity?.binding?.content?.bottomNavigation
+    var usesTabLayout: Boolean = false
+        set(value) {
+            field = value
+            updateTabLayoutVisibility()
+        }
+    var hidesToolbar: Boolean = false
+    var usesBottomNavigation = false
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?,
+    ): View? {
+        if (this.usesBottomNavigation) {
+            bottomNavigation?.visibility = View.VISIBLE
+        } else {
+            bottomNavigation?.visibility = View.GONE
+        }
+
+        setHasOptionsMenu(true)
+
+        tabLayout?.removeAllTabs()
+        updateTabLayoutVisibility()
+        updateToolbarInteractivity()
+
+        if (hidesToolbar) {
+            hideToolbar()
+            disableToolbarScrolling()
+        } else {
+            showToolbar()
+            enableToolbarScrolling()
+        }
+        context?.let {
+            FirebaseAnalytics.getInstance(it).logEvent(
+                "fragment_view",
+                bundleOf(Pair("fragment", this::class.java.canonicalName)),
+            )
+        }
+
+        return super.onCreateView(inflater, container, savedInstanceState)
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        binding = null
+    }
+
+    override fun onResume() {
+        super.onResume()
+        mainActivity?.showBackButton = showsBackButton
+        mainActivity?.supportActionBar?.setDisplayHomeAsUpEnabled(true)
+    }
+
+    override fun onCreateOptionsMenu(
+        menu: Menu,
+        inflater: MenuInflater,
+    ) {
+        super.onCreateOptionsMenu(menu, inflater)
+        mainActivity?.toolbar?.let { ToolbarColorHelper.colorizeToolbar(it, mainActivity) }
+        updateToolbarInteractivity()
+    }
+
+    var isTitleInteractive = false
+
+    open fun updateToolbarInteractivity() {
+        mainActivity?.updateToolbarInteractivity(isTitleInteractive)
+    }
+
+    private fun updateTabLayoutVisibility() {
+        if (this.usesTabLayout) {
+            tabLayout?.visibility = View.VISIBLE
+            tabLayout?.tabMode = TabLayout.MODE_FIXED
+        } else {
+            tabLayout?.visibility = View.GONE
+        }
+    }
+
+    override fun onDestroy() {
+        userRepository.close()
+        super.onDestroy()
+    }
+
+    private fun hideToolbar() {
+        mainActivity?.binding?.content?.headerView?.visibility = View.GONE
+    }
+
+    private fun showToolbar() {
+        mainActivity?.binding?.content?.headerView?.visibility = View.VISIBLE
+    }
+
+    private fun disableToolbarScrolling() {
+        val params = collapsingToolbar?.layoutParams as? AppBarLayout.LayoutParams
+        params?.scrollFlags = 0
+    }
+
+    private fun enableToolbarScrolling() {
+        val params = collapsingToolbar?.layoutParams as? AppBarLayout.LayoutParams
+        params?.scrollFlags =
+            AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL or AppBarLayout.LayoutParams.SCROLL_FLAG_EXIT_UNTIL_COLLAPSED
+    }
+
+    protected fun tintMenuIcon(item: MenuItem?) {
+        context?.getThemeColor(R.attr.headerTextColor)?.let {
+            item?.icon?.setTint(it)
+            item?.icon?.setTintMode(PorterDuff.Mode.MULTIPLY)
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/PromoInfoFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/PromoInfoFragment.kt
index b2b1b0774..375accb74 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/PromoInfoFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/PromoInfoFragment.kt
@@ -11,10 +11,12 @@ import javax.inject.Inject
 
 @AndroidEntryPoint
 class PromoInfoFragment : BaseMainFragment<FragmentPromoInfoBinding>() {
-
     override var binding: FragmentPromoInfoBinding? = null
 
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentPromoInfoBinding {
+    override fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+    ): FragmentPromoInfoBinding {
         return FragmentPromoInfoBinding.inflate(inflater, container, false)
     }
 
@@ -24,13 +26,16 @@ class PromoInfoFragment : BaseMainFragment<FragmentPromoInfoBinding>() {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View? {
         this.hidesToolbar = true
         return super.onCreateView(inflater, container, savedInstanceState)
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
         super.onViewCreated(view, savedInstanceState)
         val promo = configManager.activePromo()
         promo?.configureInfoFragment(this)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/PromoWebFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/PromoWebFragment.kt
index 4d7f30afc..2b70ea669 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/PromoWebFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/PromoWebFragment.kt
@@ -18,27 +18,34 @@ class PromoWebFragment : BaseMainFragment<FragmentNewsBinding>() {
 
     override var binding: FragmentNewsBinding? = null
 
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentNewsBinding {
+    override fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+    ): FragmentNewsBinding {
         return FragmentNewsBinding.inflate(inflater, container, false)
     }
 
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View? {
         this.hidesToolbar = true
         return super.onCreateView(inflater, container, savedInstanceState)
     }
 
     @SuppressLint("SetJavaScriptEnabled")
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
         super.onViewCreated(view, savedInstanceState)
         val webSettings = binding?.newsWebview?.settings
         webSettings?.javaScriptEnabled = true
         webSettings?.domStorageEnabled = true
-        binding?.newsWebview?.webChromeClient = object : WebChromeClient() {
-        }
+        binding?.newsWebview?.webChromeClient =
+            object : WebChromeClient() {
+            }
         arguments?.let {
             val args = PromoWebFragmentArgs.fromBundle(it)
             var url = args.url
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/ReportBottomSheetFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/ReportBottomSheetFragment.kt
index 02aa72949..27f1c7456 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/ReportBottomSheetFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/ReportBottomSheetFragment.kt
@@ -20,7 +20,6 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.ChallengeRepository
 import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.databinding.FragmentReportMessageBinding
-import com.habitrpg.android.habitica.models.social.Challenge
 import com.habitrpg.common.habitica.helpers.ExceptionHandler
 import com.habitrpg.common.habitica.helpers.launchCatching
 import com.habitrpg.common.habitica.helpers.setMarkdown
@@ -30,11 +29,11 @@ import javax.inject.Inject
 
 @AndroidEntryPoint
 class ReportBottomSheetFragment : BottomSheetDialogFragment() {
-
     private lateinit var binding: FragmentReportMessageBinding
 
     @Inject
     lateinit var socialRepository: SocialRepository
+
     @Inject
     lateinit var challengeRepository: ChallengeRepository
 
@@ -52,7 +51,7 @@ class ReportBottomSheetFragment : BottomSheetDialogFragment() {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View {
         binding = FragmentReportMessageBinding.inflate(inflater, container, false)
         return binding.root
@@ -68,7 +67,10 @@ class ReportBottomSheetFragment : BottomSheetDialogFragment() {
         return bottomSheetDialog
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
         super.onViewCreated(view, savedInstanceState)
 
         reportType = arguments?.getString(REPORT_TYPE)
@@ -81,7 +83,6 @@ class ReportBottomSheetFragment : BottomSheetDialogFragment() {
         reportingChallengeId = arguments?.getString(REPORTING_CHALLENGE_ID)
         source = arguments?.getString(SOURCE_VIEW)
 
-
         binding.messageTextView.text = arguments?.getString(messageText)
         binding.reportButton.setOnClickListener {
             if (reportType == REPORT_TYPE_MESSAGE) {
@@ -100,8 +101,8 @@ class ReportBottomSheetFragment : BottomSheetDialogFragment() {
             binding.additionalExplanationTextview.setMarkdown(
                 getString(
                     R.string.report_user_description,
-                    profileName
-                )
+                    profileName,
+                ),
             )
             binding.reportExplanationTextview.setMarkdown(getString(R.string.report_user_explanation))
             val formattedString =
@@ -111,13 +112,13 @@ class ReportBottomSheetFragment : BottomSheetDialogFragment() {
                 TypefaceSpan("sans-serif-medium"),
                 0,
                 displayName?.length ?: 0,
-                Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+                Spannable.SPAN_EXCLUSIVE_EXCLUSIVE,
             )
             spannable.setSpan(
                 TypefaceSpan("sans-serif"),
                 displayName?.length ?: 0,
                 formattedString.length,
-                Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+                Spannable.SPAN_EXCLUSIVE_EXCLUSIVE,
             )
             binding.messageTextView.text = spannable
             binding.reportReasonTitle.text = getString(R.string.report_reason_title_player)
@@ -145,7 +146,7 @@ class ReportBottomSheetFragment : BottomSheetDialogFragment() {
                     ContextCompat.getColor(requireContext(), R.color.text_dimmed)
                 } else {
                     ContextCompat.getColor(requireContext(), R.color.maroon100_red100)
-                }
+                },
             )
         }
     }
@@ -159,12 +160,12 @@ class ReportBottomSheetFragment : BottomSheetDialogFragment() {
             lifecycleScope.launch(
                 ExceptionHandler.coroutine {
                     isReporting = false
-                }
+                },
             ) {
                 socialRepository.flagMessage(
                     messageID ?: "",
                     binding.additionalInfoEdittext.text.toString(),
-                    groupID
+                    groupID,
                 )
                 dismiss()
             }
@@ -182,10 +183,11 @@ class ReportBottomSheetFragment : BottomSheetDialogFragment() {
         isReporting = true
         lifecycleScope.launchCatching {
             val reportReasonInfo = binding.additionalInfoEdittext.text.toString()
-            val updateData = mapOf(
-                "comment" to reportReasonInfo,
-                "source" to (source ?: "")
-            )
+            val updateData =
+                mapOf(
+                    "comment" to reportReasonInfo,
+                    "source" to (source ?: ""),
+                )
             socialRepository.reportMember(userIdBeingReported, updateData)
             socialRepository.blockMember(userIdBeingReported)
             Toast.makeText(context, "$profileName Reported", Toast.LENGTH_SHORT).show()
@@ -204,10 +206,11 @@ class ReportBottomSheetFragment : BottomSheetDialogFragment() {
         isReporting = true
         lifecycleScope.launchCatching {
             val reportReasonInfo = binding.additionalInfoEdittext.text.toString()
-            val updateData = mapOf(
-                "comment" to reportReasonInfo,
-                "source" to (source ?: "")
-            )
+            val updateData =
+                mapOf(
+                    "comment" to reportReasonInfo,
+                    "source" to (source ?: ""),
+                )
             challengeRepository.reportChallenge(challengeId, updateData)
             Toast.makeText(context, "$displayName Reported", Toast.LENGTH_SHORT).show()
             dismiss()
@@ -230,7 +233,6 @@ class ReportBottomSheetFragment : BottomSheetDialogFragment() {
         private const val GROUP_ID = "group_id"
         private const val SOURCE_VIEW = "source_view"
 
-
         fun newInstance(
             reportType: String,
             profileName: String = "",
@@ -240,7 +242,7 @@ class ReportBottomSheetFragment : BottomSheetDialogFragment() {
             messageId: String = "",
             messageText: String = "",
             groupId: String = "",
-            sourceView: String
+            sourceView: String,
         ): ReportBottomSheetFragment {
             val args = Bundle()
             args.putString(REPORT_TYPE, reportType)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt
index 8c1244682..290442d56 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt
@@ -10,7 +10,6 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.databinding.FragmentStatsBinding
 import com.habitrpg.android.habitica.extensions.addOkButton
-import com.habitrpg.common.habitica.extensions.setScaledPadding
 import com.habitrpg.android.habitica.helpers.UserStatComputer
 import com.habitrpg.android.habitica.models.user.Stats
 import com.habitrpg.android.habitica.models.user.User
@@ -19,6 +18,7 @@ import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.android.habitica.ui.views.stats.BulkAllocateStatsDialog
 import com.habitrpg.common.habitica.extensions.getThemeColor
+import com.habitrpg.common.habitica.extensions.setScaledPadding
 import com.habitrpg.common.habitica.helpers.launchCatching
 import com.habitrpg.shared.habitica.models.tasks.Attribute
 import dagger.hilt.android.AndroidEntryPoint
@@ -28,12 +28,11 @@ import kotlin.math.min
 
 @AndroidEntryPoint
 class StatsFragment : BaseMainFragment<FragmentStatsBinding>() {
-
     override var binding: FragmentStatsBinding? = null
 
     override fun createBinding(
         inflater: LayoutInflater,
-        container: ViewGroup?
+        container: ViewGroup?,
     ): FragmentStatsBinding {
         return FragmentStatsBinding.inflate(inflater, container, false)
     }
@@ -70,7 +69,7 @@ class StatsFragment : BaseMainFragment<FragmentStatsBinding>() {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View? {
         tutorialStepIdentifier = "stats"
         tutorialTexts = listOf(getString(R.string.tutorial_stats))
@@ -83,7 +82,10 @@ class StatsFragment : BaseMainFragment<FragmentStatsBinding>() {
         super.onDestroy()
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
         super.onViewCreated(view, savedInstanceState)
 
         binding?.leftSparklesView?.setImageBitmap(HabiticaIconsHelper.imageOfAttributeSparklesLeft())
@@ -92,18 +94,18 @@ class StatsFragment : BaseMainFragment<FragmentStatsBinding>() {
             val color = it.getThemeColor(R.attr.colorPrimaryOffset)
             binding?.distributeEvenlyHelpButton?.setImageBitmap(
                 HabiticaIconsHelper.imageOfInfoIcon(
-                    color
-                )
+                    color,
+                ),
             )
             binding?.distributeClassHelpButton?.setImageBitmap(
                 HabiticaIconsHelper.imageOfInfoIcon(
-                    color
-                )
+                    color,
+                ),
             )
             binding?.distributeTaskHelpButton?.setImageBitmap(
                 HabiticaIconsHelper.imageOfInfoIcon(
-                    color
-                )
+                    color,
+                ),
             )
         }
 
@@ -166,7 +168,7 @@ class StatsFragment : BaseMainFragment<FragmentStatsBinding>() {
         lifecycleScope.launchCatching {
             userRepository.updateUser(
                 "preferences.allocationMode",
-                allocationMode
+                allocationMode,
             )
         }
         binding?.distributeEvenlyButton?.isChecked = allocationMode == Stats.AUTO_ALLOCATE_FLAT
@@ -218,8 +220,8 @@ class StatsFragment : BaseMainFragment<FragmentStatsBinding>() {
                 binding?.numberOfPointsTextView?.setTextColor(
                     ContextCompat.getColor(
                         context,
-                        R.color.white
-                    )
+                        R.color.white,
+                    ),
                 )
                 binding?.numberOfPointsTextView?.background =
                     ContextCompat.getDrawable(context, R.drawable.button_gray_100)
@@ -230,14 +232,14 @@ class StatsFragment : BaseMainFragment<FragmentStatsBinding>() {
                 binding?.numberOfPointsTextView?.setTextColor(
                     ContextCompat.getColor(
                         context,
-                        R.color.text_quad
-                    )
+                        R.color.text_quad,
+                    ),
                 )
                 binding?.numberOfPointsTextView?.setBackgroundColor(
                     ContextCompat.getColor(
                         context,
-                        R.color.transparent
-                    )
+                        R.color.transparent,
+                    ),
                 )
                 binding?.leftSparklesView?.visibility = View.GONE
                 binding?.rightSparklesView?.visibility = View.GONE
@@ -275,12 +277,12 @@ class StatsFragment : BaseMainFragment<FragmentStatsBinding>() {
             binding?.perceptionStatsView?.levelValue = levelStat
 
             totalStrength += user.stats?.buffs?.str?.toInt() ?: 0
-            totalIntelligence += user.stats?.buffs?._int?.toInt() ?: 0
+            totalIntelligence += user.stats?.buffs?.intelligence?.toInt() ?: 0
             totalConstitution += user.stats?.buffs?.con?.toInt() ?: 0
             totalPerception += user.stats?.buffs?.per?.toInt() ?: 0
             binding?.strengthStatsView?.buffValue = user.stats?.buffs?.str?.toInt() ?: 0
             binding?.intelligenceStatsView?.buffValue =
-                user.stats?.buffs?._int?.toInt() ?: 0
+                user.stats?.buffs?.intelligence?.toInt() ?: 0
             binding?.constitutionStatsView?.buffValue =
                 user.stats?.buffs?.con?.toInt() ?: 0
             binding?.perceptionStatsView?.buffValue =
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarEquipmentFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarEquipmentFragment.kt
index 6c8ddb1d2..36db1c042 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarEquipmentFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarEquipmentFragment.kt
@@ -27,7 +27,6 @@ import javax.inject.Inject
 class AvatarEquipmentFragment :
     BaseMainFragment<FragmentRefreshRecyclerviewBinding>(),
     SwipeRefreshLayout.OnRefreshListener {
-
     @Inject
     lateinit var inventoryRepository: InventoryRepository
 
@@ -36,7 +35,10 @@ class AvatarEquipmentFragment :
 
     override var binding: FragmentRefreshRecyclerviewBinding? = null
 
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentRefreshRecyclerviewBinding {
+    override fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+    ): FragmentRefreshRecyclerviewBinding {
         return FragmentRefreshRecyclerviewBinding.inflate(inflater, container, false)
     }
 
@@ -44,19 +46,24 @@ class AvatarEquipmentFragment :
     var category: String? = null
     private var activeEquipment: String? = null
 
-    internal var adapter: CustomizationEquipmentRecyclerViewAdapter = CustomizationEquipmentRecyclerViewAdapter()
+    internal var adapter: CustomizationEquipmentRecyclerViewAdapter =
+        CustomizationEquipmentRecyclerViewAdapter()
     internal var layoutManager: GridLayoutManager = GridLayoutManager(mainActivity, 2)
 
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View? {
         showsBackButton = true
         adapter.onSelect = { equipment ->
-            val key = (if (equipment.key?.isNotBlank() != true) activeEquipment else equipment.key) ?: ""
+            val key =
+                (if (equipment.key?.isNotBlank() != true) activeEquipment else equipment.key) ?: ""
             lifecycleScope.launchCatching {
-                inventoryRepository.equip(if (userViewModel.user.value?.preferences?.costume == true) "costume" else "equipped", key)
+                inventoryRepository.equip(
+                    if (userViewModel.user.value?.preferences?.costume == true) "costume" else "equipped",
+                    key,
+                )
             }
         }
         adapter.onUnlock = { equipment ->
@@ -68,7 +75,10 @@ class AvatarEquipmentFragment :
         return super.onCreateView(inflater, container, savedInstanceState)
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
         showsBackButton = true
         super.onViewCreated(view, savedInstanceState)
         arguments?.let {
@@ -81,15 +91,16 @@ class AvatarEquipmentFragment :
         binding?.refreshLayout?.setOnRefreshListener(this)
         setGridSpanCount(view.width)
         val layoutManager = GridLayoutManager(mainActivity, 4)
-        layoutManager.spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() {
-            override fun getSpanSize(position: Int): Int {
-                return if (adapter.getItemViewType(position) == 0) {
-                    layoutManager.spanCount
-                } else {
-                    1
+        layoutManager.spanSizeLookup =
+            object : GridLayoutManager.SpanSizeLookup() {
+                override fun getSpanSize(position: Int): Int {
+                    return if (adapter.getItemViewType(position) == 0) {
+                        layoutManager.spanCount
+                    } else {
+                        1
+                    }
                 }
             }
-        }
         binding?.recyclerView?.layoutManager = layoutManager
         binding?.recyclerView?.addItemDecoration(MarginDecoration(context))
 
@@ -130,13 +141,15 @@ class AvatarEquipmentFragment :
         if (this.type == null || user?.preferences == null) {
             return
         }
-        val outfit = if (user.preferences?.costume == true) user.items?.gear?.costume else user.items?.gear?.equipped
-        val activeEquipment = when (this.type) {
-            "headAccessory" -> outfit?.headAccessory
-            "back" -> outfit?.back
-            "eyewear" -> outfit?.eyeWear
-            else -> ""
-        }
+        val outfit =
+            if (user.preferences?.costume == true) user.items?.gear?.costume else user.items?.gear?.equipped
+        val activeEquipment =
+            when (this.type) {
+                "headAccessory" -> outfit?.headAccessory
+                "back" -> outfit?.back
+                "eyewear" -> outfit?.eyeWear
+                else -> ""
+            }
         if (activeEquipment != null) {
             this.activeEquipment = activeEquipment
             this.adapter.activeEquipment = activeEquipment
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.kt
index be8479d64..5c130fe04 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.kt
@@ -1,123 +1,135 @@
-package com.habitrpg.android.habitica.ui.fragments.inventory.equipment
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.lifecycle.lifecycleScope
-import androidx.recyclerview.widget.DividerItemDecoration
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.data.InventoryRepository
-import com.habitrpg.android.habitica.databinding.FragmentRefreshRecyclerviewBinding
-import com.habitrpg.common.habitica.extensions.observeOnce
-import com.habitrpg.android.habitica.helpers.ReviewManager
-import com.habitrpg.common.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.ui.adapter.inventory.EquipmentRecyclerViewAdapter
-import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
-import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
-import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
-import com.habitrpg.common.habitica.helpers.EmptyItem
-import com.habitrpg.common.habitica.helpers.ExceptionHandler
-import com.habitrpg.common.habitica.helpers.launchCatching
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class EquipmentDetailFragment :
-    BaseMainFragment<FragmentRefreshRecyclerviewBinding>(),
-    SwipeRefreshLayout.OnRefreshListener {
-
-    @Inject
-    lateinit var inventoryRepository: InventoryRepository
-
-    override var binding: FragmentRefreshRecyclerviewBinding? = null
-    @Inject
-    lateinit var userViewModel: MainUserViewModel
-
-    @Inject
-    lateinit var reviewManager: ReviewManager
-
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentRefreshRecyclerviewBinding {
-        return FragmentRefreshRecyclerviewBinding.inflate(inflater, container, false)
-    }
-
-    var type: String? = null
-    var equippedGear: String? = null
-    var isCostume: Boolean? = null
-
-    private var adapter: EquipmentRecyclerViewAdapter = EquipmentRecyclerViewAdapter()
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        adapter.onEquip = {
-            lifecycleScope.launchCatching {
-                inventoryRepository.equipGear(it, isCostume ?: false)
-
-                if (this@EquipmentDetailFragment.isAdded) {
-                    userViewModel.user.observeOnce(viewLifecycleOwner) { user ->
-                        val parentActivity = mainActivity
-                        val totalCheckIns = user?.loginIncentives
-                        if (totalCheckIns != null && parentActivity != null) {
-                            reviewManager.requestReview(parentActivity, totalCheckIns)
-                        }
-                    }
-                }
-            }
-        }
-        return super.onCreateView(inflater, container, savedInstanceState)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        showsBackButton = true
-        super.onViewCreated(view, savedInstanceState)
-
-        arguments?.let {
-            val args = EquipmentDetailFragmentArgs.fromBundle(it)
-            type = args.type
-            isCostume = args.isCostume
-            equippedGear = args.equippedGear
-        }
-        binding?.refreshLayout?.setOnRefreshListener(this)
-        binding?.recyclerView?.onRefresh = { onRefresh() }
-        binding?.recyclerView?.emptyItem = EmptyItem(
-            getString(R.string.empty_title),
-            getString(R.string.empty_equipment_description),
-            null,
-        ) {
-            MainNavigationController.navigate(R.id.marketFragment)
-        }
-
-        this.adapter.equippedGear = this.equippedGear
-        this.adapter.isCostume = this.isCostume
-        this.adapter.type = this.type
-
-        binding?.recyclerView?.adapter = this.adapter
-        binding?.recyclerView?.layoutManager = LinearLayoutManager(mainActivity)
-        binding?.recyclerView?.addItemDecoration(DividerItemDecoration(activity, DividerItemDecoration.VERTICAL))
-        binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
-
-        type?.let { type ->
-            lifecycleScope.launchCatching {
-                inventoryRepository.getOwnedEquipment(type).collect { adapter.data = it }
-            }
-        }
-    }
-
-    override fun onDestroy() {
-        inventoryRepository.close()
-        super.onDestroy()
-    }
-
-    override fun onRefresh() {
-        lifecycleScope.launch(ExceptionHandler.coroutine()) {
-            userRepository.retrieveUser(true, true)
-            binding?.refreshLayout?.isRefreshing = false
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.inventory.equipment
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.data.InventoryRepository
+import com.habitrpg.android.habitica.databinding.FragmentRefreshRecyclerviewBinding
+import com.habitrpg.android.habitica.helpers.ReviewManager
+import com.habitrpg.android.habitica.ui.adapter.inventory.EquipmentRecyclerViewAdapter
+import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
+import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
+import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
+import com.habitrpg.common.habitica.extensions.observeOnce
+import com.habitrpg.common.habitica.helpers.EmptyItem
+import com.habitrpg.common.habitica.helpers.ExceptionHandler
+import com.habitrpg.common.habitica.helpers.MainNavigationController
+import com.habitrpg.common.habitica.helpers.launchCatching
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class EquipmentDetailFragment :
+    BaseMainFragment<FragmentRefreshRecyclerviewBinding>(),
+    SwipeRefreshLayout.OnRefreshListener {
+    @Inject
+    lateinit var inventoryRepository: InventoryRepository
+
+    override var binding: FragmentRefreshRecyclerviewBinding? = null
+
+    @Inject
+    lateinit var userViewModel: MainUserViewModel
+
+    @Inject
+    lateinit var reviewManager: ReviewManager
+
+    override fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+    ): FragmentRefreshRecyclerviewBinding {
+        return FragmentRefreshRecyclerviewBinding.inflate(inflater, container, false)
+    }
+
+    var type: String? = null
+    var equippedGear: String? = null
+    var isCostume: Boolean? = null
+
+    private var adapter: EquipmentRecyclerViewAdapter = EquipmentRecyclerViewAdapter()
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?,
+    ): View? {
+        adapter.onEquip = {
+            lifecycleScope.launchCatching {
+                inventoryRepository.equipGear(it, isCostume ?: false)
+
+                if (this@EquipmentDetailFragment.isAdded) {
+                    userViewModel.user.observeOnce(viewLifecycleOwner) { user ->
+                        val parentActivity = mainActivity
+                        val totalCheckIns = user?.loginIncentives
+                        if (totalCheckIns != null && parentActivity != null) {
+                            reviewManager.requestReview(parentActivity, totalCheckIns)
+                        }
+                    }
+                }
+            }
+        }
+        return super.onCreateView(inflater, container, savedInstanceState)
+    }
+
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
+        showsBackButton = true
+        super.onViewCreated(view, savedInstanceState)
+
+        arguments?.let {
+            val args = EquipmentDetailFragmentArgs.fromBundle(it)
+            type = args.type
+            isCostume = args.isCostume
+            equippedGear = args.equippedGear
+        }
+        binding?.refreshLayout?.setOnRefreshListener(this)
+        binding?.recyclerView?.onRefresh = { onRefresh() }
+        binding?.recyclerView?.emptyItem =
+            EmptyItem(
+                getString(R.string.empty_title),
+                getString(R.string.empty_equipment_description),
+                null,
+            ) {
+                MainNavigationController.navigate(R.id.marketFragment)
+            }
+
+        this.adapter.equippedGear = this.equippedGear
+        this.adapter.isCostume = this.isCostume
+        this.adapter.type = this.type
+
+        binding?.recyclerView?.adapter = this.adapter
+        binding?.recyclerView?.layoutManager = LinearLayoutManager(mainActivity)
+        binding?.recyclerView?.addItemDecoration(
+            DividerItemDecoration(
+                activity,
+                DividerItemDecoration.VERTICAL,
+            ),
+        )
+        binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
+
+        type?.let { type ->
+            lifecycleScope.launchCatching {
+                inventoryRepository.getOwnedEquipment(type).collect { adapter.data = it }
+            }
+        }
+    }
+
+    override fun onDestroy() {
+        inventoryRepository.close()
+        super.onDestroy()
+    }
+
+    override fun onRefresh() {
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.retrieveUser(true, true)
+            binding?.refreshLayout?.isRefreshing = false
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemDialogFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemDialogFragment.kt
index 2c212372d..ee0900549 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemDialogFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemDialogFragment.kt
@@ -12,11 +12,9 @@ import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.databinding.FragmentItemsDialogBinding
 import com.habitrpg.android.habitica.extensions.addCloseButton
-import com.habitrpg.common.habitica.extensions.observeOnce
 import com.habitrpg.android.habitica.helpers.Analytics
 import com.habitrpg.android.habitica.helpers.EventCategory
 import com.habitrpg.android.habitica.helpers.HitType
-import com.habitrpg.common.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.interactors.FeedPetUseCase
 import com.habitrpg.android.habitica.interactors.HatchPetUseCase
 import com.habitrpg.android.habitica.models.inventory.Egg
@@ -35,8 +33,10 @@ import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import com.habitrpg.android.habitica.ui.views.dialogs.OpenedMysteryitemDialog
 import com.habitrpg.common.habitica.extensions.loadImage
+import com.habitrpg.common.habitica.extensions.observeOnce
 import com.habitrpg.common.habitica.helpers.EmptyItem
 import com.habitrpg.common.habitica.helpers.ExceptionHandler
+import com.habitrpg.common.habitica.helpers.MainNavigationController
 import com.habitrpg.common.habitica.helpers.launchCatching
 import com.habitrpg.shared.habitica.models.responses.FeedResponse
 import dagger.hilt.android.AndroidEntryPoint
@@ -48,7 +48,6 @@ import javax.inject.Inject
 
 @AndroidEntryPoint
 class ItemDialogFragment : BaseDialogFragment<FragmentItemsDialogBinding>() {
-
     @Inject
     lateinit var inventoryRepository: InventoryRepository
 
@@ -80,7 +79,10 @@ class ItemDialogFragment : BaseDialogFragment<FragmentItemsDialogBinding>() {
 
     override var binding: FragmentItemsDialogBinding? = null
 
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentItemsDialogBinding {
+    override fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+    ): FragmentItemsDialogBinding {
         return FragmentItemsDialogBinding.inflate(inflater, container, false)
     }
 
@@ -92,15 +94,17 @@ class ItemDialogFragment : BaseDialogFragment<FragmentItemsDialogBinding>() {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View? {
         when {
             this.isHatching -> {
                 dialog?.requestWindowFeature(Window.FEATURE_NO_TITLE)
             }
+
             this.isFeeding -> {
                 dialog?.requestWindowFeature(Window.FEATURE_NO_TITLE)
             }
+
             else -> {
             }
         }
@@ -110,40 +114,50 @@ class ItemDialogFragment : BaseDialogFragment<FragmentItemsDialogBinding>() {
         return super.onCreateView(inflater, container, savedInstanceState)
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
         super.onViewCreated(view, savedInstanceState)
 
         val buttonMethod = {
-            Analytics.sendEvent("Items CTA tap", EventCategory.BEHAVIOUR, HitType.EVENT, mapOf(
-                "area" to "empty",
-                "type" to (itemType ?: "")
-            ))
+            Analytics.sendEvent(
+                "Items CTA tap",
+                EventCategory.BEHAVIOUR,
+                HitType.EVENT,
+                mapOf(
+                    "area" to "empty",
+                    "type" to (itemType ?: ""),
+                ),
+            )
             if (itemType == "quests") {
                 MainNavigationController.navigate(R.id.questShopFragment)
             } else {
                 openMarket()
             }
         }
-        binding?.recyclerView?.emptyItem = EmptyItem(
-            getString(R.string.no_x, itemTypeText ?: itemType),
-            when (itemType) {
-                "food" -> getString(R.string.empty_food_description)
-                "quests" -> getString(R.string.empty_quests_description)
-                "special" -> getString(R.string.empty_special_description_subscribed)
-                "eggs" -> getString(R.string.empty_eggs_description)
-                "hatchingPotions" -> getString(R.string.empty_potions_description)
-                else -> ""
-            },
-            when (itemType) {
-                "eggs" -> R.drawable.icon_eggs
-                "hatchingPotions" -> R.drawable.icon_hatchingpotions
-                "food" -> R.drawable.icon_food
-                "quests" -> R.drawable.icon_quests
-                "special" -> R.drawable.icon_special
-                else -> null
-            },
-            false,
-            if (itemType == "special") null else buttonMethod)
+        binding?.recyclerView?.emptyItem =
+            EmptyItem(
+                getString(R.string.no_x, itemTypeText ?: itemType),
+                when (itemType) {
+                    "food" -> getString(R.string.empty_food_description)
+                    "quests" -> getString(R.string.empty_quests_description)
+                    "special" -> getString(R.string.empty_special_description_subscribed)
+                    "eggs" -> getString(R.string.empty_eggs_description)
+                    "hatchingPotions" -> getString(R.string.empty_potions_description)
+                    else -> ""
+                },
+                when (itemType) {
+                    "eggs" -> R.drawable.icon_eggs
+                    "hatchingPotions" -> R.drawable.icon_hatchingpotions
+                    "food" -> R.drawable.icon_food
+                    "quests" -> R.drawable.icon_quests
+                    "special" -> R.drawable.icon_special
+                    else -> null
+                },
+                false,
+                if (itemType == "special") null else buttonMethod,
+            )
 
         layoutManager = androidx.recyclerview.widget.LinearLayoutManager(context)
         binding?.recyclerView?.layoutManager = layoutManager
@@ -163,13 +177,17 @@ class ItemDialogFragment : BaseDialogFragment<FragmentItemsDialogBinding>() {
 
         when {
             this.isHatching -> {
-                binding?.titleTextView?.text = getString(R.string.hatch_with, this.hatchingItem?.text)
+                binding?.titleTextView?.text =
+                    getString(R.string.hatch_with, this.hatchingItem?.text)
                 binding?.titleTextView?.visibility = View.VISIBLE
             }
+
             this.isFeeding -> {
-                binding?.titleTextView?.text = getString(R.string.dialog_feeding, this.feedingPet?.text)
+                binding?.titleTextView?.text =
+                    getString(R.string.dialog_feeding, this.feedingPet?.text)
                 binding?.titleTextView?.visibility = View.VISIBLE
             }
+
             else -> {
                 binding?.titleTextView?.visibility = View.GONE
             }
@@ -232,10 +250,15 @@ class ItemDialogFragment : BaseDialogFragment<FragmentItemsDialogBinding>() {
             adapter?.onFeedPet = { food -> feedPet(food) }
 
             adapter?.onOpenShop = {
-                Analytics.sendEvent("Items CTA tap", EventCategory.BEHAVIOUR, HitType.EVENT, mapOf(
-                    "area" to "bottom",
-                    "type" to (itemType ?: "")
-                ))
+                Analytics.sendEvent(
+                    "Items CTA tap",
+                    EventCategory.BEHAVIOUR,
+                    HitType.EVENT,
+                    mapOf(
+                        "area" to "bottom",
+                        "type" to (itemType ?: ""),
+                    ),
+                )
                 if (itemType == "quests") {
                     MainNavigationController.navigate(R.id.questShopFragment)
                 } else {
@@ -249,13 +272,14 @@ class ItemDialogFragment : BaseDialogFragment<FragmentItemsDialogBinding>() {
         val pet = feedingPet ?: return
         val activity = activity ?: return
         activity.lifecycleScope.launchCatching {
-            val result = feedPetUseCase.callInteractor(
-                FeedPetUseCase.RequestValues(
-                    pet,
-                    food,
-                    activity
+            val result =
+                feedPetUseCase.callInteractor(
+                    FeedPetUseCase.RequestValues(
+                        pet,
+                        food,
+                        activity,
+                    ),
                 )
-            )
             onFeedResult?.invoke(result)
         }
     }
@@ -276,7 +300,10 @@ class ItemDialogFragment : BaseDialogFragment<FragmentItemsDialogBinding>() {
         outState.putString(ITEM_TYPE_KEY, this.itemType)
     }
 
-    private fun hatchPet(potion: HatchingPotion, egg: Egg) {
+    private fun hatchPet(
+        potion: HatchingPotion,
+        egg: Egg,
+    ) {
         dismiss()
         val activity = activity ?: return
         activity.lifecycleScope.launchCatching {
@@ -284,34 +311,38 @@ class ItemDialogFragment : BaseDialogFragment<FragmentItemsDialogBinding>() {
                 HatchPetUseCase.RequestValues(
                     potion,
                     egg,
-                    activity
-                )
+                    activity,
+                ),
             )
         }
     }
 
     private fun loadItems() {
-        val itemClass: Class<out Item> = when (itemType) {
-            "eggs" -> Egg::class.java
-            "hatchingPotions" -> HatchingPotion::class.java
-            "food" -> Food::class.java
-            "quests" -> QuestContent::class.java
-            "special" -> SpecialItem::class.java
-            else -> Egg::class.java
-        }
+        val itemClass: Class<out Item> =
+            when (itemType) {
+                "eggs" -> Egg::class.java
+                "hatchingPotions" -> HatchingPotion::class.java
+                "food" -> Food::class.java
+                "quests" -> QuestContent::class.java
+                "special" -> SpecialItem::class.java
+                else -> Egg::class.java
+            }
         itemType?.let { type ->
             lifecycleScope.launch(ExceptionHandler.coroutine()) {
                 inventoryRepository.getOwnedItems(type)
                     .onEach { items ->
-                        val filteredItems = if (isFeeding) {
-                            items.filter { it.key != "Saddle" }.distinctBy { it.key }
-                        } else {
-                            items.distinctBy { it.key }
-                        }
+                        val filteredItems =
+                            if (isFeeding) {
+                                items.filter { it.key != "Saddle" }.distinctBy { it.key }
+                            } else {
+                                items.distinctBy { it.key }
+                            }
                         adapter?.data = filteredItems
                     }
                     .map { items -> items.mapNotNull { it.key } }
-                    .map { inventoryRepository.getItems(itemClass, it.toTypedArray()).firstOrNull() }
+                    .map {
+                        inventoryRepository.getItems(itemClass, it.toTypedArray()).firstOrNull()
+                    }
                     .collect {
                         val itemMap = mutableMapOf<String, Item>()
                         for (item in it ?: emptyList()) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt
index 66d49305a..bf6c49d8d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt
@@ -1,371 +1,402 @@
-package com.habitrpg.android.habitica.ui.fragments.inventory.items
-
-import android.app.Activity
-import android.content.Intent
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.core.os.bundleOf
-import androidx.lifecycle.lifecycleScope
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.data.InventoryRepository
-import com.habitrpg.android.habitica.data.SocialRepository
-import com.habitrpg.android.habitica.data.UserRepository
-import com.habitrpg.android.habitica.databinding.FragmentItemsBinding
-import com.habitrpg.android.habitica.extensions.addCloseButton
-import com.habitrpg.common.habitica.extensions.observeOnce
-import com.habitrpg.android.habitica.helpers.Analytics
-import com.habitrpg.android.habitica.helpers.EventCategory
-import com.habitrpg.android.habitica.helpers.HitType
-import com.habitrpg.common.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.interactors.HatchPetUseCase
-import com.habitrpg.android.habitica.models.inventory.Egg
-import com.habitrpg.android.habitica.models.inventory.Food
-import com.habitrpg.android.habitica.models.inventory.HatchingPotion
-import com.habitrpg.android.habitica.models.inventory.Item
-import com.habitrpg.android.habitica.models.inventory.QuestContent
-import com.habitrpg.android.habitica.models.inventory.SpecialItem
-import com.habitrpg.android.habitica.models.user.OwnedItem
-import com.habitrpg.android.habitica.models.user.OwnedPet
-import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.android.habitica.ui.activities.BaseActivity
-import com.habitrpg.android.habitica.ui.activities.MainActivity
-import com.habitrpg.android.habitica.ui.activities.SkillMemberActivity
-import com.habitrpg.android.habitica.ui.adapter.inventory.ItemRecyclerAdapter
-import com.habitrpg.android.habitica.ui.fragments.BaseFragment
-import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
-import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
-import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
-import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import com.habitrpg.android.habitica.ui.views.dialogs.OpenedMysteryitemDialog
-import com.habitrpg.common.habitica.extensions.loadImage
-import com.habitrpg.common.habitica.helpers.EmptyItem
-import com.habitrpg.common.habitica.helpers.ExceptionHandler
-import com.habitrpg.common.habitica.helpers.launchCatching
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.flow.firstOrNull
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class ItemRecyclerFragment : BaseFragment<FragmentItemsBinding>(), SwipeRefreshLayout.OnRefreshListener {
-
-    @Inject
-    lateinit var inventoryRepository: InventoryRepository
-
-    @Inject
-    lateinit var socialRepository: SocialRepository
-
-    @Inject
-    lateinit var userRepository: UserRepository
-
-    @Inject
-    internal lateinit var hatchPetUseCase: HatchPetUseCase
-
-    @Inject
-    lateinit var userViewModel: MainUserViewModel
-
-    var user: User? = null
-    var adapter: ItemRecyclerAdapter? = null
-    var itemType: String? = null
-    var transformationItems: MutableList<OwnedItem> = mutableListOf()
-    var itemTypeText: String? = null
-    private var selectedSpecialItem: SpecialItem? = null
-    internal var layoutManager: androidx.recyclerview.widget.LinearLayoutManager? = null
-
-    override var binding: FragmentItemsBinding? = null
-
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentItemsBinding {
-        return FragmentItemsBinding.inflate(inflater, container, false)
-    }
-
-    override fun onDestroy() {
-        inventoryRepository.close()
-        super.onDestroy()
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        if (savedInstanceState != null) {
-            this.itemType = savedInstanceState.getString(ITEM_TYPE_KEY, "")
-            this.itemTypeText = savedInstanceState.getString(ITEM_TYPE_TEXT_KEY, "")
-        }
-
-        binding?.refreshLayout?.setOnRefreshListener(this)
-        val buttonMethod = {
-            Analytics.sendEvent("Items CTA tap", EventCategory.BEHAVIOUR, HitType.EVENT, mapOf(
-                "area" to "empty",
-                "type" to (itemType ?: "")
-            ))
-            if (itemType == "quests") {
-                MainNavigationController.navigate(R.id.questShopFragment)
-            } else {
-                openMarket()
-            }
-        }
-        binding?.recyclerView?.emptyItem = EmptyItem(
-            getString(R.string.no_x, itemTypeText ?: itemType),
-            when (itemType) {
-                "food" -> getString(R.string.empty_food_description)
-                            "quests" -> getString(R.string.empty_quests_description)
-                "special" -> getString(R.string.empty_special_description_subscribed)
-                "eggs" -> getString(R.string.empty_eggs_description)
-                "hatchingPotions" -> getString(R.string.empty_potions_description)
-                else -> ""
-                            },
-            when (itemType) {
-                            "eggs" -> R.drawable.icon_eggs
-                "hatchingPotions" -> R.drawable.icon_hatchingpotions
-                "food" -> R.drawable.icon_food
-                "quests" -> R.drawable.icon_quests
-                "special" -> R.drawable.icon_special
-                else -> null
-                            },
-            false,
-            if (itemType == "special") null else buttonMethod)
-
-        layoutManager = androidx.recyclerview.widget.LinearLayoutManager(context)
-        binding?.recyclerView?.layoutManager = layoutManager
-        binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
-
-        userViewModel.user.observeOnce(this) {
-            if (it != null) {
-                user = it
-                adapter?.user = it
-            }
-        }
-
-
-        binding?.titleTextView?.visibility = View.GONE
-        setAdapter()
-        this.loadItems()
-    }
-
-    private fun setAdapter() {
-        val context = activity
-
-        adapter = binding?.recyclerView?.adapter as? ItemRecyclerAdapter
-        if (adapter == null) {
-            context?.let {
-                adapter = ItemRecyclerAdapter(context)
-            }
-            binding?.recyclerView?.adapter = adapter
-        }
-        adapter?.onUseSpecialItem = { onSpecialItemSelected(it) }
-        adapter?.onSellItem = {
-            lifecycleScope.launchCatching {
-                inventoryRepository.sellItem(it)
-            }
-        }
-        adapter?.onQuestInvitation = {
-            lifecycleScope.launchCatching {
-                inventoryRepository.inviteToQuest(it)
-                MainNavigationController.navigate(R.id.partyFragment)
-            }
-        }
-        adapter?.onOpenMysteryItem = {
-            lifecycleScope.launchCatching {
-                val item = inventoryRepository.openMysteryItem(user) ?: return@launchCatching
-                val activity = activity as? MainActivity
-                if (activity != null) {
-                    val dialog = OpenedMysteryitemDialog(activity)
-                    dialog.isCelebratory = true
-                    dialog.setTitle(R.string.mystery_item_title)
-                    dialog.binding.iconView.loadImage("shop_${item.key}")
-                    dialog.binding.titleView.text = item.text
-                    dialog.binding.descriptionView.text = item.notes
-                    dialog.addButton(R.string.equip, true) { _, _ ->
-                        lifecycleScope.launchCatching {
-                            item.key?.let { mysteryItem -> inventoryRepository.equip("equipped", mysteryItem) }
-                        }
-                    }
-                    dialog.addCloseButton()
-                    dialog.enqueue()
-                }
-            }
-        }
-        adapter?.onStartHatching = { showHatchingDialog(it) }
-        adapter?.onHatchPet = { pet, egg -> hatchPet(pet, egg) }
-        adapter?.onCreateNewParty = { createNewParty() }
-        adapter?.itemType = itemType ?: ""
-        adapter?.itemText = (if (itemType == "hatchingPotions") context?.getString(R.string.potions) else itemTypeText) ?: ""
-        adapter?.onOpenShop = {
-            Analytics.sendEvent("Items CTA tap", EventCategory.BEHAVIOUR, HitType.EVENT, mapOf(
-                "area" to "bottom",
-                "type" to (itemType ?: "")
-            ))
-            if (itemType == "quests") {
-                MainNavigationController.navigate(R.id.questShopFragment)
-            } else {
-                openMarket()
-            }
-        }
-    }
-
-    private fun showHatchingDialog(item: Item) {
-        val fragment = ItemDialogFragment()
-        if (item is Egg) {
-            fragment.itemType = "hatchingPotions"
-            fragment.hatchingItem = item
-        } else {
-            fragment.itemType = "eggs"
-            fragment.hatchingItem = item
-        }
-        fragment.isHatching = true
-        fragment.isFeeding = false
-        parentFragmentManager.let { fragment.show(it, "hatchingDialog") }
-    }
-
-    override fun onSaveInstanceState(outState: Bundle) {
-        super.onSaveInstanceState(outState)
-        outState.putString(ITEM_TYPE_KEY, this.itemType)
-        outState.putString(ITEM_TYPE_TEXT_KEY, this.itemTypeText)
-    }
-
-    override fun onRefresh() {
-        binding?.refreshLayout?.isRefreshing = true
-        lifecycleScope.launch(ExceptionHandler.coroutine()) {
-            userRepository.retrieveUser(true, true)
-            binding?.refreshLayout?.isRefreshing = false
-        }
-    }
-
-    private fun hatchPet(potion: HatchingPotion, egg: Egg) {
-        (activity as? BaseActivity)?.let {
-            lifecycleScope.launchCatching {
-                hatchPetUseCase.callInteractor(
-                    HatchPetUseCase.RequestValues(
-                        potion,
-                        egg,
-                        it
-                    )
-                )
-            }
-        }
-    }
-
-    private fun createNewParty() {
-        val alert = context?.let { HabiticaAlertDialog(it) }
-        alert?.setTitle(R.string.quest_party_required_title)
-        alert?.setMessage(R.string.quest_party_required_description)
-        alert?.addButton(R.string.create_new_party, true, false) { _, _ ->
-            lifecycleScope.launch(ExceptionHandler.coroutine()) {
-                socialRepository.createGroup(
-                    getString(R.string.usernames_party, user?.profile?.name),
-                    "",
-                    user?.id,
-                    "party",
-                    "",
-                    false
-                )
-                val user = userRepository.retrieveUser(false, true)
-                if (user?.hasParty == true) {
-                    val party = socialRepository.retrieveGroup("party")
-                    socialRepository.retrievePartyMembers(party?.id ?: "", true)
-                    MainNavigationController.navigate(
-                        R.id.partyFragment,
-                        bundleOf(Pair("partyID", user.party?.id))
-                    )
-                }
-            }
-        }
-        alert?.addButton(R.string.close, false) { _, _ ->
-            alert.dismiss()
-        }
-        alert?.show()
-    }
-
-    private fun loadItems() {
-        val itemClass: Class<out Item> = when (itemType) {
-            "eggs" -> Egg::class.java
-            "hatchingPotions" -> HatchingPotion::class.java
-            "food" -> Food::class.java
-            "quests" -> QuestContent::class.java
-            "special" -> SpecialItem::class.java
-            else -> Egg::class.java
-        }
-        itemType?.let { type ->
-            lifecycleScope.launch(ExceptionHandler.coroutine()) {
-                inventoryRepository.getOwnedItems(type)
-                    .onEach { items ->
-                        adapter?.data = items
-                    }
-                    .map { items -> items.mapNotNull { it.key } }
-                    .map {
-                        inventoryRepository.getItems(itemClass, it.toTypedArray()).firstOrNull()
-                    }
-                    .collect {
-                        val itemMap = mutableMapOf<String, Item>()
-                        for (item in it ?: emptyList()) {
-                            itemMap[item.key] = item
-                        }
-                        adapter?.items = itemMap
-                    }
-            }
-            lifecycleScope.launch(ExceptionHandler.coroutine()) {
-                inventoryRepository.getPets().collect { adapter?.setExistingPets(it) }
-            }
-            lifecycleScope.launch(ExceptionHandler.coroutine()) {
-                inventoryRepository.getOwnedPets().map { ownedPets ->
-                    val petMap = mutableMapOf<String, OwnedPet>()
-                    ownedPets.forEach { petMap[it.key ?: ""] = it }
-                    return@map petMap
-                }.collect { adapter?.setOwnedPets(it) }
-            }
-        }
-    }
-
-    private fun openMarket() {
-        MainNavigationController.navigate(R.id.marketFragment)
-    }
-
-    private fun onSpecialItemSelected(specialItem: SpecialItem) {
-        selectedSpecialItem = specialItem
-        val intent = Intent(activity, SkillMemberActivity::class.java)
-        memberSelectionResult.launch(intent)
-    }
-
-    private val memberSelectionResult =
-        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-            if (it.resultCode == Activity.RESULT_OK) {
-                useSpecialItem(selectedSpecialItem, it.data?.getStringExtra("member_id"))
-            }
-        }
-
-    private fun useSpecialItem(specialItem: SpecialItem?, memberID: String? = null) {
-        if (specialItem == null || memberID == null) {
-            return
-        }
-        lifecycleScope.launchCatching {
-            userRepository.useSkill(specialItem.key, specialItem.target, memberID)
-            displaySpecialItemResult(specialItem)
-        }
-    }
-
-    private fun displaySpecialItemResult(specialItem: SpecialItem?) {
-        if (!isAdded) return
-
-        val activity = activity as? MainActivity
-        activity?.let {
-            HabiticaSnackbar.showSnackbar(
-                it.snackbarContainer,
-                context?.getString(R.string.used_skill_without_mana, specialItem?.text),
-                HabiticaSnackbar.SnackbarDisplayType.BLUE
-            )
-        }
-
-        loadItems()
-    }
-
-    companion object {
-
-        private const val ITEM_TYPE_KEY = "CLASS_TYPE_KEY"
-        private const val ITEM_TYPE_TEXT_KEY = "CLASS_TYPE_TEXT_KEY"
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.inventory.items
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.core.os.bundleOf
+import androidx.lifecycle.lifecycleScope
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.data.InventoryRepository
+import com.habitrpg.android.habitica.data.SocialRepository
+import com.habitrpg.android.habitica.data.UserRepository
+import com.habitrpg.android.habitica.databinding.FragmentItemsBinding
+import com.habitrpg.android.habitica.extensions.addCloseButton
+import com.habitrpg.android.habitica.helpers.Analytics
+import com.habitrpg.android.habitica.helpers.EventCategory
+import com.habitrpg.android.habitica.helpers.HitType
+import com.habitrpg.android.habitica.interactors.HatchPetUseCase
+import com.habitrpg.android.habitica.models.inventory.Egg
+import com.habitrpg.android.habitica.models.inventory.Food
+import com.habitrpg.android.habitica.models.inventory.HatchingPotion
+import com.habitrpg.android.habitica.models.inventory.Item
+import com.habitrpg.android.habitica.models.inventory.QuestContent
+import com.habitrpg.android.habitica.models.inventory.SpecialItem
+import com.habitrpg.android.habitica.models.user.OwnedItem
+import com.habitrpg.android.habitica.models.user.OwnedPet
+import com.habitrpg.android.habitica.models.user.User
+import com.habitrpg.android.habitica.ui.activities.BaseActivity
+import com.habitrpg.android.habitica.ui.activities.MainActivity
+import com.habitrpg.android.habitica.ui.activities.SkillMemberActivity
+import com.habitrpg.android.habitica.ui.adapter.inventory.ItemRecyclerAdapter
+import com.habitrpg.android.habitica.ui.fragments.BaseFragment
+import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
+import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
+import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
+import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
+import com.habitrpg.android.habitica.ui.views.dialogs.OpenedMysteryitemDialog
+import com.habitrpg.common.habitica.extensions.loadImage
+import com.habitrpg.common.habitica.extensions.observeOnce
+import com.habitrpg.common.habitica.helpers.EmptyItem
+import com.habitrpg.common.habitica.helpers.ExceptionHandler
+import com.habitrpg.common.habitica.helpers.MainNavigationController
+import com.habitrpg.common.habitica.helpers.launchCatching
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class ItemRecyclerFragment :
+    BaseFragment<FragmentItemsBinding>(),
+    SwipeRefreshLayout.OnRefreshListener {
+    @Inject
+    lateinit var inventoryRepository: InventoryRepository
+
+    @Inject
+    lateinit var socialRepository: SocialRepository
+
+    @Inject
+    lateinit var userRepository: UserRepository
+
+    @Inject
+    internal lateinit var hatchPetUseCase: HatchPetUseCase
+
+    @Inject
+    lateinit var userViewModel: MainUserViewModel
+
+    var user: User? = null
+    var adapter: ItemRecyclerAdapter? = null
+    var itemType: String? = null
+    var transformationItems: MutableList<OwnedItem> = mutableListOf()
+    var itemTypeText: String? = null
+    private var selectedSpecialItem: SpecialItem? = null
+    internal var layoutManager: androidx.recyclerview.widget.LinearLayoutManager? = null
+
+    override var binding: FragmentItemsBinding? = null
+
+    override fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+    ): FragmentItemsBinding {
+        return FragmentItemsBinding.inflate(inflater, container, false)
+    }
+
+    override fun onDestroy() {
+        inventoryRepository.close()
+        super.onDestroy()
+    }
+
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
+        super.onViewCreated(view, savedInstanceState)
+
+        if (savedInstanceState != null) {
+            this.itemType = savedInstanceState.getString(ITEM_TYPE_KEY, "")
+            this.itemTypeText = savedInstanceState.getString(ITEM_TYPE_TEXT_KEY, "")
+        }
+
+        binding?.refreshLayout?.setOnRefreshListener(this)
+        val buttonMethod = {
+            Analytics.sendEvent(
+                "Items CTA tap",
+                EventCategory.BEHAVIOUR,
+                HitType.EVENT,
+                mapOf(
+                    "area" to "empty",
+                    "type" to (itemType ?: ""),
+                ),
+            )
+            if (itemType == "quests") {
+                MainNavigationController.navigate(R.id.questShopFragment)
+            } else {
+                openMarket()
+            }
+        }
+        binding?.recyclerView?.emptyItem =
+            EmptyItem(
+                getString(R.string.no_x, itemTypeText ?: itemType),
+                when (itemType) {
+                    "food" -> getString(R.string.empty_food_description)
+                    "quests" -> getString(R.string.empty_quests_description)
+                    "special" -> getString(R.string.empty_special_description_subscribed)
+                    "eggs" -> getString(R.string.empty_eggs_description)
+                    "hatchingPotions" -> getString(R.string.empty_potions_description)
+                    else -> ""
+                },
+                when (itemType) {
+                    "eggs" -> R.drawable.icon_eggs
+                    "hatchingPotions" -> R.drawable.icon_hatchingpotions
+                    "food" -> R.drawable.icon_food
+                    "quests" -> R.drawable.icon_quests
+                    "special" -> R.drawable.icon_special
+                    else -> null
+                },
+                false,
+                if (itemType == "special") null else buttonMethod,
+            )
+
+        layoutManager = androidx.recyclerview.widget.LinearLayoutManager(context)
+        binding?.recyclerView?.layoutManager = layoutManager
+        binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
+
+        userViewModel.user.observeOnce(this) {
+            if (it != null) {
+                user = it
+                adapter?.user = it
+            }
+        }
+
+        binding?.titleTextView?.visibility = View.GONE
+        setAdapter()
+        this.loadItems()
+    }
+
+    private fun setAdapter() {
+        val context = activity
+
+        adapter = binding?.recyclerView?.adapter as? ItemRecyclerAdapter
+        if (adapter == null) {
+            context?.let {
+                adapter = ItemRecyclerAdapter(context)
+            }
+            binding?.recyclerView?.adapter = adapter
+        }
+        adapter?.onUseSpecialItem = { onSpecialItemSelected(it) }
+        adapter?.onSellItem = {
+            lifecycleScope.launchCatching {
+                inventoryRepository.sellItem(it)
+            }
+        }
+        adapter?.onQuestInvitation = {
+            lifecycleScope.launchCatching {
+                inventoryRepository.inviteToQuest(it)
+                MainNavigationController.navigate(R.id.partyFragment)
+            }
+        }
+        adapter?.onOpenMysteryItem = {
+            lifecycleScope.launchCatching {
+                val item = inventoryRepository.openMysteryItem(user) ?: return@launchCatching
+                val activity = activity as? MainActivity
+                if (activity != null) {
+                    val dialog = OpenedMysteryitemDialog(activity)
+                    dialog.isCelebratory = true
+                    dialog.setTitle(R.string.mystery_item_title)
+                    dialog.binding.iconView.loadImage("shop_${item.key}")
+                    dialog.binding.titleView.text = item.text
+                    dialog.binding.descriptionView.text = item.notes
+                    dialog.addButton(R.string.equip, true) { _, _ ->
+                        lifecycleScope.launchCatching {
+                            item.key?.let { mysteryItem ->
+                                inventoryRepository.equip(
+                                    "equipped",
+                                    mysteryItem,
+                                )
+                            }
+                        }
+                    }
+                    dialog.addCloseButton()
+                    dialog.enqueue()
+                }
+            }
+        }
+        adapter?.onStartHatching = { showHatchingDialog(it) }
+        adapter?.onHatchPet = { pet, egg -> hatchPet(pet, egg) }
+        adapter?.onCreateNewParty = { createNewParty() }
+        adapter?.itemType = itemType ?: ""
+        adapter?.itemText =
+            (if (itemType == "hatchingPotions") context?.getString(R.string.potions) else itemTypeText)
+                ?: ""
+        adapter?.onOpenShop = {
+            Analytics.sendEvent(
+                "Items CTA tap",
+                EventCategory.BEHAVIOUR,
+                HitType.EVENT,
+                mapOf(
+                    "area" to "bottom",
+                    "type" to (itemType ?: ""),
+                ),
+            )
+            if (itemType == "quests") {
+                MainNavigationController.navigate(R.id.questShopFragment)
+            } else {
+                openMarket()
+            }
+        }
+    }
+
+    private fun showHatchingDialog(item: Item) {
+        val fragment = ItemDialogFragment()
+        if (item is Egg) {
+            fragment.itemType = "hatchingPotions"
+            fragment.hatchingItem = item
+        } else {
+            fragment.itemType = "eggs"
+            fragment.hatchingItem = item
+        }
+        fragment.isHatching = true
+        fragment.isFeeding = false
+        parentFragmentManager.let { fragment.show(it, "hatchingDialog") }
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState.putString(ITEM_TYPE_KEY, this.itemType)
+        outState.putString(ITEM_TYPE_TEXT_KEY, this.itemTypeText)
+    }
+
+    override fun onRefresh() {
+        binding?.refreshLayout?.isRefreshing = true
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.retrieveUser(true, true)
+            binding?.refreshLayout?.isRefreshing = false
+        }
+    }
+
+    private fun hatchPet(
+        potion: HatchingPotion,
+        egg: Egg,
+    ) {
+        (activity as? BaseActivity)?.let {
+            lifecycleScope.launchCatching {
+                hatchPetUseCase.callInteractor(
+                    HatchPetUseCase.RequestValues(
+                        potion,
+                        egg,
+                        it,
+                    ),
+                )
+            }
+        }
+    }
+
+    private fun createNewParty() {
+        val alert = context?.let { HabiticaAlertDialog(it) }
+        alert?.setTitle(R.string.quest_party_required_title)
+        alert?.setMessage(R.string.quest_party_required_description)
+        alert?.addButton(R.string.create_new_party, true, false) { _, _ ->
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                socialRepository.createGroup(
+                    getString(R.string.usernames_party, user?.profile?.name),
+                    "",
+                    user?.id,
+                    "party",
+                    "",
+                    false,
+                )
+                val user = userRepository.retrieveUser(false, true)
+                if (user?.hasParty == true) {
+                    val party = socialRepository.retrieveGroup("party")
+                    socialRepository.retrievePartyMembers(party?.id ?: "", true)
+                    MainNavigationController.navigate(
+                        R.id.partyFragment,
+                        bundleOf(Pair("partyID", user.party?.id)),
+                    )
+                }
+            }
+        }
+        alert?.addButton(R.string.close, false) { _, _ ->
+            alert.dismiss()
+        }
+        alert?.show()
+    }
+
+    private fun loadItems() {
+        val itemClass: Class<out Item> =
+            when (itemType) {
+                "eggs" -> Egg::class.java
+                "hatchingPotions" -> HatchingPotion::class.java
+                "food" -> Food::class.java
+                "quests" -> QuestContent::class.java
+                "special" -> SpecialItem::class.java
+                else -> Egg::class.java
+            }
+        itemType?.let { type ->
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                inventoryRepository.getOwnedItems(type)
+                    .onEach { items ->
+                        adapter?.data = items
+                    }
+                    .map { items -> items.mapNotNull { it.key } }
+                    .map {
+                        inventoryRepository.getItems(itemClass, it.toTypedArray()).firstOrNull()
+                    }
+                    .collect {
+                        val itemMap = mutableMapOf<String, Item>()
+                        for (item in it ?: emptyList()) {
+                            itemMap[item.key] = item
+                        }
+                        adapter?.items = itemMap
+                    }
+            }
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                inventoryRepository.getPets().collect { adapter?.setExistingPets(it) }
+            }
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                inventoryRepository.getOwnedPets().map { ownedPets ->
+                    val petMap = mutableMapOf<String, OwnedPet>()
+                    ownedPets.forEach { petMap[it.key ?: ""] = it }
+                    return@map petMap
+                }.collect { adapter?.setOwnedPets(it) }
+            }
+        }
+    }
+
+    private fun openMarket() {
+        MainNavigationController.navigate(R.id.marketFragment)
+    }
+
+    private fun onSpecialItemSelected(specialItem: SpecialItem) {
+        selectedSpecialItem = specialItem
+        val intent = Intent(activity, SkillMemberActivity::class.java)
+        memberSelectionResult.launch(intent)
+    }
+
+    private val memberSelectionResult =
+        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+            if (it.resultCode == Activity.RESULT_OK) {
+                useSpecialItem(selectedSpecialItem, it.data?.getStringExtra("member_id"))
+            }
+        }
+
+    private fun useSpecialItem(
+        specialItem: SpecialItem?,
+        memberID: String? = null,
+    ) {
+        if (specialItem == null || memberID == null) {
+            return
+        }
+        lifecycleScope.launchCatching {
+            userRepository.useSkill(specialItem.key, specialItem.target, memberID)
+            displaySpecialItemResult(specialItem)
+        }
+    }
+
+    private fun displaySpecialItemResult(specialItem: SpecialItem?) {
+        if (!isAdded) return
+
+        val activity = activity as? MainActivity
+        activity?.let {
+            HabiticaSnackbar.showSnackbar(
+                it.snackbarContainer,
+                context?.getString(R.string.used_skill_without_mana, specialItem?.text),
+                HabiticaSnackbar.SnackbarDisplayType.BLUE,
+            )
+        }
+
+        loadItems()
+    }
+
+    companion object {
+        private const val ITEM_TYPE_KEY = "CLASS_TYPE_KEY"
+        private const val ITEM_TYPE_TEXT_KEY = "CLASS_TYPE_TEXT_KEY"
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemsFragment.kt
index 1359e7395..a6d9b5da4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemsFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemsFragment.kt
@@ -14,24 +14,29 @@ import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
 class ItemsFragment : BaseMainFragment<FragmentViewpagerBinding>() {
-
     override var binding: FragmentViewpagerBinding? = null
 
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentViewpagerBinding {
+    override fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+    ): FragmentViewpagerBinding {
         return FragmentViewpagerBinding.inflate(inflater, container, false)
     }
 
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View? {
         this.usesTabLayout = true
         this.hidesToolbar = true
         return super.onCreateView(inflater, container, savedInstanceState)
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
         super.onViewCreated(view, savedInstanceState)
 
         binding?.viewPager?.currentItem = 0
@@ -39,46 +44,48 @@ class ItemsFragment : BaseMainFragment<FragmentViewpagerBinding>() {
 
         arguments?.let {
             val args = ItemsFragmentArgs.fromBundle(it)
-            binding?.viewPager?.currentItem = when (args.itemType) {
-                "hatchingPotions" -> 1
-                "food" -> 2
-                "quests" -> 3
-                "special" -> 4
-                else -> 0
-            }
+            binding?.viewPager?.currentItem =
+                when (args.itemType) {
+                    "hatchingPotions" -> 1
+                    "food" -> 2
+                    "quests" -> 3
+                    "special" -> 4
+                    else -> 0
+                }
         }
     }
 
     private fun setViewPagerAdapter() {
         val fragmentManager = childFragmentManager
 
-        binding?.viewPager?.adapter = object : FragmentStateAdapter(fragmentManager, lifecycle) {
+        binding?.viewPager?.adapter =
+            object : FragmentStateAdapter(fragmentManager, lifecycle) {
+                override fun createFragment(position: Int): androidx.fragment.app.Fragment {
+                    val fragment = ItemRecyclerFragment()
 
-            override fun createFragment(position: Int): androidx.fragment.app.Fragment {
-                val fragment = ItemRecyclerFragment()
+                    fragment.itemType =
+                        when (position) {
+                            0 -> "eggs"
+                            1 -> "hatchingPotions"
+                            2 -> "food"
+                            3 -> "quests"
+                            4 -> "special"
+                            else -> ""
+                        }
+                    fragment.itemTypeText =
+                        if (position == 4 && isAdded) {
+                            getString(R.string.special_items)
+                        } else {
+                            getPageTitle(position)
+                        }
 
-                fragment.itemType = when (position) {
-                    0 -> "eggs"
-                    1 -> "hatchingPotions"
-                    2 -> "food"
-                    3 -> "quests"
-                    4 -> "special"
-                    else -> ""
+                    return fragment
                 }
-                fragment.itemTypeText =
-                    if (position == 4 && isAdded) {
-                        getString(R.string.special_items)
-                    } else {
-                        getPageTitle(position)
-                    }
 
-                return fragment
+                override fun getItemCount(): Int {
+                    return 5
+                }
             }
-
-            override fun getItemCount(): Int {
-                return 5
-            }
-        }
         tabLayout?.let {
             binding?.viewPager?.let { it1 ->
                 TabLayoutMediator(it, it1) { tab, position ->
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/MarketFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/MarketFragment.kt
index 0ea664dea..74aac4205 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/MarketFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/MarketFragment.kt
@@ -12,7 +12,7 @@ class MarketFragment : ShopFragment() {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View? {
         shopIdentifier = Shop.MARKET
         return super.onCreateView(inflater, container, savedInstanceState)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/QuestShopFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/QuestShopFragment.kt
index 5ed26abba..dbce848c9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/QuestShopFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/QuestShopFragment.kt
@@ -14,13 +14,16 @@ class QuestShopFragment : ShopFragment() {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View? {
         shopIdentifier = Shop.QUEST_SHOP
         return super.onCreateView(inflater, container, savedInstanceState)
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
         super.onViewCreated(view, savedInstanceState)
 
         lifecycleScope.launchCatching {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/SeasonalShopFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/SeasonalShopFragment.kt
index 455efd057..c0fae5296 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/SeasonalShopFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/SeasonalShopFragment.kt
@@ -12,7 +12,7 @@ class SeasonalShopFragment : ShopFragment() {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View? {
         shopIdentifier = Shop.SEASONAL_SHOP
         return super.onCreateView(inflater, container, savedInstanceState)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/TimeTravelersShopFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/TimeTravelersShopFragment.kt
index c66f86499..322d7ebdf 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/TimeTravelersShopFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/TimeTravelersShopFragment.kt
@@ -19,13 +19,16 @@ class TimeTravelersShopFragment : ShopFragment() {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View? {
         shopIdentifier = Shop.TIME_TRAVELERS_SHOP
         return super.onCreateView(inflater, container, savedInstanceState)
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
         super.onViewCreated(view, savedInstanceState)
         initializeCurrencyViews()
 
@@ -33,14 +36,16 @@ class TimeTravelersShopFragment : ShopFragment() {
             val user = userViewModel.user.value
             if (user?.isSubscribed != true) {
                 delay(2.seconds)
-                val subscriptionBottomSheet = EventOutcomeSubscriptionBottomSheetFragment().apply {
-                    eventType = EventOutcomeSubscriptionBottomSheetFragment.EVENT_HOURGLASS_SHOP_OPENED
-                }
+                val subscriptionBottomSheet =
+                    EventOutcomeSubscriptionBottomSheetFragment().apply {
+                        eventType =
+                            EventOutcomeSubscriptionBottomSheetFragment.EVENT_HOURGLASS_SHOP_OPENED
+                    }
                 if (isAdded) {
                     activity?.supportFragmentManager?.let {
                         subscriptionBottomSheet.show(
                             it,
-                            SubscriptionBottomSheetFragment.TAG
+                            SubscriptionBottomSheetFragment.TAG,
                         )
                     }
                 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.kt
index 763ce736e..3ddf91a37 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.kt
@@ -1,178 +1,189 @@
-package com.habitrpg.android.habitica.ui.fragments.inventory.stable
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.lifecycle.lifecycleScope
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.data.InventoryRepository
-import com.habitrpg.android.habitica.databinding.FragmentRefreshRecyclerviewBinding
-import com.habitrpg.android.habitica.models.inventory.Mount
-import com.habitrpg.android.habitica.models.inventory.StableSection
-import com.habitrpg.android.habitica.models.user.OwnedMount
-import com.habitrpg.android.habitica.ui.adapter.inventory.MountDetailRecyclerAdapter
-import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
-import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
-import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
-import com.habitrpg.common.habitica.helpers.ExceptionHandler
-import com.habitrpg.common.habitica.helpers.launchCatching
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.flow.firstOrNull
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class MountDetailRecyclerFragment :
-    BaseMainFragment<FragmentRefreshRecyclerviewBinding>(),
-    SwipeRefreshLayout.OnRefreshListener {
-
-    @Inject
-    internal lateinit var inventoryRepository: InventoryRepository
-
-    @Inject
-    lateinit var userViewModel: MainUserViewModel
-
-    var adapter: MountDetailRecyclerAdapter? = null
-    var animalType: String? = null
-    var animalGroup: String? = null
-    var animalColor: String? = null
-    internal var layoutManager: androidx.recyclerview.widget.GridLayoutManager? = null
-
-    override var binding: FragmentRefreshRecyclerviewBinding? = null
-
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentRefreshRecyclerviewBinding {
-        return FragmentRefreshRecyclerviewBinding.inflate(inflater, container, false)
-    }
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        this.usesTabLayout = false
-        return super.onCreateView(inflater, container, savedInstanceState)
-    }
-
-    override fun onDestroy() {
-        inventoryRepository.close()
-        super.onDestroy()
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        showsBackButton = true
-        super.onViewCreated(view, savedInstanceState)
-
-        arguments?.let {
-            val args = MountDetailRecyclerFragmentArgs.fromBundle(it)
-            if (args.group != "drop") {
-                animalGroup = args.group
-            }
-            animalType = args.type
-            animalColor = args.color
-        }
-        binding?.refreshLayout?.setOnRefreshListener(this)
-
-        layoutManager = androidx.recyclerview.widget.GridLayoutManager(mainActivity, 4)
-        layoutManager?.spanSizeLookup = object : androidx.recyclerview.widget.GridLayoutManager.SpanSizeLookup() {
-            override fun getSpanSize(position: Int): Int {
-                return if (adapter?.getItemViewType(position) == 0 || adapter?.getItemViewType(position) == 1) {
-                    layoutManager?.spanCount ?: 1
-                } else {
-                    1
-                }
-            }
-        }
-        binding?.recyclerView?.layoutManager = layoutManager
-
-        adapter = binding?.recyclerView?.adapter as? MountDetailRecyclerAdapter
-        if (adapter == null) {
-            adapter = MountDetailRecyclerAdapter()
-            binding?.recyclerView?.adapter = adapter
-            binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
-            this.loadItems()
-
-            adapter?.onEquip = {
-                lifecycleScope.launchCatching {
-                    val items = inventoryRepository.equip("mount", it)
-                    adapter?.currentMount = items?.currentMount
-                }
-            }
-        }
-        userViewModel.user.observe(viewLifecycleOwner) { adapter?.currentMount = it?.currentMount }
-
-        if (savedInstanceState != null) {
-            this.animalType = savedInstanceState.getString(ANIMAL_TYPE_KEY, "")
-        }
-
-        view.post { setGridSpanCount(view.width) }
-    }
-
-    override fun onSaveInstanceState(outState: Bundle) {
-        super.onSaveInstanceState(outState)
-        outState.putString(ANIMAL_TYPE_KEY, this.animalType)
-    }
-
-    private fun setGridSpanCount(width: Int) {
-        var spanCount = 0
-        context?.resources?.let {
-            resources
-            val itemWidth: Float = resources.getDimension(R.dimen.mount_width)
-
-            spanCount = (width / itemWidth).toInt()
-        }
-        if (spanCount == 0) {
-            spanCount = 1
-        }
-        layoutManager?.spanCount = spanCount
-        layoutManager?.requestLayout()
-    }
-
-    private fun loadItems() {
-        if (animalType != null || animalGroup != null) {
-            lifecycleScope.launch(ExceptionHandler.coroutine()) {
-                val mounts = inventoryRepository.getMounts(animalType, animalGroup, animalColor).firstOrNull() ?: emptyList()
-                inventoryRepository.getOwnedMounts().map { ownedMounts ->
-                    val mountMap = mutableMapOf<String, OwnedMount>()
-                    ownedMounts.forEach { mountMap[it.key ?: ""] = it }
-                    return@map mountMap
-                }.onEach { adapter?.setOwnedMounts(it) }
-                    .collect { ownedMounts ->
-                        val items = mutableListOf<Any>()
-                        var lastMount: Mount? = null
-                        var currentSection: StableSection? = null
-                        for (mount in mounts) {
-                            if (mount.type == "wacky" || mount.type == "special") continue
-                            if (mount.type != lastMount?.type) {
-                                currentSection = StableSection(mount.type, "mounts")
-                                items.add(currentSection)
-                            }
-                            currentSection?.let {
-                                it.totalCount += 1
-                                if (ownedMounts.containsKey(mount.key)) {
-                                    it.ownedCount += 1
-                                }
-                            }
-                            items.add(mount)
-                            lastMount = mount
-                        }
-                        adapter?.setItemList(items)
-                    }
-            }
-        }
-    }
-
-    companion object {
-        private const val ANIMAL_TYPE_KEY = "ANIMAL_TYPE_KEY"
-    }
-
-    override fun onRefresh() {
-        lifecycleScope.launch(ExceptionHandler.coroutine()) {
-            userRepository.retrieveUser(false, true)
-            binding?.refreshLayout?.isRefreshing = false
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.inventory.stable
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.lifecycle.lifecycleScope
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.data.InventoryRepository
+import com.habitrpg.android.habitica.databinding.FragmentRefreshRecyclerviewBinding
+import com.habitrpg.android.habitica.models.inventory.Mount
+import com.habitrpg.android.habitica.models.inventory.StableSection
+import com.habitrpg.android.habitica.models.user.OwnedMount
+import com.habitrpg.android.habitica.ui.adapter.inventory.MountDetailRecyclerAdapter
+import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
+import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
+import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
+import com.habitrpg.common.habitica.helpers.ExceptionHandler
+import com.habitrpg.common.habitica.helpers.launchCatching
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class MountDetailRecyclerFragment :
+    BaseMainFragment<FragmentRefreshRecyclerviewBinding>(),
+    SwipeRefreshLayout.OnRefreshListener {
+    @Inject
+    internal lateinit var inventoryRepository: InventoryRepository
+
+    @Inject
+    lateinit var userViewModel: MainUserViewModel
+
+    var adapter: MountDetailRecyclerAdapter? = null
+    var animalType: String? = null
+    var animalGroup: String? = null
+    var animalColor: String? = null
+    internal var layoutManager: androidx.recyclerview.widget.GridLayoutManager? = null
+
+    override var binding: FragmentRefreshRecyclerviewBinding? = null
+
+    override fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+    ): FragmentRefreshRecyclerviewBinding {
+        return FragmentRefreshRecyclerviewBinding.inflate(inflater, container, false)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?,
+    ): View? {
+        this.usesTabLayout = false
+        return super.onCreateView(inflater, container, savedInstanceState)
+    }
+
+    override fun onDestroy() {
+        inventoryRepository.close()
+        super.onDestroy()
+    }
+
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
+        showsBackButton = true
+        super.onViewCreated(view, savedInstanceState)
+
+        arguments?.let {
+            val args = MountDetailRecyclerFragmentArgs.fromBundle(it)
+            if (args.group != "drop") {
+                animalGroup = args.group
+            }
+            animalType = args.type
+            animalColor = args.color
+        }
+        binding?.refreshLayout?.setOnRefreshListener(this)
+
+        layoutManager = androidx.recyclerview.widget.GridLayoutManager(mainActivity, 4)
+        layoutManager?.spanSizeLookup =
+            object : androidx.recyclerview.widget.GridLayoutManager.SpanSizeLookup() {
+                override fun getSpanSize(position: Int): Int {
+                    return if (adapter?.getItemViewType(position) == 0 || adapter?.getItemViewType(
+                            position,
+                        ) == 1
+                    ) {
+                        layoutManager?.spanCount ?: 1
+                    } else {
+                        1
+                    }
+                }
+            }
+        binding?.recyclerView?.layoutManager = layoutManager
+
+        adapter = binding?.recyclerView?.adapter as? MountDetailRecyclerAdapter
+        if (adapter == null) {
+            adapter = MountDetailRecyclerAdapter()
+            binding?.recyclerView?.adapter = adapter
+            binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
+            this.loadItems()
+
+            adapter?.onEquip = {
+                lifecycleScope.launchCatching {
+                    val items = inventoryRepository.equip("mount", it)
+                    adapter?.currentMount = items?.currentMount
+                }
+            }
+        }
+        userViewModel.user.observe(viewLifecycleOwner) { adapter?.currentMount = it?.currentMount }
+
+        if (savedInstanceState != null) {
+            this.animalType = savedInstanceState.getString(ANIMAL_TYPE_KEY, "")
+        }
+
+        view.post { setGridSpanCount(view.width) }
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState.putString(ANIMAL_TYPE_KEY, this.animalType)
+    }
+
+    private fun setGridSpanCount(width: Int) {
+        var spanCount = 0
+        context?.resources?.let {
+            resources
+            val itemWidth: Float = resources.getDimension(R.dimen.mount_width)
+
+            spanCount = (width / itemWidth).toInt()
+        }
+        if (spanCount == 0) {
+            spanCount = 1
+        }
+        layoutManager?.spanCount = spanCount
+        layoutManager?.requestLayout()
+    }
+
+    private fun loadItems() {
+        if (animalType != null || animalGroup != null) {
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                val mounts =
+                    inventoryRepository.getMounts(animalType, animalGroup, animalColor)
+                        .firstOrNull() ?: emptyList()
+                inventoryRepository.getOwnedMounts().map { ownedMounts ->
+                    val mountMap = mutableMapOf<String, OwnedMount>()
+                    ownedMounts.forEach { mountMap[it.key ?: ""] = it }
+                    return@map mountMap
+                }.onEach { adapter?.setOwnedMounts(it) }
+                    .collect { ownedMounts ->
+                        val items = mutableListOf<Any>()
+                        var lastMount: Mount? = null
+                        var currentSection: StableSection? = null
+                        for (mount in mounts) {
+                            if (mount.type == "wacky" || mount.type == "special") continue
+                            if (mount.type != lastMount?.type) {
+                                currentSection = StableSection(mount.type, "mounts")
+                                items.add(currentSection)
+                            }
+                            currentSection?.let {
+                                it.totalCount += 1
+                                if (ownedMounts.containsKey(mount.key)) {
+                                    it.ownedCount += 1
+                                }
+                            }
+                            items.add(mount)
+                            lastMount = mount
+                        }
+                        adapter?.setItemList(items)
+                    }
+            }
+        }
+    }
+
+    companion object {
+        private const val ANIMAL_TYPE_KEY = "ANIMAL_TYPE_KEY"
+    }
+
+    override fun onRefresh() {
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.retrieveUser(false, true)
+            binding?.refreshLayout?.isRefreshing = false
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.kt
index 225a219ab..bf6ad8362 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.kt
@@ -1,274 +1,282 @@
-package com.habitrpg.android.habitica.ui.fragments.inventory.stable
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.lifecycle.lifecycleScope
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.data.InventoryRepository
-import com.habitrpg.android.habitica.databinding.FragmentRefreshRecyclerviewBinding
-import com.habitrpg.common.habitica.extensions.observeOnce
-import com.habitrpg.android.habitica.helpers.ReviewManager
-import com.habitrpg.android.habitica.interactors.FeedPetUseCase
-import com.habitrpg.android.habitica.models.inventory.Egg
-import com.habitrpg.android.habitica.models.inventory.Food
-import com.habitrpg.android.habitica.models.inventory.HatchingPotion
-import com.habitrpg.android.habitica.models.inventory.Pet
-import com.habitrpg.android.habitica.models.inventory.StableSection
-import com.habitrpg.android.habitica.models.user.OwnedMount
-import com.habitrpg.android.habitica.models.user.OwnedPet
-import com.habitrpg.android.habitica.ui.adapter.inventory.PetDetailRecyclerAdapter
-import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
-import com.habitrpg.android.habitica.ui.fragments.inventory.items.ItemDialogFragment
-import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
-import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
-import com.habitrpg.common.habitica.helpers.ExceptionHandler
-import com.habitrpg.common.habitica.helpers.launchCatching
-import com.habitrpg.shared.habitica.models.responses.FeedResponse
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.flow.firstOrNull
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-import kotlin.coroutines.resume
-import kotlin.coroutines.suspendCoroutine
-
-@AndroidEntryPoint
-class PetDetailRecyclerFragment :
-    BaseMainFragment<FragmentRefreshRecyclerviewBinding>(),
-    SwipeRefreshLayout.OnRefreshListener {
-
-    @Inject
-    lateinit var inventoryRepository: InventoryRepository
-
-    @Inject
-    lateinit var feedPetUseCase: FeedPetUseCase
-
-    @Inject
-    lateinit var userViewModel: MainUserViewModel
-
-    val adapter: PetDetailRecyclerAdapter = PetDetailRecyclerAdapter()
-    private var animalType: String? = null
-    private var animalGroup: String? = null
-    private var animalColor: String? = null
-    internal var layoutManager: androidx.recyclerview.widget.GridLayoutManager? = null
-
-    @Inject
-    lateinit var reviewManager: ReviewManager
-
-    override var binding: FragmentRefreshRecyclerviewBinding? = null
-
-    override fun createBinding(
-        inflater: LayoutInflater,
-        container: ViewGroup?
-    ): FragmentRefreshRecyclerviewBinding {
-        return FragmentRefreshRecyclerviewBinding.inflate(inflater, container, false)
-    }
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        this.usesTabLayout = false
-        if (savedInstanceState != null) {
-            this.animalType = savedInstanceState.getString(ANIMAL_TYPE_KEY, "")
-        }
-        return super.onCreateView(inflater, container, savedInstanceState)
-    }
-
-    override fun onDestroy() {
-        inventoryRepository.close()
-        super.onDestroy()
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        showsBackButton = true
-        super.onViewCreated(view, savedInstanceState)
-
-        arguments?.let {
-            val args = PetDetailRecyclerFragmentArgs.fromBundle(it)
-            if (args.group != "drop") {
-                animalGroup = args.group
-            }
-            animalType = args.type
-            animalColor = args.color
-        }
-        binding?.refreshLayout?.setOnRefreshListener(this)
-
-        layoutManager = androidx.recyclerview.widget.GridLayoutManager(activity, 4)
-        layoutManager?.spanSizeLookup =
-            object : androidx.recyclerview.widget.GridLayoutManager.SpanSizeLookup() {
-                override fun getSpanSize(position: Int): Int {
-                    return if (adapter.getItemViewType(position) == 0 || adapter.getItemViewType(
-                            position
-                        ) == 1
-                    ) {
-                        layoutManager?.spanCount ?: 1
-                    } else {
-                        1
-                    }
-                }
-            }
-        binding?.recyclerView?.layoutManager = layoutManager
-        adapter.animalIngredientsRetriever = { animal, callback ->
-            lifecycleScope.launch(ExceptionHandler.coroutine()) {
-                val egg = inventoryRepository.getItems(Egg::class.java, arrayOf(animal.animal))
-                    .firstOrNull()?.firstOrNull() as? Egg
-                val potion =
-                    inventoryRepository.getItems(HatchingPotion::class.java, arrayOf(animal.color))
-                        .firstOrNull()?.firstOrNull() as? HatchingPotion
-                callback(Pair(egg, potion))
-            }
-        }
-        binding?.recyclerView?.adapter = adapter
-        binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
-        this.loadItems()
-
-        adapter.onEquip = {
-            lifecycleScope.launchCatching {
-                val items = inventoryRepository.equip("pet", it)
-                adapter.currentPet = items?.currentPet
-
-                if (isAdded) {
-                    userViewModel.user.observeOnce(viewLifecycleOwner) { user ->
-                        val parentActivity = mainActivity
-                        val totalCheckIns = user?.loginIncentives
-                        if (totalCheckIns != null && parentActivity != null) {
-                            reviewManager.requestReview(parentActivity, totalCheckIns)
-                        }
-                    }
-                }
-            }
-        }
-        userViewModel.user.observe(viewLifecycleOwner) { adapter.currentPet = it?.currentPet }
-        adapter.onFeed = { pet, food ->
-            showFeedingDialog(
-                pet,
-                food
-            )
-        }
-
-        view.post { setGridSpanCount(view.width) }
-    }
-
-    override fun onResume() {
-        super.onResume()
-        mainActivity?.title = animalType
-    }
-
-    override fun onSaveInstanceState(outState: Bundle) {
-        super.onSaveInstanceState(outState)
-        outState.putString(ANIMAL_TYPE_KEY, this.animalType)
-    }
-
-    private fun setGridSpanCount(width: Int) {
-        var spanCount = 0
-        if (context != null && context?.resources != null) {
-            val animalWidth = R.dimen.pet_width
-            val itemWidth: Float = context?.resources?.getDimension(animalWidth) ?: 0.toFloat()
-
-            spanCount = (width / itemWidth).toInt()
-        }
-        if (spanCount == 0) {
-            spanCount = 1
-        }
-        layoutManager?.spanCount = spanCount
-    }
-
-    private fun loadItems() {
-        if (animalType?.isNotEmpty() == true || animalGroup?.isNotEmpty() == true) {
-            lifecycleScope.launch(ExceptionHandler.coroutine()) {
-                inventoryRepository.getOwnedMounts()
-                    .map { ownedMounts ->
-                        val mountMap = mutableMapOf<String, OwnedMount>()
-                        ownedMounts.forEach { mountMap[it.key ?: ""] = it }
-                        return@map mountMap
-                    }.collect { adapter.setOwnedMounts(it) }
-            }
-            lifecycleScope.launchCatching {
-                inventoryRepository.getOwnedItems(true).collect { adapter.setOwnedItems(it) }
-            }
-            lifecycleScope.launch(ExceptionHandler.coroutine()) {
-                val mounts = inventoryRepository.getMounts(
-                    animalType,
-                    animalGroup,
-                    animalColor
-                ).firstOrNull() ?: emptyList()
-                adapter.setExistingMounts(mounts)
-                val pets = inventoryRepository.getPets(animalType, animalGroup, animalColor)
-                    .firstOrNull() ?: emptyList()
-                inventoryRepository.getOwnedPets()
-                    .map { ownedPets ->
-                        val petMap = mutableMapOf<String, OwnedPet>()
-                        ownedPets.forEach { petMap[it.key ?: ""] = it }
-                        return@map petMap
-                    }.onEach { adapter.setOwnedPets(it) }
-                    .collect { ownedPets ->
-                        val items = mutableListOf<Any>()
-                        var lastPet: Pet? = null
-                        var currentSection: StableSection? = null
-                        for (pet in pets) {
-                            if (pet.type == "wacky" || pet.type == "special") continue
-                            if (pet.type != lastPet?.type) {
-                                currentSection =
-                                    StableSection(
-                                        pet.type,
-                                        "pets"
-                                    )
-                                items.add(currentSection)
-                            }
-                            currentSection?.let { section ->
-                                section.totalCount += 1
-                                if (ownedPets.containsKey(pet.key)) {
-                                    section.ownedCount += 1
-                                }
-                            }
-                            items.add(pet)
-                            lastPet = pet
-                        }
-                        adapter.setItemList(items)
-                    }
-            }
-        }
-    }
-
-    private suspend fun showFeedingDialog(pet: Pet, food: Food?): FeedResponse? {
-        if (food != null) {
-            val context = mainActivity ?: context ?: return null
-            return feedPetUseCase.callInteractor(
-                FeedPetUseCase.RequestValues(
-                    pet,
-                    food,
-                    context
-                )
-            )
-        }
-        return suspendCoroutine { cont ->
-            val fragment = ItemDialogFragment()
-            fragment.feedingPet = pet
-            fragment.isFeeding = true
-            fragment.isHatching = false
-            fragment.itemType = "food"
-            fragment.itemTypeText = getString(R.string.food)
-            fragment.onFeedResult = {
-                cont.resume(it)
-            }
-            parentFragmentManager.let { fragment.show(it, "feedDialog") }
-        }
-    }
-
-    companion object {
-        private const val ANIMAL_TYPE_KEY = "ANIMAL_TYPE_KEY"
-    }
-
-    override fun onRefresh() {
-        lifecycleScope.launch(ExceptionHandler.coroutine()) {
-            userRepository.retrieveUser(false, true)
-            binding?.refreshLayout?.isRefreshing = false
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.inventory.stable
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.lifecycle.lifecycleScope
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.data.InventoryRepository
+import com.habitrpg.android.habitica.databinding.FragmentRefreshRecyclerviewBinding
+import com.habitrpg.android.habitica.helpers.ReviewManager
+import com.habitrpg.android.habitica.interactors.FeedPetUseCase
+import com.habitrpg.android.habitica.models.inventory.Egg
+import com.habitrpg.android.habitica.models.inventory.Food
+import com.habitrpg.android.habitica.models.inventory.HatchingPotion
+import com.habitrpg.android.habitica.models.inventory.Pet
+import com.habitrpg.android.habitica.models.inventory.StableSection
+import com.habitrpg.android.habitica.models.user.OwnedMount
+import com.habitrpg.android.habitica.models.user.OwnedPet
+import com.habitrpg.android.habitica.ui.adapter.inventory.PetDetailRecyclerAdapter
+import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
+import com.habitrpg.android.habitica.ui.fragments.inventory.items.ItemDialogFragment
+import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
+import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
+import com.habitrpg.common.habitica.extensions.observeOnce
+import com.habitrpg.common.habitica.helpers.ExceptionHandler
+import com.habitrpg.common.habitica.helpers.launchCatching
+import com.habitrpg.shared.habitica.models.responses.FeedResponse
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+import kotlin.coroutines.resume
+import kotlin.coroutines.suspendCoroutine
+
+@AndroidEntryPoint
+class PetDetailRecyclerFragment :
+    BaseMainFragment<FragmentRefreshRecyclerviewBinding>(),
+    SwipeRefreshLayout.OnRefreshListener {
+    @Inject
+    lateinit var inventoryRepository: InventoryRepository
+
+    @Inject
+    lateinit var feedPetUseCase: FeedPetUseCase
+
+    @Inject
+    lateinit var userViewModel: MainUserViewModel
+
+    val adapter: PetDetailRecyclerAdapter = PetDetailRecyclerAdapter()
+    private var animalType: String? = null
+    private var animalGroup: String? = null
+    private var animalColor: String? = null
+    internal var layoutManager: androidx.recyclerview.widget.GridLayoutManager? = null
+
+    @Inject
+    lateinit var reviewManager: ReviewManager
+
+    override var binding: FragmentRefreshRecyclerviewBinding? = null
+
+    override fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+    ): FragmentRefreshRecyclerviewBinding {
+        return FragmentRefreshRecyclerviewBinding.inflate(inflater, container, false)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?,
+    ): View? {
+        this.usesTabLayout = false
+        if (savedInstanceState != null) {
+            this.animalType = savedInstanceState.getString(ANIMAL_TYPE_KEY, "")
+        }
+        return super.onCreateView(inflater, container, savedInstanceState)
+    }
+
+    override fun onDestroy() {
+        inventoryRepository.close()
+        super.onDestroy()
+    }
+
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
+        showsBackButton = true
+        super.onViewCreated(view, savedInstanceState)
+
+        arguments?.let {
+            val args = PetDetailRecyclerFragmentArgs.fromBundle(it)
+            if (args.group != "drop") {
+                animalGroup = args.group
+            }
+            animalType = args.type
+            animalColor = args.color
+        }
+        binding?.refreshLayout?.setOnRefreshListener(this)
+
+        layoutManager = androidx.recyclerview.widget.GridLayoutManager(activity, 4)
+        layoutManager?.spanSizeLookup =
+            object : androidx.recyclerview.widget.GridLayoutManager.SpanSizeLookup() {
+                override fun getSpanSize(position: Int): Int {
+                    return if (adapter.getItemViewType(position) == 0 || adapter.getItemViewType(
+                            position,
+                        ) == 1
+                    ) {
+                        layoutManager?.spanCount ?: 1
+                    } else {
+                        1
+                    }
+                }
+            }
+        binding?.recyclerView?.layoutManager = layoutManager
+        adapter.animalIngredientsRetriever = { animal, callback ->
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                val egg =
+                    inventoryRepository.getItems(Egg::class.java, arrayOf(animal.animal))
+                        .firstOrNull()?.firstOrNull() as? Egg
+                val potion =
+                    inventoryRepository.getItems(HatchingPotion::class.java, arrayOf(animal.color))
+                        .firstOrNull()?.firstOrNull() as? HatchingPotion
+                callback(Pair(egg, potion))
+            }
+        }
+        binding?.recyclerView?.adapter = adapter
+        binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
+        this.loadItems()
+
+        adapter.onEquip = {
+            lifecycleScope.launchCatching {
+                val items = inventoryRepository.equip("pet", it)
+                adapter.currentPet = items?.currentPet
+
+                if (isAdded) {
+                    userViewModel.user.observeOnce(viewLifecycleOwner) { user ->
+                        val parentActivity = mainActivity
+                        val totalCheckIns = user?.loginIncentives
+                        if (totalCheckIns != null && parentActivity != null) {
+                            reviewManager.requestReview(parentActivity, totalCheckIns)
+                        }
+                    }
+                }
+            }
+        }
+        userViewModel.user.observe(viewLifecycleOwner) { adapter.currentPet = it?.currentPet }
+        adapter.onFeed = { pet, food ->
+            showFeedingDialog(
+                pet,
+                food,
+            )
+        }
+
+        view.post { setGridSpanCount(view.width) }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        mainActivity?.title = animalType
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState.putString(ANIMAL_TYPE_KEY, this.animalType)
+    }
+
+    private fun setGridSpanCount(width: Int) {
+        var spanCount = 0
+        if (context != null && context?.resources != null) {
+            val animalWidth = R.dimen.pet_width
+            val itemWidth: Float = context?.resources?.getDimension(animalWidth) ?: 0.toFloat()
+
+            spanCount = (width / itemWidth).toInt()
+        }
+        if (spanCount == 0) {
+            spanCount = 1
+        }
+        layoutManager?.spanCount = spanCount
+    }
+
+    private fun loadItems() {
+        if (animalType?.isNotEmpty() == true || animalGroup?.isNotEmpty() == true) {
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                inventoryRepository.getOwnedMounts()
+                    .map { ownedMounts ->
+                        val mountMap = mutableMapOf<String, OwnedMount>()
+                        ownedMounts.forEach { mountMap[it.key ?: ""] = it }
+                        return@map mountMap
+                    }.collect { adapter.setOwnedMounts(it) }
+            }
+            lifecycleScope.launchCatching {
+                inventoryRepository.getOwnedItems(true).collect { adapter.setOwnedItems(it) }
+            }
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                val mounts =
+                    inventoryRepository.getMounts(
+                        animalType,
+                        animalGroup,
+                        animalColor,
+                    ).firstOrNull() ?: emptyList()
+                adapter.setExistingMounts(mounts)
+                val pets =
+                    inventoryRepository.getPets(animalType, animalGroup, animalColor)
+                        .firstOrNull() ?: emptyList()
+                inventoryRepository.getOwnedPets()
+                    .map { ownedPets ->
+                        val petMap = mutableMapOf<String, OwnedPet>()
+                        ownedPets.forEach { petMap[it.key ?: ""] = it }
+                        return@map petMap
+                    }.onEach { adapter.setOwnedPets(it) }
+                    .collect { ownedPets ->
+                        val items = mutableListOf<Any>()
+                        var lastPet: Pet? = null
+                        var currentSection: StableSection? = null
+                        for (pet in pets) {
+                            if (pet.type == "wacky" || pet.type == "special") continue
+                            if (pet.type != lastPet?.type) {
+                                currentSection =
+                                    StableSection(
+                                        pet.type,
+                                        "pets",
+                                    )
+                                items.add(currentSection)
+                            }
+                            currentSection?.let { section ->
+                                section.totalCount += 1
+                                if (ownedPets.containsKey(pet.key)) {
+                                    section.ownedCount += 1
+                                }
+                            }
+                            items.add(pet)
+                            lastPet = pet
+                        }
+                        adapter.setItemList(items)
+                    }
+            }
+        }
+    }
+
+    private suspend fun showFeedingDialog(
+        pet: Pet,
+        food: Food?,
+    ): FeedResponse? {
+        if (food != null) {
+            val context = mainActivity ?: context ?: return null
+            return feedPetUseCase.callInteractor(
+                FeedPetUseCase.RequestValues(
+                    pet,
+                    food,
+                    context,
+                ),
+            )
+        }
+        return suspendCoroutine { cont ->
+            val fragment = ItemDialogFragment()
+            fragment.feedingPet = pet
+            fragment.isFeeding = true
+            fragment.isHatching = false
+            fragment.itemType = "food"
+            fragment.itemTypeText = getString(R.string.food)
+            fragment.onFeedResult = {
+                cont.resume(it)
+            }
+            parentFragmentManager.let { fragment.show(it, "feedDialog") }
+        }
+    }
+
+    companion object {
+        private const val ANIMAL_TYPE_KEY = "ANIMAL_TYPE_KEY"
+    }
+
+    override fun onRefresh() {
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.retrieveUser(false, true)
+            binding?.refreshLayout?.isRefreshing = false
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableFragment.kt
index 4d620530b..b0abe5888 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableFragment.kt
@@ -16,26 +16,31 @@ import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
 class StableFragment : BaseMainFragment<FragmentViewpagerBinding>() {
-
     override var binding: FragmentViewpagerBinding? = null
 
     private val viewModel: StableViewModel by viewModels()
 
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentViewpagerBinding {
+    override fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+    ): FragmentViewpagerBinding {
         return FragmentViewpagerBinding.inflate(inflater, container, false)
     }
 
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View? {
         this.usesTabLayout = true
         this.hidesToolbar = true
         return super.onCreateView(inflater, container, savedInstanceState)
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
         super.onViewCreated(view, savedInstanceState)
         binding?.viewPager?.currentItem = 0
 
@@ -45,20 +50,21 @@ class StableFragment : BaseMainFragment<FragmentViewpagerBinding>() {
     private fun setViewPagerAdapter() {
         val fragmentManager = childFragmentManager
 
-        binding?.viewPager?.adapter = object : FragmentStateAdapter(fragmentManager, lifecycle) {
+        binding?.viewPager?.adapter =
+            object : FragmentStateAdapter(fragmentManager, lifecycle) {
+                override fun createFragment(position: Int): androidx.fragment.app.Fragment {
+                    val fragment = StableRecyclerFragment()
+                    fragment.arguments =
+                        bundleOf(StableRecyclerFragment.ITEM_TYPE_KEY to if (position == 0) "pets" else "mounts")
+                    fragment.itemTypeText = getPageTitle(position)
 
-            override fun createFragment(position: Int): androidx.fragment.app.Fragment {
-                val fragment = StableRecyclerFragment()
-                fragment.arguments = bundleOf(StableRecyclerFragment.ITEM_TYPE_KEY to if (position == 0) "pets" else "mounts")
-                fragment.itemTypeText = getPageTitle(position)
+                    return fragment
+                }
 
-                return fragment
+                override fun getItemCount(): Int {
+                    return 2
+                }
             }
-
-            override fun getItemCount(): Int {
-                return 2
-            }
-        }
         tabLayout?.let {
             binding?.viewPager?.let { it1 ->
                 TabLayoutMediator(it, it1) { tab, position ->
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.kt
index 1617bfc79..b82005580 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.kt
@@ -1,172 +1,192 @@
-package com.habitrpg.android.habitica.ui.fragments.inventory.stable
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.viewModels
-import androidx.lifecycle.lifecycleScope
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.data.InventoryRepository
-import com.habitrpg.android.habitica.data.UserRepository
-import com.habitrpg.android.habitica.databinding.FragmentRefreshRecyclerviewBinding
-import com.habitrpg.android.habitica.helpers.AppConfigManager
-import com.habitrpg.android.habitica.models.inventory.Egg
-import com.habitrpg.android.habitica.models.inventory.HatchingPotion
-import com.habitrpg.android.habitica.ui.adapter.inventory.StableRecyclerAdapter
-import com.habitrpg.android.habitica.ui.fragments.BaseFragment
-import com.habitrpg.android.habitica.ui.helpers.MarginDecoration
-import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
-import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
-import com.habitrpg.android.habitica.ui.viewmodels.StableViewModel
-import com.habitrpg.common.habitica.helpers.EmptyItem
-import com.habitrpg.common.habitica.helpers.ExceptionHandler
-import com.habitrpg.common.habitica.helpers.launchCatching
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.flow.firstOrNull
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class StableRecyclerFragment :
-    BaseFragment<FragmentRefreshRecyclerviewBinding>(),
-    SwipeRefreshLayout.OnRefreshListener {
-
-    private val viewModel: StableViewModel by viewModels()
-
-    @Inject
-    lateinit var inventoryRepository: InventoryRepository
-
-    @Inject
-    lateinit var userRepository: UserRepository
-
-    @Inject
-    lateinit var configManager: AppConfigManager
-
-    @Inject
-    lateinit var userViewModel: MainUserViewModel
-
-    var adapter: StableRecyclerAdapter? = null
-    var itemTypeText: String? = null
-
-    override var binding: FragmentRefreshRecyclerviewBinding? = null
-
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentRefreshRecyclerviewBinding {
-        return FragmentRefreshRecyclerviewBinding.inflate(inflater, container, false)
-    }
-
-    override fun onDestroy() {
-        inventoryRepository.close()
-        super.onDestroy()
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding?.recyclerView?.emptyItem = EmptyItem(
-            getString(R.string.empty_items, itemTypeText ?: viewModel.itemType)
-        )
-        binding?.refreshLayout?.setOnRefreshListener(this)
-
-        val layoutManager = androidx.recyclerview.widget.GridLayoutManager(activity, 4)
-        layoutManager.spanSizeLookup = object : androidx.recyclerview.widget.GridLayoutManager.SpanSizeLookup() {
-            override fun getSpanSize(position: Int): Int {
-                return if (adapter?.getItemViewType(position) == 0 || adapter?.getItemViewType(position) == 1) {
-                    layoutManager.spanCount
-                } else {
-                    1
-                }
-            }
-        }
-
-        binding?.recyclerView?.layoutManager = layoutManager
-        activity?.let {
-            binding?.recyclerView?.addItemDecoration(MarginDecoration(it, setOf(HEADER_VIEW_TYPE)))
-        }
-
-        adapter = binding?.recyclerView?.adapter as? StableRecyclerAdapter
-        if (adapter == null) {
-            adapter = StableRecyclerAdapter()
-            adapter?.animalIngredientsRetriever = { animal, callback ->
-                lifecycleScope.launch(ExceptionHandler.coroutine()) {
-                    val egg = inventoryRepository.getItems(Egg::class.java, arrayOf(animal.animal)).firstOrNull()?.firstOrNull() as? Egg
-                    val potion = inventoryRepository.getItems(HatchingPotion::class.java, arrayOf(animal.color)).firstOrNull()?.firstOrNull() as? HatchingPotion
-                    callback(Pair(egg, potion))
-                }
-            }
-            adapter?.itemType = viewModel.itemType
-            adapter?.shopSpriteSuffix = configManager.shopSpriteSuffix()
-            binding?.recyclerView?.adapter = adapter
-            binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
-
-            adapter?.let {
-                it.onEquip = {
-                    lifecycleScope.launchCatching {
-                        inventoryRepository.equip(if (viewModel.itemType == "pets") "pet" else "mount", it)
-                    }
-                }
-            }
-        }
-        userViewModel.user.observe(viewLifecycleOwner) {
-            adapter?.currentPet = it?.currentPet
-            adapter?.currentMount = it?.currentMount
-        }
-
-        this.loadItems()
-        view.post { setGridSpanCount(view.width) }
-    }
-
-    override fun onSaveInstanceState(outState: Bundle) {
-        super.onSaveInstanceState(outState)
-        outState.putString(ITEM_TYPE_KEY, viewModel.itemType)
-    }
-
-    private fun setGridSpanCount(width: Int) {
-        var spanCount = 0
-        if (context != null && context?.resources != null) {
-            val animalWidth = if (viewModel.itemType == "pets") R.dimen.pet_width else R.dimen.mount_width
-            val itemWidth: Float = context?.resources?.getDimension(animalWidth) ?: 0.toFloat()
-
-            spanCount = (width / itemWidth).toInt()
-        }
-        if (spanCount == 0) {
-            spanCount = 1
-        }
-        (binding?.recyclerView?.layoutManager as? GridLayoutManager)?.spanCount = spanCount
-    }
-
-    private fun loadItems() {
-        viewModel.items.observe(viewLifecycleOwner) {
-            adapter?.setItemList(it)
-        }
-        viewModel.eggs.observe(viewLifecycleOwner) {
-            adapter?.setEggs(it)
-        }
-        viewModel.ownedItems.observe(viewLifecycleOwner) {
-            adapter?.setOwnedItems(it)
-        }
-        viewModel.mounts.observe(viewLifecycleOwner) {
-            adapter?.setExistingMounts(it)
-        }
-        viewModel.ownedPets.observe(viewLifecycleOwner) {
-            adapter?.setOwnedPets(it)
-        }
-        viewModel.ownedMounts.observe(viewLifecycleOwner) {
-            adapter?.setOwnedMounts(it)
-        }
-    }
-
-    companion object {
-        internal const val ITEM_TYPE_KEY = "CLASS_TYPE_KEY"
-        private const val HEADER_VIEW_TYPE = 0
-    }
-
-    override fun onRefresh() {
-        lifecycleScope.launch(ExceptionHandler.coroutine()) {
-            userRepository.retrieveUser(true, true)
-            binding?.refreshLayout?.isRefreshing = false
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.inventory.stable
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.data.InventoryRepository
+import com.habitrpg.android.habitica.data.UserRepository
+import com.habitrpg.android.habitica.databinding.FragmentRefreshRecyclerviewBinding
+import com.habitrpg.android.habitica.helpers.AppConfigManager
+import com.habitrpg.android.habitica.models.inventory.Egg
+import com.habitrpg.android.habitica.models.inventory.HatchingPotion
+import com.habitrpg.android.habitica.ui.adapter.inventory.StableRecyclerAdapter
+import com.habitrpg.android.habitica.ui.fragments.BaseFragment
+import com.habitrpg.android.habitica.ui.helpers.MarginDecoration
+import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
+import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
+import com.habitrpg.android.habitica.ui.viewmodels.StableViewModel
+import com.habitrpg.common.habitica.helpers.EmptyItem
+import com.habitrpg.common.habitica.helpers.ExceptionHandler
+import com.habitrpg.common.habitica.helpers.launchCatching
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class StableRecyclerFragment :
+    BaseFragment<FragmentRefreshRecyclerviewBinding>(),
+    SwipeRefreshLayout.OnRefreshListener {
+    private val viewModel: StableViewModel by viewModels()
+
+    @Inject
+    lateinit var inventoryRepository: InventoryRepository
+
+    @Inject
+    lateinit var userRepository: UserRepository
+
+    @Inject
+    lateinit var configManager: AppConfigManager
+
+    @Inject
+    lateinit var userViewModel: MainUserViewModel
+
+    var adapter: StableRecyclerAdapter? = null
+    var itemTypeText: String? = null
+
+    override var binding: FragmentRefreshRecyclerviewBinding? = null
+
+    override fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+    ): FragmentRefreshRecyclerviewBinding {
+        return FragmentRefreshRecyclerviewBinding.inflate(inflater, container, false)
+    }
+
+    override fun onDestroy() {
+        inventoryRepository.close()
+        super.onDestroy()
+    }
+
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
+        super.onViewCreated(view, savedInstanceState)
+
+        binding?.recyclerView?.emptyItem =
+            EmptyItem(
+                getString(R.string.empty_items, itemTypeText ?: viewModel.itemType),
+            )
+        binding?.refreshLayout?.setOnRefreshListener(this)
+
+        val layoutManager = GridLayoutManager(activity, 4)
+        layoutManager.spanSizeLookup =
+            object : GridLayoutManager.SpanSizeLookup() {
+                override fun getSpanSize(position: Int): Int {
+                    return if (adapter?.getItemViewType(position) == 0 || adapter?.getItemViewType(
+                            position,
+                        ) == 1
+                    ) {
+                        layoutManager.spanCount
+                    } else {
+                        1
+                    }
+                }
+            }
+
+        binding?.recyclerView?.layoutManager = layoutManager
+        activity?.let {
+            binding?.recyclerView?.addItemDecoration(MarginDecoration(it, setOf(HEADER_VIEW_TYPE)))
+        }
+
+        adapter = binding?.recyclerView?.adapter as? StableRecyclerAdapter
+        if (adapter == null) {
+            adapter = StableRecyclerAdapter()
+            adapter?.animalIngredientsRetriever = { animal, callback ->
+                lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                    val egg =
+                        inventoryRepository.getItems(Egg::class.java, arrayOf(animal.animal))
+                            .firstOrNull()?.firstOrNull() as? Egg
+                    val potion =
+                        inventoryRepository.getItems(
+                            HatchingPotion::class.java,
+                            arrayOf(animal.color),
+                        ).firstOrNull()?.firstOrNull() as? HatchingPotion
+                    callback(Pair(egg, potion))
+                }
+            }
+            adapter?.itemType = viewModel.itemType
+            adapter?.shopSpriteSuffix = configManager.shopSpriteSuffix()
+            binding?.recyclerView?.adapter = adapter
+            binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
+
+            adapter?.let {
+                it.onEquip = {
+                    lifecycleScope.launchCatching {
+                        inventoryRepository.equip(
+                            if (viewModel.itemType == "pets") "pet" else "mount",
+                            it,
+                        )
+                    }
+                }
+            }
+        }
+        userViewModel.user.observe(viewLifecycleOwner) {
+            adapter?.currentPet = it?.currentPet
+            adapter?.currentMount = it?.currentMount
+        }
+
+        this.loadItems()
+        view.post { setGridSpanCount(view.width) }
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState.putString(ITEM_TYPE_KEY, viewModel.itemType)
+    }
+
+    private fun setGridSpanCount(width: Int) {
+        var spanCount = 0
+        if (context != null && context?.resources != null) {
+            val animalWidth =
+                if (viewModel.itemType == "pets") R.dimen.pet_width else R.dimen.mount_width
+            val itemWidth: Float = context?.resources?.getDimension(animalWidth) ?: 0.toFloat()
+
+            spanCount = (width / itemWidth).toInt()
+        }
+        if (spanCount == 0) {
+            spanCount = 1
+        }
+        (binding?.recyclerView?.layoutManager as? GridLayoutManager)?.spanCount = spanCount
+    }
+
+    private fun loadItems() {
+        viewModel.items.observe(viewLifecycleOwner) {
+            adapter?.setItemList(it)
+        }
+        viewModel.eggs.observe(viewLifecycleOwner) {
+            adapter?.setEggs(it)
+        }
+        viewModel.ownedItems.observe(viewLifecycleOwner) {
+            adapter?.setOwnedItems(it)
+        }
+        viewModel.mounts.observe(viewLifecycleOwner) {
+            adapter?.setExistingMounts(it)
+        }
+        viewModel.ownedPets.observe(viewLifecycleOwner) {
+            adapter?.setOwnedPets(it)
+        }
+        viewModel.ownedMounts.observe(viewLifecycleOwner) {
+            adapter?.setOwnedMounts(it)
+        }
+    }
+
+    companion object {
+        internal const val ITEM_TYPE_KEY = "CLASS_TYPE_KEY"
+        private const val HEADER_VIEW_TYPE = 0
+    }
+
+    override fun onRefresh() {
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.retrieveUser(true, true)
+            binding?.refreshLayout?.isRefreshing = false
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountPreferenceFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountPreferenceFragment.kt
index a8bed8b18..593f0519a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountPreferenceFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountPreferenceFragment.kt
@@ -89,11 +89,11 @@ class AccountPreferenceFragment :
         val user = user ?: return
         configurePreference(
             findPreference("username"),
-            user.authentication?.localAuthentication?.username
+            user.authentication?.localAuthentication?.username,
         )
         configurePreference(
             findPreference("email"),
-            user.authentication?.localAuthentication?.email ?: getString(R.string.not_set)
+            user.authentication?.localAuthentication?.email ?: getString(R.string.not_set),
         )
         findPreference<Preference>("confirm_username")?.isVisible =
             user.flags?.verifiedUsername != true
@@ -145,7 +145,10 @@ class AccountPreferenceFragment :
         configurePreference(findPreference("UserID"), user.id)
     }
 
-    private fun configurePreference(preference: Preference?, value: String?) {
+    private fun configurePreference(
+        preference: Preference?,
+        value: String?,
+    ) {
         (preference as? EditTextPreference)?.let {
             it.text = value
         }
@@ -182,17 +185,19 @@ class AccountPreferenceFragment :
                 return true
             }
 
-            "display_name" -> updateUser(
-                "profile.name",
-                user?.profile?.name,
-                getString(R.string.display_name)
-            )
+            "display_name" ->
+                updateUser(
+                    "profile.name",
+                    user?.profile?.name,
+                    getString(R.string.display_name),
+                )
 
-            "photo_url" -> updateUser(
-                "profile.imageUrl",
-                user?.profile?.imageUrl,
-                getString(R.string.photo_url)
-            )
+            "photo_url" ->
+                updateUser(
+                    "profile.imageUrl",
+                    user?.profile?.imageUrl,
+                    getString(R.string.photo_url),
+                )
 
             "about" -> updateUser("profile.blurb", user?.profile?.blurb, getString(R.string.about))
             "google_auth" -> {
@@ -221,7 +226,10 @@ class AccountPreferenceFragment :
         return super.onPreferenceTreeClick(preference)
     }
 
-    private fun disconnect(network: String, networkName: String) {
+    private fun disconnect(
+        network: String,
+        networkName: String,
+    ) {
         context?.let { context ->
             val dialog = HabiticaAlertDialog(context)
             dialog.setTitle(R.string.are_you_sure)
@@ -244,7 +252,7 @@ class AccountPreferenceFragment :
                 activity?.let { it1 ->
                     viewModel.handleGoogleLoginResult(
                         it1,
-                        recoverFromPlayServicesErrorResult
+                        recoverFromPlayServicesErrorResult,
                     ) { _ ->
                         displayAuthenticationSuccess(getString(R.string.google))
                     }
@@ -255,30 +263,35 @@ class AccountPreferenceFragment :
     private fun displayAuthenticationSuccess(network: String) {
         (activity as? SnackbarActivity)?.showSnackbar(
             content = context?.getString(R.string.added_social_auth, network),
-            displayType = HabiticaSnackbar.SnackbarDisplayType.SUCCESS
+            displayType = HabiticaSnackbar.SnackbarDisplayType.SUCCESS,
         )
     }
 
     private fun displayDisconnectSuccess(network: String) {
         (activity as? SnackbarActivity)?.showSnackbar(
             content = context?.getString(R.string.removed_social_auth, network),
-            displayType = HabiticaSnackbar.SnackbarDisplayType.SUCCESS
+            displayType = HabiticaSnackbar.SnackbarDisplayType.SUCCESS,
         )
     }
 
-    private val recoverFromPlayServicesErrorResult = registerForActivityResult(
-        ActivityResultContracts.StartActivityForResult()
-    ) {
-        if (it.resultCode != Activity.RESULT_CANCELED) {
-            activity?.let { it1 ->
-                viewModel.handleGoogleLoginResult(it1, null) { _ ->
-                    displayAuthenticationSuccess(getString(R.string.google))
+    private val recoverFromPlayServicesErrorResult =
+        registerForActivityResult(
+            ActivityResultContracts.StartActivityForResult(),
+        ) {
+            if (it.resultCode != Activity.RESULT_CANCELED) {
+                activity?.let { it1 ->
+                    viewModel.handleGoogleLoginResult(it1, null) { _ ->
+                        displayAuthenticationSuccess(getString(R.string.google))
+                    }
                 }
             }
         }
-    }
 
-    private fun updateUser(path: String, value: String?, title: String) {
+    private fun updateUser(
+        path: String,
+        value: String?,
+        title: String,
+    ) {
         showSingleEntryDialog(value, title) {
             if (value != it) {
                 lifecycleScope.launchCatching {
@@ -312,11 +325,11 @@ class AccountPreferenceFragment :
                     userRepository.updatePassword(
                         oldPasswordEditText?.text ?: "",
                         passwordEditText.text ?: "",
-                        passwordRepeatEditText.text ?: ""
+                        passwordRepeatEditText.text ?: "",
                     )
                     (activity as? SnackbarActivity)?.showSnackbar(
                         content = context.getString(R.string.password_changed),
-                        displayType = HabiticaSnackbar.SnackbarDisplayType.SUCCESS
+                        displayType = HabiticaSnackbar.SnackbarDisplayType.SUCCESS,
                     )
                 }
                 d.dismiss()
@@ -362,11 +375,11 @@ class AccountPreferenceFragment :
                         user?.username ?: "",
                         email ?: "",
                         passwordEditText.text ?: "",
-                        passwordRepeatEditText.text ?: ""
+                        passwordRepeatEditText.text ?: "",
                     )
                     (activity as? SnackbarActivity)?.showSnackbar(
                         content = context.getString(R.string.password_added),
-                        displayType = HabiticaSnackbar.SnackbarDisplayType.SUCCESS
+                        displayType = HabiticaSnackbar.SnackbarDisplayType.SUCCESS,
                     )
                 }
                 dialog.dismiss()
@@ -400,7 +413,7 @@ class AccountPreferenceFragment :
                 lifecycleScope.launchCatching {
                     userRepository.updateEmail(
                         emailEditText.text.toString(),
-                        passwordEditText?.text.toString()
+                        passwordEditText?.text.toString(),
                     )
                     lifecycleScope.launch(ExceptionHandler.coroutine()) {
                         userRepository.retrieveUser(true, true)
@@ -435,7 +448,7 @@ class AccountPreferenceFragment :
         value: String?,
         title: String,
         validator: ((String?) -> Boolean)? = null,
-        onChange: (String?) -> Unit
+        onChange: (String?) -> Unit,
     ) {
         val inflater = context?.layoutInflater
         val view = inflater?.inflate(R.layout.dialog_edittext, null)
@@ -526,7 +539,7 @@ class AccountPreferenceFragment :
         dialog.addButton(R.string.confirm, true) { _, _ ->
             lifecycleScope.launchCatching {
                 userRepository.updateLoginName(
-                    user?.authentication?.localAuthentication?.username ?: ""
+                    user?.authentication?.localAuthentication?.username ?: "",
                 )
             }
         }
@@ -543,19 +556,25 @@ class AccountPreferenceFragment :
         }
     }
 
-    private fun copyValue(name: String, value: CharSequence?) {
+    private fun copyValue(
+        name: String,
+        value: CharSequence?,
+    ) {
         val clipboard: ClipboardManager? =
             context?.let { getSystemService(it, ClipboardManager::class.java) }
         clipboard?.setPrimaryClip(ClipData.newPlainText(name, value))
         if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.S_V2) {
             (activity as? SnackbarActivity)?.showSnackbar(
                 content = context?.getString(R.string.copied_to_clipboard, name),
-                displayType = HabiticaSnackbar.SnackbarDisplayType.SUCCESS
+                displayType = HabiticaSnackbar.SnackbarDisplayType.SUCCESS,
             )
         }
     }
 
-    override fun onSharedPreferenceChanged(p0: SharedPreferences?, p1: String?) {
+    override fun onSharedPreferenceChanged(
+        p0: SharedPreferences?,
+        p1: String?,
+    ) {
     }
 
     override fun resetConfirmedClicked(confirmationString: String) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/BasePreferencesFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/BasePreferencesFragment.kt
index 3901ac88f..72def1e9e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/BasePreferencesFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/BasePreferencesFragment.kt
@@ -12,7 +12,6 @@ import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import javax.inject.Inject
 
 abstract class BasePreferencesFragment : PreferenceFragmentCompat() {
-
     @Inject
     lateinit var userRepository: UserRepository
 
@@ -24,7 +23,7 @@ abstract class BasePreferencesFragment : PreferenceFragmentCompat() {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View {
         userViewModel.user.observe(viewLifecycleOwner) { setUser(it) }
         return super.onCreateView(inflater, container, savedInstanceState)
@@ -35,7 +34,10 @@ abstract class BasePreferencesFragment : PreferenceFragmentCompat() {
         super.onDestroy()
     }
 
-    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+    override fun onCreatePreferences(
+        savedInstanceState: Bundle?,
+        rootKey: String?,
+    ) {
         setPreferencesFromResource(R.xml.preferences_fragment, rootKey)
         setupPreferences()
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/EmailNotificationsPreferencesFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/EmailNotificationsPreferencesFragment.kt
index 35065c792..74b69393a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/EmailNotificationsPreferencesFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/EmailNotificationsPreferencesFragment.kt
@@ -8,8 +8,9 @@ import com.habitrpg.common.habitica.helpers.launchCatching
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
-class EmailNotificationsPreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnSharedPreferenceChangeListener {
-
+class EmailNotificationsPreferencesFragment :
+    BasePreferencesFragment(),
+    SharedPreferences.OnSharedPreferenceChangeListener {
     private var isInitialSet: Boolean = true
     private var isSettingUser: Boolean = false
 
@@ -23,58 +24,105 @@ class EmailNotificationsPreferencesFragment : BasePreferencesFragment(), SharedP
         preferenceScreen.sharedPreferences?.unregisterOnSharedPreferenceChangeListener(this)
     }
 
-    override fun setupPreferences() { /* no-on */ }
+    override fun setupPreferences() { // no-on
+    }
 
     override fun setUser(user: User?) {
         super.setUser(user)
         isSettingUser = !isInitialSet
-        updatePreference("preference_email_you_won_challenge", user?.preferences?.emailNotifications?.wonChallenge)
-        updatePreference("preference_email_received_a_private_message", user?.preferences?.emailNotifications?.newPM)
-        updatePreference("preference_email_gifted_gems", user?.preferences?.emailNotifications?.giftedGems)
-        updatePreference("preference_email_gifted_subscription", user?.preferences?.emailNotifications?.giftedSubscription)
-        updatePreference("preference_email_invited_to_party", user?.preferences?.emailNotifications?.invitedParty)
-        updatePreference("preference_email_invited_to_guild", user?.preferences?.emailNotifications?.invitedGuild)
-        updatePreference("preference_email_your_quest_has_begun", user?.preferences?.emailNotifications?.questStarted)
-        updatePreference("preference_email_invited_to_quest", user?.preferences?.emailNotifications?.invitedQuest)
-        updatePreference("preference_email_important_announcements", user?.preferences?.emailNotifications?.majorUpdates)
-        updatePreference("preference_email_kicked_group", user?.preferences?.emailNotifications?.kickedGroup)
-        updatePreference("preference_email_onboarding", user?.preferences?.emailNotifications?.onboarding)
-        updatePreference("preference_email_subscription_reminders", user?.preferences?.emailNotifications?.subscriptionReminders)
-        updatePreference("preference_email_content_release", user?.preferences?.emailNotifications?.contentRelease)
+        updatePreference(
+            "preference_email_you_won_challenge",
+            user?.preferences?.emailNotifications?.wonChallenge,
+        )
+        updatePreference(
+            "preference_email_received_a_private_message",
+            user?.preferences?.emailNotifications?.newPM,
+        )
+        updatePreference(
+            "preference_email_gifted_gems",
+            user?.preferences?.emailNotifications?.giftedGems,
+        )
+        updatePreference(
+            "preference_email_gifted_subscription",
+            user?.preferences?.emailNotifications?.giftedSubscription,
+        )
+        updatePreference(
+            "preference_email_invited_to_party",
+            user?.preferences?.emailNotifications?.invitedParty,
+        )
+        updatePreference(
+            "preference_email_invited_to_guild",
+            user?.preferences?.emailNotifications?.invitedGuild,
+        )
+        updatePreference(
+            "preference_email_your_quest_has_begun",
+            user?.preferences?.emailNotifications?.questStarted,
+        )
+        updatePreference(
+            "preference_email_invited_to_quest",
+            user?.preferences?.emailNotifications?.invitedQuest,
+        )
+        updatePreference(
+            "preference_email_important_announcements",
+            user?.preferences?.emailNotifications?.majorUpdates,
+        )
+        updatePreference(
+            "preference_email_kicked_group",
+            user?.preferences?.emailNotifications?.kickedGroup,
+        )
+        updatePreference(
+            "preference_email_onboarding",
+            user?.preferences?.emailNotifications?.onboarding,
+        )
+        updatePreference(
+            "preference_email_subscription_reminders",
+            user?.preferences?.emailNotifications?.subscriptionReminders,
+        )
+        updatePreference(
+            "preference_email_content_release",
+            user?.preferences?.emailNotifications?.contentRelease,
+        )
         isSettingUser = false
         isInitialSet = false
     }
 
-    private fun updatePreference(key: String, isChecked: Boolean?) {
+    private fun updatePreference(
+        key: String,
+        isChecked: Boolean?,
+    ) {
         val preference = (findPreference(key) as? CheckBoxPreference)
         preference?.isChecked = isChecked == true
     }
 
-    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String?) {
+    override fun onSharedPreferenceChanged(
+        sharedPreferences: SharedPreferences,
+        key: String?,
+    ) {
         if (isSettingUser) {
             return
         }
-        val pathKey = when (key) {
-            "preference_email_you_won_challenge" -> "wonChallenge"
-            "preference_email_received_a_private_message" -> "newPM"
-            "preference_email_gifted_gems" -> "giftedGems"
-            "preference_email_gifted_subscription" -> "giftedSubscription"
-            "preference_email_invited_to_party" -> "invitedParty"
-            "preference_email_invited_to_guild" -> "invitedGuild"
-            "preference_email_your_quest_has_begun" -> "questStarted"
-            "preference_email_invited_to_quest" -> "invitedQuest"
-            "preference_email_important_announcements" -> "majorUpdates"
-            "preference_email_kicked_group" -> "kickedGroup"
-            "preference_email_onboarding" -> "onboarding"
-            "preference_email_subscription_reminders" -> "subscriptionReminders"
-            "preference_email_content_release" -> "contentRelease"
-            else -> null
-        }
+        val pathKey =
+            when (key) {
+                "preference_email_you_won_challenge" -> "wonChallenge"
+                "preference_email_received_a_private_message" -> "newPM"
+                "preference_email_gifted_gems" -> "giftedGems"
+                "preference_email_gifted_subscription" -> "giftedSubscription"
+                "preference_email_invited_to_party" -> "invitedParty"
+                "preference_email_invited_to_guild" -> "invitedGuild"
+                "preference_email_your_quest_has_begun" -> "questStarted"
+                "preference_email_invited_to_quest" -> "invitedQuest"
+                "preference_email_important_announcements" -> "majorUpdates"
+                "preference_email_kicked_group" -> "kickedGroup"
+                "preference_email_onboarding" -> "onboarding"
+                "preference_email_subscription_reminders" -> "subscriptionReminders"
+                "preference_email_content_release" -> "contentRelease"
+                else -> null
+            }
         if (pathKey != null) {
             lifecycleScope.launchCatching {
                 userRepository.updateUser(
                     "preferences.emailNotifications.$pathKey",
-                    sharedPreferences.getBoolean(key, false)
+                    sharedPreferences.getBoolean(key, false),
                 )
             }
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/HabiticaAccountDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/HabiticaAccountDialog.kt
index 0c75d4ccc..9f185c792 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/HabiticaAccountDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/HabiticaAccountDialog.kt
@@ -32,11 +32,12 @@ import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class HabiticaAccountDialog(private var thisContext: Context) : BottomSheetDialogFragment(R.layout.dialog_habitica_account) {
+class HabiticaAccountDialog(private var thisContext: Context) :
+    BottomSheetDialogFragment(R.layout.dialog_habitica_account) {
     @Inject
     lateinit var userRepository: UserRepository
-    private var _binding: DialogHabiticaAccountBinding? = null
-    private val binding get() = _binding!!
+    private var viewBinding: DialogHabiticaAccountBinding? = null
+    private val binding get() = viewBinding!!
 
     var accountAction: String? = null
     var accountUpdateConfirmed: AccountUpdateConfirmed? = null
@@ -47,12 +48,19 @@ class HabiticaAccountDialog(private var thisContext: Context) : BottomSheetDialo
         setStyle(STYLE_NO_TITLE, R.style.HabiticaAlertDialogTheme)
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        _binding = DialogHabiticaAccountBinding.inflate(layoutInflater)
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?,
+    ): View {
+        viewBinding = DialogHabiticaAccountBinding.inflate(layoutInflater)
         return binding.root
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
         super.onViewCreated(view, savedInstanceState)
 
         activity?.let { _ ->
@@ -78,10 +86,11 @@ class HabiticaAccountDialog(private var thisContext: Context) : BottomSheetDialo
         input.inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS
         input.hint = getString(R.string.forgot_password_hint_example)
         input.textSize = 16f
-        val lp = LinearLayout.LayoutParams(
-            LinearLayout.LayoutParams.MATCH_PARENT,
-            LinearLayout.LayoutParams.MATCH_PARENT
-        )
+        val lp =
+            LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.MATCH_PARENT,
+                LinearLayout.LayoutParams.MATCH_PARENT,
+            )
         input.layoutParams = lp
         val alertDialog = HabiticaAlertDialog(requireContext())
         alertDialog.setTitle(R.string.forgot_password_title)
@@ -119,36 +128,69 @@ class HabiticaAccountDialog(private var thisContext: Context) : BottomSheetDialo
         binding.warningDescriptionTextview.setText(R.string.reset_account_description_new)
         binding.confirmationTextInputLayout.setHint(R.string.password)
         if (user?.authentication?.hasPassword != true) {
-            binding.warningDescriptionTextview.text = context?.getString(R.string.reset_account_description_no_pw)
+            binding.warningDescriptionTextview.text =
+                context?.getString(R.string.reset_account_description_no_pw)
             binding.confirmationTextInputLayout.setHint(R.string.confirm_reset)
             binding.confirmationInputEdittext.inputType = InputType.TYPE_CLASS_TEXT
             binding.forgotPassword.isVisible = false
         }
         binding.confirmActionTextview.setText(R.string.reset_account)
 
-        binding.confirmationInputEdittext.addTextChangedListener(object : TextWatcher {
-            override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
-                binding.confirmActionTextview.setTextColor(ContextCompat.getColor(thisContext, R.color.gray_300))
-                binding.confirmActionTextview.alpha = .4f
-            }
-
-            override fun onTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
-                if (binding.confirmationInputEdittext.text.toString().isNotEmpty()) {
-                    if ((user?.authentication?.hasPassword != true && binding.confirmationInputEdittext.text.toString() == context?.getString(R.string.reset_caps)) ||
-                        user?.authentication?.hasPassword == true
-                    ) {
-                        binding.confirmActionTextview.setTextColor(ContextCompat.getColor(thisContext, R.color.red_100))
-                        binding.confirmActionTextview.alpha = 1.0f
-                    }
-                } else {
-                    binding.confirmActionTextview.setTextColor(ContextCompat.getColor(thisContext, R.color.gray_300))
+        binding.confirmationInputEdittext.addTextChangedListener(
+            object : TextWatcher {
+                override fun beforeTextChanged(
+                    p0: CharSequence?,
+                    p1: Int,
+                    p2: Int,
+                    p3: Int,
+                ) {
+                    binding.confirmActionTextview.setTextColor(
+                        ContextCompat.getColor(
+                            thisContext,
+                            R.color.gray_300,
+                        ),
+                    )
                     binding.confirmActionTextview.alpha = .4f
                 }
-            }
 
-            override fun afterTextChanged(p0: Editable?) {
-            }
-        })
+                override fun onTextChanged(
+                    p0: CharSequence?,
+                    p1: Int,
+                    p2: Int,
+                    p3: Int,
+                ) {
+                    if (binding.confirmationInputEdittext.text.toString().isNotEmpty()) {
+                        if ((
+                                user?.authentication?.hasPassword != true && binding.confirmationInputEdittext.text.toString() ==
+                                    context?.getString(
+                                        R.string.reset_caps,
+                                    )
+                            ) ||
+                            user?.authentication?.hasPassword == true
+                        ) {
+                            binding.confirmActionTextview.setTextColor(
+                                ContextCompat.getColor(
+                                    thisContext,
+                                    R.color.red_100,
+                                ),
+                            )
+                            binding.confirmActionTextview.alpha = 1.0f
+                        }
+                    } else {
+                        binding.confirmActionTextview.setTextColor(
+                            ContextCompat.getColor(
+                                thisContext,
+                                R.color.gray_300,
+                            ),
+                        )
+                        binding.confirmActionTextview.alpha = .4f
+                    }
+                }
+
+                override fun afterTextChanged(p0: Editable?) {
+                }
+            },
+        )
 
         binding.confirmActionTextview.setOnClickListener {
             val confirmationString = binding.confirmationInputEdittext.text.toString()
@@ -168,37 +210,71 @@ class HabiticaAccountDialog(private var thisContext: Context) : BottomSheetDialo
         binding.titleTextview.setText(R.string.are_you_sure_you_want_to_delete)
         binding.confirmationTextInputLayout.setHint(R.string.password)
         binding.confirmActionTextview.setText(R.string.delete_account)
-        binding.warningDescriptionTextview.text = context?.getString(R.string.delete_account_description)
+        binding.warningDescriptionTextview.text =
+            context?.getString(R.string.delete_account_description)
         if (user?.authentication?.hasPassword != true) {
-            binding.warningDescriptionTextview.text = context?.getString(R.string.delete_oauth_account_description)
+            binding.warningDescriptionTextview.text =
+                context?.getString(R.string.delete_oauth_account_description)
             binding.confirmationTextInputLayout.setHint(R.string.confirm_deletion)
             binding.confirmationInputEdittext.inputType = InputType.TYPE_CLASS_TEXT
             binding.forgotPassword.isVisible = false
         }
 
-        binding.confirmationInputEdittext.addTextChangedListener(object : TextWatcher {
-            override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
-                binding.confirmActionTextview.setTextColor(ContextCompat.getColor(thisContext, R.color.gray_300))
-                binding.confirmActionTextview.alpha = .4f
-            }
-
-            override fun onTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
-                if (binding.confirmationInputEdittext.text.toString().isNotEmpty()) {
-                    if ((user?.authentication?.hasPassword != true && binding.confirmationInputEdittext.text.toString() == context?.getString(R.string.delete_caps)) ||
-                        user?.authentication?.hasPassword == true
-                    ) {
-                        binding.confirmActionTextview.setTextColor(ContextCompat.getColor(thisContext, R.color.red_100))
-                        binding.confirmActionTextview.alpha = 1.0f
-                    }
-                } else {
-                    binding.confirmActionTextview.setTextColor(ContextCompat.getColor(thisContext, R.color.gray_300))
+        binding.confirmationInputEdittext.addTextChangedListener(
+            object : TextWatcher {
+                override fun beforeTextChanged(
+                    p0: CharSequence?,
+                    p1: Int,
+                    p2: Int,
+                    p3: Int,
+                ) {
+                    binding.confirmActionTextview.setTextColor(
+                        ContextCompat.getColor(
+                            thisContext,
+                            R.color.gray_300,
+                        ),
+                    )
                     binding.confirmActionTextview.alpha = .4f
                 }
-            }
 
-            override fun afterTextChanged(p0: Editable?) {
-            }
-        })
+                override fun onTextChanged(
+                    p0: CharSequence?,
+                    p1: Int,
+                    p2: Int,
+                    p3: Int,
+                ) {
+                    if (binding.confirmationInputEdittext.text.toString().isNotEmpty()) {
+                        if ((
+                                user?.authentication?.hasPassword != true && binding.confirmationInputEdittext.text.toString() ==
+                                    context?.getString(
+                                        R.string.delete_caps,
+                                    )
+                            ) ||
+                            user?.authentication?.hasPassword == true
+                        ) {
+                            binding.confirmActionTextview.setTextColor(
+                                ContextCompat.getColor(
+                                    thisContext,
+                                    R.color.red_100,
+                                ),
+                            )
+                            binding.confirmActionTextview.alpha = 1.0f
+                        }
+                    } else {
+                        binding.confirmActionTextview.setTextColor(
+                            ContextCompat.getColor(
+                                thisContext,
+                                R.color.gray_300,
+                            ),
+                        )
+                        binding.confirmActionTextview.alpha = .4f
+                    }
+                }
+
+                override fun afterTextChanged(p0: Editable?) {
+                }
+            },
+        )
         binding.confirmActionTextview.setOnClickListener {
             val confirmationString = binding.confirmationInputEdittext.text.toString()
             if (user?.authentication?.hasPassword != true) {
@@ -219,6 +295,7 @@ class HabiticaAccountDialog(private var thisContext: Context) : BottomSheetDialo
 
     interface AccountUpdateConfirmed {
         fun resetConfirmedClicked(confirmationString: String)
+
         fun deletionConfirmClicked(confirmationString: String)
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.kt
index 0be52f4dc..a34850163 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.kt
@@ -1,570 +1,588 @@
-package com.habitrpg.android.habitica.ui.fragments.preferences
-
-import android.content.Intent
-import android.content.SharedPreferences
-import android.content.res.Configuration
-import android.os.Build
-import android.os.Bundle
-import android.provider.Settings
-import android.view.View
-import android.widget.TextView
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.core.content.ContextCompat
-import androidx.lifecycle.lifecycleScope
-import androidx.preference.CheckBoxPreference
-import androidx.preference.ListPreference
-import androidx.preference.Preference
-import androidx.preference.PreferenceCategory
-import androidx.preference.PreferenceScreen
-import com.habitrpg.android.habitica.BuildConfig
-import com.habitrpg.android.habitica.HabiticaBaseApplication
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.data.ApiClient
-import com.habitrpg.android.habitica.data.ContentRepository
-import com.habitrpg.android.habitica.extensions.addCancelButton
-import com.habitrpg.android.habitica.helpers.Analytics
-import com.habitrpg.android.habitica.helpers.AppConfigManager
-import com.habitrpg.android.habitica.helpers.EventCategory
-import com.habitrpg.android.habitica.helpers.HitType
-import com.habitrpg.android.habitica.helpers.SoundManager
-import com.habitrpg.android.habitica.helpers.TaskAlarmManager
-import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManager
-import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.android.habitica.prefs.TimePreference
-import com.habitrpg.android.habitica.ui.activities.ClassSelectionActivity
-import com.habitrpg.android.habitica.ui.activities.MainActivity
-import com.habitrpg.android.habitica.ui.activities.PrefsActivity
-import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
-import com.habitrpg.android.habitica.ui.views.SnackbarActivity
-import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import com.habitrpg.android.habitica.ui.views.insufficientCurrency.InsufficientGemsDialog
-import com.habitrpg.android.habitica.ui.views.preferences.PauseResumeDamageView
-import com.habitrpg.android.habitica.ui.views.showAsBottomSheet
-import com.habitrpg.common.habitica.helpers.AppTestingLevel
-import com.habitrpg.common.habitica.helpers.ExceptionHandler
-import com.habitrpg.common.habitica.helpers.LanguageHelper
-import com.habitrpg.common.habitica.helpers.launchCatching
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.flow.firstOrNull
-import kotlinx.coroutines.launch
-import java.util.Locale
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class PreferencesFragment :
-    BasePreferencesFragment(),
-    SharedPreferences.OnSharedPreferenceChangeListener {
-
-    @Inject
-    lateinit var contentRepository: ContentRepository
-
-    @Inject
-    lateinit var soundManager: SoundManager
-
-    @Inject
-    lateinit var pushNotificationManager: PushNotificationManager
-
-    @Inject
-    lateinit var configManager: AppConfigManager
-
-    @Inject
-    lateinit var apiClient: ApiClient
-
-    private var timePreference: TimePreference? = null
-    private var pushNotificationsPreference: PreferenceScreen? = null
-    private var emailNotificationsPreference: PreferenceScreen? = null
-    private var classSelectionPreference: Preference? = null
-    private var serverUrlPreference: ListPreference? = null
-    private var taskListPreference: ListPreference? = null
-
-    private val classSelectionResult =
-        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-            lifecycleScope.launch(ExceptionHandler.coroutine()) {
-                userRepository.retrieveUser(true, true)
-            }
-        }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        listView.itemAnimator = null
-
-        lifecycleScope.launchCatching {
-            userRepository.retrieveTeamPlans()
-        }
-    }
-
-    override fun setupPreferences() {
-        timePreference = findPreference("reminder_time") as? TimePreference
-        val useReminder = preferenceManager.sharedPreferences?.getBoolean("use_reminder", false)
-        timePreference?.isEnabled = useReminder ?: false
-        timePreference?.let { updatePreferenceEnabledView(it) }
-
-        classSelectionPreference = findPreference("choose_class")
-
-        val weekdayPreference = findPreference("FirstDayOfTheWeek") as? ListPreference
-        weekdayPreference?.summary = weekdayPreference?.entry
-
-        serverUrlPreference = findPreference("server_url") as? ListPreference
-        serverUrlPreference?.isVisible = false
-        serverUrlPreference?.summary =
-            preferenceManager.sharedPreferences?.getString("server_url", "")
-
-        val themePreference = findPreference("theme_name") as? ListPreference
-        themePreference?.summary = themePreference?.entry ?: "Default"
-        val themeModePreference = findPreference("theme_mode") as? ListPreference
-        themeModePreference?.summary = themeModePreference?.entry ?: "Follow System"
-
-        val launchScreenPreference = findPreference("launch_screen") as? ListPreference
-        launchScreenPreference?.summary = launchScreenPreference?.entry ?: "Habits"
-
-        val taskDisplayPreference = findPreference("task_display") as? ListPreference
-        if (configManager.enableTaskDisplayMode()) {
-            taskDisplayPreference?.isVisible = true
-            taskDisplayPreference?.summary = taskDisplayPreference?.entry
-        } else {
-            taskDisplayPreference?.isVisible = false
-        }
-    }
-
-    private fun updatePreferenceEnabledView(preference: Preference) {
-        val isEnabled = preference.isEnabled
-        preference.layoutResource = if (isEnabled) R.layout.preference_child_summary else R.layout.preference_child_summary_disabled
-    }
-
-    override fun onResume() {
-        super.onResume()
-        preferenceManager.sharedPreferences?.registerOnSharedPreferenceChangeListener(this)
-    }
-
-    override fun onPause() {
-        preferenceManager.sharedPreferences?.unregisterOnSharedPreferenceChangeListener(this)
-        super.onPause()
-    }
-
-    override fun onPreferenceTreeClick(preference: Preference): Boolean {
-        when (preference.key) {
-            "logout" -> {
-                logout()
-            }
-
-            "pause_damage" -> {
-                showAsBottomSheet { dismiss ->
-                    PauseResumeDamageView(user?.preferences?.sleep ?: true, {
-                        lifecycleScope.launchCatching {
-                            user?.let { userRepository.sleep(it) }
-                            dismiss()
-                        }
-                    })
-                }
-            }
-
-            "choose_class" -> {
-                val isPlayerOptedOutOfClass = user?.preferences?.disableClasses ?: false
-                val isClassSelected = user?.flags?.classSelected ?: false
-                val bundle = Bundle()
-                bundle.putBoolean("isInitialSelection", isClassSelected)
-                val intent = Intent(activity, ClassSelectionActivity::class.java)
-                intent.putExtras(bundle)
-
-                if (isClassSelected && !isPlayerOptedOutOfClass) {
-                    if ((user?.gemCount ?: 0) >= 3) {
-                        context?.let { context ->
-                            val dialog = HabiticaAlertDialog(context)
-                            dialog.setTitle(R.string.change_class_confirmation)
-                            dialog.setMessage(R.string.change_class_message)
-                            dialog.addButton(
-                                R.string.change_class,
-                                isPrimary = true,
-                                isDestructive = true
-                            ) { _, _ ->
-                                lifecycleScope.launch {
-                                    userRepository.changeClass()
-                                }
-                                classSelectionResult.launch(
-                                    intent
-                                )
-                            }
-                            dialog.addButton(R.string.close, false)
-                            dialog.enqueue()
-                        }
-                    } else {
-                        activity?.let { activity ->
-                            val dialog = InsufficientGemsDialog(activity, 3)
-                            Analytics.sendEvent("show insufficient gems modal", EventCategory.BEHAVIOUR, HitType.EVENT, mapOf("reason" to "class change"))
-                            dialog.show()
-                        }
-                    }
-                } else {
-                    // This will handle initial class selection (If a player has not already selected a class),
-                    // if a player started changing a class and force closes the app previously,
-                    // and if a player previously opted out of class selection.
-                    classSelectionResult.launch(intent)
-                }
-                return true
-            }
-
-            "reload_content" -> {
-                (activity as? SnackbarActivity)?.showSnackbar(
-                    content = context?.getString(R.string.reloading_content)
-                )
-                reloadContent(true)
-            }
-        }
-        return super.onPreferenceTreeClick(preference)
-    }
-
-    private fun reloadContent(withConfirmation: Boolean) {
-        lifecycleScope.launch(ExceptionHandler.coroutine()) {
-            contentRepository.retrieveContent(true)
-            if (withConfirmation) {
-                (activity as? SnackbarActivity)?.showSnackbar(
-                    content = context?.getString(R.string.reloaded_content),
-                    displayType = HabiticaSnackbar.SnackbarDisplayType.SUCCESS
-                )
-            }
-        }
-    }
-
-    private fun logout() {
-        context?.let { context ->
-            val dialog = HabiticaAlertDialog(context)
-            dialog.setTitle(R.string.are_you_sure)
-            dialog.addButton(R.string.logout, true) { _, _ ->
-                HabiticaBaseApplication.logout(context)
-                activity?.finish()
-            }
-            dialog.addCancelButton()
-            dialog.show()
-        }
-    }
-
-    private val notificationPermissionLauncher = registerForActivityResult(
-        ActivityResultContracts.RequestPermission()
-    ) { granted ->
-        if (granted) {
-            val usePushPreference = findPreference("usePushNotifications") as? CheckBoxPreference
-            usePushPreference?.isChecked = true
-            pushNotificationManager.addPushDeviceUsingStoredToken()
-        } else {
-            // If user denies notification settings originally - they must manually enable it through notification settings.
-            val alert = context?.let { HabiticaAlertDialog(it) }
-            alert?.setTitle(R.string.push_notification_system_settings_title)
-            alert?.setMessage(R.string.push_notification_system_settings_description)
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                alert?.addButton(R.string.open_settings, true, false) { _, _ ->
-                    val notifSettingIntent: Intent = Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS)
-                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                        .putExtra(Settings.EXTRA_APP_PACKAGE, context?.applicationContext?.packageName)
-                    startActivity(notifSettingIntent)
-                }
-            }
-            alert?.addButton(R.string.cancel, false) { _, _ ->
-                alert.dismiss()
-            }
-            alert?.show()
-        }
-    }
-
-    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String?) {
-        when (key) {
-            "use_reminder" -> {
-                val useReminder = sharedPreferences.getBoolean(key, false)
-                timePreference?.isEnabled = useReminder
-                timePreference?.let { updatePreferenceEnabledView(it) }
-                if (useReminder) {
-                    TaskAlarmManager.scheduleDailyReminder(context)
-                } else {
-                    TaskAlarmManager.removeDailyReminder(context)
-                }
-            }
-
-            "reminder_time" -> {
-                TaskAlarmManager.removeDailyReminder(context)
-                TaskAlarmManager.scheduleDailyReminder(context)
-            }
-
-            "usePushNotifications" -> {
-                val notifPermissionEnabled: Boolean =
-                    pushNotificationManager.notificationPermissionEnabled()
-                val usePushNotifications = sharedPreferences.getBoolean(key, true)
-                pushNotificationsPreference?.isEnabled = usePushNotifications
-                pushNotificationsPreference?.let { updatePreferenceEnabledView(it) }
-                lifecycleScope.launchCatching {
-                    userRepository.updateUser(
-                        "preferences.pushNotifications.unsubscribeFromAll",
-                        !usePushNotifications
-                    )
-                }
-                if (usePushNotifications) {
-                    if (!notifPermissionEnabled && Build.VERSION.SDK_INT >= 33) {
-                        notificationPermissionLauncher.launch(android.Manifest.permission.POST_NOTIFICATIONS)
-                    } else {
-                        pushNotificationManager.addPushDeviceUsingStoredToken()
-                    }
-                } else {
-                    lifecycleScope.launchCatching {
-                        pushNotificationManager.removePushDeviceUsingStoredToken()
-                    }
-                }
-            }
-
-            "useEmails" -> {
-                val useEmailNotifications = sharedPreferences.getBoolean(key, true)
-                emailNotificationsPreference?.isEnabled = useEmailNotifications
-                emailNotificationsPreference?.let { updatePreferenceEnabledView(it) }
-                lifecycleScope.launchCatching {
-                    userRepository.updateUser(
-                        "preferences.emailNotifications.unsubscribeFromAll",
-                        !useEmailNotifications
-                    )
-                }
-            }
-
-            "cds_time" -> {
-                val timeval = sharedPreferences.getString("cds_time", "0") ?: "0"
-                val hour = Integer.parseInt(timeval)
-                lifecycleScope.launchCatching {
-                    userRepository.changeCustomDayStart(hour)
-                }
-                val preference = findPreference<ListPreference>(key)
-                preference?.summary = preference?.entry
-            }
-
-            "language" -> {
-                val languageHelper = LanguageHelper(sharedPreferences.getString(key, "en"))
-
-                Locale.setDefault(languageHelper.locale)
-                val configuration = Configuration()
-                configuration.setLocale(languageHelper.locale)
-                @Suppress("DEPRECATION")
-                activity?.resources?.updateConfiguration(
-                    configuration,
-                    activity?.resources?.displayMetrics
-                )
-
-                if (user?.preferences?.language == languageHelper.languageCode) {
-                    return
-                }
-                lifecycleScope.launchCatching {
-                    userRepository.updateLanguage(languageHelper.languageCode ?: "en")
-                    reloadContent(false)
-                }
-                val intent = Intent(activity, MainActivity::class.java)
-                this.startActivity(intent)
-                activity?.finishAffinity()
-            }
-
-            "audioTheme" -> {
-                val newAudioTheme = sharedPreferences.getString(key, "off")
-                if (newAudioTheme != null) {
-                    lifecycleScope.launchCatching {
-                        userRepository.updateUser("preferences.sound", newAudioTheme)
-                    }
-                    soundManager.soundTheme = newAudioTheme
-                    soundManager.preloadAllFiles()
-                }
-            }
-
-            "theme_name" -> {
-                val activity = activity as? PrefsActivity ?: return
-                activity.reload()
-            }
-
-            "theme_mode" -> {
-                val activity = activity as? PrefsActivity ?: return
-                activity.reload()
-            }
-
-            "server_url" -> {
-                apiClient.updateServerUrl(sharedPreferences.getString(key, ""))
-                findPreference<Preference>(key)?.summary = sharedPreferences.getString(key, "")
-            }
-
-            "task_display" -> {
-                val preference = findPreference<ListPreference>(key)
-                preference?.summary = preference?.entry
-            }
-
-            "FirstDayOfTheWeek" -> {
-                val preference = findPreference<ListPreference>(key)
-                preference?.summary = preference?.entry
-            }
-
-            "disablePMs" -> {
-                val isDisabled = sharedPreferences.getBoolean("disablePMs", false)
-                if (user?.inbox?.optOut != isDisabled) {
-                    lifecycleScope.launchCatching {
-                        userRepository.updateUser("inbox.optOut", isDisabled)
-                    }
-                }
-            }
-
-            "launch_screen" -> {
-                val preference = findPreference<ListPreference>(key)
-                preference?.summary = preference?.entry ?: "Habits"
-            }
-        }
-    }
-
-    override fun onDisplayPreferenceDialog(preference: Preference) {
-        if (preference is TimePreference) {
-            if (parentFragmentManager.findFragmentByTag(TimePreferenceDialogFragment.TAG) == null) {
-                TimePreferenceDialogFragment.newInstance(this, preference.getKey())
-                    .show(parentFragmentManager, TimePreferenceDialogFragment.TAG)
-            }
-        } else {
-            super.onDisplayPreferenceDialog(preference)
-        }
-    }
-
-    override fun setUser(user: User?) {
-        super.setUser(user)
-
-        val pauseDamagePreference = findPreference<Preference>("pause_damage")
-        pauseDamagePreference?.title = getString(
-            if (user?.preferences?.sleep == true) {
-                R.string.resume_damage
-            } else {
-                R.string.pause_damage
-            }
-        )
-        pauseDamagePreference?.summary = getString(
-            if (user?.preferences?.sleep == true) {
-                R.string.resume_damage_summary
-            } else {
-                R.string.pause_damage_summary
-            }
-        )
-
-        val themePreference = findPreference("theme_name") as? ListPreference
-        if (themePreference?.value == "Default") themePreference.value = "purple"
-
-        val themeModePreference = findPreference("theme_mode") as? ListPreference
-        if (themeModePreference?.value == "Follow System") themeModePreference.value = "system"
-
-
-        if (10 <= (user?.stats?.lvl ?: 0)) {
-            if (user?.flags?.classSelected == true) {
-                if (user.preferences?.disableClasses == true) {
-                    classSelectionPreference?.title = getString(R.string.enable_class)
-                    classSelectionPreference?.summary = getString(R.string.enable_class_description)
-                } else {
-                    classSelectionPreference?.title = getString(R.string.change_class)
-                    classSelectionPreference?.summary = getString(R.string.change_class_description)
-                }
-            } else {
-                classSelectionPreference?.title = getString(R.string.enable_class)
-                classSelectionPreference?.summary = getString(R.string.enable_class_description)
-            }
-            classSelectionPreference?.isVisible = true
-        } else {
-            classSelectionPreference?.isVisible = false
-        }
-        val cdsTimePreference = findPreference("cds_time") as? ListPreference
-        cdsTimePreference?.value = user?.preferences?.dayStart.toString()
-        cdsTimePreference?.summary = cdsTimePreference?.entry
-        val languagePreference = findPreference("language") as? ListPreference
-        languagePreference?.value = user?.preferences?.language
-        languagePreference?.summary = languagePreference?.entry
-        val audioThemePreference = findPreference("audioTheme") as? ListPreference
-        audioThemePreference?.value = user?.preferences?.sound
-        audioThemePreference?.summary = audioThemePreference?.entry
-
-        val preference = findPreference<Preference>("authentication")
-        if (user?.flags?.verifiedUsername == true) {
-            preference?.layoutResource = R.layout.preference_child_summary
-            preference?.summary = context?.getString(R.string.authentication_summary)
-        } else {
-            preference?.layoutResource = R.layout.preference_child_summary_error
-            preference?.summary = context?.getString(R.string.username_not_confirmed)
-        }
-
-        if (user?.party?.id?.isNotBlank() != true) {
-            val launchScreenPreference = findPreference<ListPreference>("launch_screen")
-            launchScreenPreference?.entries =
-                resources.getStringArray(R.array.launch_screen_types).dropLast(1).toTypedArray()
-            launchScreenPreference?.entryValues =
-                resources.getStringArray(R.array.launch_screen_values).dropLast(1).toTypedArray()
-        }
-
-        val launchScreenPreference = findPreference<ListPreference>("launch_screen")
-        if (launchScreenPreference?.value == "habits") launchScreenPreference.value = "/user/tasks/habits"
-
-        val disablePMsPreference = findPreference("disablePMs") as? CheckBoxPreference
-        val inbox = user?.inbox
-        disablePMsPreference?.isChecked = inbox?.optOut ?: true
-
-        val notifPermissionEnabled: Boolean =
-            pushNotificationManager.notificationPermissionEnabled()
-        val usePushPreference = findPreference("usePushNotifications") as? CheckBoxPreference
-        pushNotificationsPreference = findPreference("pushNotifications") as? PreferenceScreen
-        val usePushNotifications =
-            !(user?.preferences?.pushNotifications?.unsubscribeFromAll ?: false)
-        pushNotificationsPreference?.isEnabled = usePushNotifications
-        pushNotificationsPreference?.let { updatePreferenceEnabledView(it) }
-        usePushPreference?.isChecked = (usePushNotifications && notifPermissionEnabled)
-        if (!notifPermissionEnabled) {
-            usePushPreference?.summary =
-                getString(R.string.push_notification_system_settings_description)
-        } else {
-            usePushPreference?.summary = ""
-        }
-        val useEmailPreference = findPreference("useEmails") as? CheckBoxPreference
-        emailNotificationsPreference = findPreference("emailNotifications") as? PreferenceScreen
-        val useEmailNotifications =
-            !(user?.preferences?.emailNotifications?.unsubscribeFromAll ?: false)
-        emailNotificationsPreference?.isEnabled = useEmailNotifications
-        emailNotificationsPreference?.let { updatePreferenceEnabledView(it) }
-        useEmailPreference?.isChecked = useEmailNotifications
-
-        lifecycleScope.launch {
-            val teams = userRepository.getTeamPlans().firstOrNull() ?: return@launch
-            val context = context ?: return@launch
-            val groupCategory = findPreference<PreferenceCategory>("groups_category")
-            val footer = groupCategory?.findPreference<Preference>("groups_footer")
-            footer?.order = 9999
-            groupCategory?.removeAll()
-            if (teams.isEmpty()) {
-                groupCategory?.isVisible = false
-            } else {
-                groupCategory?.isVisible = true
-                for (team in teams) {
-                    val newPreference = CheckBoxPreference(context)
-                    newPreference.layoutResource = R.layout.preference_child_summary
-                    newPreference.title = getString(R.string.copy_shared_tasks)
-                    newPreference.summary = team.summary
-                    newPreference.key = "copy_tasks-${team.id}"
-                    newPreference.onPreferenceChangeListener =
-                        Preference.OnPreferenceChangeListener { _, newValue ->
-                            val currentIds =
-                                user?.preferences?.tasks?.mirrorGroupTasks?.toMutableList()
-                                    ?: mutableListOf()
-                            if (newValue == true && !currentIds.contains(team.id)) {
-                                currentIds.add(team.id)
-                            } else if (newValue == false && currentIds.contains(team.id)) {
-                                currentIds.remove(team.id)
-                            }
-                            lifecycleScope.launchCatching {
-                                userRepository.updateUser(
-                                    "preferences.tasks.mirrorGroupTasks",
-                                    currentIds
-                                )
-                            }
-                            true
-                        }
-                    groupCategory?.addPreference(newPreference)
-                    newPreference.isChecked =
-                        user?.preferences?.tasks?.mirrorGroupTasks?.contains(team.id) == true
-                }
-            }
-            if (footer != null) {
-                groupCategory.addPreference(footer)
-            }
-        }
-
-        if (configManager.testingLevel() == AppTestingLevel.STAFF || BuildConfig.DEBUG) {
-            serverUrlPreference?.isVisible = true
-            taskListPreference?.isVisible = true
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.preferences
+
+import android.content.Intent
+import android.content.SharedPreferences
+import android.content.res.Configuration
+import android.os.Build
+import android.os.Bundle
+import android.provider.Settings
+import android.view.View
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.lifecycle.lifecycleScope
+import androidx.preference.CheckBoxPreference
+import androidx.preference.ListPreference
+import androidx.preference.Preference
+import androidx.preference.PreferenceCategory
+import androidx.preference.PreferenceScreen
+import com.habitrpg.android.habitica.BuildConfig
+import com.habitrpg.android.habitica.HabiticaBaseApplication
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.data.ApiClient
+import com.habitrpg.android.habitica.data.ContentRepository
+import com.habitrpg.android.habitica.extensions.addCancelButton
+import com.habitrpg.android.habitica.helpers.Analytics
+import com.habitrpg.android.habitica.helpers.AppConfigManager
+import com.habitrpg.android.habitica.helpers.EventCategory
+import com.habitrpg.android.habitica.helpers.HitType
+import com.habitrpg.android.habitica.helpers.SoundManager
+import com.habitrpg.android.habitica.helpers.TaskAlarmManager
+import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManager
+import com.habitrpg.android.habitica.models.user.User
+import com.habitrpg.android.habitica.prefs.TimePreference
+import com.habitrpg.android.habitica.ui.activities.ClassSelectionActivity
+import com.habitrpg.android.habitica.ui.activities.MainActivity
+import com.habitrpg.android.habitica.ui.activities.PrefsActivity
+import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
+import com.habitrpg.android.habitica.ui.views.SnackbarActivity
+import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
+import com.habitrpg.android.habitica.ui.views.insufficientCurrency.InsufficientGemsDialog
+import com.habitrpg.android.habitica.ui.views.preferences.PauseResumeDamageView
+import com.habitrpg.android.habitica.ui.views.showAsBottomSheet
+import com.habitrpg.common.habitica.helpers.AppTestingLevel
+import com.habitrpg.common.habitica.helpers.ExceptionHandler
+import com.habitrpg.common.habitica.helpers.LanguageHelper
+import com.habitrpg.common.habitica.helpers.launchCatching
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.launch
+import java.util.Locale
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class PreferencesFragment :
+    BasePreferencesFragment(),
+    SharedPreferences.OnSharedPreferenceChangeListener {
+    @Inject
+    lateinit var contentRepository: ContentRepository
+
+    @Inject
+    lateinit var soundManager: SoundManager
+
+    @Inject
+    lateinit var pushNotificationManager: PushNotificationManager
+
+    @Inject
+    lateinit var configManager: AppConfigManager
+
+    @Inject
+    lateinit var apiClient: ApiClient
+
+    private var timePreference: TimePreference? = null
+    private var pushNotificationsPreference: PreferenceScreen? = null
+    private var emailNotificationsPreference: PreferenceScreen? = null
+    private var classSelectionPreference: Preference? = null
+    private var serverUrlPreference: ListPreference? = null
+    private var taskListPreference: ListPreference? = null
+
+    private val classSelectionResult =
+        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                userRepository.retrieveUser(true, true)
+            }
+        }
+
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
+        super.onViewCreated(view, savedInstanceState)
+        listView.itemAnimator = null
+
+        lifecycleScope.launchCatching {
+            userRepository.retrieveTeamPlans()
+        }
+    }
+
+    override fun setupPreferences() {
+        timePreference = findPreference("reminder_time") as? TimePreference
+        val useReminder = preferenceManager.sharedPreferences?.getBoolean("use_reminder", false)
+        timePreference?.isEnabled = useReminder ?: false
+        timePreference?.let { updatePreferenceEnabledView(it) }
+
+        classSelectionPreference = findPreference("choose_class")
+
+        val weekdayPreference = findPreference("FirstDayOfTheWeek") as? ListPreference
+        weekdayPreference?.summary = weekdayPreference?.entry
+
+        serverUrlPreference = findPreference("server_url") as? ListPreference
+        serverUrlPreference?.isVisible = false
+        serverUrlPreference?.summary =
+            preferenceManager.sharedPreferences?.getString("server_url", "")
+
+        val themePreference = findPreference("theme_name") as? ListPreference
+        themePreference?.summary = themePreference?.entry ?: "Default"
+        val themeModePreference = findPreference("theme_mode") as? ListPreference
+        themeModePreference?.summary = themeModePreference?.entry ?: "Follow System"
+
+        val launchScreenPreference = findPreference("launch_screen") as? ListPreference
+        launchScreenPreference?.summary = launchScreenPreference?.entry ?: "Habits"
+
+        val taskDisplayPreference = findPreference("task_display") as? ListPreference
+        if (configManager.enableTaskDisplayMode()) {
+            taskDisplayPreference?.isVisible = true
+            taskDisplayPreference?.summary = taskDisplayPreference?.entry
+        } else {
+            taskDisplayPreference?.isVisible = false
+        }
+    }
+
+    private fun updatePreferenceEnabledView(preference: Preference) {
+        val isEnabled = preference.isEnabled
+        preference.layoutResource =
+            if (isEnabled) R.layout.preference_child_summary else R.layout.preference_child_summary_disabled
+    }
+
+    override fun onResume() {
+        super.onResume()
+        preferenceManager.sharedPreferences?.registerOnSharedPreferenceChangeListener(this)
+    }
+
+    override fun onPause() {
+        preferenceManager.sharedPreferences?.unregisterOnSharedPreferenceChangeListener(this)
+        super.onPause()
+    }
+
+    override fun onPreferenceTreeClick(preference: Preference): Boolean {
+        when (preference.key) {
+            "logout" -> {
+                logout()
+            }
+
+            "pause_damage" -> {
+                showAsBottomSheet { dismiss ->
+                    PauseResumeDamageView(user?.preferences?.sleep ?: true, {
+                        lifecycleScope.launchCatching {
+                            user?.let { userRepository.sleep(it) }
+                            dismiss()
+                        }
+                    })
+                }
+            }
+
+            "choose_class" -> {
+                val isPlayerOptedOutOfClass = user?.preferences?.disableClasses ?: false
+                val isClassSelected = user?.flags?.classSelected ?: false
+                val bundle = Bundle()
+                bundle.putBoolean("isInitialSelection", isClassSelected)
+                val intent = Intent(activity, ClassSelectionActivity::class.java)
+                intent.putExtras(bundle)
+
+                if (isClassSelected && !isPlayerOptedOutOfClass) {
+                    if ((user?.gemCount ?: 0) >= 3) {
+                        context?.let { context ->
+                            val dialog = HabiticaAlertDialog(context)
+                            dialog.setTitle(R.string.change_class_confirmation)
+                            dialog.setMessage(R.string.change_class_message)
+                            dialog.addButton(
+                                R.string.change_class,
+                                isPrimary = true,
+                                isDestructive = true,
+                            ) { _, _ ->
+                                lifecycleScope.launch {
+                                    userRepository.changeClass()
+                                }
+                                classSelectionResult.launch(
+                                    intent,
+                                )
+                            }
+                            dialog.addButton(R.string.close, false)
+                            dialog.enqueue()
+                        }
+                    } else {
+                        activity?.let { activity ->
+                            val dialog = InsufficientGemsDialog(activity, 3)
+                            Analytics.sendEvent(
+                                "show insufficient gems modal",
+                                EventCategory.BEHAVIOUR,
+                                HitType.EVENT,
+                                mapOf("reason" to "class change"),
+                            )
+                            dialog.show()
+                        }
+                    }
+                } else {
+                    // This will handle initial class selection (If a player has not already selected a class),
+                    // if a player started changing a class and force closes the app previously,
+                    // and if a player previously opted out of class selection.
+                    classSelectionResult.launch(intent)
+                }
+                return true
+            }
+
+            "reload_content" -> {
+                (activity as? SnackbarActivity)?.showSnackbar(
+                    content = context?.getString(R.string.reloading_content),
+                )
+                reloadContent(true)
+            }
+        }
+        return super.onPreferenceTreeClick(preference)
+    }
+
+    private fun reloadContent(withConfirmation: Boolean) {
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            contentRepository.retrieveContent(true)
+            if (withConfirmation) {
+                (activity as? SnackbarActivity)?.showSnackbar(
+                    content = context?.getString(R.string.reloaded_content),
+                    displayType = HabiticaSnackbar.SnackbarDisplayType.SUCCESS,
+                )
+            }
+        }
+    }
+
+    private fun logout() {
+        context?.let { context ->
+            val dialog = HabiticaAlertDialog(context)
+            dialog.setTitle(R.string.are_you_sure)
+            dialog.addButton(R.string.logout, true) { _, _ ->
+                HabiticaBaseApplication.logout(context)
+                activity?.finish()
+            }
+            dialog.addCancelButton()
+            dialog.show()
+        }
+    }
+
+    private val notificationPermissionLauncher =
+        registerForActivityResult(
+            ActivityResultContracts.RequestPermission(),
+        ) { granted ->
+            if (granted) {
+                val usePushPreference = findPreference("usePushNotifications") as? CheckBoxPreference
+                usePushPreference?.isChecked = true
+                pushNotificationManager.addPushDeviceUsingStoredToken()
+            } else {
+                // If user denies notification settings originally - they must manually enable it through notification settings.
+                val alert = context?.let { HabiticaAlertDialog(it) }
+                alert?.setTitle(R.string.push_notification_system_settings_title)
+                alert?.setMessage(R.string.push_notification_system_settings_description)
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    alert?.addButton(R.string.open_settings, true, false) { _, _ ->
+                        val notifSettingIntent: Intent =
+                            Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS)
+                                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                .putExtra(
+                                    Settings.EXTRA_APP_PACKAGE,
+                                    context?.applicationContext?.packageName,
+                                )
+                        startActivity(notifSettingIntent)
+                    }
+                }
+                alert?.addButton(R.string.cancel, false) { _, _ ->
+                    alert.dismiss()
+                }
+                alert?.show()
+            }
+        }
+
+    override fun onSharedPreferenceChanged(
+        sharedPreferences: SharedPreferences,
+        key: String?,
+    ) {
+        when (key) {
+            "use_reminder" -> {
+                val useReminder = sharedPreferences.getBoolean(key, false)
+                timePreference?.isEnabled = useReminder
+                timePreference?.let { updatePreferenceEnabledView(it) }
+                if (useReminder) {
+                    TaskAlarmManager.scheduleDailyReminder(context)
+                } else {
+                    TaskAlarmManager.removeDailyReminder(context)
+                }
+            }
+
+            "reminder_time" -> {
+                TaskAlarmManager.removeDailyReminder(context)
+                TaskAlarmManager.scheduleDailyReminder(context)
+            }
+
+            "usePushNotifications" -> {
+                val notifPermissionEnabled: Boolean =
+                    pushNotificationManager.notificationPermissionEnabled()
+                val usePushNotifications = sharedPreferences.getBoolean(key, true)
+                pushNotificationsPreference?.isEnabled = usePushNotifications
+                pushNotificationsPreference?.let { updatePreferenceEnabledView(it) }
+                lifecycleScope.launchCatching {
+                    userRepository.updateUser(
+                        "preferences.pushNotifications.unsubscribeFromAll",
+                        !usePushNotifications,
+                    )
+                }
+                if (usePushNotifications) {
+                    if (!notifPermissionEnabled && Build.VERSION.SDK_INT >= 33) {
+                        notificationPermissionLauncher.launch(android.Manifest.permission.POST_NOTIFICATIONS)
+                    } else {
+                        pushNotificationManager.addPushDeviceUsingStoredToken()
+                    }
+                } else {
+                    lifecycleScope.launchCatching {
+                        pushNotificationManager.removePushDeviceUsingStoredToken()
+                    }
+                }
+            }
+
+            "useEmails" -> {
+                val useEmailNotifications = sharedPreferences.getBoolean(key, true)
+                emailNotificationsPreference?.isEnabled = useEmailNotifications
+                emailNotificationsPreference?.let { updatePreferenceEnabledView(it) }
+                lifecycleScope.launchCatching {
+                    userRepository.updateUser(
+                        "preferences.emailNotifications.unsubscribeFromAll",
+                        !useEmailNotifications,
+                    )
+                }
+            }
+
+            "cds_time" -> {
+                val timeval = sharedPreferences.getString("cds_time", "0") ?: "0"
+                val hour = Integer.parseInt(timeval)
+                lifecycleScope.launchCatching {
+                    userRepository.changeCustomDayStart(hour)
+                }
+                val preference = findPreference<ListPreference>(key)
+                preference?.summary = preference?.entry
+            }
+
+            "language" -> {
+                val languageHelper = LanguageHelper(sharedPreferences.getString(key, "en"))
+
+                Locale.setDefault(languageHelper.locale)
+                val configuration = Configuration()
+                configuration.setLocale(languageHelper.locale)
+                @Suppress("DEPRECATION")
+                activity?.resources?.updateConfiguration(
+                    configuration,
+                    activity?.resources?.displayMetrics,
+                )
+
+                if (user?.preferences?.language == languageHelper.languageCode) {
+                    return
+                }
+                lifecycleScope.launchCatching {
+                    userRepository.updateLanguage(languageHelper.languageCode ?: "en")
+                    reloadContent(false)
+                }
+                val intent = Intent(activity, MainActivity::class.java)
+                this.startActivity(intent)
+                activity?.finishAffinity()
+            }
+
+            "audioTheme" -> {
+                val newAudioTheme = sharedPreferences.getString(key, "off")
+                if (newAudioTheme != null) {
+                    lifecycleScope.launchCatching {
+                        userRepository.updateUser("preferences.sound", newAudioTheme)
+                    }
+                    soundManager.soundTheme = newAudioTheme
+                    soundManager.preloadAllFiles()
+                }
+            }
+
+            "theme_name" -> {
+                val activity = activity as? PrefsActivity ?: return
+                activity.reload()
+            }
+
+            "theme_mode" -> {
+                val activity = activity as? PrefsActivity ?: return
+                activity.reload()
+            }
+
+            "server_url" -> {
+                apiClient.updateServerUrl(sharedPreferences.getString(key, ""))
+                findPreference<Preference>(key)?.summary = sharedPreferences.getString(key, "")
+            }
+
+            "task_display" -> {
+                val preference = findPreference<ListPreference>(key)
+                preference?.summary = preference?.entry
+            }
+
+            "FirstDayOfTheWeek" -> {
+                val preference = findPreference<ListPreference>(key)
+                preference?.summary = preference?.entry
+            }
+
+            "disablePMs" -> {
+                val isDisabled = sharedPreferences.getBoolean("disablePMs", false)
+                if (user?.inbox?.optOut != isDisabled) {
+                    lifecycleScope.launchCatching {
+                        userRepository.updateUser("inbox.optOut", isDisabled)
+                    }
+                }
+            }
+
+            "launch_screen" -> {
+                val preference = findPreference<ListPreference>(key)
+                preference?.summary = preference?.entry ?: "Habits"
+            }
+        }
+    }
+
+    override fun onDisplayPreferenceDialog(preference: Preference) {
+        if (preference is TimePreference) {
+            if (parentFragmentManager.findFragmentByTag(TimePreferenceDialogFragment.TAG) == null) {
+                TimePreferenceDialogFragment.newInstance(this, preference.getKey())
+                    .show(parentFragmentManager, TimePreferenceDialogFragment.TAG)
+            }
+        } else {
+            super.onDisplayPreferenceDialog(preference)
+        }
+    }
+
+    override fun setUser(user: User?) {
+        super.setUser(user)
+
+        val pauseDamagePreference = findPreference<Preference>("pause_damage")
+        pauseDamagePreference?.title =
+            getString(
+                if (user?.preferences?.sleep == true) {
+                    R.string.resume_damage
+                } else {
+                    R.string.pause_damage
+                },
+            )
+        pauseDamagePreference?.summary =
+            getString(
+                if (user?.preferences?.sleep == true) {
+                    R.string.resume_damage_summary
+                } else {
+                    R.string.pause_damage_summary
+                },
+            )
+
+        val themePreference = findPreference("theme_name") as? ListPreference
+        if (themePreference?.value == "Default") themePreference.value = "purple"
+
+        val themeModePreference = findPreference("theme_mode") as? ListPreference
+        if (themeModePreference?.value == "Follow System") themeModePreference.value = "system"
+
+        if (10 <= (user?.stats?.lvl ?: 0)) {
+            if (user?.flags?.classSelected == true) {
+                if (user.preferences?.disableClasses == true) {
+                    classSelectionPreference?.title = getString(R.string.enable_class)
+                    classSelectionPreference?.summary = getString(R.string.enable_class_description)
+                } else {
+                    classSelectionPreference?.title = getString(R.string.change_class)
+                    classSelectionPreference?.summary = getString(R.string.change_class_description)
+                }
+            } else {
+                classSelectionPreference?.title = getString(R.string.enable_class)
+                classSelectionPreference?.summary = getString(R.string.enable_class_description)
+            }
+            classSelectionPreference?.isVisible = true
+        } else {
+            classSelectionPreference?.isVisible = false
+        }
+        val cdsTimePreference = findPreference("cds_time") as? ListPreference
+        cdsTimePreference?.value = user?.preferences?.dayStart.toString()
+        cdsTimePreference?.summary = cdsTimePreference?.entry
+        val languagePreference = findPreference("language") as? ListPreference
+        languagePreference?.value = user?.preferences?.language
+        languagePreference?.summary = languagePreference?.entry
+        val audioThemePreference = findPreference("audioTheme") as? ListPreference
+        audioThemePreference?.value = user?.preferences?.sound
+        audioThemePreference?.summary = audioThemePreference?.entry
+
+        val preference = findPreference<Preference>("authentication")
+        if (user?.flags?.verifiedUsername == true) {
+            preference?.layoutResource = R.layout.preference_child_summary
+            preference?.summary = context?.getString(R.string.authentication_summary)
+        } else {
+            preference?.layoutResource = R.layout.preference_child_summary_error
+            preference?.summary = context?.getString(R.string.username_not_confirmed)
+        }
+
+        if (user?.party?.id?.isNotBlank() != true) {
+            val launchScreenPreference = findPreference<ListPreference>("launch_screen")
+            launchScreenPreference?.entries =
+                resources.getStringArray(R.array.launch_screen_types).dropLast(1).toTypedArray()
+            launchScreenPreference?.entryValues =
+                resources.getStringArray(R.array.launch_screen_values).dropLast(1).toTypedArray()
+        }
+
+        val launchScreenPreference = findPreference<ListPreference>("launch_screen")
+        if (launchScreenPreference?.value == "habits") {
+            launchScreenPreference.value =
+                "/user/tasks/habits"
+        }
+
+        val disablePMsPreference = findPreference("disablePMs") as? CheckBoxPreference
+        val inbox = user?.inbox
+        disablePMsPreference?.isChecked = inbox?.optOut ?: true
+
+        val notifPermissionEnabled: Boolean =
+            pushNotificationManager.notificationPermissionEnabled()
+        val usePushPreference = findPreference("usePushNotifications") as? CheckBoxPreference
+        pushNotificationsPreference = findPreference("pushNotifications") as? PreferenceScreen
+        val usePushNotifications =
+            !(user?.preferences?.pushNotifications?.unsubscribeFromAll ?: false)
+        pushNotificationsPreference?.isEnabled = usePushNotifications
+        pushNotificationsPreference?.let { updatePreferenceEnabledView(it) }
+        usePushPreference?.isChecked = (usePushNotifications && notifPermissionEnabled)
+        if (!notifPermissionEnabled) {
+            usePushPreference?.summary =
+                getString(R.string.push_notification_system_settings_description)
+        } else {
+            usePushPreference?.summary = ""
+        }
+        val useEmailPreference = findPreference("useEmails") as? CheckBoxPreference
+        emailNotificationsPreference = findPreference("emailNotifications") as? PreferenceScreen
+        val useEmailNotifications =
+            !(user?.preferences?.emailNotifications?.unsubscribeFromAll ?: false)
+        emailNotificationsPreference?.isEnabled = useEmailNotifications
+        emailNotificationsPreference?.let { updatePreferenceEnabledView(it) }
+        useEmailPreference?.isChecked = useEmailNotifications
+
+        lifecycleScope.launch {
+            val teams = userRepository.getTeamPlans().firstOrNull() ?: return@launch
+            val context = context ?: return@launch
+            val groupCategory = findPreference<PreferenceCategory>("groups_category")
+            val footer = groupCategory?.findPreference<Preference>("groups_footer")
+            footer?.order = 9999
+            groupCategory?.removeAll()
+            if (teams.isEmpty()) {
+                groupCategory?.isVisible = false
+            } else {
+                groupCategory?.isVisible = true
+                for (team in teams) {
+                    val newPreference = CheckBoxPreference(context)
+                    newPreference.layoutResource = R.layout.preference_child_summary
+                    newPreference.title = getString(R.string.copy_shared_tasks)
+                    newPreference.summary = team.summary
+                    newPreference.key = "copy_tasks-${team.id}"
+                    newPreference.onPreferenceChangeListener =
+                        Preference.OnPreferenceChangeListener { _, newValue ->
+                            val currentIds =
+                                user?.preferences?.tasks?.mirrorGroupTasks?.toMutableList()
+                                    ?: mutableListOf()
+                            if (newValue == true && !currentIds.contains(team.id)) {
+                                currentIds.add(team.id)
+                            } else if (newValue == false && currentIds.contains(team.id)) {
+                                currentIds.remove(team.id)
+                            }
+                            lifecycleScope.launchCatching {
+                                userRepository.updateUser(
+                                    "preferences.tasks.mirrorGroupTasks",
+                                    currentIds,
+                                )
+                            }
+                            true
+                        }
+                    groupCategory?.addPreference(newPreference)
+                    newPreference.isChecked =
+                        user?.preferences?.tasks?.mirrorGroupTasks?.contains(team.id) == true
+                }
+            }
+            if (footer != null) {
+                groupCategory.addPreference(footer)
+            }
+        }
+
+        if (configManager.testingLevel() == AppTestingLevel.STAFF || BuildConfig.DEBUG) {
+            serverUrlPreference?.isVisible = true
+            taskListPreference?.isVisible = true
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PushNotificationsPreferencesFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PushNotificationsPreferencesFragment.kt
index c720deb54..e3c2a5760 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PushNotificationsPreferencesFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PushNotificationsPreferencesFragment.kt
@@ -8,8 +8,9 @@ import com.habitrpg.common.habitica.helpers.launchCatching
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
-class PushNotificationsPreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnSharedPreferenceChangeListener {
-
+class PushNotificationsPreferencesFragment :
+    BasePreferencesFragment(),
+    SharedPreferences.OnSharedPreferenceChangeListener {
     private var isInitialSet: Boolean = true
     private var isSettingUser: Boolean = false
 
@@ -23,57 +24,107 @@ class PushNotificationsPreferencesFragment : BasePreferencesFragment(), SharedPr
         preferenceScreen.sharedPreferences?.unregisterOnSharedPreferenceChangeListener(this)
     }
 
-    override fun setupPreferences() { /* no-on */ }
+    override fun setupPreferences() { // no-on
+    }
 
     override fun setUser(user: User?) {
         super.setUser(user)
         isSettingUser = !isInitialSet
-        updatePreference("preference_push_you_won_challenge", user?.preferences?.pushNotifications?.wonChallenge)
-        updatePreference("preference_push_received_a_private_message", user?.preferences?.pushNotifications?.newPM)
-        updatePreference("preference_push_gifted_gems", user?.preferences?.pushNotifications?.giftedGems)
-        updatePreference("preference_push_gifted_subscription", user?.preferences?.pushNotifications?.giftedSubscription)
-        updatePreference("preference_push_invited_to_party", user?.preferences?.pushNotifications?.invitedParty)
-        updatePreference("preference_push_invited_to_guild", user?.preferences?.pushNotifications?.invitedGuild)
-        updatePreference("preference_push_your_quest_has_begun", user?.preferences?.pushNotifications?.questStarted)
-        updatePreference("preference_push_invited_to_quest", user?.preferences?.pushNotifications?.invitedQuest)
-        updatePreference("preference_push_important_announcements", user?.preferences?.pushNotifications?.majorUpdates)
-        updatePreference("preference_push_party_activity", user?.preferences?.pushNotifications?.partyActivity)
-        updatePreference("preference_push_party_mention", user?.preferences?.pushNotifications?.mentionParty)
-        updatePreference("preference_push_joined_guild_mention", user?.preferences?.pushNotifications?.mentionJoinedGuild)
-        updatePreference("preference_push_content_release", user?.preferences?.pushNotifications?.contentRelease)
+        updatePreference(
+            "preference_push_you_won_challenge",
+            user?.preferences?.pushNotifications?.wonChallenge,
+        )
+        updatePreference(
+            "preference_push_received_a_private_message",
+            user?.preferences?.pushNotifications?.newPM,
+        )
+        updatePreference(
+            "preference_push_gifted_gems",
+            user?.preferences?.pushNotifications?.giftedGems,
+        )
+        updatePreference(
+            "preference_push_gifted_subscription",
+            user?.preferences?.pushNotifications?.giftedSubscription,
+        )
+        updatePreference(
+            "preference_push_invited_to_party",
+            user?.preferences?.pushNotifications?.invitedParty,
+        )
+        updatePreference(
+            "preference_push_invited_to_guild",
+            user?.preferences?.pushNotifications?.invitedGuild,
+        )
+        updatePreference(
+            "preference_push_your_quest_has_begun",
+            user?.preferences?.pushNotifications?.questStarted,
+        )
+        updatePreference(
+            "preference_push_invited_to_quest",
+            user?.preferences?.pushNotifications?.invitedQuest,
+        )
+        updatePreference(
+            "preference_push_important_announcements",
+            user?.preferences?.pushNotifications?.majorUpdates,
+        )
+        updatePreference(
+            "preference_push_party_activity",
+            user?.preferences?.pushNotifications?.partyActivity,
+        )
+        updatePreference(
+            "preference_push_party_mention",
+            user?.preferences?.pushNotifications?.mentionParty,
+        )
+        updatePreference(
+            "preference_push_joined_guild_mention",
+            user?.preferences?.pushNotifications?.mentionJoinedGuild,
+        )
+        updatePreference(
+            "preference_push_content_release",
+            user?.preferences?.pushNotifications?.contentRelease,
+        )
         isSettingUser = false
         isInitialSet = false
     }
 
-    private fun updatePreference(key: String, isChecked: Boolean?) {
+    private fun updatePreference(
+        key: String,
+        isChecked: Boolean?,
+    ) {
         val preference = (findPreference(key) as? CheckBoxPreference)
         preference?.isChecked = isChecked == true
     }
 
-    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String?) {
+    override fun onSharedPreferenceChanged(
+        sharedPreferences: SharedPreferences,
+        key: String?,
+    ) {
         if (isSettingUser) {
             return
         }
-        val pathKey = when (key) {
-            "preference_push_you_won_challenge" -> "wonChallenge"
-            "preference_push_received_a_private_message" -> "newPM"
-            "preference_push_gifted_gems" -> "giftedGems"
-            "preference_push_gifted_subscription" -> "giftedSubscription"
-            "preference_push_invited_to_party" -> "invitedParty"
-            "preference_push_invited_to_guild" -> "invitedGuild"
-            "preference_push_your_quest_has_begun" -> "questStarted"
-            "preference_push_invited_to_quest" -> "invitedQuest"
-            "preference_push_important_announcements" -> "majorUpdates"
-            "preference_push_party_activity" -> "partyActivity"
-            "preference_push_party_mention" -> "mentionParty"
-            "preference_push_joined_guild_mention" -> "mentionJoinedGuild"
-            "preference_push_unjoined_guild_mention" -> "mentionUnjoinedGuild"
-            "preference_push_content_release" -> "contentRelease"
-            else -> null
-        }
+        val pathKey =
+            when (key) {
+                "preference_push_you_won_challenge" -> "wonChallenge"
+                "preference_push_received_a_private_message" -> "newPM"
+                "preference_push_gifted_gems" -> "giftedGems"
+                "preference_push_gifted_subscription" -> "giftedSubscription"
+                "preference_push_invited_to_party" -> "invitedParty"
+                "preference_push_invited_to_guild" -> "invitedGuild"
+                "preference_push_your_quest_has_begun" -> "questStarted"
+                "preference_push_invited_to_quest" -> "invitedQuest"
+                "preference_push_important_announcements" -> "majorUpdates"
+                "preference_push_party_activity" -> "partyActivity"
+                "preference_push_party_mention" -> "mentionParty"
+                "preference_push_joined_guild_mention" -> "mentionJoinedGuild"
+                "preference_push_unjoined_guild_mention" -> "mentionUnjoinedGuild"
+                "preference_push_content_release" -> "contentRelease"
+                else -> null
+            }
         if (pathKey != null) {
             lifecycleScope.launchCatching {
-                userRepository.updateUser("preferences.pushNotifications.$pathKey", sharedPreferences.getBoolean(key, false))
+                userRepository.updateUser(
+                    "preferences.pushNotifications.$pathKey",
+                    sharedPreferences.getBoolean(key, false),
+                )
             }
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/TimePreferenceDialogFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/TimePreferenceDialogFragment.kt
index 5af6da3c9..0f3e00bb5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/TimePreferenceDialogFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/TimePreferenceDialogFragment.kt
@@ -13,7 +13,6 @@ import java.util.Locale
 
 @AndroidEntryPoint
 class TimePreferenceDialogFragment : PreferenceDialogFragmentCompat() {
-
     lateinit var picker: TimePicker
 
     private val timePreference: TimePreference
@@ -73,9 +72,10 @@ class TimePreferenceDialogFragment : PreferenceDialogFragmentCompat() {
 
     companion object {
         val TAG = TimePreferenceDialogFragment::class.java.simpleName
+
         fun newInstance(
             preferenceFragment: PreferenceFragmentCompat,
-            key: String
+            key: String,
         ): TimePreferenceDialogFragment {
             val fragment = TimePreferenceDialogFragment()
             val arguments = Bundle(1)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/EventOutcomeSubscriptionBottomSheetFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/EventOutcomeSubscriptionBottomSheetFragment.kt
index a3edf23bd..babd73297 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/EventOutcomeSubscriptionBottomSheetFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/EventOutcomeSubscriptionBottomSheetFragment.kt
@@ -6,10 +6,12 @@ import androidx.core.view.isVisible
 import com.habitrpg.android.habitica.R
 
 class EventOutcomeSubscriptionBottomSheetFragment : SubscriptionBottomSheetFragment() {
-
     var eventType: String = ""
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
         super.onViewCreated(view, savedInstanceState)
         when (eventType) {
             EVENT_ARMOIRE_OPENED -> setArmoireEventSubscriptionViews()
@@ -17,7 +19,6 @@ class EventOutcomeSubscriptionBottomSheetFragment : SubscriptionBottomSheetFragm
             EVENT_GEMS_FOR_GOLD -> setGemsForGoldEventSubscriptionViews()
             EVENT_HOURGLASS_SHOP_OPENED -> setHourglassShopEventSubscriptionViews()
         }
-
     }
 
     private fun setArmoireEventSubscriptionViews() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GemsPurchaseFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GemsPurchaseFragment.kt
index 72107e79c..f0780b91b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GemsPurchaseFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GemsPurchaseFragment.kt
@@ -28,12 +28,12 @@ import com.habitrpg.android.habitica.ui.activities.GiftGemsActivity
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
 import com.habitrpg.android.habitica.ui.fragments.PromoInfoFragment
 import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard
-import com.habitrpg.common.habitica.theme.HabiticaTheme
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.android.habitica.ui.views.promo.BirthdayBanner
 import com.habitrpg.common.habitica.extensions.isUsingNightModeResources
 import com.habitrpg.common.habitica.helpers.ExceptionHandler
 import com.habitrpg.common.habitica.helpers.launchCatching
+import com.habitrpg.common.habitica.theme.HabiticaTheme
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -43,10 +43,12 @@ import javax.inject.Inject
 
 @AndroidEntryPoint
 class GemsPurchaseFragment : BaseFragment<FragmentGemPurchaseBinding>() {
-
     override var binding: FragmentGemPurchaseBinding? = null
 
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentGemPurchaseBinding {
+    override fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+    ): FragmentGemPurchaseBinding {
         return FragmentGemPurchaseBinding.inflate(inflater, container, false)
     }
 
@@ -61,7 +63,10 @@ class GemsPurchaseFragment : BaseFragment<FragmentGemPurchaseBinding>() {
 
     private var isGemSaleHappening = false
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
         super.onViewCreated(view, savedInstanceState)
 
         binding?.gems4View?.setOnPurchaseClickListener { purchaseGems(binding?.gems4View) }
@@ -104,8 +109,10 @@ class GemsPurchaseFragment : BaseFragment<FragmentGemPurchaseBinding>() {
                 HabiticaTheme {
                     BirthdayBanner(
                         endDate = birthdayEventEnd,
-                        Modifier.padding(horizontal = 20.dp).clip(HabiticaTheme.shapes.medium)
-                            .padding(bottom = 20.dp)
+                        Modifier
+                            .padding(horizontal = 20.dp)
+                            .clip(HabiticaTheme.shapes.medium)
+                            .padding(bottom = 20.dp),
                     )
                 }
             }
@@ -135,15 +142,18 @@ class GemsPurchaseFragment : BaseFragment<FragmentGemPurchaseBinding>() {
     }
 
     private fun updateButtonLabel(sku: ProductDetails) {
-        val matchingView: GemPurchaseOptionsView? = when (sku.productId) {
-            PurchaseTypes.Purchase4Gems -> binding?.gems4View
-            PurchaseTypes.Purchase21Gems -> binding?.gems21View
-            PurchaseTypes.Purchase42Gems -> binding?.gems42View
-            PurchaseTypes.Purchase84Gems -> binding?.gems84View
-            else -> return
-        }
+        val matchingView: GemPurchaseOptionsView? =
+            when (sku.productId) {
+                PurchaseTypes.PURCHASE_4_GEMS -> binding?.gems4View
+                PurchaseTypes.PURCHASE_21_GEMS -> binding?.gems21View
+                PurchaseTypes.PURCHASE_42_GEMS -> binding?.gems42View
+                PurchaseTypes.PURCHASE_84_GEMS -> binding?.gems84View
+                else -> return
+            }
         if (matchingView != null) {
-            matchingView.setPurchaseButtonText(sku.oneTimePurchaseOfferDetails?.formattedPrice ?: "")
+            matchingView.setPurchaseButtonText(
+                sku.oneTimePurchaseOfferDetails?.formattedPrice ?: "",
+            )
             matchingView.sku = sku
         }
     }
@@ -154,16 +164,19 @@ class GemsPurchaseFragment : BaseFragment<FragmentGemPurchaseBinding>() {
     }
 
     private fun showGiftGemsDialog() {
-        val chooseRecipientDialogView = this.activity?.layoutInflater?.inflate(R.layout.dialog_choose_message_recipient, null)
+        val chooseRecipientDialogView =
+            this.activity?.layoutInflater?.inflate(R.layout.dialog_choose_message_recipient, null)
 
         this.activity?.let { thisActivity ->
             val alert = HabiticaAlertDialog(thisActivity)
             alert.setTitle(getString(R.string.gift_title))
             alert.addButton(getString(R.string.action_continue), true) { _, _ ->
-                val usernameEditText = chooseRecipientDialogView?.findViewById<View>(R.id.uuidEditText) as? EditText
-                val intent = Intent(thisActivity, GiftGemsActivity::class.java).apply {
-                    putExtra("username", usernameEditText?.text.toString())
-                }
+                val usernameEditText =
+                    chooseRecipientDialogView?.findViewById<View>(R.id.uuidEditText) as? EditText
+                val intent =
+                    Intent(thisActivity, GiftGemsActivity::class.java).apply {
+                        putExtra("username", usernameEditText?.text.toString())
+                    }
                 startActivity(intent)
             }
             alert.addCancelButton { _, _ ->
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GiftBalanceGemsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GiftBalanceGemsFragment.kt
index 713c94a1b..f48156e40 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GiftBalanceGemsFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GiftBalanceGemsFragment.kt
@@ -21,7 +21,6 @@ import javax.inject.Inject
 
 @AndroidEntryPoint
 class GiftBalanceGemsFragment : BaseFragment<FragmentGiftGemBalanceBinding>() {
-
     @Inject
     lateinit var socialRepository: SocialRepository
 
@@ -39,7 +38,7 @@ class GiftBalanceGemsFragment : BaseFragment<FragmentGiftGemBalanceBinding>() {
 
     override fun createBinding(
         inflater: LayoutInflater,
-        container: ViewGroup?
+        container: ViewGroup?,
     ): FragmentGiftGemBalanceBinding {
         return FragmentGiftGemBalanceBinding.inflate(inflater, container, false)
     }
@@ -61,7 +60,10 @@ class GiftBalanceGemsFragment : BaseFragment<FragmentGiftGemBalanceBinding>() {
         binding?.usernameTextview?.text = it.formattedUsername
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
         super.onViewCreated(view, savedInstanceState)
         binding?.giftButton?.setOnClickListener { sendGift() }
         updateMemberViews()
@@ -84,8 +86,8 @@ class GiftBalanceGemsFragment : BaseFragment<FragmentGiftGemBalanceBinding>() {
                         getString(
                             R.string.gift_confirmation_text_gems_new,
                             giftedMember?.username,
-                            amount.toString()
-                        )
+                            amount.toString(),
+                        ),
                     )
                     dialog?.addCloseButton { _, _ ->
                         activity?.finish()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GiftPurchaseGemsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GiftPurchaseGemsFragment.kt
index bf6f08cf5..9cf299e29 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GiftPurchaseGemsFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GiftPurchaseGemsFragment.kt
@@ -21,13 +21,15 @@ import javax.inject.Inject
 
 @AndroidEntryPoint
 class GiftPurchaseGemsFragment : BaseFragment<FragmentGiftGemPurchaseBinding>() {
-
     @Inject
     lateinit var socialRepository: SocialRepository
 
     override var binding: FragmentGiftGemPurchaseBinding? = null
 
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentGiftGemPurchaseBinding {
+    override fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+    ): FragmentGiftGemPurchaseBinding {
         return FragmentGiftGemPurchaseBinding.inflate(inflater, container, false)
     }
 
@@ -60,14 +62,18 @@ class GiftPurchaseGemsFragment : BaseFragment<FragmentGiftGemPurchaseBinding>()
         this.purchaseHandler = handler
     }
 
-    private fun updateButtonLabel(sku: ProductDetails, price: String) {
-        val matchingView: GemPurchaseOptionsView? = when (sku.productId) {
-            PurchaseTypes.Purchase4Gems -> binding?.gems4View
-            PurchaseTypes.Purchase21Gems -> binding?.gems21View
-            PurchaseTypes.Purchase42Gems -> binding?.gems42View
-            PurchaseTypes.Purchase84Gems -> binding?.gems84View
-            else -> return
-        }
+    private fun updateButtonLabel(
+        sku: ProductDetails,
+        price: String,
+    ) {
+        val matchingView: GemPurchaseOptionsView? =
+            when (sku.productId) {
+                PurchaseTypes.PURCHASE_4_GEMS -> binding?.gems4View
+                PurchaseTypes.PURCHASE_21_GEMS -> binding?.gems21View
+                PurchaseTypes.PURCHASE_42_GEMS -> binding?.gems42View
+                PurchaseTypes.PURCHASE_84_GEMS -> binding?.gems84View
+                else -> return
+            }
         if (matchingView != null) {
             matchingView.setPurchaseButtonText(price)
             matchingView.setOnPurchaseClickListener {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionBottomSheetFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionBottomSheetFragment.kt
index 6a9439c8a..452276286 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionBottomSheetFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionBottomSheetFragment.kt
@@ -34,7 +34,6 @@ import javax.inject.Inject
 
 @AndroidEntryPoint
 open class SubscriptionBottomSheetFragment : BottomSheetDialogFragment() {
-
     private var _binding: FragmentBottomsheetSubscriptionBinding? = null
     val binding get() = _binding!!
 
@@ -56,12 +55,19 @@ open class SubscriptionBottomSheetFragment : BottomSheetDialogFragment() {
     private var user: User? = null
     private var hasLoadedSubscriptionOptions: Boolean = false
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?,
+    ): View {
         _binding = FragmentBottomsheetSubscriptionBinding.inflate(layoutInflater)
         return binding.root
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
         super.onViewCreated(view, savedInstanceState)
 
         binding.subscriptionOptions.visibility = View.GONE
@@ -110,20 +116,28 @@ open class SubscriptionBottomSheetFragment : BottomSheetDialogFragment() {
             skus = subscriptions
             withContext(Dispatchers.Main) {
                 for (sku in subscriptions) {
-                    updateButtonLabel(sku, sku.subscriptionOfferDetails?.firstOrNull()?.pricingPhases?.pricingPhaseList?.firstOrNull()?.formattedPrice ?: "")
+                    updateButtonLabel(
+                        sku,
+                        sku.subscriptionOfferDetails?.firstOrNull()?.pricingPhases?.pricingPhaseList?.firstOrNull()?.formattedPrice
+                            ?: "",
+                    )
                 }
                 subscriptions
                     .filter { buttonForSku(it)?.isVisible == true }
                     .minByOrNull {
-                    it.subscriptionOfferDetails?.firstOrNull()?.pricingPhases?.pricingPhaseList?.firstOrNull()?.priceAmountMicros ?: 0
-                }?.let { selectSubscription(it) }
+                        it.subscriptionOfferDetails?.firstOrNull()?.pricingPhases?.pricingPhaseList?.firstOrNull()?.priceAmountMicros
+                            ?: 0
+                    }?.let { selectSubscription(it) }
                 hasLoadedSubscriptionOptions = true
                 updateSubscriptionInfo()
             }
         }
     }
 
-    private fun updateButtonLabel(sku: ProductDetails, price: String) {
+    private fun updateButtonLabel(
+        sku: ProductDetails,
+        price: String,
+    ) {
         val matchingView = buttonForSku(sku)
         if (matchingView != null) {
             matchingView.setPriceText(price)
@@ -151,9 +165,9 @@ open class SubscriptionBottomSheetFragment : BottomSheetDialogFragment() {
 
     private fun buttonForSku(sku: String?): SubscriptionOptionView? {
         return when (sku) {
-            PurchaseTypes.Subscription1Month -> binding.subscription1month
-            PurchaseTypes.Subscription3Month -> binding.subscription3month
-            PurchaseTypes.Subscription12Month -> binding.subscription12month
+            PurchaseTypes.SUBSCRIPTION_1_MONTH -> binding.subscription1month
+            PurchaseTypes.SUBSCRIPTION_3_MONTH -> binding.subscription3month
+            PurchaseTypes.SUBSCRIPTION_12_MONTH -> binding.subscription12month
             else -> null
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt
index 9fd625d9c..1fd302b6c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt
@@ -1,295 +1,321 @@
-package com.habitrpg.android.habitica.ui.fragments.purchases
-
-import android.content.Context
-import android.content.Intent
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.EditText
-import androidx.compose.foundation.layout.padding
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.unit.dp
-import androidx.core.view.isVisible
-import androidx.fragment.app.Fragment
-import androidx.lifecycle.lifecycleScope
-import com.android.billingclient.api.ProductDetails
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.data.InventoryRepository
-import com.habitrpg.android.habitica.data.UserRepository
-import com.habitrpg.android.habitica.databinding.FragmentSubscriptionBinding
-import com.habitrpg.android.habitica.extensions.addCancelButton
-import com.habitrpg.android.habitica.helpers.Analytics
-import com.habitrpg.android.habitica.helpers.AppConfigManager
-import com.habitrpg.android.habitica.helpers.PurchaseHandler
-import com.habitrpg.android.habitica.helpers.PurchaseTypes
-import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.android.habitica.ui.activities.GiftSubscriptionActivity
-import com.habitrpg.android.habitica.ui.fragments.BaseFragment
-import com.habitrpg.android.habitica.ui.fragments.PromoInfoFragment
-import com.habitrpg.common.habitica.theme.HabiticaTheme
-import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import com.habitrpg.android.habitica.ui.views.promo.BirthdayBanner
-import com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView
-import com.habitrpg.common.habitica.extensions.isUsingNightModeResources
-import com.habitrpg.common.habitica.extensions.layoutInflater
-import com.habitrpg.common.habitica.helpers.ExceptionHandler
-import com.habitrpg.common.habitica.helpers.launchCatching
-import com.habitrpg.common.habitica.helpers.setMarkdown
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class SubscriptionFragment : BaseFragment<FragmentSubscriptionBinding>() {
-
-    override var binding: FragmentSubscriptionBinding? = null
-
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentSubscriptionBinding {
-        return FragmentSubscriptionBinding.inflate(inflater, container, false)
-    }
-
-    @Inject
-    lateinit var userRepository: UserRepository
-
-    @Inject
-    lateinit var appConfigManager: AppConfigManager
-
-    @Inject
-    lateinit var inventoryRepository: InventoryRepository
-
-    @Inject
-    lateinit var purchaseHandler: PurchaseHandler
-
-    private var selectedSubscriptionSku: ProductDetails? = null
-    private var skus: List<ProductDetails> = emptyList()
-
-    private var user: User? = null
-    private var hasLoadedSubscriptionOptions: Boolean = false
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding?.subscriptionOptions?.visibility = View.GONE
-        binding?.subscriptionDetails?.visibility = View.GONE
-        binding?.subscriptionDetails?.onShowSubscriptionOptions = { showSubscriptionOptions() }
-
-        binding?.giftSubscriptionButton?.setOnClickListener { context?.let { context -> showGiftSubscriptionDialog(context) } }
-
-        binding?.subscribeButton?.setOnClickListener { purchaseSubscription() }
-
-        lifecycleScope.launchCatching {
-            userRepository.getUser().collect { user ->
-                user?.let { setUser(it) }
-            }
-        }
-
-        val promo = appConfigManager.activePromo()
-        if (promo != null) {
-            binding?.let {
-                promo.configurePurchaseBanner(it)
-            }
-            binding?.promoBanner?.setOnClickListener {
-                val fragment = PromoInfoFragment()
-                parentFragmentManager
-                    .beginTransaction()
-                    .replace(R.id.fragment_container, fragment as Fragment)
-                    .commit()
-            }
-        } else {
-            binding?.promoBanner?.visibility = View.GONE
-        }
-
-        val birthdayEventEnd = appConfigManager.getBirthdayEvent()?.end
-        if (birthdayEventEnd != null) {
-            binding?.promoComposeView?.setContent {
-                HabiticaTheme {
-                    BirthdayBanner(
-                        endDate = birthdayEventEnd,
-                        Modifier.padding(horizontal = 20.dp).clip(HabiticaTheme.shapes.medium)
-                            .padding(bottom = 10.dp)
-                    )
-                }
-            }
-            binding?.promoComposeView?.isVisible = true
-        }
-
-        binding?.refreshLayout?.setOnRefreshListener { refresh() }
-
-        binding?.subscriptionDisclaimerView?.setMarkdown("Once we’ve confirmed your purchase, the payment will be charged to your Google Account.\n\nSubscriptions automatically renew unless auto-renewal is turned off at least 24-hours before the end of the current period. If you have an active subscription, your account will be charged for renewal within 24-hours prior to the end of your current subscription period and you will be charged the same price you initially paid.\n\nBy continuing you accept the [Terms of Use](https://habitica.com/static/terms) and [Privacy Policy](https://habitica.com/static/privacy).")
-
-        Analytics.sendNavigationEvent("subscription screen")
-    }
-
-    override fun onResume() {
-        super.onResume()
-        lifecycleScope.launchCatching {
-            purchaseHandler.queryPurchases()
-        }
-        refresh()
-        loadInventory()
-    }
-
-    private fun refresh() {
-        lifecycleScope.launch(ExceptionHandler.coroutine()) {
-            userRepository.retrieveUser(withTasks = false, forced = true)
-            binding?.refreshLayout?.isRefreshing = false
-        }
-    }
-
-    private fun loadInventory() {
-        CoroutineScope(Dispatchers.IO).launchCatching {
-            val subscriptions = purchaseHandler.getAllSubscriptionProducts()
-            skus = subscriptions
-            withContext(Dispatchers.Main) {
-                for (sku in subscriptions) {
-                    updateButtonLabel(sku, sku.subscriptionOfferDetails?.firstOrNull()?.pricingPhases?.pricingPhaseList?.firstOrNull()?.formattedPrice ?: "")
-                }
-                subscriptions.minByOrNull { it.subscriptionOfferDetails?.firstOrNull()?.pricingPhases?.pricingPhaseList?.firstOrNull()?.priceAmountMicros ?: 0 }?.let { selectSubscription(it) }
-                hasLoadedSubscriptionOptions = true
-                updateSubscriptionInfo()
-            }
-        }
-    }
-
-    private fun updateButtonLabel(sku: ProductDetails, price: String) {
-        val matchingView = buttonForSku(sku)
-        if (matchingView != null) {
-            matchingView.setPriceText(price)
-            matchingView.sku = sku.productId
-            matchingView.setOnPurchaseClickListener {
-                selectSubscription(sku)
-            }
-        }
-    }
-
-    private fun selectSubscription(sku: ProductDetails) {
-        if (this.selectedSubscriptionSku != null) {
-            val oldButton = buttonForSku(this.selectedSubscriptionSku)
-            oldButton?.setIsSelected(false)
-        }
-        this.selectedSubscriptionSku = sku
-        val subscriptionOptionButton = buttonForSku(this.selectedSubscriptionSku)
-        subscriptionOptionButton?.setIsSelected(true)
-        if (binding?.subscribeButton != null) {
-            binding?.subscribeButton?.isEnabled = true
-        }
-    }
-
-    private fun buttonForSku(sku: ProductDetails?): SubscriptionOptionView? {
-        return buttonForSku(sku?.productId)
-    }
-
-    private fun buttonForSku(sku: String?): SubscriptionOptionView? {
-        return when (sku) {
-            PurchaseTypes.Subscription1Month -> binding?.subscription1month
-            PurchaseTypes.Subscription3Month -> binding?.subscription3month
-            PurchaseTypes.Subscription6Month -> binding?.subscription6month
-            PurchaseTypes.Subscription12Month -> binding?.subscription12month
-            else -> null
-        }
-    }
-
-    private fun purchaseSubscription() {
-        selectedSubscriptionSku?.let { sku ->
-            activity?.let {
-                purchaseHandler.purchase(it, sku)
-            }
-        }
-    }
-
-    fun setUser(newUser: User) {
-        user = newUser
-        this.updateSubscriptionInfo()
-        checkIfNeedsCancellation()
-    }
-
-    private fun updateSubscriptionInfo() {
-        if (hasLoadedSubscriptionOptions) {
-            binding?.subscriptionOptions?.visibility = View.VISIBLE
-            binding?.loadingIndicator?.visibility = View.GONE
-        }
-        if (user != null) {
-            val isSubscribed = user?.isSubscribed ?: false
-
-            if (binding?.subscriptionDetails == null) {
-                return
-            }
-
-            if (isSubscribed) {
-                if (context?.isUsingNightModeResources() == true) {
-                    binding?.headerImageView?.setImageResource(R.drawable.subscriber_banner_dark)
-                } else {
-                    binding?.headerImageView?.setImageResource(R.drawable.subscriber_header)
-                }
-                binding?.subscriptionDetails?.visibility = View.VISIBLE
-                binding?.subscriptionDetails?.currentUserID = user?.id
-                user?.purchased?.plan?.let { binding?.subscriptionDetails?.setPlan(it) }
-                binding?.subscribeBenefitsTitle?.setText(R.string.subscribe_prompt_thanks)
-                binding?.subscriptionOptions?.visibility = View.GONE
-            } else {
-                if (context?.isUsingNightModeResources() == true) {
-                    binding?.headerImageView?.setImageResource(R.drawable.subscribe_header_dark)
-                } else {
-                    binding?.headerImageView?.setImageResource(R.drawable.subscribe_header)
-                }
-                if (!hasLoadedSubscriptionOptions) {
-                    return
-                }
-                binding?.subscriptionDetails?.visibility = View.GONE
-                binding?.subscribeBenefitsTitle?.setText(R.string.subscribe_prompt)
-            }
-            binding?.loadingIndicator?.visibility = View.GONE
-        }
-    }
-
-    private fun checkIfNeedsCancellation() {
-        CoroutineScope(Dispatchers.IO).launch(ExceptionHandler.coroutine()) {
-            val newestSubscription = purchaseHandler.checkForSubscription()
-            if (user?.purchased?.plan?.paymentMethod == "Google" &&
-                user?.purchased?.plan?.isActive == true &&
-                user?.purchased?.plan?.dateTerminated == null &&
-                (newestSubscription?.isAutoRenewing != true)
-            ) {
-                lifecycleScope.launch(ExceptionHandler.coroutine()) {
-                    purchaseHandler.cancelSubscription()
-                }
-            }
-        }
-    }
-
-    private fun showSubscriptionOptions() {
-        binding?.subscriptionOptions?.visibility = View.VISIBLE
-        binding?.subscriptionOptions?.postDelayed(
-            {
-                binding?.scrollView?.smoothScrollTo(0, binding?.subscriptionOptions?.top ?: 0)
-            },
-            500
-        )
-    }
-
-    companion object {
-        fun showGiftSubscriptionDialog(context: Context) {
-            val chooseRecipientDialogView = context.layoutInflater.inflate(R.layout.dialog_choose_message_recipient, null)
-
-            val alert = HabiticaAlertDialog(context)
-            alert.setTitle(context.getString(R.string.gift_title))
-            alert.addButton(context.getString(R.string.action_continue), true) { _, _ ->
-                val usernameEditText = chooseRecipientDialogView?.findViewById<View>(R.id.uuidEditText) as? EditText
-                val intent = Intent(context, GiftSubscriptionActivity::class.java).apply {
-                    putExtra("username", usernameEditText?.text.toString())
-                }
-                context.startActivity(intent)
-            }
-            alert.addCancelButton { _, _ ->
-                // context.dismissKeyboard()
-            }
-            alert.setAdditionalContentView(chooseRecipientDialogView)
-            alert.show()
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.purchases
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.EditText
+import androidx.compose.foundation.layout.padding
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.unit.dp
+import androidx.core.view.isVisible
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
+import com.android.billingclient.api.ProductDetails
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.data.InventoryRepository
+import com.habitrpg.android.habitica.data.UserRepository
+import com.habitrpg.android.habitica.databinding.FragmentSubscriptionBinding
+import com.habitrpg.android.habitica.extensions.addCancelButton
+import com.habitrpg.android.habitica.helpers.Analytics
+import com.habitrpg.android.habitica.helpers.AppConfigManager
+import com.habitrpg.android.habitica.helpers.PurchaseHandler
+import com.habitrpg.android.habitica.helpers.PurchaseTypes
+import com.habitrpg.android.habitica.models.user.User
+import com.habitrpg.android.habitica.ui.activities.GiftSubscriptionActivity
+import com.habitrpg.android.habitica.ui.fragments.BaseFragment
+import com.habitrpg.android.habitica.ui.fragments.PromoInfoFragment
+import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
+import com.habitrpg.android.habitica.ui.views.promo.BirthdayBanner
+import com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView
+import com.habitrpg.common.habitica.extensions.isUsingNightModeResources
+import com.habitrpg.common.habitica.extensions.layoutInflater
+import com.habitrpg.common.habitica.helpers.ExceptionHandler
+import com.habitrpg.common.habitica.helpers.launchCatching
+import com.habitrpg.common.habitica.helpers.setMarkdown
+import com.habitrpg.common.habitica.theme.HabiticaTheme
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class SubscriptionFragment : BaseFragment<FragmentSubscriptionBinding>() {
+    override var binding: FragmentSubscriptionBinding? = null
+
+    override fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+    ): FragmentSubscriptionBinding {
+        return FragmentSubscriptionBinding.inflate(inflater, container, false)
+    }
+
+    @Inject
+    lateinit var userRepository: UserRepository
+
+    @Inject
+    lateinit var appConfigManager: AppConfigManager
+
+    @Inject
+    lateinit var inventoryRepository: InventoryRepository
+
+    @Inject
+    lateinit var purchaseHandler: PurchaseHandler
+
+    private var selectedSubscriptionSku: ProductDetails? = null
+    private var skus: List<ProductDetails> = emptyList()
+
+    private var user: User? = null
+    private var hasLoadedSubscriptionOptions: Boolean = false
+
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
+        super.onViewCreated(view, savedInstanceState)
+
+        binding?.subscriptionOptions?.visibility = View.GONE
+        binding?.subscriptionDetails?.visibility = View.GONE
+        binding?.subscriptionDetails?.onShowSubscriptionOptions = { showSubscriptionOptions() }
+
+        binding?.giftSubscriptionButton?.setOnClickListener {
+            context?.let { context ->
+                showGiftSubscriptionDialog(
+                    context,
+                )
+            }
+        }
+
+        binding?.subscribeButton?.setOnClickListener { purchaseSubscription() }
+
+        lifecycleScope.launchCatching {
+            userRepository.getUser().collect { user ->
+                user?.let { setUser(it) }
+            }
+        }
+
+        val promo = appConfigManager.activePromo()
+        if (promo != null) {
+            binding?.let {
+                promo.configurePurchaseBanner(it)
+            }
+            binding?.promoBanner?.setOnClickListener {
+                val fragment = PromoInfoFragment()
+                parentFragmentManager
+                    .beginTransaction()
+                    .replace(R.id.fragment_container, fragment as Fragment)
+                    .commit()
+            }
+        } else {
+            binding?.promoBanner?.visibility = View.GONE
+        }
+
+        val birthdayEventEnd = appConfigManager.getBirthdayEvent()?.end
+        if (birthdayEventEnd != null) {
+            binding?.promoComposeView?.setContent {
+                HabiticaTheme {
+                    BirthdayBanner(
+                        endDate = birthdayEventEnd,
+                        Modifier
+                            .padding(horizontal = 20.dp)
+                            .clip(HabiticaTheme.shapes.medium)
+                            .padding(bottom = 10.dp),
+                    )
+                }
+            }
+            binding?.promoComposeView?.isVisible = true
+        }
+
+        binding?.refreshLayout?.setOnRefreshListener { refresh() }
+
+        binding?.subscriptionDisclaimerView?.setMarkdown("Once we’ve confirmed your purchase, the payment will be charged to your Google Account.\n\nSubscriptions automatically renew unless auto-renewal is turned off at least 24-hours before the end of the current period. If you have an active subscription, your account will be charged for renewal within 24-hours prior to the end of your current subscription period and you will be charged the same price you initially paid.\n\nBy continuing you accept the [Terms of Use](https://habitica.com/static/terms) and [Privacy Policy](https://habitica.com/static/privacy).")
+
+        Analytics.sendNavigationEvent("subscription screen")
+    }
+
+    override fun onResume() {
+        super.onResume()
+        lifecycleScope.launchCatching {
+            purchaseHandler.queryPurchases()
+        }
+        refresh()
+        loadInventory()
+    }
+
+    private fun refresh() {
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.retrieveUser(withTasks = false, forced = true)
+            binding?.refreshLayout?.isRefreshing = false
+        }
+    }
+
+    private fun loadInventory() {
+        CoroutineScope(Dispatchers.IO).launchCatching {
+            val subscriptions = purchaseHandler.getAllSubscriptionProducts()
+            skus = subscriptions
+            withContext(Dispatchers.Main) {
+                for (sku in subscriptions) {
+                    updateButtonLabel(
+                        sku,
+                        sku.subscriptionOfferDetails?.firstOrNull()?.pricingPhases?.pricingPhaseList?.firstOrNull()?.formattedPrice
+                            ?: "",
+                    )
+                }
+                subscriptions.minByOrNull {
+                    it.subscriptionOfferDetails?.firstOrNull()?.pricingPhases?.pricingPhaseList?.firstOrNull()?.priceAmountMicros
+                        ?: 0
+                }?.let { selectSubscription(it) }
+                hasLoadedSubscriptionOptions = true
+                updateSubscriptionInfo()
+            }
+        }
+    }
+
+    private fun updateButtonLabel(
+        sku: ProductDetails,
+        price: String,
+    ) {
+        val matchingView = buttonForSku(sku)
+        if (matchingView != null) {
+            matchingView.setPriceText(price)
+            matchingView.sku = sku.productId
+            matchingView.setOnPurchaseClickListener {
+                selectSubscription(sku)
+            }
+        }
+    }
+
+    private fun selectSubscription(sku: ProductDetails) {
+        if (this.selectedSubscriptionSku != null) {
+            val oldButton = buttonForSku(this.selectedSubscriptionSku)
+            oldButton?.setIsSelected(false)
+        }
+        this.selectedSubscriptionSku = sku
+        val subscriptionOptionButton = buttonForSku(this.selectedSubscriptionSku)
+        subscriptionOptionButton?.setIsSelected(true)
+        if (binding?.subscribeButton != null) {
+            binding?.subscribeButton?.isEnabled = true
+        }
+    }
+
+    private fun buttonForSku(sku: ProductDetails?): SubscriptionOptionView? {
+        return buttonForSku(sku?.productId)
+    }
+
+    private fun buttonForSku(sku: String?): SubscriptionOptionView? {
+        return when (sku) {
+            PurchaseTypes.SUBSCRIPTION_1_MONTH -> binding?.subscription1month
+            PurchaseTypes.SUBSCRIPTION_3_MONTH -> binding?.subscription3month
+            PurchaseTypes.SUBSCRIPTION_6_MONTH -> binding?.subscription6month
+            PurchaseTypes.SUBSCRIPTION_12_MONTH -> binding?.subscription12month
+            else -> null
+        }
+    }
+
+    private fun purchaseSubscription() {
+        selectedSubscriptionSku?.let { sku ->
+            activity?.let {
+                purchaseHandler.purchase(it, sku)
+            }
+        }
+    }
+
+    fun setUser(newUser: User) {
+        user = newUser
+        this.updateSubscriptionInfo()
+        checkIfNeedsCancellation()
+    }
+
+    private fun updateSubscriptionInfo() {
+        if (hasLoadedSubscriptionOptions) {
+            binding?.subscriptionOptions?.visibility = View.VISIBLE
+            binding?.loadingIndicator?.visibility = View.GONE
+        }
+        if (user != null) {
+            val isSubscribed = user?.isSubscribed ?: false
+
+            if (binding?.subscriptionDetails == null) {
+                return
+            }
+
+            if (isSubscribed) {
+                if (context?.isUsingNightModeResources() == true) {
+                    binding?.headerImageView?.setImageResource(R.drawable.subscriber_banner_dark)
+                } else {
+                    binding?.headerImageView?.setImageResource(R.drawable.subscriber_header)
+                }
+                binding?.subscriptionDetails?.visibility = View.VISIBLE
+                binding?.subscriptionDetails?.currentUserID = user?.id
+                user?.purchased?.plan?.let { binding?.subscriptionDetails?.setPlan(it) }
+                binding?.subscribeBenefitsTitle?.setText(R.string.subscribe_prompt_thanks)
+                binding?.subscriptionOptions?.visibility = View.GONE
+            } else {
+                if (context?.isUsingNightModeResources() == true) {
+                    binding?.headerImageView?.setImageResource(R.drawable.subscribe_header_dark)
+                } else {
+                    binding?.headerImageView?.setImageResource(R.drawable.subscribe_header)
+                }
+                if (!hasLoadedSubscriptionOptions) {
+                    return
+                }
+                binding?.subscriptionDetails?.visibility = View.GONE
+                binding?.subscribeBenefitsTitle?.setText(R.string.subscribe_prompt)
+            }
+            binding?.loadingIndicator?.visibility = View.GONE
+        }
+    }
+
+    private fun checkIfNeedsCancellation() {
+        CoroutineScope(Dispatchers.IO).launch(ExceptionHandler.coroutine()) {
+            val newestSubscription = purchaseHandler.checkForSubscription()
+            if (user?.purchased?.plan?.paymentMethod == "Google" &&
+                user?.purchased?.plan?.isActive == true &&
+                user?.purchased?.plan?.dateTerminated == null &&
+                (newestSubscription?.isAutoRenewing != true)
+            ) {
+                lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                    purchaseHandler.cancelSubscription()
+                }
+            }
+        }
+    }
+
+    private fun showSubscriptionOptions() {
+        binding?.subscriptionOptions?.visibility = View.VISIBLE
+        binding?.subscriptionOptions?.postDelayed(
+            {
+                binding?.scrollView?.smoothScrollTo(0, binding?.subscriptionOptions?.top ?: 0)
+            },
+            500,
+        )
+    }
+
+    companion object {
+        fun showGiftSubscriptionDialog(context: Context) {
+            val chooseRecipientDialogView =
+                context.layoutInflater.inflate(R.layout.dialog_choose_message_recipient, null)
+
+            val alert = HabiticaAlertDialog(context)
+            alert.setTitle(context.getString(R.string.gift_title))
+            alert.addButton(context.getString(R.string.action_continue), true) { _, _ ->
+                val usernameEditText =
+                    chooseRecipientDialogView?.findViewById<View>(R.id.uuidEditText) as? EditText
+                val intent =
+                    Intent(context, GiftSubscriptionActivity::class.java).apply {
+                        putExtra("username", usernameEditText?.text.toString())
+                    }
+                context.startActivity(intent)
+            }
+            alert.addCancelButton { _, _ ->
+                // context.dismissKeyboard()
+            }
+            alert.setAdditionalContentView(chooseRecipientDialogView)
+            alert.show()
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.kt
index 671fc7deb..765e710de 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.kt
@@ -1,228 +1,347 @@
-package com.habitrpg.android.habitica.ui.fragments.setup
-
-import android.os.Bundle
-import android.util.TypedValue
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.RelativeLayout
-import androidx.lifecycle.lifecycleScope
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.google.android.material.tabs.TabLayout
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.data.InventoryRepository
-import com.habitrpg.android.habitica.data.SetupCustomizationRepository
-import com.habitrpg.android.habitica.data.UserRepository
-import com.habitrpg.android.habitica.databinding.FragmentSetupAvatarBinding
-import com.habitrpg.android.habitica.models.SetupCustomization
-import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.android.habitica.ui.activities.SetupActivity
-import com.habitrpg.android.habitica.ui.adapter.setup.CustomizationSetupAdapter
-import com.habitrpg.android.habitica.ui.fragments.BaseFragment
-import com.habitrpg.android.habitica.ui.views.setup.AvatarCategoryView
-import com.habitrpg.common.habitica.helpers.launchCatching
-import dagger.hilt.android.AndroidEntryPoint
-import java.util.Random
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class AvatarSetupFragment : BaseFragment<FragmentSetupAvatarBinding>() {
-
-    @Inject
-    lateinit var customizationRepository: SetupCustomizationRepository
-
-    @Inject
-    lateinit var userRepository: UserRepository
-
-    @Inject
-    lateinit var inventoryRepository: InventoryRepository
-
-    override var binding: FragmentSetupAvatarBinding? = null
-
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentSetupAvatarBinding {
-        return FragmentSetupAvatarBinding.inflate(inflater, container, false)
-    }
-
-    var activity: SetupActivity? = null
-    var width: Int = 0
-
-    internal var adapter: CustomizationSetupAdapter? = null
-
-    private var user: User? = null
-    private var subcategories: List<String> = emptyList()
-    private var activeButton: AvatarCategoryView? = null
-    private var activeCategory: String? = null
-    private var activeSubCategory: String? = null
-    private var random = Random()
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        this.adapter = CustomizationSetupAdapter()
-        this.adapter?.userSize = this.user?.preferences?.size ?: "slim"
-        adapter?.onUpdateUser = {
-            lifecycleScope.launchCatching {
-                userRepository.updateUser(it)
-            }
-        }
-        adapter?.onEquipGear = {
-            lifecycleScope.launchCatching {
-                inventoryRepository.equip("equipped", it)
-            }
-        }
-
-        this.adapter?.user = this.user
-        val layoutManager = LinearLayoutManager(activity)
-        layoutManager.orientation = LinearLayoutManager.HORIZONTAL
-        binding?.customizationDrawer?.binding?.customizationList?.layoutManager = layoutManager
-
-        binding?.customizationDrawer?.binding?.customizationList?.adapter = this.adapter
-
-        binding?.customizationDrawer?.binding?.subcategoryTabs?.addOnTabSelectedListener(object : TabLayout.OnTabSelectedListener {
-            override fun onTabSelected(tab: TabLayout.Tab) {
-                val position = tab.position
-                if (position < subcategories.size) {
-                    activeSubCategory = subcategories[position]
-                }
-                loadCustomizations()
-            }
-
-            override fun onTabUnselected(tab: TabLayout.Tab) { /* no-on */ }
-
-            override fun onTabReselected(tab: TabLayout.Tab) { /* no-on */ }
-        })
-
-        binding?.customizationDrawer?.binding?.bodyButton?.setOnClickListener { selectedBodyCategory() }
-        binding?.customizationDrawer?.binding?.skinButton?.setOnClickListener { selectedSkinCategory() }
-        binding?.customizationDrawer?.binding?.hairButton?.setOnClickListener { selectedHairCategory() }
-        binding?.customizationDrawer?.binding?.extrasButton?.setOnClickListener { selectedExtrasCategory() }
-        binding?.randomizeButton?.setOnClickListener { randomizeCharacter() }
-
-        this.selectedBodyCategory()
-
-        if (this.user != null) {
-            this.updateAvatar()
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-        if (this.user != null) {
-            this.updateAvatar()
-        }
-        this.selectedBodyCategory()
-        if (context != null) {
-            binding?.speechBubble?.animateText(context?.getString(R.string.avatar_setup_description) ?: "")
-        }
-    }
-
-    private fun loadCustomizations() {
-        val user = this.user ?: return
-        val activeCategory = this.activeCategory ?: return
-
-        this.adapter?.setCustomizationList(customizationRepository.getCustomizations(activeCategory, activeSubCategory, user))
-    }
-
-    fun setUser(user: User?) {
-        this.user = user
-        if (binding?.avatarView != null) {
-            updateAvatar()
-        }
-        if (this.adapter != null) {
-            this.adapter?.user = user
-            this.adapter?.notifyDataSetChanged()
-            loadCustomizations()
-        }
-    }
-
-    private fun updateAvatar() {
-        user?.let {
-            binding?.avatarView?.setAvatar(it)
-        }
-    }
-
-    private fun selectedBodyCategory() {
-        activateButton(binding?.customizationDrawer?.binding?.bodyButton)
-        this.activeCategory = SetupCustomizationRepository.CATEGORY_BODY
-        binding?.customizationDrawer?.binding?.subcategoryTabs?.removeAllTabs()
-        this.subcategories = listOf(SetupCustomizationRepository.SUBCATEGORY_SIZE, SetupCustomizationRepository.SUBCATEGORY_SHIRT)
-        binding?.customizationDrawer?.binding?.subcategoryTabs?.newTab()?.setText(R.string.avatar_size)?.let { binding?.customizationDrawer?.binding?.subcategoryTabs?.addTab(it) }
-        binding?.customizationDrawer?.binding?.subcategoryTabs?.newTab()?.setText(R.string.avatar_shirt)?.let { binding?.customizationDrawer?.binding?.subcategoryTabs?.addTab(it) }
-        loadCustomizations()
-    }
-
-    private fun selectedSkinCategory() {
-        activateButton(binding?.customizationDrawer?.binding?.skinButton)
-        this.activeCategory = SetupCustomizationRepository.CATEGORY_SKIN
-        binding?.customizationDrawer?.binding?.subcategoryTabs?.removeAllTabs()
-        this.subcategories = listOf(SetupCustomizationRepository.SUBCATEGORY_COLOR)
-        binding?.customizationDrawer?.binding?.subcategoryTabs?.newTab()?.setText(R.string.avatar_skin_color)?.let { binding?.customizationDrawer?.binding?.subcategoryTabs?.addTab(it) }
-        loadCustomizations()
-    }
-
-    private fun selectedHairCategory() {
-        activateButton(binding?.customizationDrawer?.binding?.hairButton)
-        this.activeCategory = SetupCustomizationRepository.CATEGORY_HAIR
-        binding?.customizationDrawer?.binding?.subcategoryTabs?.removeAllTabs()
-        this.subcategories = listOf(SetupCustomizationRepository.SUBCATEGORY_BANGS, SetupCustomizationRepository.SUBCATEGORY_COLOR, SetupCustomizationRepository.SUBCATEGORY_PONYTAIL)
-        binding?.customizationDrawer?.binding?.subcategoryTabs?.newTab()?.setText(R.string.avatar_hair_bangs)?.let { binding?.customizationDrawer?.binding?.subcategoryTabs?.addTab(it) }
-        binding?.customizationDrawer?.binding?.subcategoryTabs?.newTab()?.setText(R.string.avatar_hair_color)?.let { binding?.customizationDrawer?.binding?.subcategoryTabs?.addTab(it) }
-        binding?.customizationDrawer?.binding?.subcategoryTabs?.newTab()?.setText(R.string.avatar_hair_ponytail)?.let { binding?.customizationDrawer?.binding?.subcategoryTabs?.addTab(it) }
-        loadCustomizations()
-    }
-
-    private fun selectedExtrasCategory() {
-        activateButton(binding?.customizationDrawer?.binding?.extrasButton)
-        this.activeCategory = SetupCustomizationRepository.CATEGORY_EXTRAS
-        binding?.customizationDrawer?.binding?.subcategoryTabs?.removeAllTabs()
-        this.subcategories = listOf(SetupCustomizationRepository.SUBCATEGORY_GLASSES, SetupCustomizationRepository.SUBCATEGORY_FLOWER, SetupCustomizationRepository.SUBCATEGORY_WHEELCHAIR)
-        binding?.customizationDrawer?.binding?.subcategoryTabs?.newTab()?.setText(R.string.avatar_glasses)?.let { binding?.customizationDrawer?.binding?.subcategoryTabs?.addTab(it) }
-        binding?.customizationDrawer?.binding?.subcategoryTabs?.newTab()?.setText(R.string.avatar_flower)?.let { binding?.customizationDrawer?.binding?.subcategoryTabs?.addTab(it) }
-        binding?.customizationDrawer?.binding?.subcategoryTabs?.newTab()?.setText(R.string.avatar_wheelchair)?.let { binding?.customizationDrawer?.binding?.subcategoryTabs?.addTab(it) }
-        loadCustomizations()
-    }
-
-    private fun randomizeCharacter() {
-        val user = this.user ?: return
-        val updateData = HashMap<String, Any>()
-        updateData["preferences.size"] = chooseRandomKey(customizationRepository.getCustomizations(SetupCustomizationRepository.CATEGORY_BODY, SetupCustomizationRepository.SUBCATEGORY_SIZE, user), false)
-        updateData["preferences.shirt"] = chooseRandomKey(customizationRepository.getCustomizations(SetupCustomizationRepository.CATEGORY_BODY, SetupCustomizationRepository.SUBCATEGORY_SHIRT, user), false)
-        updateData["preferences.skin"] = chooseRandomKey(customizationRepository.getCustomizations(SetupCustomizationRepository.CATEGORY_SKIN, SetupCustomizationRepository.SUBCATEGORY_COLOR, user), false)
-        updateData["preferences.hair.color"] = chooseRandomKey(customizationRepository.getCustomizations(SetupCustomizationRepository.CATEGORY_HAIR, SetupCustomizationRepository.SUBCATEGORY_COLOR, user), false)
-        updateData["preferences.hair.base"] = chooseRandomKey(customizationRepository.getCustomizations(SetupCustomizationRepository.CATEGORY_HAIR, SetupCustomizationRepository.SUBCATEGORY_PONYTAIL, user), false)
-        updateData["preferences.hair.bangs"] = chooseRandomKey(customizationRepository.getCustomizations(SetupCustomizationRepository.CATEGORY_HAIR, SetupCustomizationRepository.SUBCATEGORY_BANGS, user), false)
-        updateData["preferences.hair.flower"] = chooseRandomKey(customizationRepository.getCustomizations(SetupCustomizationRepository.CATEGORY_EXTRAS, SetupCustomizationRepository.SUBCATEGORY_FLOWER, user), true)
-        updateData["preferences.chair"] = chooseRandomKey(customizationRepository.getCustomizations(SetupCustomizationRepository.CATEGORY_EXTRAS, SetupCustomizationRepository.SUBCATEGORY_WHEELCHAIR, user), true)
-        lifecycleScope.launchCatching {
-            userRepository.updateUser(updateData)
-        }
-    }
-
-    @Suppress("ReturnCount")
-    private fun chooseRandomKey(customizations: List<SetupCustomization>, weighFirstOption: Boolean): String {
-        if (customizations.isEmpty()) {
-            return ""
-        }
-        if (weighFirstOption) {
-            if (random.nextInt(10) > 3) {
-                return customizations[0].key
-            }
-        }
-        return customizations[random.nextInt(customizations.size)].key
-    }
-
-    private fun activateButton(button: AvatarCategoryView?) {
-        if (this.activeButton != null) {
-            this.activeButton?.setActive(false)
-        }
-        this.activeButton = button
-        this.activeButton?.setActive(true)
-        val location = IntArray(2)
-        val params = binding?.customizationDrawer?.binding?.caretView?.layoutParams as? RelativeLayout.LayoutParams
-        this.activeButton?.getLocationOnScreen(location)
-        val r = resources
-        val px = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 40f, r.displayMetrics).toInt()
-        params?.marginStart = location[0] + px
-        binding?.customizationDrawer?.binding?.caretView?.layoutParams = params
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.setup
+
+import android.os.Bundle
+import android.util.TypedValue
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.RelativeLayout
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.google.android.material.tabs.TabLayout
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.data.InventoryRepository
+import com.habitrpg.android.habitica.data.SetupCustomizationRepository
+import com.habitrpg.android.habitica.data.UserRepository
+import com.habitrpg.android.habitica.databinding.FragmentSetupAvatarBinding
+import com.habitrpg.android.habitica.models.SetupCustomization
+import com.habitrpg.android.habitica.models.user.User
+import com.habitrpg.android.habitica.ui.activities.SetupActivity
+import com.habitrpg.android.habitica.ui.adapter.setup.CustomizationSetupAdapter
+import com.habitrpg.android.habitica.ui.fragments.BaseFragment
+import com.habitrpg.android.habitica.ui.views.setup.AvatarCategoryView
+import com.habitrpg.common.habitica.helpers.launchCatching
+import dagger.hilt.android.AndroidEntryPoint
+import java.util.Random
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class AvatarSetupFragment : BaseFragment<FragmentSetupAvatarBinding>() {
+    @Inject
+    lateinit var customizationRepository: SetupCustomizationRepository
+
+    @Inject
+    lateinit var userRepository: UserRepository
+
+    @Inject
+    lateinit var inventoryRepository: InventoryRepository
+
+    override var binding: FragmentSetupAvatarBinding? = null
+
+    override fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+    ): FragmentSetupAvatarBinding {
+        return FragmentSetupAvatarBinding.inflate(inflater, container, false)
+    }
+
+    var activity: SetupActivity? = null
+    var width: Int = 0
+
+    internal var adapter: CustomizationSetupAdapter? = null
+
+    private var user: User? = null
+    private var subcategories: List<String> = emptyList()
+    private var activeButton: AvatarCategoryView? = null
+    private var activeCategory: String? = null
+    private var activeSubCategory: String? = null
+    private var random = Random()
+
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
+        super.onViewCreated(view, savedInstanceState)
+
+        this.adapter = CustomizationSetupAdapter()
+        this.adapter?.userSize = this.user?.preferences?.size ?: "slim"
+        adapter?.onUpdateUser = {
+            lifecycleScope.launchCatching {
+                userRepository.updateUser(it)
+            }
+        }
+        adapter?.onEquipGear = {
+            lifecycleScope.launchCatching {
+                inventoryRepository.equip("equipped", it)
+            }
+        }
+
+        this.adapter?.user = this.user
+        val layoutManager = LinearLayoutManager(activity)
+        layoutManager.orientation = LinearLayoutManager.HORIZONTAL
+        binding?.customizationDrawer?.binding?.customizationList?.layoutManager = layoutManager
+
+        binding?.customizationDrawer?.binding?.customizationList?.adapter = this.adapter
+
+        binding?.customizationDrawer?.binding?.subcategoryTabs?.addOnTabSelectedListener(
+            object :
+                TabLayout.OnTabSelectedListener {
+                override fun onTabSelected(tab: TabLayout.Tab) {
+                    val position = tab.position
+                    if (position < subcategories.size) {
+                        activeSubCategory = subcategories[position]
+                    }
+                    loadCustomizations()
+                }
+
+                override fun onTabUnselected(tab: TabLayout.Tab) { // no-on
+                }
+
+                override fun onTabReselected(tab: TabLayout.Tab) { // no-on
+                }
+            },
+        )
+
+        binding?.customizationDrawer?.binding?.bodyButton?.setOnClickListener { selectedBodyCategory() }
+        binding?.customizationDrawer?.binding?.skinButton?.setOnClickListener { selectedSkinCategory() }
+        binding?.customizationDrawer?.binding?.hairButton?.setOnClickListener { selectedHairCategory() }
+        binding?.customizationDrawer?.binding?.extrasButton?.setOnClickListener { selectedExtrasCategory() }
+        binding?.randomizeButton?.setOnClickListener { randomizeCharacter() }
+
+        this.selectedBodyCategory()
+
+        if (this.user != null) {
+            this.updateAvatar()
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        if (this.user != null) {
+            this.updateAvatar()
+        }
+        this.selectedBodyCategory()
+        if (context != null) {
+            binding?.speechBubble?.animateText(
+                context?.getString(R.string.avatar_setup_description) ?: "",
+            )
+        }
+    }
+
+    private fun loadCustomizations() {
+        val user = this.user ?: return
+        val activeCategory = this.activeCategory ?: return
+
+        this.adapter?.setCustomizationList(
+            customizationRepository.getCustomizations(
+                activeCategory,
+                activeSubCategory,
+                user,
+            ),
+        )
+    }
+
+    fun setUser(user: User?) {
+        this.user = user
+        if (binding?.avatarView != null) {
+            updateAvatar()
+        }
+        if (this.adapter != null) {
+            this.adapter?.user = user
+            this.adapter?.notifyDataSetChanged()
+            loadCustomizations()
+        }
+    }
+
+    private fun updateAvatar() {
+        user?.let {
+            binding?.avatarView?.setAvatar(it)
+        }
+    }
+
+    private fun selectedBodyCategory() {
+        activateButton(binding?.customizationDrawer?.binding?.bodyButton)
+        this.activeCategory = SetupCustomizationRepository.CATEGORY_BODY
+        binding?.customizationDrawer?.binding?.subcategoryTabs?.removeAllTabs()
+        this.subcategories =
+            listOf(
+                SetupCustomizationRepository.SUBCATEGORY_SIZE,
+                SetupCustomizationRepository.SUBCATEGORY_SHIRT,
+            )
+        binding?.customizationDrawer?.binding?.subcategoryTabs?.newTab()
+            ?.setText(R.string.avatar_size)
+            ?.let { binding?.customizationDrawer?.binding?.subcategoryTabs?.addTab(it) }
+        binding?.customizationDrawer?.binding?.subcategoryTabs?.newTab()
+            ?.setText(R.string.avatar_shirt)
+            ?.let { binding?.customizationDrawer?.binding?.subcategoryTabs?.addTab(it) }
+        loadCustomizations()
+    }
+
+    private fun selectedSkinCategory() {
+        activateButton(binding?.customizationDrawer?.binding?.skinButton)
+        this.activeCategory = SetupCustomizationRepository.CATEGORY_SKIN
+        binding?.customizationDrawer?.binding?.subcategoryTabs?.removeAllTabs()
+        this.subcategories = listOf(SetupCustomizationRepository.SUBCATEGORY_COLOR)
+        binding?.customizationDrawer?.binding?.subcategoryTabs?.newTab()
+            ?.setText(R.string.avatar_skin_color)
+            ?.let { binding?.customizationDrawer?.binding?.subcategoryTabs?.addTab(it) }
+        loadCustomizations()
+    }
+
+    private fun selectedHairCategory() {
+        activateButton(binding?.customizationDrawer?.binding?.hairButton)
+        this.activeCategory = SetupCustomizationRepository.CATEGORY_HAIR
+        binding?.customizationDrawer?.binding?.subcategoryTabs?.removeAllTabs()
+        this.subcategories =
+            listOf(
+                SetupCustomizationRepository.SUBCATEGORY_BANGS,
+                SetupCustomizationRepository.SUBCATEGORY_COLOR,
+                SetupCustomizationRepository.SUBCATEGORY_PONYTAIL,
+            )
+        binding?.customizationDrawer?.binding?.subcategoryTabs?.newTab()
+            ?.setText(R.string.avatar_hair_bangs)
+            ?.let { binding?.customizationDrawer?.binding?.subcategoryTabs?.addTab(it) }
+        binding?.customizationDrawer?.binding?.subcategoryTabs?.newTab()
+            ?.setText(R.string.avatar_hair_color)
+            ?.let { binding?.customizationDrawer?.binding?.subcategoryTabs?.addTab(it) }
+        binding?.customizationDrawer?.binding?.subcategoryTabs?.newTab()
+            ?.setText(R.string.avatar_hair_ponytail)
+            ?.let { binding?.customizationDrawer?.binding?.subcategoryTabs?.addTab(it) }
+        loadCustomizations()
+    }
+
+    private fun selectedExtrasCategory() {
+        activateButton(binding?.customizationDrawer?.binding?.extrasButton)
+        this.activeCategory = SetupCustomizationRepository.CATEGORY_EXTRAS
+        binding?.customizationDrawer?.binding?.subcategoryTabs?.removeAllTabs()
+        this.subcategories =
+            listOf(
+                SetupCustomizationRepository.SUBCATEGORY_GLASSES,
+                SetupCustomizationRepository.SUBCATEGORY_FLOWER,
+                SetupCustomizationRepository.SUBCATEGORY_WHEELCHAIR,
+            )
+        binding?.customizationDrawer?.binding?.subcategoryTabs?.newTab()
+            ?.setText(R.string.avatar_glasses)
+            ?.let { binding?.customizationDrawer?.binding?.subcategoryTabs?.addTab(it) }
+        binding?.customizationDrawer?.binding?.subcategoryTabs?.newTab()
+            ?.setText(R.string.avatar_flower)
+            ?.let { binding?.customizationDrawer?.binding?.subcategoryTabs?.addTab(it) }
+        binding?.customizationDrawer?.binding?.subcategoryTabs?.newTab()
+            ?.setText(R.string.avatar_wheelchair)
+            ?.let { binding?.customizationDrawer?.binding?.subcategoryTabs?.addTab(it) }
+        loadCustomizations()
+    }
+
+    private fun randomizeCharacter() {
+        val user = this.user ?: return
+        val updateData = HashMap<String, Any>()
+        updateData["preferences.size"] =
+            chooseRandomKey(
+                customizationRepository.getCustomizations(
+                    SetupCustomizationRepository.CATEGORY_BODY,
+                    SetupCustomizationRepository.SUBCATEGORY_SIZE,
+                    user,
+                ),
+                false,
+            )
+        updateData["preferences.shirt"] =
+            chooseRandomKey(
+                customizationRepository.getCustomizations(
+                    SetupCustomizationRepository.CATEGORY_BODY,
+                    SetupCustomizationRepository.SUBCATEGORY_SHIRT,
+                    user,
+                ),
+                false,
+            )
+        updateData["preferences.skin"] =
+            chooseRandomKey(
+                customizationRepository.getCustomizations(
+                    SetupCustomizationRepository.CATEGORY_SKIN,
+                    SetupCustomizationRepository.SUBCATEGORY_COLOR,
+                    user,
+                ),
+                false,
+            )
+        updateData["preferences.hair.color"] =
+            chooseRandomKey(
+                customizationRepository.getCustomizations(
+                    SetupCustomizationRepository.CATEGORY_HAIR,
+                    SetupCustomizationRepository.SUBCATEGORY_COLOR,
+                    user,
+                ),
+                false,
+            )
+        updateData["preferences.hair.base"] =
+            chooseRandomKey(
+                customizationRepository.getCustomizations(
+                    SetupCustomizationRepository.CATEGORY_HAIR,
+                    SetupCustomizationRepository.SUBCATEGORY_PONYTAIL,
+                    user,
+                ),
+                false,
+            )
+        updateData["preferences.hair.bangs"] =
+            chooseRandomKey(
+                customizationRepository.getCustomizations(
+                    SetupCustomizationRepository.CATEGORY_HAIR,
+                    SetupCustomizationRepository.SUBCATEGORY_BANGS,
+                    user,
+                ),
+                false,
+            )
+        updateData["preferences.hair.flower"] =
+            chooseRandomKey(
+                customizationRepository.getCustomizations(
+                    SetupCustomizationRepository.CATEGORY_EXTRAS,
+                    SetupCustomizationRepository.SUBCATEGORY_FLOWER,
+                    user,
+                ),
+                true,
+            )
+        updateData["preferences.chair"] =
+            chooseRandomKey(
+                customizationRepository.getCustomizations(
+                    SetupCustomizationRepository.CATEGORY_EXTRAS,
+                    SetupCustomizationRepository.SUBCATEGORY_WHEELCHAIR,
+                    user,
+                ),
+                true,
+            )
+        lifecycleScope.launchCatching {
+            userRepository.updateUser(updateData)
+        }
+    }
+
+    @Suppress("ReturnCount")
+    private fun chooseRandomKey(
+        customizations: List<SetupCustomization>,
+        weighFirstOption: Boolean,
+    ): String {
+        if (customizations.isEmpty()) {
+            return ""
+        }
+        if (weighFirstOption) {
+            if (random.nextInt(10) > 3) {
+                return customizations[0].key
+            }
+        }
+        return customizations[random.nextInt(customizations.size)].key
+    }
+
+    private fun activateButton(button: AvatarCategoryView?) {
+        if (this.activeButton != null) {
+            this.activeButton?.setActive(false)
+        }
+        this.activeButton = button
+        this.activeButton?.setActive(true)
+        val location = IntArray(2)
+        val params =
+            binding?.customizationDrawer?.binding?.caretView?.layoutParams as? RelativeLayout.LayoutParams
+        this.activeButton?.getLocationOnScreen(location)
+        val r = resources
+        val px =
+            TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 40f, r.displayMetrics).toInt()
+        params?.marginStart = location[0] + px
+        binding?.customizationDrawer?.binding?.caretView?.layoutParams = params
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/IntroFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/IntroFragment.kt
index 51706bb32..c114119e5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/IntroFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/IntroFragment.kt
@@ -11,10 +11,12 @@ import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
 class IntroFragment : BaseFragment<FragmentIntroBinding>() {
-
     override var binding: FragmentIntroBinding? = null
 
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentIntroBinding {
+    override fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+    ): FragmentIntroBinding {
         return FragmentIntroBinding.inflate(inflater, container, false)
     }
 
@@ -25,7 +27,10 @@ class IntroFragment : BaseFragment<FragmentIntroBinding>() {
     private var description: String? = null
     private var backgroundColor: Int? = null
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
         super.onViewCreated(view, savedInstanceState)
 
         if (this.image != null) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/TaskSetupFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/TaskSetupFragment.kt
index c496de322..9e145f9a7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/TaskSetupFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/TaskSetupFragment.kt
@@ -1,166 +1,271 @@
-package com.habitrpg.android.habitica.ui.fragments.setup
-
-import android.graphics.drawable.BitmapDrawable
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.recyclerview.widget.GridLayoutManager
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.databinding.FragmentSetupTasksBinding
-import com.habitrpg.android.habitica.models.tasks.Days
-import com.habitrpg.android.habitica.models.tasks.Task
-import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.android.habitica.ui.activities.SetupActivity
-import com.habitrpg.android.habitica.ui.adapter.setup.TaskSetupAdapter
-import com.habitrpg.android.habitica.ui.fragments.BaseFragment
-import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import com.habitrpg.shared.habitica.models.tasks.Frequency
-import com.habitrpg.shared.habitica.models.tasks.TaskType
-import dagger.hilt.android.AndroidEntryPoint
-import java.util.Date
-import java.util.UUID
-
-@AndroidEntryPoint
-class TaskSetupFragment : BaseFragment<FragmentSetupTasksBinding>() {
-
-    var activity: SetupActivity? = null
-    var width: Int = 0
-
-    override var binding: FragmentSetupTasksBinding? = null
-
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentSetupTasksBinding {
-        return FragmentSetupTasksBinding.inflate(inflater, container, false)
-    }
-
-    internal var adapter: TaskSetupAdapter = TaskSetupAdapter()
-    private var taskGroups: List<List<String>> = listOf()
-    private var tasks: List<List<Any>> = listOf()
-    private var user: User? = null
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        this.setTasks()
-
-        this.adapter = TaskSetupAdapter()
-        this.adapter.setTaskList(this.taskGroups)
-        binding?.recyclerView?.layoutManager = GridLayoutManager(activity, 2)
-        binding?.recyclerView?.adapter = this.adapter
-
-        if (this.user != null) {
-            this.updateAvatar()
-        }
-
-        binding?.heartIcon?.setImageDrawable(BitmapDrawable(resources, HabiticaIconsHelper.imageOfHeartLightBg()))
-    }
-
-    override fun onResume() {
-        super.onResume()
-        if (context != null) {
-            binding?.speechBubble?.animateText(context?.getString(R.string.task_setup_description) ?: "")
-        }
-    }
-
-    fun setUser(user: User?) {
-        this.user = user
-        if (binding?.avatarView != null) {
-            updateAvatar()
-        }
-    }
-
-    private fun updateAvatar() {
-        user?.let {
-            binding?.avatarView?.setAvatar(it)
-        }
-    }
-
-    private fun setTasks() {
-        this.taskGroups = listOf(listOf(getString(R.string.setup_group_work), TYPE_WORK), listOf(getString(R.string.setup_group_exercise), TYPE_EXERCISE), listOf(getString(R.string.setup_group_health), TYPE_HEALTH), listOf(getString(R.string.setup_group_school), TYPE_SCHOOL), listOf(getString(R.string.setup_group_teams), TYPE_TEAMS), listOf(getString(R.string.setup_group_chores), TYPE_CHORES), listOf(getString(R.string.setup_group_creativity), TYPE_CREATIVITY), listOf(getString(R.string.setuP_group_other), TYPE_OTHER))
-
-        this.tasks = listOf(
-            listOf(TYPE_WORK, TaskType.HABIT, getString(R.string.setup_task_work_1), true, false), listOf(TYPE_WORK, TaskType.DAILY, getString(R.string.setup_task_work_2)), listOf(TYPE_WORK, TaskType.TODO, getString(R.string.setup_task_work_3)),
-            listOf(TYPE_EXERCISE, TaskType.HABIT, getString(R.string.setup_task_exercise_1), true, false), listOf(TYPE_EXERCISE, TaskType.DAILY, getString(R.string.setup_task_exercise_2)), listOf(TYPE_EXERCISE, TaskType.TODO, getString(R.string.setup_task_exercise_3)),
-            listOf(TYPE_HEALTH, TaskType.HABIT, getString(R.string.setup_task_healthWellness_1), true, true), listOf(TYPE_HEALTH, TaskType.DAILY, getString(R.string.setup_task_healthWellness_2)), listOf(TYPE_HEALTH, TaskType.TODO, getString(R.string.setup_task_healthWellness_3)),
-            listOf(TYPE_SCHOOL, TaskType.HABIT, getString(R.string.setup_task_school_1), true, true), listOf(TYPE_SCHOOL, TaskType.DAILY, getString(R.string.setup_task_school_2)), listOf(TYPE_SCHOOL, TaskType.TODO, getString(R.string.setup_task_school_3)),
-            listOf(TYPE_TEAMS, TaskType.HABIT, getString(R.string.setup_task_teams_1), true, false), listOf(TYPE_TEAMS, TaskType.DAILY, getString(R.string.setup_task_teams_2)), listOf(TYPE_TEAMS, TaskType.TODO, getString(R.string.setup_task_teams_3)),
-            listOf(TYPE_CHORES, TaskType.HABIT, getString(R.string.setup_task_chores_1), true, false), listOf(TYPE_CHORES, TaskType.DAILY, getString(R.string.setup_task_chores_2)), listOf(TYPE_CHORES, TaskType.TODO, getString(R.string.setup_task_chores_3)),
-            listOf(TYPE_CREATIVITY, TaskType.HABIT, getString(R.string.setup_task_creativity_1), true, false), listOf(TYPE_CREATIVITY, TaskType.DAILY, getString(R.string.setup_task_creativity_2)), listOf(TYPE_CREATIVITY, TaskType.TODO, getString(R.string.setup_task_creativity_3))
-        )
-    }
-
-    fun createSampleTasks(): List<Task> {
-        val groups = ArrayList<String>()
-        for ((i, checked) in this.adapter.checkedList.withIndex()) {
-            if (checked) {
-                groups.add(this.taskGroups[i][1])
-            }
-        }
-        val tasks = ArrayList<Task>()
-        for (task in this.tasks) {
-            val taskGroup = task[0] as? String
-            if (groups.contains(taskGroup)) {
-                val taskObject: Task = if (task.size == 5) {
-                    this.makeTaskObject(task[1] as? TaskType, task[2] as? String, task[3] as? Boolean, task[4] as? Boolean)
-                } else {
-                    this.makeTaskObject(task[1] as? TaskType, task[2] as? String, null, null)
-                }
-                tasks.add(taskObject)
-            }
-        }
-        tasks.add(makeTaskObject(TaskType.HABIT, getString(R.string.setup_task_habit_1), true, false, getString(R.string.setup_task_habit_1_notes)))
-        tasks.add(makeTaskObject(TaskType.HABIT, getString(R.string.setup_task_habit_2), false, true, getString(R.string.setup_task_habit_2_notes)))
-        tasks.add(makeTaskObject(TaskType.REWARD, getString(R.string.setup_task_reward), null, null, getString(R.string.setup_task_reward_notes)))
-        tasks.add(makeTaskObject(TaskType.TODO, getString(R.string.setup_task_join_habitica), null, null, getString(R.string.setup_task_join_habitica_notes)))
-        return tasks
-    }
-
-    private fun makeTaskObject(
-        type: TaskType?,
-        text: String?,
-        up: Boolean?,
-        down: Boolean?,
-        notes: String? = null
-    ): Task {
-        val task = Task()
-        task.id = UUID.randomUUID().toString()
-        task.text = text ?: ""
-        task.notes = notes
-        task.priority = 1.0f
-        task.type = type ?: TaskType.HABIT
-        task.frequency = Frequency.DAILY
-
-        if (type == TaskType.HABIT) {
-            task.up = up
-            task.down = down
-        }
-
-        if (type == TaskType.DAILY) {
-            task.frequency = Frequency.WEEKLY
-            task.startDate = Date()
-            task.everyX = 1
-            val days = Days()
-            days.m = true
-            days.t = true
-            days.w = true
-            days.th = true
-            days.f = true
-            days.s = true
-            days.su = true
-            task.repeat = days
-        }
-
-        return task
-    }
-
-    companion object {
-        const val TYPE_EXERCISE = "exercise"
-        const val TYPE_HEALTH = "healthWellness"
-        const val TYPE_WORK = "work"
-        const val TYPE_SCHOOL = "school"
-        const val TYPE_TEAMS = "teams"
-        const val TYPE_CHORES = "chores"
-        const val TYPE_CREATIVITY = "creativity"
-        const val TYPE_OTHER = "other"
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.setup
+
+import android.graphics.drawable.BitmapDrawable
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.GridLayoutManager
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.FragmentSetupTasksBinding
+import com.habitrpg.android.habitica.models.tasks.Days
+import com.habitrpg.android.habitica.models.tasks.Task
+import com.habitrpg.android.habitica.models.user.User
+import com.habitrpg.android.habitica.ui.activities.SetupActivity
+import com.habitrpg.android.habitica.ui.adapter.setup.TaskSetupAdapter
+import com.habitrpg.android.habitica.ui.fragments.BaseFragment
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
+import com.habitrpg.shared.habitica.models.tasks.Frequency
+import com.habitrpg.shared.habitica.models.tasks.TaskType
+import dagger.hilt.android.AndroidEntryPoint
+import java.util.Date
+import java.util.UUID
+
+@AndroidEntryPoint
+class TaskSetupFragment : BaseFragment<FragmentSetupTasksBinding>() {
+    var activity: SetupActivity? = null
+    var width: Int = 0
+
+    override var binding: FragmentSetupTasksBinding? = null
+
+    override fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+    ): FragmentSetupTasksBinding {
+        return FragmentSetupTasksBinding.inflate(inflater, container, false)
+    }
+
+    internal var adapter: TaskSetupAdapter = TaskSetupAdapter()
+    private var taskGroups: List<List<String>> = listOf()
+    private var tasks: List<List<Any>> = listOf()
+    private var user: User? = null
+
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
+        super.onViewCreated(view, savedInstanceState)
+
+        this.setTasks()
+
+        this.adapter = TaskSetupAdapter()
+        this.adapter.setTaskList(this.taskGroups)
+        binding?.recyclerView?.layoutManager = GridLayoutManager(activity, 2)
+        binding?.recyclerView?.adapter = this.adapter
+
+        if (this.user != null) {
+            this.updateAvatar()
+        }
+
+        binding?.heartIcon?.setImageDrawable(
+            BitmapDrawable(
+                resources,
+                HabiticaIconsHelper.imageOfHeartLightBg(),
+            ),
+        )
+    }
+
+    override fun onResume() {
+        super.onResume()
+        if (context != null) {
+            binding?.speechBubble?.animateText(
+                context?.getString(R.string.task_setup_description) ?: "",
+            )
+        }
+    }
+
+    fun setUser(user: User?) {
+        this.user = user
+        if (binding?.avatarView != null) {
+            updateAvatar()
+        }
+    }
+
+    private fun updateAvatar() {
+        user?.let {
+            binding?.avatarView?.setAvatar(it)
+        }
+    }
+
+    private fun setTasks() {
+        this.taskGroups =
+            listOf(
+                listOf(getString(R.string.setup_group_work), TYPE_WORK),
+                listOf(getString(R.string.setup_group_exercise), TYPE_EXERCISE),
+                listOf(getString(R.string.setup_group_health), TYPE_HEALTH),
+                listOf(getString(R.string.setup_group_school), TYPE_SCHOOL),
+                listOf(getString(R.string.setup_group_teams), TYPE_TEAMS),
+                listOf(getString(R.string.setup_group_chores), TYPE_CHORES),
+                listOf(getString(R.string.setup_group_creativity), TYPE_CREATIVITY),
+                listOf(getString(R.string.setuP_group_other), TYPE_OTHER),
+            )
+
+        this.tasks =
+            listOf(
+                listOf(TYPE_WORK, TaskType.HABIT, getString(R.string.setup_task_work_1), true, false),
+                listOf(TYPE_WORK, TaskType.DAILY, getString(R.string.setup_task_work_2)),
+                listOf(TYPE_WORK, TaskType.TODO, getString(R.string.setup_task_work_3)),
+                listOf(
+                    TYPE_EXERCISE,
+                    TaskType.HABIT,
+                    getString(R.string.setup_task_exercise_1),
+                    true,
+                    false,
+                ),
+                listOf(TYPE_EXERCISE, TaskType.DAILY, getString(R.string.setup_task_exercise_2)),
+                listOf(TYPE_EXERCISE, TaskType.TODO, getString(R.string.setup_task_exercise_3)),
+                listOf(
+                    TYPE_HEALTH,
+                    TaskType.HABIT,
+                    getString(R.string.setup_task_healthWellness_1),
+                    true,
+                    true,
+                ),
+                listOf(TYPE_HEALTH, TaskType.DAILY, getString(R.string.setup_task_healthWellness_2)),
+                listOf(TYPE_HEALTH, TaskType.TODO, getString(R.string.setup_task_healthWellness_3)),
+                listOf(
+                    TYPE_SCHOOL,
+                    TaskType.HABIT,
+                    getString(R.string.setup_task_school_1),
+                    true,
+                    true,
+                ),
+                listOf(TYPE_SCHOOL, TaskType.DAILY, getString(R.string.setup_task_school_2)),
+                listOf(TYPE_SCHOOL, TaskType.TODO, getString(R.string.setup_task_school_3)),
+                listOf(TYPE_TEAMS, TaskType.HABIT, getString(R.string.setup_task_teams_1), true, false),
+                listOf(TYPE_TEAMS, TaskType.DAILY, getString(R.string.setup_task_teams_2)),
+                listOf(TYPE_TEAMS, TaskType.TODO, getString(R.string.setup_task_teams_3)),
+                listOf(
+                    TYPE_CHORES,
+                    TaskType.HABIT,
+                    getString(R.string.setup_task_chores_1),
+                    true,
+                    false,
+                ),
+                listOf(TYPE_CHORES, TaskType.DAILY, getString(R.string.setup_task_chores_2)),
+                listOf(TYPE_CHORES, TaskType.TODO, getString(R.string.setup_task_chores_3)),
+                listOf(
+                    TYPE_CREATIVITY,
+                    TaskType.HABIT,
+                    getString(R.string.setup_task_creativity_1),
+                    true,
+                    false,
+                ),
+                listOf(TYPE_CREATIVITY, TaskType.DAILY, getString(R.string.setup_task_creativity_2)),
+                listOf(TYPE_CREATIVITY, TaskType.TODO, getString(R.string.setup_task_creativity_3)),
+            )
+    }
+
+    fun createSampleTasks(): List<Task> {
+        val groups = ArrayList<String>()
+        for ((i, checked) in this.adapter.checkedList.withIndex()) {
+            if (checked) {
+                groups.add(this.taskGroups[i][1])
+            }
+        }
+        val tasks = ArrayList<Task>()
+        for (task in this.tasks) {
+            val taskGroup = task[0] as? String
+            if (groups.contains(taskGroup)) {
+                val taskObject: Task =
+                    if (task.size == 5) {
+                        this.makeTaskObject(
+                            task[1] as? TaskType,
+                            task[2] as? String,
+                            task[3] as? Boolean,
+                            task[4] as? Boolean,
+                        )
+                    } else {
+                        this.makeTaskObject(task[1] as? TaskType, task[2] as? String, null, null)
+                    }
+                tasks.add(taskObject)
+            }
+        }
+        tasks.add(
+            makeTaskObject(
+                TaskType.HABIT,
+                getString(R.string.setup_task_habit_1),
+                true,
+                false,
+                getString(R.string.setup_task_habit_1_notes),
+            ),
+        )
+        tasks.add(
+            makeTaskObject(
+                TaskType.HABIT,
+                getString(R.string.setup_task_habit_2),
+                false,
+                true,
+                getString(R.string.setup_task_habit_2_notes),
+            ),
+        )
+        tasks.add(
+            makeTaskObject(
+                TaskType.REWARD,
+                getString(R.string.setup_task_reward),
+                null,
+                null,
+                getString(R.string.setup_task_reward_notes),
+            ),
+        )
+        tasks.add(
+            makeTaskObject(
+                TaskType.TODO,
+                getString(R.string.setup_task_join_habitica),
+                null,
+                null,
+                getString(R.string.setup_task_join_habitica_notes),
+            ),
+        )
+        return tasks
+    }
+
+    private fun makeTaskObject(
+        type: TaskType?,
+        text: String?,
+        up: Boolean?,
+        down: Boolean?,
+        notes: String? = null,
+    ): Task {
+        val task = Task()
+        task.id = UUID.randomUUID().toString()
+        task.text = text ?: ""
+        task.notes = notes
+        task.priority = 1.0f
+        task.type = type ?: TaskType.HABIT
+        task.frequency = Frequency.DAILY
+
+        if (type == TaskType.HABIT) {
+            task.up = up
+            task.down = down
+        }
+
+        if (type == TaskType.DAILY) {
+            task.frequency = Frequency.WEEKLY
+            task.startDate = Date()
+            task.everyX = 1
+            val days = Days()
+            days.m = true
+            days.t = true
+            days.w = true
+            days.th = true
+            days.f = true
+            days.s = true
+            days.su = true
+            task.repeat = days
+        }
+
+        return task
+    }
+
+    companion object {
+        const val TYPE_EXERCISE = "exercise"
+        const val TYPE_HEALTH = "healthWellness"
+        const val TYPE_WORK = "work"
+        const val TYPE_SCHOOL = "school"
+        const val TYPE_TEAMS = "teams"
+        const val TYPE_CHORES = "chores"
+        const val TYPE_CREATIVITY = "creativity"
+        const val TYPE_OTHER = "other"
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.kt
index 3927612f0..2f8ffabf8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.kt
@@ -1,147 +1,149 @@
-package com.habitrpg.android.habitica.ui.fragments.setup
-
-import android.graphics.drawable.BitmapDrawable
-import android.graphics.drawable.Drawable
-import android.graphics.drawable.VectorDrawable
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.core.content.ContextCompat
-import androidx.lifecycle.lifecycleScope
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.data.UserRepository
-import com.habitrpg.android.habitica.databinding.FragmentWelcomeBinding
-import com.habitrpg.android.habitica.extensions.OnChangeTextWatcher
-import com.habitrpg.android.habitica.ui.fragments.BaseFragment
-import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import com.habitrpg.common.habitica.helpers.ExceptionHandler
-import com.habitrpg.common.habitica.helpers.launchCatching
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.filter
-import kotlinx.coroutines.flow.filterNotNull
-import kotlinx.coroutines.flow.firstOrNull
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class WelcomeFragment : BaseFragment<FragmentWelcomeBinding>() {
-
-    var onNameValid: ((Boolean?) -> Unit)? = null
-
-    @Inject
-    lateinit var userRepository: UserRepository
-
-    override var binding: FragmentWelcomeBinding? = null
-
-    override fun createBinding(
-        inflater: LayoutInflater,
-        container: ViewGroup?
-    ): FragmentWelcomeBinding {
-        return FragmentWelcomeBinding.inflate(inflater, container, false)
-    }
-
-    private val displayNameVerificationEvents = MutableStateFlow<String?>(null)
-    private val usernameVerificationEvents = MutableStateFlow<String?>(null)
-
-    private val checkmarkIcon: Drawable by lazy {
-        context?.let {
-            BitmapDrawable(
-                resources,
-                HabiticaIconsHelper.imageOfCheckmark(
-                    ContextCompat.getColor(it, R.color.green_50),
-                    1f
-                )
-            )
-        } ?: VectorDrawable()
-    }
-    private val alertIcon: Drawable by lazy {
-        BitmapDrawable(resources, HabiticaIconsHelper.imageOfAlertIcon())
-    }
-    val username: String
-        get() = binding?.usernameEditText?.text?.toString() ?: ""
-    val displayName: String
-        get() = binding?.displayNameEditText?.text?.toString() ?: ""
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding?.speechBubble?.animateText(context?.getString(R.string.welcome_text) ?: "")
-
-        super.onCreate(savedInstanceState)
-
-        binding?.displayNameEditText?.addTextChangedListener(
-            OnChangeTextWatcher { p0, _, _, _ ->
-                displayNameVerificationEvents.value = p0.toString()
-            }
-        )
-        binding?.usernameEditText?.addTextChangedListener(
-            OnChangeTextWatcher { p0, _, _, _ ->
-                usernameVerificationEvents.value = p0.toString()
-            }
-        )
-
-        lifecycleScope.launchCatching {
-            displayNameVerificationEvents
-                .map { it?.length in 1..30 }
-                .collect {
-                    if (it) {
-                        binding?.displayNameEditText?.setCompoundDrawablesWithIntrinsicBounds(
-                            null,
-                            null,
-                            checkmarkIcon,
-                            null
-                        )
-                        binding?.issuesTextView?.visibility = View.GONE
-                    } else {
-                        binding?.displayNameEditText?.setCompoundDrawablesWithIntrinsicBounds(
-                            null,
-                            null,
-                            alertIcon,
-                            null
-                        )
-                        binding?.issuesTextView?.visibility = View.VISIBLE
-                        binding?.issuesTextView?.text =
-                            context?.getString(R.string.display_name_length_error)
-                    }
-                }
-        }
-        lifecycleScope.launchCatching {
-            usernameVerificationEvents
-                .filter { it?.length in 1..30 }
-                .filterNotNull()
-                .map { userRepository.verifyUsername(it) }
-                .collect {
-                    if (it?.isUsable == true) {
-                        binding?.usernameEditText?.setCompoundDrawablesWithIntrinsicBounds(
-                            null,
-                            null,
-                            checkmarkIcon,
-                            null
-                        )
-                        binding?.issuesTextView?.visibility = View.GONE
-                    } else {
-                        binding?.usernameEditText?.setCompoundDrawablesWithIntrinsicBounds(
-                            null,
-                            null,
-                            alertIcon,
-                            null
-                        )
-                        binding?.issuesTextView?.visibility = View.VISIBLE
-                        binding?.issuesTextView?.text = it?.issues?.joinToString("\n")
-                    }
-                    onNameValid?.invoke(it?.isUsable)
-                }
-        }
-
-        lifecycleScope.launch(ExceptionHandler.coroutine()) {
-            val user = userRepository.getUser().firstOrNull()
-            binding?.displayNameEditText?.setText(user?.profile?.name)
-            displayNameVerificationEvents.value = user?.profile?.name ?: ""
-            binding?.usernameEditText?.setText(user?.authentication?.localAuthentication?.username)
-            usernameVerificationEvents.value = user?.username ?: ""
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.setup
+
+import android.graphics.drawable.BitmapDrawable
+import android.graphics.drawable.Drawable
+import android.graphics.drawable.VectorDrawable
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.content.ContextCompat
+import androidx.lifecycle.lifecycleScope
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.data.UserRepository
+import com.habitrpg.android.habitica.databinding.FragmentWelcomeBinding
+import com.habitrpg.android.habitica.extensions.OnChangeTextWatcher
+import com.habitrpg.android.habitica.ui.fragments.BaseFragment
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
+import com.habitrpg.common.habitica.helpers.ExceptionHandler
+import com.habitrpg.common.habitica.helpers.launchCatching
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class WelcomeFragment : BaseFragment<FragmentWelcomeBinding>() {
+    var onNameValid: ((Boolean?) -> Unit)? = null
+
+    @Inject
+    lateinit var userRepository: UserRepository
+
+    override var binding: FragmentWelcomeBinding? = null
+
+    override fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+    ): FragmentWelcomeBinding {
+        return FragmentWelcomeBinding.inflate(inflater, container, false)
+    }
+
+    private val displayNameVerificationEvents = MutableStateFlow<String?>(null)
+    private val usernameVerificationEvents = MutableStateFlow<String?>(null)
+
+    private val checkmarkIcon: Drawable by lazy {
+        context?.let {
+            BitmapDrawable(
+                resources,
+                HabiticaIconsHelper.imageOfCheckmark(
+                    ContextCompat.getColor(it, R.color.green_50),
+                    1f,
+                ),
+            )
+        } ?: VectorDrawable()
+    }
+    private val alertIcon: Drawable by lazy {
+        BitmapDrawable(resources, HabiticaIconsHelper.imageOfAlertIcon())
+    }
+    val username: String
+        get() = binding?.usernameEditText?.text?.toString() ?: ""
+    val displayName: String
+        get() = binding?.displayNameEditText?.text?.toString() ?: ""
+
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
+        super.onViewCreated(view, savedInstanceState)
+
+        binding?.speechBubble?.animateText(context?.getString(R.string.welcome_text) ?: "")
+
+        super.onCreate(savedInstanceState)
+
+        binding?.displayNameEditText?.addTextChangedListener(
+            OnChangeTextWatcher { p0, _, _, _ ->
+                displayNameVerificationEvents.value = p0.toString()
+            },
+        )
+        binding?.usernameEditText?.addTextChangedListener(
+            OnChangeTextWatcher { p0, _, _, _ ->
+                usernameVerificationEvents.value = p0.toString()
+            },
+        )
+
+        lifecycleScope.launchCatching {
+            displayNameVerificationEvents
+                .map { it?.length in 1..30 }
+                .collect {
+                    if (it) {
+                        binding?.displayNameEditText?.setCompoundDrawablesWithIntrinsicBounds(
+                            null,
+                            null,
+                            checkmarkIcon,
+                            null,
+                        )
+                        binding?.issuesTextView?.visibility = View.GONE
+                    } else {
+                        binding?.displayNameEditText?.setCompoundDrawablesWithIntrinsicBounds(
+                            null,
+                            null,
+                            alertIcon,
+                            null,
+                        )
+                        binding?.issuesTextView?.visibility = View.VISIBLE
+                        binding?.issuesTextView?.text =
+                            context?.getString(R.string.display_name_length_error)
+                    }
+                }
+        }
+        lifecycleScope.launchCatching {
+            usernameVerificationEvents
+                .filter { it?.length in 1..30 }
+                .filterNotNull()
+                .map { userRepository.verifyUsername(it) }
+                .collect {
+                    if (it?.isUsable == true) {
+                        binding?.usernameEditText?.setCompoundDrawablesWithIntrinsicBounds(
+                            null,
+                            null,
+                            checkmarkIcon,
+                            null,
+                        )
+                        binding?.issuesTextView?.visibility = View.GONE
+                    } else {
+                        binding?.usernameEditText?.setCompoundDrawablesWithIntrinsicBounds(
+                            null,
+                            null,
+                            alertIcon,
+                            null,
+                        )
+                        binding?.issuesTextView?.visibility = View.VISIBLE
+                        binding?.issuesTextView?.text = it?.issues?.joinToString("\n")
+                    }
+                    onNameValid?.invoke(it?.isUsable)
+                }
+        }
+
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            val user = userRepository.getUser().firstOrNull()
+            binding?.displayNameEditText?.setText(user?.profile?.name)
+            displayNameVerificationEvents.value = user?.profile?.name ?: ""
+            binding?.usernameEditText?.setText(user?.authentication?.localAuthentication?.username)
+            usernameVerificationEvents.value = user?.username ?: ""
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillTasksRecyclerViewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillTasksRecyclerViewFragment.kt
index 3af0cda23..3bdec6fce 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillTasksRecyclerViewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillTasksRecyclerViewFragment.kt
@@ -28,7 +28,10 @@ class SkillTasksRecyclerViewFragment : BaseFragment<FragmentRecyclerviewBinding>
 
     override var binding: FragmentRecyclerviewBinding? = null
 
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentRecyclerviewBinding {
+    override fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+    ): FragmentRecyclerviewBinding {
         return FragmentRecyclerviewBinding.inflate(inflater, container, false)
     }
 
@@ -37,7 +40,10 @@ class SkillTasksRecyclerViewFragment : BaseFragment<FragmentRecyclerviewBinding>
 
     var onTaskSelection: ((Task) -> Unit)? = null
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
         super.onViewCreated(view, savedInstanceState)
 
         val layoutManager = LinearLayoutManager(context)
@@ -48,8 +54,13 @@ class SkillTasksRecyclerViewFragment : BaseFragment<FragmentRecyclerviewBinding>
         binding?.recyclerView?.adapter = adapter
 
         val additionalGroupIDs = userViewModel.mirrorGroupTasks.toTypedArray()
-        var tasks = taskRepository.getTasks(taskType ?: TaskType.HABIT, userViewModel.userID, additionalGroupIDs)
-            .map { it.filter { it.challengeID == null && it.group?.groupID?.isNotBlank() != true } }
+        var tasks =
+            taskRepository.getTasks(
+                taskType ?: TaskType.HABIT,
+                userViewModel.userID,
+                additionalGroupIDs,
+            )
+                .map { it.filter { it.challengeID == null && it.group?.groupID?.isNotBlank() != true } }
         if (taskType == TaskType.TODO) {
             tasks = tasks.map { it.filter { !it.completed } }
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.kt
index 607df13ee..36854f0a1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.kt
@@ -1,176 +1,198 @@
-package com.habitrpg.android.habitica.ui.fragments.skills
-
-import android.app.Activity
-import android.content.Intent
-import android.graphics.drawable.BitmapDrawable
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.core.content.ContextCompat
-import androidx.lifecycle.lifecycleScope
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.databinding.FragmentRecyclerviewBinding
-import com.habitrpg.android.habitica.models.Skill
-import com.habitrpg.android.habitica.models.responses.SkillResponse
-import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.android.habitica.ui.activities.SkillMemberActivity
-import com.habitrpg.android.habitica.ui.activities.SkillTasksActivity
-import com.habitrpg.android.habitica.ui.adapter.SkillsRecyclerViewAdapter
-import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
-import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
-import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
-import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
-import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.Companion.showSnackbar
-import com.habitrpg.common.habitica.helpers.ExceptionHandler
-import com.habitrpg.common.habitica.helpers.launchCatching
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class SkillsFragment : BaseMainFragment<FragmentRecyclerviewBinding>() {
-    internal var adapter: SkillsRecyclerViewAdapter? = null
-    private var selectedSkill: Skill? = null
-
-    override var binding: FragmentRecyclerviewBinding? = null
-
-    @Inject
-    lateinit var userViewModel: MainUserViewModel
-
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentRecyclerviewBinding {
-        return FragmentRecyclerviewBinding.inflate(inflater, container, false)
-    }
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        adapter = SkillsRecyclerViewAdapter()
-        adapter?.onUseSkill = { onSkillSelected(it) }
-
-        this.tutorialStepIdentifier = "skills"
-        this.tutorialTexts = listOf(getString(R.string.tutorial_skills))
-        return super.onCreateView(inflater, container, savedInstanceState)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        userViewModel.user.observe(viewLifecycleOwner) { user ->
-            user?.let { checkUserLoadSkills(it) }
-        }
-        binding?.recyclerView?.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(mainActivity)
-        binding?.recyclerView?.adapter = adapter
-        binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
-    }
-
-    private fun checkUserLoadSkills(user: User) {
-        if (adapter == null) {
-            return
-        }
-        adapter?.mana = user.stats?.mp ?: 0.0
-        adapter?.level = user.stats?.lvl ?: 0
-        adapter?.specialItems = user.items?.special
-        lifecycleScope.launchCatching {
-            userRepository.getSkills(user)
-                .combine(userRepository.getSpecialItems(user)) { skills, items ->
-                    val allEntries = mutableListOf<Skill>()
-                    for (skill in skills) {
-                        allEntries.add(skill)
-                    }
-                    for (item in items) {
-                        allEntries.add(item)
-                    }
-                    return@combine allEntries
-                }.collect { skills -> adapter?.setSkillList(skills) }
-        }
-    }
-
-    private fun onSkillSelected(skill: Skill) {
-        when {
-            "special" == skill.habitClass -> {
-                selectedSkill = skill
-                val intent = Intent(mainActivity, SkillMemberActivity::class.java)
-                memberSelectionResult.launch(intent)
-            }
-            skill.target == "task" -> {
-                selectedSkill = skill
-                val intent = Intent(mainActivity, SkillTasksActivity::class.java)
-                taskSelectionResult.launch(intent)
-            }
-            else -> useSkill(skill)
-        }
-    }
-
-    private fun displaySkillResult(usedSkill: Skill?, response: SkillResponse) {
-        if (!isAdded) return
-        adapter?.mana = response.user?.stats?.mp ?: 0.0
-        val activity = mainActivity ?: return
-        if ("special" == usedSkill?.habitClass) {
-            showSnackbar(activity.snackbarContainer, context?.getString(R.string.used_skill_without_mana, usedSkill.text), HabiticaSnackbar.SnackbarDisplayType.BLUE)
-        } else {
-            context?.let {
-                showSnackbar(
-                    activity.snackbarContainer,
-                    null,
-                    context?.getString(R.string.used_skill_without_mana, usedSkill?.text),
-                    BitmapDrawable(resources, HabiticaIconsHelper.imageOfMagic()),
-                    ContextCompat.getColor(it, R.color.blue_10),
-                    "-" + usedSkill?.mana,
-                    HabiticaSnackbar.SnackbarDisplayType.BLUE
-                )
-            }
-        }
-        if (response.damage > 0) {
-            lifecycleScope.launch(ExceptionHandler.coroutine()) {
-                delay(2000L)
-                if (!isAdded) return@launch
-                showSnackbar(
-                    activity.snackbarContainer,
-                    null,
-                    context?.getString(R.string.caused_damage),
-                    BitmapDrawable(resources, HabiticaIconsHelper.imageOfDamage()),
-                    ContextCompat.getColor(activity, R.color.green_10),
-                    "+%.01f".format(response.damage),
-                    HabiticaSnackbar.SnackbarDisplayType.SUCCESS
-                )
-            }
-        }
-        lifecycleScope.launch(ExceptionHandler.coroutine()) {
-            userRepository.retrieveUser(true)
-        }
-    }
-
-    private val taskSelectionResult = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-        if (it.resultCode == Activity.RESULT_OK) {
-            useSkill(selectedSkill, it.data?.getStringExtra("taskID"))
-        }
-    }
-
-    private val memberSelectionResult = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-        if (it.resultCode == Activity.RESULT_OK) {
-            useSkill(selectedSkill, it.data?.getStringExtra("member_id"))
-        }
-    }
-
-    private fun useSkill(skill: Skill?, taskId: String? = null) {
-        if (skill == null) {
-            return
-        }
-        lifecycleScope.launchCatching {
-            val skillResponse = if (taskId != null) {
-                userRepository.useSkill(skill.key, skill.target, taskId)
-            } else {
-                userRepository.useSkill(skill.key, skill.target)
-            }
-            if (skillResponse != null) {
-                displaySkillResult(skill, skillResponse)
-            }
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.skills
+
+import android.app.Activity
+import android.content.Intent
+import android.graphics.drawable.BitmapDrawable
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.core.content.ContextCompat
+import androidx.lifecycle.lifecycleScope
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.FragmentRecyclerviewBinding
+import com.habitrpg.android.habitica.models.Skill
+import com.habitrpg.android.habitica.models.responses.SkillResponse
+import com.habitrpg.android.habitica.models.user.User
+import com.habitrpg.android.habitica.ui.activities.SkillMemberActivity
+import com.habitrpg.android.habitica.ui.activities.SkillTasksActivity
+import com.habitrpg.android.habitica.ui.adapter.SkillsRecyclerViewAdapter
+import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
+import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
+import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
+import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.Companion.showSnackbar
+import com.habitrpg.common.habitica.helpers.ExceptionHandler
+import com.habitrpg.common.habitica.helpers.launchCatching
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class SkillsFragment : BaseMainFragment<FragmentRecyclerviewBinding>() {
+    internal var adapter: SkillsRecyclerViewAdapter? = null
+    private var selectedSkill: Skill? = null
+
+    override var binding: FragmentRecyclerviewBinding? = null
+
+    @Inject
+    lateinit var userViewModel: MainUserViewModel
+
+    override fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+    ): FragmentRecyclerviewBinding {
+        return FragmentRecyclerviewBinding.inflate(inflater, container, false)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?,
+    ): View? {
+        adapter = SkillsRecyclerViewAdapter()
+        adapter?.onUseSkill = { onSkillSelected(it) }
+
+        this.tutorialStepIdentifier = "skills"
+        this.tutorialTexts = listOf(getString(R.string.tutorial_skills))
+        return super.onCreateView(inflater, container, savedInstanceState)
+    }
+
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
+        super.onViewCreated(view, savedInstanceState)
+        userViewModel.user.observe(viewLifecycleOwner) { user ->
+            user?.let { checkUserLoadSkills(it) }
+        }
+        binding?.recyclerView?.layoutManager =
+            androidx.recyclerview.widget.LinearLayoutManager(mainActivity)
+        binding?.recyclerView?.adapter = adapter
+        binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
+    }
+
+    private fun checkUserLoadSkills(user: User) {
+        if (adapter == null) {
+            return
+        }
+        adapter?.mana = user.stats?.mp ?: 0.0
+        adapter?.level = user.stats?.lvl ?: 0
+        adapter?.specialItems = user.items?.special
+        lifecycleScope.launchCatching {
+            userRepository.getSkills(user)
+                .combine(userRepository.getSpecialItems(user)) { skills, items ->
+                    val allEntries = mutableListOf<Skill>()
+                    for (skill in skills) {
+                        allEntries.add(skill)
+                    }
+                    for (item in items) {
+                        allEntries.add(item)
+                    }
+                    return@combine allEntries
+                }.collect { skills -> adapter?.setSkillList(skills) }
+        }
+    }
+
+    private fun onSkillSelected(skill: Skill) {
+        when {
+            "special" == skill.habitClass -> {
+                selectedSkill = skill
+                val intent = Intent(mainActivity, SkillMemberActivity::class.java)
+                memberSelectionResult.launch(intent)
+            }
+
+            skill.target == "task" -> {
+                selectedSkill = skill
+                val intent = Intent(mainActivity, SkillTasksActivity::class.java)
+                taskSelectionResult.launch(intent)
+            }
+
+            else -> useSkill(skill)
+        }
+    }
+
+    private fun displaySkillResult(
+        usedSkill: Skill?,
+        response: SkillResponse,
+    ) {
+        if (!isAdded) return
+        adapter?.mana = response.user?.stats?.mp ?: 0.0
+        val activity = mainActivity ?: return
+        if ("special" == usedSkill?.habitClass) {
+            showSnackbar(
+                activity.snackbarContainer,
+                context?.getString(R.string.used_skill_without_mana, usedSkill.text),
+                HabiticaSnackbar.SnackbarDisplayType.BLUE,
+            )
+        } else {
+            context?.let {
+                showSnackbar(
+                    activity.snackbarContainer,
+                    null,
+                    context?.getString(R.string.used_skill_without_mana, usedSkill?.text),
+                    BitmapDrawable(resources, HabiticaIconsHelper.imageOfMagic()),
+                    ContextCompat.getColor(it, R.color.blue_10),
+                    "-" + usedSkill?.mana,
+                    HabiticaSnackbar.SnackbarDisplayType.BLUE,
+                )
+            }
+        }
+        if (response.damage > 0) {
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                delay(2000L)
+                if (!isAdded) return@launch
+                showSnackbar(
+                    activity.snackbarContainer,
+                    null,
+                    context?.getString(R.string.caused_damage),
+                    BitmapDrawable(resources, HabiticaIconsHelper.imageOfDamage()),
+                    ContextCompat.getColor(activity, R.color.green_10),
+                    "+%.01f".format(response.damage),
+                    HabiticaSnackbar.SnackbarDisplayType.SUCCESS,
+                )
+            }
+        }
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.retrieveUser(true)
+        }
+    }
+
+    private val taskSelectionResult =
+        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+            if (it.resultCode == Activity.RESULT_OK) {
+                useSkill(selectedSkill, it.data?.getStringExtra("taskID"))
+            }
+        }
+
+    private val memberSelectionResult =
+        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+            if (it.resultCode == Activity.RESULT_OK) {
+                useSkill(selectedSkill, it.data?.getStringExtra("member_id"))
+            }
+        }
+
+    private fun useSkill(
+        skill: Skill?,
+        taskId: String? = null,
+    ) {
+        if (skill == null) {
+            return
+        }
+        lifecycleScope.launchCatching {
+            val skillResponse =
+                if (taskId != null) {
+                    userRepository.useSkill(skill.key, skill.target, taskId)
+                } else {
+                    userRepository.useSkill(skill.key, skill.target)
+                }
+            if (skillResponse != null) {
+                displaySkillResult(skill, skillResponse)
+            }
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatFragment.kt
index 214dd04e3..a179abf38 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatFragment.kt
@@ -1,225 +1,231 @@
-package com.habitrpg.android.habitica.ui.fragments.social
-
-import android.content.ClipData
-import android.content.ClipboardManager
-import android.content.Context
-import android.os.Build
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.viewModels
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.data.SocialRepository
-import com.habitrpg.android.habitica.databinding.FragmentChatBinding
-import com.habitrpg.common.habitica.extensions.observeOnce
-import com.habitrpg.android.habitica.helpers.AppConfigManager
-import com.habitrpg.android.habitica.models.social.ChatMessage
-import com.habitrpg.android.habitica.ui.activities.FullProfileActivity
-import com.habitrpg.android.habitica.ui.activities.MainActivity
-import com.habitrpg.android.habitica.ui.adapter.social.ChatRecyclerViewAdapter
-import com.habitrpg.android.habitica.ui.fragments.BaseFragment
-import com.habitrpg.android.habitica.ui.fragments.ReportBottomSheetFragment
-import com.habitrpg.android.habitica.ui.helpers.AutocompleteAdapter
-import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
-import com.habitrpg.android.habitica.ui.viewmodels.GroupViewModel
-import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.Companion.showSnackbar
-import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.SnackbarDisplayType
-import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import com.habitrpg.common.habitica.helpers.launchCatching
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.delay
-import javax.inject.Inject
-import kotlin.time.DurationUnit
-import kotlin.time.toDuration
-
-@AndroidEntryPoint
-open class ChatFragment : BaseFragment<FragmentChatBinding>() {
-
-    override var binding: FragmentChatBinding? = null
-
-    override fun createBinding(
-        inflater: LayoutInflater,
-        container: ViewGroup?
-    ): FragmentChatBinding {
-        return FragmentChatBinding.inflate(inflater, container, false)
-    }
-
-    open val viewModel: GroupViewModel by viewModels(
-        ownerProducer = { requireParentFragment() }
-    )
-
-    @Inject
-    lateinit var configManager: AppConfigManager
-
-    @Inject
-    lateinit var socialRepository: SocialRepository
-
-    private var chatAdapter: ChatRecyclerViewAdapter? = null
-    private var navigatedOnceToFragment = false
-    private var isScrolledToBottom = true
-    private var isFirstRefresh = true
-    var autocompleteContext: String = ""
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        val layoutManager = LinearLayoutManager(context)
-        layoutManager.reverseLayout = true
-        layoutManager.stackFromEnd = false
-        binding?.recyclerView?.layoutManager = layoutManager
-
-        chatAdapter = ChatRecyclerViewAdapter(null, true)
-        chatAdapter?.let { adapter ->
-            adapter.onOpenProfile = { userId -> FullProfileActivity.open(userId) }
-            adapter.onDeleteMessage = { this.showDeleteConfirmationDialog(it) }
-            adapter.onFlagMessage = { this.showFlagMessageBottomSheet(it) }
-            adapter.onReply = { setReplyTo(it) }
-            adapter.onCopyMessage = { this.copyMessageToClipboard(it) }
-            adapter.onMessageLike = { viewModel.likeMessage(it) }
-        }
-
-        binding?.chatBarView?.sendAction = { sendChatMessage(it) }
-        binding?.chatBarView?.maxChatLength = configManager.maxChatLength()
-        binding?.chatBarView?.autocompleteContext = "party"
-        binding?.chatBarView?.groupID = viewModel.getGroupData().value?.id
-        binding?.chatBarView?.autocompleteAdapter = AutocompleteAdapter(
-            requireContext(),
-            socialRepository,
-            autocompleteContext,
-            viewModel.groupID,
-            configManager.enableUsernameAutocomplete()
-        )
-
-        binding?.recyclerView?.adapter = chatAdapter
-        binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
-
-        binding?.recyclerView?.addOnScrollListener(object :
-                androidx.recyclerview.widget.RecyclerView.OnScrollListener() {
-                override fun onScrolled(
-                    recyclerView: androidx.recyclerview.widget.RecyclerView,
-                    dx: Int,
-                    dy: Int
-                ) {
-                    super.onScrolled(recyclerView, dx, dy)
-                    isScrolledToBottom = layoutManager.findFirstVisibleItemPosition() == 0
-                }
-            })
-
-        viewModel.chatmessages.observe(viewLifecycleOwner) { setChatMessages(it) }
-
-        binding?.chatBarView?.onCommunityGuidelinesAccepted = {
-            viewModel.updateUser("flags.communityGuidelinesAccepted", true)
-            binding?.chatBarView?.hasAcceptedGuidelines = true
-        }
-
-        viewModel.user.observeOnce(viewLifecycleOwner) {
-            chatAdapter?.user = it
-            binding?.chatBarView?.hasAcceptedGuidelines =
-                it?.flags?.communityGuidelinesAccepted == true
-        }
-
-        lifecycleScope.launchCatching {
-            repeatOnLifecycle(Lifecycle.State.RESUMED) {
-                while (true) {
-                    refresh()
-                    delay(30.toDuration(DurationUnit.SECONDS))
-                }
-            }
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-        setNavigatedToFragment()
-    }
-
-    private fun setReplyTo(username: String?) {
-        val previousMessage = binding?.chatBarView?.message ?: ""
-        if (previousMessage.contains("@$username")) {
-            return
-        }
-        binding?.chatBarView?.message = "@$username $previousMessage"
-    }
-
-    private fun refresh() {
-        viewModel.retrieveGroupChat {
-            if (isScrolledToBottom || isFirstRefresh) {
-                binding?.recyclerView?.scrollToPosition(0)
-            }
-            isFirstRefresh = false
-        }
-    }
-
-    fun setNavigatedToFragment() {
-        navigatedOnceToFragment = true
-        markMessagesAsSeen()
-    }
-
-    private fun markMessagesAsSeen() {
-        if (navigatedOnceToFragment) {
-            viewModel.markMessagesSeen()
-        }
-    }
-
-    private fun copyMessageToClipboard(chatMessage: ChatMessage) {
-        val clipMan = activity?.getSystemService(Context.CLIPBOARD_SERVICE) as? ClipboardManager
-        val messageText = ClipData.newPlainText("Chat message", chatMessage.text)
-        clipMan?.setPrimaryClip(messageText)
-        val activity = activity as? MainActivity
-        if (activity != null && Build.VERSION.SDK_INT <= Build.VERSION_CODES.S_V2) {
-            showSnackbar(
-                activity.snackbarContainer,
-                getString(R.string.chat_message_copied),
-                SnackbarDisplayType.NORMAL
-            )
-        }
-    }
-
-    private fun showFlagMessageBottomSheet(chatMessage : ChatMessage) {
-        val reportBottomSheetFragment = ReportBottomSheetFragment.newInstance(
-            reportType = ReportBottomSheetFragment.REPORT_TYPE_MESSAGE,
-            profileName = chatMessage.username ?: "",
-            messageId = chatMessage.id,
-            messageText = chatMessage.text ?: "",
-            groupId = chatMessage.groupId ?: "",
-            userIdBeingReported = chatMessage.userID ?: "",
-            sourceView = this::class.simpleName ?: ""
-        )
-
-        reportBottomSheetFragment.show(childFragmentManager, ReportBottomSheetFragment.TAG)
-    }
-
-    private fun showDeleteConfirmationDialog(chatMessage: ChatMessage) {
-        val context = context
-        if (context != null) {
-            val dialog = HabiticaAlertDialog(context)
-            dialog.setTitle(R.string.confirm_delete_tag_title)
-            dialog.setMessage(R.string.confirm_delete_tag_message)
-            dialog.addButton(R.string.yes, true, true) { _, _ ->
-                viewModel.deleteMessage(chatMessage)
-            }
-            dialog.show()
-        }
-    }
-
-    private fun setChatMessages(chatMessages: List<ChatMessage>) {
-        chatAdapter?.data = chatMessages
-        binding?.chatBarView?.chatMessages = chatMessages
-
-        viewModel.gotNewMessages = true
-
-        markMessagesAsSeen()
-    }
-
-    private fun sendChatMessage(chatText: String) {
-        viewModel.postGroupChat(
-            chatText,
-            { binding?.recyclerView?.scrollToPosition(0) }
-        ) { binding?.chatBarView?.message = chatText }
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.social
+
+import android.content.ClipData
+import android.content.ClipboardManager
+import android.content.Context
+import android.os.Build
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.data.SocialRepository
+import com.habitrpg.android.habitica.databinding.FragmentChatBinding
+import com.habitrpg.android.habitica.helpers.AppConfigManager
+import com.habitrpg.android.habitica.models.social.ChatMessage
+import com.habitrpg.android.habitica.ui.activities.FullProfileActivity
+import com.habitrpg.android.habitica.ui.activities.MainActivity
+import com.habitrpg.android.habitica.ui.adapter.social.ChatRecyclerViewAdapter
+import com.habitrpg.android.habitica.ui.fragments.BaseFragment
+import com.habitrpg.android.habitica.ui.fragments.ReportBottomSheetFragment
+import com.habitrpg.android.habitica.ui.helpers.AutocompleteAdapter
+import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
+import com.habitrpg.android.habitica.ui.viewmodels.GroupViewModel
+import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.Companion.showSnackbar
+import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.SnackbarDisplayType
+import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
+import com.habitrpg.common.habitica.extensions.observeOnce
+import com.habitrpg.common.habitica.helpers.launchCatching
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.delay
+import javax.inject.Inject
+import kotlin.time.DurationUnit
+import kotlin.time.toDuration
+
+@AndroidEntryPoint
+open class ChatFragment : BaseFragment<FragmentChatBinding>() {
+    override var binding: FragmentChatBinding? = null
+
+    override fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+    ): FragmentChatBinding {
+        return FragmentChatBinding.inflate(inflater, container, false)
+    }
+
+    open val viewModel: GroupViewModel by viewModels(
+        ownerProducer = { requireParentFragment() },
+    )
+
+    @Inject
+    lateinit var configManager: AppConfigManager
+
+    @Inject
+    lateinit var socialRepository: SocialRepository
+
+    private var chatAdapter: ChatRecyclerViewAdapter? = null
+    private var navigatedOnceToFragment = false
+    private var isScrolledToBottom = true
+    private var isFirstRefresh = true
+    var autocompleteContext: String = ""
+
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
+        super.onViewCreated(view, savedInstanceState)
+
+        val layoutManager = LinearLayoutManager(context)
+        layoutManager.reverseLayout = true
+        layoutManager.stackFromEnd = false
+        binding?.recyclerView?.layoutManager = layoutManager
+
+        chatAdapter = ChatRecyclerViewAdapter(null, true)
+        chatAdapter?.let { adapter ->
+            adapter.onOpenProfile = { userId -> FullProfileActivity.open(userId) }
+            adapter.onDeleteMessage = { this.showDeleteConfirmationDialog(it) }
+            adapter.onFlagMessage = { this.showFlagMessageBottomSheet(it) }
+            adapter.onReply = { setReplyTo(it) }
+            adapter.onCopyMessage = { this.copyMessageToClipboard(it) }
+            adapter.onMessageLike = { viewModel.likeMessage(it) }
+        }
+
+        binding?.chatBarView?.sendAction = { sendChatMessage(it) }
+        binding?.chatBarView?.maxChatLength = configManager.maxChatLength()
+        binding?.chatBarView?.autocompleteContext = "party"
+        binding?.chatBarView?.groupID = viewModel.getGroupData().value?.id
+        binding?.chatBarView?.autocompleteAdapter =
+            AutocompleteAdapter(
+                requireContext(),
+                socialRepository,
+                autocompleteContext,
+                viewModel.groupID,
+                configManager.enableUsernameAutocomplete(),
+            )
+
+        binding?.recyclerView?.adapter = chatAdapter
+        binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
+
+        binding?.recyclerView?.addOnScrollListener(
+            object :
+                androidx.recyclerview.widget.RecyclerView.OnScrollListener() {
+                override fun onScrolled(
+                    recyclerView: androidx.recyclerview.widget.RecyclerView,
+                    dx: Int,
+                    dy: Int,
+                ) {
+                    super.onScrolled(recyclerView, dx, dy)
+                    isScrolledToBottom = layoutManager.findFirstVisibleItemPosition() == 0
+                }
+            },
+        )
+
+        viewModel.chatmessages.observe(viewLifecycleOwner) { setChatMessages(it) }
+
+        binding?.chatBarView?.onCommunityGuidelinesAccepted = {
+            viewModel.updateUser("flags.communityGuidelinesAccepted", true)
+            binding?.chatBarView?.hasAcceptedGuidelines = true
+        }
+
+        viewModel.user.observeOnce(viewLifecycleOwner) {
+            chatAdapter?.user = it
+            binding?.chatBarView?.hasAcceptedGuidelines =
+                it?.flags?.communityGuidelinesAccepted == true
+        }
+
+        lifecycleScope.launchCatching {
+            repeatOnLifecycle(Lifecycle.State.RESUMED) {
+                while (true) {
+                    refresh()
+                    delay(30.toDuration(DurationUnit.SECONDS))
+                }
+            }
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        setNavigatedToFragment()
+    }
+
+    private fun setReplyTo(username: String?) {
+        val previousMessage = binding?.chatBarView?.message ?: ""
+        if (previousMessage.contains("@$username")) {
+            return
+        }
+        binding?.chatBarView?.message = "@$username $previousMessage"
+    }
+
+    private fun refresh() {
+        viewModel.retrieveGroupChat {
+            if (isScrolledToBottom || isFirstRefresh) {
+                binding?.recyclerView?.scrollToPosition(0)
+            }
+            isFirstRefresh = false
+        }
+    }
+
+    fun setNavigatedToFragment() {
+        navigatedOnceToFragment = true
+        markMessagesAsSeen()
+    }
+
+    private fun markMessagesAsSeen() {
+        if (navigatedOnceToFragment) {
+            viewModel.markMessagesSeen()
+        }
+    }
+
+    private fun copyMessageToClipboard(chatMessage: ChatMessage) {
+        val clipMan = activity?.getSystemService(Context.CLIPBOARD_SERVICE) as? ClipboardManager
+        val messageText = ClipData.newPlainText("Chat message", chatMessage.text)
+        clipMan?.setPrimaryClip(messageText)
+        val activity = activity as? MainActivity
+        if (activity != null && Build.VERSION.SDK_INT <= Build.VERSION_CODES.S_V2) {
+            showSnackbar(
+                activity.snackbarContainer,
+                getString(R.string.chat_message_copied),
+                SnackbarDisplayType.NORMAL,
+            )
+        }
+    }
+
+    private fun showFlagMessageBottomSheet(chatMessage: ChatMessage) {
+        val reportBottomSheetFragment =
+            ReportBottomSheetFragment.newInstance(
+                reportType = ReportBottomSheetFragment.REPORT_TYPE_MESSAGE,
+                profileName = chatMessage.username ?: "",
+                messageId = chatMessage.id,
+                messageText = chatMessage.text ?: "",
+                groupId = chatMessage.groupId ?: "",
+                userIdBeingReported = chatMessage.userID ?: "",
+                sourceView = this::class.simpleName ?: "",
+            )
+
+        reportBottomSheetFragment.show(childFragmentManager, ReportBottomSheetFragment.TAG)
+    }
+
+    private fun showDeleteConfirmationDialog(chatMessage: ChatMessage) {
+        val context = context
+        if (context != null) {
+            val dialog = HabiticaAlertDialog(context)
+            dialog.setTitle(R.string.confirm_delete_tag_title)
+            dialog.setMessage(R.string.confirm_delete_tag_message)
+            dialog.addButton(R.string.yes, true, true) { _, _ ->
+                viewModel.deleteMessage(chatMessage)
+            }
+            dialog.show()
+        }
+    }
+
+    private fun setChatMessages(chatMessages: List<ChatMessage>) {
+        chatAdapter?.data = chatMessages
+        binding?.chatBarView?.chatMessages = chatMessages
+
+        viewModel.gotNewMessages = true
+
+        markMessagesAsSeen()
+    }
+
+    private fun sendChatMessage(chatText: String) {
+        viewModel.postGroupChat(
+            chatText,
+            { binding?.recyclerView?.scrollToPosition(0) },
+        ) { binding?.chatBarView?.message = chatText }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.kt
index cb4c15aa4..ce6ede816 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.kt
@@ -1,237 +1,258 @@
-package com.habitrpg.android.habitica.ui.fragments.social
-
-import android.content.ClipData
-import android.content.ClipboardManager
-import android.content.Context
-import android.os.Build
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.viewModels
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
-import androidx.recyclerview.widget.RecyclerView
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.data.SocialRepository
-import com.habitrpg.android.habitica.databinding.FragmentInboxMessageListBinding
-import com.habitrpg.android.habitica.extensions.addOkButton
-import com.habitrpg.android.habitica.helpers.AppConfigManager
-import com.habitrpg.android.habitica.models.social.ChatMessage
-import com.habitrpg.android.habitica.ui.activities.FullProfileActivity
-import com.habitrpg.android.habitica.ui.activities.MainActivity
-import com.habitrpg.android.habitica.ui.adapter.social.InboxAdapter
-import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
-import com.habitrpg.android.habitica.ui.fragments.ReportBottomSheetFragment
-import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
-import com.habitrpg.android.habitica.ui.viewmodels.InboxViewModel
-import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
-import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.Companion.showSnackbar
-import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import com.habitrpg.common.habitica.helpers.ExceptionHandler
-import com.habitrpg.common.habitica.helpers.launchCatching
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-import kotlin.time.DurationUnit
-import kotlin.time.toDuration
-
-@AndroidEntryPoint
-class InboxMessageListFragment : BaseMainFragment<FragmentInboxMessageListBinding>() {
-
-    override var binding: FragmentInboxMessageListBinding? = null
-
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentInboxMessageListBinding {
-        return FragmentInboxMessageListBinding.inflate(inflater, container, false)
-    }
-
-    @Inject
-    lateinit var socialRepository: SocialRepository
-
-    @Inject
-    lateinit var configManager: AppConfigManager
-
-    private var chatAdapter: InboxAdapter? = null
-
-    private val viewModel: InboxViewModel by viewModels()
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        this.hidesToolbar = true
-        return super.onCreateView(inflater, container, savedInstanceState)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        showsBackButton = true
-        super.onViewCreated(view, savedInstanceState)
-
-        val layoutManager = androidx.recyclerview.widget.LinearLayoutManager(this.activity)
-        layoutManager.reverseLayout = true
-        layoutManager.stackFromEnd = false
-        binding?.recyclerView?.layoutManager = layoutManager
-        lifecycleScope.launch(ExceptionHandler.coroutine()) {
-            socialRepository.getMember(viewModel.recipientID ?: viewModel.recipientUsername ?: "").collect {
-                mainActivity?.title = it?.displayName
-                chatAdapter?.replyToUser = it
-            }
-        }
-        chatAdapter = InboxAdapter(viewModel.user.value)
-        chatAdapter?.registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() {
-            override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
-                if (positionStart == 0) {
-                    binding?.recyclerView?.scrollToPosition(0)
-                }
-            }
-        })
-        binding?.recyclerView?.adapter = chatAdapter
-        binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
-        chatAdapter?.let { adapter ->
-            adapter.onOpenProfile = {
-                FullProfileActivity.open(it)
-            }
-            adapter.onDeleteMessage = { showDeleteConfirmationDialog(it) }
-            adapter.onFlagMessage = { showFlagMessageBottomSheet(it) }
-            adapter.onCopyMessage = { copyMessageToClipboard(it) }
-        }
-
-        viewModel.messages.observe(viewLifecycleOwner) {
-            markMessagesAsRead(it)
-            chatAdapter?.submitList(it)
-        }
-
-        binding?.chatBarView?.sendAction = { sendMessage(it) }
-        binding?.chatBarView?.maxChatLength = configManager.maxChatLength()
-
-        binding?.chatBarView?.hasAcceptedGuidelines = true
-
-        lifecycleScope.launchCatching {
-            lifecycle.repeatOnLifecycle(Lifecycle.State.RESUMED) {
-                while (true) {
-                    refreshConversation()
-                    delay(30.toDuration(DurationUnit.SECONDS))
-                }
-            }
-        }
-    }
-
-    override fun onResume() {
-        if (viewModel.recipientID?.isNotBlank() != true && viewModel.recipientUsername?.isNotBlank() != true) {
-            parentFragmentManager.popBackStack()
-        }
-        super.onResume()
-    }
-
-    override fun onAttach(context: Context) {
-        view?.invalidate()
-        view?.forceLayout()
-
-        super.onAttach(context)
-    }
-
-    override fun onDestroy() {
-        socialRepository.close()
-        super.onDestroy()
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        this.mainActivity?.menuInflater?.inflate(R.menu.inbox_chat, menu)
-        super.onCreateOptionsMenu(menu, inflater)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            R.id.open_profile -> {
-                openProfile()
-                return true
-            }
-        }
-        return super.onOptionsItemSelected(item)
-    }
-
-    private fun markMessagesAsRead(messages: List<ChatMessage>) {
-        socialRepository.markSomePrivateMessagesAsRead(viewModel.user.value, messages)
-    }
-
-    private fun refreshConversation() {
-        if (viewModel.memberID?.isNotBlank() != true) { return }
-        lifecycleScope.launch(ExceptionHandler.coroutine()) {
-            socialRepository.retrieveInboxMessages(viewModel.recipientID ?: "", 0)
-            viewModel.invalidateDataSource()
-        }
-    }
-
-    private fun sendMessage(chatText: String) {
-        viewModel.memberID?.let { userID ->
-            lifecycleScope.launch(
-                ExceptionHandler.coroutine { error ->
-                    ExceptionHandler.reportError(error)
-                    binding?.let {
-                        val alert = HabiticaAlertDialog(it.chatBarView.context)
-                        alert.setTitle("You cannot reply to this conversation")
-                        alert.setMessage("This user is unable to receive your private message")
-                        alert.addOkButton()
-                        alert.show()
-                    }
-                    binding?.chatBarView?.message = chatText
-                }
-            ) {
-                socialRepository.postPrivateMessage(userID, chatText)
-                delay(200.toDuration(DurationUnit.MILLISECONDS))
-                viewModel.invalidateDataSource()
-            }
-        }
-    }
-
-    private fun copyMessageToClipboard(chatMessage: ChatMessage) {
-        val clipMan = activity?.getSystemService(Context.CLIPBOARD_SERVICE) as? ClipboardManager
-        val messageText = ClipData.newPlainText("Chat message", chatMessage.text)
-        clipMan?.setPrimaryClip(messageText)
-        val activity = activity as? MainActivity
-        if (activity != null && Build.VERSION.SDK_INT <= Build.VERSION_CODES.S_V2) {
-            showSnackbar(activity.snackbarContainer, getString(R.string.chat_message_copied), HabiticaSnackbar.SnackbarDisplayType.NORMAL)
-        }
-    }
-
-    private fun showFlagMessageBottomSheet(chatMessage : ChatMessage) {
-        val reportBottomSheetFragment = ReportBottomSheetFragment.newInstance(
-            reportType = ReportBottomSheetFragment.REPORT_TYPE_MESSAGE,
-            profileName = chatMessage.username ?: "",
-            messageId = chatMessage.id,
-            messageText = chatMessage.text ?: "",
-            groupId = chatMessage.groupId ?: "",
-            userIdBeingReported = chatMessage.userID ?: "",
-            sourceView = this::class.simpleName ?: ""
-        )
-
-        reportBottomSheetFragment.show(childFragmentManager, ReportBottomSheetFragment.TAG)
-    }
-
-    private fun showDeleteConfirmationDialog(chatMessage: ChatMessage) {
-        val context = context
-        if (context != null) {
-            val dialog = HabiticaAlertDialog(context)
-            dialog.setTitle(R.string.confirm_delete_tag_title)
-            dialog.setMessage(R.string.confirm_delete_tag_message)
-            dialog.addButton(R.string.yes, true, true) { _, _ ->
-                lifecycleScope.launchCatching {
-                    socialRepository.deleteMessage(chatMessage)
-                    viewModel.invalidateDataSource()
-                }
-            }
-            dialog.addButton(R.string.no, false)
-            dialog.show()
-        }
-    }
-
-    private fun openProfile() {
-        viewModel.recipientID?.let { FullProfileActivity.open(it) }
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.social
+
+import android.content.ClipData
+import android.content.ClipboardManager
+import android.content.Context
+import android.os.Build
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import androidx.recyclerview.widget.RecyclerView
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.data.SocialRepository
+import com.habitrpg.android.habitica.databinding.FragmentInboxMessageListBinding
+import com.habitrpg.android.habitica.extensions.addOkButton
+import com.habitrpg.android.habitica.helpers.AppConfigManager
+import com.habitrpg.android.habitica.models.social.ChatMessage
+import com.habitrpg.android.habitica.ui.activities.FullProfileActivity
+import com.habitrpg.android.habitica.ui.activities.MainActivity
+import com.habitrpg.android.habitica.ui.adapter.social.InboxAdapter
+import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
+import com.habitrpg.android.habitica.ui.fragments.ReportBottomSheetFragment
+import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
+import com.habitrpg.android.habitica.ui.viewmodels.InboxViewModel
+import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
+import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.Companion.showSnackbar
+import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
+import com.habitrpg.common.habitica.helpers.ExceptionHandler
+import com.habitrpg.common.habitica.helpers.launchCatching
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+import kotlin.time.DurationUnit
+import kotlin.time.toDuration
+
+@AndroidEntryPoint
+class InboxMessageListFragment : BaseMainFragment<FragmentInboxMessageListBinding>() {
+    override var binding: FragmentInboxMessageListBinding? = null
+
+    override fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+    ): FragmentInboxMessageListBinding {
+        return FragmentInboxMessageListBinding.inflate(inflater, container, false)
+    }
+
+    @Inject
+    lateinit var socialRepository: SocialRepository
+
+    @Inject
+    lateinit var configManager: AppConfigManager
+
+    private var chatAdapter: InboxAdapter? = null
+
+    private val viewModel: InboxViewModel by viewModels()
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?,
+    ): View? {
+        this.hidesToolbar = true
+        return super.onCreateView(inflater, container, savedInstanceState)
+    }
+
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
+        showsBackButton = true
+        super.onViewCreated(view, savedInstanceState)
+
+        val layoutManager = androidx.recyclerview.widget.LinearLayoutManager(this.activity)
+        layoutManager.reverseLayout = true
+        layoutManager.stackFromEnd = false
+        binding?.recyclerView?.layoutManager = layoutManager
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            socialRepository.getMember(viewModel.recipientID ?: viewModel.recipientUsername ?: "")
+                .collect {
+                    mainActivity?.title = it?.displayName
+                    chatAdapter?.replyToUser = it
+                }
+        }
+        chatAdapter = InboxAdapter(viewModel.user.value)
+        chatAdapter?.registerAdapterDataObserver(
+            object : RecyclerView.AdapterDataObserver() {
+                override fun onItemRangeInserted(
+                    positionStart: Int,
+                    itemCount: Int,
+                ) {
+                    if (positionStart == 0) {
+                        binding?.recyclerView?.scrollToPosition(0)
+                    }
+                }
+            },
+        )
+        binding?.recyclerView?.adapter = chatAdapter
+        binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
+        chatAdapter?.let { adapter ->
+            adapter.onOpenProfile = {
+                FullProfileActivity.open(it)
+            }
+            adapter.onDeleteMessage = { showDeleteConfirmationDialog(it) }
+            adapter.onFlagMessage = { showFlagMessageBottomSheet(it) }
+            adapter.onCopyMessage = { copyMessageToClipboard(it) }
+        }
+
+        viewModel.messages.observe(viewLifecycleOwner) {
+            markMessagesAsRead(it)
+            chatAdapter?.submitList(it)
+        }
+
+        binding?.chatBarView?.sendAction = { sendMessage(it) }
+        binding?.chatBarView?.maxChatLength = configManager.maxChatLength()
+
+        binding?.chatBarView?.hasAcceptedGuidelines = true
+
+        lifecycleScope.launchCatching {
+            lifecycle.repeatOnLifecycle(Lifecycle.State.RESUMED) {
+                while (true) {
+                    refreshConversation()
+                    delay(30.toDuration(DurationUnit.SECONDS))
+                }
+            }
+        }
+    }
+
+    override fun onResume() {
+        if (viewModel.recipientID?.isNotBlank() != true && viewModel.recipientUsername?.isNotBlank() != true) {
+            parentFragmentManager.popBackStack()
+        }
+        super.onResume()
+    }
+
+    override fun onAttach(context: Context) {
+        view?.invalidate()
+        view?.forceLayout()
+
+        super.onAttach(context)
+    }
+
+    override fun onDestroy() {
+        socialRepository.close()
+        super.onDestroy()
+    }
+
+    override fun onCreateOptionsMenu(
+        menu: Menu,
+        inflater: MenuInflater,
+    ) {
+        this.mainActivity?.menuInflater?.inflate(R.menu.inbox_chat, menu)
+        super.onCreateOptionsMenu(menu, inflater)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+            R.id.open_profile -> {
+                openProfile()
+                return true
+            }
+        }
+        return super.onOptionsItemSelected(item)
+    }
+
+    private fun markMessagesAsRead(messages: List<ChatMessage>) {
+        socialRepository.markSomePrivateMessagesAsRead(viewModel.user.value, messages)
+    }
+
+    private fun refreshConversation() {
+        if (viewModel.memberID?.isNotBlank() != true) {
+            return
+        }
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            socialRepository.retrieveInboxMessages(viewModel.recipientID ?: "", 0)
+            viewModel.invalidateDataSource()
+        }
+    }
+
+    private fun sendMessage(chatText: String) {
+        viewModel.memberID?.let { userID ->
+            lifecycleScope.launch(
+                ExceptionHandler.coroutine { error ->
+                    ExceptionHandler.reportError(error)
+                    binding?.let {
+                        val alert = HabiticaAlertDialog(it.chatBarView.context)
+                        alert.setTitle("You cannot reply to this conversation")
+                        alert.setMessage("This user is unable to receive your private message")
+                        alert.addOkButton()
+                        alert.show()
+                    }
+                    binding?.chatBarView?.message = chatText
+                },
+            ) {
+                socialRepository.postPrivateMessage(userID, chatText)
+                delay(200.toDuration(DurationUnit.MILLISECONDS))
+                viewModel.invalidateDataSource()
+            }
+        }
+    }
+
+    private fun copyMessageToClipboard(chatMessage: ChatMessage) {
+        val clipMan = activity?.getSystemService(Context.CLIPBOARD_SERVICE) as? ClipboardManager
+        val messageText = ClipData.newPlainText("Chat message", chatMessage.text)
+        clipMan?.setPrimaryClip(messageText)
+        val activity = activity as? MainActivity
+        if (activity != null && Build.VERSION.SDK_INT <= Build.VERSION_CODES.S_V2) {
+            showSnackbar(
+                activity.snackbarContainer,
+                getString(R.string.chat_message_copied),
+                HabiticaSnackbar.SnackbarDisplayType.NORMAL,
+            )
+        }
+    }
+
+    private fun showFlagMessageBottomSheet(chatMessage: ChatMessage) {
+        val reportBottomSheetFragment =
+            ReportBottomSheetFragment.newInstance(
+                reportType = ReportBottomSheetFragment.REPORT_TYPE_MESSAGE,
+                profileName = chatMessage.username ?: "",
+                messageId = chatMessage.id,
+                messageText = chatMessage.text ?: "",
+                groupId = chatMessage.groupId ?: "",
+                userIdBeingReported = chatMessage.userID ?: "",
+                sourceView = this::class.simpleName ?: "",
+            )
+
+        reportBottomSheetFragment.show(childFragmentManager, ReportBottomSheetFragment.TAG)
+    }
+
+    private fun showDeleteConfirmationDialog(chatMessage: ChatMessage) {
+        val context = context
+        if (context != null) {
+            val dialog = HabiticaAlertDialog(context)
+            dialog.setTitle(R.string.confirm_delete_tag_title)
+            dialog.setMessage(R.string.confirm_delete_tag_message)
+            dialog.addButton(R.string.yes, true, true) { _, _ ->
+                lifecycleScope.launchCatching {
+                    socialRepository.deleteMessage(chatMessage)
+                    viewModel.invalidateDataSource()
+                }
+            }
+            dialog.addButton(R.string.no, false)
+            dialog.show()
+        }
+    }
+
+    private fun openProfile() {
+        viewModel.recipientID?.let { FullProfileActivity.open(it) }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxOverviewFragment.kt
index 5531346c2..8c9f78db9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxOverviewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxOverviewFragment.kt
@@ -1,208 +1,230 @@
-package com.habitrpg.android.habitica.ui.fragments.social
-
-import android.content.Context
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
-import android.view.View
-import android.view.ViewGroup
-import android.widget.TextView
-import androidx.lifecycle.lifecycleScope
-import com.habitrpg.android.habitica.BuildConfig
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.data.SocialRepository
-import com.habitrpg.android.habitica.databinding.DialogChooseMessageRecipientBinding
-import com.habitrpg.android.habitica.databinding.FragmentInboxBinding
-import com.habitrpg.android.habitica.extensions.getAgoString
-import com.habitrpg.android.habitica.helpers.AppConfigManager
-import com.habitrpg.common.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.models.members.Member
-import com.habitrpg.android.habitica.models.social.InboxConversation
-import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
-import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard
-import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
-import com.habitrpg.android.habitica.ui.views.UsernameLabel
-import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import com.habitrpg.common.habitica.helpers.ExceptionHandler
-import com.habitrpg.common.habitica.helpers.launchCatching
-import com.habitrpg.common.habitica.views.AvatarView
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class InboxOverviewFragment : BaseMainFragment<FragmentInboxBinding>(), androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener, View.OnClickListener {
-
-    @Inject
-    lateinit var socialRepository: SocialRepository
-
-    @Inject
-    lateinit var configManager: AppConfigManager
-
-    @Inject
-    lateinit var userViewModel: MainUserViewModel
-
-    override var binding: FragmentInboxBinding? = null
-
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentInboxBinding {
-        return FragmentInboxBinding.inflate(inflater, container, false)
-    }
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        this.hidesToolbar = true
-        lifecycleScope.launchCatching {
-            socialRepository.markPrivateMessagesRead(null)
-        }
-        return super.onCreateView(inflater, container, savedInstanceState)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding?.inboxRefreshLayout?.setOnRefreshListener(this)
-
-        userViewModel.user.observe(viewLifecycleOwner) {
-            binding?.optOutView?.visibility = if (it?.inbox?.optOut == true) View.VISIBLE else View.GONE
-        }
-
-        loadMessages()
-        retrieveMessages()
-    }
-
-    private fun loadMessages() {
-        lifecycleScope.launch(ExceptionHandler.coroutine()) {
-            socialRepository.getInboxConversations().collect {
-                setInboxMessages(it)
-            }
-        }
-    }
-
-    override fun onDestroy() {
-        socialRepository.close()
-        super.onDestroy()
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        this.mainActivity?.menuInflater?.inflate(R.menu.inbox, menu)
-        val item = menu.findItem(R.id.send_message)
-        tintMenuIcon(item)
-        super.onCreateOptionsMenu(menu, inflater)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            R.id.send_message -> {
-                openNewMessageDialog()
-                return true
-            }
-        }
-        return super.onOptionsItemSelected(item)
-    }
-
-    private fun openNewMessageDialog() {
-        if (BuildConfig.DEBUG && this.mainActivity == null) {
-            error("Assertion failed")
-        }
-        val binding = DialogChooseMessageRecipientBinding.inflate(layoutInflater)
-        this.mainActivity?.let { thisActivity ->
-            val alert = HabiticaAlertDialog(thisActivity)
-            alert.setTitle(getString(R.string.choose_recipient_title))
-            alert.addButton(
-                getString(R.string.action_continue),
-                true,
-                isDestructive = false,
-                autoDismiss = false
-            ) { _, _ ->
-                binding.errorTextView.visibility = View.GONE
-                binding.progressCircular.visibility = View.VISIBLE
-                val username = binding.uuidEditText.text?.toString() ?: ""
-                lifecycleScope.launch(ExceptionHandler.coroutine()) {
-                    var member: Member? = null
-                    try {
-                        member = socialRepository.retrieveMember(username, false)
-                    } finally {
-                        if (member != null) {
-                            alert.dismiss()
-                            openInboxMessages("", username)
-                            binding.progressCircular.visibility = View.GONE
-                        } else {
-                            binding.errorTextView.visibility = View.VISIBLE
-                            binding.progressCircular.visibility = View.GONE
-                        }
-                    }
-                }
-            }
-            alert.addButton(getString(R.string.action_cancel), false) { _, _ ->
-                thisActivity.dismissKeyboard()
-            }
-            alert.setAdditionalContentView(binding.root)
-            binding.uuidEditText.requestFocus()
-            alert.show()
-        }
-    }
-
-    private fun retrieveMessages() {
-        lifecycleScope.launchCatching {
-            socialRepository.retrieveInboxConversations()
-            binding?.inboxRefreshLayout?.isRefreshing = false
-        }
-    }
-
-    override fun onRefresh() {
-        binding?.inboxRefreshLayout?.isRefreshing = true
-        retrieveMessages()
-    }
-
-    private fun setInboxMessages(messages: List<InboxConversation>) {
-        if (binding?.inboxMessages == null) {
-            return
-        }
-
-        binding?.inboxMessages?.removeAllViewsInLayout()
-
-        val inflater = context?.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as? LayoutInflater
-        if (messages.isNotEmpty()) {
-            for (message in messages) {
-                val entry = inflater?.inflate(R.layout.item_inbox_overview, binding?.inboxMessages, false)
-                val avatarView = entry?.findViewById(R.id.avatar_view) as? AvatarView
-                message.userStyles?.let { avatarView?.setAvatar(it) }
-                val displayNameTextView = entry?.findViewById(R.id.display_name_textview) as? UsernameLabel
-                displayNameTextView?.username = message.user
-                displayNameTextView?.tier = message.contributor?.level ?: 0
-                val timestampTextView = entry?.findViewById(R.id.timestamp_textview) as? TextView
-                timestampTextView?.text = message.timestamp?.getAgoString(resources)
-                val usernameTextView = entry?.findViewById(R.id.username_textview) as? TextView
-                if (message.username?.isNotEmpty() == true) {
-                    usernameTextView?.text = message.formattedUsername
-                    usernameTextView?.visibility = View.VISIBLE
-                } else {
-                    usernameTextView?.visibility = View.GONE
-                }
-                val messageTextView = entry?.findViewById(R.id.message_textview) as? TextView
-                messageTextView?.text = message.text
-                entry?.tag = message.uuid
-                entry?.setOnClickListener(this)
-                binding?.inboxMessages?.addView(entry)
-            }
-        } else {
-            val tv = TextView(context)
-            tv.setText(R.string.empty_inbox)
-        }
-    }
-
-    override fun onClick(v: View) {
-        val displaynameView = v.findViewById(R.id.display_name_textview) as? UsernameLabel
-        val replyToUserName = displaynameView?.username ?: ""
-        openInboxMessages(v.tag.toString(), replyToUserName)
-    }
-
-    private fun openInboxMessages(userID: String, username: String) {
-        MainNavigationController.navigate(InboxOverviewFragmentDirections.openInboxDetail(userID, username))
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.social
+
+import android.content.Context
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.lifecycle.lifecycleScope
+import com.habitrpg.android.habitica.BuildConfig
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.data.SocialRepository
+import com.habitrpg.android.habitica.databinding.DialogChooseMessageRecipientBinding
+import com.habitrpg.android.habitica.databinding.FragmentInboxBinding
+import com.habitrpg.android.habitica.extensions.getAgoString
+import com.habitrpg.android.habitica.helpers.AppConfigManager
+import com.habitrpg.android.habitica.models.members.Member
+import com.habitrpg.android.habitica.models.social.InboxConversation
+import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
+import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard
+import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
+import com.habitrpg.android.habitica.ui.views.UsernameLabel
+import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
+import com.habitrpg.common.habitica.helpers.ExceptionHandler
+import com.habitrpg.common.habitica.helpers.MainNavigationController
+import com.habitrpg.common.habitica.helpers.launchCatching
+import com.habitrpg.common.habitica.views.AvatarView
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class InboxOverviewFragment :
+    BaseMainFragment<FragmentInboxBinding>(),
+    androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener,
+    View.OnClickListener {
+    @Inject
+    lateinit var socialRepository: SocialRepository
+
+    @Inject
+    lateinit var configManager: AppConfigManager
+
+    @Inject
+    lateinit var userViewModel: MainUserViewModel
+
+    override var binding: FragmentInboxBinding? = null
+
+    override fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+    ): FragmentInboxBinding {
+        return FragmentInboxBinding.inflate(inflater, container, false)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?,
+    ): View? {
+        this.hidesToolbar = true
+        lifecycleScope.launchCatching {
+            socialRepository.markPrivateMessagesRead(null)
+        }
+        return super.onCreateView(inflater, container, savedInstanceState)
+    }
+
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
+        super.onViewCreated(view, savedInstanceState)
+
+        binding?.inboxRefreshLayout?.setOnRefreshListener(this)
+
+        userViewModel.user.observe(viewLifecycleOwner) {
+            binding?.optOutView?.visibility =
+                if (it?.inbox?.optOut == true) View.VISIBLE else View.GONE
+        }
+
+        loadMessages()
+        retrieveMessages()
+    }
+
+    private fun loadMessages() {
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            socialRepository.getInboxConversations().collect {
+                setInboxMessages(it)
+            }
+        }
+    }
+
+    override fun onDestroy() {
+        socialRepository.close()
+        super.onDestroy()
+    }
+
+    override fun onCreateOptionsMenu(
+        menu: Menu,
+        inflater: MenuInflater,
+    ) {
+        this.mainActivity?.menuInflater?.inflate(R.menu.inbox, menu)
+        val item = menu.findItem(R.id.send_message)
+        tintMenuIcon(item)
+        super.onCreateOptionsMenu(menu, inflater)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+            R.id.send_message -> {
+                openNewMessageDialog()
+                return true
+            }
+        }
+        return super.onOptionsItemSelected(item)
+    }
+
+    private fun openNewMessageDialog() {
+        if (BuildConfig.DEBUG && this.mainActivity == null) {
+            error("Assertion failed")
+        }
+        val binding = DialogChooseMessageRecipientBinding.inflate(layoutInflater)
+        this.mainActivity?.let { thisActivity ->
+            val alert = HabiticaAlertDialog(thisActivity)
+            alert.setTitle(getString(R.string.choose_recipient_title))
+            alert.addButton(
+                getString(R.string.action_continue),
+                true,
+                isDestructive = false,
+                autoDismiss = false,
+            ) { _, _ ->
+                binding.errorTextView.visibility = View.GONE
+                binding.progressCircular.visibility = View.VISIBLE
+                val username = binding.uuidEditText.text?.toString() ?: ""
+                lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                    var member: Member? = null
+                    try {
+                        member = socialRepository.retrieveMember(username, false)
+                    } finally {
+                        if (member != null) {
+                            alert.dismiss()
+                            openInboxMessages("", username)
+                            binding.progressCircular.visibility = View.GONE
+                        } else {
+                            binding.errorTextView.visibility = View.VISIBLE
+                            binding.progressCircular.visibility = View.GONE
+                        }
+                    }
+                }
+            }
+            alert.addButton(getString(R.string.action_cancel), false) { _, _ ->
+                thisActivity.dismissKeyboard()
+            }
+            alert.setAdditionalContentView(binding.root)
+            binding.uuidEditText.requestFocus()
+            alert.show()
+        }
+    }
+
+    private fun retrieveMessages() {
+        lifecycleScope.launchCatching {
+            socialRepository.retrieveInboxConversations()
+            binding?.inboxRefreshLayout?.isRefreshing = false
+        }
+    }
+
+    override fun onRefresh() {
+        binding?.inboxRefreshLayout?.isRefreshing = true
+        retrieveMessages()
+    }
+
+    private fun setInboxMessages(messages: List<InboxConversation>) {
+        if (binding?.inboxMessages == null) {
+            return
+        }
+
+        binding?.inboxMessages?.removeAllViewsInLayout()
+
+        val inflater = context?.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as? LayoutInflater
+        if (messages.isNotEmpty()) {
+            for (message in messages) {
+                val entry =
+                    inflater?.inflate(R.layout.item_inbox_overview, binding?.inboxMessages, false)
+                val avatarView = entry?.findViewById(R.id.avatar_view) as? AvatarView
+                message.userStyles?.let { avatarView?.setAvatar(it) }
+                val displayNameTextView =
+                    entry?.findViewById(R.id.display_name_textview) as? UsernameLabel
+                displayNameTextView?.username = message.user
+                displayNameTextView?.tier = message.contributor?.level ?: 0
+                val timestampTextView = entry?.findViewById(R.id.timestamp_textview) as? TextView
+                timestampTextView?.text = message.timestamp?.getAgoString(resources)
+                val usernameTextView = entry?.findViewById(R.id.username_textview) as? TextView
+                if (message.username?.isNotEmpty() == true) {
+                    usernameTextView?.text = message.formattedUsername
+                    usernameTextView?.visibility = View.VISIBLE
+                } else {
+                    usernameTextView?.visibility = View.GONE
+                }
+                val messageTextView = entry?.findViewById(R.id.message_textview) as? TextView
+                messageTextView?.text = message.text
+                entry?.tag = message.uuid
+                entry?.setOnClickListener(this)
+                binding?.inboxMessages?.addView(entry)
+            }
+        } else {
+            val tv = TextView(context)
+            tv.setText(R.string.empty_inbox)
+        }
+    }
+
+    override fun onClick(v: View) {
+        val displaynameView = v.findViewById(R.id.display_name_textview) as? UsernameLabel
+        val replyToUserName = displaynameView?.username ?: ""
+        openInboxMessages(v.tag.toString(), replyToUserName)
+    }
+
+    private fun openInboxMessages(
+        userID: String,
+        username: String,
+    ) {
+        MainNavigationController.navigate(
+            InboxOverviewFragmentDirections.openInboxDetail(
+                userID,
+                username,
+            ),
+        )
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/PartyChatFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/PartyChatFragment.kt
index 374a3a1ab..ea3d3a49c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/PartyChatFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/PartyChatFragment.kt
@@ -5,6 +5,6 @@ import com.habitrpg.android.habitica.ui.viewmodels.PartyViewModel
 
 class PartyChatFragment : ChatFragment() {
     override val viewModel: PartyViewModel by viewModels(
-        ownerProducer = { requireParentFragment() }
+        ownerProducer = { requireParentFragment() },
     )
 }
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 e9e7bda81..dbc0173d6 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
@@ -39,7 +39,6 @@ import javax.inject.Inject
 
 @AndroidEntryPoint
 class QuestDetailFragment : BaseMainFragment<FragmentQuestDetailBinding>() {
-
     @Inject
     lateinit var socialRepository: SocialRepository
 
@@ -53,7 +52,7 @@ class QuestDetailFragment : BaseMainFragment<FragmentQuestDetailBinding>() {
 
     override fun createBinding(
         inflater: LayoutInflater,
-        container: ViewGroup?
+        container: ViewGroup?,
     ): FragmentQuestDetailBinding {
         return FragmentQuestDetailBinding.inflate(inflater, container, false)
     }
@@ -68,13 +67,16 @@ class QuestDetailFragment : BaseMainFragment<FragmentQuestDetailBinding>() {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View? {
         this.hidesToolbar = true
         return super.onCreateView(inflater, container, savedInstanceState)
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
         showsBackButton = true
         super.onViewCreated(view, savedInstanceState)
 
@@ -148,7 +150,7 @@ class QuestDetailFragment : BaseMainFragment<FragmentQuestDetailBinding>() {
         // We need to do this, because the quest description can contain markdown AND HTML.
         binding?.descriptionView?.setText(
             MarkdownParser.parseMarkdown(questContent.notes).toHtml().fromHtml(),
-            TextView.BufferType.SPANNABLE
+            TextView.BufferType.SPANNABLE,
         )
 
         binding?.questScrollImageView?.loadImage("inventory_quest_scroll_" + questContent.key)
@@ -178,26 +180,28 @@ class QuestDetailFragment : BaseMainFragment<FragmentQuestDetailBinding>() {
                             statusTextView?.setTextColor(
                                 ContextCompat.getColor(
                                     it,
-                                    R.color.text_ternary
-                                )
+                                    R.color.text_ternary,
+                                ),
                             )
                         }
+
                         true -> {
                             statusTextView?.setText(R.string.accepted)
                             statusTextView?.setTextColor(
                                 ContextCompat.getColor(
                                     it,
-                                    R.color.text_green
-                                )
+                                    R.color.text_green,
+                                ),
                             )
                         }
+
                         else -> {
                             statusTextView?.setText(R.string.declined)
                             statusTextView?.setTextColor(
                                 ContextCompat.getColor(
                                     it,
-                                    R.color.text_red
-                                )
+                                    R.color.text_red,
+                                ),
                             )
                         }
                     }
@@ -256,17 +260,18 @@ class QuestDetailFragment : BaseMainFragment<FragmentQuestDetailBinding>() {
         HapticFeedbackManager.tap(requireView())
         context?.let {
             if (isQuestActive) {
-                val builder = AlertDialog.Builder(activity)
-                    .setMessage(R.string.quest_abort_message)
-                    .setPositiveButton(R.string.yes) { _, _ ->
-                        party?.id?.let { partyID ->
-                            lifecycleScope.launchCatching {
-                                socialRepository.abortQuest(partyID)
-                                userRepository.retrieveUser(true)
-                                activity?.supportFragmentManager?.popBackStack()
+                val builder =
+                    AlertDialog.Builder(activity)
+                        .setMessage(R.string.quest_abort_message)
+                        .setPositiveButton(R.string.yes) { _, _ ->
+                            party?.id?.let { partyID ->
+                                lifecycleScope.launchCatching {
+                                    socialRepository.abortQuest(partyID)
+                                    userRepository.retrieveUser(true)
+                                    activity?.supportFragmentManager?.popBackStack()
+                                }
                             }
-                        }
-                    }.setNegativeButton(R.string.no) { _, _ -> }
+                        }.setNegativeButton(R.string.no) { _, _ -> }
                 builder.show()
             } else {
                 val alert = HabiticaAlertDialog(it)
@@ -288,18 +293,19 @@ class QuestDetailFragment : BaseMainFragment<FragmentQuestDetailBinding>() {
 
     private fun onQuestLeave() {
         HapticFeedbackManager.tap(requireView())
-        val builder = AlertDialog.Builder(activity)
-            .setMessage(if (quest?.active == true) R.string.quest_leave_message else R.string.quest_leave_message_nostart)
-            .setPositiveButton(R.string.yes) { _, _ ->
-                party?.id?.let { partyID ->
-                    lifecycleScope.launchCatching {
-                        socialRepository.leaveQuest(partyID)
-                        socialRepository.retrieveGroup(partyID)
-                        userRepository.retrieveUser(true)
-                        activity?.supportFragmentManager?.popBackStack()
+        val builder =
+            AlertDialog.Builder(activity)
+                .setMessage(if (quest?.active == true) R.string.quest_leave_message else R.string.quest_leave_message_nostart)
+                .setPositiveButton(R.string.yes) { _, _ ->
+                    party?.id?.let { partyID ->
+                        lifecycleScope.launchCatching {
+                            socialRepository.leaveQuest(partyID)
+                            socialRepository.retrieveGroup(partyID)
+                            userRepository.retrieveUser(true)
+                            activity?.supportFragmentManager?.popBackStack()
+                        }
                     }
-                }
-            }.setNegativeButton(R.string.no) { _, _ -> }
+                }.setNegativeButton(R.string.no) { _, _ -> }
         builder.show()
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailFragment.kt
index 0d78d7b72..290c19224 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailFragment.kt
@@ -19,7 +19,6 @@ import com.habitrpg.android.habitica.databinding.DialogChallengeDetailTaskGroupB
 import com.habitrpg.android.habitica.databinding.FragmentChallengeDetailBinding
 import com.habitrpg.android.habitica.extensions.addCloseButton
 import com.habitrpg.android.habitica.extensions.inflate
-import com.habitrpg.common.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.models.social.Challenge
 import com.habitrpg.android.habitica.models.tasks.Task
@@ -36,6 +35,7 @@ import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.common.habitica.helpers.EmojiParser
 import com.habitrpg.common.habitica.helpers.ExceptionHandler
+import com.habitrpg.common.habitica.helpers.MainNavigationController
 import com.habitrpg.common.habitica.helpers.launchCatching
 import com.habitrpg.common.habitica.helpers.setMarkdown
 import com.habitrpg.shared.habitica.models.tasks.TaskType
@@ -47,7 +47,6 @@ import javax.inject.Inject
 
 @AndroidEntryPoint
 class ChallengeDetailFragment : BaseMainFragment<FragmentChallengeDetailBinding>() {
-
     @Inject
     lateinit var challengeRepository: ChallengeRepository
 
@@ -59,7 +58,10 @@ class ChallengeDetailFragment : BaseMainFragment<FragmentChallengeDetailBinding>
 
     override var binding: FragmentChallengeDetailBinding? = null
 
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentChallengeDetailBinding {
+    override fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+    ): FragmentChallengeDetailBinding {
         return FragmentChallengeDetailBinding.inflate(inflater, container, false)
     }
 
@@ -70,14 +72,17 @@ class ChallengeDetailFragment : BaseMainFragment<FragmentChallengeDetailBinding>
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View? {
         this.hidesToolbar = true
         return super.onCreateView(inflater, container, savedInstanceState)
     }
 
     @Suppress("ReturnCount")
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
         showsBackButton = true
         super.onViewCreated(view, savedInstanceState)
 
@@ -164,7 +169,10 @@ class ChallengeDetailFragment : BaseMainFragment<FragmentChallengeDetailBinding>
         refresh()
     }
 
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+    override fun onCreateOptionsMenu(
+        menu: Menu,
+        inflater: MenuInflater,
+    ) {
         super.onCreateOptionsMenu(menu, inflater)
         inflater.inflate(R.menu.menu_challenge_details, menu)
         val editMenuItem = menu.findItem(R.id.action_edit)
@@ -185,17 +193,29 @@ class ChallengeDetailFragment : BaseMainFragment<FragmentChallengeDetailBinding>
                 startActivity(intent)
                 return true
             }
+
             R.id.action_share -> {
-                val shareGuildIntent = Intent().apply {
-                    action = Intent.ACTION_SEND
-                    putExtra(Intent.EXTRA_TEXT, "${context?.getString(R.string.base_url)}/challenges/$challengeID")
-                    type = "text/plain"
-                }
-                startActivity(Intent.createChooser(shareGuildIntent, context?.getString(R.string.share_challenge_with)))
+                val shareGuildIntent =
+                    Intent().apply {
+                        action = Intent.ACTION_SEND
+                        putExtra(
+                            Intent.EXTRA_TEXT,
+                            "${context?.getString(R.string.base_url)}/challenges/$challengeID",
+                        )
+                        type = "text/plain"
+                    }
+                startActivity(
+                    Intent.createChooser(
+                        shareGuildIntent,
+                        context?.getString(R.string.share_challenge_with),
+                    ),
+                )
             }
+
             R.id.action_end_challenge -> {
                 showEndChallengeDialog()
             }
+
             R.id.action_report -> {
                 showReportChallengeBottomSheet()
             }
@@ -212,7 +232,11 @@ class ChallengeDetailFragment : BaseMainFragment<FragmentChallengeDetailBinding>
         dialog.addButton(R.string.open_website, true, false) { _, _ ->
             val uriUrl = "https://habitica.com/challenges/$challengeID".toUri()
             val launchBrowser = Intent(Intent.ACTION_VIEW, uriUrl)
-            val l = context.packageManager.queryIntentActivities(launchBrowser, PackageManager.MATCH_DEFAULT_ONLY)
+            val l =
+                context.packageManager.queryIntentActivities(
+                    launchBrowser,
+                    PackageManager.MATCH_DEFAULT_ONLY,
+                )
             val notHabitica = l.firstOrNull { !it.activityInfo.processName.contains("habitica") }
             if (notHabitica != null) {
                 launchBrowser.setPackage(notHabitica.activityInfo.processName)
@@ -224,14 +248,20 @@ class ChallengeDetailFragment : BaseMainFragment<FragmentChallengeDetailBinding>
     }
 
     private fun showReportChallengeBottomSheet() {
-        val reportBottomSheetFragment = ReportBottomSheetFragment.newInstance(
-            reportType = ReportBottomSheetFragment.REPORT_TYPE_CHALLENGE,
-            challengeBeingReported = challengeID ?: "",
-            displayName = challenge?.name ?: "",
-            sourceView = this::class.simpleName ?: ""
-        )
+        val reportBottomSheetFragment =
+            ReportBottomSheetFragment.newInstance(
+                reportType = ReportBottomSheetFragment.REPORT_TYPE_CHALLENGE,
+                challengeBeingReported = challengeID ?: "",
+                displayName = challenge?.name ?: "",
+                sourceView = this::class.simpleName ?: "",
+            )
 
-        activity?.supportFragmentManager?.let { reportBottomSheetFragment.show(it, ReportBottomSheetFragment.TAG) }
+        activity?.supportFragmentManager?.let {
+            reportBottomSheetFragment.show(
+                it,
+                ReportBottomSheetFragment.TAG,
+            )
+        }
     }
 
     private fun refresh() {
@@ -276,8 +306,14 @@ class ChallengeDetailFragment : BaseMainFragment<FragmentChallengeDetailBinding>
     }
 
     private fun addHabits(habits: ArrayList<Task>) {
-        val groupBinding = DialogChallengeDetailTaskGroupBinding.inflate(layoutInflater, binding?.taskGroupLayout, true)
-        groupBinding.taskGroupName.text = getLabelByTypeAndCount(Challenge.TASK_ORDER_HABITS, habits.size)
+        val groupBinding =
+            DialogChallengeDetailTaskGroupBinding.inflate(
+                layoutInflater,
+                binding?.taskGroupLayout,
+                true,
+            )
+        groupBinding.taskGroupName.text =
+            getLabelByTypeAndCount(Challenge.TASK_ORDER_HABITS, habits.size)
         groupBinding.taskCountView.text = habits.size.toString()
         for (i in 0 until habits.size) {
             val task = habits[i]
@@ -290,8 +326,14 @@ class ChallengeDetailFragment : BaseMainFragment<FragmentChallengeDetailBinding>
     }
 
     private fun addDailys(dailies: ArrayList<Task>) {
-        val groupBinding = DialogChallengeDetailTaskGroupBinding.inflate(layoutInflater, binding?.taskGroupLayout, true)
-        groupBinding.taskGroupName.text = getLabelByTypeAndCount(Challenge.TASK_ORDER_DAILYS, dailies.size)
+        val groupBinding =
+            DialogChallengeDetailTaskGroupBinding.inflate(
+                layoutInflater,
+                binding?.taskGroupLayout,
+                true,
+            )
+        groupBinding.taskGroupName.text =
+            getLabelByTypeAndCount(Challenge.TASK_ORDER_DAILYS, dailies.size)
         groupBinding.taskCountView.text = dailies.size.toString()
 
         for (i in 0 until dailies.size) {
@@ -305,8 +347,14 @@ class ChallengeDetailFragment : BaseMainFragment<FragmentChallengeDetailBinding>
     }
 
     private fun addTodos(todos: ArrayList<Task>) {
-        val groupBinding = DialogChallengeDetailTaskGroupBinding.inflate(layoutInflater, binding?.taskGroupLayout, true)
-        groupBinding.taskGroupName.text = getLabelByTypeAndCount(Challenge.TASK_ORDER_TODOS, todos.size)
+        val groupBinding =
+            DialogChallengeDetailTaskGroupBinding.inflate(
+                layoutInflater,
+                binding?.taskGroupLayout,
+                true,
+            )
+        groupBinding.taskGroupName.text =
+            getLabelByTypeAndCount(Challenge.TASK_ORDER_TODOS, todos.size)
         groupBinding.taskCountView.text = todos.size.toString()
 
         for (i in 0 until todos.size) {
@@ -320,8 +368,14 @@ class ChallengeDetailFragment : BaseMainFragment<FragmentChallengeDetailBinding>
     }
 
     private fun addRewards(rewards: ArrayList<Task>) {
-        val groupBinding = DialogChallengeDetailTaskGroupBinding.inflate(layoutInflater, binding?.taskGroupLayout, true)
-        groupBinding.taskGroupName.text = getLabelByTypeAndCount(Challenge.TASK_ORDER_REWARDS, rewards.size)
+        val groupBinding =
+            DialogChallengeDetailTaskGroupBinding.inflate(
+                layoutInflater,
+                binding?.taskGroupLayout,
+                true,
+            )
+        groupBinding.taskGroupName.text =
+            getLabelByTypeAndCount(Challenge.TASK_ORDER_REWARDS, rewards.size)
         groupBinding.taskCountView.text = rewards.size.toString()
 
         for (i in 0 until rewards.size) {
@@ -334,7 +388,10 @@ class ChallengeDetailFragment : BaseMainFragment<FragmentChallengeDetailBinding>
         }
     }
 
-    private fun getLabelByTypeAndCount(type: String, count: Int): String {
+    private fun getLabelByTypeAndCount(
+        type: String,
+        count: Int,
+    ): String {
         return when (type) {
             Challenge.TASK_ORDER_DAILYS -> context?.getString(if (count == 1) R.string.daily else R.string.dailies)
             Challenge.TASK_ORDER_HABITS -> context?.getString(if (count == 1) R.string.habit else R.string.habits)
@@ -354,7 +411,11 @@ class ChallengeDetailFragment : BaseMainFragment<FragmentChallengeDetailBinding>
                 challengeRepository.leaveChallenge(challenge, "keep-all")
             }
         }
-        alert.addButton(R.string.leave_delete_tasks, isPrimary = false, isDestructive = true) { _, _ ->
+        alert.addButton(
+            R.string.leave_delete_tasks,
+            isPrimary = false,
+            isDestructive = true,
+        ) { _, _ ->
             val challenge = challenge ?: return@addButton
             lifecycleScope.launchCatching {
                 challengeRepository.leaveChallenge(challenge, "remove-all")
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeFilterDialogHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeFilterDialogHolder.kt
index 8559d0e0c..5520870d1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeFilterDialogHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeFilterDialogHolder.kt
@@ -1,90 +1,97 @@
-package com.habitrpg.android.habitica.ui.fragments.social.challenges
-
-import android.app.Activity
-import android.view.View
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.databinding.DialogChallengeFilterBinding
-import com.habitrpg.android.habitica.models.social.Group
-import com.habitrpg.android.habitica.ui.adapter.social.challenges.ChallengesFilterRecyclerViewAdapter
-import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaBottomSheetDialog
-
-internal class ChallengeFilterDialogHolder private constructor(
-    view: View,
-    private val context: Activity
-) {
-    private val binding = DialogChallengeFilterBinding.bind(view)
-
-    private var filterGroups: List<Group> = emptyList()
-    private var currentFilter: ChallengeFilterOptions? = null
-    private var selectedGroupsCallback: ((ChallengeFilterOptions) -> Unit)? = null
-    private var adapter: ChallengesFilterRecyclerViewAdapter? = null
-
-    init {
-        binding.challengeFilterButtonAll.setOnClickListener { allClicked() }
-        binding.challengeFilterButtonNone.setOnClickListener { noneClicked() }
-        binding.challengeFilterOwned.setOnCheckedChangeListener { _, isChecked ->
-            currentFilter?.showOwned = isChecked
-        }
-        binding.challengeFilterNotOwned.setOnCheckedChangeListener { _, isChecked ->
-            currentFilter?.notOwned = isChecked
-        }
-    }
-
-    fun bind(
-        filterGroups: List<Group>,
-        currentFilter: ChallengeFilterOptions?,
-        selectedGroupsCallback: ((ChallengeFilterOptions) -> Unit)?
-    ) {
-        this.filterGroups = filterGroups
-        this.currentFilter = currentFilter
-        this.selectedGroupsCallback = selectedGroupsCallback
-        fillChallengeGroups()
-
-        if (currentFilter != null) {
-            binding.challengeFilterOwned.isChecked = currentFilter.showOwned
-            binding.challengeFilterNotOwned.isChecked = currentFilter.notOwned
-        }
-    }
-
-    private fun fillChallengeGroups() {
-        binding.challengeFilterRecyclerView.layoutManager = LinearLayoutManager(context)
-        adapter = ChallengesFilterRecyclerViewAdapter(filterGroups)
-        currentFilter?.let { currentFilter ->
-            adapter?.checkedEntries?.addAll(currentFilter.showByGroups)
-        }
-
-        binding.challengeFilterRecyclerView.adapter = adapter
-    }
-
-    private fun allClicked() {
-        this.adapter?.checkedEntries?.clear()
-        adapter?.checkedEntries?.addAll(filterGroups)
-    }
-
-    private fun noneClicked() {
-        this.adapter?.checkedEntries?.clear()
-    }
-
-    companion object {
-        fun showDialog(
-            activity: Activity,
-            filterGroups: List<Group>,
-            currentFilter: ChallengeFilterOptions?,
-            selectedGroupsCallback: ((ChallengeFilterOptions) -> Unit)
-        ) {
-            val dialogLayout = activity.layoutInflater.inflate(R.layout.dialog_challenge_filter, null)
-
-            val holder = ChallengeFilterDialogHolder(dialogLayout, activity)
-
-            val sheet = HabiticaBottomSheetDialog(activity)
-            sheet.setContentView(dialogLayout)
-            sheet.setOnDismissListener {
-                selectedGroupsCallback(ChallengeFilterOptions(holder.adapter?.checkedEntries ?: emptyList(), holder.binding.challengeFilterOwned.isChecked, holder.binding.challengeFilterNotOwned.isChecked))
-            }
-
-            holder.bind(filterGroups, currentFilter, selectedGroupsCallback)
-            sheet.show()
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.social.challenges
+
+import android.app.Activity
+import android.view.View
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.DialogChallengeFilterBinding
+import com.habitrpg.android.habitica.models.social.Group
+import com.habitrpg.android.habitica.ui.adapter.social.challenges.ChallengesFilterRecyclerViewAdapter
+import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaBottomSheetDialog
+
+internal class ChallengeFilterDialogHolder private constructor(
+    view: View,
+    private val context: Activity,
+) {
+    private val binding = DialogChallengeFilterBinding.bind(view)
+
+    private var filterGroups: List<Group> = emptyList()
+    private var currentFilter: ChallengeFilterOptions? = null
+    private var selectedGroupsCallback: ((ChallengeFilterOptions) -> Unit)? = null
+    private var adapter: ChallengesFilterRecyclerViewAdapter? = null
+
+    init {
+        binding.challengeFilterButtonAll.setOnClickListener { allClicked() }
+        binding.challengeFilterButtonNone.setOnClickListener { noneClicked() }
+        binding.challengeFilterOwned.setOnCheckedChangeListener { _, isChecked ->
+            currentFilter?.showOwned = isChecked
+        }
+        binding.challengeFilterNotOwned.setOnCheckedChangeListener { _, isChecked ->
+            currentFilter?.notOwned = isChecked
+        }
+    }
+
+    fun bind(
+        filterGroups: List<Group>,
+        currentFilter: ChallengeFilterOptions?,
+        selectedGroupsCallback: ((ChallengeFilterOptions) -> Unit)?,
+    ) {
+        this.filterGroups = filterGroups
+        this.currentFilter = currentFilter
+        this.selectedGroupsCallback = selectedGroupsCallback
+        fillChallengeGroups()
+
+        if (currentFilter != null) {
+            binding.challengeFilterOwned.isChecked = currentFilter.showOwned
+            binding.challengeFilterNotOwned.isChecked = currentFilter.notOwned
+        }
+    }
+
+    private fun fillChallengeGroups() {
+        binding.challengeFilterRecyclerView.layoutManager = LinearLayoutManager(context)
+        adapter = ChallengesFilterRecyclerViewAdapter(filterGroups)
+        currentFilter?.let { currentFilter ->
+            adapter?.checkedEntries?.addAll(currentFilter.showByGroups)
+        }
+
+        binding.challengeFilterRecyclerView.adapter = adapter
+    }
+
+    private fun allClicked() {
+        this.adapter?.checkedEntries?.clear()
+        adapter?.checkedEntries?.addAll(filterGroups)
+    }
+
+    private fun noneClicked() {
+        this.adapter?.checkedEntries?.clear()
+    }
+
+    companion object {
+        fun showDialog(
+            activity: Activity,
+            filterGroups: List<Group>,
+            currentFilter: ChallengeFilterOptions?,
+            selectedGroupsCallback: ((ChallengeFilterOptions) -> Unit),
+        ) {
+            val dialogLayout =
+                activity.layoutInflater.inflate(R.layout.dialog_challenge_filter, null)
+
+            val holder = ChallengeFilterDialogHolder(dialogLayout, activity)
+
+            val sheet = HabiticaBottomSheetDialog(activity)
+            sheet.setContentView(dialogLayout)
+            sheet.setOnDismissListener {
+                selectedGroupsCallback(
+                    ChallengeFilterOptions(
+                        holder.adapter?.checkedEntries ?: emptyList(),
+                        holder.binding.challengeFilterOwned.isChecked,
+                        holder.binding.challengeFilterNotOwned.isChecked,
+                    ),
+                )
+            }
+
+            holder.bind(filterGroups, currentFilter, selectedGroupsCallback)
+            sheet.show()
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeFilterOptions.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeFilterOptions.kt
index ed7d3f443..18e3874ea 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeFilterOptions.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeFilterOptions.kt
@@ -1,9 +1,9 @@
-package com.habitrpg.android.habitica.ui.fragments.social.challenges
-
-import com.habitrpg.android.habitica.models.social.Group
-
-data class ChallengeFilterOptions(
-    var showByGroups: List<Group>,
-    var showOwned: Boolean = false,
-    var notOwned: Boolean = false
-)
+package com.habitrpg.android.habitica.ui.fragments.social.challenges
+
+import com.habitrpg.android.habitica.models.social.Group
+
+data class ChallengeFilterOptions(
+    var showByGroups: List<Group>,
+    var showOwned: Boolean = false,
+    var notOwned: Boolean = false,
+)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.kt
index 9ba0520f2..3537bdb7a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.kt
@@ -1,191 +1,200 @@
-package com.habitrpg.android.habitica.ui.fragments.social.challenges
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.lifecycle.lifecycleScope
-import androidx.recyclerview.widget.RecyclerView
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.data.ChallengeRepository
-import com.habitrpg.android.habitica.data.SocialRepository
-import com.habitrpg.android.habitica.data.UserRepository
-import com.habitrpg.android.habitica.databinding.FragmentRefreshRecyclerviewBinding
-import com.habitrpg.common.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.models.social.Challenge
-import com.habitrpg.android.habitica.models.social.Group
-import com.habitrpg.android.habitica.ui.adapter.social.ChallengesListViewAdapter
-import com.habitrpg.android.habitica.ui.fragments.BaseFragment
-import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
-import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
-import com.habitrpg.common.habitica.helpers.EmptyItem
-import com.habitrpg.common.habitica.helpers.ExceptionHandler
-import com.habitrpg.common.habitica.helpers.launchCatching
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class ChallengeListFragment :
-    BaseFragment<FragmentRefreshRecyclerviewBinding>(),
-    androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener {
-
-    @Inject
-    lateinit var challengeRepository: ChallengeRepository
-
-    @Inject
-    lateinit var socialRepository: SocialRepository
-
-    @Inject
-    lateinit var userRepository: UserRepository
-
-    @Inject
-    lateinit var userViewModel: MainUserViewModel
-
-    override var binding: FragmentRefreshRecyclerviewBinding? = null
-
-    override fun createBinding(
-        inflater: LayoutInflater,
-        container: ViewGroup?
-    ): FragmentRefreshRecyclerviewBinding {
-        return FragmentRefreshRecyclerviewBinding.inflate(inflater, container, false)
-    }
-
-    private var challengeAdapter: ChallengesListViewAdapter? = null
-    private var viewUserChallengesOnly: Boolean = false
-
-    private var nextPageToLoad = 0
-    private var loadedAllData = false
-
-    private var challenges: List<Challenge>? = null
-    private var filterGroups: MutableList<Group>? = null
-
-    private var filterOptions: ChallengeFilterOptions? = null
-
-    fun setViewUserChallengesOnly(only: Boolean) {
-        this.viewUserChallengesOnly = only
-    }
-
-    override fun onDestroy() {
-        challengeRepository.close()
-        super.onDestroy()
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        challengeAdapter = ChallengesListViewAdapter(viewUserChallengesOnly, userViewModel.userID)
-        challengeAdapter?.onOpenChallengeFragment = { openDetailFragment(it) }
-        binding?.refreshLayout?.setOnRefreshListener(this)
-
-        if (viewUserChallengesOnly) {
-            binding?.recyclerView?.emptyItem = EmptyItem(
-                getString(R.string.empty_challenge_list),
-                getString(R.string.empty_discover_description)
-            )
-        }
-        binding?.recyclerView?.layoutManager =
-            androidx.recyclerview.widget.LinearLayoutManager(this.activity)
-        binding?.recyclerView?.adapter = challengeAdapter
-        if (!viewUserChallengesOnly) {
-            binding?.recyclerView?.setBackgroundResource(R.color.content_background)
-        }
-
-        lifecycleScope.launch(ExceptionHandler.coroutine()) {
-            socialRepository.getGroup(Group.TAVERN_ID)
-                .combine(socialRepository.getUserGroups("guild")) { tavern, guilds ->
-                    return@combine Pair(tavern, guilds)
-                }.collect {
-                    this@ChallengeListFragment.filterGroups = mutableListOf()
-                    it.first?.let { tavern -> filterGroups?.add(tavern) }
-                    filterGroups?.addAll(it.second)
-                }
-        }
-
-        binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
-
-        challengeAdapter?.updateUnfilteredData(challenges)
-        loadLocalChallenges()
-
-        binding?.recyclerView?.addOnScrollListener(object : RecyclerView.OnScrollListener() {
-            override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
-                super.onScrollStateChanged(recyclerView, newState)
-
-                if (!recyclerView.canScrollVertically(1)) {
-                    retrieveChallengesPage()
-                }
-            }
-        })
-
-        retrieveChallengesPage(true)
-    }
-
-    private fun openDetailFragment(challengeID: String) {
-        MainNavigationController.navigate(
-            ChallengesOverviewFragmentDirections.openChallengeDetail(
-                challengeID
-            )
-        )
-    }
-
-    override fun onRefresh() {
-        nextPageToLoad = 0
-        loadedAllData = false
-        retrieveChallengesPage(true)
-    }
-
-    private fun setRefreshing(state: Boolean) {
-        binding?.refreshLayout?.isRefreshing = state
-    }
-
-    private fun loadLocalChallenges() {
-        lifecycleScope.launchCatching {
-            val flow = if (viewUserChallengesOnly) {
-                challengeRepository.getUserChallenges()
-            } else {
-                challengeRepository.getChallenges()
-            }
-            flow.collect { challenges ->
-                if (challenges.isEmpty()) {
-                    retrieveChallengesPage()
-                }
-                this@ChallengeListFragment.challenges = challenges
-                challengeAdapter?.updateUnfilteredData(challenges)
-            }
-        }
-    }
-
-    internal fun retrieveChallengesPage(forced: Boolean = false) {
-        if ((!forced && binding?.refreshLayout?.isRefreshing == true) || loadedAllData || !this::challengeRepository.isInitialized) {
-            return
-        }
-        setRefreshing(true)
-        lifecycleScope.launchCatching {
-            val challenges =
-                challengeRepository.retrieveChallenges(nextPageToLoad, viewUserChallengesOnly)
-            setRefreshing(false)
-            if ((challenges?.size ?: 0) < 10) {
-                loadedAllData = true
-            }
-            nextPageToLoad += 1
-        }
-    }
-
-    internal fun showFilterDialog() {
-        activity?.let {
-            ChallengeFilterDialogHolder.showDialog(
-                it,
-                filterGroups ?: emptyList(),
-                filterOptions
-            ) {
-                changeFilter(it)
-            }
-        }
-    }
-
-    private fun changeFilter(challengeFilterOptions: ChallengeFilterOptions) {
-        filterOptions = challengeFilterOptions
-        challengeAdapter?.filter(challengeFilterOptions)
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.social.challenges
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.RecyclerView
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.data.ChallengeRepository
+import com.habitrpg.android.habitica.data.SocialRepository
+import com.habitrpg.android.habitica.data.UserRepository
+import com.habitrpg.android.habitica.databinding.FragmentRefreshRecyclerviewBinding
+import com.habitrpg.android.habitica.models.social.Challenge
+import com.habitrpg.android.habitica.models.social.Group
+import com.habitrpg.android.habitica.ui.adapter.social.ChallengesListViewAdapter
+import com.habitrpg.android.habitica.ui.fragments.BaseFragment
+import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
+import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
+import com.habitrpg.common.habitica.helpers.EmptyItem
+import com.habitrpg.common.habitica.helpers.ExceptionHandler
+import com.habitrpg.common.habitica.helpers.MainNavigationController
+import com.habitrpg.common.habitica.helpers.launchCatching
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class ChallengeListFragment :
+    BaseFragment<FragmentRefreshRecyclerviewBinding>(),
+    androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener {
+    @Inject
+    lateinit var challengeRepository: ChallengeRepository
+
+    @Inject
+    lateinit var socialRepository: SocialRepository
+
+    @Inject
+    lateinit var userRepository: UserRepository
+
+    @Inject
+    lateinit var userViewModel: MainUserViewModel
+
+    override var binding: FragmentRefreshRecyclerviewBinding? = null
+
+    override fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+    ): FragmentRefreshRecyclerviewBinding {
+        return FragmentRefreshRecyclerviewBinding.inflate(inflater, container, false)
+    }
+
+    private var challengeAdapter: ChallengesListViewAdapter? = null
+    private var viewUserChallengesOnly: Boolean = false
+
+    private var nextPageToLoad = 0
+    private var loadedAllData = false
+
+    private var challenges: List<Challenge>? = null
+    private var filterGroups: MutableList<Group>? = null
+
+    private var filterOptions: ChallengeFilterOptions? = null
+
+    fun setViewUserChallengesOnly(only: Boolean) {
+        this.viewUserChallengesOnly = only
+    }
+
+    override fun onDestroy() {
+        challengeRepository.close()
+        super.onDestroy()
+    }
+
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
+        super.onViewCreated(view, savedInstanceState)
+
+        challengeAdapter = ChallengesListViewAdapter(viewUserChallengesOnly, userViewModel.userID)
+        challengeAdapter?.onOpenChallengeFragment = { openDetailFragment(it) }
+        binding?.refreshLayout?.setOnRefreshListener(this)
+
+        if (viewUserChallengesOnly) {
+            binding?.recyclerView?.emptyItem =
+                EmptyItem(
+                    getString(R.string.empty_challenge_list),
+                    getString(R.string.empty_discover_description),
+                )
+        }
+        binding?.recyclerView?.layoutManager =
+            androidx.recyclerview.widget.LinearLayoutManager(this.activity)
+        binding?.recyclerView?.adapter = challengeAdapter
+        if (!viewUserChallengesOnly) {
+            binding?.recyclerView?.setBackgroundResource(R.color.content_background)
+        }
+
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            socialRepository.getGroup(Group.TAVERN_ID)
+                .combine(socialRepository.getUserGroups("guild")) { tavern, guilds ->
+                    return@combine Pair(tavern, guilds)
+                }.collect {
+                    this@ChallengeListFragment.filterGroups = mutableListOf()
+                    it.first?.let { tavern -> filterGroups?.add(tavern) }
+                    filterGroups?.addAll(it.second)
+                }
+        }
+
+        binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
+
+        challengeAdapter?.updateUnfilteredData(challenges)
+        loadLocalChallenges()
+
+        binding?.recyclerView?.addOnScrollListener(
+            object : RecyclerView.OnScrollListener() {
+                override fun onScrollStateChanged(
+                    recyclerView: RecyclerView,
+                    newState: Int,
+                ) {
+                    super.onScrollStateChanged(recyclerView, newState)
+
+                    if (!recyclerView.canScrollVertically(1)) {
+                        retrieveChallengesPage()
+                    }
+                }
+            },
+        )
+
+        retrieveChallengesPage(true)
+    }
+
+    private fun openDetailFragment(challengeID: String) {
+        MainNavigationController.navigate(
+            ChallengesOverviewFragmentDirections.openChallengeDetail(
+                challengeID,
+            ),
+        )
+    }
+
+    override fun onRefresh() {
+        nextPageToLoad = 0
+        loadedAllData = false
+        retrieveChallengesPage(true)
+    }
+
+    private fun setRefreshing(state: Boolean) {
+        binding?.refreshLayout?.isRefreshing = state
+    }
+
+    private fun loadLocalChallenges() {
+        lifecycleScope.launchCatching {
+            val flow =
+                if (viewUserChallengesOnly) {
+                    challengeRepository.getUserChallenges()
+                } else {
+                    challengeRepository.getChallenges()
+                }
+            flow.collect { challenges ->
+                if (challenges.isEmpty()) {
+                    retrieveChallengesPage()
+                }
+                this@ChallengeListFragment.challenges = challenges
+                challengeAdapter?.updateUnfilteredData(challenges)
+            }
+        }
+    }
+
+    internal fun retrieveChallengesPage(forced: Boolean = false) {
+        if ((!forced && binding?.refreshLayout?.isRefreshing == true) || loadedAllData || !this::challengeRepository.isInitialized) {
+            return
+        }
+        setRefreshing(true)
+        lifecycleScope.launchCatching {
+            val challenges =
+                challengeRepository.retrieveChallenges(nextPageToLoad, viewUserChallengesOnly)
+            setRefreshing(false)
+            if ((challenges?.size ?: 0) < 10) {
+                loadedAllData = true
+            }
+            nextPageToLoad += 1
+        }
+    }
+
+    internal fun showFilterDialog() {
+        activity?.let {
+            ChallengeFilterDialogHolder.showDialog(
+                it,
+                filterGroups ?: emptyList(),
+                filterOptions,
+            ) {
+                changeFilter(it)
+            }
+        }
+    }
+
+    private fun changeFilter(challengeFilterOptions: ChallengeFilterOptions) {
+        filterOptions = challengeFilterOptions
+        challengeAdapter?.filter(challengeFilterOptions)
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengesOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengesOverviewFragment.kt
index 530e38c97..1bc694ca0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengesOverviewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengesOverviewFragment.kt
@@ -1,144 +1,156 @@
-package com.habitrpg.android.habitica.ui.fragments.social.challenges
-
-import android.content.Intent
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
-import android.view.View
-import android.view.ViewGroup
-import android.widget.RelativeLayout
-import android.widget.TextView
-import androidx.core.view.MenuItemCompat
-import androidx.fragment.app.Fragment
-import androidx.viewpager2.adapter.FragmentStateAdapter
-import com.google.android.material.tabs.TabLayoutMediator
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.data.ChallengeRepository
-import com.habitrpg.android.habitica.databinding.FragmentViewpagerBinding
-import com.habitrpg.android.habitica.ui.activities.ChallengeFormActivity
-import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
-import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class ChallengesOverviewFragment : BaseMainFragment<FragmentViewpagerBinding>() {
-
-    @Inject
-    internal lateinit var challengeRepository: ChallengeRepository
-
-    override var binding: FragmentViewpagerBinding? = null
-
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentViewpagerBinding {
-        return FragmentViewpagerBinding.inflate(inflater, container, false)
-    }
-
-    private var statePagerAdapter: FragmentStateAdapter? = null
-    private var userChallengesFragment: ChallengeListFragment? = ChallengeListFragment()
-    private var availableChallengesFragment: ChallengeListFragment? = ChallengeListFragment()
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        this.usesTabLayout = true
-        this.hidesToolbar = true
-        return super.onCreateView(inflater, container, savedInstanceState)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        userChallengesFragment?.setViewUserChallengesOnly(true)
-
-        availableChallengesFragment?.setViewUserChallengesOnly(false)
-        setViewPagerAdapter()
-    }
-
-    override fun onResume() {
-        super.onResume()
-        getActiveFragment()?.retrieveChallengesPage()
-    }
-
-    override fun onDestroy() {
-        challengeRepository.close()
-        super.onDestroy()
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        super.onCreateOptionsMenu(menu, inflater)
-        inflater.inflate(R.menu.menu_list_challenges, menu)
-
-        @Suppress("Deprecation")
-        val badgeLayout = MenuItemCompat.getActionView(menu.findItem(R.id.action_search)) as? RelativeLayout
-        if (badgeLayout != null) {
-            val filterCountTextView = badgeLayout.findViewById<TextView>(R.id.badge_textview)
-            filterCountTextView.text = null
-            filterCountTextView.visibility = View.GONE
-            badgeLayout.setOnClickListener { getActiveFragment()?.showFilterDialog() }
-        }
-    }
-
-    @Suppress("ReturnCount")
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            R.id.action_create_challenge -> {
-                val intent = Intent(activity, ChallengeFormActivity::class.java)
-                startActivity(intent)
-                return true
-            }
-            R.id.action_reload -> {
-                getActiveFragment()?.retrieveChallengesPage()
-                return true
-            }
-            R.id.action_search -> {
-                getActiveFragment()?.showFilterDialog()
-                return true
-            }
-        }
-
-        return super.onOptionsItemSelected(item)
-    }
-
-    private fun getActiveFragment(): ChallengeListFragment? {
-        return if (binding?.viewPager?.currentItem == 0) {
-            userChallengesFragment
-        } else {
-            availableChallengesFragment
-        }
-    }
-
-    private fun setViewPagerAdapter() {
-        val fragmentManager = childFragmentManager
-
-        statePagerAdapter = object : FragmentStateAdapter(fragmentManager, lifecycle) {
-
-            override fun createFragment(position: Int): Fragment {
-                return if (position == 0) {
-                    userChallengesFragment
-                } else {
-                    availableChallengesFragment
-                } ?: Fragment()
-            }
-
-            override fun getItemCount(): Int {
-                return 2
-            }
-        }
-        binding?.viewPager?.adapter = statePagerAdapter
-        tabLayout?.let {
-            binding?.viewPager?.let { it1 ->
-                TabLayoutMediator(it, it1) { tab, position ->
-                    tab.text = when (position) {
-                        0 -> getString(R.string.my_challenges)
-                        1 -> getString(R.string.discover)
-                        else -> ""
-                    }
-                }.attach()
-            }
-        }
-        statePagerAdapter?.notifyDataSetChanged()
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.social.challenges
+
+import android.content.Intent
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import android.widget.RelativeLayout
+import android.widget.TextView
+import androidx.core.view.MenuItemCompat
+import androidx.fragment.app.Fragment
+import androidx.viewpager2.adapter.FragmentStateAdapter
+import com.google.android.material.tabs.TabLayoutMediator
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.data.ChallengeRepository
+import com.habitrpg.android.habitica.databinding.FragmentViewpagerBinding
+import com.habitrpg.android.habitica.ui.activities.ChallengeFormActivity
+import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
+import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class ChallengesOverviewFragment : BaseMainFragment<FragmentViewpagerBinding>() {
+    @Inject
+    internal lateinit var challengeRepository: ChallengeRepository
+
+    override var binding: FragmentViewpagerBinding? = null
+
+    override fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+    ): FragmentViewpagerBinding {
+        return FragmentViewpagerBinding.inflate(inflater, container, false)
+    }
+
+    private var statePagerAdapter: FragmentStateAdapter? = null
+    private var userChallengesFragment: ChallengeListFragment? = ChallengeListFragment()
+    private var availableChallengesFragment: ChallengeListFragment? = ChallengeListFragment()
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?,
+    ): View? {
+        this.usesTabLayout = true
+        this.hidesToolbar = true
+        return super.onCreateView(inflater, container, savedInstanceState)
+    }
+
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
+        super.onViewCreated(view, savedInstanceState)
+
+        userChallengesFragment?.setViewUserChallengesOnly(true)
+
+        availableChallengesFragment?.setViewUserChallengesOnly(false)
+        setViewPagerAdapter()
+    }
+
+    override fun onResume() {
+        super.onResume()
+        getActiveFragment()?.retrieveChallengesPage()
+    }
+
+    override fun onDestroy() {
+        challengeRepository.close()
+        super.onDestroy()
+    }
+
+    override fun onCreateOptionsMenu(
+        menu: Menu,
+        inflater: MenuInflater,
+    ) {
+        super.onCreateOptionsMenu(menu, inflater)
+        inflater.inflate(R.menu.menu_list_challenges, menu)
+
+        @Suppress("Deprecation")
+        val badgeLayout =
+            MenuItemCompat.getActionView(menu.findItem(R.id.action_search)) as? RelativeLayout
+        if (badgeLayout != null) {
+            val filterCountTextView = badgeLayout.findViewById<TextView>(R.id.badge_textview)
+            filterCountTextView.text = null
+            filterCountTextView.visibility = View.GONE
+            badgeLayout.setOnClickListener { getActiveFragment()?.showFilterDialog() }
+        }
+    }
+
+    @Suppress("ReturnCount")
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+            R.id.action_create_challenge -> {
+                val intent = Intent(activity, ChallengeFormActivity::class.java)
+                startActivity(intent)
+                return true
+            }
+
+            R.id.action_reload -> {
+                getActiveFragment()?.retrieveChallengesPage()
+                return true
+            }
+
+            R.id.action_search -> {
+                getActiveFragment()?.showFilterDialog()
+                return true
+            }
+        }
+
+        return super.onOptionsItemSelected(item)
+    }
+
+    private fun getActiveFragment(): ChallengeListFragment? {
+        return if (binding?.viewPager?.currentItem == 0) {
+            userChallengesFragment
+        } else {
+            availableChallengesFragment
+        }
+    }
+
+    private fun setViewPagerAdapter() {
+        val fragmentManager = childFragmentManager
+
+        statePagerAdapter =
+            object : FragmentStateAdapter(fragmentManager, lifecycle) {
+                override fun createFragment(position: Int): Fragment {
+                    return if (position == 0) {
+                        userChallengesFragment
+                    } else {
+                        availableChallengesFragment
+                    } ?: Fragment()
+                }
+
+                override fun getItemCount(): Int {
+                    return 2
+                }
+            }
+        binding?.viewPager?.adapter = statePagerAdapter
+        tabLayout?.let {
+            binding?.viewPager?.let { it1 ->
+                TabLayoutMediator(it, it1) { tab, position ->
+                    tab.text =
+                        when (position) {
+                            0 -> getString(R.string.my_challenges)
+                            1 -> getString(R.string.discover)
+                            else -> ""
+                        }
+                }.attach()
+            }
+        }
+        statePagerAdapter?.notifyDataSetChanged()
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildDetailFragment.kt
index 7ff3cf72f..6661453d9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildDetailFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildDetailFragment.kt
@@ -16,7 +16,6 @@ import com.habitrpg.android.habitica.data.ChallengeRepository
 import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.databinding.FragmentGuildDetailBinding
 import com.habitrpg.android.habitica.helpers.AppConfigManager
-import com.habitrpg.common.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.models.social.Challenge
 import com.habitrpg.android.habitica.models.social.Group
@@ -27,6 +26,7 @@ import com.habitrpg.android.habitica.ui.viewmodels.GroupViewModel
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.SnackbarActivity
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
+import com.habitrpg.common.habitica.helpers.MainNavigationController
 import com.habitrpg.common.habitica.helpers.launchCatching
 import com.habitrpg.common.habitica.helpers.setMarkdown
 import dagger.hilt.android.AndroidEntryPoint
@@ -38,7 +38,6 @@ import javax.inject.Inject
 
 @AndroidEntryPoint
 class GuildDetailFragment : BaseFragment<FragmentGuildDetailBinding>() {
-
     @Inject
     lateinit var configManager: AppConfigManager
 
@@ -50,15 +49,21 @@ class GuildDetailFragment : BaseFragment<FragmentGuildDetailBinding>() {
     @Inject
     lateinit var userRepository: UserRepository
 
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentGuildDetailBinding {
+    override fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+    ): FragmentGuildDetailBinding {
         return FragmentGuildDetailBinding.inflate(inflater, container, false)
     }
 
     val viewModel: GroupViewModel by viewModels(
-        ownerProducer = { parentFragment as Fragment }
+        ownerProducer = { parentFragment as Fragment },
     )
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
         super.onViewCreated(view, savedInstanceState)
 
         binding?.refreshLayout?.setOnRefreshListener { this.refresh() }
@@ -101,30 +106,31 @@ class GuildDetailFragment : BaseFragment<FragmentGuildDetailBinding>() {
         binding?.leaveButton?.visibility = if (isMember == true) View.VISIBLE else View.GONE
     }
 
-    private val sendInvitesResult = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-        if (it.resultCode == Activity.RESULT_OK) {
-            val inviteData = HashMap<String, Any>()
-            inviteData["inviter"] = viewModel.user.value?.profile?.name ?: ""
-            val emails = it.data?.getStringArrayExtra(GroupInviteActivity.EMAILS_KEY)
-            if (!emails.isNullOrEmpty()) {
-                val invites = ArrayList<HashMap<String, String>>()
-                emails.forEach { email ->
-                    val invite = HashMap<String, String>()
-                    invite["name"] = ""
-                    invite["email"] = email
-                    invites.add(invite)
+    private val sendInvitesResult =
+        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+            if (it.resultCode == Activity.RESULT_OK) {
+                val inviteData = HashMap<String, Any>()
+                inviteData["inviter"] = viewModel.user.value?.profile?.name ?: ""
+                val emails = it.data?.getStringArrayExtra(GroupInviteActivity.EMAILS_KEY)
+                if (!emails.isNullOrEmpty()) {
+                    val invites = ArrayList<HashMap<String, String>>()
+                    emails.forEach { email ->
+                        val invite = HashMap<String, String>()
+                        invite["name"] = ""
+                        invite["email"] = email
+                        invites.add(invite)
+                    }
+                    inviteData["emails"] = invites
                 }
-                inviteData["emails"] = invites
+                val userIDs = it.data?.getStringArrayExtra(GroupInviteActivity.USER_IDS_KEY)
+                if (!userIDs.isNullOrEmpty()) {
+                    val invites = ArrayList<String>()
+                    userIDs.forEach { invites.add(it) }
+                    inviteData["usernames"] = invites
+                }
+                viewModel.inviteToGroup(inviteData)
             }
-            val userIDs = it.data?.getStringArrayExtra(GroupInviteActivity.USER_IDS_KEY)
-            if (!userIDs.isNullOrEmpty()) {
-                val invites = ArrayList<String>()
-                userIDs.forEach { invites.add(it) }
-                inviteData["usernames"] = invites
-            }
-            viewModel.inviteToGroup(inviteData)
         }
-    }
 
     private fun refresh() {
         viewModel.retrieveGroup {
@@ -137,7 +143,8 @@ class GuildDetailFragment : BaseFragment<FragmentGuildDetailBinding>() {
         lifecycleScope.launchCatching {
             userRepository.getUser().collect {
                 it?.challenges?.forEach { membership ->
-                    val challenge = challengeRepository.getChallenge(membership.challengeID).firstOrNull()
+                    val challenge =
+                        challengeRepository.getChallenge(membership.challengeID).firstOrNull()
                     if (challenge != null && challenge.groupId == viewModel.groupID) {
                         groupChallenges.add(challenge)
                     }
@@ -160,7 +167,11 @@ class GuildDetailFragment : BaseFragment<FragmentGuildDetailBinding>() {
                     alert.addButton(R.string.keep_challenges, true) { _, _ ->
                         viewModel.leaveGroup(groupChallenges, true) { showLeaveSnackbar() }
                     }
-                    alert.addButton(R.string.leave_challenges_delete_tasks, isPrimary = false, isDestructive = true) { _, _ ->
+                    alert.addButton(
+                        R.string.leave_challenges_delete_tasks,
+                        isPrimary = false,
+                        isDestructive = true,
+                    ) { _, _ ->
                         viewModel.leaveGroup(groupChallenges, false) { showLeaveSnackbar() }
                     }
                     alert.setExtraCloseButtonVisibility(View.VISIBLE)
@@ -169,7 +180,11 @@ class GuildDetailFragment : BaseFragment<FragmentGuildDetailBinding>() {
                     val alert = HabiticaAlertDialog(context)
                     alert.setTitle(R.string.leave_guild_confirmation)
                     alert.setMessage(R.string.rejoin_guild)
-                    alert.addButton(R.string.leave, isPrimary = true, isDestructive = true) { _, _ ->
+                    alert.addButton(
+                        R.string.leave,
+                        isPrimary = true,
+                        isDestructive = true,
+                    ) { _, _ ->
                         viewModel.leaveGroup(groupChallenges, false) {
                             showLeaveSnackbar()
                         }
@@ -187,7 +202,11 @@ class GuildDetailFragment : BaseFragment<FragmentGuildDetailBinding>() {
 
     private fun updateGuild(guild: Group?) {
         binding?.titleView?.text = guild?.name
-        binding?.guildMembersIcon?.setImageBitmap(HabiticaIconsHelper.imageOfGuildCrestMedium((guild?.memberCount ?: 0).toFloat()))
+        binding?.guildMembersIcon?.setImageBitmap(
+            HabiticaIconsHelper.imageOfGuildCrestMedium(
+                (guild?.memberCount ?: 0).toFloat(),
+            ),
+        )
         binding?.guildMembersText?.text = guild?.memberCount.toString()
         binding?.guildBankText?.text = guild?.gemCount.toString()
         binding?.guildSummary?.setMarkdown(guild?.summary)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildFragment.kt
index 736770f7b..78bc35157 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildFragment.kt
@@ -1,226 +1,247 @@
-package com.habitrpg.android.habitica.ui.fragments.social.guilds
-
-import android.app.Activity
-import android.content.Intent
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
-import android.view.View
-import android.view.ViewGroup
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.viewModels
-import androidx.viewpager2.adapter.FragmentStateAdapter
-import androidx.viewpager2.widget.ViewPager2
-import com.google.android.material.tabs.TabLayoutMediator
-import com.google.firebase.analytics.FirebaseAnalytics
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.databinding.FragmentViewpagerBinding
-import com.habitrpg.android.habitica.models.social.Group
-import com.habitrpg.android.habitica.ui.activities.GroupFormActivity
-import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
-import com.habitrpg.android.habitica.ui.fragments.social.ChatFragment
-import com.habitrpg.android.habitica.ui.viewmodels.GroupViewModel
-import com.habitrpg.android.habitica.ui.viewmodels.GroupViewType
-import dagger.hilt.android.AndroidEntryPoint
-
-@AndroidEntryPoint
-class GuildFragment : BaseMainFragment<FragmentViewpagerBinding>() {
-
-    internal val viewModel: GroupViewModel by viewModels()
-    private var guildInformationFragment: GuildDetailFragment? = null
-    private var chatFragment: ChatFragment? = null
-
-    override var binding: FragmentViewpagerBinding? = null
-
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentViewpagerBinding {
-        return FragmentViewpagerBinding.inflate(inflater, container, false)
-    }
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        this.usesTabLayout = true
-        this.hidesToolbar = true
-        return super.onCreateView(inflater, container, savedInstanceState)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        showsBackButton = true
-        super.onViewCreated(view, savedInstanceState)
-
-        viewModel.groupViewType = GroupViewType.GUILD
-        viewModel.getGroupData().observe(viewLifecycleOwner) { setGroup(it) }
-        viewModel.getIsMemberData().observe(viewLifecycleOwner) { mainActivity?.invalidateOptionsMenu() }
-
-        arguments?.let {
-            val args = GuildFragmentArgs.fromBundle(it)
-            viewModel.setGroupID(args.groupID)
-        }
-
-        setViewPagerAdapter()
-        setFragments()
-
-        if (viewModel.groupID == "f2db2a7f-13c5-454d-b3ee-ea1f5089e601") {
-            context?.let { FirebaseAnalytics.getInstance(it).logEvent("opened_no_party_guild", null) }
-        }
-
-        viewModel.retrieveGroup { }
-    }
-
-    override fun onResume() {
-        super.onResume()
-
-        arguments?.let {
-            val args = GuildFragmentArgs.fromBundle(it)
-            binding?.viewPager?.setCurrentItem(args.tabToOpen, false)
-        }
-    }
-
-    private fun setFragments() {
-        val fragments = childFragmentManager.fragments
-        for (childFragment in fragments) {
-            if (childFragment is ChatFragment) {
-                chatFragment = childFragment
-            }
-            if (childFragment is GuildDetailFragment) {
-                guildInformationFragment = childFragment
-            }
-        }
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        if (this.mainActivity != null) {
-            if (viewModel.isMember) {
-                if (viewModel.isLeader) {
-                    this.mainActivity?.menuInflater?.inflate(R.menu.guild_admin, menu)
-                } else {
-                    this.mainActivity?.menuInflater?.inflate(R.menu.guild_member, menu)
-                }
-            } else {
-                this.mainActivity?.menuInflater?.inflate(R.menu.guild_nonmember, menu)
-            }
-        }
-        super.onCreateOptionsMenu(menu, inflater)
-    }
-
-    @Suppress("ReturnCount")
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            R.id.menu_guild_join -> {
-                viewModel.joinGroup()
-                return true
-            }
-            R.id.menu_guild_leave -> {
-                guildInformationFragment?.leaveGuild()
-                return true
-            }
-            R.id.menu_guild_edit -> {
-                this.displayEditForm()
-                return true
-            }
-            R.id.menu_guild_refresh -> {
-                viewModel.retrieveGroupChat { }
-                viewModel.retrieveGroup { }
-                return true
-            }
-        }
-        return super.onOptionsItemSelected(item)
-    }
-
-    private fun setViewPagerAdapter() {
-        val fragmentManager = childFragmentManager
-
-        binding?.viewPager?.adapter = object : FragmentStateAdapter(fragmentManager, lifecycle) {
-
-            override fun createFragment(position: Int): Fragment {
-                val fragment: Fragment?
-
-                when (position) {
-                    0 -> {
-                        guildInformationFragment = GuildDetailFragment.newInstance()
-                        fragment = guildInformationFragment
-                    }
-                    1 -> {
-                        chatFragment = ChatFragment()
-                        fragment = chatFragment
-                    }
-                    else -> fragment = Fragment()
-                }
-
-                return fragment ?: Fragment()
-            }
-
-            override fun getItemCount(): Int {
-                return 2
-            }
-        }
-
-        binding?.viewPager?.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
-            override fun onPageScrolled(
-                position: Int,
-                positionOffset: Float,
-                positionOffsetPixels: Int
-            ) {
-                if (position == 1) {
-                    chatFragment?.setNavigatedToFragment()
-                }
-            }
-
-            override fun onPageSelected(position: Int) {
-                if (position == 1) {
-                    chatFragment?.setNavigatedToFragment()
-                }
-            }
-        })
-
-        tabLayout?.let {
-            binding?.viewPager?.let { it1 ->
-                TabLayoutMediator(it, it1) { tab, position ->
-                    tab.text = when (position) {
-                        0 -> context?.getString(R.string.guild)
-                        1 -> context?.getString(R.string.chat)
-                        else -> ""
-                    }
-                }.attach()
-            }
-        }
-    }
-
-    private fun displayEditForm() {
-        val bundle = Bundle()
-        val guild = viewModel.getGroupData().value
-        bundle.putString("groupID", guild?.id)
-        bundle.putString("name", guild?.name)
-        bundle.putString("description", guild?.description)
-        bundle.putString("privacy", guild?.privacy)
-        bundle.putString("leader", guild?.leaderID)
-        bundle.putBoolean("leaderOnlyChallenges", guild?.leaderOnlyChallenges ?: true)
-
-        val intent = Intent(mainActivity, GroupFormActivity::class.java)
-        intent.putExtras(bundle)
-        intent.flags = Intent.FLAG_ACTIVITY_REORDER_TO_FRONT
-        groupFormResult.launch(intent)
-    }
-
-    private val groupFormResult = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-        if (it.resultCode == Activity.RESULT_OK) {
-            val bundle = it?.data?.extras
-            viewModel.updateGroup(bundle)
-        }
-    }
-
-    private fun setGroup(group: Group?) {
-        this.mainActivity?.invalidateOptionsMenu()
-
-        if (viewModel.isPublicGuild) {
-            chatFragment?.autocompleteContext = "publicGuild"
-        } else {
-            chatFragment?.autocompleteContext = "privateGuild"
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.social.guilds
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
+import androidx.viewpager2.adapter.FragmentStateAdapter
+import androidx.viewpager2.widget.ViewPager2
+import com.google.android.material.tabs.TabLayoutMediator
+import com.google.firebase.analytics.FirebaseAnalytics
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.FragmentViewpagerBinding
+import com.habitrpg.android.habitica.models.social.Group
+import com.habitrpg.android.habitica.ui.activities.GroupFormActivity
+import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
+import com.habitrpg.android.habitica.ui.fragments.social.ChatFragment
+import com.habitrpg.android.habitica.ui.viewmodels.GroupViewModel
+import com.habitrpg.android.habitica.ui.viewmodels.GroupViewType
+import dagger.hilt.android.AndroidEntryPoint
+
+@AndroidEntryPoint
+class GuildFragment : BaseMainFragment<FragmentViewpagerBinding>() {
+    internal val viewModel: GroupViewModel by viewModels()
+    private var guildInformationFragment: GuildDetailFragment? = null
+    private var chatFragment: ChatFragment? = null
+
+    override var binding: FragmentViewpagerBinding? = null
+
+    override fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+    ): FragmentViewpagerBinding {
+        return FragmentViewpagerBinding.inflate(inflater, container, false)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?,
+    ): View? {
+        this.usesTabLayout = true
+        this.hidesToolbar = true
+        return super.onCreateView(inflater, container, savedInstanceState)
+    }
+
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
+        showsBackButton = true
+        super.onViewCreated(view, savedInstanceState)
+
+        viewModel.groupViewType = GroupViewType.GUILD
+        viewModel.getGroupData().observe(viewLifecycleOwner) { setGroup(it) }
+        viewModel.getIsMemberData()
+            .observe(viewLifecycleOwner) { mainActivity?.invalidateOptionsMenu() }
+
+        arguments?.let {
+            val args = GuildFragmentArgs.fromBundle(it)
+            viewModel.setGroupID(args.groupID)
+        }
+
+        setViewPagerAdapter()
+        setFragments()
+
+        if (viewModel.groupID == "f2db2a7f-13c5-454d-b3ee-ea1f5089e601") {
+            context?.let {
+                FirebaseAnalytics.getInstance(it).logEvent("opened_no_party_guild", null)
+            }
+        }
+
+        viewModel.retrieveGroup { }
+    }
+
+    override fun onResume() {
+        super.onResume()
+
+        arguments?.let {
+            val args = GuildFragmentArgs.fromBundle(it)
+            binding?.viewPager?.setCurrentItem(args.tabToOpen, false)
+        }
+    }
+
+    private fun setFragments() {
+        val fragments = childFragmentManager.fragments
+        for (childFragment in fragments) {
+            if (childFragment is ChatFragment) {
+                chatFragment = childFragment
+            }
+            if (childFragment is GuildDetailFragment) {
+                guildInformationFragment = childFragment
+            }
+        }
+    }
+
+    override fun onCreateOptionsMenu(
+        menu: Menu,
+        inflater: MenuInflater,
+    ) {
+        if (this.mainActivity != null) {
+            if (viewModel.isMember) {
+                if (viewModel.isLeader) {
+                    this.mainActivity?.menuInflater?.inflate(R.menu.guild_admin, menu)
+                } else {
+                    this.mainActivity?.menuInflater?.inflate(R.menu.guild_member, menu)
+                }
+            } else {
+                this.mainActivity?.menuInflater?.inflate(R.menu.guild_nonmember, menu)
+            }
+        }
+        super.onCreateOptionsMenu(menu, inflater)
+    }
+
+    @Suppress("ReturnCount")
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+            R.id.menu_guild_join -> {
+                viewModel.joinGroup()
+                return true
+            }
+
+            R.id.menu_guild_leave -> {
+                guildInformationFragment?.leaveGuild()
+                return true
+            }
+
+            R.id.menu_guild_edit -> {
+                this.displayEditForm()
+                return true
+            }
+
+            R.id.menu_guild_refresh -> {
+                viewModel.retrieveGroupChat { }
+                viewModel.retrieveGroup { }
+                return true
+            }
+        }
+        return super.onOptionsItemSelected(item)
+    }
+
+    private fun setViewPagerAdapter() {
+        val fragmentManager = childFragmentManager
+
+        binding?.viewPager?.adapter =
+            object : FragmentStateAdapter(fragmentManager, lifecycle) {
+                override fun createFragment(position: Int): Fragment {
+                    val fragment: Fragment?
+
+                    when (position) {
+                        0 -> {
+                            guildInformationFragment = GuildDetailFragment.newInstance()
+                            fragment = guildInformationFragment
+                        }
+
+                        1 -> {
+                            chatFragment = ChatFragment()
+                            fragment = chatFragment
+                        }
+
+                        else -> fragment = Fragment()
+                    }
+
+                    return fragment ?: Fragment()
+                }
+
+                override fun getItemCount(): Int {
+                    return 2
+                }
+            }
+
+        binding?.viewPager?.registerOnPageChangeCallback(
+            object :
+                ViewPager2.OnPageChangeCallback() {
+                override fun onPageScrolled(
+                    position: Int,
+                    positionOffset: Float,
+                    positionOffsetPixels: Int,
+                ) {
+                    if (position == 1) {
+                        chatFragment?.setNavigatedToFragment()
+                    }
+                }
+
+                override fun onPageSelected(position: Int) {
+                    if (position == 1) {
+                        chatFragment?.setNavigatedToFragment()
+                    }
+                }
+            },
+        )
+
+        tabLayout?.let {
+            binding?.viewPager?.let { it1 ->
+                TabLayoutMediator(it, it1) { tab, position ->
+                    tab.text =
+                        when (position) {
+                            0 -> context?.getString(R.string.guild)
+                            1 -> context?.getString(R.string.chat)
+                            else -> ""
+                        }
+                }.attach()
+            }
+        }
+    }
+
+    private fun displayEditForm() {
+        val bundle = Bundle()
+        val guild = viewModel.getGroupData().value
+        bundle.putString("groupID", guild?.id)
+        bundle.putString("name", guild?.name)
+        bundle.putString("description", guild?.description)
+        bundle.putString("privacy", guild?.privacy)
+        bundle.putString("leader", guild?.leaderID)
+        bundle.putBoolean("leaderOnlyChallenges", guild?.leaderOnlyChallenges ?: true)
+
+        val intent = Intent(mainActivity, GroupFormActivity::class.java)
+        intent.putExtras(bundle)
+        intent.flags = Intent.FLAG_ACTIVITY_REORDER_TO_FRONT
+        groupFormResult.launch(intent)
+    }
+
+    private val groupFormResult =
+        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+            if (it.resultCode == Activity.RESULT_OK) {
+                val bundle = it?.data?.extras
+                viewModel.updateGroup(bundle)
+            }
+        }
+
+    private fun setGroup(group: Group?) {
+        this.mainActivity?.invalidateOptionsMenu()
+
+        if (viewModel.isPublicGuild) {
+            chatFragment?.autocompleteContext = "publicGuild"
+        } else {
+            chatFragment?.autocompleteContext = "privateGuild"
+        }
+    }
+}
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 aa0d76244..35b04b338 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,184 +1,195 @@
-package com.habitrpg.android.habitica.ui.fragments.social.party
-
-import android.app.Activity
-import android.content.Intent
-import android.graphics.Bitmap
-import android.graphics.Shader
-import android.graphics.drawable.BitmapDrawable
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-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.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.data.SocialRepository
-import com.habitrpg.android.habitica.databinding.FragmentNoPartyBinding
-import com.habitrpg.android.habitica.helpers.AppConfigManager
-import com.habitrpg.common.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.common.habitica.extensions.DataBindingUtils
-import com.habitrpg.common.habitica.helpers.ExceptionHandler
-import com.habitrpg.common.habitica.helpers.launchCatching
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.launch
-import java.util.Date
-import javax.inject.Inject
-import kotlin.math.roundToInt
-
-@AndroidEntryPoint
-class NoPartyFragmentFragment : BaseMainFragment<FragmentNoPartyBinding>() {
-
-    @Inject
-    lateinit var socialRepository: SocialRepository
-
-    @Inject
-    lateinit var configManager: AppConfigManager
-
-    @Inject
-    lateinit var userViewModel: MainUserViewModel
-
-    override var binding: FragmentNoPartyBinding? = null
-
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentNoPartyBinding {
-        return FragmentNoPartyBinding.inflate(inflater, container, false)
-    }
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        hidesToolbar = true
-        return super.onCreateView(inflater, container, savedInstanceState)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding?.refreshLayout?.setOnRefreshListener { this.refresh() }
-        refresh()
-
-        binding?.invitationsView?.acceptCall = {
-            lifecycleScope.launch(ExceptionHandler.coroutine()) {
-                socialRepository.joinGroup(it)
-                userRepository.retrieveUser(false, true)
-                parentFragmentManager.popBackStack()
-                MainNavigationController.navigate(
-                    R.id.partyFragment,
-                    bundleOf(Pair("partyID", userViewModel.partyID))
-                )
-            }
-        }
-
-        binding?.invitationsView?.rejectCall = {
-            lifecycleScope.launchCatching {
-                socialRepository.rejectGroupInvite(it)
-            }
-            binding?.invitationWrapper?.visibility = View.GONE
-        }
-
-        binding?.invitationsView?.getLeader = { leaderID ->
-            socialRepository.retrieveMember(leaderID)
-        }
-
-        userViewModel.user.observe(viewLifecycleOwner) { user ->
-            val partyInvitations = user?.invitations?.parties ?: emptyList()
-            if (partyInvitations.isNotEmpty()) {
-                binding?.invitationWrapper?.visibility = View.VISIBLE
-                binding?.invitationsView?.setInvitations(partyInvitations)
-            } else {
-                binding?.invitationWrapper?.visibility = View.GONE
-            }
-
-            val isSeeking = user?.party?.seeking != null
-            binding?.seekPartyButton?.isVisible = !isSeeking
-            binding?.seekingPartyWrapper?.isVisible = isSeeking
-        }
-
-        binding?.seekPartyButton?.setOnClickListener {
-            lifecycleScope.launchCatching {
-                userRepository.updateUser("party.seeking", Date())
-            }
-        }
-
-        binding?.leaveSeekingButton?.setOnClickListener {
-            lifecycleScope.launchCatching {
-                userRepository.updateUser("party.seeking", null)
-            }
-        }
-
-        binding?.createPartyButton?.setOnClickListener {
-            val bundle = Bundle()
-            bundle.putString("groupType", "party")
-            bundle.putString("leader", userViewModel.userID)
-            val intent = Intent(mainActivity, GroupFormActivity::class.java)
-            intent.putExtras(bundle)
-            intent.flags = Intent.FLAG_ACTIVITY_REORDER_TO_FRONT
-            groupFormResult.launch(intent)
-        }
-
-        context?.let { context ->
-            DataBindingUtils.loadImage(context, "timeTravelersShop_background_fall") { drawable ->
-                val bitmap = drawable.toBitmap()
-                val aspectRatio = bitmap.width / bitmap.height.toFloat()
-                val height = context.resources.getDimension(R.dimen.shop_height).toInt()
-                val width = (height * aspectRatio).roundToInt()
-                val bitmapDrawable = BitmapDrawable(context.resources, Bitmap.createScaledBitmap(bitmap, width, height, false))
-                bitmapDrawable.tileModeX = Shader.TileMode.REPEAT
-                if (binding?.noPartyBackground != null) {
-                    binding?.noPartyBackground?.background = bitmapDrawable
-                }
-            }
-        }
-    }
-
-    private val groupFormResult = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-        if (it.resultCode == Activity.RESULT_OK) {
-            val bundle = it.data?.extras
-            if (bundle?.getString("groupType") == "party") {
-                lifecycleScope.launch(ExceptionHandler.coroutine()) {
-                    val group = socialRepository.createGroup(
-                        bundle.getString("name"),
-                        bundle.getString("description"),
-                        bundle.getString("leader"),
-                        "party",
-                        bundle.getString("privacy"),
-                        bundle.getBoolean("leaderCreateChallenge")
-                    )
-                    userRepository.retrieveUser(false, true)
-                    if (isAdded) {
-                        parentFragmentManager.popBackStack()
-                    }
-                    MainNavigationController.navigate(
-                        R.id.partyFragment,
-                        bundleOf(Pair("partyID", group?.id))
-                    )
-                }
-            }
-        }
-    }
-
-    private fun refresh() {
-        lifecycleScope.launch(ExceptionHandler.coroutine()) {
-            val user = userRepository.retrieveUser(false, true)
-            binding?.refreshLayout?.isRefreshing = false
-            if (user?.hasParty == true) {
-                lifecycleScope.launch(ExceptionHandler.coroutine()) {
-                    val group = socialRepository.retrieveGroup("party")
-                    socialRepository.retrievePartyMembers(group?.id ?: "", true)
-                }
-            }
-        }
-    }
-
-    override fun onDestroy() {
-        socialRepository.close()
-        super.onDestroy()
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.social.party
+
+import android.app.Activity
+import android.content.Intent
+import android.graphics.Bitmap
+import android.graphics.Shader
+import android.graphics.drawable.BitmapDrawable
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+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.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.data.SocialRepository
+import com.habitrpg.android.habitica.databinding.FragmentNoPartyBinding
+import com.habitrpg.android.habitica.helpers.AppConfigManager
+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.common.habitica.extensions.DataBindingUtils
+import com.habitrpg.common.habitica.helpers.ExceptionHandler
+import com.habitrpg.common.habitica.helpers.MainNavigationController
+import com.habitrpg.common.habitica.helpers.launchCatching
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.launch
+import java.util.Date
+import javax.inject.Inject
+import kotlin.math.roundToInt
+
+@AndroidEntryPoint
+class NoPartyFragmentFragment : BaseMainFragment<FragmentNoPartyBinding>() {
+    @Inject
+    lateinit var socialRepository: SocialRepository
+
+    @Inject
+    lateinit var configManager: AppConfigManager
+
+    @Inject
+    lateinit var userViewModel: MainUserViewModel
+
+    override var binding: FragmentNoPartyBinding? = null
+
+    override fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+    ): FragmentNoPartyBinding {
+        return FragmentNoPartyBinding.inflate(inflater, container, false)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?,
+    ): View? {
+        hidesToolbar = true
+        return super.onCreateView(inflater, container, savedInstanceState)
+    }
+
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
+        super.onViewCreated(view, savedInstanceState)
+
+        binding?.refreshLayout?.setOnRefreshListener { this.refresh() }
+        refresh()
+
+        binding?.invitationsView?.acceptCall = {
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                socialRepository.joinGroup(it)
+                userRepository.retrieveUser(false, true)
+                parentFragmentManager.popBackStack()
+                MainNavigationController.navigate(
+                    R.id.partyFragment,
+                    bundleOf(Pair("partyID", userViewModel.partyID)),
+                )
+            }
+        }
+
+        binding?.invitationsView?.rejectCall = {
+            lifecycleScope.launchCatching {
+                socialRepository.rejectGroupInvite(it)
+            }
+            binding?.invitationWrapper?.visibility = View.GONE
+        }
+
+        binding?.invitationsView?.getLeader = { leaderID ->
+            socialRepository.retrieveMember(leaderID)
+        }
+
+        userViewModel.user.observe(viewLifecycleOwner) { user ->
+            val partyInvitations = user?.invitations?.parties ?: emptyList()
+            if (partyInvitations.isNotEmpty()) {
+                binding?.invitationWrapper?.visibility = View.VISIBLE
+                binding?.invitationsView?.setInvitations(partyInvitations)
+            } else {
+                binding?.invitationWrapper?.visibility = View.GONE
+            }
+
+            val isSeeking = user?.party?.seeking != null
+            binding?.seekPartyButton?.isVisible = !isSeeking
+            binding?.seekingPartyWrapper?.isVisible = isSeeking
+        }
+
+        binding?.seekPartyButton?.setOnClickListener {
+            lifecycleScope.launchCatching {
+                userRepository.updateUser("party.seeking", Date())
+            }
+        }
+
+        binding?.leaveSeekingButton?.setOnClickListener {
+            lifecycleScope.launchCatching {
+                userRepository.updateUser("party.seeking", null)
+            }
+        }
+
+        binding?.createPartyButton?.setOnClickListener {
+            val bundle = Bundle()
+            bundle.putString("groupType", "party")
+            bundle.putString("leader", userViewModel.userID)
+            val intent = Intent(mainActivity, GroupFormActivity::class.java)
+            intent.putExtras(bundle)
+            intent.flags = Intent.FLAG_ACTIVITY_REORDER_TO_FRONT
+            groupFormResult.launch(intent)
+        }
+
+        context?.let { context ->
+            DataBindingUtils.loadImage(context, "timeTravelersShop_background_fall") { drawable ->
+                val bitmap = drawable.toBitmap()
+                val aspectRatio = bitmap.width / bitmap.height.toFloat()
+                val height = context.resources.getDimension(R.dimen.shop_height).toInt()
+                val width = (height * aspectRatio).roundToInt()
+                val bitmapDrawable =
+                    BitmapDrawable(
+                        context.resources,
+                        Bitmap.createScaledBitmap(bitmap, width, height, false),
+                    )
+                bitmapDrawable.tileModeX = Shader.TileMode.REPEAT
+                if (binding?.noPartyBackground != null) {
+                    binding?.noPartyBackground?.background = bitmapDrawable
+                }
+            }
+        }
+    }
+
+    private val groupFormResult =
+        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+            if (it.resultCode == Activity.RESULT_OK) {
+                val bundle = it.data?.extras
+                if (bundle?.getString("groupType") == "party") {
+                    lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                        val group =
+                            socialRepository.createGroup(
+                                bundle.getString("name"),
+                                bundle.getString("description"),
+                                bundle.getString("leader"),
+                                "party",
+                                bundle.getString("privacy"),
+                                bundle.getBoolean("leaderCreateChallenge"),
+                            )
+                        userRepository.retrieveUser(false, true)
+                        if (isAdded) {
+                            parentFragmentManager.popBackStack()
+                        }
+                        MainNavigationController.navigate(
+                            R.id.partyFragment,
+                            bundleOf(Pair("partyID", group?.id)),
+                        )
+                    }
+                }
+            }
+        }
+
+    private fun refresh() {
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            val user = userRepository.retrieveUser(false, true)
+            binding?.refreshLayout?.isRefreshing = false
+            if (user?.hasParty == true) {
+                lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                    val group = socialRepository.retrieveGroup("party")
+                    socialRepository.retrievePartyMembers(group?.id ?: "", true)
+                }
+            }
+        }
+    }
+
+    override fun onDestroy() {
+        socialRepository.close()
+        super.onDestroy()
+    }
+}
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 3db3ef11d..9bbfe580b 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
@@ -23,7 +23,6 @@ import com.habitrpg.android.habitica.databinding.FragmentPartyDetailBinding
 import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.helpers.HapticFeedbackManager
-import com.habitrpg.common.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.models.inventory.QuestContent
 import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.models.social.Challenge
@@ -34,7 +33,6 @@ import com.habitrpg.android.habitica.ui.activities.MainActivity
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
 import com.habitrpg.android.habitica.ui.fragments.inventory.items.ItemDialogFragment
 import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard
-import com.habitrpg.common.habitica.theme.HabiticaTheme
 import com.habitrpg.android.habitica.ui.viewHolders.GroupMemberViewHolder
 import com.habitrpg.android.habitica.ui.viewmodels.PartyViewModel
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
@@ -46,8 +44,10 @@ import com.habitrpg.common.habitica.extensions.DataBindingUtils
 import com.habitrpg.common.habitica.extensions.dpToPx
 import com.habitrpg.common.habitica.extensions.loadImage
 import com.habitrpg.common.habitica.helpers.ExceptionHandler
+import com.habitrpg.common.habitica.helpers.MainNavigationController
 import com.habitrpg.common.habitica.helpers.launchCatching
 import com.habitrpg.common.habitica.helpers.setMarkdown
+import com.habitrpg.common.habitica.theme.HabiticaTheme
 import com.habitrpg.common.habitica.views.AvatarView
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.Dispatchers
@@ -60,14 +60,14 @@ import javax.inject.Inject
 @AndroidEntryPoint
 class PartyDetailFragment : BaseFragment<FragmentPartyDetailBinding>() {
     val viewModel: PartyViewModel by viewModels(
-        ownerProducer = { parentFragment as Fragment }
+        ownerProducer = { parentFragment as Fragment },
     )
 
     override var binding: FragmentPartyDetailBinding? = null
 
     override fun createBinding(
         inflater: LayoutInflater,
-        container: ViewGroup?
+        container: ViewGroup?,
     ): FragmentPartyDetailBinding {
         return FragmentPartyDetailBinding.inflate(inflater, container, false)
     }
@@ -92,7 +92,10 @@ class PartyDetailFragment : BaseFragment<FragmentPartyDetailBinding>() {
         super.onDestroyView()
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
         super.onViewCreated(view, savedInstanceState)
         binding?.refreshLayout?.setOnRefreshListener { this.refreshParty() }
 
@@ -114,7 +117,7 @@ class PartyDetailFragment : BaseFragment<FragmentPartyDetailBinding>() {
                     parentFragmentManager.popBackStack()
                     MainNavigationController.navigate(
                         R.id.partyFragment,
-                        bundleOf(Pair("partyID", user?.party?.id))
+                        bundleOf(Pair("partyID", user?.party?.id)),
                     )
                 }
             }
@@ -130,10 +133,11 @@ class PartyDetailFragment : BaseFragment<FragmentPartyDetailBinding>() {
             HabiticaTheme {
                 Column {
                     for (invitedMember in viewModel.pendingInvites) {
-                        val state = viewModel.pendingInviteStates.getOrDefault(
-                            invitedMember.id,
-                            LoadingButtonState.CONTENT
-                        )
+                        val state =
+                            viewModel.pendingInviteStates.getOrDefault(
+                                invitedMember.id,
+                                LoadingButtonState.CONTENT,
+                            )
                         PartySeekingListItem(
                             user = invitedMember,
                             inviteState = state,
@@ -143,7 +147,7 @@ class PartyDetailFragment : BaseFragment<FragmentPartyDetailBinding>() {
                             configManager = appConfigManager,
                             onInvite = {
                                 viewModel.rescindInvite(invitedMember)
-                            }
+                            },
                         )
                     }
                 }
@@ -221,13 +225,18 @@ class PartyDetailFragment : BaseFragment<FragmentPartyDetailBinding>() {
             }
         }
 
-
         if (viewModel.isQuestActive && viewModel.isUserOnQuest) {
             val value = (user.party?.quest?.progress?.up ?: 0F).toDouble()
             val df = DecimalFormat("###.#")
-            binding?.questPendingDamageView?.text = getString(R.string.damage_pending, df.format(value))
+            binding?.questPendingDamageView?.text =
+                getString(R.string.damage_pending, df.format(value))
             val collectedItems = user.party?.quest?.progress?.collectedItems
-            binding?.questPendingItemsView?.text = requireContext().resources.getQuantityString(R.plurals.items_pending, collectedItems ?: 0, collectedItems ?: 0)
+            binding?.questPendingItemsView?.text =
+                requireContext().resources.getQuantityString(
+                    R.plurals.items_pending,
+                    collectedItems ?: 0,
+                    collectedItems ?: 0,
+                )
         }
 
         if ((user.invitations?.parties?.count() ?: 0) > 0) {
@@ -246,7 +255,7 @@ class PartyDetailFragment : BaseFragment<FragmentPartyDetailBinding>() {
                                 getString(
                                     R.string.invitation_title,
                                     member.displayName,
-                                    groupName
+                                    groupName,
                                 )
                         }
                     }
@@ -296,15 +305,15 @@ class PartyDetailFragment : BaseFragment<FragmentPartyDetailBinding>() {
             binding?.questParticipationView?.setTextColor(
                 ContextCompat.getColor(
                     it,
-                    R.color.text_ternary
-                )
+                    R.color.text_ternary,
+                ),
             )
         }
         if (viewModel.isQuestActive) {
             binding?.questProgressView?.visibility = View.VISIBLE
             binding?.questProgressView?.setData(
                 questContent,
-                viewModel.getGroupData().value?.quest?.progress
+                viewModel.getGroupData().value?.quest?.progress,
             )
 
             val questParticipants = viewModel.getGroupData().value?.quest?.members
@@ -320,8 +329,8 @@ class PartyDetailFragment : BaseFragment<FragmentPartyDetailBinding>() {
                     binding?.questParticipationView?.setTextColor(
                         ContextCompat.getColor(
                             it,
-                            R.color.red_10
-                        )
+                            R.color.red_10,
+                        ),
                     )
                 }
                 binding?.questImageWrapper?.alpha = 0.5f
@@ -329,7 +338,6 @@ class PartyDetailFragment : BaseFragment<FragmentPartyDetailBinding>() {
                 binding?.questPendingDamageView?.isVisible = false
                 binding?.questPendingItemsView?.isVisible = false
             }
-
         } else {
             binding?.questProgressView?.visibility = View.GONE
             val members = viewModel.getGroupData().value?.quest?.members
@@ -344,15 +352,16 @@ class PartyDetailFragment : BaseFragment<FragmentPartyDetailBinding>() {
     private fun updateMembersList(members: List<Member>?) {
         val leaderID = viewModel.leaderID
         members?.forEachIndexed { index, member ->
-            val memberView = (
-                if ((binding?.membersWrapper?.childCount ?: 0) > index) {
-                    binding?.membersWrapper?.getChildAt(index)
-                } else {
-                    val view = binding?.membersWrapper?.inflate(R.layout.party_member, false)
-                    binding?.membersWrapper?.addView(view)
-                    view?.tag = member.id
-                    view
-                }
+            val memberView =
+                (
+                    if ((binding?.membersWrapper?.childCount ?: 0) > index) {
+                        binding?.membersWrapper?.getChildAt(index)
+                    } else {
+                        val view = binding?.membersWrapper?.inflate(R.layout.party_member, false)
+                        binding?.membersWrapper?.addView(view)
+                        view?.tag = member.id
+                        view
+                    }
                 ) ?: return@forEachIndexed
             val viewHolder = GroupMemberViewHolder(memberView)
             viewHolder.bind(member, leaderID ?: "", viewModel.user.value?.id)
@@ -371,7 +380,10 @@ class PartyDetailFragment : BaseFragment<FragmentPartyDetailBinding>() {
         }
     }
 
-    private fun showSendMessageToUserDialog(userID: String, username: String) {
+    private fun showSendMessageToUserDialog(
+        userID: String,
+        username: String,
+    ) {
         val factory = LayoutInflater.from(context)
         val newMessageView = factory.inflate(R.layout.profile_new_message_dialog, null)
 
@@ -389,7 +401,7 @@ class PartyDetailFragment : BaseFragment<FragmentPartyDetailBinding>() {
                     HabiticaSnackbar.showSnackbar(
                         it1,
                         String.format(getString(R.string.profile_message_sent_to), username),
-                        HabiticaSnackbar.SnackbarDisplayType.NORMAL
+                        HabiticaSnackbar.SnackbarDisplayType.NORMAL,
                     )
                 }
             }
@@ -397,13 +409,16 @@ class PartyDetailFragment : BaseFragment<FragmentPartyDetailBinding>() {
         }
         addMessageDialog?.addButton(
             android.R.string.cancel,
-            false
+            false,
         ) { _, _ -> activity?.dismissKeyboard() }
         addMessageDialog?.setAdditionalContentView(newMessageView)
         addMessageDialog?.show()
     }
 
-    private fun showTransferOwnerShipDialog(userID: String, displayName: String) {
+    private fun showTransferOwnerShipDialog(
+        userID: String,
+        displayName: String,
+    ) {
         val dialog = context?.let { HabiticaAlertDialog(it) }
         dialog?.addButton(R.string.transfer, true) { _, _ ->
             lifecycleScope.launch(ExceptionHandler.coroutine()) {
@@ -412,7 +427,7 @@ class PartyDetailFragment : BaseFragment<FragmentPartyDetailBinding>() {
                     HabiticaSnackbar.showSnackbar(
                         it1,
                         String.format(getString(R.string.transferred_ownership), displayName),
-                        HabiticaSnackbar.SnackbarDisplayType.NORMAL
+                        HabiticaSnackbar.SnackbarDisplayType.NORMAL,
                     )
                 }
             }
@@ -423,13 +438,16 @@ class PartyDetailFragment : BaseFragment<FragmentPartyDetailBinding>() {
         dialog?.setMessage(
             context?.getString(
                 R.string.transfer_ownership_confirm_message,
-                displayName
-            )
+                displayName,
+            ),
         )
         dialog?.show()
     }
 
-    private fun showRemoveMemberDialog(userID: String, displayName: String) {
+    private fun showRemoveMemberDialog(
+        userID: String,
+        displayName: String,
+    ) {
         val dialog = context?.let { HabiticaAlertDialog(it) }
         dialog?.addButton(R.string.remove, true) { _, _ ->
             lifecycleScope.launch(ExceptionHandler.coroutine()) {
@@ -438,7 +456,7 @@ class PartyDetailFragment : BaseFragment<FragmentPartyDetailBinding>() {
                     HabiticaSnackbar.showSnackbar(
                         it1,
                         String.format(getString(R.string.removed_member), displayName),
-                        HabiticaSnackbar.SnackbarDisplayType.NORMAL
+                        HabiticaSnackbar.SnackbarDisplayType.NORMAL,
                     )
                     binding?.membersWrapper?.findViewWithTag<View>(userID)?.let { memberView ->
                         binding?.membersWrapper?.removeView(memberView)
@@ -497,7 +515,7 @@ class PartyDetailFragment : BaseFragment<FragmentPartyDetailBinding>() {
                     alert.addButton(
                         R.string.leave_challenges_delete_tasks,
                         false,
-                        isDestructive = true
+                        isDestructive = true,
                     ) { _, _ ->
                         viewModel.leaveGroup(groupChallenges, false) {
                             parentFragmentManager.popBackStack()
@@ -513,7 +531,7 @@ class PartyDetailFragment : BaseFragment<FragmentPartyDetailBinding>() {
                     alert.addButton(
                         R.string.leave,
                         isPrimary = true,
-                        isDestructive = true
+                        isDestructive = true,
                     ) { _, _ ->
                         viewModel.leaveGroup(groupChallenges, false) {
                             if (isAdded) {
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 c431924eb..0176c9cd7 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
@@ -1,197 +1,212 @@
-package com.habitrpg.android.habitica.ui.fragments.social.party
-
-import android.app.Activity
-import android.content.Intent
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
-import android.view.View
-import android.view.ViewGroup
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.viewModels
-import androidx.viewpager2.adapter.FragmentStateAdapter
-import com.google.android.material.tabs.TabLayoutMediator
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.databinding.FragmentViewpagerBinding
-import com.habitrpg.common.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.models.social.Group
-import com.habitrpg.android.habitica.ui.activities.GroupFormActivity
-import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
-import com.habitrpg.android.habitica.ui.fragments.social.PartyChatFragment
-import com.habitrpg.android.habitica.ui.viewmodels.GroupViewType
-import com.habitrpg.android.habitica.ui.viewmodels.PartyViewModel
-import dagger.hilt.android.AndroidEntryPoint
-
-@AndroidEntryPoint
-class PartyFragment : BaseMainFragment<FragmentViewpagerBinding>() {
-
-    private var detailFragment: PartyDetailFragment? = null
-    private var viewPagerAdapter: FragmentStateAdapter? = null
-
-    internal val viewModel: PartyViewModel by viewModels()
-
-    override var binding: FragmentViewpagerBinding? = null
-
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentViewpagerBinding {
-        return FragmentViewpagerBinding.inflate(inflater, container, false)
-    }
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        this.usesTabLayout = true
-        this.hidesToolbar = true
-        return super.onCreateView(inflater, container, savedInstanceState)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        viewModel.groupViewType = GroupViewType.PARTY
-
-        viewModel.getGroupData().observe(
-            viewLifecycleOwner
-        ) {
-            updateGroupUI(it)
-        }
-
-        binding?.viewPager?.currentItem = 0
-
-        setViewPagerAdapter()
-
-        arguments?.let {
-            val args = PartyFragmentArgs.fromBundle(it)
-            binding?.viewPager?.post {
-                binding?.viewPager?.currentItem = args.tabToOpen
-            }
-            if (args.partyID?.isNotBlank() == true) {
-                viewModel.setGroupID(args.partyID ?: "")
-            }
-        }
-
-        viewModel.loadPartyID()
-
-        viewModel.retrieveGroup {}
-    }
-
-    override fun onResume() {
-        if (viewModel.isLeader) {
-            this.tutorialStepIdentifier = "party"
-            this.tutorialTexts = listOf(getString(R.string.tutorial_party_created))
-        }
-        super.onResume()
-    }
-
-    private fun updateGroupUI(group: Group?) {
-        viewPagerAdapter?.notifyDataSetChanged()
-
-        if (group == null) {
-            tabLayout?.visibility = View.GONE
-            return
-        } else {
-            tabLayout?.visibility = View.VISIBLE
-        }
-
-        this.mainActivity?.invalidateOptionsMenu()
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        super.onCreateOptionsMenu(menu, inflater)
-        val group = viewModel.getGroupData().value
-        if (viewModel.isLeader) {
-            inflater.inflate(R.menu.menu_party_admin, menu)
-            menu.findItem(R.id.menu_guild_leave).isVisible = group?.memberCount != 1
-        } else {
-            inflater.inflate(R.menu.menu_party, menu)
-        }
-    }
-
-    @Suppress("ReturnCount")
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            R.id.menu_invite_item -> {
-                MainNavigationController.navigate(R.id.partyInvitationFragment)
-                return true
-            }
-            R.id.menu_guild_edit -> {
-                this.displayEditForm()
-                return true
-            }
-            R.id.menu_guild_leave -> {
-                detailFragment?.leaveParty()
-                return true
-            }
-            R.id.menu_guild_refresh -> {
-                viewModel.retrieveGroupChat { }
-                viewModel.retrieveGroup { }
-                return true
-            }
-        }
-
-        return super.onOptionsItemSelected(item)
-    }
-
-    private fun displayEditForm() {
-        val bundle = Bundle()
-        val group = viewModel.getGroupData().value
-        bundle.putString("groupID", group?.id)
-        bundle.putString("name", group?.name)
-        bundle.putString("groupType", group?.type)
-        bundle.putString("description", group?.description)
-        bundle.putString("leader", group?.leaderID)
-        bundle.putBoolean("leaderCreateChallenge", group?.leaderOnlyChallenges ?: false)
-
-        val intent = Intent(mainActivity, GroupFormActivity::class.java)
-        intent.putExtras(bundle)
-        intent.flags = Intent.FLAG_ACTIVITY_REORDER_TO_FRONT
-        groupFormResult.launch(intent)
-    }
-
-    private val groupFormResult = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-        if (it.resultCode == Activity.RESULT_OK) {
-            viewModel.updateOrCreateGroup(it.data?.extras)
-        }
-    }
-
-    private fun setViewPagerAdapter() {
-        val fragmentManager = childFragmentManager
-
-        viewPagerAdapter = object : FragmentStateAdapter(fragmentManager, lifecycle) {
-
-            override fun createFragment(position: Int): Fragment {
-                return when (position) {
-                    0 -> {
-                        detailFragment = PartyDetailFragment()
-                        detailFragment
-                    }
-                    1 -> {
-                        PartyChatFragment()
-                    }
-                    else -> Fragment()
-                } ?: Fragment()
-            }
-
-            override fun getItemCount(): Int {
-                return 2
-            }
-        }
-        binding?.viewPager?.adapter = viewPagerAdapter
-
-        tabLayout?.let {
-            binding?.viewPager?.let { it1 ->
-                TabLayoutMediator(it, it1) { tab, position ->
-                    tab.text = when (position) {
-                        0 -> context?.getString(R.string.party)
-                        1 -> context?.getString(R.string.chat)
-                        else -> ""
-                    }
-                }.attach()
-            }
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.social.party
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
+import androidx.viewpager2.adapter.FragmentStateAdapter
+import com.google.android.material.tabs.TabLayoutMediator
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.FragmentViewpagerBinding
+import com.habitrpg.android.habitica.models.social.Group
+import com.habitrpg.android.habitica.ui.activities.GroupFormActivity
+import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
+import com.habitrpg.android.habitica.ui.fragments.social.PartyChatFragment
+import com.habitrpg.android.habitica.ui.viewmodels.GroupViewType
+import com.habitrpg.android.habitica.ui.viewmodels.PartyViewModel
+import com.habitrpg.common.habitica.helpers.MainNavigationController
+import dagger.hilt.android.AndroidEntryPoint
+
+@AndroidEntryPoint
+class PartyFragment : BaseMainFragment<FragmentViewpagerBinding>() {
+    private var detailFragment: PartyDetailFragment? = null
+    private var viewPagerAdapter: FragmentStateAdapter? = null
+
+    internal val viewModel: PartyViewModel by viewModels()
+
+    override var binding: FragmentViewpagerBinding? = null
+
+    override fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+    ): FragmentViewpagerBinding {
+        return FragmentViewpagerBinding.inflate(inflater, container, false)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?,
+    ): View? {
+        this.usesTabLayout = true
+        this.hidesToolbar = true
+        return super.onCreateView(inflater, container, savedInstanceState)
+    }
+
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
+        super.onViewCreated(view, savedInstanceState)
+
+        viewModel.groupViewType = GroupViewType.PARTY
+
+        viewModel.getGroupData().observe(
+            viewLifecycleOwner,
+        ) {
+            updateGroupUI(it)
+        }
+
+        binding?.viewPager?.currentItem = 0
+
+        setViewPagerAdapter()
+
+        arguments?.let {
+            val args = PartyFragmentArgs.fromBundle(it)
+            binding?.viewPager?.post {
+                binding?.viewPager?.currentItem = args.tabToOpen
+            }
+            if (args.partyID?.isNotBlank() == true) {
+                viewModel.setGroupID(args.partyID ?: "")
+            }
+        }
+
+        viewModel.loadPartyID()
+
+        viewModel.retrieveGroup {}
+    }
+
+    override fun onResume() {
+        if (viewModel.isLeader) {
+            this.tutorialStepIdentifier = "party"
+            this.tutorialTexts = listOf(getString(R.string.tutorial_party_created))
+        }
+        super.onResume()
+    }
+
+    private fun updateGroupUI(group: Group?) {
+        viewPagerAdapter?.notifyDataSetChanged()
+
+        if (group == null) {
+            tabLayout?.visibility = View.GONE
+            return
+        } else {
+            tabLayout?.visibility = View.VISIBLE
+        }
+
+        this.mainActivity?.invalidateOptionsMenu()
+    }
+
+    override fun onCreateOptionsMenu(
+        menu: Menu,
+        inflater: MenuInflater,
+    ) {
+        super.onCreateOptionsMenu(menu, inflater)
+        val group = viewModel.getGroupData().value
+        if (viewModel.isLeader) {
+            inflater.inflate(R.menu.menu_party_admin, menu)
+            menu.findItem(R.id.menu_guild_leave).isVisible = group?.memberCount != 1
+        } else {
+            inflater.inflate(R.menu.menu_party, menu)
+        }
+    }
+
+    @Suppress("ReturnCount")
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+            R.id.menu_invite_item -> {
+                MainNavigationController.navigate(R.id.partyInvitationFragment)
+                return true
+            }
+
+            R.id.menu_guild_edit -> {
+                this.displayEditForm()
+                return true
+            }
+
+            R.id.menu_guild_leave -> {
+                detailFragment?.leaveParty()
+                return true
+            }
+
+            R.id.menu_guild_refresh -> {
+                viewModel.retrieveGroupChat { }
+                viewModel.retrieveGroup { }
+                return true
+            }
+        }
+
+        return super.onOptionsItemSelected(item)
+    }
+
+    private fun displayEditForm() {
+        val bundle = Bundle()
+        val group = viewModel.getGroupData().value
+        bundle.putString("groupID", group?.id)
+        bundle.putString("name", group?.name)
+        bundle.putString("groupType", group?.type)
+        bundle.putString("description", group?.description)
+        bundle.putString("leader", group?.leaderID)
+        bundle.putBoolean("leaderCreateChallenge", group?.leaderOnlyChallenges ?: false)
+
+        val intent = Intent(mainActivity, GroupFormActivity::class.java)
+        intent.putExtras(bundle)
+        intent.flags = Intent.FLAG_ACTIVITY_REORDER_TO_FRONT
+        groupFormResult.launch(intent)
+    }
+
+    private val groupFormResult =
+        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+            if (it.resultCode == Activity.RESULT_OK) {
+                viewModel.updateOrCreateGroup(it.data?.extras)
+            }
+        }
+
+    private fun setViewPagerAdapter() {
+        val fragmentManager = childFragmentManager
+
+        viewPagerAdapter =
+            object : FragmentStateAdapter(fragmentManager, lifecycle) {
+                override fun createFragment(position: Int): Fragment {
+                    return when (position) {
+                        0 -> {
+                            detailFragment = PartyDetailFragment()
+                            detailFragment
+                        }
+
+                        1 -> {
+                            PartyChatFragment()
+                        }
+
+                        else -> Fragment()
+                    } ?: Fragment()
+                }
+
+                override fun getItemCount(): Int {
+                    return 2
+                }
+            }
+        binding?.viewPager?.adapter = viewPagerAdapter
+
+        tabLayout?.let {
+            binding?.viewPager?.let { it1 ->
+                TabLayoutMediator(it, it1) { tab, position ->
+                    tab.text =
+                        when (position) {
+                            0 -> context?.getString(R.string.party)
+                            1 -> context?.getString(R.string.chat)
+                            else -> ""
+                        }
+                }.attach()
+            }
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyInviteFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyInviteFragment.kt
index b063de9a4..dc0c9b771 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyInviteFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyInviteFragment.kt
@@ -52,16 +52,16 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.databinding.FragmentComposeBinding
-import com.habitrpg.common.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.models.invitations.InviteResponse
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
 import com.habitrpg.android.habitica.ui.theme.colors
-import com.habitrpg.common.habitica.theme.HabiticaTheme
 import com.habitrpg.android.habitica.ui.viewmodels.BaseViewModel
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import com.habitrpg.android.habitica.ui.views.LoadingButtonState
 import com.habitrpg.common.habitica.extensions.isValidEmail
+import com.habitrpg.common.habitica.helpers.MainNavigationController
 import com.habitrpg.common.habitica.helpers.launchCatching
+import com.habitrpg.common.habitica.theme.HabiticaTheme
 import dagger.hilt.android.AndroidEntryPoint
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.delay
@@ -79,36 +79,39 @@ fun uUIDFromStringOrNull(name: String): UUID? {
 }
 
 @HiltViewModel
-class PartyInviteViewModel @Inject constructor(
-    userRepository: UserRepository,
-    userViewModel: MainUserViewModel,
-    val socialRepository: SocialRepository
-) : BaseViewModel(userRepository, userViewModel) {
-    val invites = mutableStateListOf("")
+class PartyInviteViewModel
+    @Inject
+    constructor(
+        userRepository: UserRepository,
+        userViewModel: MainUserViewModel,
+        val socialRepository: SocialRepository,
+    ) : BaseViewModel(userRepository, userViewModel) {
+        val invites = mutableStateListOf("")
 
-    suspend fun sendInvites(): List<InviteResponse>? {
-        val inviteMap = mapOf<String, MutableList<Any>>(
-            "emails" to mutableListOf(),
-            "uuids" to mutableListOf(),
-            "usernames" to mutableListOf()
-        )
-        for (invite in invites) {
-            if (invite.isValidEmail()) {
-                inviteMap["emails"]?.add(
-                    mapOf(
-                        "name" to "",
-                        "email" to invite
-                    )
+        suspend fun sendInvites(): List<InviteResponse>? {
+            val inviteMap =
+                mapOf<String, MutableList<Any>>(
+                    "emails" to mutableListOf(),
+                    "uuids" to mutableListOf(),
+                    "usernames" to mutableListOf(),
                 )
-            } else if (uUIDFromStringOrNull(invite) != null) {
-                inviteMap["uuids"]?.add(invite)
-            } else if (invite.isNotBlank()) {
-                inviteMap["usernames"]?.add(invite)
+            for (invite in invites) {
+                if (invite.isValidEmail()) {
+                    inviteMap["emails"]?.add(
+                        mapOf(
+                            "name" to "",
+                            "email" to invite,
+                        ),
+                    )
+                } else if (uUIDFromStringOrNull(invite) != null) {
+                    inviteMap["uuids"]?.add(invite)
+                } else if (invite.isNotBlank()) {
+                    inviteMap["usernames"]?.add(invite)
+                }
             }
+            return socialRepository.inviteToGroup("party", inviteMap)
         }
-        return socialRepository.inviteToGroup("party", inviteMap)
     }
-}
 
 @AndroidEntryPoint
 class PartyInviteFragment : BaseFragment<FragmentComposeBinding>() {
@@ -118,7 +121,7 @@ class PartyInviteFragment : BaseFragment<FragmentComposeBinding>() {
 
     override fun createBinding(
         inflater: LayoutInflater,
-        container: ViewGroup?
+        container: ViewGroup?,
     ): FragmentComposeBinding {
         return FragmentComposeBinding.inflate(inflater, container, false)
     }
@@ -126,7 +129,7 @@ class PartyInviteFragment : BaseFragment<FragmentComposeBinding>() {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View? {
         val view = super.onCreateView(inflater, container, savedInstanceState)
         binding?.composeView?.setContent {
@@ -144,7 +147,7 @@ class PartyInviteFragment : BaseFragment<FragmentComposeBinding>() {
 @Composable
 fun PartyInviteView(
     viewModel: PartyInviteViewModel,
-    dismiss: () -> Unit
+    dismiss: () -> Unit,
 ) {
     var inviteButtonState: LoadingButtonState by remember { mutableStateOf(LoadingButtonState.CONTENT) }
     val scope = rememberCoroutineScope()
@@ -154,26 +157,27 @@ fun PartyInviteView(
         Modifier
             .fillMaxSize()
             .padding(14.dp)
-            .scrollable(scrollableState, Orientation.Vertical)
+            .scrollable(scrollableState, Orientation.Vertical),
     ) {
         item {
             Column(
                 horizontalAlignment = Alignment.CenterHorizontally,
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(top = 22.dp, bottom = 14.dp)
+                modifier =
+                    Modifier
+                        .fillMaxWidth()
+                        .padding(top = 22.dp, bottom = 14.dp),
             ) {
                 Text(
                     stringResource(R.string.invite_with_username_email),
                     color = HabiticaTheme.colors.textPrimary,
                     fontSize = 16.sp,
                     fontWeight = FontWeight.Medium,
-                    modifier = Modifier.padding(bottom = 4.dp)
+                    modifier = Modifier.padding(bottom = 4.dp),
                 )
                 Text(
                     stringResource(R.string.habiticans_send_invite),
                     color = HabiticaTheme.colors.textSecondary,
-                    style = TextStyle(fontSize = 16.sp, fontWeight = FontWeight.Normal)
+                    style = TextStyle(fontSize = 16.sp, fontWeight = FontWeight.Normal),
                 )
             }
         }
@@ -181,20 +185,22 @@ fun PartyInviteView(
             if (viewModel.invites.size <= index) return@items
             val invite = viewModel.invites[index]
             val transition = updateTransition(viewModel.invites.size - 1 == index, label = "isLast")
-            val rotation = transition.animateFloat(
-                label = "isAssigned",
-                transitionSpec = { spring(Spring.DampingRatioLowBouncy, Spring.StiffnessMediumLow) }
-            ) {
-                if (it) 135f else 0f
-            }
+            val rotation =
+                transition.animateFloat(
+                    label = "isAssigned",
+                    transitionSpec = { spring(Spring.DampingRatioLowBouncy, Spring.StiffnessMediumLow) },
+                ) {
+                    if (it) 135f else 0f
+                }
             Row(
                 verticalAlignment = Alignment.CenterVertically,
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(0.dp, 4.dp)
-                    .background(HabiticaTheme.colors.windowBackground, HabiticaTheme.shapes.medium)
-                    .padding(4.dp, 4.dp)
-                    .animateItemPlacement()
+                modifier =
+                    Modifier
+                        .fillMaxWidth()
+                        .padding(0.dp, 4.dp)
+                        .background(HabiticaTheme.colors.windowBackground, HabiticaTheme.shapes.medium)
+                        .padding(4.dp, 4.dp)
+                        .animateItemPlacement(),
             ) {
                 Button(
                     onClick = {
@@ -205,17 +211,19 @@ fun PartyInviteView(
                     colors = ButtonDefaults.textButtonColors(),
                     elevation = ButtonDefaults.elevation(0.dp),
                     contentPadding = PaddingValues(0.dp),
-                    modifier = Modifier
-                        .size(32.dp)
-                        .padding(3.dp)
+                    modifier =
+                        Modifier
+                            .size(32.dp)
+                            .padding(3.dp),
                 ) {
                     Image(
                         painterResource(R.drawable.ic_close_white_24dp),
                         null,
                         colorFilter = ColorFilter.tint(HabiticaTheme.colors.textPrimary),
-                        modifier = Modifier
-                            .rotate(rotation.value)
-                            .size(32.dp)
+                        modifier =
+                            Modifier
+                                .rotate(rotation.value)
+                                .size(32.dp),
                     )
                 }
 
@@ -230,20 +238,22 @@ fun PartyInviteView(
                     singleLine = true,
                     textStyle = TextStyle(fontSize = 16.sp),
                     placeholder = { Text(stringResource(R.string.username_or_email)) },
-                    colors = TextFieldDefaults.textFieldColors(
-                        backgroundColor = Color.Transparent,
-                        unfocusedIndicatorColor = Color.Transparent,
-                        focusedIndicatorColor = Color.Transparent,
-                        textColor = HabiticaTheme.colors.textPrimary
-                    ),
-                    modifier = Modifier
-                        .onFocusChanged {
-                            if (!it.isFocused) {
-                                if (viewModel.invites.size > index && viewModel.invites[index].isBlank() && viewModel.invites.size - 1 != index && viewModel.invites.size > 1) {
-                                    viewModel.invites.removeAt(index)
+                    colors =
+                        TextFieldDefaults.textFieldColors(
+                            backgroundColor = Color.Transparent,
+                            unfocusedIndicatorColor = Color.Transparent,
+                            focusedIndicatorColor = Color.Transparent,
+                            textColor = HabiticaTheme.colors.textPrimary,
+                        ),
+                    modifier =
+                        Modifier
+                            .onFocusChanged {
+                                if (!it.isFocused) {
+                                    if (viewModel.invites.size > index && viewModel.invites[index].isBlank() && viewModel.invites.size - 1 != index && viewModel.invites.size > 1) {
+                                        viewModel.invites.removeAt(index)
+                                    }
                                 }
-                            }
-                        }
+                            },
                 )
             }
         }
@@ -271,7 +281,7 @@ fun PartyInviteView(
                             inviteButtonState = LoadingButtonState.CONTENT
                         }
                     }
-                }
+                },
             )
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyInvitePagerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyInvitePagerFragment.kt
index 7eaef5b9b..121a9b3a4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyInvitePagerFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyInvitePagerFragment.kt
@@ -17,14 +17,13 @@ import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
 class PartyInvitePagerFragment : BaseMainFragment<FragmentViewpagerBinding>() {
-
     override var binding: FragmentViewpagerBinding? = null
 
     internal val viewModel: PartyViewModel by viewModels()
 
     override fun createBinding(
         inflater: LayoutInflater,
-        container: ViewGroup?
+        container: ViewGroup?,
     ): FragmentViewpagerBinding {
         return FragmentViewpagerBinding.inflate(inflater, container, false)
     }
@@ -32,7 +31,7 @@ class PartyInvitePagerFragment : BaseMainFragment<FragmentViewpagerBinding>() {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View? {
         this.usesTabLayout = true
         this.hidesToolbar = true
@@ -49,7 +48,10 @@ class PartyInvitePagerFragment : BaseMainFragment<FragmentViewpagerBinding>() {
         return super.onCreateView(inflater, container, savedInstanceState)
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
         super.onViewCreated(view, savedInstanceState)
 
         setViewPagerAdapter()
@@ -58,37 +60,39 @@ class PartyInvitePagerFragment : BaseMainFragment<FragmentViewpagerBinding>() {
 
     private fun setViewPagerAdapter() {
         val fragmentManager = childFragmentManager
-        binding?.viewPager?.adapter = object : FragmentStateAdapter(fragmentManager, lifecycle) {
-            override fun createFragment(position: Int): Fragment {
-                return when (position) {
-                    0 -> {
-                        if (viewModel.isLeader) {
-                            PartySeekingFragment()
-                        } else {
+        binding?.viewPager?.adapter =
+            object : FragmentStateAdapter(fragmentManager, lifecycle) {
+                override fun createFragment(position: Int): Fragment {
+                    return when (position) {
+                        0 -> {
+                            if (viewModel.isLeader) {
+                                PartySeekingFragment()
+                            } else {
+                                PartyInviteFragment()
+                            }
+                        }
+
+                        1 -> {
                             PartyInviteFragment()
                         }
-                    }
 
-                    1 -> {
-                        PartyInviteFragment()
+                        else -> Fragment()
                     }
+                }
 
-                    else -> Fragment()
+                override fun getItemCount(): Int {
+                    return if (viewModel.isLeader) 2 else 1
                 }
             }
-
-            override fun getItemCount(): Int {
-                return if (viewModel.isLeader) 2 else 1
-            }
-        }
         tabLayout?.let {
             binding?.viewPager?.let { it1 ->
                 TabLayoutMediator(it, it1) { tab, position ->
-                    tab.text = when (position) {
-                        0 -> context?.getString(R.string.list)
-                        1 -> context?.getString(R.string.by_invite)
-                        else -> ""
-                    }
+                    tab.text =
+                        when (position) {
+                            0 -> context?.getString(R.string.list)
+                            1 -> context?.getString(R.string.by_invite)
+                            else -> ""
+                        }
                 }.attach()
             }
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartySeekingFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartySeekingFragment.kt
index 3db12aedb..495f5ab70 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartySeekingFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartySeekingFragment.kt
@@ -9,7 +9,7 @@ import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
-import androidx.compose.animation.with
+import androidx.compose.animation.togetherWith
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Arrangement
@@ -62,16 +62,16 @@ import com.habitrpg.android.habitica.models.invitations.InviteResponse
 import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
 import com.habitrpg.android.habitica.ui.theme.colors
-import com.habitrpg.common.habitica.theme.HabiticaTheme
 import com.habitrpg.android.habitica.ui.viewmodels.BaseViewModel
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import com.habitrpg.android.habitica.ui.views.LoadingButton
 import com.habitrpg.android.habitica.ui.views.LoadingButtonState
 import com.habitrpg.android.habitica.ui.views.LoadingButtonType
-import com.habitrpg.common.habitica.views.HabiticaCircularProgressView
 import com.habitrpg.android.habitica.ui.views.progress.HabiticaPullRefreshIndicator
 import com.habitrpg.android.habitica.ui.views.social.PartySeekingListItem
 import com.habitrpg.common.habitica.helpers.launchCatching
+import com.habitrpg.common.habitica.theme.HabiticaTheme
+import com.habitrpg.common.habitica.views.HabiticaCircularProgressView
 import dagger.hilt.android.AndroidEntryPoint
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.delay
@@ -81,49 +81,55 @@ import kotlin.time.DurationUnit
 import kotlin.time.toDuration
 
 @HiltViewModel
-class PartySeekingViewModel @Inject constructor(
-    userRepository: UserRepository,
-    userViewModel: MainUserViewModel,
-    val socialRepository: SocialRepository,
-    val configManager: AppConfigManager
-) : BaseViewModel(userRepository, userViewModel) {
-    val isRefreshing = mutableStateOf(false)
-    val seekingUsers: Flow<PagingData<Member>>
-    val inviteStates = mutableStateMapOf<String, Pair<Boolean, LoadingButtonState>>()
-    init {
-        seekingUsers = Pager(
-            config = PagingConfig(
-                pageSize = 30,
-                prefetchDistance = 10
-            ),
-            pagingSourceFactory = {
-                PartySeekingPagingSource(socialRepository)
-            }
-        ).flow.cachedIn(viewModelScope)
-    }
+class PartySeekingViewModel
+    @Inject
+    constructor(
+        userRepository: UserRepository,
+        userViewModel: MainUserViewModel,
+        val socialRepository: SocialRepository,
+        val configManager: AppConfigManager,
+    ) : BaseViewModel(userRepository, userViewModel) {
+        val isRefreshing = mutableStateOf(false)
+        val seekingUsers: Flow<PagingData<Member>>
+        val inviteStates = mutableStateMapOf<String, Pair<Boolean, LoadingButtonState>>()
 
-    suspend fun inviteUser(member: Member): InviteResponse? {
-        return socialRepository.inviteToGroup(
-            "party",
-            mapOf(
-                "uuids" to listOf(member.id)
-            )
-        )?.firstOrNull()
-    }
+        init {
+            seekingUsers =
+                Pager(
+                    config =
+                        PagingConfig(
+                            pageSize = 30,
+                            prefetchDistance = 10,
+                        ),
+                    pagingSourceFactory = {
+                        PartySeekingPagingSource(socialRepository)
+                    },
+                ).flow.cachedIn(viewModelScope)
+        }
 
-    suspend fun rescindInvite(member: Member): Member? {
-        return socialRepository.removeMemberFromGroup("party", member.id)?.firstOrNull()
+        suspend fun inviteUser(member: Member): InviteResponse? {
+            return socialRepository.inviteToGroup(
+                "party",
+                mapOf(
+                    "uuids" to listOf(member.id),
+                ),
+            )?.firstOrNull()
+        }
+
+        suspend fun rescindInvite(member: Member): Member? {
+            return socialRepository.removeMemberFromGroup("party", member.id)?.firstOrNull()
+        }
     }
-}
 
 @AndroidEntryPoint
 class PartySeekingFragment : BaseFragment<FragmentComposeBinding>() {
     val viewModel: PartySeekingViewModel by viewModels()
 
     override var binding: FragmentComposeBinding? = null
+
     override fun createBinding(
         inflater: LayoutInflater,
-        container: ViewGroup?
+        container: ViewGroup?,
     ): FragmentComposeBinding {
         return FragmentComposeBinding.inflate(inflater)
     }
@@ -131,7 +137,7 @@ class PartySeekingFragment : BaseFragment<FragmentComposeBinding>() {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View? {
         val view = super.onCreateView(inflater, container, savedInstanceState)
         binding?.composeView?.setContent {
@@ -154,28 +160,29 @@ fun InviteButton(
     state: LoadingButtonState,
     onClick: () -> Unit,
     modifier: Modifier = Modifier,
-    isAlreadyInvited: Boolean = false
+    isAlreadyInvited: Boolean = false,
 ) {
     AnimatedContent(
         transitionSpec = {
-            fadeIn(animationSpec = tween(220, delayMillis = 90)) with
+            fadeIn(animationSpec = tween(220, delayMillis = 90)) togetherWith
                 fadeOut(animationSpec = tween(90))
         },
-        targetState = isAlreadyInvited
+        targetState = isAlreadyInvited,
     ) { isInvited ->
         if (isInvited) {
             LoadingButton(
                 state = state,
                 onClick = onClick,
                 type = LoadingButtonType.DESTRUCTIVE,
-                colors = ButtonDefaults.buttonColors(
-                    backgroundColor = HabiticaTheme.colors.errorBackground,
-                    contentColor = Color.White
-                ),
+                colors =
+                    ButtonDefaults.buttonColors(
+                        backgroundColor = HabiticaTheme.colors.errorBackground,
+                        contentColor = Color.White,
+                    ),
                 modifier = modifier,
                 successContent = {
                     Text(stringResource(R.string.rescinded))
-                }
+                },
             ) {
                 Text(stringResource(R.string.rescind_invite))
             }
@@ -186,7 +193,7 @@ fun InviteButton(
                 modifier = modifier,
                 successContent = {
                     Text(stringResource(R.string.invited))
-                }
+                },
             ) {
                 Text(stringResource(R.string.send_invite))
             }
@@ -198,7 +205,7 @@ fun InviteButton(
 @Composable
 fun PartySeekingView(
     viewModel: PartySeekingViewModel,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     val pageData = viewModel.seekingUsers.collectAsLazyPagingItems()
     val refreshing by viewModel.isRefreshing
@@ -206,24 +213,26 @@ fun PartySeekingView(
     val scope = rememberCoroutineScope()
 
     Box(
-        modifier = modifier
-            .fillMaxSize()
-            .pullRefresh(pullRefreshState)
+        modifier =
+            modifier
+                .fillMaxSize()
+                .pullRefresh(pullRefreshState),
     ) {
         LazyColumn {
             item {
                 Column(
                     horizontalAlignment = Alignment.CenterHorizontally,
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .padding(top = 36.dp, bottom = 14.dp)
+                    modifier =
+                        Modifier
+                            .fillMaxWidth()
+                            .padding(top = 36.dp, bottom = 14.dp),
                 ) {
                     Text(
                         stringResource(R.string.find_more_members),
                         color = HabiticaTheme.colors.textPrimary,
                         fontSize = 16.sp,
                         fontWeight = FontWeight.Medium,
-                        modifier = Modifier.padding(bottom = 4.dp)
+                        modifier = Modifier.padding(bottom = 4.dp),
                     )
                     if (pageData.itemCount == 0 && pageData.loadState.refresh is LoadState.NotLoading && pageData.loadState.append is LoadState.NotLoading) {
                         Text(
@@ -231,14 +240,15 @@ fun PartySeekingView(
                             textAlign = TextAlign.Center,
                             style = TextStyle(fontSize = 16.sp, fontWeight = FontWeight.Normal),
                             color = HabiticaTheme.colors.textSecondary,
-                            modifier = Modifier
-                                .width(320.dp)
-                                .align(alignment = Alignment.CenterHorizontally)
+                            modifier =
+                                Modifier
+                                    .width(320.dp)
+                                    .align(alignment = Alignment.CenterHorizontally),
                         )
                         Image(
                             painterResource(R.drawable.looking_for_party_empty),
                             null,
-                            modifier = Modifier.padding(top = 50.dp)
+                            modifier = Modifier.padding(top = 50.dp),
                         )
                     } else {
                         Text(
@@ -246,38 +256,53 @@ fun PartySeekingView(
                             textAlign = TextAlign.Center,
                             style = TextStyle(fontSize = 16.sp, fontWeight = FontWeight.Normal),
                             color = HabiticaTheme.colors.textSecondary,
-                            modifier = Modifier
-                                .width(320.dp)
-                                .align(alignment = Alignment.CenterHorizontally)
+                            modifier =
+                                Modifier
+                                    .width(320.dp)
+                                    .align(alignment = Alignment.CenterHorizontally),
                         )
                     }
                 }
             }
             items(
-                pageData.itemCount
+                pageData.itemCount,
             ) {
                 val item = pageData[it] ?: return@items
                 PartySeekingListItem(
                     user = item,
-                    inviteState = viewModel.inviteStates[item.id]?.second ?: LoadingButtonState.CONTENT,
+                    inviteState =
+                        viewModel.inviteStates[item.id]?.second
+                            ?: LoadingButtonState.CONTENT,
                     isInvited = viewModel.inviteStates[item.id]?.first ?: false,
                     configManager = viewModel.configManager,
-                    modifier = Modifier
-                        .animateItemPlacement()
-                        .padding(horizontal = 14.dp)
+                    modifier =
+                        Modifier
+                            .animateItemPlacement()
+                            .padding(horizontal = 14.dp),
                 ) { member ->
                     scope.launchCatching({
                         viewModel.inviteStates[member.id] = Pair(false, LoadingButtonState.FAILED)
                     }) {
                         val isInvited = viewModel.inviteStates[member.id]?.first ?: false
-                        viewModel.inviteStates[member.id] = Pair(isInvited, LoadingButtonState.LOADING)
-                        val response: Any? = if (isInvited) viewModel.rescindInvite(member) else viewModel.inviteUser(member)
+                        viewModel.inviteStates[member.id] =
+                            Pair(isInvited, LoadingButtonState.LOADING)
+                        val response: Any? =
+                            if (isInvited) {
+                                viewModel.rescindInvite(member)
+                            } else {
+                                viewModel.inviteUser(
+                                    member,
+                                )
+                            }
                         if (response != null) {
-                            viewModel.inviteStates[member.id] = Pair(isInvited, LoadingButtonState.SUCCESS)
+                            viewModel.inviteStates[member.id] =
+                                Pair(isInvited, LoadingButtonState.SUCCESS)
                             delay(2500.toDuration(DurationUnit.MILLISECONDS))
-                            viewModel.inviteStates[member.id] = Pair(!isInvited, LoadingButtonState.CONTENT)
+                            viewModel.inviteStates[member.id] =
+                                Pair(!isInvited, LoadingButtonState.CONTENT)
                         } else {
-                            viewModel.inviteStates[member.id] = Pair(isInvited, LoadingButtonState.FAILED)
+                            viewModel.inviteStates[member.id] =
+                                Pair(isInvited, LoadingButtonState.FAILED)
                         }
                     }
                 }
@@ -290,10 +315,11 @@ fun PartySeekingView(
                 is LoadState.Loading -> {
                     item {
                         Column(
-                            modifier = Modifier
-                                .fillParentMaxSize(),
+                            modifier =
+                                Modifier
+                                    .fillParentMaxSize(),
                             horizontalAlignment = Alignment.CenterHorizontally,
-                            verticalArrangement = Arrangement.Center
+                            verticalArrangement = Arrangement.Center,
                         ) {
                             HabiticaCircularProgressView()
                         }
@@ -310,10 +336,11 @@ fun PartySeekingView(
                 is LoadState.Loading -> {
                     item {
                         Box(
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .padding(12.dp),
-                            contentAlignment = Alignment.Center
+                            modifier =
+                                Modifier
+                                    .fillMaxWidth()
+                                    .padding(12.dp),
+                            contentAlignment = Alignment.Center,
                         ) {
                             HabiticaCircularProgressView(indicatorSize = 32.dp)
                         }
@@ -327,13 +354,13 @@ fun PartySeekingView(
             pageData.itemCount == 0,
             refreshing,
             pullRefreshState,
-            Modifier.align(Alignment.TopCenter)
+            Modifier.align(Alignment.TopCenter),
         )
     }
 }
 
 class PartySeekingPagingSource(
-    private val repository: SocialRepository
+    private val repository: SocialRepository,
 ) : PagingSource<Int, Member>() {
     override fun getRefreshKey(state: PagingState<Int, Member>): Int? {
         return state.anchorPosition?.let { anchorPosition ->
@@ -350,7 +377,7 @@ class PartySeekingPagingSource(
             LoadResult.Page(
                 data = response ?: emptyList(),
                 prevKey = if (page == 0) null else page.minus(1),
-                nextKey = if ((response?.size ?: 0) < 30) null else page.plus(1)
+                nextKey = if ((response?.size ?: 0) < 30) null else page.plus(1),
             )
         } catch (e: Exception) {
             LoadResult.Error(e)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/BugFixFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/BugFixFragment.kt
index f312273fa..994324c5b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/BugFixFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/BugFixFragment.kt
@@ -14,12 +14,12 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.FragmentSupportBugFixBinding
 import com.habitrpg.android.habitica.databinding.KnownIssueBinding
 import com.habitrpg.android.habitica.helpers.AppConfigManager
-import com.habitrpg.common.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import com.habitrpg.common.habitica.extensions.layoutInflater
 import com.habitrpg.common.habitica.helpers.AppTestingLevel
 import com.habitrpg.common.habitica.helpers.ExceptionHandler
+import com.habitrpg.common.habitica.helpers.MainNavigationController
 import com.jaredrummler.android.device.DeviceName
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.launch
@@ -32,7 +32,7 @@ class BugFixFragment : BaseMainFragment<FragmentSupportBugFixBinding>() {
 
     override fun createBinding(
         inflater: LayoutInflater,
-        container: ViewGroup?
+        container: ViewGroup?,
     ): FragmentSupportBugFixBinding {
         return FragmentSupportBugFixBinding.inflate(inflater, container, false)
     }
@@ -46,14 +46,17 @@ class BugFixFragment : BaseMainFragment<FragmentSupportBugFixBinding>() {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View? {
         hidesToolbar = true
         showsBackButton = true
         return super.onCreateView(inflater, container, savedInstanceState)
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
         super.onViewCreated(view, savedInstanceState)
 
         lifecycleScope.launch(ExceptionHandler.coroutine()) {
@@ -72,7 +75,7 @@ class BugFixFragment : BaseMainFragment<FragmentSupportBugFixBinding>() {
             issueBinding.root.setOnClickListener {
                 MainNavigationController.navigate(
                     R.id.FAQDetailFragment,
-                    bundleOf(Pair("question", issue["title"]), Pair("answer", issue["text"]))
+                    bundleOf(Pair("question", issue["title"]), Pair("answer", issue["text"])),
                 )
             }
             binding?.knownIssuesLayout?.addView(issueBinding.root)
@@ -81,7 +84,10 @@ class BugFixFragment : BaseMainFragment<FragmentSupportBugFixBinding>() {
 
     private val versionName: String by lazy {
         try {
-            mainActivity?.packageManager?.getPackageInfo(mainActivity?.packageName ?: "", 0)?.versionName
+            mainActivity?.packageManager?.getPackageInfo(
+                mainActivity?.packageName ?: "",
+                0,
+            )?.versionName
                 ?: ""
         } catch (e: PackageManager.NameNotFoundException) {
             ""
@@ -91,7 +97,10 @@ class BugFixFragment : BaseMainFragment<FragmentSupportBugFixBinding>() {
     private val versionCode: Int by lazy {
         try {
             @Suppress("DEPRECATION")
-            mainActivity?.packageManager?.getPackageInfo(mainActivity?.packageName ?: "", 0)?.versionCode
+            mainActivity?.packageManager?.getPackageInfo(
+                mainActivity?.packageName ?: "",
+                0,
+            )?.versionCode
                 ?: 0
         } catch (e: PackageManager.NameNotFoundException) {
             0
@@ -103,15 +112,18 @@ class BugFixFragment : BaseMainFragment<FragmentSupportBugFixBinding>() {
         val deviceName = deviceInfo?.name ?: DeviceName.getDeviceName()
         val manufacturer = deviceInfo?.manufacturer ?: Build.MANUFACTURER
         val newLine = "%0D%0A"
-        var bodyOfEmail = Uri.encode("Device: $manufacturer $deviceName") +
-            newLine + Uri.encode("Android Version: $version") +
-            newLine + Uri.encode(
-            "AppVersion: " + getString(
-                R.string.version_info,
-                versionName,
-                versionCode
-            )
-        )
+        var bodyOfEmail =
+            Uri.encode("Device: $manufacturer $deviceName") +
+                newLine + Uri.encode("Android Version: $version") +
+                newLine +
+                Uri.encode(
+                    "AppVersion: " +
+                        getString(
+                            R.string.version_info,
+                            versionName,
+                            versionCode,
+                        ),
+                )
 
         if (appConfigManager.testingLevel().name != AppTestingLevel.PRODUCTION.name) {
             bodyOfEmail += " " + Uri.encode(appConfigManager.testingLevel().name)
@@ -120,33 +132,36 @@ class BugFixFragment : BaseMainFragment<FragmentSupportBugFixBinding>() {
 
         userViewModel.user.value?.let { user ->
             bodyOfEmail += newLine + Uri.encode("Level: " + (user.stats?.lvl ?: 0)) +
-                newLine + Uri.encode(
-                "Class: " + (
-                    if (user.preferences?.disableClasses == true) {
-                        "Disabled"
-                    } else {
-                        (
-                            user.stats?.habitClass
-                                ?: "None"
+                newLine +
+                Uri.encode(
+                    "Class: " + (
+                        if (user.preferences?.disableClasses == true) {
+                            "Disabled"
+                        } else {
+                            (
+                                user.stats?.habitClass
+                                    ?: "None"
                             )
-                    }
-                    )
-            ) +
+                        }
+                    ),
+                ) +
                 newLine + Uri.encode("Is in Inn: " + (user.preferences?.sleep ?: false)) +
                 newLine + Uri.encode("Uses Costume: " + (user.preferences?.costume ?: false)) +
                 newLine + Uri.encode("Custom Day Start: " + (user.preferences?.dayStart ?: 0)) +
-                newLine + Uri.encode(
-                "Timezone Offset: " + (user.preferences?.timezoneOffset ?: 0)
-            )
+                newLine +
+                Uri.encode(
+                    "Timezone Offset: " + (user.preferences?.timezoneOffset ?: 0),
+                )
         }
 
         bodyOfEmail += "%0D%0ADetails:%0D%0A%0D%0A"
 
         mainActivity?.let {
             val emailIntent = Intent(Intent.ACTION_SENDTO)
-            val mailto = "mailto:" + appConfigManager.supportEmail() +
-                "?subject=" + Uri.encode(subject) +
-                "&body=" + bodyOfEmail
+            val mailto =
+                "mailto:" + appConfigManager.supportEmail() +
+                    "?subject=" + Uri.encode(subject) +
+                    "&body=" + bodyOfEmail
             emailIntent.data = Uri.parse(mailto)
 
             startActivity(Intent.createChooser(emailIntent, "Choose an Email client:"))
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQDetailFragment.kt
index e89cf1e89..0776902ef 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQDetailFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQDetailFragment.kt
@@ -21,21 +21,27 @@ class FAQDetailFragment : BaseMainFragment<FragmentFaqDetailBinding>() {
 
     override var binding: FragmentFaqDetailBinding? = null
 
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentFaqDetailBinding {
+    override fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+    ): FragmentFaqDetailBinding {
         return FragmentFaqDetailBinding.inflate(inflater, container, false)
     }
 
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View? {
         hidesToolbar = true
         showsBackButton = true
         return super.onCreateView(inflater, container, savedInstanceState)
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
         super.onViewCreated(view, savedInstanceState)
 
         arguments?.let {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQOverviewFragment.kt
index 0e19892ef..3c712ab99 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQOverviewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQOverviewFragment.kt
@@ -1,267 +1,298 @@
-package com.habitrpg.android.habitica.ui.fragments.support
-
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.net.Uri
-import android.os.Build
-import android.os.Bundle
-import android.text.SpannableStringBuilder
-import android.text.Spanned
-import android.text.TextPaint
-import android.text.method.LinkMovementMethod
-import android.text.style.ClickableSpan
-import android.view.Gravity
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.FrameLayout
-import android.widget.ImageView
-import android.widget.LinearLayout
-import androidx.core.content.ContextCompat
-import androidx.core.view.isVisible
-import androidx.lifecycle.lifecycleScope
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.data.FAQRepository
-import com.habitrpg.android.habitica.databinding.FragmentFaqOverviewBinding
-import com.habitrpg.android.habitica.databinding.SupportFaqItemBinding
-import com.habitrpg.android.habitica.helpers.AppConfigManager
-import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
-import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
-import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import com.habitrpg.android.habitica.ui.views.UsernameLabel
-import com.habitrpg.common.habitica.extensions.dpToPx
-import com.habitrpg.common.habitica.extensions.layoutInflater
-import com.habitrpg.common.habitica.helpers.AppTestingLevel
-import com.habitrpg.common.habitica.helpers.ExceptionHandler
-import com.habitrpg.common.habitica.helpers.MainNavigationController
-import com.habitrpg.common.habitica.helpers.launchCatching
-import com.habitrpg.common.habitica.models.PlayerTier
-import com.jaredrummler.android.device.DeviceName
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-import kotlin.math.max
-import kotlin.math.min
-
-@AndroidEntryPoint
-class FAQOverviewFragment : BaseMainFragment<FragmentFaqOverviewBinding>() {
-
-    private var deviceInfo: DeviceName.DeviceInfo? = null
-    override var binding: FragmentFaqOverviewBinding? = null
-
-    @Inject
-    lateinit var appConfigManager: AppConfigManager
-
-    @Inject
-    lateinit var userViewModel: MainUserViewModel
-
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentFaqOverviewBinding {
-        return FragmentFaqOverviewBinding.inflate(inflater, container, false)
-    }
-
-    @Inject
-    lateinit var faqRepository: FAQRepository
-
-    @Inject
-    lateinit var configManager: AppConfigManager
-
-    private val versionName: String by lazy {
-        try {
-            mainActivity?.packageManager?.getPackageInfo(mainActivity?.packageName ?: "", 0)?.versionName
-                ?: ""
-        } catch (e: PackageManager.NameNotFoundException) {
-            ""
-        }
-    }
-
-    private val versionCode: Int by lazy {
-        try {
-            @Suppress("DEPRECATION")
-            mainActivity?.packageManager?.getPackageInfo(mainActivity?.packageName ?: "", 0)?.versionCode
-                ?: 0
-        } catch (e: PackageManager.NameNotFoundException) {
-            0
-        }
-    }
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        hidesToolbar = true
-        showsBackButton = true
-        return super.onCreateView(inflater, container, savedInstanceState)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding?.npcHeader?.npcBannerView?.shopSpriteSuffix = configManager.shopSpriteSuffix()
-        binding?.npcHeader?.npcBannerView?.identifier = "tavern"
-        binding?.npcHeader?.namePlate?.setText(R.string.tavern_owner)
-        binding?.npcHeader?.descriptionView?.isVisible = false
-
-        lifecycleScope.launch(ExceptionHandler.coroutine()) {
-            DeviceName.with(context).request { info, _ ->
-                deviceInfo = info
-            }
-        }
-
-        binding?.healthSection?.findViewById<ImageView>(R.id.icon_view)?.setImageBitmap(
-            HabiticaIconsHelper.imageOfHeartLarge()
-        )
-        binding?.experienceSection?.findViewById<ImageView>(R.id.icon_view)?.setImageBitmap(
-            HabiticaIconsHelper.imageOfExperienceReward()
-        )
-        binding?.manaSection?.findViewById<ImageView>(R.id.icon_view)?.setImageBitmap(
-            HabiticaIconsHelper.imageOfMagicLarge()
-        )
-        binding?.goldSection?.findViewById<ImageView>(R.id.icon_view)?.setImageBitmap(
-            HabiticaIconsHelper.imageOfGoldReward()
-        )
-        binding?.gemsSection?.findViewById<ImageView>(R.id.icon_view)?.setImageBitmap(
-            HabiticaIconsHelper.imageOfGem()
-        )
-        binding?.hourglassesSection?.findViewById<ImageView>(R.id.icon_view)?.setImageBitmap(
-            HabiticaIconsHelper.imageOfHourglassLarge()
-        )
-        binding?.statsSection?.findViewById<ImageView>(R.id.icon_view)?.setImageBitmap(
-            HabiticaIconsHelper.imageOfStats()
-        )
-
-        binding?.contribTierSection?.findViewById<ImageView>(R.id.icon_view)?.setImageResource(R.drawable.contributor_icon)
-        addPlayerTiers()
-
-        val fullText = getString(R.string.need_help_description)
-        val clickableText = "contact us"
-        val spannableString = SpannableStringBuilder(fullText)
-        val clickableSpan = object : ClickableSpan() {
-            override fun onClick(textView: View) {
-                sendEmail("[Android] Question")
-            }
-            override fun updateDrawState(ds: TextPaint) {
-                super.updateDrawState(ds)
-                ds.isUnderlineText = false
-            }
-        }
-        val startIndex = max(0, fullText.indexOf(clickableText))
-        val endIndex = startIndex + clickableText.length
-        spannableString.setSpan(clickableSpan, startIndex, endIndex, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
-
-        binding?.moreHelpTextView?.text = spannableString
-        binding?.moreHelpTextView?.movementMethod = LinkMovementMethod.getInstance()
-
-        this.loadArticles()
-    }
-
-    override fun onDestroy() {
-        faqRepository.close()
-        super.onDestroy()
-    }
-
-    private fun loadArticles() {
-        lifecycleScope.launchCatching {
-            faqRepository.getArticles().collect {
-                val context = context ?: return@collect
-                if (binding?.faqLinearLayout == null) return@collect
-                for (article in it) {
-                    val binding = SupportFaqItemBinding.inflate(
-                        context.layoutInflater,
-                        binding?.faqLinearLayout,
-                        true
-                    )
-                    binding.textView.text = article.question
-                    binding.root.setOnClickListener {
-                        val direction = FAQOverviewFragmentDirections.openFAQDetail(null, null)
-                        direction.position = article.position ?: 0
-                        MainNavigationController.navigate(direction)
-                    }
-                }
-            }
-        }
-    }
-
-    private fun sendEmail(subject: String) {
-        val version = Build.VERSION.SDK_INT
-        val deviceName = deviceInfo?.name ?: DeviceName.getDeviceName()
-        val manufacturer = deviceInfo?.manufacturer ?: Build.MANUFACTURER
-        val newLine = "%0D%0A"
-        var bodyOfEmail = Uri.encode("Device: $manufacturer $deviceName") +
-            newLine + Uri.encode("Android Version: $version") +
-            newLine + Uri.encode(
-            "AppVersion: " + getString(
-                R.string.version_info,
-                versionName,
-                versionCode
-            )
-        )
-
-        if (appConfigManager.testingLevel().name != AppTestingLevel.PRODUCTION.name) {
-            bodyOfEmail += " " + Uri.encode(appConfigManager.testingLevel().name)
-        }
-        bodyOfEmail += newLine + Uri.encode("User ID: ${userViewModel.userID}")
-
-        userViewModel.user.value?.let { user ->
-            bodyOfEmail += newLine + Uri.encode("Level: " + (user.stats?.lvl ?: 0)) +
-                newLine + Uri.encode(
-                "Class: " + (
-                    if (user.preferences?.disableClasses == true) {
-                        "Disabled"
-                    } else {
-                        (
-                            user.stats?.habitClass
-                                ?: "None"
-                            )
-                    }
-                    )
-            ) +
-                newLine + Uri.encode("Is in Inn: " + (user.preferences?.sleep ?: false)) +
-                newLine + Uri.encode("Uses Costume: " + (user.preferences?.costume ?: false)) +
-                newLine + Uri.encode("Custom Day Start: " + (user.preferences?.dayStart ?: 0)) +
-                newLine + Uri.encode(
-                "Timezone Offset: " + (user.preferences?.timezoneOffset ?: 0)
-            )
-        }
-
-        bodyOfEmail += "%0D%0ADetails:%0D%0A%0D%0A"
-
-        mainActivity?.let {
-            val emailIntent = Intent(Intent.ACTION_SENDTO)
-            val mailto = "mailto:" + appConfigManager.supportEmail() +
-                "?subject=" + Uri.encode(subject) +
-                "&body=" + bodyOfEmail
-            emailIntent.data = Uri.parse(mailto)
-
-            startActivity(Intent.createChooser(emailIntent, "Choose an Email client:"))
-        }
-    }
-
-    private fun addPlayerTiers() {
-        val tiers = PlayerTier.getTiers()
-        for (tier in tiers) {
-            context?.let {
-                val container = FrameLayout(it)
-                container.background = ContextCompat.getDrawable(it, R.drawable.rounded_border)
-                container.background.setTint(PlayerTier.getColorForTier(it, tier.id))
-                container.background.alpha = 50
-                val label = UsernameLabel(it, null)
-                label.tier = tier.id
-                label.username = tier.title
-                val params = FrameLayout.LayoutParams(
-                    FrameLayout.LayoutParams.WRAP_CONTENT,
-                    FrameLayout.LayoutParams.WRAP_CONTENT,
-                    Gravity.CENTER
-                )
-                container.addView(label, params)
-                container.isVisible = false
-                binding?.contribTierSection?.addView(container)
-                val containerParams = container.layoutParams as LinearLayout.LayoutParams
-                containerParams.setMargins(12.dpToPx(context), 0, 12.dpToPx(context), if (tiers.last() == tier) 12.dpToPx(context) else 6.dpToPx(context))
-                val padding = context?.resources?.getDimension(R.dimen.spacing_medium)?.toInt() ?: 0
-                container.setPadding(0, padding, 0, padding)
-            }
-        }
-        (binding?.contribTierSection?.parent as? ViewGroup)?.invalidate()
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.support
+
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.net.Uri
+import android.os.Build
+import android.os.Bundle
+import android.text.SpannableStringBuilder
+import android.text.Spanned
+import android.text.TextPaint
+import android.text.method.LinkMovementMethod
+import android.text.style.ClickableSpan
+import android.view.Gravity
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import android.widget.ImageView
+import android.widget.LinearLayout
+import androidx.core.content.ContextCompat
+import androidx.core.view.isVisible
+import androidx.lifecycle.lifecycleScope
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.data.FAQRepository
+import com.habitrpg.android.habitica.databinding.FragmentFaqOverviewBinding
+import com.habitrpg.android.habitica.databinding.SupportFaqItemBinding
+import com.habitrpg.android.habitica.helpers.AppConfigManager
+import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
+import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.UsernameLabel
+import com.habitrpg.common.habitica.extensions.dpToPx
+import com.habitrpg.common.habitica.extensions.layoutInflater
+import com.habitrpg.common.habitica.helpers.AppTestingLevel
+import com.habitrpg.common.habitica.helpers.ExceptionHandler
+import com.habitrpg.common.habitica.helpers.MainNavigationController
+import com.habitrpg.common.habitica.helpers.launchCatching
+import com.habitrpg.common.habitica.models.PlayerTier
+import com.jaredrummler.android.device.DeviceName
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+import kotlin.math.max
+
+@AndroidEntryPoint
+class FAQOverviewFragment : BaseMainFragment<FragmentFaqOverviewBinding>() {
+    private var deviceInfo: DeviceName.DeviceInfo? = null
+    override var binding: FragmentFaqOverviewBinding? = null
+
+    @Inject
+    lateinit var appConfigManager: AppConfigManager
+
+    @Inject
+    lateinit var userViewModel: MainUserViewModel
+
+    override fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+    ): FragmentFaqOverviewBinding {
+        return FragmentFaqOverviewBinding.inflate(inflater, container, false)
+    }
+
+    @Inject
+    lateinit var faqRepository: FAQRepository
+
+    @Inject
+    lateinit var configManager: AppConfigManager
+
+    private val versionName: String by lazy {
+        try {
+            mainActivity?.packageManager?.getPackageInfo(
+                mainActivity?.packageName ?: "",
+                0,
+            )?.versionName
+                ?: ""
+        } catch (e: PackageManager.NameNotFoundException) {
+            ""
+        }
+    }
+
+    private val versionCode: Int by lazy {
+        try {
+            @Suppress("DEPRECATION")
+            mainActivity?.packageManager?.getPackageInfo(
+                mainActivity?.packageName ?: "",
+                0,
+            )?.versionCode
+                ?: 0
+        } catch (e: PackageManager.NameNotFoundException) {
+            0
+        }
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?,
+    ): View? {
+        hidesToolbar = true
+        showsBackButton = true
+        return super.onCreateView(inflater, container, savedInstanceState)
+    }
+
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
+        super.onViewCreated(view, savedInstanceState)
+
+        binding?.npcHeader?.npcBannerView?.shopSpriteSuffix = configManager.shopSpriteSuffix()
+        binding?.npcHeader?.npcBannerView?.identifier = "tavern"
+        binding?.npcHeader?.namePlate?.setText(R.string.tavern_owner)
+        binding?.npcHeader?.descriptionView?.isVisible = false
+
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            DeviceName.with(context).request { info, _ ->
+                deviceInfo = info
+            }
+        }
+
+        binding?.healthSection?.findViewById<ImageView>(R.id.icon_view)?.setImageBitmap(
+            HabiticaIconsHelper.imageOfHeartLarge(),
+        )
+        binding?.experienceSection?.findViewById<ImageView>(R.id.icon_view)?.setImageBitmap(
+            HabiticaIconsHelper.imageOfExperienceReward(),
+        )
+        binding?.manaSection?.findViewById<ImageView>(R.id.icon_view)?.setImageBitmap(
+            HabiticaIconsHelper.imageOfMagicLarge(),
+        )
+        binding?.goldSection?.findViewById<ImageView>(R.id.icon_view)?.setImageBitmap(
+            HabiticaIconsHelper.imageOfGoldReward(),
+        )
+        binding?.gemsSection?.findViewById<ImageView>(R.id.icon_view)?.setImageBitmap(
+            HabiticaIconsHelper.imageOfGem(),
+        )
+        binding?.hourglassesSection?.findViewById<ImageView>(R.id.icon_view)?.setImageBitmap(
+            HabiticaIconsHelper.imageOfHourglassLarge(),
+        )
+        binding?.statsSection?.findViewById<ImageView>(R.id.icon_view)?.setImageBitmap(
+            HabiticaIconsHelper.imageOfStats(),
+        )
+
+        binding?.contribTierSection?.findViewById<ImageView>(R.id.icon_view)
+            ?.setImageResource(R.drawable.contributor_icon)
+        addPlayerTiers()
+
+        val fullText = getString(R.string.need_help_description)
+        val clickableText = "contact us"
+        val spannableString = SpannableStringBuilder(fullText)
+        val clickableSpan =
+            object : ClickableSpan() {
+                override fun onClick(textView: View) {
+                    sendEmail("[Android] Question")
+                }
+
+                override fun updateDrawState(ds: TextPaint) {
+                    super.updateDrawState(ds)
+                    ds.isUnderlineText = false
+                }
+            }
+        val startIndex = max(0, fullText.indexOf(clickableText))
+        val endIndex = startIndex + clickableText.length
+        spannableString.setSpan(
+            clickableSpan,
+            startIndex,
+            endIndex,
+            Spanned.SPAN_EXCLUSIVE_EXCLUSIVE,
+        )
+
+        binding?.moreHelpTextView?.text = spannableString
+        binding?.moreHelpTextView?.movementMethod = LinkMovementMethod.getInstance()
+
+        this.loadArticles()
+    }
+
+    override fun onDestroy() {
+        faqRepository.close()
+        super.onDestroy()
+    }
+
+    private fun loadArticles() {
+        lifecycleScope.launchCatching {
+            faqRepository.getArticles().collect {
+                val context = context ?: return@collect
+                if (binding?.faqLinearLayout == null) return@collect
+                for (article in it) {
+                    val binding =
+                        SupportFaqItemBinding.inflate(
+                            context.layoutInflater,
+                            binding?.faqLinearLayout,
+                            true,
+                        )
+                    binding.textView.text = article.question
+                    binding.root.setOnClickListener {
+                        val direction = FAQOverviewFragmentDirections.openFAQDetail(null, null)
+                        direction.position = article.position ?: 0
+                        MainNavigationController.navigate(direction)
+                    }
+                }
+            }
+        }
+    }
+
+    private fun sendEmail(subject: String) {
+        val version = Build.VERSION.SDK_INT
+        val deviceName = deviceInfo?.name ?: DeviceName.getDeviceName()
+        val manufacturer = deviceInfo?.manufacturer ?: Build.MANUFACTURER
+        val newLine = "%0D%0A"
+        var bodyOfEmail =
+            Uri.encode("Device: $manufacturer $deviceName") +
+                newLine + Uri.encode("Android Version: $version") +
+                newLine +
+                Uri.encode(
+                    "AppVersion: " +
+                        getString(
+                            R.string.version_info,
+                            versionName,
+                            versionCode,
+                        ),
+                )
+
+        if (appConfigManager.testingLevel().name != AppTestingLevel.PRODUCTION.name) {
+            bodyOfEmail += " " + Uri.encode(appConfigManager.testingLevel().name)
+        }
+        bodyOfEmail += newLine + Uri.encode("User ID: ${userViewModel.userID}")
+
+        userViewModel.user.value?.let { user ->
+            bodyOfEmail += newLine + Uri.encode("Level: " + (user.stats?.lvl ?: 0)) +
+                newLine +
+                Uri.encode(
+                    "Class: " + (
+                        if (user.preferences?.disableClasses == true) {
+                            "Disabled"
+                        } else {
+                            (
+                                user.stats?.habitClass
+                                    ?: "None"
+                            )
+                        }
+                    ),
+                ) +
+                newLine + Uri.encode("Is in Inn: " + (user.preferences?.sleep ?: false)) +
+                newLine + Uri.encode("Uses Costume: " + (user.preferences?.costume ?: false)) +
+                newLine + Uri.encode("Custom Day Start: " + (user.preferences?.dayStart ?: 0)) +
+                newLine +
+                Uri.encode(
+                    "Timezone Offset: " + (user.preferences?.timezoneOffset ?: 0),
+                )
+        }
+
+        bodyOfEmail += "%0D%0ADetails:%0D%0A%0D%0A"
+
+        mainActivity?.let {
+            val emailIntent = Intent(Intent.ACTION_SENDTO)
+            val mailto =
+                "mailto:" + appConfigManager.supportEmail() +
+                    "?subject=" + Uri.encode(subject) +
+                    "&body=" + bodyOfEmail
+            emailIntent.data = Uri.parse(mailto)
+
+            startActivity(Intent.createChooser(emailIntent, "Choose an Email client:"))
+        }
+    }
+
+    private fun addPlayerTiers() {
+        val tiers = PlayerTier.getTiers()
+        for (tier in tiers) {
+            context?.let {
+                val container = FrameLayout(it)
+                container.background = ContextCompat.getDrawable(it, R.drawable.rounded_border)
+                container.background.setTint(PlayerTier.getColorForTier(it, tier.id))
+                container.background.alpha = 50
+                val label = UsernameLabel(it, null)
+                label.tier = tier.id
+                label.username = tier.title
+                val params =
+                    FrameLayout.LayoutParams(
+                        FrameLayout.LayoutParams.WRAP_CONTENT,
+                        FrameLayout.LayoutParams.WRAP_CONTENT,
+                        Gravity.CENTER,
+                    )
+                container.addView(label, params)
+                container.isVisible = false
+                binding?.contribTierSection?.addView(container)
+                val containerParams = container.layoutParams as LinearLayout.LayoutParams
+                containerParams.setMargins(
+                    12.dpToPx(context),
+                    0,
+                    12.dpToPx(context),
+                    if (tiers.last() == tier) 12.dpToPx(context) else 6.dpToPx(context),
+                )
+                val padding = context?.resources?.getDimension(R.dimen.spacing_medium)?.toInt() ?: 0
+                container.setPadding(0, padding, 0, padding)
+            }
+        }
+        (binding?.contribTierSection?.parent as? ViewGroup)?.invalidate()
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/SupportMainFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/SupportMainFragment.kt
index 8ff73a477..a3d7bc1f3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/SupportMainFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/SupportMainFragment.kt
@@ -11,10 +11,10 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.FAQRepository
 import com.habitrpg.android.habitica.databinding.FragmentSupportMainBinding
 import com.habitrpg.android.habitica.helpers.AppConfigManager
-import com.habitrpg.common.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
 import com.habitrpg.common.habitica.helpers.ExceptionHandler
+import com.habitrpg.common.habitica.helpers.MainNavigationController
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.launch
 import javax.inject.Inject
@@ -23,7 +23,10 @@ import javax.inject.Inject
 class SupportMainFragment : BaseMainFragment<FragmentSupportMainBinding>() {
     override var binding: FragmentSupportMainBinding? = null
 
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentSupportMainBinding {
+    override fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+    ): FragmentSupportMainBinding {
         return FragmentSupportMainBinding.inflate(inflater, container, false)
     }
 
@@ -36,13 +39,16 @@ class SupportMainFragment : BaseMainFragment<FragmentSupportMainBinding>() {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View? {
         hidesToolbar = true
         return super.onCreateView(inflater, container, savedInstanceState)
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
         super.onViewCreated(view, savedInstanceState)
         binding?.usingHabiticaWrapper?.setOnClickListener {
             MainNavigationController.navigate(R.id.FAQOverviewFragment)
@@ -61,7 +67,12 @@ class SupportMainFragment : BaseMainFragment<FragmentSupportMainBinding>() {
         binding?.resetTutorialButton?.setOnClickListener {
             lifecycleScope.launch(ExceptionHandler.coroutine()) {
                 userRepository.resetTutorial()
-                mainActivity?.showSnackbar(null, null, getString(R.string.tutorial_reset_confirmation), displayType = HabiticaSnackbar.SnackbarDisplayType.SUCCESS)
+                mainActivity?.showSnackbar(
+                    null,
+                    null,
+                    getString(R.string.tutorial_reset_confirmation),
+                    displayType = HabiticaSnackbar.SnackbarDisplayType.SUCCESS,
+                )
             }
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/RewardsRecyclerviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/RewardsRecyclerviewFragment.kt
index 76c3d0620..f18702e8f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/RewardsRecyclerviewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/RewardsRecyclerviewFragment.kt
@@ -28,14 +28,13 @@ import kotlinx.coroutines.launch
 
 @AndroidEntryPoint
 class RewardsRecyclerviewFragment : TaskRecyclerViewFragment() {
-
     private var showCustomRewards: Boolean = true
     private var selectedCard: ShopItem? = null
 
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View? {
         lifecycleScope.launchCatching {
             inventoryRepository.retrieveInAppRewards()
@@ -43,22 +42,31 @@ class RewardsRecyclerviewFragment : TaskRecyclerViewFragment() {
         return super.onCreateView(inflater, container, savedInstanceState)
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
         super.onViewCreated(view, savedInstanceState)
 
-        (layoutManager as? GridLayoutManager)?.spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() {
-            override fun getSpanSize(position: Int): Int {
-                return if ((recyclerAdapter?.getItemViewType(position) ?: 0) < 3) {
-                    (layoutManager as? GridLayoutManager)?.spanCount ?: 1
-                } else {
-                    1
+        (layoutManager as? GridLayoutManager)?.spanSizeLookup =
+            object : GridLayoutManager.SpanSizeLookup() {
+                override fun getSpanSize(position: Int): Int {
+                    return if ((recyclerAdapter?.getItemViewType(position) ?: 0) < 3) {
+                        (layoutManager as? GridLayoutManager)?.spanCount ?: 1
+                    } else {
+                        1
+                    }
                 }
             }
-        }
 
         view.post { setGridSpanCount(view.width) }
         context?.let {
-            binding?.recyclerView?.setBackgroundColor(ContextCompat.getColor(it, R.color.content_background))
+            binding?.recyclerView?.setBackgroundColor(
+                ContextCompat.getColor(
+                    it,
+                    R.color.content_background,
+                ),
+            )
         }
         binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
 
@@ -66,11 +74,12 @@ class RewardsRecyclerviewFragment : TaskRecyclerViewFragment() {
             lifecycleScope.launchCatching {
                 inventoryRepository.getInAppRewards().collect {
                     val user = viewModel.user.value
-                    (recyclerAdapter as? RewardsRecyclerViewAdapter)?.goldGemsLeft = if (user?.isSubscribed == true) {
-                        user.purchased?.plan?.numberOfGemsLeft
-                    } else {
-                        -1
-                    }
+                    (recyclerAdapter as? RewardsRecyclerViewAdapter)?.goldGemsLeft =
+                        if (user?.isSubscribed == true) {
+                            user.purchased?.plan?.numberOfGemsLeft
+                        } else {
+                            -1
+                        }
                     (recyclerAdapter as? RewardsRecyclerViewAdapter)?.updateItemRewards(it)
                 }
             }
@@ -128,33 +137,44 @@ class RewardsRecyclerviewFragment : TaskRecyclerViewFragment() {
         (layoutManager as? GridLayoutManager)?.spanCount = spanCount
     }
 
-    private val cardSelectedResult = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-        if (it.resultCode == Activity.RESULT_OK) {
-            lifecycleScope.launchCatching {
-                userRepository.useSkill(
-                    selectedCard?.key ?: "",
-                    "member",
-                    it.data?.getStringExtra("member_id") ?: ""
-                )
-                val activity = (activity as? MainActivity) ?: return@launchCatching
-                HabiticaSnackbar.showSnackbar(
-                    activity.snackbarContainer,
-                    context?.getString(R.string.sent_card, selectedCard?.text),
-                    HabiticaSnackbar.SnackbarDisplayType.BLUE
-                )
+    private val cardSelectedResult =
+        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+            if (it.resultCode == Activity.RESULT_OK) {
+                lifecycleScope.launchCatching {
+                    userRepository.useSkill(
+                        selectedCard?.key ?: "",
+                        "member",
+                        it.data?.getStringExtra("member_id") ?: "",
+                    )
+                    val activity = (activity as? MainActivity) ?: return@launchCatching
+                    HabiticaSnackbar.showSnackbar(
+                        activity.snackbarContainer,
+                        context?.getString(R.string.sent_card, selectedCard?.text),
+                        HabiticaSnackbar.SnackbarDisplayType.BLUE,
+                    )
+                }
             }
         }
-    }
 
     companion object {
-        fun newInstance(context: Context?, classType: TaskType, showCustomRewards: Boolean): RewardsRecyclerviewFragment {
+        fun newInstance(
+            context: Context?,
+            classType: TaskType,
+            showCustomRewards: Boolean,
+        ): RewardsRecyclerviewFragment {
             val fragment = RewardsRecyclerviewFragment()
             fragment.taskType = classType
             fragment.showCustomRewards = showCustomRewards
 
             if (context != null) {
                 fragment.tutorialStepIdentifier = "rewards"
-                fragment.tutorialTexts = ArrayList(listOf(context.getString(R.string.tutorial_rewards_1), context.getString(R.string.tutorial_rewards_2)))
+                fragment.tutorialTexts =
+                    ArrayList(
+                        listOf(
+                            context.getString(R.string.tutorial_rewards_1),
+                            context.getString(R.string.tutorial_rewards_2),
+                        ),
+                    )
             }
             fragment.tutorialCanBeDeferred = false
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt
index 0757e048e..888982041 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt
@@ -1,641 +1,695 @@
-package com.habitrpg.android.habitica.ui.fragments.tasks
-
-import android.content.Context
-import android.content.SharedPreferences
-import android.graphics.drawable.BitmapDrawable
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.core.content.ContextCompat
-import androidx.fragment.app.viewModels
-import androidx.lifecycle.asFlow
-import androidx.lifecycle.lifecycleScope
-import androidx.recyclerview.widget.ItemTouchHelper
-import androidx.recyclerview.widget.RecyclerView
-import androidx.recyclerview.widget.RecyclerView.NO_POSITION
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.data.InventoryRepository
-import com.habitrpg.android.habitica.data.TaskRepository
-import com.habitrpg.android.habitica.data.UserRepository
-import com.habitrpg.android.habitica.databinding.FragmentRefreshRecyclerviewBinding
-import com.habitrpg.common.habitica.extensions.observeOnce
-import com.habitrpg.common.habitica.extensions.setScaledPadding
-import com.habitrpg.android.habitica.helpers.AppConfigManager
-import com.habitrpg.android.habitica.helpers.HapticFeedbackManager
-import com.habitrpg.common.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.helpers.NotificationsManager
-import com.habitrpg.android.habitica.helpers.SoundManager
-import com.habitrpg.android.habitica.models.tasks.ChecklistItem
-import com.habitrpg.android.habitica.models.tasks.Task
-import com.habitrpg.android.habitica.ui.activities.MainActivity
-import com.habitrpg.android.habitica.ui.activities.TaskFormActivity
-import com.habitrpg.android.habitica.ui.adapter.BaseRecyclerViewAdapter
-import com.habitrpg.android.habitica.ui.adapter.tasks.DailiesRecyclerViewHolder
-import com.habitrpg.android.habitica.ui.adapter.tasks.HabitsRecyclerViewAdapter
-import com.habitrpg.android.habitica.ui.adapter.tasks.RewardsRecyclerViewAdapter
-import com.habitrpg.android.habitica.ui.adapter.tasks.TaskRecyclerViewAdapter
-import com.habitrpg.android.habitica.ui.adapter.tasks.TodosRecyclerViewAdapter
-import com.habitrpg.android.habitica.ui.fragments.BaseFragment
-import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
-import com.habitrpg.android.habitica.ui.viewHolders.tasks.BaseTaskViewHolder
-import com.habitrpg.android.habitica.ui.viewmodels.TasksViewModel
-import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
-import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import com.habitrpg.common.habitica.helpers.EmptyItem
-import com.habitrpg.common.habitica.helpers.ExceptionHandler
-import com.habitrpg.common.habitica.helpers.launchCatching
-import com.habitrpg.shared.habitica.models.responses.TaskDirection
-import com.habitrpg.shared.habitica.models.responses.TaskScoringResult
-import com.habitrpg.shared.habitica.models.tasks.TaskType
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.distinctUntilChangedBy
-import kotlinx.coroutines.flow.firstOrNull
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.flow.takeWhile
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import java.util.Date
-import javax.inject.Inject
-
-@AndroidEntryPoint
-open class TaskRecyclerViewFragment :
-    BaseFragment<FragmentRefreshRecyclerviewBinding>(),
-    androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener {
-    private var taskFlowJob: Job? = null
-    val viewModel: TasksViewModel by viewModels({ requireParentFragment() })
-
-    internal var canScoreTasks: Boolean = true
-    override var binding: FragmentRefreshRecyclerviewBinding? = null
-
-    override fun createBinding(
-        inflater: LayoutInflater,
-        container: ViewGroup?
-    ): FragmentRefreshRecyclerviewBinding {
-        return FragmentRefreshRecyclerviewBinding.inflate(inflater, container, false)
-    }
-
-    var recyclerAdapter: TaskRecyclerViewAdapter? = null
-    var itemAnimator = SafeDefaultItemAnimator()
-
-    @Inject
-    lateinit var userRepository: UserRepository
-
-    @Inject
-    lateinit var inventoryRepository: InventoryRepository
-
-    @Inject
-    lateinit var taskRepository: TaskRepository
-
-    @Inject
-    lateinit var soundManager: SoundManager
-
-    @Inject
-    lateinit var configManager: AppConfigManager
-
-    @Inject
-    lateinit var sharedPreferences: SharedPreferences
-
-    @Inject
-    lateinit var notificationsManager: NotificationsManager
-
-    internal var layoutManager: RecyclerView.LayoutManager? = null
-
-    internal var taskType: TaskType = TaskType.HABIT
-    private var itemTouchCallback: ItemTouchHelper.Callback? = null
-
-    internal val className: TaskType
-        get() = this.taskType
-
-    private fun setInnerAdapter() {
-        if (binding?.recyclerView?.adapter != null && binding?.recyclerView?.adapter == recyclerAdapter) {
-            return
-        }
-        viewModel.let { viewModel ->
-            val adapter: BaseRecyclerViewAdapter<*, *>? = when (this.taskType) {
-                TaskType.HABIT -> HabitsRecyclerViewAdapter(R.layout.habit_item_card, viewModel)
-                TaskType.DAILY -> DailiesRecyclerViewHolder(R.layout.daily_item_card, viewModel)
-                TaskType.TODO -> TodosRecyclerViewAdapter(R.layout.todo_item_card, viewModel)
-                TaskType.REWARD -> RewardsRecyclerViewAdapter(
-                    null,
-                    R.layout.reward_item_card,
-                    viewModel
-                )
-                else -> null
-            }
-
-            recyclerAdapter = adapter as? TaskRecyclerViewAdapter
-            binding?.recyclerView?.adapter = adapter
-
-            viewModel.getFilterSet(taskType)?.observe(viewLifecycleOwner) {
-                recyclerAdapter?.filter()
-            }
-        }
-        context?.let { recyclerAdapter?.taskDisplayMode = configManager.taskDisplayMode(it) }
-
-        recyclerAdapter?.errorButtonEvents = {
-            lifecycleScope.launchCatching {
-                taskRepository.syncErroredTasks()
-            }
-        }
-        recyclerAdapter?.taskOpenEvents = { task, _ ->
-            openTaskForm(task)
-        }
-        recyclerAdapter?.taskScoreEvents = { task, direction ->
-            playSound(direction)
-            context?.let { it1 -> notificationsManager.dismissTaskNotification(it1, task) }
-            scoreTask(task, direction)
-        }
-        recyclerAdapter?.checklistItemScoreEvents = { task, item ->
-            scoreChecklistItem(task, item)
-        }
-        recyclerAdapter?.brokenTaskEvents = { showBrokenChallengeDialog(it) }
-        recyclerAdapter?.adventureGuideOpenEvents = {
-            MainNavigationController.navigate(
-                R.id.adventureGuideActivity
-            )
-        }
-
-        viewModel.ownerID.observe(viewLifecycleOwner) {
-            canScoreTasks = viewModel.isPersonalBoard
-            updateTaskSubscription(it)
-        }
-        lifecycleScope.launch {
-            viewModel.userViewModel.user.asFlow()
-                .onEach { recyclerAdapter?.user = it }
-                .map { it?.preferences?.tasks?.mirrorGroupTasks }
-                .distinctUntilChanged()
-                .collect {
-                    updateTaskSubscription(viewModel.ownerID.value)
-                }
-        }
-    }
-
-    private fun scoreChecklistItem(task: Task, item: ChecklistItem) {
-        lifecycleScope.launch(ExceptionHandler.coroutine()) {
-            taskRepository.scoreChecklistItem(task.id ?: "", item.id ?: "")
-        }
-    }
-
-    private fun handleTaskResult(result: TaskScoringResult, value: Int) {
-        if (taskType == TaskType.REWARD) {
-            (activity as? MainActivity)?.let { activity ->
-                HabiticaSnackbar.showSnackbar(
-                    activity.snackbarContainer,
-                    null,
-                    getString(R.string.notification_purchase_reward),
-                    BitmapDrawable(resources, HabiticaIconsHelper.imageOfGold()),
-                    ContextCompat.getColor(activity, R.color.yellow_10),
-                    "-$value",
-                    HabiticaSnackbar.SnackbarDisplayType.DROP
-                )
-            }
-        } else {
-            (activity as? MainActivity)?.displayTaskScoringResponse(result)
-        }
-    }
-
-    private fun playSound(direction: TaskDirection) {
-        HapticFeedbackManager.tap(requireView())
-        val soundName = when (taskType) {
-            TaskType.HABIT -> if (direction == TaskDirection.UP) SoundManager.SoundPlusHabit else SoundManager.SoundMinusHabit
-            TaskType.DAILY -> SoundManager.SoundDaily
-            TaskType.TODO -> SoundManager.SoundTodo
-            TaskType.REWARD -> SoundManager.SoundReward
-            else -> null
-        }
-        soundName?.let { soundManager.loadAndPlayAudio(it) }
-    }
-
-    private fun allowReordering() {
-        val itemTouchHelper = itemTouchCallback?.let { ItemTouchHelper(it) }
-        itemTouchHelper?.attachToRecyclerView(binding?.recyclerView)
-    }
-
-    protected open fun getLayoutManager(context: Context?): androidx.recyclerview.widget.LinearLayoutManager {
-        return androidx.recyclerview.widget.LinearLayoutManager(context)
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        itemTouchCallback = null
-    }
-
-    override fun onDestroy() {
-        userRepository.close()
-        super.onDestroy()
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        savedInstanceState?.let {
-            this.taskType =
-                TaskType.from(savedInstanceState.getString(CLASS_TYPE_KEY, "")) ?: TaskType.HABIT
-        }
-
-        this.setInnerAdapter()
-        recyclerAdapter?.filter()
-
-        itemTouchCallback = object : ItemTouchHelper.Callback() {
-            override fun onSelectedChanged(viewHolder: RecyclerView.ViewHolder?, actionState: Int) {
-                super.onSelectedChanged(viewHolder, actionState)
-                if (viewHolder == null || viewHolder.bindingAdapterPosition == NO_POSITION) return
-                val taskViewHolder = viewHolder as? BaseTaskViewHolder
-                if (taskViewHolder != null) {
-                    taskViewHolder.movingFromPosition = viewHolder.bindingAdapterPosition
-                }
-                binding?.refreshLayout?.isEnabled = false
-            }
-
-            override fun onMove(
-                recyclerView: RecyclerView,
-                viewHolder: RecyclerView.ViewHolder,
-                target: RecyclerView.ViewHolder
-            ): Boolean {
-                recyclerAdapter?.notifyItemMoved(
-                    viewHolder.bindingAdapterPosition,
-                    target.bindingAdapterPosition
-                )
-                return true
-            }
-
-            override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) { /* no-on */
-            }
-
-            // defines the enabled move directions in each state (idle, swiping, dragging).
-            override fun getMovementFlags(
-                recyclerView: RecyclerView,
-                viewHolder: RecyclerView.ViewHolder
-            ): Int {
-                return if ((
-                    recyclerAdapter?.getItemViewType(viewHolder.bindingAdapterPosition)
-                        ?: 0
-                    ) != 0
-                ) {
-                    makeFlag(ItemTouchHelper.ACTION_STATE_IDLE, 0)
-                } else {
-                    makeFlag(
-                        ItemTouchHelper.ACTION_STATE_DRAG,
-                        ItemTouchHelper.DOWN or ItemTouchHelper.UP
-                    )
-                }
-            }
-
-            override fun isItemViewSwipeEnabled(): Boolean = false
-
-            override fun isLongPressDragEnabled(): Boolean = true
-
-            override fun clearView(
-                recyclerView: RecyclerView,
-                viewHolder: RecyclerView.ViewHolder
-            ) {
-                super.clearView(recyclerView, viewHolder)
-                binding?.refreshLayout?.isEnabled = true
-
-                if (viewHolder.bindingAdapterPosition == NO_POSITION) return
-                val taskViewHolder = viewHolder as? BaseTaskViewHolder
-                val validTaskId = taskViewHolder?.task?.takeIf { it.isValid }?.id
-                if (viewHolder.bindingAdapterPosition != taskViewHolder?.movingFromPosition) {
-                    taskViewHolder?.movingFromPosition = null
-                    updateTaskInRepository(validTaskId, viewHolder)
-                }
-            }
-
-            private fun updateTaskInRepository(
-                validTaskId: String?,
-                viewHolder: RecyclerView.ViewHolder
-            ) {
-                if (validTaskId != null) {
-                    var newPosition = viewHolder.bindingAdapterPosition
-                    if (viewModel.filterCount(taskType) > 0) {
-                        newPosition = if ((newPosition + 1) >= (recyclerAdapter?.data?.size ?: 0)) {
-                            recyclerAdapter?.data?.get(newPosition - 1)?.position ?: newPosition
-                        } else {
-                            (
-                                recyclerAdapter?.data?.get(newPosition + 1)?.position
-                                    ?: newPosition
-                                ) - 1
-                        }
-                    }
-                    // Factor in if adventure guide is shown.
-                    if (recyclerAdapter?.showAdventureGuide == true) {
-                        newPosition -= 1
-                    }
-                    lifecycleScope.launchCatching {
-                        taskRepository.updateTaskPosition(
-                            taskType,
-                            validTaskId,
-                            newPosition
-                        )
-                    }
-                }
-            }
-        }
-
-        binding?.recyclerView?.setScaledPadding(context, 0, 0, 0, 108)
-
-        layoutManager = getLayoutManager(context)
-        binding?.recyclerView?.layoutManager = layoutManager
-
-        allowReordering()
-
-        binding?.recyclerView?.itemAnimator = itemAnimator
-
-        binding?.refreshLayout?.setOnRefreshListener(this)
-
-        setEmptyLabels()
-
-        binding?.recyclerView?.addOnScrollListener(object : RecyclerView.OnScrollListener() {
-            override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
-                super.onScrollStateChanged(recyclerView, newState)
-                if (newState == RecyclerView.SCROLL_STATE_IDLE) {
-                    binding?.refreshLayout?.isEnabled =
-                        (activity as? MainActivity)?.isAppBarExpanded ?: false
-                }
-            }
-        })
-
-        lifecycleScope.launch(ExceptionHandler.coroutine()) {
-            userRepository.getUser()
-                .distinctUntilChangedBy { it?.hasCompletedOnboarding }
-                .onEach { recyclerAdapter?.showAdventureGuide = it?.hasCompletedOnboarding != true }
-                .takeWhile { it?.hasCompletedOnboarding != true }
-                .collect {
-                    recyclerAdapter?.user = it
-                }
-        }
-        setPreferenceTaskFilters()
-    }
-
-    private fun updateTaskSubscription(ownerID: String?) {
-        if (taskFlowJob?.isActive == true) {
-            taskFlowJob?.cancel()
-        }
-        val additionalGroupIDs =
-            if (ownerID == viewModel.userViewModel.userID) viewModel.userViewModel.mirrorGroupTasks.toTypedArray() else emptyArray()
-        taskFlowJob = lifecycleScope.launch(ExceptionHandler.coroutine()) {
-            taskRepository.getTasks(taskType, ownerID, additionalGroupIDs).collect {
-                recyclerAdapter?.updateUnfilteredData(it)
-            }
-        }
-    }
-
-    protected fun showBrokenChallengeDialog(task: Task) {
-        context?.let {
-            if (!task.isValid) {
-                return
-            }
-            lifecycleScope.launchCatching {
-                val tasks = taskRepository.getTasksForChallenge(task.challengeID).firstOrNull()
-                    ?: return@launchCatching
-                val taskCount = tasks.size
-                val dialog = HabiticaAlertDialog(it)
-                dialog.setTitle(R.string.broken_challenge)
-                dialog.setMessage(
-                    it.getString(
-                        R.string.broken_challenge_description,
-                        taskCount
-                    )
-                )
-                dialog.addButton(
-                    it.getString(R.string.keep_x_tasks, taskCount),
-                    true
-                ) { _, _ ->
-                    if (!task.isValid) return@addButton
-                    lifecycleScope.launch {
-                        taskRepository.unlinkAllTasks(task.challengeID, "keep-all")
-                        userRepository.retrieveUser(true, forced = true)
-                    }
-                }
-                dialog.addButton(
-                    it.getString(R.string.delete_x_tasks, taskCount),
-                    isPrimary = false,
-                    isDestructive = true
-                ) { _, _ ->
-                    if (!task.isValid) return@addButton
-                    lifecycleScope.launch {
-                        taskRepository.unlinkAllTasks(task.challengeID, "remove-all")
-                        userRepository.retrieveUser(true, forced = true)
-                    }
-                }
-                dialog.setExtraCloseButtonVisibility(View.VISIBLE)
-                dialog.show()
-            }
-        }
-    }
-
-    private fun setEmptyLabels() {
-        binding?.recyclerView?.emptyItem = if (viewModel.filterCount(taskType) > 0) {
-            when (this.taskType) {
-                TaskType.HABIT -> {
-                    EmptyItem(
-                        getString(R.string.empty_title_habits_filtered),
-                        getString(R.string.empty_description_habits_filtered),
-                        R.drawable.icon_habits
-                    )
-                }
-                TaskType.DAILY -> {
-                    EmptyItem(
-                        getString(R.string.empty_title_dailies_filtered),
-                        getString(R.string.empty_description_dailies_filtered),
-                        R.drawable.icon_dailies
-                    )
-                }
-                TaskType.TODO -> {
-                    EmptyItem(
-                        getString(R.string.empty_title_todos_filtered),
-                        getString(R.string.empty_description_todos_filtered),
-                        R.drawable.icon_todos
-                    )
-                }
-                TaskType.REWARD -> {
-                    EmptyItem(
-                        getString(R.string.empty_title_rewards_filtered),
-                        null,
-                        R.drawable.icon_rewards
-                    )
-                }
-                else -> EmptyItem("")
-            }
-        } else {
-            when (this.taskType) {
-                TaskType.HABIT -> {
-                    EmptyItem(
-                        getString(R.string.empty_title_habits),
-                        getString(R.string.empty_description_habits),
-                        R.drawable.icon_habits
-                    )
-                }
-                TaskType.DAILY -> {
-                    EmptyItem(
-                        getString(R.string.empty_title_dailies),
-                        getString(R.string.empty_description_dailies),
-                        R.drawable.icon_dailies
-                    )
-                }
-                TaskType.TODO -> {
-                    EmptyItem(
-                        getString(R.string.empty_title_todos),
-                        getString(R.string.empty_description_todos),
-                        R.drawable.icon_todos
-                    )
-                }
-                TaskType.REWARD -> {
-                    EmptyItem(
-                        getString(R.string.empty_title_rewards),
-                        null,
-                        R.drawable.icon_rewards
-                    )
-                }
-                else -> EmptyItem("")
-            }
-        }
-    }
-
-    private fun scoreTask(task: Task, direction: TaskDirection) {
-        viewModel.scoreTask(task, direction) { result, value ->
-            handleTaskResult(result, value)
-        }
-    }
-
-    override fun onSaveInstanceState(outState: Bundle) {
-        super.onSaveInstanceState(outState)
-        outState.putString(CLASS_TYPE_KEY, this.taskType.value)
-    }
-
-    override val displayedClassName: String?
-        get() = this.taskType.value + super.displayedClassName
-
-    override fun onRefresh() {
-        binding?.refreshLayout?.isRefreshing = true
-        viewModel.refreshData {
-            binding?.refreshLayout?.isRefreshing = false
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-        context?.let { recyclerAdapter?.taskDisplayMode = configManager.taskDisplayMode(it) }
-        setInnerAdapter()
-    }
-
-    fun setActiveFilter(activeFilter: String) {
-        viewModel.setActiveFilter(taskType, activeFilter)
-        recyclerAdapter?.filter()
-
-        setEmptyLabels()
-
-        if (activeFilter == Task.FILTER_COMPLETED) {
-            lifecycleScope.launchCatching {
-                taskRepository.retrieveCompletedTodos()
-            }
-        }
-    }
-
-    private fun setPreferenceTaskFilters() {
-        viewModel.userViewModel.user.observeOnce(this) {
-            if (it != null) {
-                when (taskType) {
-                    TaskType.TODO -> viewModel.setActiveFilter(
-                        TaskType.TODO,
-                        Task.FILTER_ACTIVE
-                    )
-                    TaskType.DAILY -> {
-                        if (!viewModel.initialPreferenceFilterSet) {
-                            viewModel.initialPreferenceFilterSet = true
-                            if (it.isValid && it.preferences?.dailyDueDefaultView == true) {
-                                viewModel.setActiveFilter(TaskType.DAILY, Task.FILTER_ACTIVE)
-                            }
-                        }
-                    }
-                    else -> {}
-                }
-            }
-        }
-    }
-
-    private fun openTaskForm(task: Task) {
-        if (Date().time - (
-            TasksFragment.lastTaskFormOpen?.time
-                ?: 0
-            ) < 2000 || !task.isValid
-        ) {
-            return
-        }
-
-        val bundle = Bundle()
-        bundle.putString(TaskFormActivity.TASK_TYPE_KEY, task.type?.value)
-        bundle.putString(TaskFormActivity.TASK_ID_KEY, task.id)
-        bundle.putString(TaskFormActivity.GROUP_ID_KEY, task.group?.groupID)
-        bundle.putDouble(TaskFormActivity.TASK_VALUE_KEY, task.value)
-
-        lifecycleScope.launchCatching {
-            val id = if (viewModel.canEditTask(task)) {
-                R.id.taskFormActivity
-            } else {
-                R.id.taskSummaryActivity
-            }
-            withContext(Dispatchers.Main) {
-                MainNavigationController.navigate(id, bundle)
-            }
-        }
-        TasksFragment.lastTaskFormOpen = Date()
-    }
-
-    companion object {
-        private const val CLASS_TYPE_KEY = "CLASS_TYPE_KEY"
-
-        fun newInstance(context: Context?, classType: TaskType): TaskRecyclerViewFragment {
-            val fragment = TaskRecyclerViewFragment()
-            fragment.taskType = classType
-            var tutorialTexts: List<String>? = null
-            if (context != null) {
-                when (fragment.taskType) {
-                    TaskType.HABIT -> {
-                        fragment.tutorialStepIdentifier = "habits"
-                        tutorialTexts = listOf(
-                            context.getString(R.string.tutorial_overview),
-                            context.getString(R.string.tutorial_habits_1),
-                            context.getString(R.string.tutorial_habits_2),
-                            context.getString(R.string.tutorial_habits_3),
-                            context.getString(R.string.tutorial_habits_4)
-                        )
-                    }
-                    TaskType.DAILY -> {
-                        fragment.tutorialStepIdentifier = "dailies"
-                        tutorialTexts = listOf(
-                            context.getString(R.string.tutorial_dailies_1),
-                            context.getString(R.string.tutorial_dailies_2)
-                        )
-                    }
-                    TaskType.TODO -> {
-                        fragment.tutorialStepIdentifier = "todos"
-                        tutorialTexts = listOf(
-                            context.getString(R.string.tutorial_todos_1),
-                            context.getString(R.string.tutorial_todos_2)
-                        )
-                    }
-                    TaskType.REWARD -> {
-                        fragment.tutorialStepIdentifier = "rewards"
-                        tutorialTexts = listOf(
-                            context.getString(R.string.tutorial_rewards_1),
-                            context.getString(R.string.tutorial_rewards_2)
-                        )
-                    }
-                }
-            }
-
-            if (tutorialTexts != null) {
-                fragment.tutorialTexts = ArrayList(tutorialTexts)
-            }
-            fragment.tutorialCanBeDeferred = false
-
-            return fragment
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.tasks
+
+import android.content.Context
+import android.content.SharedPreferences
+import android.graphics.drawable.BitmapDrawable
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.content.ContextCompat
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.asFlow
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.ItemTouchHelper
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView.NO_POSITION
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.data.InventoryRepository
+import com.habitrpg.android.habitica.data.TaskRepository
+import com.habitrpg.android.habitica.data.UserRepository
+import com.habitrpg.android.habitica.databinding.FragmentRefreshRecyclerviewBinding
+import com.habitrpg.android.habitica.helpers.AppConfigManager
+import com.habitrpg.android.habitica.helpers.HapticFeedbackManager
+import com.habitrpg.android.habitica.helpers.NotificationsManager
+import com.habitrpg.android.habitica.helpers.SoundManager
+import com.habitrpg.android.habitica.models.tasks.ChecklistItem
+import com.habitrpg.android.habitica.models.tasks.Task
+import com.habitrpg.android.habitica.ui.activities.MainActivity
+import com.habitrpg.android.habitica.ui.activities.TaskFormActivity
+import com.habitrpg.android.habitica.ui.adapter.BaseRecyclerViewAdapter
+import com.habitrpg.android.habitica.ui.adapter.tasks.DailiesRecyclerViewHolder
+import com.habitrpg.android.habitica.ui.adapter.tasks.HabitsRecyclerViewAdapter
+import com.habitrpg.android.habitica.ui.adapter.tasks.RewardsRecyclerViewAdapter
+import com.habitrpg.android.habitica.ui.adapter.tasks.TaskRecyclerViewAdapter
+import com.habitrpg.android.habitica.ui.adapter.tasks.TodosRecyclerViewAdapter
+import com.habitrpg.android.habitica.ui.fragments.BaseFragment
+import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
+import com.habitrpg.android.habitica.ui.viewHolders.tasks.BaseTaskViewHolder
+import com.habitrpg.android.habitica.ui.viewmodels.TasksViewModel
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
+import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
+import com.habitrpg.common.habitica.extensions.observeOnce
+import com.habitrpg.common.habitica.extensions.setScaledPadding
+import com.habitrpg.common.habitica.helpers.EmptyItem
+import com.habitrpg.common.habitica.helpers.ExceptionHandler
+import com.habitrpg.common.habitica.helpers.MainNavigationController
+import com.habitrpg.common.habitica.helpers.launchCatching
+import com.habitrpg.shared.habitica.models.responses.TaskDirection
+import com.habitrpg.shared.habitica.models.responses.TaskScoringResult
+import com.habitrpg.shared.habitica.models.tasks.TaskType
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.distinctUntilChangedBy
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.takeWhile
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import java.util.Date
+import javax.inject.Inject
+
+@AndroidEntryPoint
+open class TaskRecyclerViewFragment :
+    BaseFragment<FragmentRefreshRecyclerviewBinding>(),
+    androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener {
+    private var taskFlowJob: Job? = null
+    val viewModel: TasksViewModel by viewModels({ requireParentFragment() })
+
+    internal var canScoreTasks: Boolean = true
+    override var binding: FragmentRefreshRecyclerviewBinding? = null
+
+    override fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+    ): FragmentRefreshRecyclerviewBinding {
+        return FragmentRefreshRecyclerviewBinding.inflate(inflater, container, false)
+    }
+
+    var recyclerAdapter: TaskRecyclerViewAdapter? = null
+    var itemAnimator = SafeDefaultItemAnimator()
+
+    @Inject
+    lateinit var userRepository: UserRepository
+
+    @Inject
+    lateinit var inventoryRepository: InventoryRepository
+
+    @Inject
+    lateinit var taskRepository: TaskRepository
+
+    @Inject
+    lateinit var soundManager: SoundManager
+
+    @Inject
+    lateinit var configManager: AppConfigManager
+
+    @Inject
+    lateinit var sharedPreferences: SharedPreferences
+
+    @Inject
+    lateinit var notificationsManager: NotificationsManager
+
+    internal var layoutManager: RecyclerView.LayoutManager? = null
+
+    internal var taskType: TaskType = TaskType.HABIT
+    private var itemTouchCallback: ItemTouchHelper.Callback? = null
+
+    internal val className: TaskType
+        get() = this.taskType
+
+    private fun setInnerAdapter() {
+        if (binding?.recyclerView?.adapter != null && binding?.recyclerView?.adapter == recyclerAdapter) {
+            return
+        }
+        viewModel.let { viewModel ->
+            val adapter: BaseRecyclerViewAdapter<*, *>? =
+                when (this.taskType) {
+                    TaskType.HABIT -> HabitsRecyclerViewAdapter(R.layout.habit_item_card, viewModel)
+                    TaskType.DAILY -> DailiesRecyclerViewHolder(R.layout.daily_item_card, viewModel)
+                    TaskType.TODO -> TodosRecyclerViewAdapter(R.layout.todo_item_card, viewModel)
+                    TaskType.REWARD ->
+                        RewardsRecyclerViewAdapter(
+                            null,
+                            R.layout.reward_item_card,
+                            viewModel,
+                        )
+
+                    else -> null
+                }
+
+            recyclerAdapter = adapter as? TaskRecyclerViewAdapter
+            binding?.recyclerView?.adapter = adapter
+
+            viewModel.getFilterSet(taskType)?.observe(viewLifecycleOwner) {
+                recyclerAdapter?.filter()
+            }
+        }
+        context?.let { recyclerAdapter?.taskDisplayMode = configManager.taskDisplayMode(it) }
+
+        recyclerAdapter?.errorButtonEvents = {
+            lifecycleScope.launchCatching {
+                taskRepository.syncErroredTasks()
+            }
+        }
+        recyclerAdapter?.taskOpenEvents = { task, _ ->
+            openTaskForm(task)
+        }
+        recyclerAdapter?.taskScoreEvents = { task, direction ->
+            playSound(direction)
+            context?.let { it1 -> notificationsManager.dismissTaskNotification(it1, task) }
+            scoreTask(task, direction)
+        }
+        recyclerAdapter?.checklistItemScoreEvents = { task, item ->
+            scoreChecklistItem(task, item)
+        }
+        recyclerAdapter?.brokenTaskEvents = { showBrokenChallengeDialog(it) }
+        recyclerAdapter?.adventureGuideOpenEvents = {
+            MainNavigationController.navigate(
+                R.id.adventureGuideActivity,
+            )
+        }
+
+        viewModel.ownerID.observe(viewLifecycleOwner) {
+            canScoreTasks = viewModel.isPersonalBoard
+            updateTaskSubscription(it)
+        }
+        lifecycleScope.launch {
+            viewModel.userViewModel.user.asFlow()
+                .onEach { recyclerAdapter?.user = it }
+                .map { it?.preferences?.tasks?.mirrorGroupTasks }
+                .distinctUntilChanged()
+                .collect {
+                    updateTaskSubscription(viewModel.ownerID.value)
+                }
+        }
+    }
+
+    private fun scoreChecklistItem(
+        task: Task,
+        item: ChecklistItem,
+    ) {
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            taskRepository.scoreChecklistItem(task.id ?: "", item.id ?: "")
+        }
+    }
+
+    private fun handleTaskResult(
+        result: TaskScoringResult,
+        value: Int,
+    ) {
+        if (taskType == TaskType.REWARD) {
+            (activity as? MainActivity)?.let { activity ->
+                HabiticaSnackbar.showSnackbar(
+                    activity.snackbarContainer,
+                    null,
+                    getString(R.string.notification_purchase_reward),
+                    BitmapDrawable(resources, HabiticaIconsHelper.imageOfGold()),
+                    ContextCompat.getColor(activity, R.color.yellow_10),
+                    "-$value",
+                    HabiticaSnackbar.SnackbarDisplayType.DROP,
+                )
+            }
+        } else {
+            (activity as? MainActivity)?.displayTaskScoringResponse(result)
+        }
+    }
+
+    private fun playSound(direction: TaskDirection) {
+        HapticFeedbackManager.tap(requireView())
+        val soundName =
+            when (taskType) {
+                TaskType.HABIT -> if (direction == TaskDirection.UP) SoundManager.SOUND_PLUS_HABIT else SoundManager.SOUND_MINUS_HABIT
+                TaskType.DAILY -> SoundManager.SOUND_DAILY
+                TaskType.TODO -> SoundManager.SOUND_TODO
+                TaskType.REWARD -> SoundManager.SOUND_REWARD
+                else -> null
+            }
+        soundName?.let { soundManager.loadAndPlayAudio(it) }
+    }
+
+    private fun allowReordering() {
+        val itemTouchHelper = itemTouchCallback?.let { ItemTouchHelper(it) }
+        itemTouchHelper?.attachToRecyclerView(binding?.recyclerView)
+    }
+
+    protected open fun getLayoutManager(context: Context?): androidx.recyclerview.widget.LinearLayoutManager {
+        return androidx.recyclerview.widget.LinearLayoutManager(context)
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        itemTouchCallback = null
+    }
+
+    override fun onDestroy() {
+        userRepository.close()
+        super.onDestroy()
+    }
+
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
+        super.onViewCreated(view, savedInstanceState)
+        savedInstanceState?.let {
+            this.taskType =
+                TaskType.from(savedInstanceState.getString(CLASS_TYPE_KEY, "")) ?: TaskType.HABIT
+        }
+
+        this.setInnerAdapter()
+        recyclerAdapter?.filter()
+
+        itemTouchCallback =
+            object : ItemTouchHelper.Callback() {
+                override fun onSelectedChanged(
+                    viewHolder: RecyclerView.ViewHolder?,
+                    actionState: Int,
+                ) {
+                    super.onSelectedChanged(viewHolder, actionState)
+                    if (viewHolder == null || viewHolder.bindingAdapterPosition == NO_POSITION) return
+                    val taskViewHolder = viewHolder as? BaseTaskViewHolder
+                    if (taskViewHolder != null) {
+                        taskViewHolder.movingFromPosition = viewHolder.bindingAdapterPosition
+                    }
+                    binding?.refreshLayout?.isEnabled = false
+                }
+
+                override fun onMove(
+                    recyclerView: RecyclerView,
+                    viewHolder: RecyclerView.ViewHolder,
+                    target: RecyclerView.ViewHolder,
+                ): Boolean {
+                    recyclerAdapter?.notifyItemMoved(
+                        viewHolder.bindingAdapterPosition,
+                        target.bindingAdapterPosition,
+                    )
+                    return true
+                }
+
+                override fun onSwiped(
+                    viewHolder: RecyclerView.ViewHolder,
+                    direction: Int,
+                ) { // no-on
+                }
+
+                // defines the enabled move directions in each state (idle, swiping, dragging).
+                override fun getMovementFlags(
+                    recyclerView: RecyclerView,
+                    viewHolder: RecyclerView.ViewHolder,
+                ): Int {
+                    return if ((
+                            recyclerAdapter?.getItemViewType(viewHolder.bindingAdapterPosition)
+                                ?: 0
+                        ) != 0
+                    ) {
+                        makeFlag(ItemTouchHelper.ACTION_STATE_IDLE, 0)
+                    } else {
+                        makeFlag(
+                            ItemTouchHelper.ACTION_STATE_DRAG,
+                            ItemTouchHelper.DOWN or ItemTouchHelper.UP,
+                        )
+                    }
+                }
+
+                override fun isItemViewSwipeEnabled(): Boolean = false
+
+                override fun isLongPressDragEnabled(): Boolean = true
+
+                override fun clearView(
+                    recyclerView: RecyclerView,
+                    viewHolder: RecyclerView.ViewHolder,
+                ) {
+                    super.clearView(recyclerView, viewHolder)
+                    binding?.refreshLayout?.isEnabled = true
+
+                    if (viewHolder.bindingAdapterPosition == NO_POSITION) return
+                    val taskViewHolder = viewHolder as? BaseTaskViewHolder
+                    val validTaskId = taskViewHolder?.task?.takeIf { it.isValid }?.id
+                    if (viewHolder.bindingAdapterPosition != taskViewHolder?.movingFromPosition) {
+                        taskViewHolder?.movingFromPosition = null
+                        updateTaskInRepository(validTaskId, viewHolder)
+                    }
+                }
+
+                private fun updateTaskInRepository(
+                    validTaskId: String?,
+                    viewHolder: RecyclerView.ViewHolder,
+                ) {
+                    if (validTaskId != null) {
+                        var newPosition = viewHolder.bindingAdapterPosition
+                        if (viewModel.filterCount(taskType) > 0) {
+                            newPosition =
+                                if ((newPosition + 1) >= (recyclerAdapter?.data?.size ?: 0)) {
+                                    recyclerAdapter?.data?.get(newPosition - 1)?.position ?: newPosition
+                                } else {
+                                    (
+                                        recyclerAdapter?.data?.get(newPosition + 1)?.position
+                                            ?: newPosition
+                                    ) - 1
+                                }
+                        }
+                        // Factor in if adventure guide is shown.
+                        if (recyclerAdapter?.showAdventureGuide == true) {
+                            newPosition -= 1
+                        }
+                        lifecycleScope.launchCatching {
+                            taskRepository.updateTaskPosition(
+                                taskType,
+                                validTaskId,
+                                newPosition,
+                            )
+                        }
+                    }
+                }
+            }
+
+        binding?.recyclerView?.setScaledPadding(context, 0, 0, 0, 108)
+
+        layoutManager = getLayoutManager(context)
+        binding?.recyclerView?.layoutManager = layoutManager
+
+        allowReordering()
+
+        binding?.recyclerView?.itemAnimator = itemAnimator
+
+        binding?.refreshLayout?.setOnRefreshListener(this)
+
+        setEmptyLabels()
+
+        binding?.recyclerView?.addOnScrollListener(
+            object : RecyclerView.OnScrollListener() {
+                override fun onScrollStateChanged(
+                    recyclerView: RecyclerView,
+                    newState: Int,
+                ) {
+                    super.onScrollStateChanged(recyclerView, newState)
+                    if (newState == RecyclerView.SCROLL_STATE_IDLE) {
+                        binding?.refreshLayout?.isEnabled =
+                            (activity as? MainActivity)?.isAppBarExpanded ?: false
+                    }
+                }
+            },
+        )
+
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.getUser()
+                .distinctUntilChangedBy { it?.hasCompletedOnboarding }
+                .onEach { recyclerAdapter?.showAdventureGuide = it?.hasCompletedOnboarding != true }
+                .takeWhile { it?.hasCompletedOnboarding != true }
+                .collect {
+                    recyclerAdapter?.user = it
+                }
+        }
+        setPreferenceTaskFilters()
+    }
+
+    private fun updateTaskSubscription(ownerID: String?) {
+        if (taskFlowJob?.isActive == true) {
+            taskFlowJob?.cancel()
+        }
+        val additionalGroupIDs =
+            if (ownerID == viewModel.userViewModel.userID) viewModel.userViewModel.mirrorGroupTasks.toTypedArray() else emptyArray()
+        taskFlowJob =
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                taskRepository.getTasks(taskType, ownerID, additionalGroupIDs).collect {
+                    recyclerAdapter?.updateUnfilteredData(it)
+                }
+            }
+    }
+
+    protected fun showBrokenChallengeDialog(task: Task) {
+        context?.let {
+            if (!task.isValid) {
+                return
+            }
+            lifecycleScope.launchCatching {
+                val tasks =
+                    taskRepository.getTasksForChallenge(task.challengeID).firstOrNull()
+                        ?: return@launchCatching
+                val taskCount = tasks.size
+                val dialog = HabiticaAlertDialog(it)
+                dialog.setTitle(R.string.broken_challenge)
+                dialog.setMessage(
+                    it.getString(
+                        R.string.broken_challenge_description,
+                        taskCount,
+                    ),
+                )
+                dialog.addButton(
+                    it.getString(R.string.keep_x_tasks, taskCount),
+                    true,
+                ) { _, _ ->
+                    if (!task.isValid) return@addButton
+                    lifecycleScope.launch {
+                        taskRepository.unlinkAllTasks(task.challengeID, "keep-all")
+                        userRepository.retrieveUser(true, forced = true)
+                    }
+                }
+                dialog.addButton(
+                    it.getString(R.string.delete_x_tasks, taskCount),
+                    isPrimary = false,
+                    isDestructive = true,
+                ) { _, _ ->
+                    if (!task.isValid) return@addButton
+                    lifecycleScope.launch {
+                        taskRepository.unlinkAllTasks(task.challengeID, "remove-all")
+                        userRepository.retrieveUser(true, forced = true)
+                    }
+                }
+                dialog.setExtraCloseButtonVisibility(View.VISIBLE)
+                dialog.show()
+            }
+        }
+    }
+
+    private fun setEmptyLabels() {
+        binding?.recyclerView?.emptyItem =
+            if (viewModel.filterCount(taskType) > 0) {
+                when (this.taskType) {
+                    TaskType.HABIT -> {
+                        EmptyItem(
+                            getString(R.string.empty_title_habits_filtered),
+                            getString(R.string.empty_description_habits_filtered),
+                            R.drawable.icon_habits,
+                        )
+                    }
+
+                    TaskType.DAILY -> {
+                        EmptyItem(
+                            getString(R.string.empty_title_dailies_filtered),
+                            getString(R.string.empty_description_dailies_filtered),
+                            R.drawable.icon_dailies,
+                        )
+                    }
+
+                    TaskType.TODO -> {
+                        EmptyItem(
+                            getString(R.string.empty_title_todos_filtered),
+                            getString(R.string.empty_description_todos_filtered),
+                            R.drawable.icon_todos,
+                        )
+                    }
+
+                    TaskType.REWARD -> {
+                        EmptyItem(
+                            getString(R.string.empty_title_rewards_filtered),
+                            null,
+                            R.drawable.icon_rewards,
+                        )
+                    }
+
+                    else -> EmptyItem("")
+                }
+            } else {
+                when (this.taskType) {
+                    TaskType.HABIT -> {
+                        EmptyItem(
+                            getString(R.string.empty_title_habits),
+                            getString(R.string.empty_description_habits),
+                            R.drawable.icon_habits,
+                        )
+                    }
+
+                    TaskType.DAILY -> {
+                        EmptyItem(
+                            getString(R.string.empty_title_dailies),
+                            getString(R.string.empty_description_dailies),
+                            R.drawable.icon_dailies,
+                        )
+                    }
+
+                    TaskType.TODO -> {
+                        EmptyItem(
+                            getString(R.string.empty_title_todos),
+                            getString(R.string.empty_description_todos),
+                            R.drawable.icon_todos,
+                        )
+                    }
+
+                    TaskType.REWARD -> {
+                        EmptyItem(
+                            getString(R.string.empty_title_rewards),
+                            null,
+                            R.drawable.icon_rewards,
+                        )
+                    }
+
+                    else -> EmptyItem("")
+                }
+            }
+    }
+
+    private fun scoreTask(
+        task: Task,
+        direction: TaskDirection,
+    ) {
+        viewModel.scoreTask(task, direction) { result, value ->
+            handleTaskResult(result, value)
+        }
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState.putString(CLASS_TYPE_KEY, this.taskType.value)
+    }
+
+    override val displayedClassName: String?
+        get() = this.taskType.value + super.displayedClassName
+
+    override fun onRefresh() {
+        binding?.refreshLayout?.isRefreshing = true
+        viewModel.refreshData {
+            binding?.refreshLayout?.isRefreshing = false
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        context?.let { recyclerAdapter?.taskDisplayMode = configManager.taskDisplayMode(it) }
+        setInnerAdapter()
+    }
+
+    fun setActiveFilter(activeFilter: String) {
+        viewModel.setActiveFilter(taskType, activeFilter)
+        recyclerAdapter?.filter()
+
+        setEmptyLabels()
+
+        if (activeFilter == Task.FILTER_COMPLETED) {
+            lifecycleScope.launchCatching {
+                taskRepository.retrieveCompletedTodos()
+            }
+        }
+    }
+
+    private fun setPreferenceTaskFilters() {
+        viewModel.userViewModel.user.observeOnce(this) {
+            if (it != null) {
+                when (taskType) {
+                    TaskType.TODO ->
+                        viewModel.setActiveFilter(
+                            TaskType.TODO,
+                            Task.FILTER_ACTIVE,
+                        )
+
+                    TaskType.DAILY -> {
+                        if (!viewModel.initialPreferenceFilterSet) {
+                            viewModel.initialPreferenceFilterSet = true
+                            if (it.isValid && it.preferences?.dailyDueDefaultView == true) {
+                                viewModel.setActiveFilter(TaskType.DAILY, Task.FILTER_ACTIVE)
+                            }
+                        }
+                    }
+
+                    else -> {}
+                }
+            }
+        }
+    }
+
+    private fun openTaskForm(task: Task) {
+        if (Date().time - (
+                TasksFragment.lastTaskFormOpen?.time
+                    ?: 0
+            ) < 2000 || !task.isValid
+        ) {
+            return
+        }
+
+        val bundle = Bundle()
+        bundle.putString(TaskFormActivity.TASK_TYPE_KEY, task.type?.value)
+        bundle.putString(TaskFormActivity.TASK_ID_KEY, task.id)
+        bundle.putString(TaskFormActivity.GROUP_ID_KEY, task.group?.groupID)
+        bundle.putDouble(TaskFormActivity.TASK_VALUE_KEY, task.value)
+
+        lifecycleScope.launchCatching {
+            val id =
+                if (viewModel.canEditTask(task)) {
+                    R.id.taskFormActivity
+                } else {
+                    R.id.taskSummaryActivity
+                }
+            withContext(Dispatchers.Main) {
+                MainNavigationController.navigate(id, bundle)
+            }
+        }
+        TasksFragment.lastTaskFormOpen = Date()
+    }
+
+    companion object {
+        private const val CLASS_TYPE_KEY = "CLASS_TYPE_KEY"
+
+        fun newInstance(
+            context: Context?,
+            classType: TaskType,
+        ): TaskRecyclerViewFragment {
+            val fragment = TaskRecyclerViewFragment()
+            fragment.taskType = classType
+            var tutorialTexts: List<String>? = null
+            if (context != null) {
+                when (fragment.taskType) {
+                    TaskType.HABIT -> {
+                        fragment.tutorialStepIdentifier = "habits"
+                        tutorialTexts =
+                            listOf(
+                                context.getString(R.string.tutorial_overview),
+                                context.getString(R.string.tutorial_habits_1),
+                                context.getString(R.string.tutorial_habits_2),
+                                context.getString(R.string.tutorial_habits_3),
+                                context.getString(R.string.tutorial_habits_4),
+                            )
+                    }
+
+                    TaskType.DAILY -> {
+                        fragment.tutorialStepIdentifier = "dailies"
+                        tutorialTexts =
+                            listOf(
+                                context.getString(R.string.tutorial_dailies_1),
+                                context.getString(R.string.tutorial_dailies_2),
+                            )
+                    }
+
+                    TaskType.TODO -> {
+                        fragment.tutorialStepIdentifier = "todos"
+                        tutorialTexts =
+                            listOf(
+                                context.getString(R.string.tutorial_todos_1),
+                                context.getString(R.string.tutorial_todos_2),
+                            )
+                    }
+
+                    TaskType.REWARD -> {
+                        fragment.tutorialStepIdentifier = "rewards"
+                        tutorialTexts =
+                            listOf(
+                                context.getString(R.string.tutorial_rewards_1),
+                                context.getString(R.string.tutorial_rewards_2),
+                            )
+                    }
+                }
+            }
+
+            if (tutorialTexts != null) {
+                fragment.tutorialTexts = ArrayList(tutorialTexts)
+            }
+            fragment.tutorialCanBeDeferred = false
+
+            return fragment
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt
index 975a71326..1eeac2d0e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt
@@ -1,436 +1,491 @@
-package com.habitrpg.android.habitica.ui.fragments.tasks
-
-import android.app.Activity
-import android.content.Intent
-import android.graphics.PorterDuff
-import android.os.Bundle
-import android.text.format.DateUtils
-import android.view.LayoutInflater
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
-import android.view.View
-import android.view.ViewGroup
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.appcompat.widget.SearchView
-import androidx.core.content.ContextCompat
-import androidx.core.content.edit
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.viewModels
-import androidx.lifecycle.lifecycleScope
-import androidx.viewpager2.adapter.FragmentStateAdapter
-import androidx.viewpager2.widget.ViewPager2
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.data.TagRepository
-import com.habitrpg.android.habitica.databinding.FragmentViewpagerBinding
-import com.habitrpg.common.habitica.extensions.setTintWith
-import com.habitrpg.android.habitica.helpers.Analytics
-import com.habitrpg.android.habitica.helpers.EventCategory
-import com.habitrpg.android.habitica.helpers.HitType
-import com.habitrpg.common.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.ui.activities.TaskFormActivity
-import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
-import com.habitrpg.android.habitica.ui.viewmodels.TasksViewModel
-import com.habitrpg.android.habitica.ui.views.navigation.HabiticaBottomNavigationViewListener
-import com.habitrpg.android.habitica.ui.views.tasks.TaskFilterDialog
-import com.habitrpg.common.habitica.extensions.getThemeColor
-import com.habitrpg.common.habitica.helpers.launchCatching
-import com.habitrpg.shared.habitica.models.tasks.TaskType
-import dagger.hilt.android.AndroidEntryPoint
-import java.util.Date
-import java.util.WeakHashMap
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class TasksFragment : BaseMainFragment<FragmentViewpagerBinding>(), SearchView.OnQueryTextListener, HabiticaBottomNavigationViewListener {
-    @Inject
-    lateinit var tagRepository: TagRepository
-
-    internal val viewModel: TasksViewModel by viewModels()
-    override var binding: FragmentViewpagerBinding? = null
-
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentViewpagerBinding {
-        return FragmentViewpagerBinding.inflate(inflater, container, false)
-    }
-
-    private var refreshItem: MenuItem? = null
-    internal var viewFragmentsDictionary: MutableMap<Int, TaskRecyclerViewFragment>? = WeakHashMap()
-
-    private var filterMenuItem: MenuItem? = null
-
-    private val activeFragment: TaskRecyclerViewFragment?
-        get() {
-            var fragment = viewFragmentsDictionary?.get(binding?.viewPager?.currentItem)
-            if (fragment == null) {
-                if (isAdded) {
-                    fragment = (childFragmentManager.findFragmentByTag("android:switcher:" + R.id.viewPager + ":" + binding?.viewPager?.currentItem) as? TaskRecyclerViewFragment)
-                }
-            }
-            return fragment
-        }
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        this.usesTabLayout = false
-        this.usesBottomNavigation = true
-        return super.onCreateView(inflater, container, savedInstanceState)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        loadTaskLists()
-        arguments?.let {
-            val args = TasksFragmentArgs.fromBundle(it)
-            val taskTypeValue = args.taskType
-            if (args.ownerID?.isNotBlank() == true) {
-                viewModel.canSwitchOwners.value = false
-                viewModel.ownerID.value = args.ownerID ?: viewModel.userViewModel.userID
-            } else if (viewModel.ownerID.value?.isNotBlank() != true) {
-                viewModel.ownerID.value = viewModel.userViewModel.userID
-            }
-            if (taskTypeValue?.isNotBlank() == true) {
-                val taskType = TaskType.from(taskTypeValue)
-                switchToTaskTab(taskType)
-            } else {
-                when (viewModel.sharedPreferences.getString("launch_screen", "")) {
-                    "/user/tasks/habits" -> onTabSelected(TaskType.HABIT, false)
-                    "/user/tasks/dailies" -> onTabSelected(TaskType.DAILY, false)
-                    "/user/tasks/todos" -> onTabSelected(TaskType.TODO, false)
-                    "/user/tasks/rewards" -> onTabSelected(TaskType.REWARD, false)
-                }
-            }
-        }
-
-        viewModel.ownerID.observe(viewLifecycleOwner) {
-            updateBoardDisplay()
-        }
-        viewModel.canSwitchOwners.observe(viewLifecycleOwner) {
-            isTitleInteractive = it ?: false
-            updateToolbarInteractivity()
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-        bottomNavigation?.activeTaskType = getActiveTaskType()
-        binding?.viewPager?.currentItem = binding?.viewPager?.currentItem ?: 0
-        bottomNavigation?.listener = this
-        lifecycleScope.launchCatching {
-            bottomNavigation?.canAddTasks = viewModel.canAddTasks()
-        }
-
-        mainActivity?.binding?.content?.toolbarTitle?.setOnClickListener {
-            viewModel.cycleOwnerIDs()
-        }
-    }
-
-    override fun onPause() {
-        if (bottomNavigation?.listener == this) {
-            bottomNavigation?.listener = null
-        }
-        super.onPause()
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        super.onCreateOptionsMenu(menu, inflater)
-        if (viewModel.isPersonalBoard) {
-            inflater.inflate(R.menu.menu_main_activity, menu)
-        } else {
-            inflater.inflate(R.menu.menu_team_board, menu)
-        }
-
-        filterMenuItem = menu.findItem(R.id.action_filter)
-        updateFilterIcon(taskType = getActiveTaskType())
-
-        val item = menu.findItem(R.id.action_search)
-        tintMenuIcon(item)
-        val sv = item.actionView as? SearchView
-        sv?.setOnQueryTextListener(this)
-        sv?.setIconifiedByDefault(false)
-        item.setOnActionExpandListener(object : MenuItem.OnActionExpandListener {
-            override fun onMenuItemActionCollapse(item: MenuItem): Boolean {
-                filterMenuItem?.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS)
-                return true
-            }
-
-            override fun onMenuItemActionExpand(item: MenuItem): Boolean {
-                // Do something when expanded
-                filterMenuItem?.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
-                return true
-            }
-        })
-    }
-
-    override fun onQueryTextSubmit(query: String?): Boolean {
-        return true
-    }
-
-    override fun onQueryTextChange(newText: String?): Boolean {
-        viewModel.searchQuery = newText
-        return true
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        return when (item.itemId) {
-            R.id.action_filter -> {
-                showFilterDialog()
-                true
-            }
-            R.id.action_reload -> {
-                refreshItem = item
-                viewModel.refreshData { }
-                true
-            }
-            else -> super.onOptionsItemSelected(item)
-        }
-    }
-
-    private fun showFilterDialog() {
-        context?.let {
-            val dialog = TaskFilterDialog(it, tagRepository, viewModel.isPersonalBoard)
-            dialog.viewModel = viewModel
-
-            // There are some cases where these things might not be correctly set after the app resumes. This is just to catch that as best as possible
-            val navigation = bottomNavigation ?: mainActivity?.binding?.content?.bottomNavigation
-            val taskType = navigation?.activeTaskType ?: activeFragment?.taskType
-
-            dialog.setOnDismissListener { updateFilterIcon(taskType) }
-
-            if (taskType != null) {
-                dialog.taskType = taskType
-            }
-            dialog.show()
-        }
-    }
-
-    private fun loadTaskLists() {
-        val fragmentManager = childFragmentManager
-
-        binding?.viewPager?.adapter = object : FragmentStateAdapter(fragmentManager, lifecycle) {
-            override fun createFragment(position: Int): Fragment {
-                val fragment: TaskRecyclerViewFragment = when (position) {
-                    0 -> TaskRecyclerViewFragment.newInstance(context, TaskType.HABIT)
-                    1 -> TaskRecyclerViewFragment.newInstance(context, TaskType.DAILY)
-                    3 -> RewardsRecyclerviewFragment.newInstance(context, TaskType.REWARD, true)
-                    else -> TaskRecyclerViewFragment.newInstance(context, TaskType.TODO)
-                }
-                viewFragmentsDictionary?.put(position, fragment)
-                return fragment
-            }
-
-            override fun getItemCount(): Int = 4
-        }
-
-        binding?.viewPager?.registerOnPageChangeCallback(object :
-                ViewPager2.OnPageChangeCallback() {
-            override fun onPageSelected(position: Int) {
-                super.onPageSelected(position)
-                bottomNavigation?.selectedPosition = position
-                updateFilterIcon(getTaskTypeFromTabPosition(position))
-            }
-        })
-    }
-
-    private fun updateFilterIcon(taskType: TaskType?) {
-        val filterCount = viewModel.filterCount(taskType)
-
-        filterMenuItem?.isVisible = taskType != TaskType.REWARD
-        if (filterCount == 0) {
-            filterMenuItem?.setIcon(R.drawable.ic_action_filter_list)
-            context?.let {
-                val filterIcon = ContextCompat.getDrawable(it, R.drawable.ic_action_filter_list)
-                filterIcon?.setTintWith(it.getThemeColor(R.attr.headerTextColor), PorterDuff.Mode.MULTIPLY)
-                filterMenuItem?.setIcon(filterIcon)
-            }
-        } else {
-            context?.let {
-                val filterIcon = ContextCompat.getDrawable(it, R.drawable.ic_filters_active)
-                filterIcon?.setTintWith(it.getThemeColor(R.attr.textColorPrimaryDark), PorterDuff.Mode.MULTIPLY)
-                filterMenuItem?.setIcon(filterIcon)
-            }
-        }
-    }
-
-    private fun updateBottomBarBadges() {
-        if (bottomNavigation == null) {
-            return
-        }
-        lifecycleScope.launchCatching {
-            tutorialRepository.getTutorialSteps(listOf("habits", "dailies", "todos", "rewards"))
-                .collect { tutorialSteps ->
-                    val activeTutorialFragments = ArrayList<TaskType>()
-                    for (step in tutorialSteps) {
-                        var id = -1
-                        val taskType = when (step.identifier) {
-                            "habits" -> {
-                                id = R.id.habits_tab
-                                TaskType.HABIT
-                            }
-                            "dailies" -> {
-                                id = R.id.dailies_tab
-                                TaskType.DAILY
-                            }
-                            "todos" -> {
-                                id = R.id.todos_tab
-                                TaskType.TODO
-                            }
-                            "rewards" -> {
-                                id = R.id.rewards_tab
-                                TaskType.REWARD
-                            }
-                            else -> TaskType.HABIT
-                        }
-                        val tab = bottomNavigation?.tabWithId(id)
-                        if (step.shouldDisplay) {
-                            tab?.badgeCount = 1
-                            activeTutorialFragments.add(taskType)
-                        } else {
-                            tab?.badgeCount = 0
-                        }
-                    }
-                    if (activeTutorialFragments.size == 1) {
-                        val fragment =
-                            viewFragmentsDictionary?.get(indexForTaskType(activeTutorialFragments[0]))
-                        if (fragment?.tutorialTexts != null && context != null) {
-                            val finalText = context?.getString(R.string.tutorial_tasks_complete)
-                            if (!fragment.tutorialTexts.contains(finalText) && finalText != null) {
-                                fragment.tutorialTexts = fragment.tutorialTexts + finalText
-                            }
-                        }
-                    }
-                }
-        }
-    }
-    // endregion
-
-    private fun openNewTaskActivity(type: TaskType) {
-        if (Date().time - (lastTaskFormOpen?.time ?: 0) < 2000) {
-            return
-        }
-
-        val additionalData = HashMap<String, Any>()
-        additionalData["created task type"] = type
-        additionalData["viewed task type"] =
-                getTaskTypeFromTabPosition(binding?.viewPager?.currentItem) ?: ""
-        Analytics.sendEvent("open create task form", EventCategory.BEHAVIOUR, HitType.EVENT, additionalData)
-
-        val bundle = Bundle()
-        bundle.putString(TaskFormActivity.TASK_TYPE_KEY, type.value)
-        if (!viewModel.isPersonalBoard) {
-            bundle.putString(TaskFormActivity.GROUP_ID_KEY, viewModel.ownerID.value)
-        }
-        bundle.putStringArrayList(TaskFormActivity.SELECTED_TAGS_KEY, ArrayList(viewModel.tags))
-
-        val intent = Intent(mainActivity, TaskFormActivity::class.java)
-        intent.putExtras(bundle)
-        intent.flags = Intent.FLAG_ACTIVITY_REORDER_TO_FRONT
-        if (this.isAdded) {
-            lastTaskFormOpen = Date()
-            taskCreateResult.launch(intent)
-        }
-    }
-
-    private fun getTaskTypeFromTabPosition(position: Int?): TaskType? = when (position) {
-        0 -> TaskType.HABIT
-        1 -> TaskType.DAILY
-        2 -> TaskType.TODO
-        3 -> TaskType.REWARD
-        else -> null
-    }
-
-    private fun getActiveTaskType(): TaskType =
-            getTaskTypeFromTabPosition(binding?.viewPager?.currentItem) ?: TaskType.HABIT
-
-    //endregion Events
-
-    private val taskCreateResult = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-        onTaskCreatedResult(it.resultCode, it.data)
-    }
-
-    private fun onTaskCreatedResult(resultCode: Int, data: Intent?) {
-        if (resultCode == Activity.RESULT_OK) {
-            val taskTypeValue = data?.getStringExtra(TaskFormActivity.TASK_TYPE_KEY)
-            if (taskTypeValue != null) {
-                val taskType = TaskType.from(taskTypeValue)
-                switchToTaskTab(taskType)
-
-                val index = indexForTaskType(taskType)
-                if (index != -1) {
-                    val fragment = viewFragmentsDictionary?.get(index)
-                    fragment?.binding?.recyclerView?.scrollToPosition(0)
-                }
-            }
-
-            if (!DateUtils.isToday(viewModel.sharedPreferences.getLong("last_creation_reporting", 0))) {
-                Analytics.sendEvent(
-                    "task created",
-                    EventCategory.BEHAVIOUR,
-                    HitType.EVENT
-                )
-                viewModel.sharedPreferences.edit {
-                    putLong("last_creation_reporting", Date().time)
-                }
-            }
-        }
-    }
-
-    private fun switchToTaskTab(taskType: TaskType?) {
-        val index = indexForTaskType(taskType)
-        if (binding?.viewPager != null && index != -1) {
-            binding?.viewPager?.currentItem = index
-            updateBottomBarBadges()
-        }
-    }
-
-    private fun indexForTaskType(taskType: TaskType?): Int {
-        if (taskType != null) {
-            for (index in 0 until (viewFragmentsDictionary?.size ?: 0)) {
-                val fragment = viewFragmentsDictionary?.get(index)
-                if (fragment != null && taskType == fragment.className) {
-                    return index
-                }
-            }
-        }
-        return -1
-    }
-
-    override val displayedClassName: String?
-        get() = null
-
-    override fun addToBackStack(): Boolean = false
-
-    companion object {
-        var lastTaskFormOpen: Date? = null
-    }
-
-    override fun onTabSelected(taskType: TaskType, smooth: Boolean) {
-        val newItem = when (taskType) {
-            TaskType.HABIT -> 0
-            TaskType.DAILY -> 1
-            TaskType.TODO -> 2
-            TaskType.REWARD -> 3
-            else -> 0
-        }
-        binding?.viewPager?.setCurrentItem(newItem, smooth)
-        updateBottomBarBadges()
-    }
-
-    override fun onAdd(taskType: TaskType) {
-        openNewTaskActivity(taskType)
-    }
-
-    private fun updateBoardDisplay() {
-        if (viewModel.ownerTitle.isNotBlank()) {
-            mainActivity?.title = viewModel.ownerTitle
-            MainNavigationController.updateLabel(R.id.tasksFragment, viewModel.ownerTitle.toString())
-        }
-        val teamPlan = viewModel.teamPlans[viewModel.ownerID.value]
-        viewModel.userViewModel.currentTeamPlan.tryEmit(teamPlan)
-        lifecycleScope.launchCatching {
-            bottomNavigation?.canAddTasks = viewModel.canAddTasks()
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.tasks
+
+import android.app.Activity
+import android.content.Intent
+import android.graphics.PorterDuff
+import android.os.Bundle
+import android.text.format.DateUtils
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.widget.SearchView
+import androidx.core.content.ContextCompat
+import androidx.core.content.edit
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.lifecycleScope
+import androidx.viewpager2.adapter.FragmentStateAdapter
+import androidx.viewpager2.widget.ViewPager2
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.data.TagRepository
+import com.habitrpg.android.habitica.databinding.FragmentViewpagerBinding
+import com.habitrpg.android.habitica.helpers.Analytics
+import com.habitrpg.android.habitica.helpers.EventCategory
+import com.habitrpg.android.habitica.helpers.HitType
+import com.habitrpg.android.habitica.ui.activities.TaskFormActivity
+import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
+import com.habitrpg.android.habitica.ui.viewmodels.TasksViewModel
+import com.habitrpg.android.habitica.ui.views.navigation.HabiticaBottomNavigationViewListener
+import com.habitrpg.android.habitica.ui.views.tasks.TaskFilterDialog
+import com.habitrpg.common.habitica.extensions.getThemeColor
+import com.habitrpg.common.habitica.extensions.setTintWith
+import com.habitrpg.common.habitica.helpers.MainNavigationController
+import com.habitrpg.common.habitica.helpers.launchCatching
+import com.habitrpg.shared.habitica.models.tasks.TaskType
+import dagger.hilt.android.AndroidEntryPoint
+import java.util.Date
+import java.util.WeakHashMap
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class TasksFragment :
+    BaseMainFragment<FragmentViewpagerBinding>(),
+    SearchView.OnQueryTextListener,
+    HabiticaBottomNavigationViewListener {
+    @Inject
+    lateinit var tagRepository: TagRepository
+
+    internal val viewModel: TasksViewModel by viewModels()
+    override var binding: FragmentViewpagerBinding? = null
+
+    override fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+    ): FragmentViewpagerBinding {
+        return FragmentViewpagerBinding.inflate(inflater, container, false)
+    }
+
+    private var refreshItem: MenuItem? = null
+    internal var viewFragmentsDictionary: MutableMap<Int, TaskRecyclerViewFragment>? = WeakHashMap()
+
+    private var filterMenuItem: MenuItem? = null
+
+    private val activeFragment: TaskRecyclerViewFragment?
+        get() {
+            var fragment = viewFragmentsDictionary?.get(binding?.viewPager?.currentItem)
+            if (fragment == null) {
+                if (isAdded) {
+                    fragment =
+                        (childFragmentManager.findFragmentByTag("android:switcher:" + R.id.viewPager + ":" + binding?.viewPager?.currentItem) as? TaskRecyclerViewFragment)
+                }
+            }
+            return fragment
+        }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?,
+    ): View? {
+        this.usesTabLayout = false
+        this.usesBottomNavigation = true
+        return super.onCreateView(inflater, container, savedInstanceState)
+    }
+
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
+        super.onViewCreated(view, savedInstanceState)
+        loadTaskLists()
+        arguments?.let {
+            val args = TasksFragmentArgs.fromBundle(it)
+            val taskTypeValue = args.taskType
+            if (args.ownerID?.isNotBlank() == true) {
+                viewModel.canSwitchOwners.value = false
+                viewModel.ownerID.value = args.ownerID ?: viewModel.userViewModel.userID
+            } else if (viewModel.ownerID.value?.isNotBlank() != true) {
+                viewModel.ownerID.value = viewModel.userViewModel.userID
+            }
+            if (taskTypeValue?.isNotBlank() == true) {
+                val taskType = TaskType.from(taskTypeValue)
+                switchToTaskTab(taskType)
+            } else {
+                when (viewModel.sharedPreferences.getString("launch_screen", "")) {
+                    "/user/tasks/habits" -> onTabSelected(TaskType.HABIT, false)
+                    "/user/tasks/dailies" -> onTabSelected(TaskType.DAILY, false)
+                    "/user/tasks/todos" -> onTabSelected(TaskType.TODO, false)
+                    "/user/tasks/rewards" -> onTabSelected(TaskType.REWARD, false)
+                }
+            }
+        }
+
+        viewModel.ownerID.observe(viewLifecycleOwner) {
+            updateBoardDisplay()
+        }
+        viewModel.canSwitchOwners.observe(viewLifecycleOwner) {
+            isTitleInteractive = it ?: false
+            updateToolbarInteractivity()
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        bottomNavigation?.activeTaskType = getActiveTaskType()
+        binding?.viewPager?.currentItem = binding?.viewPager?.currentItem ?: 0
+        bottomNavigation?.listener = this
+        lifecycleScope.launchCatching {
+            bottomNavigation?.canAddTasks = viewModel.canAddTasks()
+        }
+
+        mainActivity?.binding?.content?.toolbarTitle?.setOnClickListener {
+            viewModel.cycleOwnerIDs()
+        }
+    }
+
+    override fun onPause() {
+        if (bottomNavigation?.listener == this) {
+            bottomNavigation?.listener = null
+        }
+        super.onPause()
+    }
+
+    override fun onCreateOptionsMenu(
+        menu: Menu,
+        inflater: MenuInflater,
+    ) {
+        super.onCreateOptionsMenu(menu, inflater)
+        if (viewModel.isPersonalBoard) {
+            inflater.inflate(R.menu.menu_main_activity, menu)
+        } else {
+            inflater.inflate(R.menu.menu_team_board, menu)
+        }
+
+        filterMenuItem = menu.findItem(R.id.action_filter)
+        updateFilterIcon(taskType = getActiveTaskType())
+
+        val item = menu.findItem(R.id.action_search)
+        tintMenuIcon(item)
+        val sv = item.actionView as? SearchView
+        sv?.setOnQueryTextListener(this)
+        sv?.setIconifiedByDefault(false)
+        item.setOnActionExpandListener(
+            object : MenuItem.OnActionExpandListener {
+                override fun onMenuItemActionCollapse(item: MenuItem): Boolean {
+                    filterMenuItem?.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS)
+                    return true
+                }
+
+                override fun onMenuItemActionExpand(item: MenuItem): Boolean {
+                    // Do something when expanded
+                    filterMenuItem?.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
+                    return true
+                }
+            },
+        )
+    }
+
+    override fun onQueryTextSubmit(query: String?): Boolean {
+        return true
+    }
+
+    override fun onQueryTextChange(newText: String?): Boolean {
+        viewModel.searchQuery = newText
+        return true
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return when (item.itemId) {
+            R.id.action_filter -> {
+                showFilterDialog()
+                true
+            }
+
+            R.id.action_reload -> {
+                refreshItem = item
+                viewModel.refreshData { }
+                true
+            }
+
+            else -> super.onOptionsItemSelected(item)
+        }
+    }
+
+    private fun showFilterDialog() {
+        context?.let {
+            val dialog = TaskFilterDialog(it, tagRepository, viewModel.isPersonalBoard)
+            dialog.viewModel = viewModel
+
+            // There are some cases where these things might not be correctly set after the app resumes. This is just to catch that as best as possible
+            val navigation = bottomNavigation ?: mainActivity?.binding?.content?.bottomNavigation
+            val taskType = navigation?.activeTaskType ?: activeFragment?.taskType
+
+            dialog.setOnDismissListener { updateFilterIcon(taskType) }
+
+            if (taskType != null) {
+                dialog.taskType = taskType
+            }
+            dialog.show()
+        }
+    }
+
+    private fun loadTaskLists() {
+        val fragmentManager = childFragmentManager
+
+        binding?.viewPager?.adapter =
+            object : FragmentStateAdapter(fragmentManager, lifecycle) {
+                override fun createFragment(position: Int): Fragment {
+                    val fragment: TaskRecyclerViewFragment =
+                        when (position) {
+                            0 -> TaskRecyclerViewFragment.newInstance(context, TaskType.HABIT)
+                            1 -> TaskRecyclerViewFragment.newInstance(context, TaskType.DAILY)
+                            3 -> RewardsRecyclerviewFragment.newInstance(context, TaskType.REWARD, true)
+                            else -> TaskRecyclerViewFragment.newInstance(context, TaskType.TODO)
+                        }
+                    viewFragmentsDictionary?.put(position, fragment)
+                    return fragment
+                }
+
+                override fun getItemCount(): Int = 4
+            }
+
+        binding?.viewPager?.registerOnPageChangeCallback(
+            object :
+                ViewPager2.OnPageChangeCallback() {
+                override fun onPageSelected(position: Int) {
+                    super.onPageSelected(position)
+                    bottomNavigation?.selectedPosition = position
+                    updateFilterIcon(getTaskTypeFromTabPosition(position))
+                }
+            },
+        )
+    }
+
+    private fun updateFilterIcon(taskType: TaskType?) {
+        val filterCount = viewModel.filterCount(taskType)
+
+        filterMenuItem?.isVisible = taskType != TaskType.REWARD
+        if (filterCount == 0) {
+            filterMenuItem?.setIcon(R.drawable.ic_action_filter_list)
+            context?.let {
+                val filterIcon = ContextCompat.getDrawable(it, R.drawable.ic_action_filter_list)
+                filterIcon?.setTintWith(
+                    it.getThemeColor(R.attr.headerTextColor),
+                    PorterDuff.Mode.MULTIPLY,
+                )
+                filterMenuItem?.setIcon(filterIcon)
+            }
+        } else {
+            context?.let {
+                val filterIcon = ContextCompat.getDrawable(it, R.drawable.ic_filters_active)
+                filterIcon?.setTintWith(
+                    it.getThemeColor(R.attr.textColorPrimaryDark),
+                    PorterDuff.Mode.MULTIPLY,
+                )
+                filterMenuItem?.setIcon(filterIcon)
+            }
+        }
+    }
+
+    private fun updateBottomBarBadges() {
+        if (bottomNavigation == null) {
+            return
+        }
+        lifecycleScope.launchCatching {
+            tutorialRepository.getTutorialSteps(listOf("habits", "dailies", "todos", "rewards"))
+                .collect { tutorialSteps ->
+                    val activeTutorialFragments = ArrayList<TaskType>()
+                    for (step in tutorialSteps) {
+                        var id = -1
+                        val taskType =
+                            when (step.identifier) {
+                                "habits" -> {
+                                    id = R.id.habits_tab
+                                    TaskType.HABIT
+                                }
+
+                                "dailies" -> {
+                                    id = R.id.dailies_tab
+                                    TaskType.DAILY
+                                }
+
+                                "todos" -> {
+                                    id = R.id.todos_tab
+                                    TaskType.TODO
+                                }
+
+                                "rewards" -> {
+                                    id = R.id.rewards_tab
+                                    TaskType.REWARD
+                                }
+
+                                else -> TaskType.HABIT
+                            }
+                        val tab = bottomNavigation?.tabWithId(id)
+                        if (step.shouldDisplay) {
+                            tab?.badgeCount = 1
+                            activeTutorialFragments.add(taskType)
+                        } else {
+                            tab?.badgeCount = 0
+                        }
+                    }
+                    if (activeTutorialFragments.size == 1) {
+                        val fragment =
+                            viewFragmentsDictionary?.get(indexForTaskType(activeTutorialFragments[0]))
+                        if (fragment?.tutorialTexts != null && context != null) {
+                            val finalText = context?.getString(R.string.tutorial_tasks_complete)
+                            if (!fragment.tutorialTexts.contains(finalText) && finalText != null) {
+                                fragment.tutorialTexts = fragment.tutorialTexts + finalText
+                            }
+                        }
+                    }
+                }
+        }
+    }
+    // endregion
+
+    private fun openNewTaskActivity(type: TaskType) {
+        if (Date().time - (lastTaskFormOpen?.time ?: 0) < 2000) {
+            return
+        }
+
+        val additionalData = HashMap<String, Any>()
+        additionalData["created task type"] = type
+        additionalData["viewed task type"] =
+            getTaskTypeFromTabPosition(binding?.viewPager?.currentItem) ?: ""
+        Analytics.sendEvent(
+            "open create task form",
+            EventCategory.BEHAVIOUR,
+            HitType.EVENT,
+            additionalData,
+        )
+
+        val bundle = Bundle()
+        bundle.putString(TaskFormActivity.TASK_TYPE_KEY, type.value)
+        if (!viewModel.isPersonalBoard) {
+            bundle.putString(TaskFormActivity.GROUP_ID_KEY, viewModel.ownerID.value)
+        }
+        bundle.putStringArrayList(TaskFormActivity.SELECTED_TAGS_KEY, ArrayList(viewModel.tags))
+
+        val intent = Intent(mainActivity, TaskFormActivity::class.java)
+        intent.putExtras(bundle)
+        intent.flags = Intent.FLAG_ACTIVITY_REORDER_TO_FRONT
+        if (this.isAdded) {
+            lastTaskFormOpen = Date()
+            taskCreateResult.launch(intent)
+        }
+    }
+
+    private fun getTaskTypeFromTabPosition(position: Int?): TaskType? =
+        when (position) {
+            0 -> TaskType.HABIT
+            1 -> TaskType.DAILY
+            2 -> TaskType.TODO
+            3 -> TaskType.REWARD
+            else -> null
+        }
+
+    private fun getActiveTaskType(): TaskType =
+        getTaskTypeFromTabPosition(binding?.viewPager?.currentItem) ?: TaskType.HABIT
+
+    //endregion Events
+
+    private val taskCreateResult =
+        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+            onTaskCreatedResult(it.resultCode, it.data)
+        }
+
+    private fun onTaskCreatedResult(
+        resultCode: Int,
+        data: Intent?,
+    ) {
+        if (resultCode == Activity.RESULT_OK) {
+            val taskTypeValue = data?.getStringExtra(TaskFormActivity.TASK_TYPE_KEY)
+            if (taskTypeValue != null) {
+                val taskType = TaskType.from(taskTypeValue)
+                switchToTaskTab(taskType)
+
+                val index = indexForTaskType(taskType)
+                if (index != -1) {
+                    val fragment = viewFragmentsDictionary?.get(index)
+                    fragment?.binding?.recyclerView?.scrollToPosition(0)
+                }
+            }
+
+            if (!DateUtils.isToday(
+                    viewModel.sharedPreferences.getLong(
+                        "last_creation_reporting",
+                        0,
+                    ),
+                )
+            ) {
+                Analytics.sendEvent(
+                    "task created",
+                    EventCategory.BEHAVIOUR,
+                    HitType.EVENT,
+                )
+                viewModel.sharedPreferences.edit {
+                    putLong("last_creation_reporting", Date().time)
+                }
+            }
+        }
+    }
+
+    private fun switchToTaskTab(taskType: TaskType?) {
+        val index = indexForTaskType(taskType)
+        if (binding?.viewPager != null && index != -1) {
+            binding?.viewPager?.currentItem = index
+            updateBottomBarBadges()
+        }
+    }
+
+    private fun indexForTaskType(taskType: TaskType?): Int {
+        if (taskType != null) {
+            for (index in 0 until (viewFragmentsDictionary?.size ?: 0)) {
+                val fragment = viewFragmentsDictionary?.get(index)
+                if (fragment != null && taskType == fragment.className) {
+                    return index
+                }
+            }
+        }
+        return -1
+    }
+
+    override val displayedClassName: String?
+        get() = null
+
+    override fun addToBackStack(): Boolean = false
+
+    companion object {
+        var lastTaskFormOpen: Date? = null
+    }
+
+    override fun onTabSelected(
+        taskType: TaskType,
+        smooth: Boolean,
+    ) {
+        val newItem =
+            when (taskType) {
+                TaskType.HABIT -> 0
+                TaskType.DAILY -> 1
+                TaskType.TODO -> 2
+                TaskType.REWARD -> 3
+                else -> 0
+            }
+        binding?.viewPager?.setCurrentItem(newItem, smooth)
+        updateBottomBarBadges()
+    }
+
+    override fun onAdd(taskType: TaskType) {
+        openNewTaskActivity(taskType)
+    }
+
+    private fun updateBoardDisplay() {
+        if (viewModel.ownerTitle.isNotBlank()) {
+            mainActivity?.title = viewModel.ownerTitle
+            MainNavigationController.updateLabel(
+                R.id.tasksFragment,
+                viewModel.ownerTitle.toString(),
+            )
+        }
+        val teamPlan = viewModel.teamPlans[viewModel.ownerID.value]
+        viewModel.userViewModel.currentTeamPlan.tryEmit(teamPlan)
+        lifecycleScope.launchCatching {
+            bottomNavigation?.canAddTasks = viewModel.canAddTasks()
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/AutocompleteAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/AutocompleteAdapter.kt
index ab433c767..bfb3c0694 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/AutocompleteAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/AutocompleteAdapter.kt
@@ -25,7 +25,7 @@ class AutocompleteAdapter(
     val socialRepository: SocialRepository? = null,
     var autocompleteContext: String? = null,
     var groupID: String? = null,
-    val remoteAutocomplete: Boolean = false
+    val remoteAutocomplete: Boolean = false,
 ) : BaseAdapter(), Filterable {
     var chatMessages: List<ChatMessage> = arrayListOf()
     private var userResults: List<FindUsernameResult> = arrayListOf()
@@ -55,25 +55,30 @@ class AutocompleteAdapter(
                     } else if (constraint[0] == '@') {
                         lastAutocomplete = Date().time
                         isAutocompletingUsers = true
-                        userResults = chatMessages
-                            .filter { it.isValid }
-                            .distinctBy {
-                                it.username
-                            }.filter { it.username?.startsWith(constraint.toString().drop(1)) ?: false }.map { message ->
-                                val result = FindUsernameResult()
-                                result.authentication = Authentication()
-                                result.authentication?.localAuthentication = LocalAuthentication()
-                                result.authentication?.localAuthentication?.username = message.username
-                                result.contributor = message.contributor
-                                result.profile = Profile()
-                                result.profile?.name = message.user
-                                result
-                            }
+                        userResults =
+                            chatMessages
+                                .filter { it.isValid }
+                                .distinctBy {
+                                    it.username
+                                }.filter {
+                                    it.username?.startsWith(constraint.toString().drop(1)) ?: false
+                                }.map { message ->
+                                    val result = FindUsernameResult()
+                                    result.authentication = Authentication()
+                                    result.authentication?.localAuthentication = LocalAuthentication()
+                                    result.authentication?.localAuthentication?.username =
+                                        message.username
+                                    result.contributor = message.contributor
+                                    result.profile = Profile()
+                                    result.profile?.name = message.user
+                                    result
+                                }
                         filterResults.values = userResults
                         filterResults.count = userResults.size
                     } else if (constraint[0] == ':') {
                         isAutocompletingUsers = false
-                        emojiResults = EmojiMap.invertedEmojiMap.keys.filter { it.startsWith(constraint) }
+                        emojiResults =
+                            EmojiMap.invertedEmojiMap.keys.filter { it.startsWith(constraint) }
                         filterResults.values = emojiResults
                         filterResults.count = emojiResults.size
                     }
@@ -81,7 +86,10 @@ class AutocompleteAdapter(
                 return filterResults
             }
 
-            override fun publishResults(contraint: CharSequence?, results: FilterResults?) {
+            override fun publishResults(
+                contraint: CharSequence?,
+                results: FilterResults?,
+            ) {
                 if (results != null && results.count > 0) {
                     notifyDataSetChanged()
                 } else {
@@ -91,7 +99,11 @@ class AutocompleteAdapter(
         }
     }
 
-    override fun getView(position: Int, convertView: View?, parent: ViewGroup?): View {
+    override fun getView(
+        position: Int,
+        convertView: View?,
+        parent: ViewGroup?,
+    ): View {
         return if (isAutocompletingUsers) {
             val view = parent?.inflate(R.layout.autocomplete_username)
             val result = getItem(position) as? FindUsernameResult
@@ -111,7 +123,13 @@ class AutocompleteAdapter(
     }
 
     override fun getItem(position: Int): Any? {
-        return if (isAutocompletingUsers) userResults.getOrNull(position) else emojiResults.getOrNull(position)
+        return if (isAutocompletingUsers) {
+            userResults.getOrNull(position)
+        } else {
+            emojiResults.getOrNull(
+                position,
+            )
+        }
     }
 
     override fun getItemId(position: Int): Long {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/AutocompleteTokenizer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/AutocompleteTokenizer.kt
index c63eb43c2..d2a6a57a5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/AutocompleteTokenizer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/AutocompleteTokenizer.kt
@@ -6,22 +6,27 @@ import android.text.TextUtils
 import android.widget.MultiAutoCompleteTextView
 
 class AutocompleteTokenizer(val tokens: List<Char>) : MultiAutoCompleteTextView.Tokenizer {
-
-    override fun findTokenStart(text: CharSequence, cursor: Int): Int {
+    override fun findTokenStart(
+        text: CharSequence,
+        cursor: Int,
+    ): Int {
         var i = cursor
 
-        while (i > 0 && text[i - 1] != ' ' && !tokens.contains(text[i-1])) {
+        while (i > 0 && text[i - 1] != ' ' && !tokens.contains(text[i - 1])) {
             i--
         }
 
-        return if (i < 1 || !tokens.contains(text[i-1])) {
+        return if (i < 1 || !tokens.contains(text[i - 1])) {
             cursor
         } else {
             i - 1
         }
     }
 
-    override fun findTokenEnd(text: CharSequence, cursor: Int): Int {
+    override fun findTokenEnd(
+        text: CharSequence,
+        cursor: Int,
+    ): Int {
         var i = cursor
         val len = text.length
 
@@ -54,7 +59,7 @@ class AutocompleteTokenizer(val tokens: List<Char>) : MultiAutoCompleteTextView.
                     text.length,
                     Any::class.java,
                     sp,
-                    0
+                    0,
                 )
                 sp
             } else {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/KeyboardUtil.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/KeyboardUtil.kt
index 2aee92b51..8204d2722 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/KeyboardUtil.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/KeyboardUtil.kt
@@ -23,7 +23,8 @@ class KeyboardUtil {
     companion object {
         fun dismissKeyboard(act: Activity?) {
             if (act != null && act.currentFocus != null) {
-                val inputMethodManager = act.getSystemService(Activity.INPUT_METHOD_SERVICE) as? InputMethodManager
+                val inputMethodManager =
+                    act.getSystemService(Activity.INPUT_METHOD_SERVICE) as? InputMethodManager
                 inputMethodManager?.hideSoftInputFromWindow(act.currentFocus?.windowToken, 0)
             }
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarginDecoration.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarginDecoration.kt
index 52949b9b3..7f096a13c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarginDecoration.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarginDecoration.kt
@@ -6,14 +6,16 @@ import android.view.View
 import androidx.recyclerview.widget.RecyclerView
 import com.habitrpg.android.habitica.R
 
-class MarginDecoration(context: Context?, private var noMarginViewTypes: Set<Int> = setOf()) : RecyclerView.ItemDecoration() {
-    private val margin: Int = context?.resources?.getDimensionPixelSize(R.dimen.grid_item_margin) ?: 0
+class MarginDecoration(context: Context?, private var noMarginViewTypes: Set<Int> = setOf()) :
+    RecyclerView.ItemDecoration() {
+    private val margin: Int =
+        context?.resources?.getDimensionPixelSize(R.dimen.grid_item_margin) ?: 0
 
     override fun getItemOffsets(
         outRect: Rect,
         view: View,
         parent: RecyclerView,
-        state: RecyclerView.State
+        state: RecyclerView.State,
     ) {
         val position = parent.getChildAdapterPosition(view)
         val viewType: Int? = parent.adapter?.getItemViewType(position)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/RecyclerViewEmptySupport.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/RecyclerViewEmptySupport.kt
index d0302a5fd..efad9fa6a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/RecyclerViewEmptySupport.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/RecyclerViewEmptySupport.kt
@@ -7,74 +7,86 @@ import com.habitrpg.common.habitica.helpers.EmptyItem
 import com.habitrpg.common.habitica.helpers.RecyclerViewState
 import com.habitrpg.common.habitica.helpers.RecyclerViewStateAdapter
 
-class RecyclerViewEmptySupport @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null
-) : RecyclerView(context, attrs) {
-    var onRefresh: (() -> Unit)?
-        get() = emptyAdapter.onRefresh
-        set(value) { emptyAdapter.onRefresh = value }
+class RecyclerViewEmptySupport
+    @JvmOverloads
+    constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+    ) : RecyclerView(context, attrs) {
+        var onRefresh: (() -> Unit)?
+            get() = emptyAdapter.onRefresh
+            set(value) {
+                emptyAdapter.onRefresh = value
+            }
 
-    var state: RecyclerViewState = RecyclerViewState.LOADING
-        set(value) {
-            field = value
-            when (field) {
-                RecyclerViewState.DISPLAYING_DATA -> updateAdapter(actualAdapter)
-                else -> {
-                    updateAdapter(emptyAdapter)
-                    emptyAdapter.state = value
+        var state: RecyclerViewState = RecyclerViewState.LOADING
+            set(value) {
+                field = value
+                when (field) {
+                    RecyclerViewState.DISPLAYING_DATA -> updateAdapter(actualAdapter)
+                    else -> {
+                        updateAdapter(emptyAdapter)
+                        emptyAdapter.state = value
+                    }
                 }
             }
-        }
 
-    private fun updateAdapter(newAdapter: Adapter<*>?) {
-        if (adapter != newAdapter) {
-            super.setAdapter(newAdapter)
-        }
-    }
-
-    var emptyItem: EmptyItem?
-        get() = emptyAdapter.emptyItem
-        set(value) {
-            emptyAdapter.emptyItem = value
-        }
-
-    private var actualAdapter: Adapter<*>? = null
-    private val emptyAdapter = RecyclerViewStateAdapter()
-
-    private val observer = object : AdapterDataObserver() {
-        override fun onChanged() {
-            updateState()
-        }
-
-        override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
-            updateState()
-        }
-
-        override fun onItemRangeRemoved(positionStart: Int, itemCount: Int) {
-            updateState()
-        }
-    }
-
-    internal fun updateState(isInitial: Boolean = false) {
-        state = if (actualAdapter != null && !isInitial) {
-            val emptyViewVisible = actualAdapter?.itemCount == 0
-            if (emptyViewVisible) {
-                RecyclerViewState.EMPTY
-            } else {
-                RecyclerViewState.DISPLAYING_DATA
+        private fun updateAdapter(newAdapter: Adapter<*>?) {
+            if (adapter != newAdapter) {
+                super.setAdapter(newAdapter)
             }
-        } else {
-            RecyclerViewState.LOADING
+        }
+
+        var emptyItem: EmptyItem?
+            get() = emptyAdapter.emptyItem
+            set(value) {
+                emptyAdapter.emptyItem = value
+            }
+
+        private var actualAdapter: Adapter<*>? = null
+        private val emptyAdapter = RecyclerViewStateAdapter()
+
+        private val observer =
+            object : AdapterDataObserver() {
+                override fun onChanged() {
+                    updateState()
+                }
+
+                override fun onItemRangeInserted(
+                    positionStart: Int,
+                    itemCount: Int,
+                ) {
+                    updateState()
+                }
+
+                override fun onItemRangeRemoved(
+                    positionStart: Int,
+                    itemCount: Int,
+                ) {
+                    updateState()
+                }
+            }
+
+        internal fun updateState(isInitial: Boolean = false) {
+            state =
+                if (actualAdapter != null && !isInitial) {
+                    val emptyViewVisible = actualAdapter?.itemCount == 0
+                    if (emptyViewVisible) {
+                        RecyclerViewState.EMPTY
+                    } else {
+                        RecyclerViewState.DISPLAYING_DATA
+                    }
+                } else {
+                    RecyclerViewState.LOADING
+                }
+        }
+
+        override fun setAdapter(adapter: Adapter<*>?) {
+            val oldAdapter = actualAdapter
+            oldAdapter?.unregisterAdapterDataObserver(observer)
+            super.setAdapter(adapter)
+            adapter?.registerAdapterDataObserver(observer)
+            actualAdapter = adapter
+            updateState(true)
         }
     }
-
-    override fun setAdapter(adapter: Adapter<*>?) {
-        val oldAdapter = actualAdapter
-        oldAdapter?.unregisterAdapterDataObserver(observer)
-        super.setAdapter(adapter)
-        adapter?.registerAdapterDataObserver(observer)
-        actualAdapter = adapter
-        updateState(true)
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/SafeDefaultItemAnimator.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/SafeDefaultItemAnimator.kt
index af7a6d3b6..a64afde7e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/SafeDefaultItemAnimator.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/SafeDefaultItemAnimator.kt
@@ -15,7 +15,6 @@ import com.habitrpg.shared.habitica.LogLevel
  */
 
 class SafeDefaultItemAnimator : SimpleItemAnimator() {
-
     private val pendingRemovals = ArrayList<RecyclerView.ViewHolder>()
     private val pendingAdditions = ArrayList<RecyclerView.ViewHolder>()
     private val pendingMoves = ArrayList<MoveInfo>()
@@ -37,12 +36,12 @@ class SafeDefaultItemAnimator : SimpleItemAnimator() {
         var fromX: Int,
         var fromY: Int,
         var toX: Int,
-        var toY: Int
+        var toY: Int,
     )
 
     private class ChangeInfo private constructor(
         var oldHolder: RecyclerView.ViewHolder?,
-        var newHolder: RecyclerView.ViewHolder?
+        var newHolder: RecyclerView.ViewHolder?,
     ) {
         var fromX: Int = 0
         var fromY: Int = 0
@@ -55,7 +54,7 @@ class SafeDefaultItemAnimator : SimpleItemAnimator() {
             fromX: Int,
             fromY: Int,
             toX: Int,
-            toY: Int
+            toY: Int,
         ) : this(oldHolder, newHolder) {
             this.fromX = fromX
             this.fromY = fromY
@@ -73,7 +72,7 @@ class SafeDefaultItemAnimator : SimpleItemAnimator() {
                     ", toX=" + toX +
                     ", toY=" + toY +
                     '}'.toString()
-                )
+            )
         }
     }
 
@@ -99,21 +98,22 @@ class SafeDefaultItemAnimator : SimpleItemAnimator() {
             val moves = ArrayList(pendingMoves)
             movesList.add(moves)
             pendingMoves.clear()
-            val mover = Runnable {
-                for (moveInfo in moves) {
-                    moveInfo.holder?.let {
-                        animateMoveImpl(
-                            it,
-                            moveInfo.fromX,
-                            moveInfo.fromY,
-                            moveInfo.toX,
-                            moveInfo.toY
-                        )
+            val mover =
+                Runnable {
+                    for (moveInfo in moves) {
+                        moveInfo.holder?.let {
+                            animateMoveImpl(
+                                it,
+                                moveInfo.fromX,
+                                moveInfo.fromY,
+                                moveInfo.toX,
+                                moveInfo.toY,
+                            )
+                        }
                     }
+                    moves.clear()
+                    movesList.remove(moves)
                 }
-                moves.clear()
-                movesList.remove(moves)
-            }
             if (removalsPending) {
                 val holder = moves[0].holder
                 if (holder != null) {
@@ -129,13 +129,14 @@ class SafeDefaultItemAnimator : SimpleItemAnimator() {
             val changes = ArrayList(pendingChanges)
             changesList.add(changes)
             pendingChanges.clear()
-            val changer = Runnable {
-                for (change in changes) {
-                    animateChangeImpl(change)
+            val changer =
+                Runnable {
+                    for (change in changes) {
+                        animateChangeImpl(change)
+                    }
+                    changes.clear()
+                    changesList.remove(changes)
                 }
-                changes.clear()
-                changesList.remove(changes)
-            }
             if (removalsPending) {
                 val holder = changes[0].oldHolder
                 if (holder != null) {
@@ -150,13 +151,14 @@ class SafeDefaultItemAnimator : SimpleItemAnimator() {
             val additions = ArrayList(pendingAdditions)
             additionsList.add(additions)
             pendingAdditions.clear()
-            val adder = Runnable {
-                for (holder in additions) {
-                    animateAddImpl(holder)
+            val adder =
+                Runnable {
+                    for (holder in additions) {
+                        animateAddImpl(holder)
+                    }
+                    additions.clear()
+                    additionsList.remove(additions)
                 }
-                additions.clear()
-                additionsList.remove(additions)
-            }
             if (removalsPending || movesPending || changesPending) {
                 val removeDuration = if (removalsPending) removeDuration else 0
                 val moveDuration = if (movesPending) moveDuration else 0
@@ -195,7 +197,7 @@ class SafeDefaultItemAnimator : SimpleItemAnimator() {
                     removeAnimations.remove(holder)
                     dispatchFinishedWhenDone()
                 }
-            }
+            },
         ).start()
     }
 
@@ -211,22 +213,24 @@ class SafeDefaultItemAnimator : SimpleItemAnimator() {
         val animation = view.animate()
         addAnimations.add(holder)
         animation.alpha(1f).setDuration(addDuration)
-            .setListener(object : AnimatorListenerAdapter() {
-                override fun onAnimationStart(animator: Animator) {
-                    dispatchAddStarting(holder)
-                }
+            .setListener(
+                object : AnimatorListenerAdapter() {
+                    override fun onAnimationStart(animator: Animator) {
+                        dispatchAddStarting(holder)
+                    }
 
-                override fun onAnimationCancel(animator: Animator) {
-                    view.alpha = 1f
-                }
+                    override fun onAnimationCancel(animator: Animator) {
+                        view.alpha = 1f
+                    }
 
-                override fun onAnimationEnd(animator: Animator) {
-                    animation.setListener(null)
-                    dispatchAddFinished(holder)
-                    addAnimations.remove(holder)
-                    dispatchFinishedWhenDone()
-                }
-            }).start()
+                    override fun onAnimationEnd(animator: Animator) {
+                        animation.setListener(null)
+                        dispatchAddFinished(holder)
+                        addAnimations.remove(holder)
+                        dispatchFinishedWhenDone()
+                    }
+                },
+            ).start()
     }
 
     override fun animateMove(
@@ -234,7 +238,7 @@ class SafeDefaultItemAnimator : SimpleItemAnimator() {
         fromX: Int,
         fromY: Int,
         toX: Int,
-        toY: Int
+        toY: Int,
     ): Boolean {
         var newFromX = fromX
         var newFromY = fromY
@@ -265,7 +269,7 @@ class SafeDefaultItemAnimator : SimpleItemAnimator() {
         fromX: Int,
         fromY: Int,
         toX: Int,
-        toY: Int
+        toY: Int,
     ) {
         val view = holder.itemView
         val deltaX = toX - fromX
@@ -282,27 +286,29 @@ class SafeDefaultItemAnimator : SimpleItemAnimator() {
         // need listener functionality in VPACompat for this. Ick.
         val animation = view.animate()
         moveAnimations.add(holder)
-        animation.setDuration(moveDuration).setListener(object : AnimatorListenerAdapter() {
-            override fun onAnimationStart(animator: Animator) {
-                dispatchMoveStarting(holder)
-            }
-
-            override fun onAnimationCancel(animator: Animator) {
-                if (deltaX != 0) {
-                    view.translationX = 0f
+        animation.setDuration(moveDuration).setListener(
+            object : AnimatorListenerAdapter() {
+                override fun onAnimationStart(animator: Animator) {
+                    dispatchMoveStarting(holder)
                 }
-                if (deltaY != 0) {
-                    view.translationY = 0f
-                }
-            }
 
-            override fun onAnimationEnd(animator: Animator) {
-                animation.setListener(null)
-                dispatchMoveFinished(holder)
-                moveAnimations.remove(holder)
-                dispatchFinishedWhenDone()
-            }
-        }).start()
+                override fun onAnimationCancel(animator: Animator) {
+                    if (deltaX != 0) {
+                        view.translationX = 0f
+                    }
+                    if (deltaY != 0) {
+                        view.translationY = 0f
+                    }
+                }
+
+                override fun onAnimationEnd(animator: Animator) {
+                    animation.setListener(null)
+                    dispatchMoveFinished(holder)
+                    moveAnimations.remove(holder)
+                    dispatchFinishedWhenDone()
+                }
+            },
+        ).start()
     }
 
     override fun animateChange(
@@ -311,7 +317,7 @@ class SafeDefaultItemAnimator : SimpleItemAnimator() {
         fromX: Int,
         fromY: Int,
         toX: Int,
-        toY: Int
+        toY: Int,
     ): Boolean {
         if (oldHolder === newHolder) {
             // Don't know how to run change animations when the same view holder is re-used.
@@ -347,51 +353,59 @@ class SafeDefaultItemAnimator : SimpleItemAnimator() {
         val newHolder = changeInfo.newHolder
         val newView = newHolder?.itemView
         if (view != null) {
-            val oldViewAnim = view.animate().setDuration(
-                changeDuration
-            )
+            val oldViewAnim =
+                view.animate().setDuration(
+                    changeDuration,
+                )
             changeInfo.oldHolder?.let { changeAnimations.add(it) }
             oldViewAnim.translationX((changeInfo.toX - changeInfo.fromX).toFloat())
             oldViewAnim.translationY((changeInfo.toY - changeInfo.fromY).toFloat())
-            oldViewAnim.alpha(0f).setListener(object : AnimatorListenerAdapter() {
-                override fun onAnimationStart(animator: Animator) {
-                    dispatchChangeStarting(changeInfo.oldHolder, true)
-                }
+            oldViewAnim.alpha(0f).setListener(
+                object : AnimatorListenerAdapter() {
+                    override fun onAnimationStart(animator: Animator) {
+                        dispatchChangeStarting(changeInfo.oldHolder, true)
+                    }
 
-                override fun onAnimationEnd(animator: Animator) {
-                    oldViewAnim.setListener(null)
-                    view.alpha = 1f
-                    view.translationX = 0f
-                    view.translationY = 0f
-                    dispatchChangeFinished(changeInfo.oldHolder, true)
-                    changeInfo.oldHolder?.let { changeAnimations.add(it) }
-                    dispatchFinishedWhenDone()
-                }
-            }).start()
+                    override fun onAnimationEnd(animator: Animator) {
+                        oldViewAnim.setListener(null)
+                        view.alpha = 1f
+                        view.translationX = 0f
+                        view.translationY = 0f
+                        dispatchChangeFinished(changeInfo.oldHolder, true)
+                        changeInfo.oldHolder?.let { changeAnimations.add(it) }
+                        dispatchFinishedWhenDone()
+                    }
+                },
+            ).start()
         }
         if (newView != null) {
             val newViewAnimation = newView.animate()
             changeInfo.newHolder?.let { changeAnimations.add(it) }
             newViewAnimation.translationX(0f).translationY(0f).setDuration(changeDuration)
-                .alpha(1f).setListener(object : AnimatorListenerAdapter() {
-                    override fun onAnimationStart(animator: Animator) {
-                        dispatchChangeStarting(changeInfo.newHolder, false)
-                    }
+                .alpha(1f).setListener(
+                    object : AnimatorListenerAdapter() {
+                        override fun onAnimationStart(animator: Animator) {
+                            dispatchChangeStarting(changeInfo.newHolder, false)
+                        }
 
-                    override fun onAnimationEnd(animator: Animator) {
-                        newViewAnimation.setListener(null)
-                        newView.alpha = 1f
-                        newView.translationX = 0f
-                        newView.translationY = 0f
-                        dispatchChangeFinished(changeInfo.newHolder, false)
-                        changeInfo.newHolder?.let { changeAnimations.add(it) }
-                        dispatchFinishedWhenDone()
-                    }
-                }).start()
+                        override fun onAnimationEnd(animator: Animator) {
+                            newViewAnimation.setListener(null)
+                            newView.alpha = 1f
+                            newView.translationX = 0f
+                            newView.translationY = 0f
+                            dispatchChangeFinished(changeInfo.newHolder, false)
+                            changeInfo.newHolder?.let { changeAnimations.add(it) }
+                            dispatchFinishedWhenDone()
+                        }
+                    },
+                ).start()
         }
     }
 
-    private fun endChangeAnimation(infoList: MutableList<ChangeInfo>, item: RecyclerView.ViewHolder) {
+    private fun endChangeAnimation(
+        infoList: MutableList<ChangeInfo>,
+        item: RecyclerView.ViewHolder,
+    ) {
         for (i in infoList.indices.reversed()) {
             val changeInfo = infoList[i]
             if (endChangeAnimationIfNecessary(changeInfo, item)) {
@@ -413,7 +427,7 @@ class SafeDefaultItemAnimator : SimpleItemAnimator() {
 
     private fun endChangeAnimationIfNecessary(
         changeInfo: ChangeInfo,
-        item: RecyclerView.ViewHolder?
+        item: RecyclerView.ViewHolder?,
     ): Boolean {
         var oldItem = false
         when {
@@ -422,6 +436,7 @@ class SafeDefaultItemAnimator : SimpleItemAnimator() {
                 changeInfo.oldHolder = null
                 oldItem = true
             }
+
             else -> return false
         }
         item?.itemView?.alpha = 1f
@@ -521,7 +536,7 @@ class SafeDefaultItemAnimator : SimpleItemAnimator() {
                 movesList.isNotEmpty() ||
                 additionsList.isNotEmpty() ||
                 changesList.isNotEmpty()
-            )
+        )
     }
 
     /**
@@ -644,7 +659,7 @@ class SafeDefaultItemAnimator : SimpleItemAnimator() {
      */
     override fun canReuseUpdatedViewHolder(
         viewHolder: RecyclerView.ViewHolder,
-        payloads: List<Any>
+        payloads: List<Any>,
     ): Boolean {
         return payloads.isNotEmpty() || super.canReuseUpdatedViewHolder(viewHolder, payloads)
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/ToolbarColorHelper.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/ToolbarColorHelper.kt
index 0f744c5be..c5de8e386 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/ToolbarColorHelper.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/ToolbarColorHelper.kt
@@ -26,8 +26,8 @@ import androidx.appcompat.view.menu.ActionMenuItemView
 import androidx.appcompat.widget.ActionMenuView
 import androidx.appcompat.widget.Toolbar
 import com.habitrpg.android.habitica.R
-import com.habitrpg.common.habitica.extensions.waitForLayout
 import com.habitrpg.common.habitica.extensions.getThemeColor
+import com.habitrpg.common.habitica.extensions.waitForLayout
 
 /**
  * Helper class that iterates through Toolbar views, and sets dynamically icons and texts color
@@ -43,10 +43,12 @@ object ToolbarColorHelper {
         toolbar: Toolbar,
         activity: Activity?,
         iconColor: Int? = null,
-        backgroundColor: Int? = null
+        backgroundColor: Int? = null,
     ) {
         if (activity == null) return
-        toolbar.setBackgroundColor(backgroundColor ?: activity.getThemeColor(R.attr.headerBackgroundColor))
+        toolbar.setBackgroundColor(
+            backgroundColor ?: activity.getThemeColor(R.attr.headerBackgroundColor),
+        )
         val toolbarIconsColor = iconColor ?: activity.getThemeColor(R.attr.headerTextColor)
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
             activity.window.statusBarColor = activity.getThemeColor(R.attr.colorPrimaryDark)
@@ -57,11 +59,13 @@ object ToolbarColorHelper {
                 is ImageButton -> {
                     v.drawable.colorFilter = colorFilter
                 }
+
                 is ActionMenuView -> {
                     for (j in 0 until v.childCount) {
                         colorizeChild(v.getChildAt(j), toolbarIconsColor, colorFilter)
                     }
                 }
+
                 is TextView -> {
                     v.setTextColor(toolbarIconsColor)
                 }
@@ -77,7 +81,7 @@ object ToolbarColorHelper {
     private fun colorizeChild(
         innerView: View,
         toolbarIconsColor: Int,
-        colorFilter: PorterDuffColorFilter
+        colorFilter: PorterDuffColorFilter,
     ) {
         if (innerView is ActionMenuItemView) {
             innerView.setTextColor(toolbarIconsColor)
@@ -97,14 +101,17 @@ object ToolbarColorHelper {
      * @param activity
      * @param color
      */
-    private fun setOverflowButtonColor(activity: Activity, color: Int) {
+    private fun setOverflowButtonColor(
+        activity: Activity,
+        color: Int,
+    ) {
         val overflowDescription = activity.getString(R.string.abc_action_menu_overflow_description)
         activity.window.decorView.waitForLayout {
             val outViews = ArrayList<View>()
             findViewsWithText(
                 outViews,
                 overflowDescription,
-                View.FIND_VIEWS_WITH_CONTENT_DESCRIPTION
+                View.FIND_VIEWS_WITH_CONTENT_DESCRIPTION,
             )
             if (outViews.isEmpty()) {
                 return@waitForLayout
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/BottomSheetMenu.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/BottomSheetMenu.kt
index 6ef287f4b..a3358aa84 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/BottomSheetMenu.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/BottomSheetMenu.kt
@@ -22,7 +22,8 @@ class BottomSheetMenu(context: Context) : HabiticaBottomSheetDialog(context), Vi
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
         binding.menuItems.children.forEachIndexed { index, view ->
-            val anim = TranslateAnimation(0f, 0f, 10f.dpToPx(context) + (5f.dpToPx(context) * index), 0f)
+            val anim =
+                TranslateAnimation(0f, 0f, 10f.dpToPx(context) + (5f.dpToPx(context) * index), 0f)
             anim.startOffset = 300 + (20 * index).toLong()
             anim.fillBefore = true
             anim.fillAfter = true
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/BottomSheetMenuItem.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/BottomSheetMenuItem.kt
index 86829fffe..572c3f0e4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/BottomSheetMenuItem.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/BottomSheetMenuItem.kt
@@ -9,13 +9,22 @@ import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.MenuBottomSheetItemBinding
 
-class BottomSheetMenuItem(private val title: String, private val isDestructive: Boolean = false, private val currency: String? = null, private val price: Double = 0.0) {
-
-    fun inflate(context: Context, inflater: LayoutInflater, contentView: ViewGroup): View {
+class BottomSheetMenuItem(
+    private val title: String,
+    private val isDestructive: Boolean = false,
+    private val currency: String? = null,
+    private val price: Double = 0.0,
+) {
+    fun inflate(
+        context: Context,
+        inflater: LayoutInflater,
+        contentView: ViewGroup,
+    ): View {
         val binding = MenuBottomSheetItemBinding.inflate(inflater, contentView, false)
         binding.textView.text = this.title
         if (this.isDestructive) {
-            binding.root.backgroundTintList = ColorStateList.valueOf(ContextCompat.getColor(context, R.color.maroon_100))
+            binding.root.backgroundTintList =
+                ColorStateList.valueOf(ContextCompat.getColor(context, R.color.maroon_100))
         }
         if (price > 0) {
             binding.currencyView.currency = currency ?: "gold"
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/HabiticaDrawerItem.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/HabiticaDrawerItem.kt
index 42b2cd6f5..08ac28fea 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/HabiticaDrawerItem.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/HabiticaDrawerItem.kt
@@ -9,7 +9,7 @@ data class HabiticaDrawerItem(
     val identifier: String,
     val text: String,
     val icon: Drawable? = null,
-    val isHeader: Boolean = false
+    val isHeader: Boolean = false,
 ) {
     constructor(transitionId: Int, identifier: String) : this(transitionId, identifier, "")
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/theme/HabiticaTheme.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/theme/HabiticaTheme.kt
index 766249a40..ba7bbf556 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/theme/HabiticaTheme.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/theme/HabiticaTheme.kt
@@ -12,30 +12,46 @@ import com.habitrpg.common.habitica.extensions.getThemeColor
 import com.habitrpg.common.habitica.theme.HabiticaColors
 import com.habitrpg.common.habitica.theme.HabiticaTheme
 
-
 @Composable
 fun HabiticaColors.textPrimaryFor(task: Task?): Color {
-    return colorResource((if (isSystemInDarkTheme()) task?.extraExtraLightTaskColor else task?.extraDarkTaskColor) ?: R.color.text_primary)
+    return colorResource(
+        (if (isSystemInDarkTheme()) task?.extraExtraLightTaskColor else task?.extraDarkTaskColor)
+            ?: R.color.text_primary,
+    )
 }
 
 @Composable
 fun HabiticaColors.textSecondaryFor(task: Task?): Color {
-    return colorResource((if (isSystemInDarkTheme()) task?.extraLightTaskColor else task?.lowSaturationTaskColor) ?: R.color.brand_sub_text)
+    return colorResource(
+        (if (isSystemInDarkTheme()) task?.extraLightTaskColor else task?.lowSaturationTaskColor)
+            ?: R.color.brand_sub_text,
+    )
 }
 
 @Composable
 fun HabiticaColors.primaryBackgroundFor(task: Task?): Color {
-    return colorResource((if (isSystemInDarkTheme()) task?.mediumTaskColor else task?.lightTaskColor) ?: R.color.brand_400)
+    return colorResource(
+        (if (isSystemInDarkTheme()) task?.mediumTaskColor else task?.lightTaskColor)
+            ?: R.color.brand_400,
+    )
 }
 
 @Composable
 fun HabiticaColors.windowBackgroundFor(task: Task?): Color {
-    return (if (isSystemInDarkTheme()) task?.extraExtraDarkTaskColor else task?.extraExtraLightTaskColor)?.let { colorResource(it) } ?: windowBackground
+    return (if (isSystemInDarkTheme()) task?.extraExtraDarkTaskColor else task?.extraExtraLightTaskColor)?.let {
+        colorResource(
+            it,
+        )
+    } ?: windowBackground
 }
 
 @Composable
 fun HabiticaColors.contentBackgroundFor(task: Task?): Color {
-    return (if (isSystemInDarkTheme()) task?.darkestTaskColor else task?.lightestTaskColor)?.let { colorResource(it) } ?: windowBackground
+    return (if (isSystemInDarkTheme()) task?.darkestTaskColor else task?.lightestTaskColor)?.let {
+        colorResource(
+            it,
+        )
+    } ?: windowBackground
 }
 
 @Composable
@@ -78,6 +94,6 @@ val HabiticaTheme.colors: HabiticaColors
             errorBackground = Color(ContextCompat.getColor(context, R.color.background_red)),
             errorColor = Color(ContextCompat.getColor(context, R.color.text_red)),
             successBackground = Color(ContextCompat.getColor(context, R.color.background_green)),
-            successColor = Color(ContextCompat.getColor(context, R.color.text_green))
+            successColor = Color(ContextCompat.getColor(context, R.color.text_green)),
         )
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/BindableViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/BindableViewHolder.kt
index fa1f6469f..04e64a337 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/BindableViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/BindableViewHolder.kt
@@ -4,10 +4,9 @@ import android.view.View
 import androidx.recyclerview.widget.RecyclerView
 
 abstract class BindableViewHolder<T>(itemView: View) : RecyclerView.ViewHolder(itemView) {
-
     abstract fun bind(
         data: T,
         position: Int,
-        displayMode: String
+        displayMode: String,
     )
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ChatRecyclerViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ChatRecyclerViewHolder.kt
index a7554132e..d4aa80690 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ChatRecyclerViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ChatRecyclerViewHolder.kt
@@ -13,16 +13,14 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.ChatItemBinding
 import com.habitrpg.android.habitica.databinding.TavernChatIntroItemBinding
 import com.habitrpg.android.habitica.extensions.getAgoString
-import com.habitrpg.common.habitica.extensions.setScaledPadding
 import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.models.social.ChatMessage
 import com.habitrpg.android.habitica.models.user.Permission
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
-import com.habitrpg.android.habitica.ui.views.SnackbarActivity
 import com.habitrpg.common.habitica.extensions.DataBindingUtils
 import com.habitrpg.common.habitica.extensions.dpToPx
+import com.habitrpg.common.habitica.extensions.setScaledPadding
 import com.habitrpg.common.habitica.helpers.MarkdownParser
 import com.habitrpg.common.habitica.helpers.setParsedMarkdown
 import kotlinx.coroutines.Dispatchers
@@ -32,7 +30,8 @@ import kotlinx.coroutines.withContext
 
 open class ChatRecyclerViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView)
 
-class ChatRecyclerIntroViewHolder(itemView: View, replyToUUID: String) : ChatRecyclerViewHolder(itemView) {
+class ChatRecyclerIntroViewHolder(itemView: View, replyToUUID: String) :
+    ChatRecyclerViewHolder(itemView) {
     private val binding = TavernChatIntroItemBinding.bind(itemView)
 
     var onOpenProfile: ((String) -> Unit)? = null
@@ -55,7 +54,7 @@ class ChatRecyclerIntroViewHolder(itemView: View, replyToUUID: String) : ChatRec
 class ChatRecyclerMessageViewHolder(
     itemView: View,
     private var userId: String,
-    private val isGroupChat: Boolean
+    private val isGroupChat: Boolean,
 ) : ChatRecyclerViewHolder(itemView) {
     val binding = ChatItemBinding.bind(itemView)
 
@@ -96,32 +95,37 @@ class ChatRecyclerMessageViewHolder(
             BitmapDrawable(res, HabiticaIconsHelper.imageOfChatReplyIcon()),
             null,
             null,
-            null
+            null,
         )
         binding.copyButton.setOnClickListener { chatMessage?.let { onCopyMessage?.invoke(it) } }
         binding.copyButton.setCompoundDrawablesWithIntrinsicBounds(
             BitmapDrawable(res, HabiticaIconsHelper.imageOfChatCopyIcon()),
             null,
             null,
-            null
+            null,
         )
         binding.reportButton.setOnClickListener { chatMessage?.let { onFlagMessage?.invoke(it) } }
         binding.reportButton.setCompoundDrawablesWithIntrinsicBounds(
             BitmapDrawable(res, HabiticaIconsHelper.imageOfChatReportIcon()),
             null,
             null,
-            null
+            null,
         )
         binding.deleteButton.setOnClickListener { chatMessage?.let { onDeleteMessage?.invoke(it) } }
         binding.deleteButton.setCompoundDrawablesWithIntrinsicBounds(
             BitmapDrawable(res, HabiticaIconsHelper.imageOfChatDeleteIcon()),
             null,
             null,
-            null
+            null,
         )
     }
 
-    fun bind(msg: ChatMessage, uuid: String, user: User?, isExpanded: Boolean) {
+    fun bind(
+        msg: ChatMessage,
+        uuid: String,
+        user: User?,
+        isExpanded: Boolean,
+    ) {
         chatMessage = msg
         this.user = user
         userId = uuid
@@ -137,7 +141,8 @@ class ChatRecyclerMessageViewHolder(
             binding.userLabel.username = name
             if (user?.username != null) {
                 @SuppressLint("SetTextI18n")
-                binding.sublineTextview.text = "${user.formattedUsername} ∙ ${msg.timestamp?.getAgoString(res)}"
+                binding.sublineTextview.text =
+                    "${user.formattedUsername} ∙ ${msg.timestamp?.getAgoString(res)}"
             } else {
                 binding.sublineTextview.text = msg.timestamp?.getAgoString(res)
             }
@@ -147,7 +152,8 @@ class ChatRecyclerMessageViewHolder(
             binding.userLabel.username = msg.user
             if (msg.username != null) {
                 @SuppressLint("SetTextI18n")
-                binding.sublineTextview.text = "${msg.formattedUsername} ∙ ${msg.timestamp?.getAgoString(res)}"
+                binding.sublineTextview.text =
+                    "${msg.formattedUsername} ∙ ${msg.timestamp?.getAgoString(res)}"
             } else {
                 binding.sublineTextview.text = msg.timestamp?.getAgoString(res)
             }
@@ -156,21 +162,30 @@ class ChatRecyclerMessageViewHolder(
             8 -> {
                 binding.modView.visibility = View.VISIBLE
                 binding.modView.text = context.getString(R.string.moderator)
-                binding.modView.background = ContextCompat.getDrawable(context, R.drawable.pill_bg_blue)
+                binding.modView.background =
+                    ContextCompat.getDrawable(context, R.drawable.pill_bg_blue)
                 binding.modView.setScaledPadding(context, 12, 4, 12, 4)
             }
+
             9 -> {
                 binding.modView.visibility = View.VISIBLE
                 binding.modView.text = context.getString(R.string.staff)
-                binding.modView.background = ContextCompat.getDrawable(context, R.drawable.pill_bg_purple_300)
+                binding.modView.background =
+                    ContextCompat.getDrawable(context, R.drawable.pill_bg_purple_300)
                 binding.modView.setScaledPadding(context, 12, 4, 12, 4)
             }
+
             else -> binding.modView.visibility = View.GONE
         }
 
         if (wasSent) {
             binding.avatarView.visibility = View.GONE
-            itemView.setPadding(64.dpToPx(context), itemView.paddingTop, itemView.paddingRight, itemView.paddingBottom)
+            itemView.setPadding(
+                64.dpToPx(context),
+                itemView.paddingTop,
+                itemView.paddingRight,
+                itemView.paddingBottom,
+            )
         } else {
             val displayMetrics = res.displayMetrics
             val dpWidth = displayMetrics.widthPixels / displayMetrics.density
@@ -182,7 +197,12 @@ class ChatRecyclerMessageViewHolder(
             } else {
                 binding.avatarView.visibility = View.GONE
             }
-            itemView.setPadding(16.dpToPx(context), itemView.paddingTop, itemView.paddingRight, itemView.paddingBottom)
+            itemView.setPadding(
+                16.dpToPx(context),
+                itemView.paddingTop,
+                itemView.paddingRight,
+                itemView.paddingBottom,
+            )
         }
 
         binding.messageText.setParsedMarkdown(chatMessage?.parsedText)
@@ -198,33 +218,51 @@ class ChatRecyclerMessageViewHolder(
         }
 
         val username = user?.formattedUsername
-        binding.messageWrapper.background = if ((name != null && msg.text?.contains("@$name") == true) || (username != null && msg.text?.contains(username) == true)) {
-            ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_brand_700)
-        } else {
-            ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_window)
-        }
+        binding.messageWrapper.background =
+            if ((name != null && msg.text?.contains("@$name") == true) || (
+                    username != null && msg.text?.contains(
+                        username,
+                    ) == true
+                )
+            ) {
+                ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_brand_700)
+            } else {
+                ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_window)
+            }
         binding.messageWrapper.setScaledPadding(context, 8, 8, 8, 8)
 
         if (isExpanded) {
             binding.buttonsWrapper.visibility = View.VISIBLE
             binding.deleteButton.visibility = if (shouldShowDelete()) View.VISIBLE else View.GONE
-            binding.replyButton.visibility = if (chatMessage?.isInboxMessage == true) View.GONE else View.VISIBLE
+            binding.replyButton.visibility =
+                if (chatMessage?.isInboxMessage == true) View.GONE else View.VISIBLE
         } else {
             binding.buttonsWrapper.visibility = View.GONE
         }
 
         val flagCount = (chatMessage?.flagCount ?: 0)
         if (flagCount > 0 && user?.hasPermission(Permission.MODERATOR) == true) {
-            binding.flagCountTextview.text = if (flagCount == 10) {
-                context.getString(R.string.shadow_muted_hidden)
-            } else {
-                context.resources.getQuantityString(R.plurals.flagged_count, flagCount, flagCount)
-            }
+            binding.flagCountTextview.text =
+                if (flagCount == 10) {
+                    context.getString(R.string.shadow_muted_hidden)
+                } else {
+                    context.resources.getQuantityString(R.plurals.flagged_count, flagCount, flagCount)
+                }
             binding.flagCountTextview.isVisible = true
             if (flagCount == 1) {
-                binding.flagCountTextview.setTextColor(ContextCompat.getColor(context, R.color.text_orange))
+                binding.flagCountTextview.setTextColor(
+                    ContextCompat.getColor(
+                        context,
+                        R.color.text_orange,
+                    ),
+                )
             } else {
-                binding.flagCountTextview.setTextColor(ContextCompat.getColor(context, R.color.text_red))
+                binding.flagCountTextview.setTextColor(
+                    ContextCompat.getColor(
+                        context,
+                        R.color.text_red,
+                    ),
+                )
             }
         } else {
             binding.flagCountTextview.isVisible = false
@@ -256,7 +294,10 @@ class ChatRecyclerMessageViewHolder(
             foregroundColorRes = R.color.tavern_nolikes_foreground
         }
 
-        DataBindingUtils.setRoundedBackground(binding.likeBackgroundLayout, ContextCompat.getColor(context, backgroundColorRes))
+        DataBindingUtils.setRoundedBackground(
+            binding.likeBackgroundLayout,
+            ContextCompat.getColor(context, backgroundColorRes),
+        )
         binding.tvLikes.setTextColor(ContextCompat.getColor(context, foregroundColorRes))
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/GroupMemberViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/GroupMemberViewHolder.kt
index aa920b647..02b9acb1e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/GroupMemberViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/GroupMemberViewHolder.kt
@@ -11,7 +11,9 @@ import com.habitrpg.android.habitica.models.user.Stats
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.getTranslatedClassName
 
-class GroupMemberViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView), PopupMenu.OnMenuItemClickListener {
+class GroupMemberViewHolder(itemView: View) :
+    androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView),
+    PopupMenu.OnMenuItemClickListener {
     private val binding = PartyMemberBinding.bind(itemView)
     private var currentUserID: String? = null
     private var leaderID: String? = null
@@ -39,15 +41,27 @@ class GroupMemberViewHolder(itemView: View) : androidx.recyclerview.widget.Recyc
 
     override fun onMenuItemClick(item: MenuItem?): Boolean {
         when (item?.itemId) {
-            R.id.send_message -> { sendMessageEvent?.invoke() }
-            R.id.transfer_ownership -> { transferOwnershipEvent?.invoke() }
-            R.id.remove -> { removeMemberEvent?.invoke() }
+            R.id.send_message -> {
+                sendMessageEvent?.invoke()
+            }
+
+            R.id.transfer_ownership -> {
+                transferOwnershipEvent?.invoke()
+            }
+
+            R.id.remove -> {
+                removeMemberEvent?.invoke()
+            }
         }
         return true
     }
 
     @SuppressLint("SetTextI18n")
-    fun bind(user: Member, leaderID: String?, userID: String?) {
+    fun bind(
+        user: Member,
+        leaderID: String?,
+        userID: String?,
+    ) {
         binding.avatarView.setAvatar(user)
         this.leaderID = leaderID
         this.currentUserID = userID
@@ -72,9 +86,15 @@ class GroupMemberViewHolder(itemView: View) : androidx.recyclerview.widget.Recyc
         binding.displayNameTextview.tier = user.contributor?.level ?: 0
 
         if (user.hasClass) {
-            binding.sublineTextview.text = itemView.context.getString(R.string.user_level_with_class, user.stats?.lvl, getTranslatedClassName(itemView.context.resources, user.stats?.habitClass))
+            binding.sublineTextview.text =
+                itemView.context.getString(
+                    R.string.user_level_with_class,
+                    user.stats?.lvl,
+                    getTranslatedClassName(itemView.context.resources, user.stats?.habitClass),
+                )
         } else {
-            binding.sublineTextview.text = itemView.context.getString(R.string.user_level, user.stats?.lvl)
+            binding.sublineTextview.text =
+                itemView.context.getString(R.string.user_level, user.stats?.lvl)
         }
 
         if (user.stats?.isBuffed == true) {
@@ -88,15 +108,19 @@ class GroupMemberViewHolder(itemView: View) : androidx.recyclerview.widget.Recyc
             Stats.HEALER -> {
                 binding.classIconView.setImageBitmap(HabiticaIconsHelper.imageOfHealerLightBg())
             }
+
             Stats.WARRIOR -> {
                 binding.classIconView.setImageBitmap(HabiticaIconsHelper.imageOfWarriorLightBg())
             }
+
             Stats.ROGUE -> {
                 binding.classIconView.setImageBitmap(HabiticaIconsHelper.imageOfRogueLightBg())
             }
+
             Stats.MAGE -> {
                 binding.classIconView.setImageBitmap(HabiticaIconsHelper.imageOfMageLightBg())
             }
+
             else -> {
                 binding.classIconView.visibility = View.INVISIBLE
             }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/MountViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/MountViewHolder.kt
index bdf537b59..d58be1606 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/MountViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/MountViewHolder.kt
@@ -15,7 +15,9 @@ import com.habitrpg.android.habitica.ui.views.stable.MountBottomSheet
 import com.habitrpg.common.habitica.extensions.DataBindingUtils
 import dagger.hilt.android.internal.managers.ViewComponentManager
 
-class MountViewHolder(parent: ViewGroup, private val onEquip: ((String) -> Unit)?) : androidx.recyclerview.widget.RecyclerView.ViewHolder(parent.inflate(R.layout.mount_overview_item)), View.OnClickListener {
+class MountViewHolder(parent: ViewGroup, private val onEquip: ((String) -> Unit)?) :
+    androidx.recyclerview.widget.RecyclerView.ViewHolder(parent.inflate(R.layout.mount_overview_item)),
+    View.OnClickListener {
     private var binding: MountOverviewItemBinding = MountOverviewItemBinding.bind(itemView)
     private var owned: Boolean = false
     var animal: Mount? = null
@@ -27,7 +29,11 @@ class MountViewHolder(parent: ViewGroup, private val onEquip: ((String) -> Unit)
         itemView.setOnClickListener(this)
     }
 
-    fun bind(item: Mount, owned: Boolean, currentMount: String?) {
+    fun bind(
+        item: Mount,
+        owned: Boolean,
+        currentMount: String?,
+    ) {
         animal = item
         this.owned = owned
         this.currentMount = currentMount
@@ -39,10 +45,19 @@ class MountViewHolder(parent: ViewGroup, private val onEquip: ((String) -> Unit)
             binding.imageView.alpha = 0.2f
         }
         binding.imageView.background = null
-        binding.activeIndicator.visibility = if (currentMount.equals(animal?.key)) View.VISIBLE else View.GONE
+        binding.activeIndicator.visibility =
+            if (currentMount.equals(animal?.key)) View.VISIBLE else View.GONE
         binding.imageView.tag = imageName
         DataBindingUtils.loadImage(itemView.context, imageName) {
-            val drawable = if (owned) it else BitmapDrawable(itemView.context.resources, it.toBitmap().extractAlpha())
+            val drawable =
+                if (owned) {
+                    it
+                } else {
+                    BitmapDrawable(
+                        itemView.context.resources,
+                        it.toBitmap().extractAlpha(),
+                    )
+                }
             if (binding.imageView.tag == imageName) {
                 binding.imageView.bitmap = drawable.toBitmap()
             }
@@ -55,16 +70,18 @@ class MountViewHolder(parent: ViewGroup, private val onEquip: ((String) -> Unit)
         }
         val context = itemView.context
         animal?.let { pet ->
-            (if (context is ViewComponentManager.FragmentContextWrapper) {
-                context.baseContext
-            } else {
-                context
-            }as Activity).showAsBottomSheet {
+            (
+                if (context is ViewComponentManager.FragmentContextWrapper) {
+                    context.baseContext
+                } else {
+                    context
+                } as Activity
+            ).showAsBottomSheet {
                 MountBottomSheet(
                     pet,
                     currentMount.equals(animal?.key),
                     onEquip,
-                    it
+                    it,
                 )
             }
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/PetViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/PetViewHolder.kt
index f7116196c..98cb55fbf 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/PetViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/PetViewHolder.kt
@@ -25,7 +25,7 @@ class PetViewHolder(
     parent: ViewGroup,
     private val onEquip: ((String) -> Unit)?,
     private val onFeed: (suspend (Pet, Food?) -> FeedResponse?)?,
-    private val ingredientsReceiver: ((Animal, ((Pair<Egg?, HatchingPotion?>) -> Unit)) -> Unit)?
+    private val ingredientsReceiver: ((Animal, ((Pair<Egg?, HatchingPotion?>) -> Unit)) -> Unit)?,
 ) : androidx.recyclerview.widget.RecyclerView.ViewHolder(parent.inflate(R.layout.pet_detail_item)),
     View.OnClickListener {
     private var hasMount: Boolean = false
@@ -58,7 +58,7 @@ class PetViewHolder(
         hasUnlockedEgg: Boolean,
         hasUnlockedPotion: Boolean,
         hasMount: Boolean,
-        currentPet: String?
+        currentPet: String?,
     ) {
         this.animal = item
         this.trained = trained
@@ -102,7 +102,14 @@ class PetViewHolder(
         DataBindingUtils.loadImage(itemView.context, imageName) {
             val resources = itemView.context.resources ?: return@loadImage
             val drawable =
-                if (trained == 0 && canRaiseToMount) BitmapDrawable(resources, it.toBitmap().extractAlpha()) else it
+                if (trained == 0 && canRaiseToMount) {
+                    BitmapDrawable(
+                        resources,
+                        it.toBitmap().extractAlpha(),
+                    )
+                } else {
+                    it
+                }
             if (binding.imageView.tag == imageName) {
                 binding.imageView.bitmap = drawable.toBitmap()
             }
@@ -116,11 +123,13 @@ class PetViewHolder(
         }
         val context = itemView.context
         animal?.let { pet ->
-            (if (context is ViewComponentManager.FragmentContextWrapper) {
-                context.baseContext
-            } else {
-                context
-            }as Activity).showAsBottomSheet {
+            (
+                if (context is ViewComponentManager.FragmentContextWrapper) {
+                    context.baseContext
+                } else {
+                    context
+                } as Activity
+            ).showAsBottomSheet {
                 PetBottomSheet(
                     pet,
                     trained,
@@ -129,7 +138,7 @@ class PetViewHolder(
                     ownsSaddles,
                     onEquip,
                     onFeed,
-                    it
+                    it,
                 )
             }
         }
@@ -148,7 +157,7 @@ class PetViewHolder(
                     potionCount,
                     hasUnlockedEgg,
                     hasUnlockedPotion,
-                    hasMount
+                    hasMount,
                 )
                 dialog.show()
             }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/SectionViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/SectionViewHolder.kt
index 2dd5d156c..ade30d132 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/SectionViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/SectionViewHolder.kt
@@ -17,7 +17,6 @@ import com.habitrpg.android.habitica.models.inventory.StableSection
 import com.habitrpg.android.habitica.ui.views.CurrencyView
 
 class SectionViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-
     private val label: TextView = itemView.findViewById(R.id.label)
     private val switchesInLabel: TextView? = itemView.findViewById(R.id.switches_in_label)
     private val selectionSpinner: Spinner? = itemView.findViewById(R.id.class_selection_spinner)
@@ -34,25 +33,27 @@ class SectionViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
     constructor(parent: ViewGroup) : this(parent.inflate(R.layout.customization_section_header))
 
     init {
-        selectionSpinner?.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onNothingSelected(parent: AdapterView<*>?) {
-                spinnerSelectionChanged?.invoke()
-            }
+        selectionSpinner?.onItemSelectedListener =
+            object : AdapterView.OnItemSelectedListener {
+                override fun onNothingSelected(parent: AdapterView<*>?) {
+                    spinnerSelectionChanged?.invoke()
+                }
 
-            override fun onItemSelected(
-                parent: AdapterView<*>?,
-                view: View?,
-                position: Int,
-                id: Long
-            ) {
-                spinnerSelectionChanged?.invoke()
+                override fun onItemSelected(
+                    parent: AdapterView<*>?,
+                    view: View?,
+                    position: Int,
+                    id: Long,
+                ) {
+                    spinnerSelectionChanged?.invoke()
+                }
             }
-        }
     }
 
     fun bind(title: String) {
         try {
-            val stringID = context.resources.getIdentifier("section$title", "string", context.packageName)
+            val stringID =
+                context.resources.getIdentifier("section$title", "string", context.packageName)
             this.label.text = context.getString(stringID)
         } catch (e: Exception) {
             this.label.text = title
@@ -60,18 +61,27 @@ class SectionViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
     }
 
     fun bind(section: StableSection) {
-        label.text = if (section.type == "pets") {
-            context.getString(R.string.pet_category, getTranslatedAnimalType(context, section.key))
-        } else {
-            context.getString(R.string.mount_category, getTranslatedAnimalType(context, section.key))
-        }
+        label.text =
+            if (section.type == "pets") {
+                context.getString(R.string.pet_category, getTranslatedAnimalType(context, section.key))
+            } else {
+                context.getString(
+                    R.string.mount_category,
+                    getTranslatedAnimalType(context, section.key),
+                )
+            }
         if (section.key == "special") {
             countPill?.visibility = View.GONE
         } else {
             countPill?.visibility = View.VISIBLE
         }
         label.gravity = Gravity.START
-        countPill?.text = itemView.context.getString(R.string.pet_ownership_fraction, section.ownedCount, section.totalCount)
+        countPill?.text =
+            itemView.context.getString(
+                R.string.pet_ownership_fraction,
+                section.ownedCount,
+                section.totalCount,
+            )
     }
 
     var spinnerAdapter: ArrayAdapter<CharSequence>? = null
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ShopItemViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ShopItemViewHolder.kt
index 33cf2b51c..7638af678 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ShopItemViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ShopItemViewHolder.kt
@@ -45,7 +45,11 @@ class ShopItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), Vi
         binding.pinIndicator.setImageBitmap(HabiticaIconsHelper.imageOfPinnedItem())
     }
 
-    fun bind(item: ShopItem, canBuy: Boolean, numberOwned: Int) {
+    fun bind(
+        item: ShopItem,
+        canBuy: Boolean,
+        numberOwned: Int,
+    ) {
         this.item = item
         binding.buyButton.visibility = View.VISIBLE
 
@@ -75,23 +79,31 @@ class ShopItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), Vi
                 AppCompatResources.getDrawable(context, R.drawable.pill_bg_gray)
             binding.itemDetailIndicator.visibility = View.VISIBLE
         } else if (item.locked) {
-            binding.itemDetailIndicator.background = AppCompatResources.getDrawable(context, R.drawable.shop_locked)
+            binding.itemDetailIndicator.background =
+                AppCompatResources.getDrawable(context, R.drawable.shop_locked)
             binding.itemDetailIndicator.visibility = View.VISIBLE
         } else if (isLimited) {
             if (numberOwned == 0) {
-                binding.itemDetailIndicator.background = BitmapDrawable(context.resources, HabiticaIconsHelper.imageOfItemIndicatorLimited())
+                binding.itemDetailIndicator.background =
+                    BitmapDrawable(
+                        context.resources,
+                        HabiticaIconsHelper.imageOfItemIndicatorLimited(),
+                    )
             } else {
-                binding.itemDetailIndicator.background = AppCompatResources.getDrawable(context, R.drawable.pill_bg_purple_300)
+                binding.itemDetailIndicator.background =
+                    AppCompatResources.getDrawable(context, R.drawable.pill_bg_purple_300)
             }
             binding.itemDetailIndicator.visibility = View.VISIBLE
         }
 
         val limitedLeft = item.limitedNumberLeft ?: limitedNumberLeft
         if (item.key == "gem" && limitedLeft == -1) {
-            binding.itemDetailIndicator.background = AppCompatResources.getDrawable(context, R.drawable.item_indicator_subscribe)
+            binding.itemDetailIndicator.background =
+                AppCompatResources.getDrawable(context, R.drawable.item_indicator_subscribe)
             binding.itemDetailIndicator.visibility = View.VISIBLE
         } else if (item.key == "gem") {
-            binding.itemDetailIndicator.background = AppCompatResources.getDrawable(context, R.drawable.pill_bg_green)
+            binding.itemDetailIndicator.background =
+                AppCompatResources.getDrawable(context, R.drawable.pill_bg_green)
             binding.itemDetailIndicator.text = "$limitedLeft"
             binding.itemDetailIndicator.setTextColor(ContextCompat.getColor(context, R.color.white))
             binding.itemDetailIndicator.visibility = View.VISIBLE
@@ -99,11 +111,12 @@ class ShopItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), Vi
 
         if (binding.itemDetailIndicator.visibility == View.VISIBLE) {
             val layoutParams = binding.itemDetailIndicator.layoutParams
-            layoutParams.width = if (binding.itemDetailIndicator.text.isBlank()) {
-                24.dpToPx(context)
-            } else {
-                ViewGroup.LayoutParams.WRAP_CONTENT
-            }
+            layoutParams.width =
+                if (binding.itemDetailIndicator.text.isBlank()) {
+                    24.dpToPx(context)
+                } else {
+                    ViewGroup.LayoutParams.WRAP_CONTENT
+                }
             binding.itemDetailIndicator.layoutParams = layoutParams
         }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/AuthenticationViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/AuthenticationViewModel.kt
index e9b7ae7d7..2212b375d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/AuthenticationViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/AuthenticationViewModel.kt
@@ -31,150 +31,156 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import javax.inject.Inject
 
-class AuthenticationViewModel @Inject constructor(
-    val apiClient: ApiClient,
-    val userRepository: UserRepository,
-    val sharedPrefs: SharedPreferences,
-    val authenticationHandler: AuthenticationHandler,
-    val hostConfig: HostConfig,
-    private val keyHelper: KeyHelper?
-) {
-    var googleEmail: String? = null
-
-    fun handleGoogleLogin(
-        activity: Activity,
-        pickAccountResult: ActivityResultLauncher<Intent>
+class AuthenticationViewModel
+    @Inject
+    constructor(
+        val apiClient: ApiClient,
+        val userRepository: UserRepository,
+        val sharedPrefs: SharedPreferences,
+        val authenticationHandler: AuthenticationHandler,
+        val hostConfig: HostConfig,
+        private val keyHelper: KeyHelper?,
     ) {
-        if (!checkPlayServices(activity)) {
-            return
-        }
-        val accountTypes = arrayOf("com.google")
-        val intent = AccountManager.newChooseAccountIntent(
-            null,
-            null,
-            accountTypes,
-            true,
-            null,
-            null,
-            null,
-            null
-        )
-        try {
-            pickAccountResult.launch(intent)
-        } catch (e: ActivityNotFoundException) {
-            val alert = HabiticaAlertDialog(activity)
-            alert.setTitle(R.string.authentication_error_title)
-            alert.setMessage(R.string.google_services_missing)
-            alert.addCloseButton()
-            alert.show()
-        }
-    }
+        var googleEmail: String? = null
 
-    fun handleGoogleLoginResult(
-        activity: Activity,
-        recoverFromPlayServicesErrorResult: ActivityResultLauncher<Intent>?,
-        onSuccess: (Boolean) -> Unit
-    ) {
-        val scopesString = Scopes.PROFILE + " " + Scopes.EMAIL
-        val scopes = "oauth2:$scopesString"
-        var newUser: Boolean
-        CoroutineScope(Dispatchers.IO).launchCatching({ throwable ->
-            if (recoverFromPlayServicesErrorResult == null) return@launchCatching
-            if (throwable is GoogleAuthException) {
-                handleGoogleAuthException(
-                    throwable,
-                    activity,
-                    recoverFromPlayServicesErrorResult
+        fun handleGoogleLogin(
+            activity: Activity,
+            pickAccountResult: ActivityResultLauncher<Intent>,
+        ) {
+            if (!checkPlayServices(activity)) {
+                return
+            }
+            val accountTypes = arrayOf("com.google")
+            val intent =
+                AccountManager.newChooseAccountIntent(
+                    null,
+                    null,
+                    accountTypes,
+                    true,
+                    null,
+                    null,
+                    null,
+                    null,
                 )
-            }
-        }) {
-            val token = GoogleAuthUtil.getToken(activity, googleEmail ?: "", scopes)
-            val response =
-                apiClient.connectSocial("google", googleEmail ?: "", token) ?: return@launchCatching
-            newUser = response.newUser
-            handleAuthResponse(response)
-            onSuccess(newUser)
-        }
-    }
-
-    private fun handleGoogleAuthException(
-        e: Exception,
-        activity: Activity,
-        recoverFromPlayServicesErrorResult: ActivityResultLauncher<Intent>
-    ) {
-        if (e is GooglePlayServicesAvailabilityException) {
-            GoogleApiAvailability.getInstance()
-            GooglePlayServicesUtil.showErrorDialogFragment(
-                e.connectionStatusCode,
-                activity,
-                null,
-                REQUEST_CODE_RECOVER_FROM_PLAY_SERVICES_ERROR
-            ) {
-            }
-            return
-        } else if (e is UserRecoverableAuthException) {
-            // Unable to authenticate, such as when the user has not yet granted
-            // the app access to the account, but the user can fix this.
-            // Forward the user to an activity in Google Play services.
-            if (!activity.isFinishing) {
-                val intent = e.intent
-                recoverFromPlayServicesErrorResult.launch(intent)
+            try {
+                pickAccountResult.launch(intent)
+            } catch (e: ActivityNotFoundException) {
+                val alert = HabiticaAlertDialog(activity)
+                alert.setTitle(R.string.authentication_error_title)
+                alert.setMessage(R.string.google_services_missing)
+                alert.addCloseButton()
+                alert.show()
             }
         }
-    }
 
-    private fun checkPlayServices(activity: Activity): Boolean {
-        val googleAPI = GoogleApiAvailability.getInstance()
-        val result = googleAPI.isGooglePlayServicesAvailable(activity)
-        if (result != ConnectionResult.SUCCESS) {
-            if (googleAPI.isUserResolvableError(result)) {
-                googleAPI.getErrorDialog(
+        fun handleGoogleLoginResult(
+            activity: Activity,
+            recoverFromPlayServicesErrorResult: ActivityResultLauncher<Intent>?,
+            onSuccess: (Boolean) -> Unit,
+        ) {
+            val scopesString = Scopes.PROFILE + " " + Scopes.EMAIL
+            val scopes = "oauth2:$scopesString"
+            var newUser: Boolean
+            CoroutineScope(Dispatchers.IO).launchCatching({ throwable ->
+                if (recoverFromPlayServicesErrorResult == null) return@launchCatching
+                if (throwable is GoogleAuthException) {
+                    handleGoogleAuthException(
+                        throwable,
+                        activity,
+                        recoverFromPlayServicesErrorResult,
+                    )
+                }
+            }) {
+                val token = GoogleAuthUtil.getToken(activity, googleEmail ?: "", scopes)
+                val response =
+                    apiClient.connectSocial("google", googleEmail ?: "", token) ?: return@launchCatching
+                newUser = response.newUser
+                handleAuthResponse(response)
+                onSuccess(newUser)
+            }
+        }
+
+        private fun handleGoogleAuthException(
+            e: Exception,
+            activity: Activity,
+            recoverFromPlayServicesErrorResult: ActivityResultLauncher<Intent>,
+        ) {
+            if (e is GooglePlayServicesAvailabilityException) {
+                GoogleApiAvailability.getInstance()
+                GooglePlayServicesUtil.showErrorDialogFragment(
+                    e.connectionStatusCode,
                     activity,
-                    result,
-                    PLAY_SERVICES_RESOLUTION_REQUEST
-                )?.show()
+                    null,
+                    REQUEST_CODE_RECOVER_FROM_PLAY_SERVICES_ERROR,
+                ) {
+                }
+                return
+            } else if (e is UserRecoverableAuthException) {
+                // Unable to authenticate, such as when the user has not yet granted
+                // the app access to the account, but the user can fix this.
+                // Forward the user to an activity in Google Play services.
+                if (!activity.isFinishing) {
+                    val intent = e.intent
+                    recoverFromPlayServicesErrorResult.launch(intent)
+                }
             }
-            return false
         }
 
-        return true
-    }
+        private fun checkPlayServices(activity: Activity): Boolean {
+            val googleAPI = GoogleApiAvailability.getInstance()
+            val result = googleAPI.isGooglePlayServicesAvailable(activity)
+            if (result != ConnectionResult.SUCCESS) {
+                if (googleAPI.isUserResolvableError(result)) {
+                    googleAPI.getErrorDialog(
+                        activity,
+                        result,
+                        PLAY_SERVICES_RESOLUTION_REQUEST,
+                    )?.show()
+                }
+                return false
+            }
 
-    fun handleAuthResponse(userAuthResponse: UserAuthResponse) {
-        try {
-            saveTokens(userAuthResponse.apiToken, userAuthResponse.id)
-        } catch (e: Exception) {
-            Analytics.logException(e)
+            return true
         }
-    }
 
-    @Throws(Exception::class)
-    private fun saveTokens(api: String, user: String) {
-        this.apiClient.updateAuthenticationCredentials(user, api)
-        authenticationHandler.updateUserID(user)
-        sharedPrefs.edit {
-            putString("UserID", user)
-            val encryptedKey =
-                if (keyHelper != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                    try {
-                        keyHelper.encrypt(api)
-                    } catch (e: Exception) {
+        fun handleAuthResponse(userAuthResponse: UserAuthResponse) {
+            try {
+                saveTokens(userAuthResponse.apiToken, userAuthResponse.id)
+            } catch (e: Exception) {
+                Analytics.logException(e)
+            }
+        }
+
+        @Throws(Exception::class)
+        private fun saveTokens(
+            api: String,
+            user: String,
+        ) {
+            this.apiClient.updateAuthenticationCredentials(user, api)
+            authenticationHandler.updateUserID(user)
+            sharedPrefs.edit {
+                putString("UserID", user)
+                val encryptedKey =
+                    if (keyHelper != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                        try {
+                            keyHelper.encrypt(api)
+                        } catch (e: Exception) {
+                            null
+                        }
+                    } else {
                         null
                     }
+                if ((encryptedKey?.length ?: 0) > 5) {
+                    putString(user, encryptedKey)
                 } else {
-                    null
+                    // Something might have gone wrong with encryption, so fall back to this.
+                    putString("APIToken", api)
                 }
-            if ((encryptedKey?.length ?: 0) > 5) {
-                putString(user, encryptedKey)
-            } else {
-                // Something might have gone wrong with encryption, so fall back to this.
-                putString("APIToken", api)
             }
         }
-    }
 
-    companion object {
-        private const val REQUEST_CODE_RECOVER_FROM_PLAY_SERVICES_ERROR = 1001
-        private const val PLAY_SERVICES_RESOLUTION_REQUEST = 9000
+        companion object {
+            private const val REQUEST_CODE_RECOVER_FROM_PLAY_SERVICES_ERROR = 1001
+            private const val PLAY_SERVICES_RESOLUTION_REQUEST = 9000
+        }
     }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/BaseViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/BaseViewModel.kt
index edbbaf754..eebdcb2c1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/BaseViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/BaseViewModel.kt
@@ -8,7 +8,10 @@ import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.common.habitica.helpers.ExceptionHandler
 import kotlinx.coroutines.launch
 
-abstract class BaseViewModel(val userRepository: UserRepository, val userViewModel: MainUserViewModel) : ViewModel() {
+abstract class BaseViewModel(
+    val userRepository: UserRepository,
+    val userViewModel: MainUserViewModel,
+) : ViewModel() {
     val user: LiveData<User?> by lazy {
         userViewModel.user
     }
@@ -18,7 +21,10 @@ abstract class BaseViewModel(val userRepository: UserRepository, val userViewMod
         super.onCleared()
     }
 
-    fun updateUser(path: String, value: Any) {
+    fun updateUser(
+        path: String,
+        value: Any,
+    ) {
         viewModelScope.launch(ExceptionHandler.coroutine()) {
             userRepository.updateUser(path, value)
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/GroupViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/GroupViewModel.kt
index 34fe05da2..75df57b1e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/GroupViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/GroupViewModel.kt
@@ -43,268 +43,281 @@ enum class GroupViewType(internal val order: String) {
 
 @OptIn(ExperimentalCoroutinesApi::class)
 @HiltViewModel
-open class GroupViewModel @Inject constructor(
-    userRepository: UserRepository,
-    userViewModel: MainUserViewModel,
-    val challengeRepository: ChallengeRepository,
-    val socialRepository: SocialRepository,
-    val notificationsManager: NotificationsManager
-) : BaseViewModel(userRepository, userViewModel) {
+open class GroupViewModel
+    @Inject
+    constructor(
+        userRepository: UserRepository,
+        userViewModel: MainUserViewModel,
+        val challengeRepository: ChallengeRepository,
+        val socialRepository: SocialRepository,
+        val notificationsManager: NotificationsManager,
+    ) : BaseViewModel(userRepository, userViewModel) {
+        protected val groupIDState = MutableStateFlow<String?>(null)
+        val groupIDFlow: Flow<String?> = groupIDState
 
-    protected val groupIDState = MutableStateFlow<String?>(null)
-    val groupIDFlow: Flow<String?> = groupIDState
+        var groupViewType: GroupViewType? = null
 
-    var groupViewType: GroupViewType? = null
+        private val groupFlow =
+            groupIDFlow
+                .filterNotNull()
+                .flatMapLatest { socialRepository.getGroup(it) }
+        private val group = groupFlow.asLiveData()
 
-    private val groupFlow = groupIDFlow
-        .filterNotNull()
-        .flatMapLatest { socialRepository.getGroup(it) }
-    private val group = groupFlow.asLiveData()
+        private val leaderFlow =
+            groupFlow.map { it?.leaderID }
+                .filterNotNull()
+                .flatMapLatest { socialRepository.retrieveMember(it).toFlow() }
+        private val leader = leaderFlow.asLiveData()
 
-    private val leaderFlow = groupFlow.map { it?.leaderID }
-        .filterNotNull()
-        .flatMapLatest { socialRepository.retrieveMember(it).toFlow() }
-    private val leader = leaderFlow.asLiveData()
+        private val isMemberFlow =
+            groupIDFlow
+                .filterNotNull()
+                .flatMapLatest { socialRepository.getGroupMembership(it) }
+                .map { it != null }
+        private val isMemberData = isMemberFlow.asLiveData()
 
-    private val isMemberFlow = groupIDFlow
-        .filterNotNull()
-        .flatMapLatest { socialRepository.getGroupMembership(it) }
-        .map { it != null }
-    private val isMemberData = isMemberFlow.asLiveData()
-
-    private val _chatMessages: MutableLiveData<List<ChatMessage>> by lazy {
-        MutableLiveData<List<ChatMessage>>(listOf())
-    }
-    val chatmessages: LiveData<List<ChatMessage>> by lazy {
-        _chatMessages
-    }
-
-    var gotNewMessages: Boolean = false
-
-    override fun onCleared() {
-        socialRepository.close()
-        super.onCleared()
-    }
-
-    fun setGroupID(groupID: String) {
-        if (groupID == groupIDState.value) return
-        groupIDState.value = groupID
-
-        viewModelScope.launchCatching {
-            val notifications =
-                notificationsManager.getNotifications().firstOrNull()?.filter { notification ->
-                    val data = notification.data as? NewChatMessageData
-                    data?.group?.id == groupID
-                } ?: return@launchCatching
-            notifications.forEach { userRepository.readNotification(it.id) }
+        private val chatMessagesLiveData: MutableLiveData<List<ChatMessage>> by lazy {
+            MutableLiveData<List<ChatMessage>>(listOf())
+        }
+        val chatmessages: LiveData<List<ChatMessage>> by lazy {
+            chatMessagesLiveData
         }
-    }
 
-    val groupID: String?
-        get() = groupIDState.value
-    val isMember: Boolean
-        get() = isMemberData.value ?: false
-    val leaderID: String?
-        get() = group.value?.leaderID
-    val isLeader: Boolean
-        get() = user.value?.id == leaderID
-    val isPublicGuild: Boolean
-        get() = group.value?.privacy == "public"
+        var gotNewMessages: Boolean = false
 
-    val pendingInvites = mutableStateListOf<Member>()
-    val pendingInviteStates = mutableStateMapOf<String, LoadingButtonState>()
+        override fun onCleared() {
+            socialRepository.close()
+            super.onCleared()
+        }
 
-    fun getGroupData(): LiveData<Group?> = group
-    fun getLeaderData(): LiveData<Member?> = leader
-    fun getIsMemberData(): LiveData<Boolean> = isMemberData
+        fun setGroupID(groupID: String) {
+            if (groupID == groupIDState.value) return
+            groupIDState.value = groupID
 
-    fun retrieveGroup(function: (() -> Unit)?) {
-        if (groupID?.isNotEmpty() == true) {
-            viewModelScope.launch(
-                ExceptionHandler.coroutine {
-                    if (it is HttpException && it.code() == 404) {
-                        MainNavigationController.navigateBack()
-                    }
-                }
-            ) {
-                val group = socialRepository.retrieveGroup(groupID ?: "")
-                if (groupViewType == GroupViewType.PARTY) {
-                    socialRepository.retrievePartyMembers(group?.id ?: "", true)
-                    if (isLeader) {
-                        val invites =
-                            socialRepository.retrievegroupInvites(group?.id ?: "", true)
-                                ?: emptyList()
-                        pendingInvites.clear()
-                        pendingInvites.addAll(invites)
+            viewModelScope.launchCatching {
+                val notifications =
+                    notificationsManager.getNotifications().firstOrNull()?.filter { notification ->
+                        val data = notification.data as? NewChatMessageData
+                        data?.group?.id == groupID
+                    } ?: return@launchCatching
+                notifications.forEach { userRepository.readNotification(it.id) }
+            }
+        }
+
+        val groupID: String?
+            get() = groupIDState.value
+        val isMember: Boolean
+            get() = isMemberData.value ?: false
+        val leaderID: String?
+            get() = group.value?.leaderID
+        val isLeader: Boolean
+            get() = user.value?.id == leaderID
+        val isPublicGuild: Boolean
+            get() = group.value?.privacy == "public"
+
+        val pendingInvites = mutableStateListOf<Member>()
+        val pendingInviteStates = mutableStateMapOf<String, LoadingButtonState>()
+
+        fun getGroupData(): LiveData<Group?> = group
+
+        fun getLeaderData(): LiveData<Member?> = leader
+
+        fun getIsMemberData(): LiveData<Boolean> = isMemberData
+
+        fun retrieveGroup(function: (() -> Unit)?) {
+            if (groupID?.isNotEmpty() == true) {
+                viewModelScope.launch(
+                    ExceptionHandler.coroutine {
+                        if (it is HttpException && it.code() == 404) {
+                            MainNavigationController.navigateBack()
+                        }
+                    },
+                ) {
+                    val group = socialRepository.retrieveGroup(groupID ?: "")
+                    if (groupViewType == GroupViewType.PARTY) {
+                        socialRepository.retrievePartyMembers(group?.id ?: "", true)
+                        if (isLeader) {
+                            val invites =
+                                socialRepository.retrievegroupInvites(group?.id ?: "", true)
+                                    ?: emptyList()
+                            pendingInvites.clear()
+                            pendingInvites.addAll(invites)
+                        }
+                    }
+                    function?.invoke()
+                }
+            }
+        }
+
+        fun inviteToGroup(inviteData: HashMap<String, Any>) {
+            viewModelScope.launchCatching {
+                socialRepository.inviteToGroup(group.value?.id ?: "", inviteData)
+            }
+        }
+
+        fun updateOrCreateGroup(bundle: Bundle?) {
+            viewModelScope.launch(ExceptionHandler.coroutine()) {
+                if (group.value == null) {
+                    socialRepository.createGroup(
+                        bundle?.getString("name"),
+                        bundle?.getString("description"),
+                        bundle?.getString("leader"),
+                        bundle?.getString("groupType"),
+                        bundle?.getString("privacy"),
+                        bundle?.getBoolean("leaderCreateChallenge"),
+                    )
+                } else {
+                    socialRepository.updateGroup(
+                        group.value,
+                        bundle?.getString("name"),
+                        bundle?.getString("description"),
+                        bundle?.getString("leader"),
+                        bundle?.getBoolean("leaderOnlyChallenges"),
+                    )
+                }
+            }
+        }
+
+        fun leaveGroup(
+            groupChallenges: List<Challenge>,
+            keepChallenges: Boolean = true,
+            function: (() -> Unit)? = null,
+        ) {
+            if (!keepChallenges) {
+                viewModelScope.launchCatching {
+                    for (challenge in groupChallenges) {
+                        challengeRepository.leaveChallenge(challenge, "remove-all")
                     }
                 }
+            }
+            viewModelScope.launch(ExceptionHandler.coroutine()) {
+                socialRepository.leaveGroup(groupID ?: "", keepChallenges)
+                userRepository.retrieveUser(withTasks = false, forced = true)
                 function?.invoke()
             }
         }
-    }
 
-    fun inviteToGroup(inviteData: HashMap<String, Any>) {
-        viewModelScope.launchCatching {
-            socialRepository.inviteToGroup(group.value?.id ?: "", inviteData)
+        fun joinGroup(
+            id: String? = null,
+            function: (() -> Unit)? = null,
+        ) {
+            viewModelScope.launchCatching {
+                socialRepository.joinGroup(id ?: groupID)
+                function?.invoke()
+            }
         }
-    }
 
-    fun updateOrCreateGroup(bundle: Bundle?) {
-        viewModelScope.launch(ExceptionHandler.coroutine()) {
-            if (group.value == null) {
-                socialRepository.createGroup(
-                    bundle?.getString("name"),
-                    bundle?.getString("description"),
-                    bundle?.getString("leader"),
-                    bundle?.getString("groupType"),
-                    bundle?.getString("privacy"),
-                    bundle?.getBoolean("leaderCreateChallenge")
-                )
-            } else {
+        fun rejectGroupInvite(id: String? = null) {
+            groupID?.let {
+                viewModelScope.launchCatching {
+                    socialRepository.rejectGroupInvite(id ?: it)
+                }
+            }
+        }
+
+        fun markMessagesSeen() {
+            groupID?.let {
+                if (it.isNotEmpty() && gotNewMessages) {
+                    viewModelScope.launchCatching {
+                        socialRepository.markMessagesSeen(it)
+                    }
+                }
+            }
+        }
+
+        fun likeMessage(message: ChatMessage) {
+            viewModelScope.launchCatching {
+                val newMessage = socialRepository.likeMessage(message)
+                val index = chatMessagesLiveData.value?.indexOfFirst { it.id == newMessage?.id }
+                if (index == null || index < 0) {
+                    retrieveGroupChat { }
+                    return@launchCatching
+                }
+                val list = mutableListOf<ChatMessage>()
+                chatMessagesLiveData.value?.let { list.addAll(it) }
+                if (newMessage != null) {
+                    list[index] = newMessage
+                }
+                chatMessagesLiveData.postValue(list)
+            }
+        }
+
+        fun deleteMessage(chatMessage: ChatMessage) {
+            val oldIndex = chatMessagesLiveData.value?.indexOf(chatMessage) ?: return
+            val list = chatMessagesLiveData.value?.toMutableList()
+            list?.remove(chatMessage)
+            chatMessagesLiveData.postValue(list)
+            viewModelScope.launch(
+                ExceptionHandler.coroutine {
+                    list?.add(oldIndex, chatMessage)
+                    chatMessagesLiveData.postValue(list)
+                    ExceptionHandler.reportError(it)
+                },
+            ) {
+                socialRepository.deleteMessage(chatMessage)
+            }
+        }
+
+        fun postGroupChat(
+            chatText: String,
+            onComplete: () -> Unit,
+            onError: () -> Unit,
+        ) {
+            groupID?.let { groupID ->
+                viewModelScope.launch(
+                    ExceptionHandler.coroutine {
+                        ExceptionHandler.reportError(it)
+                        onError()
+                    },
+                ) {
+                    val response = socialRepository.postGroupChat(groupID, chatText)
+                    val list = chatMessagesLiveData.value?.toMutableList()
+                    if (response != null) {
+                        list?.add(0, response.message)
+                    }
+                    chatMessagesLiveData.postValue(list)
+                    onComplete()
+                }
+            }
+        }
+
+        fun retrieveGroupChat(onComplete: () -> Unit) {
+            var groupID = groupID
+            if (groupViewType == GroupViewType.PARTY) {
+                groupID = "party"
+            }
+            if (groupID.isNullOrEmpty()) {
+                onComplete()
+                return
+            }
+            viewModelScope.launch(ExceptionHandler.coroutine()) {
+                val messages = socialRepository.retrieveGroupChat(groupID)
+                chatMessagesLiveData.postValue(messages)
+                onComplete()
+            }
+        }
+
+        fun updateGroup(bundle: Bundle?) {
+            viewModelScope.launch(ExceptionHandler.coroutine()) {
                 socialRepository.updateGroup(
                     group.value,
                     bundle?.getString("name"),
                     bundle?.getString("description"),
                     bundle?.getString("leader"),
-                    bundle?.getBoolean("leaderOnlyChallenges")
+                    bundle?.getBoolean("leaderOnlyChallenges"),
                 )
             }
         }
-    }
 
-    fun leaveGroup(
-        groupChallenges: List<Challenge>,
-        keepChallenges: Boolean = true,
-        function: (() -> Unit)? = null
-    ) {
-        if (!keepChallenges) {
-            viewModelScope.launchCatching {
-                for (challenge in groupChallenges) {
-                    challengeRepository.leaveChallenge(challenge, "remove-all")
-                }
-            }
-        }
-        viewModelScope.launch(ExceptionHandler.coroutine()) {
-            socialRepository.leaveGroup(groupID ?: "", keepChallenges)
-            userRepository.retrieveUser(withTasks = false, forced = true)
-            function?.invoke()
-        }
-    }
-
-    fun joinGroup(id: String? = null, function: (() -> Unit)? = null) {
-        viewModelScope.launchCatching {
-            socialRepository.joinGroup(id ?: groupID)
-            function?.invoke()
-        }
-    }
-
-    fun rejectGroupInvite(id: String? = null) {
-        groupID?.let {
-            viewModelScope.launchCatching {
-                socialRepository.rejectGroupInvite(id ?: it)
+        fun rescindInvite(invitedMember: Member) {
+            pendingInviteStates[invitedMember.id] = LoadingButtonState.LOADING
+            viewModelScope.launchCatching({
+                pendingInviteStates[invitedMember.id] = LoadingButtonState.FAILED
+            }) {
+                socialRepository.removeMemberFromGroup(groupID ?: "", invitedMember.id)
+                pendingInviteStates[invitedMember.id] = LoadingButtonState.SUCCESS
+                delay(1.toDuration(DurationUnit.SECONDS))
+                pendingInvites.remove(invitedMember)
             }
         }
     }
-
-    fun markMessagesSeen() {
-        groupID?.let {
-            if (it.isNotEmpty() && gotNewMessages) {
-                viewModelScope.launchCatching {
-                    socialRepository.markMessagesSeen(it)
-                }
-            }
-        }
-    }
-
-    fun likeMessage(message: ChatMessage) {
-        viewModelScope.launchCatching {
-            val newMessage = socialRepository.likeMessage(message)
-            val index = _chatMessages.value?.indexOfFirst { it.id == newMessage?.id }
-            if (index == null || index < 0) {
-                retrieveGroupChat { }
-                return@launchCatching
-            }
-            val list = mutableListOf<ChatMessage>()
-            _chatMessages.value?.let { list.addAll(it) }
-            if (newMessage != null) {
-                list[index] = newMessage
-            }
-            _chatMessages.postValue(list)
-        }
-    }
-
-    fun deleteMessage(chatMessage: ChatMessage) {
-        val oldIndex = _chatMessages.value?.indexOf(chatMessage) ?: return
-        val list = _chatMessages.value?.toMutableList()
-        list?.remove(chatMessage)
-        _chatMessages.postValue(list)
-        viewModelScope.launch(
-            ExceptionHandler.coroutine {
-                list?.add(oldIndex, chatMessage)
-                _chatMessages.postValue(list)
-                ExceptionHandler.reportError(it)
-            }
-        ) {
-            socialRepository.deleteMessage(chatMessage)
-        }
-    }
-
-    fun postGroupChat(chatText: String, onComplete: () -> Unit, onError: () -> Unit) {
-        groupID?.let { groupID ->
-            viewModelScope.launch(
-                ExceptionHandler.coroutine {
-                    ExceptionHandler.reportError(it)
-                    onError()
-                }
-            ) {
-                val response = socialRepository.postGroupChat(groupID, chatText)
-                val list = _chatMessages.value?.toMutableList()
-                if (response != null) {
-                    list?.add(0, response.message)
-                }
-                _chatMessages.postValue(list)
-                onComplete()
-            }
-        }
-    }
-
-    fun retrieveGroupChat(onComplete: () -> Unit) {
-        var groupID = groupID
-        if (groupViewType == GroupViewType.PARTY) {
-            groupID = "party"
-        }
-        if (groupID.isNullOrEmpty()) {
-            onComplete()
-            return
-        }
-        viewModelScope.launch(ExceptionHandler.coroutine()) {
-            val messages = socialRepository.retrieveGroupChat(groupID)
-            _chatMessages.postValue(messages)
-            onComplete()
-        }
-    }
-
-    fun updateGroup(bundle: Bundle?) {
-        viewModelScope.launch(ExceptionHandler.coroutine()) {
-            socialRepository.updateGroup(
-                group.value,
-                bundle?.getString("name"),
-                bundle?.getString("description"),
-                bundle?.getString("leader"),
-                bundle?.getBoolean("leaderOnlyChallenges")
-            )
-        }
-    }
-
-    fun rescindInvite(invitedMember: Member) {
-        pendingInviteStates[invitedMember.id] = LoadingButtonState.LOADING
-        viewModelScope.launchCatching({
-            pendingInviteStates[invitedMember.id] = LoadingButtonState.FAILED
-        }) {
-            socialRepository.removeMemberFromGroup(groupID ?: "", invitedMember.id)
-            pendingInviteStates[invitedMember.id] = LoadingButtonState.SUCCESS
-            delay(1.toDuration(DurationUnit.SECONDS))
-            pendingInvites.remove(invitedMember)
-        }
-    }
-}
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 4571ab6b1..4e4c06d0f 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
@@ -7,17 +7,19 @@ import androidx.lifecycle.asLiveData
 import androidx.lifecycle.viewModelScope
 import androidx.paging.DataSource
 import androidx.paging.PagedList
-import androidx.paging.PositionalDataSource
-import androidx.paging.toLiveData
+import androidx.paging.Pager
+import androidx.paging.PagingConfig
+import androidx.paging.PagingSource
+import androidx.paging.liveData
 import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.data.UserRepository
-import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.models.social.ChatMessage
 import com.habitrpg.common.habitica.helpers.ExceptionHandler
 import dagger.hilt.android.lifecycle.HiltViewModel
 import io.realm.kotlin.toFlow
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.asCoroutineDispatcher
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.emptyFlow
@@ -31,72 +33,97 @@ import javax.inject.Inject
 import kotlin.math.ceil
 
 @HiltViewModel
-class InboxViewModel @Inject constructor(
-    savedStateHandle: SavedStateHandle,
-    userRepository: UserRepository,
-    userViewModel: MainUserViewModel,
-    val socialRepository: SocialRepository
-) : BaseViewModel(userRepository, userViewModel) {
-    val recipientID: String? = savedStateHandle["userID"]
-    val recipientUsername: String? = savedStateHandle["username"]
+class InboxViewModel
+    @Inject
+    constructor(
+        savedStateHandle: SavedStateHandle,
+        userRepository: UserRepository,
+        userViewModel: MainUserViewModel,
+        val socialRepository: SocialRepository,
+    ) : BaseViewModel(userRepository, userViewModel) {
+        val recipientID: String? = savedStateHandle["userID"]
+        val recipientUsername: String? = savedStateHandle["username"]
 
-    private var memberIDFlow = MutableStateFlow<String?>(null)
-    val memberIDState: StateFlow<String?> = memberIDFlow
+        private var memberIDFlow = MutableStateFlow<String?>(null)
+        val memberIDState: StateFlow<String?> = memberIDFlow
 
-    private val config = PagedList.Config.Builder()
-        .setPageSize(10)
-        .setEnablePlaceholders(false)
-        .build()
+        private val config =
+            PagedList.Config.Builder()
+                .setPageSize(10)
+                .setEnablePlaceholders(false)
+                .build()
 
-    private val dataSourceFactory = MessagesDataSourceFactory(socialRepository, recipientID, ChatMessage())
-    val messages: LiveData<PagedList<ChatMessage>> = dataSourceFactory.toLiveData(config)
-    private val member = memberIDFlow
-        .filterNotNull()
-        .flatMapLatest { socialRepository.retrieveMember(it).toFlow() }
-        .asLiveData()
+        private val dataSourceFactory =
+            MessagesDataSourceFactory(socialRepository, recipientID, ChatMessage())
+        val messages: LiveData<PagedList<ChatMessage>> =
+            Pager<Int, ChatMessage>(
+                PagingConfig(
+                    config.pageSize,
+                    config.prefetchDistance,
+                    config.enablePlaceholders,
+                    config.initialLoadSizeHint,
+                    config.maxSize,
+                ),
+                null,
+                dataSourceFactory.asPagingSourceFactory(
+                    ArchTaskExecutor.getIOThreadExecutor().asCoroutineDispatcher(),
+                ),
+            ).liveData
+        private val member =
+            memberIDFlow
+                .filterNotNull()
+                .flatMapLatest { socialRepository.retrieveMember(it).toFlow() }
+                .asLiveData()
 
-    fun setMemberID(memberID: String) {
-        if (memberID == memberIDState.value) return
-        memberIDFlow.value = memberID
-    }
+        fun setMemberID(memberID: String) {
+            if (memberID == memberIDState.value) return
+            memberIDFlow.value = memberID
+        }
 
-    val memberID: String?
-        get() = memberIDFlow.value
+        val memberID: String?
+            get() = memberIDFlow.value
 
-    fun invalidateDataSource() {
-        dataSourceFactory.sourceLiveData.value?.invalidate()
-    }
+        fun invalidateDataSource() {
+            dataSourceFactory.sourceLiveData.value?.invalidate()
+        }
 
-    init {
-        if (recipientID?.isNotBlank() == true) {
-            setMemberID(recipientID)
-        } else if (recipientUsername?.isNotBlank() == true) {
-            viewModelScope.launch(ExceptionHandler.coroutine()) {
-                val member = socialRepository.retrieveMember(recipientUsername, false)
-                setMemberID(member?.id ?: "")
-                invalidateDataSource()
-                dataSourceFactory.updateRecipientID(memberID)
+        init {
+            if (recipientID?.isNotBlank() == true) {
+                setMemberID(recipientID)
+            } else if (recipientUsername?.isNotBlank() == true) {
+                viewModelScope.launch(ExceptionHandler.coroutine()) {
+                    val member = socialRepository.retrieveMember(recipientUsername, false)
+                    setMemberID(member?.id ?: "")
+                    invalidateDataSource()
+                    dataSourceFactory.updateRecipientID(memberID)
+                }
             }
         }
     }
-}
 
 class MessagesDataSource(
     val socialRepository: SocialRepository,
     var recipientID: String?,
-    var footer: ChatMessage?
+    var footer: ChatMessage?,
 ) :
-    PositionalDataSource<ChatMessage>() {
+    PagingSource<Int, T>() {
     private var lastFetchWasEnd = false
-    override fun loadRange(params: LoadRangeParams, callback: LoadRangeCallback<ChatMessage>) {
+
+    override fun loadRange(
+        params: LoadRangeParams,
+        callback: LoadRangeCallback<ChatMessage>,
+    ) {
         if (lastFetchWasEnd) {
             callback.onResult(emptyList())
             return
         }
         MainScope().launch(Dispatchers.Main.immediate) {
-            if (recipientID?.isNotBlank() != true) { return@launch }
+            if (recipientID?.isNotBlank() != true) {
+                return@launch
+            }
             val page = ceil(params.startPosition.toFloat() / params.loadSize.toFloat()).toInt()
-            val messages = socialRepository.retrieveInboxMessages(recipientID ?: "", page) ?: return@launch
+            val messages =
+                socialRepository.retrieveInboxMessages(recipientID ?: "", page) ?: return@launch
             if (messages.size < 10) {
                 lastFetchWasEnd = true
                 callback.onResult(messages)
@@ -106,7 +133,10 @@ class MessagesDataSource(
         }
     }
 
-    override fun loadInitial(params: LoadInitialParams, callback: LoadInitialCallback<ChatMessage>) {
+    override fun loadInitial(
+        params: LoadInitialParams,
+        callback: LoadInitialCallback<ChatMessage>,
+    ) {
         lastFetchWasEnd = false
         MainScope().launch(Dispatchers.Main.immediate) {
             socialRepository.getInboxMessages(recipientID)
@@ -114,8 +144,12 @@ class MessagesDataSource(
                 .take(1)
                 .flatMapLatest {
                     if (it.isEmpty()) {
-                        if (recipientID?.isNotBlank() != true) { return@flatMapLatest flowOf(it) }
-                        val messages = socialRepository.retrieveInboxMessages(recipientID ?: "", 0) ?: return@flatMapLatest emptyFlow()
+                        if (recipientID?.isNotBlank() != true) {
+                            return@flatMapLatest flowOf(it)
+                        }
+                        val messages =
+                            socialRepository.retrieveInboxMessages(recipientID ?: "", 0)
+                                ?: return@flatMapLatest emptyFlow()
                         if (messages.size < 10) {
                             lastFetchWasEnd = true
                         }
@@ -138,7 +172,7 @@ class MessagesDataSource(
 class MessagesDataSourceFactory(
     val socialRepository: SocialRepository,
     var recipientID: String?,
-    val footer: ChatMessage?
+    val footer: ChatMessage?,
 ) :
     DataSource.Factory<Int, ChatMessage>() {
     val sourceLiveData = MutableLiveData<MessagesDataSource>()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/MainActivityViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/MainActivityViewModel.kt
index 9df149b78..2729ddc15 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/MainActivityViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/MainActivityViewModel.kt
@@ -31,167 +31,171 @@ import java.util.Date
 import javax.inject.Inject
 
 @HiltViewModel
-class MainActivityViewModel @Inject constructor(
-    userRepository: UserRepository,
-    userViewModel: MainUserViewModel,
-    val hostConfig: HostConfig,
-    val pushNotificationManager: PushNotificationManager,
-    val sharedPreferences: SharedPreferences,
-    val contentRepository: ContentRepository,
-    val taskRepository: TaskRepository,
-    val inventoryRepository: InventoryRepository,
-    val taskAlarmManager: TaskAlarmManager,
-    val maintenanceService: MaintenanceApiService
-) : BaseViewModel(userRepository, userViewModel), TutorialView.OnTutorialReaction {
+class MainActivityViewModel
+    @Inject
+    constructor(
+        userRepository: UserRepository,
+        userViewModel: MainUserViewModel,
+        val hostConfig: HostConfig,
+        val pushNotificationManager: PushNotificationManager,
+        val sharedPreferences: SharedPreferences,
+        val contentRepository: ContentRepository,
+        val taskRepository: TaskRepository,
+        val inventoryRepository: InventoryRepository,
+        val taskAlarmManager: TaskAlarmManager,
+        val maintenanceService: MaintenanceApiService,
+    ) : BaseViewModel(userRepository, userViewModel), TutorialView.OnTutorialReaction {
+        val isAuthenticated: Boolean
+            get() = hostConfig.hasAuthentication()
+        val launchScreen: String?
+            get() = sharedPreferences.getString("launch_screen", "")
+        var preferenceLanguage: String?
+            get() = sharedPreferences.getString("language", "en")
+            set(value) {
+                sharedPreferences.edit {
+                    putString("language", value)
+                }
+            }
+        var requestNotificationPermission = MutableLiveData(false)
 
-    val isAuthenticated: Boolean
-        get() = hostConfig.hasAuthentication()
-    val launchScreen: String?
-        get() = sharedPreferences.getString("launch_screen", "")
-    var preferenceLanguage: String?
-        get() = sharedPreferences.getString("language", "en")
-        set(value) {
+        val canShowTeamPlanHeader = mutableStateOf(false)
+
+        override fun onCleared() {
+            taskRepository.close()
+            inventoryRepository.close()
+            contentRepository.close()
+            super.onCleared()
+        }
+
+        fun onCreate() {
+            try {
+                viewModelScope.launch(ExceptionHandler.coroutine()) {
+                    taskAlarmManager.scheduleAllSavedAlarms(
+                        sharedPreferences.getBoolean(
+                            "preventDailyReminder",
+                            false,
+                        ),
+                    )
+                }
+            } catch (e: Exception) {
+                Analytics.logException(e)
+            }
+        }
+
+        fun onResume() {
+            // Track when the app was last opened, so that we can use this to send out special reminders after a week of inactivity
             sharedPreferences.edit {
-                putString("language", value)
+                putLong("lastAppLaunch", Date().time)
+                putBoolean("preventDailyReminder", false)
             }
         }
-    var requestNotificationPermission = MutableLiveData(false)
 
-    val canShowTeamPlanHeader = mutableStateOf(false)
-
-    override fun onCleared() {
-        taskRepository.close()
-        inventoryRepository.close()
-        contentRepository.close()
-        super.onCleared()
-    }
-
-    fun onCreate() {
-        try {
-            viewModelScope.launch(ExceptionHandler.coroutine()) {
-                taskAlarmManager.scheduleAllSavedAlarms(
-                    sharedPreferences.getBoolean(
-                        "preventDailyReminder",
-                        false
-                    )
-                )
-            }
-        } catch (e: Exception) {
-            Analytics.logException(e)
-        }
-    }
-
-    fun onResume() {
-        // Track when the app was last opened, so that we can use this to send out special reminders after a week of inactivity
-        sharedPreferences.edit {
-            putLong("lastAppLaunch", Date().time)
-            putBoolean("preventDailyReminder", false)
-        }
-    }
-
-    fun retrieveUser(forced: Boolean = false) {
-        if (hostConfig.hasAuthentication()) {
-            viewModelScope.launch(ExceptionHandler.coroutine()) {
-                contentRepository.retrieveWorldState()
-                userRepository.retrieveUser(true, forced)?.let { user ->
-                    Analytics.setUserProperty(
-                        "has_party",
-                        if (user.party?.id?.isNotEmpty() == true) "true" else "false"
-                    )
-                    Analytics.setUserProperty(
-                        "is_subscribed",
-                        if (user.isSubscribed) "true" else "false"
-                    )
-                    Analytics.setUserProperty(
-                        "checkin_count",
-                        user.loginIncentives.toString()
-                    )
-                    Analytics.setUserProperty("level", user.stats?.lvl?.toString() ?: "")
-                    pushNotificationManager.setUser(user)
-                    if (!pushNotificationManager.notificationPermissionEnabled()) {
-                        if (sharedPreferences.getBoolean("usePushNotifications", true)) {
-                            requestNotificationPermission.value = true
+        fun retrieveUser(forced: Boolean = false) {
+            if (hostConfig.hasAuthentication()) {
+                viewModelScope.launch(ExceptionHandler.coroutine()) {
+                    contentRepository.retrieveWorldState()
+                    userRepository.retrieveUser(true, forced)?.let { user ->
+                        Analytics.setUserProperty(
+                            "has_party",
+                            if (user.party?.id?.isNotEmpty() == true) "true" else "false",
+                        )
+                        Analytics.setUserProperty(
+                            "is_subscribed",
+                            if (user.isSubscribed) "true" else "false",
+                        )
+                        Analytics.setUserProperty(
+                            "checkin_count",
+                            user.loginIncentives.toString(),
+                        )
+                        Analytics.setUserProperty("level", user.stats?.lvl?.toString() ?: "")
+                        pushNotificationManager.setUser(user)
+                        if (!pushNotificationManager.notificationPermissionEnabled()) {
+                            if (sharedPreferences.getBoolean("usePushNotifications", true)) {
+                                requestNotificationPermission.value = true
+                            }
+                        } else {
+                            pushNotificationManager.addPushDeviceUsingStoredToken()
                         }
-                    } else {
-                        pushNotificationManager.addPushDeviceUsingStoredToken()
                     }
+                    inventoryRepository.retrieveInAppRewards()
+                    contentRepository.retrieveContent()
                 }
-                inventoryRepository.retrieveInAppRewards()
-                contentRepository.retrieveContent()
-            }
-            viewModelScope.launchCatching {
-                userRepository.retrieveTeamPlans()
-            }
-        }
-    }
-
-    fun updateAllowPushNotifications(allowPushNotifications: Boolean) {
-        sharedPreferences.getBoolean("usePushNotifications", true)
-        sharedPreferences.edit {
-            putBoolean("usePushNotifications", allowPushNotifications)
-        }
-    }
-
-    override fun onTutorialCompleted(step: TutorialStep) {
-        updateUser("flags.tutorial." + step.tutorialGroup + "." + step.identifier, true)
-        logTutorialStatus(step, true)
-    }
-
-    override fun onTutorialDeferred(step: TutorialStep) {
-        taskRepository.modify(step) { it.displayedOn = Date() }
-    }
-
-    fun logTutorialStatus(step: TutorialStep, complete: Boolean) {
-        val additionalData = HashMap<String, Any>()
-        additionalData["eventLabel"] = step.identifier + "-android"
-        additionalData["eventValue"] = step.identifier ?: ""
-        additionalData["complete"] = complete
-        Analytics.sendEvent(
-            "tutorial",
-            EventCategory.BEHAVIOUR,
-            HitType.EVENT,
-            additionalData
-        )
-    }
-
-    fun ifNeedsMaintenance(onResult: ((MaintenanceResponse) -> Unit)) {
-        viewModelScope.launchCatching {
-            val maintenanceResponse = maintenanceService.getMaintenanceStatus()
-            if (maintenanceResponse?.activeMaintenance == null) {
-                return@launchCatching
-            }
-            onResult(maintenanceResponse)
-        }
-    }
-
-    fun getToolbarTitle(
-        id: Int,
-        label: CharSequence?,
-        eggType: String?,
-        onSuccess: ((CharSequence?) -> Unit)
-    ) {
-        if (id == R.id.petDetailRecyclerFragment || id == R.id.mountDetailRecyclerFragment) {
-            viewModelScope.launchCatching {
-                val item = inventoryRepository.getItem("egg", eggType ?: "").firstOrNull()
-                if (item?.isValid() != true) return@launchCatching
-                onSuccess(
-                    if (id == R.id.petDetailRecyclerFragment) {
-                        (item as? Egg)?.text
-                    } else {
-                        (item as? Egg)?.mountText
-                    }
-                )
-            }
-        } else {
-            onSuccess(
-                if (id == R.id.promoInfoFragment) {
-                    ""
-                } else if (label.isNullOrEmpty() && user.value?.isValid == true) {
-                    user.value?.profile?.name
-                } else {
-                    label ?: ""
+                viewModelScope.launchCatching {
+                    userRepository.retrieveTeamPlans()
                 }
+            }
+        }
+
+        fun updateAllowPushNotifications(allowPushNotifications: Boolean) {
+            sharedPreferences.getBoolean("usePushNotifications", true)
+            sharedPreferences.edit {
+                putBoolean("usePushNotifications", allowPushNotifications)
+            }
+        }
+
+        override fun onTutorialCompleted(step: TutorialStep) {
+            updateUser("flags.tutorial." + step.tutorialGroup + "." + step.identifier, true)
+            logTutorialStatus(step, true)
+        }
+
+        override fun onTutorialDeferred(step: TutorialStep) {
+            taskRepository.modify(step) { it.displayedOn = Date() }
+        }
+
+        fun logTutorialStatus(
+            step: TutorialStep,
+            complete: Boolean,
+        ) {
+            val additionalData = HashMap<String, Any>()
+            additionalData["eventLabel"] = step.identifier + "-android"
+            additionalData["eventValue"] = step.identifier ?: ""
+            additionalData["complete"] = complete
+            Analytics.sendEvent(
+                "tutorial",
+                EventCategory.BEHAVIOUR,
+                HitType.EVENT,
+                additionalData,
             )
         }
+
+        fun ifNeedsMaintenance(onResult: ((MaintenanceResponse) -> Unit)) {
+            viewModelScope.launchCatching {
+                val maintenanceResponse = maintenanceService.getMaintenanceStatus()
+                if (maintenanceResponse?.activeMaintenance == null) {
+                    return@launchCatching
+                }
+                onResult(maintenanceResponse)
+            }
+        }
+
+        fun getToolbarTitle(
+            id: Int,
+            label: CharSequence?,
+            eggType: String?,
+            onSuccess: ((CharSequence?) -> Unit),
+        ) {
+            if (id == R.id.petDetailRecyclerFragment || id == R.id.mountDetailRecyclerFragment) {
+                viewModelScope.launchCatching {
+                    val item = inventoryRepository.getItem("egg", eggType ?: "").firstOrNull()
+                    if (item?.isValid() != true) return@launchCatching
+                    onSuccess(
+                        if (id == R.id.petDetailRecyclerFragment) {
+                            (item as? Egg)?.text
+                        } else {
+                            (item as? Egg)?.mountText
+                        },
+                    )
+                }
+            } else {
+                onSuccess(
+                    if (id == R.id.promoInfoFragment) {
+                        ""
+                    } else if (label.isNullOrEmpty() && user.value?.isValid == true) {
+                        user.value?.profile?.name
+                    } else {
+                        label ?: ""
+                    },
+                )
+            }
+        }
     }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/MainUserViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/MainUserViewModel.kt
index c52d11159..6aa5c471a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/MainUserViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/MainUserViewModel.kt
@@ -22,71 +22,86 @@ import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
-class MainUserViewModel @Inject constructor(private val authenticationHandler: AuthenticationHandler, val userRepository: UserRepository, val socialRepository: SocialRepository) {
+class MainUserViewModel
+    @Inject
+    constructor(
+        private val authenticationHandler: AuthenticationHandler,
+        val userRepository: UserRepository,
+        val socialRepository: SocialRepository,
+    ) {
+        val formattedUsername: CharSequence?
+            get() = validatedUser?.formattedUsername
+        val userID: String
+            get() = validatedUser?.id ?: authenticationHandler.currentUserID ?: ""
+        val username: CharSequence
+            get() = validatedUser?.username ?: ""
+        val displayName: CharSequence
+            get() = validatedUser?.profile?.name ?: ""
+        val partyID: String?
+            get() = validatedUser?.party?.id
+        val isUserFainted: Boolean
+            get() = (validatedUser?.stats?.hp ?: 1.0) == 0.0
+        val isUserInParty: Boolean
+            get() = validatedUser?.hasParty == true
+        val mirrorGroupTasks: List<String>
+            get() = validatedUser?.preferences?.tasks?.mirrorGroupTasks ?: emptyList()
 
-    val formattedUsername: CharSequence?
-        get() = validatedUser?.formattedUsername
-    val userID: String
-        get() = validatedUser?.id ?: authenticationHandler.currentUserID ?: ""
-    val username: CharSequence
-        get() = validatedUser?.username ?: ""
-    val displayName: CharSequence
-        get() = validatedUser?.profile?.name ?: ""
-    val partyID: String?
-        get() = validatedUser?.party?.id
-    val isUserFainted: Boolean
-        get() = (validatedUser?.stats?.hp ?: 1.0) == 0.0
-    val isUserInParty: Boolean
-        get() = validatedUser?.hasParty == true
-    val mirrorGroupTasks: List<String>
-        get() = validatedUser?.preferences?.tasks?.mirrorGroupTasks ?: emptyList()
-
-    val user: LiveData<User?> = userRepository.getUser().asLiveData()
-    private val validatedUser: User?
-        get() {
-        val u = this.user.value
-        if (u?.isValid() == true) {
-            return u
-        }
-        return null
-    }
-    var currentTeamPlan = MutableSharedFlow<TeamPlan?>(
-        replay = 1,
-        onBufferOverflow = BufferOverflow.DROP_OLDEST
-    )
-
-    @OptIn(ExperimentalCoroutinesApi::class)
-    var currentTeamPlanGroup = currentTeamPlan
-        .map { it?.id }
-        .distinctUntilChanged { old, new -> old == new }
-        .filterNotNull()
-        .flatMapLatest { socialRepository.getGroup(it) }
-
-    @OptIn(ExperimentalCoroutinesApi::class)
-    var currentTeamPlanMembers: LiveData<List<Member>> = currentTeamPlan
-        .map { it?.id }
-        .distinctUntilChanged { old, new -> old == new }
-        .filterNotNull()
-        .flatMapLatest { socialRepository.getGroupMembers(it) }
-        .distinctUntilChanged { old, new -> old.size == new.size && !old.mapIndexed { index, member -> member.id == new[index].id }.contains(false) }
-        .onEach {
-            if (it.isEmpty()) {
-                currentTeamPlan.lastOrNull()?.let { plan ->
-                    userRepository.retrieveTeamPlan(plan.id)
+        val user: LiveData<User?> = userRepository.getUser().asLiveData()
+        private val validatedUser: User?
+            get() {
+                val u = this.user.value
+                if (u?.isValid == true) {
+                    return u
                 }
+                return null
+            }
+        var currentTeamPlan =
+            MutableSharedFlow<TeamPlan?>(
+                replay = 1,
+                onBufferOverflow = BufferOverflow.DROP_OLDEST,
+            )
+
+        @OptIn(ExperimentalCoroutinesApi::class)
+        var currentTeamPlanGroup =
+            currentTeamPlan
+                .map { it?.id }
+                .distinctUntilChanged { old, new -> old == new }
+                .filterNotNull()
+                .flatMapLatest { socialRepository.getGroup(it) }
+
+        @OptIn(ExperimentalCoroutinesApi::class)
+        var currentTeamPlanMembers: LiveData<List<Member>> =
+            currentTeamPlan
+                .map { it?.id }
+                .distinctUntilChanged { old, new -> old == new }
+                .filterNotNull()
+                .flatMapLatest { socialRepository.getGroupMembers(it) }
+                .distinctUntilChanged { old, new ->
+                    old.size == new.size &&
+                        !old.mapIndexed { index, member -> member.id == new[index].id }
+                            .contains(false)
+                }
+                .onEach {
+                    if (it.isEmpty()) {
+                        currentTeamPlan.lastOrNull()?.let { plan ->
+                            userRepository.retrieveTeamPlan(plan.id)
+                        }
+                    }
+                }
+                .asLiveData()
+
+        fun updateUser(
+            path: String,
+            value: Any,
+        ) {
+            MainScope().launch(ExceptionHandler.coroutine()) {
+                userRepository.updateUser(path, value)
             }
         }
-        .asLiveData()
 
-    fun updateUser(path: String, value: Any) {
-        MainScope().launch(ExceptionHandler.coroutine()) {
-            userRepository.updateUser(path, value)
+        fun updateUser(data: Map<String, Any>) {
+            MainScope().launch(ExceptionHandler.coroutine()) {
+                userRepository.updateUser(data)
+            }
         }
     }
-
-    fun updateUser(data: Map<String, Any>) {
-        MainScope().launch(ExceptionHandler.coroutine()) {
-            userRepository.updateUser(data)
-        }
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/NotificationsViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/NotificationsViewModel.kt
index cd4819bba..3fb25a29b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/NotificationsViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/NotificationsViewModel.kt
@@ -6,11 +6,11 @@ import androidx.lifecycle.viewModelScope
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.data.UserRepository
-import com.habitrpg.common.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.helpers.NotificationsManager
 import com.habitrpg.android.habitica.models.social.UserParty
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.common.habitica.helpers.ExceptionHandler
+import com.habitrpg.common.habitica.helpers.MainNavigationController
 import com.habitrpg.common.habitica.helpers.launchCatching
 import com.habitrpg.common.habitica.models.Notification
 import com.habitrpg.common.habitica.models.notifications.GroupTaskRequiresApprovalData
@@ -32,417 +32,429 @@ import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltViewModel
-open class NotificationsViewModel @Inject constructor(
-    userRepository: UserRepository,
-    userViewModel: MainUserViewModel,
-    val notificationsManager: NotificationsManager,
-    val socialRepository: SocialRepository
-) : BaseViewModel(userRepository, userViewModel) {
+open class NotificationsViewModel
+    @Inject
+    constructor(
+        userRepository: UserRepository,
+        userViewModel: MainUserViewModel,
+        val notificationsManager: NotificationsManager,
+        val socialRepository: SocialRepository,
+    ) : BaseViewModel(userRepository, userViewModel) {
+        private val supportedNotificationTypes =
+            listOf(
+                Notification.Type.NEW_STUFF.type,
+                Notification.Type.NEW_CHAT_MESSAGE.type,
+                Notification.Type.NEW_MYSTERY_ITEMS.type,
+                Notification.Type.GROUP_TASK_NEEDS_WORK.type,
+                Notification.Type.GROUP_TASK_APPROVED.type,
+                Notification.Type.UNALLOCATED_STATS_POINTS.type,
+                Notification.Type.ITEM_RECEIVED.type,
+            )
 
-    private val supportedNotificationTypes = listOf(
-        Notification.Type.NEW_STUFF.type,
-        Notification.Type.NEW_CHAT_MESSAGE.type,
-        Notification.Type.NEW_MYSTERY_ITEMS.type,
-        Notification.Type.GROUP_TASK_NEEDS_WORK.type,
-        Notification.Type.GROUP_TASK_APPROVED.type,
-        Notification.Type.UNALLOCATED_STATS_POINTS.type,
-        Notification.Type.ITEM_RECEIVED.type
-    )
+        private val actionableNotificationTypes =
+            listOf(
+                Notification.Type.GUILD_INVITATION.type,
+                Notification.Type.PARTY_INVITATION.type,
+                Notification.Type.QUEST_INVITATION.type,
+            )
 
-    private val actionableNotificationTypes = listOf(
-        Notification.Type.GUILD_INVITATION.type,
-        Notification.Type.PARTY_INVITATION.type,
-        Notification.Type.QUEST_INVITATION.type
-    )
+        private var party: UserParty? = null
+        private var hasStats = false
 
-    private var party: UserParty? = null
-    private var hasStats = false
+        private val customNotifications = MutableStateFlow<List<Notification>>(emptyList())
 
-    private val customNotifications = MutableStateFlow<List<Notification>>(emptyList())
+        init {
+            userViewModel.user.observeForever {
+                if (it == null) return@observeForever
+                party = it.party
+                hasStats = it.hasClass
+                val notifications = convertInvitationsToNotifications(it)
+                if (it.flags?.newStuff == true) {
+                    val notification = Notification()
+                    notification.id = "custom-new-stuff-notification"
+                    notification.type = Notification.Type.NEW_STUFF.type
+                    val data = NewStuffData()
+                    notification.data = data
+                    notifications.add(notification)
+                }
+                customNotifications.value = notifications
+            }
+        }
 
-    init {
-        userViewModel.user.observeForever {
-            if (it == null) return@observeForever
-            party = it.party
-            hasStats = it.hasClass
-            val notifications = convertInvitationsToNotifications(it)
-            if (it.flags?.newStuff == true) {
+        fun getNotifications(): Flow<List<Notification>> {
+            val serverNotifications =
+                notificationsManager.getNotifications().map { filterSupportedTypes(it) }
+
+            return serverNotifications.combine(customNotifications) { serverNotificationsList, customNotificationsList ->
+                if (serverNotificationsList.firstOrNull { notification -> notification.type == Notification.Type.NEW_STUFF.type } != null) {
+                    return@combine serverNotificationsList + customNotificationsList.filter { notification -> notification.type != Notification.Type.NEW_STUFF.type }
+                }
+                return@combine serverNotificationsList + customNotificationsList
+            }.map { it.sortedBy { notification -> notification.priority } }
+        }
+
+        fun getNotificationCount(): Flow<Int> {
+            return getNotifications().map {
+                it.count { notification ->
+                    (notification.type != Notification.Type.UNALLOCATED_STATS_POINTS.type) || hasStats
+                }
+            }.distinctUntilChanged()
+        }
+
+        fun allNotificationsSeen(): Flow<Boolean> {
+            return getNotifications().map { it.all { notification -> notification.seen == true } }
+                .distinctUntilChanged()
+        }
+
+        fun getHasPartyNotification(): Flow<Boolean> {
+            return getNotifications().map {
+                it.find { notification ->
+                    val data = notification.data as? NewChatMessageData
+                    isPartyMessage(data)
+                } != null
+            }.distinctUntilChanged()
+        }
+
+        suspend fun refreshNotifications(): User? {
+            return userRepository.retrieveUser(withTasks = false, forced = true)
+        }
+
+        private fun filterSupportedTypes(notifications: List<Notification>): List<Notification> {
+            return notifications.filter { supportedNotificationTypes.contains(it.type) }
+        }
+
+        private fun convertInvitationsToNotifications(user: User): MutableList<Notification> {
+            val notifications = mutableListOf<Notification>()
+
+            notifications.addAll(
+                user.invitations?.parties?.map {
+                    val notification = Notification()
+                    notification.id = "custom-party-invitation-" + it.id
+                    notification.type = Notification.Type.PARTY_INVITATION.type
+                    val data = PartyInvitationData()
+                    data.invitation = PartyInvite()
+                    data.invitation?.id = it.id
+                    data.invitation?.name = it.name
+                    data.invitation?.inviter = it.inviter
+                    notification.data = data
+                    notification
+                } ?: emptyList(),
+            )
+
+            notifications.addAll(
+                user.invitations?.guilds?.map {
+                    val notification = Notification()
+                    notification.id = "custom-guild-invitation-" + it.id
+                    notification.type = Notification.Type.GUILD_INVITATION.type
+                    val data = GuildInvitationData()
+                    data.invitation = GuildInvite()
+                    data.invitation?.id = it.id
+                    data.invitation?.name = it.name
+                    data.invitation?.inviter = it.inviter
+                    data.invitation?.publicGuild = it.publicGuild
+                    notification.data = data
+                    notification
+                } ?: emptyList(),
+            )
+
+            val quest = user.party?.quest
+            if (quest != null && quest.RSVPNeeded) {
                 val notification = Notification()
-                notification.id = "custom-new-stuff-notification"
-                notification.type = Notification.Type.NEW_STUFF.type
-                val data = NewStuffData()
+                notification.id = "custom-quest-invitation-" + user.party?.id
+                notification.type = Notification.Type.QUEST_INVITATION.type
+                val data = QuestInvitationData()
+                data.questKey = quest.key
                 notification.data = data
+
                 notifications.add(notification)
             }
-            customNotifications.value = notifications
+
+            return notifications
         }
-    }
 
-    fun getNotifications(): Flow<List<Notification>> {
-        val serverNotifications =
-            notificationsManager.getNotifications().map { filterSupportedTypes(it) }
-
-        return serverNotifications.combine(customNotifications) { serverNotificationsList, customNotificationsList ->
-            if (serverNotificationsList.firstOrNull { notification -> notification.type == Notification.Type.NEW_STUFF.type } != null) {
-                return@combine serverNotificationsList + customNotificationsList.filter { notification -> notification.type != Notification.Type.NEW_STUFF.type }
+        fun isPartyMessage(data: NewChatMessageData?): Boolean {
+            if (party?.isValid != true || data?.group?.id == null) {
+                return false
             }
-            return@combine serverNotificationsList + customNotificationsList
-        }.map { it.sortedBy { notification -> notification.priority } }
-    }
 
-    fun getNotificationCount(): Flow<Int> {
-        return getNotifications().map {
-            it.count { notification ->
-                (notification.type != Notification.Type.UNALLOCATED_STATS_POINTS.type) || hasStats
+            return party?.id == data.group?.id
+        }
+
+        /**
+         * Is the given notification an "artificial" custom notification (created by this class)
+         * instead of one of the ones coming from server.
+         */
+        private fun isCustomNotification(notification: Notification): Boolean {
+            return notification.id.startsWith("custom-")
+        }
+
+        private fun isCustomNewStuffNotification(notification: Notification) =
+            notification.id == "custom-new-stuff-notification"
+
+        fun dismissNotification(notification: Notification) {
+            if (isCustomNotification(notification)) {
+                if (isCustomNewStuffNotification(notification)) {
+                    updateUser("flags.newStuff", false)
+                    customNotifications.value =
+                        customNotifications.value.filterNot { it.id == notification.id }
+                }
+                return
             }
-        }.distinctUntilChanged()
-    }
 
-    fun allNotificationsSeen(): Flow<Boolean> {
-        return getNotifications().map { it.all { notification -> notification.seen == true } }
-            .distinctUntilChanged()
-    }
-
-    fun getHasPartyNotification(): Flow<Boolean> {
-        return getNotifications().map {
-            it.find { notification ->
-                val data = notification.data as? NewChatMessageData
-                isPartyMessage(data)
-            } != null
-        }.distinctUntilChanged()
-    }
-
-    suspend fun refreshNotifications(): User? {
-        return userRepository.retrieveUser(withTasks = false, forced = true)
-    }
-
-    private fun filterSupportedTypes(notifications: List<Notification>): List<Notification> {
-        return notifications.filter { supportedNotificationTypes.contains(it.type) }
-    }
-
-    private fun convertInvitationsToNotifications(user: User): MutableList<Notification> {
-        val notifications = mutableListOf<Notification>()
-
-        notifications.addAll(
-            user.invitations?.parties?.map {
-                val notification = Notification()
-                notification.id = "custom-party-invitation-" + it.id
-                notification.type = Notification.Type.PARTY_INVITATION.type
-                val data = PartyInvitationData()
-                data.invitation = PartyInvite()
-                data.invitation?.id = it.id
-                data.invitation?.name = it.name
-                data.invitation?.inviter = it.inviter
-                notification.data = data
-                notification
-            } ?: emptyList()
-        )
-
-        notifications.addAll(
-            user.invitations?.guilds?.map {
-                val notification = Notification()
-                notification.id = "custom-guild-invitation-" + it.id
-                notification.type = Notification.Type.GUILD_INVITATION.type
-                val data = GuildInvitationData()
-                data.invitation = GuildInvite()
-                data.invitation?.id = it.id
-                data.invitation?.name = it.name
-                data.invitation?.inviter = it.inviter
-                data.invitation?.publicGuild = it.publicGuild
-                notification.data = data
-                notification
-            } ?: emptyList()
-        )
-
-        val quest = user.party?.quest
-        if (quest != null && quest.RSVPNeeded) {
-            val notification = Notification()
-            notification.id = "custom-quest-invitation-" + user.party?.id
-            notification.type = Notification.Type.QUEST_INVITATION.type
-            val data = QuestInvitationData()
-            data.questKey = quest.key
-            notification.data = data
-
-            notifications.add(notification)
-        }
-
-        return notifications
-    }
-
-    fun isPartyMessage(data: NewChatMessageData?): Boolean {
-        if (party?.isValid != true || data?.group?.id == null) {
-            return false
-        }
-
-        return party?.id == data.group?.id
-    }
-
-    /**
-     * Is the given notification an "artificial" custom notification (created by this class)
-     * instead of one of the ones coming from server.
-     */
-    private fun isCustomNotification(notification: Notification): Boolean {
-        return notification.id.startsWith("custom-")
-    }
-
-    private fun isCustomNewStuffNotification(notification: Notification) =
-        notification.id == "custom-new-stuff-notification"
-
-    fun dismissNotification(notification: Notification) {
-        if (isCustomNotification(notification)) {
-            if (isCustomNewStuffNotification(notification)) {
-                updateUser("flags.newStuff", false)
-                customNotifications.value =
-                    customNotifications.value.filterNot { it.id == notification.id }
+            viewModelScope.launchCatching {
+                userRepository.readNotification(notification.id)
             }
-            return
         }
 
-        viewModelScope.launchCatching {
-            userRepository.readNotification(notification.id)
-        }
-    }
+        fun dismissAllNotifications(notifications: List<Notification>) {
+            val dismissableIds =
+                notifications.filter { !isCustomNotification(it) }
+                    .filter { !actionableNotificationTypes.contains(it.type) }.map { it.id }
 
-    fun dismissAllNotifications(notifications: List<Notification>) {
-        val dismissableIds = notifications.filter { !isCustomNotification(it) }
-            .filter { !actionableNotificationTypes.contains(it.type) }.map { it.id }
+            val customNewStuffNotification =
+                notifications.firstOrNull { isCustomNewStuffNotification(it) }
 
-        val customNewStuffNotification =
-            notifications.firstOrNull { isCustomNewStuffNotification(it) }
+            if (customNewStuffNotification != null) {
+                dismissNotification(customNewStuffNotification)
+            }
 
-        if (customNewStuffNotification != null) {
-            dismissNotification(customNewStuffNotification)
+            if (dismissableIds.isEmpty()) {
+                return
+            }
+
+            val notificationIds = HashMap<String, List<String>>()
+            notificationIds["notificationIds"] = dismissableIds
+
+            viewModelScope.launchCatching {
+                userRepository.readNotifications(notificationIds)
+            }
         }
 
-        if (dismissableIds.isEmpty()) {
-            return
+        fun markNotificationsAsSeen(notifications: List<Notification>) {
+            val unseenIds =
+                notifications.filter { !isCustomNotification(it) }.filter { it.seen == false }
+                    .map { it.id }
+
+            if (unseenIds.isEmpty()) {
+                return
+            }
+
+            val notificationIds = HashMap<String, List<String>>()
+            notificationIds["notificationIds"] = unseenIds
+
+            viewModelScope.launchCatching {
+                userRepository.seeNotifications(notificationIds)
+            }
         }
 
-        val notificationIds = HashMap<String, List<String>>()
-        notificationIds["notificationIds"] = dismissableIds
-
-        viewModelScope.launchCatching {
-            userRepository.readNotifications(notificationIds)
-        }
-    }
-
-    fun markNotificationsAsSeen(notifications: List<Notification>) {
-        val unseenIds =
-            notifications.filter { !isCustomNotification(it) }.filter { it.seen == false }
-                .map { it.id }
-
-        if (unseenIds.isEmpty()) {
-            return
+        private fun findNotification(id: String): Notification? {
+            return notificationsManager.getNotification(id)
+                ?: customNotifications.value.find { it.id == id }
         }
 
-        val notificationIds = HashMap<String, List<String>>()
-        notificationIds["notificationIds"] = unseenIds
+        fun click(
+            notificationId: String,
+            navController: MainNavigationController,
+        ) {
+            val notification = findNotification(notificationId) ?: return
 
-        viewModelScope.launchCatching {
-            userRepository.seeNotifications(notificationIds)
+            dismissNotification(notification)
+
+            when (notification.type) {
+                Notification.Type.NEW_STUFF.type -> navController.navigate(R.id.newsFragment)
+                Notification.Type.NEW_CHAT_MESSAGE.type ->
+                    clickNewChatMessage(
+                        notification,
+                        navController,
+                    )
+
+                Notification.Type.GUILD_INVITATION.type ->
+                    clickGroupInvitation(
+                        notification,
+                        navController,
+                    )
+
+                Notification.Type.PARTY_INVITATION.type ->
+                    clickGroupInvitation(
+                        notification,
+                        navController,
+                    )
+
+                Notification.Type.QUEST_INVITATION.type -> navController.navigate(R.id.partyFragment)
+                Notification.Type.NEW_MYSTERY_ITEMS.type ->
+                    navController.navigate(
+                        R.id.itemsFragment,
+                        bundleOf(Pair("itemType", "special")),
+                    )
+
+                Notification.Type.UNALLOCATED_STATS_POINTS.type -> navController.navigate(R.id.statsFragment)
+                // Group tasks should go to Group tasks view if that is added to this app at some point
+                Notification.Type.GROUP_TASK_APPROVED.type -> navController.navigate(R.id.tasksFragment)
+                Notification.Type.GROUP_TASK_NEEDS_WORK.type -> navController.navigate(R.id.tasksFragment)
+                Notification.Type.ITEM_RECEIVED.type ->
+                    clickItemReceivedNotification(
+                        notification,
+                        navController,
+                    )
+            }
         }
-    }
 
-    private fun findNotification(id: String): Notification? {
-        return notificationsManager.getNotification(id)
-            ?: customNotifications.value.find { it.id == id }
-    }
-
-    fun click(notificationId: String, navController: MainNavigationController) {
-        val notification = findNotification(notificationId) ?: return
-
-        dismissNotification(notification)
-
-        when (notification.type) {
-            Notification.Type.NEW_STUFF.type -> navController.navigate(R.id.newsFragment)
-            Notification.Type.NEW_CHAT_MESSAGE.type -> clickNewChatMessage(
-                notification,
-                navController
-            )
-
-            Notification.Type.GUILD_INVITATION.type -> clickGroupInvitation(
-                notification,
-                navController
-            )
-
-            Notification.Type.PARTY_INVITATION.type -> clickGroupInvitation(
-                notification,
-                navController
-            )
-
-            Notification.Type.QUEST_INVITATION.type -> navController.navigate(R.id.partyFragment)
-            Notification.Type.NEW_MYSTERY_ITEMS.type -> navController.navigate(
-                R.id.itemsFragment,
-                bundleOf(Pair("itemType", "special"))
-            )
-
-            Notification.Type.UNALLOCATED_STATS_POINTS.type -> navController.navigate(R.id.statsFragment)
-            // Group tasks should go to Group tasks view if that is added to this app at some point
-            Notification.Type.GROUP_TASK_APPROVED.type -> navController.navigate(R.id.tasksFragment)
-            Notification.Type.GROUP_TASK_NEEDS_WORK.type -> navController.navigate(R.id.tasksFragment)
-            Notification.Type.ITEM_RECEIVED.type -> clickItemReceivedNotification(
-                notification,
-                navController
-            )
+        private fun clickItemReceivedNotification(
+            notification: Notification,
+            navController: MainNavigationController,
+        ) {
+            val data = notification.data as? ItemReceivedData
+            if (data?.destination?.startsWith("/") == true) {
+                MainNavigationController.navigate(data.destination ?: "")
+                return
+            }
+            when (data?.destination) {
+                "equipment" -> navController.navigate(R.id.equipmentOverviewFragment)
+                "customization" -> navController.navigate(R.id.avatarCustomizationFragment)
+                "stable" -> navController.navigate(R.id.stableFragment)
+                "pets" -> navController.navigate(R.id.stableFragment)
+                "mounts" -> navController.navigate(R.id.stableFragment)
+                else -> navController.navigate(R.id.itemsFragment)
+            }
         }
-    }
 
-    private fun clickItemReceivedNotification(
-        notification: Notification,
-        navController: MainNavigationController
-    ) {
-        val data = notification.data as? ItemReceivedData
-        if (data?.destination?.startsWith("/") == true) {
-            MainNavigationController.navigate(data.destination ?: "")
-            return
-        }
-        when (data?.destination) {
-            "equipment" -> navController.navigate(R.id.equipmentOverviewFragment)
-            "customization" -> navController.navigate(R.id.avatarCustomizationFragment)
-            "stable" -> navController.navigate(R.id.stableFragment)
-            "pets" -> navController.navigate(R.id.stableFragment)
-            "mounts" -> navController.navigate(R.id.stableFragment)
-            else -> navController.navigate(R.id.itemsFragment)
-        }
-    }
-
-    private fun clickNewChatMessage(
-        notification: Notification,
-        navController: MainNavigationController
-    ) {
-        val data = notification.data as? NewChatMessageData
-        if (isPartyMessage(data)) {
-            val bundle = Bundle()
-            bundle.putString("groupID", data?.group?.id)
-            bundle.putInt("tabToOpen", 1)
-            navController.navigate(R.id.partyFragment, bundle)
-        } else {
-            val bundle = Bundle()
-            bundle.putString("groupID", data?.group?.id)
-            bundle.putBoolean(
-                "isMember",
-                true
-            ) // safe to assume user is member since they got the notification
-            bundle.putInt("tabToOpen", 1)
-            navController.navigate(R.id.guildFragment, bundle)
-        }
-    }
-
-    private fun clickGroupInvitation(
-        notification: Notification,
-        navController: MainNavigationController
-    ) {
-        when (notification.type) {
-            Notification.Type.GUILD_INVITATION.type -> {
+        private fun clickNewChatMessage(
+            notification: Notification,
+            navController: MainNavigationController,
+        ) {
+            val data = notification.data as? NewChatMessageData
+            if (isPartyMessage(data)) {
                 val bundle = Bundle()
-                val data = notification.data as? GuildInvitationData
-                bundle.putString("groupID", data?.invitation?.id)
+                bundle.putString("groupID", data?.group?.id)
+                bundle.putInt("tabToOpen", 1)
+                navController.navigate(R.id.partyFragment, bundle)
+            } else {
+                val bundle = Bundle()
+                bundle.putString("groupID", data?.group?.id)
                 bundle.putBoolean(
                     "isMember",
-                    true
+                    true,
                 ) // safe to assume user is member since they got the notification
+                bundle.putInt("tabToOpen", 1)
                 navController.navigate(R.id.guildFragment, bundle)
             }
+        }
 
-            Notification.Type.PARTY_INVITATION.type -> {
-                navController.navigate(R.id.partyFragment)
+        private fun clickGroupInvitation(
+            notification: Notification,
+            navController: MainNavigationController,
+        ) {
+            when (notification.type) {
+                Notification.Type.GUILD_INVITATION.type -> {
+                    val bundle = Bundle()
+                    val data = notification.data as? GuildInvitationData
+                    bundle.putString("groupID", data?.invitation?.id)
+                    bundle.putBoolean(
+                        "isMember",
+                        true,
+                    ) // safe to assume user is member since they got the notification
+                    navController.navigate(R.id.guildFragment, bundle)
+                }
+
+                Notification.Type.PARTY_INVITATION.type -> {
+                    navController.navigate(R.id.partyFragment)
+                }
             }
         }
-    }
 
-    fun accept(notificationId: String) {
-        val notification = findNotification(notificationId) ?: return
-        when (notification.type) {
-            Notification.Type.GUILD_INVITATION.type -> {
-                val data = notification.data as? GuildInvitationData
-                acceptGroupInvitation(data?.invitation?.id)
+        fun accept(notificationId: String) {
+            val notification = findNotification(notificationId) ?: return
+            when (notification.type) {
+                Notification.Type.GUILD_INVITATION.type -> {
+                    val data = notification.data as? GuildInvitationData
+                    acceptGroupInvitation(data?.invitation?.id)
+                }
+
+                Notification.Type.PARTY_INVITATION.type -> {
+                    val data = notification.data as? PartyInvitationData
+                    acceptGroupInvitation(data?.invitation?.id)
+                }
+
+                Notification.Type.QUEST_INVITATION.type -> acceptQuestInvitation()
+                Notification.Type.GROUP_TASK_REQUIRES_APPROVAL.type -> acceptTaskApproval(notification)
             }
-
-            Notification.Type.PARTY_INVITATION.type -> {
-                val data = notification.data as? PartyInvitationData
-                acceptGroupInvitation(data?.invitation?.id)
+            if (isCustomNotification(notification)) {
+                viewModelScope.launch(ExceptionHandler.coroutine()) {
+                    userRepository.retrieveUser()
+                }
+            } else {
+                dismissNotification(notification)
             }
-
-            Notification.Type.QUEST_INVITATION.type -> acceptQuestInvitation()
-            Notification.Type.GROUP_TASK_REQUIRES_APPROVAL.type -> acceptTaskApproval(notification)
         }
-        if (isCustomNotification(notification)) {
+
+        fun reject(notificationId: String) {
+            val notification = findNotification(notificationId) ?: return
+            when (notification.type) {
+                Notification.Type.GUILD_INVITATION.type -> {
+                    val data = notification.data as? GuildInvitationData
+                    rejectGroupInvite(data?.invitation?.id)
+                }
+
+                Notification.Type.PARTY_INVITATION.type -> {
+                    val data = notification.data as? PartyInvitationData
+                    rejectGroupInvite(data?.invitation?.id)
+                }
+
+                Notification.Type.QUEST_INVITATION.type -> rejectQuestInvitation()
+                Notification.Type.GROUP_TASK_REQUIRES_APPROVAL.type -> rejectTaskApproval(notification)
+            }
+            if (!isCustomNotification(notification)) {
+                dismissNotification(notification)
+            }
+        }
+
+        private fun acceptGroupInvitation(groupId: String?) {
+            groupId?.let {
+                viewModelScope.launch(ExceptionHandler.coroutine()) {
+                    socialRepository.joinGroup(it)
+                    refreshUser()
+                }
+            }
+        }
+
+        fun rejectGroupInvite(groupId: String?) {
+            groupId?.let {
+                viewModelScope.launchCatching {
+                    socialRepository.rejectGroupInvite(it)
+                    refreshUser()
+                }
+            }
+        }
+
+        private fun acceptQuestInvitation() {
+            party?.id?.let {
+                viewModelScope.launchCatching {
+                    socialRepository.acceptQuest(null, it)
+                    refreshUser()
+                }
+            }
+        }
+
+        private fun rejectQuestInvitation() {
+            party?.id?.let {
+                viewModelScope.launchCatching {
+                    socialRepository.rejectQuest(null, it)
+                    refreshUser()
+                }
+            }
+        }
+
+        private fun refreshUser() {
             viewModelScope.launch(ExceptionHandler.coroutine()) {
-                userRepository.retrieveUser()
-            }
-        } else {
-            dismissNotification(notification)
-        }
-    }
-
-    fun reject(notificationId: String) {
-        val notification = findNotification(notificationId) ?: return
-        when (notification.type) {
-            Notification.Type.GUILD_INVITATION.type -> {
-                val data = notification.data as? GuildInvitationData
-                rejectGroupInvite(data?.invitation?.id)
-            }
-
-            Notification.Type.PARTY_INVITATION.type -> {
-                val data = notification.data as? PartyInvitationData
-                rejectGroupInvite(data?.invitation?.id)
-            }
-
-            Notification.Type.QUEST_INVITATION.type -> rejectQuestInvitation()
-            Notification.Type.GROUP_TASK_REQUIRES_APPROVAL.type -> rejectTaskApproval(notification)
-        }
-        if (!isCustomNotification(notification)) {
-            dismissNotification(notification)
-        }
-    }
-
-    private fun acceptGroupInvitation(groupId: String?) {
-        groupId?.let {
-            viewModelScope.launch(ExceptionHandler.coroutine()) {
-                socialRepository.joinGroup(it)
-                refreshUser()
+                refreshNotifications()
             }
         }
-    }
 
-    fun rejectGroupInvite(groupId: String?) {
-        groupId?.let {
-            viewModelScope.launchCatching {
-                socialRepository.rejectGroupInvite(it)
-                refreshUser()
-            }
+        private fun acceptTaskApproval(notification: Notification) {
+            notification.data as? GroupTaskRequiresApprovalData
+        }
+
+        private fun rejectTaskApproval(notification: Notification) {
+            notification.data as? GroupTaskRequiresApprovalData
         }
     }
-
-    private fun acceptQuestInvitation() {
-        party?.id?.let {
-            viewModelScope.launchCatching {
-                socialRepository.acceptQuest(null, it)
-                refreshUser()
-            }
-        }
-    }
-
-    private fun rejectQuestInvitation() {
-        party?.id?.let {
-            viewModelScope.launchCatching {
-                socialRepository.rejectQuest(null, it)
-                refreshUser()
-            }
-        }
-    }
-
-    private fun refreshUser() {
-        viewModelScope.launch(ExceptionHandler.coroutine()) {
-            refreshNotifications()
-        }
-    }
-
-    private fun acceptTaskApproval(notification: Notification) {
-        notification.data as? GroupTaskRequiresApprovalData
-    }
-
-    private fun rejectTaskApproval(notification: Notification) {
-        notification.data as? GroupTaskRequiresApprovalData
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/PartyViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/PartyViewModel.kt
index fab74230d..57a5a6039 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/PartyViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/PartyViewModel.kt
@@ -18,69 +18,78 @@ import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltViewModel
-class PartyViewModel @Inject constructor(
-    userRepository: UserRepository,
-    userViewModel: MainUserViewModel,
-    challengeRepository: ChallengeRepository,
-    socialRepository: SocialRepository,
-    notificationsManager: NotificationsManager
-) : GroupViewModel(userRepository, userViewModel, challengeRepository, socialRepository, notificationsManager) {
+class PartyViewModel
+    @Inject
+    constructor(
+        userRepository: UserRepository,
+        userViewModel: MainUserViewModel,
+        challengeRepository: ChallengeRepository,
+        socialRepository: SocialRepository,
+        notificationsManager: NotificationsManager,
+    ) : GroupViewModel(
+            userRepository,
+            userViewModel,
+            challengeRepository,
+            socialRepository,
+            notificationsManager,
+        ) {
+        internal val isQuestActive: Boolean
+            get() = getGroupData().value?.quest?.active == true
 
-    internal val isQuestActive: Boolean
-        get() = getGroupData().value?.quest?.active == true
+        internal val isUserOnQuest: Boolean
+            get() =
+                !(
+                    getGroupData().value?.quest?.members?.none { it.key == user.value?.id }
+                        ?: true
+                )
 
-    internal val isUserOnQuest: Boolean
-        get() = !(
-            getGroupData().value?.quest?.members?.none { it.key == user.value?.id }
-                ?: true
-            )
-
-    @OptIn(ExperimentalCoroutinesApi::class)
-    private val membersFlow = groupIDFlow
-        .filterNotNull()
-        .flatMapLatest { socialRepository.getPartyMembers(it) }
-    private val members = membersFlow.asLiveData()
-
-    init {
-        groupViewType = GroupViewType.PARTY
-    }
-
-    fun getMembersData() = members
-
-    fun acceptQuest() {
-        groupID?.let { groupID ->
-            viewModelScope.launchCatching {
-                socialRepository.acceptQuest(null, groupID)
-                socialRepository.retrieveGroup(groupID)
-                userRepository.retrieveUser()
-            }
-        }
-    }
-
-    fun rejectQuest() {
-        groupID?.let { groupID ->
-            viewModelScope.launchCatching {
-                socialRepository.rejectQuest(null, groupID)
-                socialRepository.retrieveGroup(groupID)
-                userRepository.retrieveUser()
-            }
-        }
-    }
-
-    fun showParticipantButtons(): Boolean {
-        val user = user.value
-        return !(user?.party == null || user.party?.quest == null) && !isQuestActive && user.party?.quest?.RSVPNeeded == true
-    }
-
-    fun loadPartyID() {
-        viewModelScope.launch(ExceptionHandler.coroutine()) {
-            userRepository.getUser()
-                .map { it?.party?.id }
-                .distinctUntilChanged()
+        @OptIn(ExperimentalCoroutinesApi::class)
+        private val membersFlow =
+            groupIDFlow
                 .filterNotNull()
-                .collect {
-                    setGroupID(it)
+                .flatMapLatest { socialRepository.getPartyMembers(it) }
+        private val members = membersFlow.asLiveData()
+
+        init {
+            groupViewType = GroupViewType.PARTY
+        }
+
+        fun getMembersData() = members
+
+        fun acceptQuest() {
+            groupID?.let { groupID ->
+                viewModelScope.launchCatching {
+                    socialRepository.acceptQuest(null, groupID)
+                    socialRepository.retrieveGroup(groupID)
+                    userRepository.retrieveUser()
                 }
+            }
+        }
+
+        fun rejectQuest() {
+            groupID?.let { groupID ->
+                viewModelScope.launchCatching {
+                    socialRepository.rejectQuest(null, groupID)
+                    socialRepository.retrieveGroup(groupID)
+                    userRepository.retrieveUser()
+                }
+            }
+        }
+
+        fun showParticipantButtons(): Boolean {
+            val user = user.value
+            return !(user?.party == null || user.party?.quest == null) && !isQuestActive && user.party?.quest?.RSVPNeeded == true
+        }
+
+        fun loadPartyID() {
+            viewModelScope.launch(ExceptionHandler.coroutine()) {
+                userRepository.getUser()
+                    .map { it?.party?.id }
+                    .distinctUntilChanged()
+                    .filterNotNull()
+                    .collect {
+                        setGroupID(it)
+                    }
+            }
         }
     }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/StableViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/StableViewModel.kt
index 25d41ac84..615380a63 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/StableViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/StableViewModel.kt
@@ -23,130 +23,145 @@ import kotlinx.coroutines.flow.map
 import javax.inject.Inject
 
 @HiltViewModel
-class StableViewModel @Inject constructor(
-    savedStateHandle: SavedStateHandle,
-    userRepository: UserRepository,
-    userViewModel: MainUserViewModel,
-    val inventoryRepository: InventoryRepository
-) : BaseViewModel(userRepository, userViewModel) {
+class StableViewModel
+    @Inject
+    constructor(
+        savedStateHandle: SavedStateHandle,
+        userRepository: UserRepository,
+        userViewModel: MainUserViewModel,
+        val inventoryRepository: InventoryRepository,
+    ) : BaseViewModel(userRepository, userViewModel) {
+        internal val itemType: String? = savedStateHandle[StableRecyclerFragment.ITEM_TYPE_KEY]
 
-    internal val itemType: String? = savedStateHandle[StableRecyclerFragment.ITEM_TYPE_KEY]
-
-    private val _items: MutableLiveData<List<Any>> = MutableLiveData()
-    val items: LiveData<List<Any>> = _items
-    val eggs: LiveData<Map<String, Egg>> = inventoryRepository.getItems(Egg::class.java)
-        .map {
-            val eggMap = mutableMapOf<String, Egg>()
-            it.forEach { egg ->
-                eggMap[egg.key] = egg as Egg
-            }
-            eggMap
-        }
-        .asLiveData()
-    val ownedItems: LiveData<Map<String, OwnedItem>> = inventoryRepository.getOwnedItems(true).asLiveData()
-    val mounts: LiveData<List<Mount>> = inventoryRepository.getMounts().asLiveData()
-    private val _ownedPets: MutableLiveData<Map<String, OwnedPet>> = MutableLiveData()
-    val ownedPets: LiveData<Map<String, OwnedPet>> = _ownedPets
-    private val _ownedMounts: MutableLiveData<Map<String, OwnedMount>> = MutableLiveData()
-    val ownedMounts: LiveData<Map<String, OwnedMount>> = _ownedMounts
-
-    init {
-        loadItems()
-    }
-
-    private fun loadItems() {
-        viewModelScope.launchCatching {
-            val animals = if ("pets" == itemType) {
-                inventoryRepository.getPets().firstOrNull()
-            } else {
-                inventoryRepository.getMounts().firstOrNull()
-            } ?: emptyList()
-            if ("pets" == itemType) {
-                inventoryRepository.getOwnedPets()
-            } else {
-                inventoryRepository.getOwnedMounts()
-            }.map {
-                val animalMap = mutableMapOf<String, OwnedObject>()
-                it.forEach { animal ->
-                    val castedAnimal = animal as? OwnedObject ?: return@forEach
-                    animalMap[castedAnimal.key ?: ""] = castedAnimal
+        private val _items: MutableLiveData<List<Any>> = MutableLiveData()
+        val items: LiveData<List<Any>> = _items
+        val eggs: LiveData<Map<String, Egg>> =
+            inventoryRepository.getItems(Egg::class.java)
+                .map {
+                    val eggMap = mutableMapOf<String, Egg>()
+                    it.forEach { egg ->
+                        eggMap[egg.key] = egg as Egg
+                    }
+                    eggMap
+                }
+                .asLiveData()
+        val ownedItems: LiveData<Map<String, OwnedItem>> =
+            inventoryRepository.getOwnedItems(true).asLiveData()
+        val mounts: LiveData<List<Mount>> = inventoryRepository.getMounts().asLiveData()
+        private val _ownedPets: MutableLiveData<Map<String, OwnedPet>> = MutableLiveData()
+        val ownedPets: LiveData<Map<String, OwnedPet>> = _ownedPets
+        private val _ownedMounts: MutableLiveData<Map<String, OwnedMount>> = MutableLiveData()
+        val ownedMounts: LiveData<Map<String, OwnedMount>> = _ownedMounts
+
+        init {
+            loadItems()
+        }
+
+        private fun loadItems() {
+            viewModelScope.launchCatching {
+                val animals =
+                    if ("pets" == itemType) {
+                        inventoryRepository.getPets().firstOrNull()
+                    } else {
+                        inventoryRepository.getMounts().firstOrNull()
+                    } ?: emptyList()
+                if ("pets" == itemType) {
+                    inventoryRepository.getOwnedPets()
+                } else {
+                    inventoryRepository.getOwnedMounts()
+                }.map {
+                    val animalMap = mutableMapOf<String, OwnedObject>()
+                    it.forEach { animal ->
+                        val castedAnimal = animal as? OwnedObject ?: return@forEach
+                        animalMap[castedAnimal.key ?: ""] = castedAnimal
+                    }
+                    animalMap
+                }.collect {
+                    _items.value = mapAnimals(animals, it)
+                }
+            }
+            viewModelScope.launchCatching {
+                inventoryRepository.getOwnedPets().map { ownedPets ->
+                    val petMap = mutableMapOf<String, OwnedPet>()
+                    ownedPets.forEach { petMap[it.key ?: ""] = it }
+                    return@map petMap
+                }.collect {
+                    _ownedPets.value = it
+                }
+            }
+            viewModelScope.launchCatching {
+                inventoryRepository.getOwnedMounts().map { ownedMounts ->
+                    val mountMap = mutableMapOf<String, OwnedMount>()
+                    ownedMounts.forEach { mountMap[it.key ?: ""] = it }
+                    return@map mountMap
+                }.collect {
+                    _ownedMounts.value = it
                 }
-                animalMap
-            }.collect {
-                _items.value = mapAnimals(animals, it)
             }
         }
-        viewModelScope.launchCatching {
-            inventoryRepository.getOwnedPets().map { ownedPets ->
-                val petMap = mutableMapOf<String, OwnedPet>()
-                ownedPets.forEach { petMap[it.key ?: ""] = it }
-                return@map petMap
-            }.collect {
-                _ownedPets.value = it
+
+        private fun mapAnimals(
+            unsortedAnimals: List<Animal>,
+            ownedAnimals: Map<String, OwnedObject>,
+        ): ArrayList<Any> {
+            val items = ArrayList<Any>()
+            var lastAnimal: Animal = unsortedAnimals.firstOrNull() ?: return items
+            var lastSection: StableSection? = null
+            for (animal in unsortedAnimals) {
+                val identifier =
+                    if (animal.animal.isNotEmpty() && (animal.type != "special" && animal.type != "wacky")) animal.animal else animal.key
+                val lastIdentifier = lastAnimal.animal.ifEmpty { lastAnimal.key }
+                if (animal.type == "premium") {
+                    if (!items.contains(lastAnimal)) {
+                        items.add(lastAnimal)
+                    }
+                    lastAnimal = items.first { (it as? Animal)?.animal == animal.animal } as Animal
+                } else if (identifier != lastIdentifier || animal === unsortedAnimals[unsortedAnimals.size - 1]) {
+                    if (!((lastAnimal.type == "special") && lastAnimal.numberOwned == 0) &&
+                        !items.contains(
+                            lastAnimal,
+                        )
+                    ) {
+                        items.add(lastAnimal)
+                    }
+                    lastAnimal = animal
+                }
+
+                if (animal.type != lastSection?.key && animal.type != "premium") {
+                    if (items.size > 0 && items[items.size - 1].javaClass == StableSection::class.java) {
+                        items.removeAt(items.size - 1)
+                    }
+                    val section = StableSection(animal.type, itemType ?: "")
+                    items.add(section)
+                    lastSection = section
+                }
+                val isOwned =
+                    when (itemType) {
+                        "pets" -> {
+                            val ownedPet = ownedAnimals[animal.key] as? OwnedPet
+                            (ownedPet?.trained ?: 0) > 0
+                        }
+
+                        "mounts" -> {
+                            val ownedMount = ownedAnimals[animal.key] as? OwnedMount
+                            ownedMount?.owned == true
+                        }
+
+                        else -> false
+                    }
+                lastAnimal.totalNumber += 1
+                lastSection?.totalCount = (lastSection?.totalCount ?: 0) + 1
+                if (isOwned) {
+                    lastAnimal.numberOwned += 1
+                    lastSection?.ownedCount = (lastSection?.ownedCount ?: 0) + 1
+                }
             }
-        }
-        viewModelScope.launchCatching {
-            inventoryRepository.getOwnedMounts().map { ownedMounts ->
-                val mountMap = mutableMapOf<String, OwnedMount>()
-                ownedMounts.forEach { mountMap[it.key ?: ""] = it }
-                return@map mountMap
-            }.collect {
-                _ownedMounts.value = it
+            if (!((lastAnimal.type == "premium" || lastAnimal.type == "special") && lastAnimal.numberOwned == 0)) {
+                items.add(lastAnimal)
             }
+
+            items.add(0, "header")
+            items.removeAll { it is StableSection && it.key == "special" && it.ownedCount == 0 }
+            return items
         }
     }
-
-    private fun mapAnimals(unsortedAnimals: List<Animal>, ownedAnimals: Map<String, OwnedObject>): ArrayList<Any> {
-        val items = ArrayList<Any>()
-        var lastAnimal: Animal = unsortedAnimals.firstOrNull() ?: return items
-        var lastSection: StableSection? = null
-        for (animal in unsortedAnimals) {
-            val identifier = if (animal.animal.isNotEmpty() && (animal.type != "special" && animal.type != "wacky")) animal.animal else animal.key
-            val lastIdentifier = lastAnimal.animal.ifEmpty { lastAnimal.key }
-            if (animal.type == "premium") {
-                if (!items.contains(lastAnimal)) {
-                    items.add(lastAnimal)
-                }
-                lastAnimal = items.first { (it as? Animal)?.animal == animal.animal } as Animal
-            } else if (identifier != lastIdentifier || animal === unsortedAnimals[unsortedAnimals.size - 1]) {
-                if (!((lastAnimal.type == "special") && lastAnimal.numberOwned == 0) && !items.contains(lastAnimal)) {
-                    items.add(lastAnimal)
-                }
-                lastAnimal = animal
-            }
-
-            if (animal.type != lastSection?.key && animal.type != "premium") {
-                if (items.size > 0 && items[items.size - 1].javaClass == StableSection::class.java) {
-                    items.removeAt(items.size - 1)
-                }
-                val section = StableSection(animal.type, itemType ?: "")
-                items.add(section)
-                lastSection = section
-            }
-            val isOwned = when (itemType) {
-                "pets" -> {
-                    val ownedPet = ownedAnimals[animal.key] as? OwnedPet
-                    (ownedPet?.trained ?: 0) > 0
-                }
-                "mounts" -> {
-                    val ownedMount = ownedAnimals[animal.key] as? OwnedMount
-                    ownedMount?.owned == true
-                }
-                else -> false
-            }
-            lastAnimal.totalNumber += 1
-            lastSection?.totalCount = (lastSection?.totalCount ?: 0) + 1
-            if (isOwned) {
-                lastAnimal.numberOwned += 1
-                lastSection?.ownedCount = (lastSection?.ownedCount ?: 0) + 1
-            }
-        }
-        if (!((lastAnimal.type == "premium" || lastAnimal.type == "special") && lastAnimal.numberOwned == 0)) {
-            items.add(lastAnimal)
-        }
-
-        items.add(0, "header")
-        items.removeAll { it is StableSection && it.key == "special" && it.ownedCount == 0 }
-        return items
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/TaskFormViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/TaskFormViewModel.kt
index c56543b9d..d8f81edb7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/TaskFormViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/TaskFormViewModel.kt
@@ -9,13 +9,15 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 
 @HiltViewModel
-class TaskFormViewModel @Inject constructor(
-    userRepository: UserRepository,
-    userViewModel: MainUserViewModel
-) : BaseViewModel(userRepository, userViewModel) {
-    val taskDifficulty = mutableStateOf(TaskDifficulty.EASY)
-    val selectedAttribute = mutableStateOf(Attribute.STRENGTH)
-    val habitResetOption = mutableStateOf(HabitResetOption.DAILY)
-    val habitScoringPositive = mutableStateOf(true)
-    val habitScoringNegative = mutableStateOf(false)
-}
+class TaskFormViewModel
+    @Inject
+    constructor(
+        userRepository: UserRepository,
+        userViewModel: MainUserViewModel,
+    ) : BaseViewModel(userRepository, userViewModel) {
+        val taskDifficulty = mutableStateOf(TaskDifficulty.EASY)
+        val selectedAttribute = mutableStateOf(Attribute.STRENGTH)
+        val habitResetOption = mutableStateOf(HabitResetOption.DAILY)
+        val habitScoringPositive = mutableStateOf(true)
+        val habitScoringNegative = mutableStateOf(false)
+    }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/TasksViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/TasksViewModel.kt
index 6605eb65c..2463f012d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/TasksViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/TasksViewModel.kt
@@ -33,339 +33,355 @@ import java.util.Date
 import javax.inject.Inject
 
 @HiltViewModel
-class TasksViewModel @Inject constructor(
-    userRepository: UserRepository,
-    userViewModel: MainUserViewModel,
-    val taskRepository: TaskRepository,
-    val tagRepository: TagRepository,
-    val appConfigManager: AppConfigManager,
-    val sharedPreferences: SharedPreferences
-) : BaseViewModel(userRepository, userViewModel), GroupPlanInfoProvider {
-    private var owners: List<Pair<String, CharSequence>> = listOf()
-    var canSwitchOwners = MutableLiveData<Boolean?>()
-    val ownerID: MutableLiveData<String?> by lazy {
-        MutableLiveData()
-    }
-    var teamPlans = mapOf<String, TeamPlan>()
-    var initialPreferenceFilterSet: Boolean = false
-
-    val isPersonalBoard: Boolean
-        get() {
-            return ownerID.value == userViewModel.userID
-        }
-    val ownerTitle: CharSequence
-        get() {
-            return owners.firstOrNull { it.first == ownerID.value }?.second ?: ""
+class TasksViewModel
+    @Inject
+    constructor(
+        userRepository: UserRepository,
+        userViewModel: MainUserViewModel,
+        val taskRepository: TaskRepository,
+        val tagRepository: TagRepository,
+        val appConfigManager: AppConfigManager,
+        val sharedPreferences: SharedPreferences,
+    ) : BaseViewModel(userRepository, userViewModel), GroupPlanInfoProvider {
+        private var owners: List<Pair<String, CharSequence>> = listOf()
+        var canSwitchOwners = MutableLiveData<Boolean?>()
+        val ownerID: MutableLiveData<String?> by lazy {
+            MutableLiveData()
         }
+        var teamPlans = mapOf<String, TeamPlan>()
+        var initialPreferenceFilterSet: Boolean = false
 
-    init {
-        viewModelScope.launch(ExceptionHandler.coroutine()) {
-            userRepository.getTeamPlans()
-                .collect { plans ->
-                    teamPlans = plans.associateBy { it.id }
-                    owners =
-                        listOf(Pair(userViewModel.userID, userViewModel.displayName)) + plans.map {
-                            Pair(
-                                it.id,
-                                it.summary
-                            )
+        val isPersonalBoard: Boolean
+            get() {
+                return ownerID.value == userViewModel.userID
+            }
+        val ownerTitle: CharSequence
+            get() {
+                return owners.firstOrNull { it.first == ownerID.value }?.second ?: ""
+            }
+
+        init {
+            viewModelScope.launch(ExceptionHandler.coroutine()) {
+                userRepository.getTeamPlans()
+                    .collect { plans ->
+                        teamPlans = plans.associateBy { it.id }
+                        owners =
+                            listOf(Pair(userViewModel.userID, userViewModel.displayName)) +
+                            plans.map {
+                                Pair(
+                                    it.id,
+                                    it.summary,
+                                )
+                            }
+                        if (owners.size > 1 && canSwitchOwners.value != false) {
+                            canSwitchOwners.value = owners.size > 1
+                        }
+                    }
+            }
+        }
+
+        internal fun refreshData(onComplete: () -> Unit) {
+            viewModelScope.launch(ExceptionHandler.coroutine()) {
+                if (isPersonalBoard) {
+                    userRepository.retrieveUser(
+                        withTasks = true,
+                        forced = true,
+                    )
+                    if (activeFilters[TaskType.TODO] == Task.FILTER_COMPLETED) {
+                        taskRepository.retrieveCompletedTodos()
+                    }
+                } else {
+                    userRepository.retrieveTeamPlan(ownerID.value ?: "")
+                }
+                onComplete()
+            }
+        }
+
+        fun cycleOwnerIDs() {
+            if (owners.size <= 1) return
+            val nextIndex = owners.indexOfFirst { it.first == ownerID.value } + 1
+            if (nextIndex < owners.size) {
+                ownerID.value = owners[nextIndex].first
+            } else {
+                ownerID.value = owners[0].first
+            }
+        }
+
+        fun scoreTask(
+            task: Task,
+            direction: TaskDirection,
+            onResult: (TaskScoringResult, Int) -> Unit,
+        ) {
+            viewModelScope.launch(ExceptionHandler.coroutine()) {
+                taskRepository.taskChecked(
+                    null,
+                    task.id ?: "",
+                    direction == TaskDirection.UP,
+                    false,
+                ) { result ->
+                    onResult(result, task.value.toInt())
+                    if (!DateUtils.isToday(sharedPreferences.getLong("last_task_reporting", 0))) {
+                        Analytics.sendEvent(
+                            "task scored",
+                            EventCategory.BEHAVIOUR,
+                            HitType.EVENT,
+                        )
+                        sharedPreferences.edit {
+                            putLong("last_task_reporting", Date().time)
                         }
-                    if (owners.size > 1 && canSwitchOwners.value != false) {
-                        canSwitchOwners.value = owners.size > 1
                     }
                 }
+            }
         }
-    }
 
-    internal fun refreshData(onComplete: () -> Unit) {
-        viewModelScope.launch(ExceptionHandler.coroutine()) {
-            if (isPersonalBoard) {
-                userRepository.retrieveUser(
-                    withTasks = true,
-                    forced = true
-                )
-                if (activeFilters[TaskType.TODO] == Task.FILTER_COMPLETED) {
+        private val filterSets: HashMap<TaskType, MutableLiveData<Triple<String?, String?, List<String>>>> =
+            hashMapOf(
+                Pair(TaskType.HABIT, MutableLiveData()),
+                Pair(TaskType.DAILY, MutableLiveData()),
+                Pair(TaskType.TODO, MutableLiveData()),
+            )
+
+        fun getFilterSet(type: TaskType): MutableLiveData<Triple<String?, String?, List<String>>>? {
+            return filterSets[type]
+        }
+
+        var searchQuery: String? = null
+            set(value) {
+                field = value
+                filterSets.forEach {
+                    val old = it.value.value
+                    it.value.value = Triple(value, old?.second, old?.third ?: listOf())
+                }
+            }
+        private val activeFilters = HashMap<TaskType, String>()
+
+        var tags: MutableList<String> = mutableListOf()
+            set(value) {
+                field = value
+                filterSets.forEach {
+                    val old = it.value.value
+                    it.value.value = Triple(old?.first, old?.second, field)
+                }
+            }
+
+        fun addActiveTag(tagID: String) {
+            if (!tags.contains(tagID)) {
+                tags.add(tagID)
+            }
+            filterSets.forEach {
+                val old = it.value.value
+                it.value.value = Triple(old?.first, old?.second, tags)
+            }
+        }
+
+        fun removeActiveTag(tagID: String) {
+            if (tags.contains(tagID)) {
+                tags.remove(tagID)
+            }
+            filterSets.forEach {
+                val old = it.value.value
+                it.value.value = Triple(old?.first, old?.second, tags)
+            }
+        }
+
+        fun filterCount(type: TaskType?): Int {
+            return this.tags.size + if (isTaskFilterActive(type)) 1 else 0
+        }
+
+        fun isFiltering(type: TaskType?): Boolean {
+            return filterCount(type) > 0
+        }
+
+        private fun isTaskFilterActive(type: TaskType?): Boolean {
+            if (activeFilters[type] == null) {
+                return false
+            }
+            return if (TaskType.TODO == type) {
+                Task.FILTER_ACTIVE != activeFilters[type]
+            } else {
+                Task.FILTER_ALL != activeFilters[type]
+            }
+        }
+
+        fun filter(tasks: List<Task>): List<Task> {
+            if (tasks.isEmpty()) {
+                return tasks
+            }
+            val filtered = ArrayList<Task>()
+            var activeFilter: String? = null
+            if (activeFilters.size > 0) {
+                activeFilter = activeFilters[tasks[0].type]
+            }
+            for (task in tasks) {
+                if (isFiltered(task, activeFilter)) {
+                    filtered.add(task)
+                }
+            }
+
+            return filtered
+        }
+
+        private fun isFiltered(
+            task: Task,
+            activeFilter: String?,
+        ): Boolean {
+            if (!task.containsAllTagIds(tags)) {
+                return false
+            }
+            return if (activeFilter != null && activeFilter != Task.FILTER_ALL) {
+                when (activeFilter) {
+                    Task.FILTER_ACTIVE ->
+                        if (task.type == TaskType.DAILY) {
+                            task.isDisplayedActive
+                        } else {
+                            !task.completed
+                        }
+
+                    Task.FILTER_GRAY -> task.completed || !task.isDisplayedActive
+                    Task.FILTER_WEAK -> task.value < 1
+                    Task.FILTER_STRONG -> task.value >= 1
+                    Task.FILTER_DATED -> task.dueDate != null
+                    Task.FILTER_COMPLETED -> task.completed
+                    else -> true
+                }
+            } else {
+                true
+            }
+        }
+
+        fun setActiveFilter(
+            type: TaskType,
+            activeFilter: String,
+        ) {
+            activeFilters[type] = activeFilter
+            filterSets[type]?.value = Triple(searchQuery, activeFilter, tags)
+
+            if (activeFilters[TaskType.TODO] == Task.FILTER_COMPLETED) {
+                viewModelScope.launchCatching {
                     taskRepository.retrieveCompletedTodos()
                 }
-            } else {
-                userRepository.retrieveTeamPlan(ownerID.value ?: "")
             }
-            onComplete()
-        }
-    }
 
-    fun cycleOwnerIDs() {
-        if (owners.size <= 1) return
-        val nextIndex = owners.indexOfFirst { it.first == ownerID.value } + 1
-        if (nextIndex < owners.size) {
-            ownerID.value = owners[nextIndex].first
-        } else {
-            ownerID.value = owners[0].first
-        }
-    }
-
-    fun scoreTask(
-        task: Task,
-        direction: TaskDirection,
-        onResult: (TaskScoringResult, Int) -> Unit
-    ) {
-        viewModelScope.launch(ExceptionHandler.coroutine()) {
-            taskRepository.taskChecked(
-                null,
-                task.id ?: "",
-                direction == TaskDirection.UP,
-                false
-            ) { result ->
-                onResult(result, task.value.toInt())
-                if (!DateUtils.isToday(sharedPreferences.getLong("last_task_reporting", 0))) {
-                    Analytics.sendEvent(
-                        "task scored",
-                        EventCategory.BEHAVIOUR,
-                        HitType.EVENT
-                    )
-                    sharedPreferences.edit {
-                        putLong("last_task_reporting", Date().time)
+            if (type == TaskType.DAILY) {
+                val isShowingDue = activeFilter == Task.FILTER_ACTIVE
+                if (isShowingDue != user.value?.preferences?.dailyDueDefaultView) {
+                    viewModelScope.launchCatching {
+                        userRepository.updateUser("preferences.dailyDueDefaultView", isShowingDue)
                     }
                 }
             }
         }
-    }
 
-    private val filterSets: HashMap<TaskType, MutableLiveData<Triple<String?, String?, List<String>>>> =
-        hashMapOf(
-            Pair(TaskType.HABIT, MutableLiveData()),
-            Pair(TaskType.DAILY, MutableLiveData()),
-            Pair(TaskType.TODO, MutableLiveData())
-        )
-
-    fun getFilterSet(type: TaskType): MutableLiveData<Triple<String?, String?, List<String>>>? {
-        return filterSets[type]
-    }
-
-    var searchQuery: String? = null
-        set(value) {
-            field = value
-            filterSets.forEach {
-                val old = it.value.value
-                it.value.value = Triple(value, old?.second, old?.third ?: listOf())
-            }
-        }
-    private val activeFilters = HashMap<TaskType, String>()
-
-    var tags: MutableList<String> = mutableListOf()
-        set(value) {
-            field = value
-            filterSets.forEach {
-                val old = it.value.value
-                it.value.value = Triple(old?.first, old?.second, field)
+        fun getActiveFilter(type: TaskType?): String? {
+            return if (activeFilters.containsKey(type)) {
+                activeFilters[type]
+            } else {
+                null
             }
         }
 
-    fun addActiveTag(tagID: String) {
-        if (!tags.contains(tagID)) {
-            tags.add(tagID)
-        }
-        filterSets.forEach {
-            val old = it.value.value
-            it.value.value = Triple(old?.first, old?.second, tags)
-        }
-    }
-
-    fun removeActiveTag(tagID: String) {
-        if (tags.contains(tagID)) {
-            tags.remove(tagID)
-        }
-        filterSets.forEach {
-            val old = it.value.value
-            it.value.value = Triple(old?.first, old?.second, tags)
-        }
-    }
-
-    fun filterCount(type: TaskType?): Int {
-        return this.tags.size + if (isTaskFilterActive(type)) 1 else 0
-    }
-
-    fun isFiltering(type: TaskType?): Boolean {
-        return filterCount(type) > 0
-    }
-
-    private fun isTaskFilterActive(type: TaskType?): Boolean {
-        if (activeFilters[type] == null) {
-            return false
-        }
-        return if (TaskType.TODO == type) {
-            Task.FILTER_ACTIVE != activeFilters[type]
-        } else {
-            Task.FILTER_ALL != activeFilters[type]
-        }
-    }
-
-    fun filter(tasks: List<Task>): List<Task> {
-        if (tasks.isEmpty()) {
-            return tasks
-        }
-        val filtered = ArrayList<Task>()
-        var activeFilter: String? = null
-        if (activeFilters.size > 0) {
-            activeFilter = activeFilters[tasks[0].type]
-        }
-        for (task in tasks) {
-            if (isFiltered(task, activeFilter)) {
-                filtered.add(task)
+        fun createQuery(unfilteredData: OrderedRealmCollection<Task>): RealmQuery<Task>? {
+            if (!unfilteredData.isValid) {
+                return null
             }
+            var query = unfilteredData.where()
+
+            if (unfilteredData.size != 0) {
+                val taskType = unfilteredData[0].type
+                val activeFilter = getActiveFilter(taskType)
+
+                if (tags.size > 0) {
+                    query = query.`in`("tags.id", tags.toTypedArray())
+                }
+                if (searchQuery?.isNotEmpty() == true) {
+                    query =
+                        query
+                            .beginGroup()
+                            .contains("text", searchQuery ?: "", Case.INSENSITIVE)
+                            .or()
+                            .contains("notes", searchQuery ?: "", Case.INSENSITIVE)
+                            .endGroup()
+                }
+                if (activeFilter != null && activeFilter != Task.FILTER_ALL) {
+                    when (activeFilter) {
+                        Task.FILTER_ACTIVE ->
+                            query =
+                                if (TaskType.DAILY == taskType) {
+                                    query.equalTo("completed", false).equalTo("isDue", true)
+                                } else {
+                                    query.equalTo("completed", false)
+                                }
+
+                        Task.FILTER_GRAY ->
+                            query =
+                                query.equalTo("completed", true).or().equalTo("isDue", false)
+
+                        Task.FILTER_WEAK -> query = query.lessThan("value", 1.0)
+                        Task.FILTER_STRONG -> query = query.greaterThanOrEqualTo("value", 1.0)
+                        Task.FILTER_DATED ->
+                            query =
+                                query.isNotNull("dueDate").equalTo("completed", false).sort("dueDate")
+
+                        Task.FILTER_COMPLETED -> query = query.equalTo("completed", true)
+                    }
+                }
+                if (activeFilter != Task.FILTER_DATED) {
+                    query = query.sort("position", Sort.ASCENDING, "dateCreated", Sort.DESCENDING)
+                }
+            }
+            return query
         }
 
-        return filtered
-    }
-
-    private fun isFiltered(task: Task, activeFilter: String?): Boolean {
-        if (!task.containsAllTagIds(tags)) {
-            return false
+        override fun canScoreTask(task: Task): Boolean {
+            if (!task.isGroupTask) {
+                return true
+            }
+            return task.isAssignedToUser(userViewModel.userID) || task.group?.assignedUsers?.isEmpty() != false
         }
-        return if (activeFilter != null && activeFilter != Task.FILTER_ALL) {
-            when (activeFilter) {
-                Task.FILTER_ACTIVE -> if (task.type == TaskType.DAILY) {
-                    task.isDisplayedActive
+
+        override suspend fun canEditTask(task: Task): Boolean {
+            if (!task.isGroupTask) {
+                return true
+            }
+            val groupID = task.group?.groupID ?: return true
+            val group = userRepository.getTeamPlan(groupID).firstOrNull()
+            return group?.hasTaskEditPrivileges(userViewModel.userID) ?: false
+        }
+
+        override suspend fun canAddTasks(): Boolean {
+            if (isPersonalBoard) {
+                return true
+            }
+            val groupID = ownerID.value ?: return true
+            val group = userRepository.getTeamPlan(groupID).firstOrNull()
+            return group?.hasTaskEditPrivileges(userViewModel.userID) ?: false
+        }
+
+        override fun assignedTextForTask(
+            resources: Resources,
+            assignedUsers: List<String>,
+        ): String {
+            return if (assignedUsers.contains(userViewModel.userID)) {
+                if (assignedUsers.size == 1) {
+                    resources.getString(R.string.you)
                 } else {
-                    !task.completed
+                    resources.getQuantityString(
+                        R.plurals.you_x_others,
+                        assignedUsers.size - 1,
+                        assignedUsers.size - 1,
+                    )
                 }
-
-                Task.FILTER_GRAY -> task.completed || !task.isDisplayedActive
-                Task.FILTER_WEAK -> task.value < 1
-                Task.FILTER_STRONG -> task.value >= 1
-                Task.FILTER_DATED -> task.dueDate != null
-                Task.FILTER_COMPLETED -> task.completed
-                else -> true
-            }
-        } else {
-            true
-        }
-    }
-
-    fun setActiveFilter(type: TaskType, activeFilter: String) {
-        activeFilters[type] = activeFilter
-        filterSets[type]?.value = Triple(searchQuery, activeFilter, tags)
-
-        if (activeFilters[TaskType.TODO] == Task.FILTER_COMPLETED) {
-            viewModelScope.launchCatching {
-                taskRepository.retrieveCompletedTodos()
-            }
-        }
-
-        if (type == TaskType.DAILY) {
-            val isShowingDue = activeFilter == Task.FILTER_ACTIVE
-            if (isShowingDue != user.value?.preferences?.dailyDueDefaultView) {
-                viewModelScope.launchCatching {
-                    userRepository.updateUser("preferences.dailyDueDefaultView", isShowingDue)
-                }
-            }
-        }
-    }
-
-    fun getActiveFilter(type: TaskType?): String? {
-        return if (activeFilters.containsKey(type)) {
-            activeFilters[type]
-        } else {
-            null
-        }
-    }
-
-    fun createQuery(unfilteredData: OrderedRealmCollection<Task>): RealmQuery<Task>? {
-        if (!unfilteredData.isValid) {
-            return null
-        }
-        var query = unfilteredData.where()
-
-        if (unfilteredData.size != 0) {
-            val taskType = unfilteredData[0].type
-            val activeFilter = getActiveFilter(taskType)
-
-            if (tags.size > 0) {
-                query = query.`in`("tags.id", tags.toTypedArray())
-            }
-            if (searchQuery?.isNotEmpty() == true) {
-                query = query
-                    .beginGroup()
-                    .contains("text", searchQuery ?: "", Case.INSENSITIVE)
-                    .or()
-                    .contains("notes", searchQuery ?: "", Case.INSENSITIVE)
-                    .endGroup()
-            }
-            if (activeFilter != null && activeFilter != Task.FILTER_ALL) {
-                when (activeFilter) {
-                    Task.FILTER_ACTIVE -> query = if (TaskType.DAILY == taskType) {
-                        query.equalTo("completed", false).equalTo("isDue", true)
-                    } else {
-                        query.equalTo("completed", false)
-                    }
-
-                    Task.FILTER_GRAY ->
-                        query =
-                            query.equalTo("completed", true).or().equalTo("isDue", false)
-
-                    Task.FILTER_WEAK -> query = query.lessThan("value", 1.0)
-                    Task.FILTER_STRONG -> query = query.greaterThanOrEqualTo("value", 1.0)
-                    Task.FILTER_DATED ->
-                        query =
-                            query.isNotNull("dueDate").equalTo("completed", false).sort("dueDate")
-
-                    Task.FILTER_COMPLETED -> query = query.equalTo("completed", true)
-                }
-            }
-            if (activeFilter != Task.FILTER_DATED) {
-                query = query.sort("position", Sort.ASCENDING, "dateCreated", Sort.DESCENDING)
-            }
-        }
-        return query
-    }
-
-    override fun canScoreTask(task: Task): Boolean {
-        if (!task.isGroupTask) {
-            return true
-        }
-        return task.isAssignedToUser(userViewModel.userID) || task.group?.assignedUsers?.isEmpty() != false
-    }
-
-    override suspend fun canEditTask(task: Task): Boolean {
-        if (!task.isGroupTask) {
-            return true
-        }
-        val groupID = task.group?.groupID ?: return true
-        val group = userRepository.getTeamPlan(groupID).firstOrNull()
-        return group?.hasTaskEditPrivileges(userViewModel.userID) ?: false
-    }
-
-    override suspend fun canAddTasks(): Boolean {
-        if (isPersonalBoard) {
-            return true
-        }
-        val groupID = ownerID.value ?: return true
-        val group = userRepository.getTeamPlan(groupID).firstOrNull()
-        return group?.hasTaskEditPrivileges(userViewModel.userID) ?: false
-    }
-
-    override fun assignedTextForTask(resources: Resources, assignedUsers: List<String>): String {
-        return if (assignedUsers.contains(userViewModel.userID)) {
-            if (assignedUsers.size == 1) {
-                resources.getString(R.string.you)
             } else {
-                resources.getQuantityString(
-                    R.plurals.you_x_others,
-                    assignedUsers.size - 1,
-                    assignedUsers.size - 1
-                )
-            }
-        } else {
-            if (assignedUsers.size == 1) {
-                userViewModel.currentTeamPlanMembers.value?.firstOrNull { it.id == assignedUsers.first() }?.displayName
-                    ?: ""
-            } else {
-                resources.getQuantityString(
-                    R.plurals.people,
-                    assignedUsers.size,
-                    assignedUsers.size
-                )
+                if (assignedUsers.size == 1) {
+                    userViewModel.currentTeamPlanMembers.value?.firstOrNull { it.id == assignedUsers.first() }?.displayName
+                        ?: ""
+                } else {
+                    resources.getQuantityString(
+                        R.plurals.people,
+                        assignedUsers.size,
+                        assignedUsers.size,
+                    )
+                }
             }
         }
     }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/inventory/equipment/EquipmentOverviewViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/inventory/equipment/EquipmentOverviewViewModel.kt
index 885567432..27210cb97 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/inventory/equipment/EquipmentOverviewViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/inventory/equipment/EquipmentOverviewViewModel.kt
@@ -11,21 +11,26 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 
 @HiltViewModel
-class EquipmentOverviewViewModel @Inject constructor(
-    userRepository: UserRepository,
-    userViewModel: MainUserViewModel,
-    val inventoryRepository: InventoryRepository
-) : BaseViewModel(userRepository, userViewModel) {
-    val usesAutoEquip: Boolean
-        get() = user.value?.preferences?.autoEquip == true
-    val usesCostume: Boolean
-        get() = user.value?.preferences?.costume == true
+class EquipmentOverviewViewModel
+    @Inject
+    constructor(
+        userRepository: UserRepository,
+        userViewModel: MainUserViewModel,
+        val inventoryRepository: InventoryRepository,
+    ) : BaseViewModel(userRepository, userViewModel) {
+        val usesAutoEquip: Boolean
+            get() = user.value?.preferences?.autoEquip == true
+        val usesCostume: Boolean
+            get() = user.value?.preferences?.costume == true
 
-    fun getGear(key: String, onSuccess: (Equipment) -> Unit) {
-        viewModelScope.launchCatching {
-            inventoryRepository.getEquipment(key).collect {
-                onSuccess(it)
+        fun getGear(
+            key: String,
+            onSuccess: (Equipment) -> Unit,
+        ) {
+            viewModelScope.launchCatching {
+                inventoryRepository.getEquipment(key).collect {
+                    onSuccess(it)
+                }
             }
         }
     }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/AppHeaderView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/AppHeaderView.kt
index 3df91b2b8..e35fbbe36 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/AppHeaderView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/AppHeaderView.kt
@@ -3,7 +3,6 @@ package com.habitrpg.android.habitica.ui.views
 import android.content.res.Resources
 import androidx.compose.animation.AnimatedContent
 import androidx.compose.animation.ContentTransform
-import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.animation.core.FastOutSlowInEasing
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.animation.core.tween
@@ -51,7 +50,6 @@ import androidx.compose.ui.unit.sp
 import androidx.core.os.bundleOf
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.helpers.AppConfigManager
-import com.habitrpg.common.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.models.TeamPlan
 import com.habitrpg.android.habitica.models.auth.LocalAuthentication
 import com.habitrpg.android.habitica.models.members.Member
@@ -66,34 +64,39 @@ import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.theme.basicButtonColor
 import com.habitrpg.android.habitica.ui.theme.basicTextColor
 import com.habitrpg.android.habitica.ui.theme.colors
+import com.habitrpg.common.habitica.helpers.MainNavigationController
 import com.habitrpg.common.habitica.theme.HabiticaTheme
 import com.habitrpg.common.habitica.views.ComposableAvatarView
 import com.habitrpg.shared.habitica.models.Avatar
 import kotlin.random.Random
 
 @Composable
-fun UserLevelText(user : Avatar) {
-    val text = if (user.hasClass) {
-        stringResource(
-            id = R.string.user_level_with_class,
-            user.stats?.lvl ?: 0,
-            getTranslatedClassName(
-                LocalContext.current.resources,
-                user.stats?.habitClass
+fun UserLevelText(user: Avatar) {
+    val text =
+        if (user.hasClass) {
+            stringResource(
+                id = R.string.user_level_with_class,
+                user.stats?.lvl ?: 0,
+                getTranslatedClassName(
+                    LocalContext.current.resources,
+                    user.stats?.habitClass,
+                ),
             )
-        )
-    } else {
-        stringResource(id = R.string.user_level, user.stats?.lvl ?: 0)
-    }
+        } else {
+            stringResource(id = R.string.user_level, user.stats?.lvl ?: 0)
+        }
     Text(
         text,
         fontSize = 12.sp,
         fontWeight = FontWeight.SemiBold,
-        color = colorResource(R.color.text_primary)
+        color = colorResource(R.color.text_primary),
     )
 }
 
-fun getTranslatedClassName(resources : Resources, className : String?) : String {
+fun getTranslatedClassName(
+    resources: Resources,
+    className: String?,
+): String {
     return when (className) {
         Stats.HEALER -> resources.getString(R.string.healer)
         Stats.ROGUE -> resources.getString(R.string.rogue)
@@ -105,15 +108,15 @@ fun getTranslatedClassName(resources : Resources, className : String?) : String
 
 @Composable
 fun AppHeaderView(
-    user : Avatar?,
-    modifier : Modifier = Modifier,
-    isMyProfile : Boolean = false,
-    teamPlan : TeamPlan? = null,
-    teamPlanMembers : List<Member>? = null,
+    user: Avatar?,
+    modifier: Modifier = Modifier,
+    isMyProfile: Boolean = false,
+    teamPlan: TeamPlan? = null,
+    teamPlanMembers: List<Member>? = null,
     onAvatarClicked: (() -> Unit)? = null,
-    onMemberRowClicked : () -> Unit,
+    onMemberRowClicked: () -> Unit,
     onClassSelectionClicked: () -> Unit,
-    configManager: AppConfigManager
+    configManager: AppConfigManager,
 ) {
     val isPlayerOptedOutOfClass = user?.preferences?.disableClasses ?: false
     Column(modifier) {
@@ -126,7 +129,7 @@ fun AppHeaderView(
                     .padding(end = 16.dp)
                     .clickable {
                         onAvatarClicked?.invoke()
-                    }
+                    },
             )
             val animationValue =
                 animateFloatAsState(targetValue = if (teamPlan != null) 1f else 0f).value
@@ -134,8 +137,8 @@ fun AppHeaderView(
                 Column(
                     Modifier.padding(
                         bottom = (animationValue * 48f).dp,
-                        end = (animationValue * 80f).dp
-                    )
+                        end = (animationValue * 80f).dp,
+                    ),
                 ) {
                     LabeledBar(
                         icon = HabiticaIconsHelper.imageOfHeartLightBg(),
@@ -144,7 +147,7 @@ fun AppHeaderView(
                         value = user?.stats?.hp ?: 0.0,
                         maxValue = user?.stats?.maxHealth?.toDouble() ?: 0.0,
                         displayCompact = teamPlan != null,
-                        modifier = Modifier.weight(1f)
+                        modifier = Modifier.weight(1f),
                     )
                     LabeledBar(
                         icon = HabiticaIconsHelper.imageOfExperience(),
@@ -155,7 +158,7 @@ fun AppHeaderView(
                         displayCompact = teamPlan != null,
                         abbreviateValue = false,
                         abbreviateMax = false,
-                        modifier = Modifier.weight(1f)
+                        modifier = Modifier.weight(1f),
                     )
                     if (user?.hasClass == true) {
                         LabeledBar(
@@ -167,11 +170,12 @@ fun AppHeaderView(
                             displayCompact = teamPlan != null,
                             abbreviateValue = false,
                             abbreviateMax = false,
-                            modifier = Modifier
-                                .weight(1f)
-                                .clickable {
-                                    MainNavigationController.navigate(R.id.skillsFragment)
-                                }
+                            modifier =
+                                Modifier
+                                    .weight(1f)
+                                    .clickable {
+                                        MainNavigationController.navigate(R.id.skillsFragment)
+                                    },
                         )
                     } else if ((user?.stats?.lvl ?: 0) < 10) {
                         LabeledBar(
@@ -182,7 +186,7 @@ fun AppHeaderView(
                             maxValue = 1.0,
                             displayCompact = teamPlan != null,
                             disabled = true,
-                            modifier = Modifier.weight(1f)
+                            modifier = Modifier.weight(1f),
                         )
                     } else if (user?.hasClass == false && isMyProfile && !isPlayerOptedOutOfClass) {
                         HabiticaButton(
@@ -193,11 +197,11 @@ fun AppHeaderView(
                             },
                             contentPadding = PaddingValues(0.dp),
                             fontSize = 14.sp,
-                            modifier = Modifier.height(28.dp)
+                            modifier = Modifier.height(28.dp),
                         ) {
                             Text(
                                 text = stringResource(R.string.choose_class),
-                                color = HabiticaTheme.colors.basicTextColor()
+                                color = HabiticaTheme.colors.basicTextColor(),
                             )
                         }
                     } else {
@@ -209,31 +213,34 @@ fun AppHeaderView(
                     visible = teamPlan != null,
                     enter = slideInHorizontally { animWidth } + fadeIn(),
                     exit = slideOutHorizontally { animWidth } + fadeOut(),
-                    modifier = Modifier.align(Alignment.TopEnd)
+                    modifier = Modifier.align(Alignment.TopEnd),
                 ) {
                     Row(
                         horizontalArrangement = Arrangement.Center,
                         verticalAlignment = Alignment.CenterVertically,
-                        modifier = Modifier
-                            .padding(start = 12.dp)
-                            .width(72.dp)
-                            .height(48.dp)
-                            .clip(MaterialTheme.shapes.medium)
-                            .background(
-                                colorResource(R.color.window_background)
-                            )
-                            .clickable {
-                                MainNavigationController.navigate(
-                                    R.id.guildFragment,
-                                    bundleOf("groupID" to teamPlan?.id, "tabToOpen" to 1)
+                        modifier =
+                            Modifier
+                                .padding(start = 12.dp)
+                                .width(72.dp)
+                                .height(48.dp)
+                                .clip(MaterialTheme.shapes.medium)
+                                .background(
+                                    colorResource(R.color.window_background),
                                 )
-                            }
+                                .clickable {
+                                    MainNavigationController.navigate(
+                                        R.id.guildFragment,
+                                        bundleOf("groupID" to teamPlan?.id, "tabToOpen" to 1),
+                                    )
+                                },
                     ) {
                         Image(
-                            painterResource(R.drawable.icon_chat), null,
-                            colorFilter = ColorFilter.tint(
-                                colorResource(R.color.text_ternary)
-                            )
+                            painterResource(R.drawable.icon_chat),
+                            null,
+                            colorFilter =
+                                ColorFilter.tint(
+                                    colorResource(R.color.text_ternary),
+                                ),
                         )
                     }
                 }
@@ -242,49 +249,61 @@ fun AppHeaderView(
                     visible = teamPlan != null,
                     enter = slideInVertically { animHeight } + fadeIn(),
                     exit = slideOutVertically { animHeight } + fadeOut(),
-                    modifier = Modifier.align(Alignment.BottomCenter)
+                    modifier = Modifier.align(Alignment.BottomCenter),
                 ) {
-                    AnimatedContent(targetState = teamPlanMembers?.filter { it.id != user?.id },
+                    AnimatedContent(
+                        targetState = teamPlanMembers?.filter { it.id != user?.id },
                         transitionSpec = {
                             ContentTransform(
-                                targetContentEnter =  fadeIn(animationSpec = tween(200, easing = FastOutSlowInEasing)) + slideInVertically { height -> height },
-                                initialContentExit = fadeOut(animationSpec = tween(200)) + slideOutVertically { height -> -height }
+                                targetContentEnter =
+                                    fadeIn(
+                                        animationSpec =
+                                            tween(
+                                                200,
+                                                easing = FastOutSlowInEasing,
+                                            ),
+                                    ) + slideInVertically { height -> height },
+                                initialContentExit = fadeOut(animationSpec = tween(200)) + slideOutVertically { height -> -height },
                             )
-                        }) {members ->
+                        },
+                    ) { members ->
                         Row(
-                            horizontalArrangement = Arrangement.spacedBy(
-                                12.dp,
-                                Alignment.CenterHorizontally
-                            ),
+                            horizontalArrangement =
+                                Arrangement.spacedBy(
+                                    12.dp,
+                                    Alignment.CenterHorizontally,
+                                ),
                             verticalAlignment = Alignment.CenterVertically,
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .height(40.dp)
-                                .width(72.dp)
-                                .clip(MaterialTheme.shapes.medium)
-                                .background(
-                                    colorResource(R.color.window_background)
-                                )
-                                .padding(start = 12.dp, end = 12.dp)
-                                .clickable {
-                                    onMemberRowClicked()
-                                }
+                            modifier =
+                                Modifier
+                                    .fillMaxWidth()
+                                    .height(40.dp)
+                                    .width(72.dp)
+                                    .clip(MaterialTheme.shapes.medium)
+                                    .background(
+                                        colorResource(R.color.window_background),
+                                    )
+                                    .padding(start = 12.dp, end = 12.dp)
+                                    .clickable {
+                                        onMemberRowClicked()
+                                    },
                         ) {
                             for (member in members
                                 ?.sortedByDescending { it.authentication?.timestamps?.lastLoggedIn }
                                 ?.take(6) ?: emptyList()) {
                                 Box(
-                                    modifier = Modifier
-                                        .clip(CircleShape)
-                                        .size(26.dp)
-                                        .padding(end = 6.dp, top = 4.dp)
+                                    modifier =
+                                        Modifier
+                                            .clip(CircleShape)
+                                            .size(26.dp)
+                                            .padding(end = 6.dp, top = 4.dp),
                                 ) {
                                     ComposableAvatarView(
                                         avatar = member,
                                         configManager,
                                         Modifier
                                             .size(64.dp)
-                                            .requiredSize(64.dp)
+                                            .requiredSize(64.dp),
                                     )
                                 }
                             }
@@ -295,12 +314,12 @@ fun AppHeaderView(
         }
         Row(
             verticalAlignment = Alignment.CenterVertically,
-            modifier = Modifier.defaultMinSize(minHeight = 28.dp)
+            modifier = Modifier.defaultMinSize(minHeight = 28.dp),
         ) {
             ClassIcon(
                 className = user?.stats?.habitClass,
                 hasClass = user?.hasClass ?: false,
-                modifier = Modifier.padding(4.dp)
+                modifier = Modifier.padding(4.dp),
             )
             user?.let { UserLevelText(it) }
             Spacer(Modifier.weight(1f))
@@ -309,12 +328,13 @@ fun AppHeaderView(
                     CurrencyText(
                         "hourglasses",
                         user.hourglassCount.toDouble(),
-                        modifier = Modifier
-                            .padding(end = 12.dp)
-                            .clickable {
-                                MainNavigationController.navigate(R.id.subscriptionPurchaseActivity)
-                            },
-                        decimals = 0
+                        modifier =
+                            Modifier
+                                .padding(end = 12.dp)
+                                .clickable {
+                                    MainNavigationController.navigate(R.id.subscriptionPurchaseActivity)
+                                },
+                        decimals = 0,
                     )
                 }
                 CurrencyText(
@@ -322,15 +342,16 @@ fun AppHeaderView(
                     user.stats?.gp ?: 0.0,
                     modifier = Modifier.padding(end = 12.dp),
                     decimals = 0,
-                    minForAbbreviation = 10000
+                    minForAbbreviation = 10000,
                 )
                 CurrencyText(
                     "gems",
                     user.gemCount.toDouble(),
-                    modifier = Modifier.clickable {
-                        MainNavigationController.navigate(R.id.gemPurchaseActivity)
-                    },
-                    decimals = 0
+                    modifier =
+                        Modifier.clickable {
+                            MainNavigationController.navigate(R.id.gemPurchaseActivity)
+                        },
+                    decimals = 0,
                 )
             }
         }
@@ -338,8 +359,7 @@ fun AppHeaderView(
 }
 
 private class UserProvider : PreviewParameterProvider<Pair<User, TeamPlan?>> {
-
-    private fun generateMember() : User {
+    private fun generateMember(): User {
         val member = User()
         member.profile = Profile()
         member.profile?.name = "User"
@@ -364,7 +384,7 @@ private class UserProvider : PreviewParameterProvider<Pair<User, TeamPlan?>> {
         return member
     }
 
-    override val values : Sequence<Pair<User, TeamPlan?>>
+    override val values: Sequence<Pair<User, TeamPlan?>>
         get() {
             val list = mutableListOf<Pair<User, TeamPlan?>>()
             val earlyMember = generateMember()
@@ -399,17 +419,20 @@ private class UserProvider : PreviewParameterProvider<Pair<User, TeamPlan?>> {
 
 @Composable
 @Preview
-private fun Preview(@PreviewParameter(UserProvider::class) data: Pair<User, TeamPlan>) {
+private fun Preview(
+    @PreviewParameter(UserProvider::class) data: Pair<User, TeamPlan>,
+) {
     HabiticaTheme {
         AppHeaderView(
             data.first,
             teamPlan = data.second,
-            modifier = Modifier
-                .background(HabiticaTheme.colors.contentBackground)
-                .padding(8.dp),
+            modifier =
+                Modifier
+                    .background(HabiticaTheme.colors.contentBackground)
+                    .padding(8.dp),
             onMemberRowClicked = { },
             onClassSelectionClicked = { },
-            configManager = AppConfigManager(null)
+            configManager = AppConfigManager(null),
         )
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/BackgroundScene.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/BackgroundScene.kt
index c9edb3bbb..ecf044a23 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/BackgroundScene.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/BackgroundScene.kt
@@ -39,7 +39,7 @@ private fun getBackgroundPainter(): ImageBitmap {
             Calendar.NOVEMBER -> R.drawable.stable_tile_november
             Calendar.DECEMBER -> R.drawable.stable_tile_december
             else -> R.drawable.stable_tile_may
-        }
+        },
     )
 }
 
@@ -47,27 +47,33 @@ private fun getBackgroundPainter(): ImageBitmap {
 fun BackgroundScene(modifier: Modifier = Modifier) {
     val image = getBackgroundPainter()
     Canvas(
-        modifier = modifier
-            .height(124.dp)
-            .fillMaxWidth()
-            .zIndex(1f), onDraw = {
-            val bitmap = Bitmap.createScaledBitmap(
-                image.asAndroidBitmap(),
-                image.width.dp.roundToPx(),
-                124.dp.roundToPx(),
-                false
-            )
-            val paint = Paint().asFrameworkPaint().apply {
-                isAntiAlias = true
-                shader = ImageShader(
-                    bitmap.asImageBitmap(),
-                    TileMode.Repeated,
-                    TileMode.Repeated
+        modifier =
+            modifier
+                .height(124.dp)
+                .fillMaxWidth()
+                .zIndex(1f),
+        onDraw = {
+            val bitmap =
+                Bitmap.createScaledBitmap(
+                    image.asAndroidBitmap(),
+                    image.width.dp.roundToPx(),
+                    124.dp.roundToPx(),
+                    false,
                 )
-            }
+            val paint =
+                Paint().asFrameworkPaint().apply {
+                    isAntiAlias = true
+                    shader =
+                        ImageShader(
+                            bitmap.asImageBitmap(),
+                            TileMode.Repeated,
+                            TileMode.Repeated,
+                        )
+                }
             drawIntoCanvas {
                 it.nativeCanvas.drawPaint(paint)
             }
             paint.reset()
-        })
+        },
+    )
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/BottomSheetUtils.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/BottomSheetUtils.kt
index 929677ed9..2ce758ca0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/BottomSheetUtils.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/BottomSheetUtils.kt
@@ -50,7 +50,7 @@ fun Fragment.showAsBottomSheet(content: @Composable (() -> Unit) -> Unit) {
 // Helper method
 private fun addContentToView(
     viewGroup: ViewGroup,
-    content: @Composable (() -> Unit) -> Unit
+    content: @Composable (() -> Unit) -> Unit,
 ) {
     viewGroup.addView(
         ComposeView(viewGroup.context).apply {
@@ -59,7 +59,7 @@ private fun addContentToView(
                     BottomSheetWrapper(viewGroup, this, content)
                 }
             }
-        }
+        },
     )
 }
 
@@ -68,10 +68,11 @@ private fun addContentToView(
 private fun BottomSheetWrapper(
     parent: ViewGroup,
     composeView: ComposeView,
-    content: @Composable (() -> Unit) -> Unit
+    content: @Composable (() -> Unit) -> Unit,
 ) {
     val coroutineScope = rememberCoroutineScope()
-    val modalBottomSheetState = rememberModalBottomSheetState(ModalBottomSheetValue.Hidden, skipHalfExpanded = true)
+    val modalBottomSheetState =
+        rememberModalBottomSheetState(ModalBottomSheetValue.Hidden, skipHalfExpanded = true)
     var isSheetOpened by remember { mutableStateOf(false) }
 
     val systemUiController = rememberSystemUiController()
@@ -90,19 +91,21 @@ private fun BottomSheetWrapper(
         sheetContent = {
             Column(
                 horizontalAlignment = Alignment.CenterHorizontally,
-                modifier = Modifier
-                    .padding(horizontal = 4.dp)
-                    .background(
-                        HabiticaTheme.colors.windowBackground,
-                        RoundedCornerShape(topStart = radius, topEnd = radius)
-                    )
-                    .padding(vertical = 8.dp)
+                modifier =
+                    Modifier
+                        .padding(horizontal = 4.dp)
+                        .background(
+                            HabiticaTheme.colors.windowBackground,
+                            RoundedCornerShape(topStart = radius, topEnd = radius),
+                        )
+                        .padding(vertical = 8.dp),
             ) {
                 Box(
-                    modifier = Modifier
-                        .padding(bottom = 16.dp)
-                        .background(colorResource(R.color.content_background_offset))
-                        .size(24.dp, 3.dp)
+                    modifier =
+                        Modifier
+                            .padding(bottom = 16.dp)
+                            .background(colorResource(R.color.content_background_offset))
+                            .size(24.dp, 3.dp),
                 )
                 content {
                     // Action passed for clicking close button in the content
@@ -111,7 +114,7 @@ private fun BottomSheetWrapper(
                     }
                 }
             }
-        }
+        },
     ) {}
 
     BackHandler {
@@ -129,6 +132,7 @@ private fun BottomSheetWrapper(
                         systemUiController.setStatusBarColor(statusBarColor, darkIcons = false)
                         parent.removeView(composeView)
                     }
+
                     else -> {
                         isSheetOpened = true
                         coroutineScope.launch {
@@ -138,6 +142,7 @@ private fun BottomSheetWrapper(
                     }
                 }
             }
+
             else -> {
             }
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/BuffIcon.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/BuffIcon.kt
index 19c201e40..6e4218f0e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/BuffIcon.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/BuffIcon.kt
@@ -6,7 +6,10 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.asImageBitmap
 
 @Composable
-fun BuffIcon(buffed: Boolean?, modifier: Modifier = Modifier) {
+fun BuffIcon(
+    buffed: Boolean?,
+    modifier: Modifier = Modifier,
+) {
     if (buffed == true) {
         Image(HabiticaIconsHelper.imageOfBuffIcon().asImageBitmap(), null, modifier = modifier)
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/ClassIcon.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/ClassIcon.kt
index c67ab53af..daf20699b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/ClassIcon.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/ClassIcon.kt
@@ -6,15 +6,20 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.asImageBitmap
 
 @Composable
-fun ClassIcon(className: String?, hasClass: Boolean, modifier: Modifier = Modifier) {
+fun ClassIcon(
+    className: String?,
+    hasClass: Boolean,
+    modifier: Modifier = Modifier,
+) {
     if (hasClass) {
-        val icon = when (className) {
-            "warrior" -> HabiticaIconsHelper.imageOfWarriorLightBg().asImageBitmap()
-            "wizard" -> HabiticaIconsHelper.imageOfMageLightBg().asImageBitmap()
-            "healer" -> HabiticaIconsHelper.imageOfHealerLightBg().asImageBitmap()
-            "rogue" -> HabiticaIconsHelper.imageOfRogueLightBg().asImageBitmap()
-            else -> null
-        }
+        val icon =
+            when (className) {
+                "warrior" -> HabiticaIconsHelper.imageOfWarriorLightBg().asImageBitmap()
+                "wizard" -> HabiticaIconsHelper.imageOfMageLightBg().asImageBitmap()
+                "healer" -> HabiticaIconsHelper.imageOfHealerLightBg().asImageBitmap()
+                "rogue" -> HabiticaIconsHelper.imageOfRogueLightBg().asImageBitmap()
+                else -> null
+            }
         if (icon != null) {
             Image(bitmap = icon, "", modifier = modifier)
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/ClassText.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/ClassText.kt
index 36ae6725b..cffc5e660 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/ClassText.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/ClassText.kt
@@ -20,33 +20,35 @@ fun ClassText(
     hasClass: Boolean,
     fontSize: TextUnit,
     modifier: Modifier = Modifier,
-    iconSize: Dp? = null
+    iconSize: Dp? = null,
 ) {
     if (!hasClass) return
-    val classColor = colorResource(
-        when (className) {
-            "warrior" -> R.color.text_red
-            "wizard" -> R.color.text_blue
-            "rogue" -> R.color.text_brand
-            "healer" -> R.color.text_yellow
-            else -> R.color.text_primary
-        }
-    )
+    val classColor =
+        colorResource(
+            when (className) {
+                "warrior" -> R.color.text_red
+                "wizard" -> R.color.text_blue
+                "rogue" -> R.color.text_brand
+                "healer" -> R.color.text_yellow
+                else -> R.color.text_primary
+            },
+        )
     Row(verticalAlignment = Alignment.CenterVertically, modifier = modifier) {
         ClassIcon(
             className = className,
             hasClass = true,
-            modifier = Modifier.size(
-                iconSize ?: with(LocalDensity.current) {
-                    fontSize.toDp()
-                }
-            )
+            modifier =
+                Modifier.size(
+                    iconSize ?: with(LocalDensity.current) {
+                        fontSize.toDp()
+                    },
+                ),
         )
         Text(
             getTranslatedClassName(LocalContext.current.resources, className),
             fontSize = fontSize,
             fontWeight = FontWeight.SemiBold,
-            color = classColor
+            color = classColor,
         )
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CollapsibleSectionView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CollapsibleSectionView.kt
index 60a0af08e..7c59478ca 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CollapsibleSectionView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CollapsibleSectionView.kt
@@ -13,13 +13,15 @@ import com.habitrpg.android.habitica.databinding.ViewCollapsibleSectionBinding
 import com.habitrpg.common.habitica.extensions.getThemeColor
 import com.habitrpg.common.habitica.extensions.layoutInflater
 
-class CollapsibleSectionView(context: Context, attrs: AttributeSet?) : LinearLayout(context, attrs) {
+class CollapsibleSectionView(context: Context, attrs: AttributeSet?) :
+    LinearLayout(context, attrs) {
     val infoIconView: ImageView
         get() = binding.infoIconView
     private val binding = ViewCollapsibleSectionBinding.inflate(context.layoutInflater, this)
     private var preferences: SharedPreferences? = null
     private val padding = context.resources?.getDimension(R.dimen.spacing_large)?.toInt() ?: 0
-    private val bottomPadding = context.resources?.getDimension(R.dimen.collapsible_section_padding)?.toInt() ?: 0
+    private val bottomPadding =
+        context.resources?.getDimension(R.dimen.collapsible_section_padding)?.toInt() ?: 0
 
     var title: CharSequence
         get() {
@@ -88,14 +90,29 @@ class CollapsibleSectionView(context: Context, attrs: AttributeSet?) : LinearLay
             }
     }
 
-    override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) {
+    override fun onLayout(
+        changed: Boolean,
+        l: Int,
+        t: Int,
+        r: Int,
+        b: Int,
+    ) {
         setChildMargins()
         super.onLayout(changed, l, t, r, b)
     }
 
-    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+    override fun onMeasure(
+        widthMeasureSpec: Int,
+        heightMeasureSpec: Int,
+    ) {
         var height = 0
-        measureChildWithMargins(binding.sectionTitleView, widthMeasureSpec, 0, heightMeasureSpec, height)
+        measureChildWithMargins(
+            binding.sectionTitleView,
+            widthMeasureSpec,
+            0,
+            heightMeasureSpec,
+            height,
+        )
         height += binding.sectionTitleView.measuredHeight
         (1 until childCount)
             .map { getChildAt(it) }
@@ -117,12 +134,13 @@ class CollapsibleSectionView(context: Context, attrs: AttributeSet?) : LinearLay
         binding.sectionTitleView.setOnClickListener {
             isCollapsed = !isCollapsed
         }
-        val attributes = context.theme?.obtainStyledAttributes(
-            attrs,
-            R.styleable.CollapsibleSectionView,
-            0,
-            0
-        )
+        val attributes =
+            context.theme?.obtainStyledAttributes(
+                attrs,
+                R.styleable.CollapsibleSectionView,
+                0,
+                0,
+            )
         title = attributes?.getString(R.styleable.CollapsibleSectionView_title) ?: ""
         identifier = attributes?.getString(R.styleable.CollapsibleSectionView_identifier)
 
@@ -132,8 +150,18 @@ class CollapsibleSectionView(context: Context, attrs: AttributeSet?) : LinearLay
             binding.titleTextView.setTextColor(color)
         }
 
-        if (attributes?.getBoolean(R.styleable.CollapsibleSectionView_hasAdditionalInfo, false) == true) {
-            binding.infoIconView.setImageBitmap(HabiticaIconsHelper.imageOfInfoIcon(context.getThemeColor(R.attr.colorPrimaryOffset)))
+        if (attributes?.getBoolean(
+                R.styleable.CollapsibleSectionView_hasAdditionalInfo,
+                false,
+            ) == true
+        ) {
+            binding.infoIconView.setImageBitmap(
+                HabiticaIconsHelper.imageOfInfoIcon(
+                    context.getThemeColor(
+                        R.attr.colorPrimaryOffset,
+                    ),
+                ),
+            )
         } else {
             binding.infoIconView.visibility = View.GONE
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CompletedAt.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CompletedAt.kt
index 11a84ee14..714433627 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CompletedAt.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CompletedAt.kt
@@ -18,27 +18,36 @@ import java.text.DateFormat
 import java.util.Date
 
 val completedTimeFormatToday: DateFormat = DateFormat.getTimeInstance(DateFormat.SHORT)
-val completedTimeFormat: DateFormat = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT)
+val completedTimeFormat: DateFormat =
+    DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT)
 
 @Composable
 fun CompletedAt(
-    completedAt: Date?
+    completedAt: Date?,
 ) {
     val completedToday = completedAt?.time?.let { DateUtils.isToday(it) } ?: false
     Row(
         verticalAlignment = Alignment.CenterVertically,
-        modifier = Modifier.padding(top = 4.dp)
+        modifier = Modifier.padding(top = 4.dp),
     ) {
         Image(painterResource(R.drawable.completed), null)
         Text(
             stringResource(
                 R.string.completed_at,
-                completedAt?.let { if (completedToday) completedTimeFormatToday.format(it) else completedTimeFormat.format(it) }
-                    ?: ""
+                completedAt?.let {
+                    if (completedToday) {
+                        completedTimeFormatToday.format(it)
+                    } else {
+                        completedTimeFormat.format(
+                            it,
+                        )
+                    }
+                }
+                    ?: "",
             ),
             fontSize = 14.sp,
             color = if (completedToday) colorResource(R.color.green_10) else colorResource(R.color.text_secondary),
-            modifier = Modifier.padding(start = 4.dp)
+            modifier = Modifier.padding(start = 4.dp),
         )
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyText.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyText.kt
index 65e547eae..172f78c15 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyText.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyText.kt
@@ -26,9 +26,17 @@ fun CurrencyText(
     fontSize: TextUnit = 12.sp,
     decimals: Int = 0,
     minForAbbreviation: Int = 0,
-    animated: Boolean = true
+    animated: Boolean = true,
 ) {
-    CurrencyText(currency = currency, value = value.toDouble(), modifier, fontSize, decimals, minForAbbreviation, animated)
+    CurrencyText(
+        currency = currency,
+        value = value.toDouble(),
+        modifier,
+        fontSize,
+        decimals,
+        minForAbbreviation,
+        animated,
+    )
 }
 
 @Composable
@@ -39,16 +47,17 @@ fun CurrencyText(
     fontSize: TextUnit = 12.sp,
     decimals: Int = 0,
     minForAbbreviation: Int = 0,
-    animated: Boolean = true
+    animated: Boolean = true,
 ) {
-    val animatedValue = if (animated) {
-        animateFloatAsState(
-            targetValue = value.toFloat(),
-            animationSpec = ProgressIndicatorDefaults.ProgressAnimationSpec
-        ).value
-    } else {
-        value.toFloat()
-    }
+    val animatedValue =
+        if (animated) {
+            animateFloatAsState(
+                targetValue = value.toFloat(),
+                animationSpec = ProgressIndicatorDefaults.ProgressAnimationSpec,
+            ).value
+        } else {
+            value.toFloat()
+        }
     Row(verticalAlignment = Alignment.CenterVertically, modifier = modifier) {
         when (currency) {
             "gold" -> HabiticaIconsHelper.imageOfGold()
@@ -58,14 +67,15 @@ fun CurrencyText(
         }?.asImageBitmap()?.let { Image(it, null, Modifier.padding(end = 5.dp)) }
         Text(
             NumberAbbreviator.abbreviate(null, animatedValue, decimals, minForAbbreviation),
-            color = when (currency) {
-                "gold" -> colorResource(R.color.text_gold)
-                "gems" -> colorResource(R.color.text_green)
-                "hourglasses" -> colorResource(R.color.text_brand)
-                else -> colorResource(R.color.text_primary)
-            },
+            color =
+                when (currency) {
+                    "gold" -> colorResource(R.color.text_gold)
+                    "gems" -> colorResource(R.color.text_green)
+                    "hourglasses" -> colorResource(R.color.text_brand)
+                    else -> colorResource(R.color.text_primary)
+                },
             fontSize = fontSize,
-            fontWeight = FontWeight.SemiBold
+            fontWeight = FontWeight.SemiBold,
         )
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyView.kt
index 079add07f..511cb6d3b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyView.kt
@@ -34,18 +34,21 @@ class CurrencyView : androidx.appcompat.widget.AppCompatTextView {
     private var currencyContentDescription: String? = null
 
     constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) {
-        val attributes = context.theme?.obtainStyledAttributes(
-            attrs,
-            R.styleable.CurrencyView,
-            0,
-            0
-        )
+        val attributes =
+            context.theme?.obtainStyledAttributes(
+                attrs,
+                R.styleable.CurrencyView,
+                0,
+                0,
+            )
         val fallBackLight = !context.isUsingNightModeResources()
-        lightBackground = try {
-            attributes?.getBoolean(R.styleable.CurrencyView_hasLightBackground, fallBackLight) ?: fallBackLight
-        } catch (_: ArrayIndexOutOfBoundsException) {
-            !context.isUsingNightModeResources()
-        }
+        lightBackground =
+            try {
+                attributes?.getBoolean(R.styleable.CurrencyView_hasLightBackground, fallBackLight)
+                    ?: fallBackLight
+            } catch (_: ArrayIndexOutOfBoundsException) {
+                !context.isUsingNightModeResources()
+            }
         currency = attributes?.getString(R.styleable.CurrencyView_currency)
         visibility = GONE
         setSingleLine()
@@ -63,7 +66,10 @@ class CurrencyView : androidx.appcompat.widget.AppCompatTextView {
         when (currency) {
             "gold" -> this.currencyContentDescription = context.getString(R.string.gold_plural)
             "gems" -> this.currencyContentDescription = context.getString(R.string.gems)
-            "hourglasses" -> this.currencyContentDescription = context.getString(R.string.mystic_hourglasses)
+            "hourglasses" ->
+                this.currencyContentDescription =
+                    context.getString(R.string.mystic_hourglasses)
+
             else -> this.currencyContentDescription = ""
         }
     }
@@ -105,13 +111,14 @@ class CurrencyView : androidx.appcompat.widget.AppCompatTextView {
                     drawable,
                     null,
                     null,
-                    null
+                    null,
                 )
-                val padding = TypedValue.applyDimension(
-                    TypedValue.COMPLEX_UNIT_DIP,
-                    6f,
-                    context.resources.displayMetrics
-                ).toInt()
+                val padding =
+                    TypedValue.applyDimension(
+                        TypedValue.COMPLEX_UNIT_DIP,
+                        6f,
+                        context.resources.displayMetrics,
+                    ).toInt()
                 compoundDrawablePadding = padding
                 this.gravity = Gravity.CENTER_VERTICAL
             }
@@ -123,7 +130,13 @@ class CurrencyView : androidx.appcompat.widget.AppCompatTextView {
     var animationDelay = 0L
 
     private fun update(value: Double) {
-        text = NumberAbbreviator.abbreviate(context, value, decimals, minForAbbrevation = minForAbbrevation)
+        text =
+            NumberAbbreviator.abbreviate(
+                context,
+                value,
+                decimals,
+                minForAbbrevation = minForAbbrevation,
+            )
     }
 
     private fun endUpdate() {
@@ -170,10 +183,11 @@ class CurrencyView : androidx.appcompat.widget.AppCompatTextView {
         }
 
     private fun updateVisibility() {
-        visibility = if (hideWhenEmpty) {
-            if ("0" == text) View.GONE else View.VISIBLE
-        } else {
-            View.VISIBLE
-        }
+        visibility =
+            if (hideWhenEmpty) {
+                if ("0" == text) View.GONE else View.VISIBLE
+            } else {
+                View.VISIBLE
+            }
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyViews.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyViews.kt
index 87c59a90e..c3221ccfd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyViews.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyViews.kt
@@ -15,19 +15,26 @@ class CurrencyViews : LinearLayout {
             gemTextView.lightBackground = value
             goldTextView.lightBackground = value
         }
-    private val hourglassTextView: CurrencyView = CurrencyView(context, "hourglasses", lightBackground)
+    private val hourglassTextView: CurrencyView =
+        CurrencyView(context, "hourglasses", lightBackground)
     private val goldTextView: CurrencyView = CurrencyView(context, "gold", lightBackground)
     private val gemTextView: CurrencyView = CurrencyView(context, "gems", lightBackground)
 
     var gold: Double
         get() = goldTextView.value
-        set(value) { goldTextView.value = value }
+        set(value) {
+            goldTextView.value = value
+        }
     var gems: Double
         get() = gemTextView.value
-        set(value) { gemTextView.value = value }
+        set(value) {
+            gemTextView.value = value
+        }
     var hourglasses: Double
         get() = hourglassTextView.value
-        set(value) { hourglassTextView.value = value }
+        set(value) {
+            hourglassTextView.value = value
+        }
 
     var hourglassVisibility
         get() = hourglassTextView.visibility
@@ -37,21 +44,28 @@ class CurrencyViews : LinearLayout {
         }
     var goldVisibility: Int
         get() = goldTextView.visibility
-        set(value) { goldTextView.visibility = value }
+        set(value) {
+            goldTextView.visibility = value
+        }
     var gemVisibility
         get() = gemTextView.visibility
-        set(value) { gemTextView.visibility = value }
+        set(value) {
+            gemTextView.visibility = value
+        }
 
     constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) {
-        val attributes = context.theme?.obtainStyledAttributes(
-            attrs,
-            R.styleable.CurrencyViews,
-            0,
-            0
-        )
+        val attributes =
+            context.theme?.obtainStyledAttributes(
+                attrs,
+                R.styleable.CurrencyViews,
+                0,
+                0,
+            )
         setupViews()
         val fallBackLight = !context.isUsingNightModeResources()
-        lightBackground = attributes?.getBoolean(R.styleable.CurrencyViews_hasLightBackground, fallBackLight) ?: fallBackLight
+        lightBackground =
+            attributes?.getBoolean(R.styleable.CurrencyViews_hasLightBackground, fallBackLight)
+                ?: fallBackLight
     }
 
     constructor(context: Context?) : super(context) {
@@ -59,13 +73,21 @@ class CurrencyViews : LinearLayout {
     }
 
     private fun setupViews() {
-        val margin = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 12f, context.resources.displayMetrics).toInt()
+        val margin =
+            TypedValue.applyDimension(
+                TypedValue.COMPLEX_UNIT_DIP,
+                12f,
+                context.resources.displayMetrics,
+            ).toInt()
         setupView(hourglassTextView, margin)
         setupView(goldTextView, margin)
         setupView(gemTextView, margin)
     }
 
-    private fun setupView(view: CurrencyView, margin: Int) {
+    private fun setupView(
+        view: CurrencyView,
+        margin: Int,
+    ) {
         this.addView(view)
         view.textSize = 12f
         val params = view.layoutParams as? LayoutParams
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/DayNightTextView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/DayNightTextView.kt
index ce07d5518..3c0965106 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/DayNightTextView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/DayNightTextView.kt
@@ -8,15 +8,21 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.common.habitica.extensions.isUsingNightModeResources
 
 class DayNightTextView(context: Context, attrs: AttributeSet?) : AppCompatTextView(context, attrs) {
-
     init {
-        val attributes = context.theme?.obtainStyledAttributes(attrs, R.styleable.DayNightTextView, 0, 0)
+        val attributes =
+            context.theme?.obtainStyledAttributes(attrs, R.styleable.DayNightTextView, 0, 0)
         setTextColor(
             if (context.isUsingNightModeResources()) {
-                attributes?.getColor(R.styleable.DayNightTextView_nightTextColor, ContextCompat.getColor(context, R.color.text_primary))
+                attributes?.getColor(
+                    R.styleable.DayNightTextView_nightTextColor,
+                    ContextCompat.getColor(context, R.color.text_primary),
+                )
             } else {
-                attributes?.getColor(R.styleable.DayNightTextView_dayTextColor, ContextCompat.getColor(context, R.color.text_primary))
-            } ?: ContextCompat.getColor(context, R.color.text_primary)
+                attributes?.getColor(
+                    R.styleable.DayNightTextView_dayTextColor,
+                    ContextCompat.getColor(context, R.color.text_primary),
+                )
+            } ?: ContextCompat.getColor(context, R.color.text_primary),
         )
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/DragLinearLayout.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/DragLinearLayout.kt
index 204d71f97..841bd2ba0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/DragLinearLayout.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/DragLinearLayout.kt
@@ -39,441 +39,518 @@ import kotlin.math.min
  * [.removeView] calls, so avoid using these with children previously
  * declared as draggable to prevent memory leaks and/or subtle bugs. Pull requests welcome!
  */
-open class DragLinearLayout @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : LinearLayout(context, attrs) {
-    private val nominalDistanceScaled: Float
+open class DragLinearLayout
+    @JvmOverloads
+    constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+    ) : LinearLayout(context, attrs) {
+        private val nominalDistanceScaled: Float
 
-    private var swapListener: OnViewSwapListener? = null
-    private val draggableChildren: SparseArray<DraggableChild>
-    private val draggedItem: DragItem
-    private val slop: Int
-    private var downY = -1
-    private var activePointerId = INVALID_POINTER_ID
-    private val dragTopShadowDrawable: Drawable?
-    private val dragBottomShadowDrawable: Drawable?
-    private val dragShadowHeight: Int
-    private var containerScrollView: ScrollView? = null
+        private var swapListener: OnViewSwapListener? = null
+        private val draggableChildren: SparseArray<DraggableChild>
+        private val draggedItem: DragItem
+        private val slop: Int
+        private var downY = -1
+        private var activePointerId = INVALID_POINTER_ID
+        private val dragTopShadowDrawable: Drawable?
+        private val dragBottomShadowDrawable: Drawable?
+        private val dragShadowHeight: Int
+        private var containerScrollView: ScrollView? = null
 
-    /**
-     * Sets the height from upper / lower edge at which a container [android.widget.ScrollView],
-     * if one is registered via [.setContainerScrollView],
-     * is scrolled.
-     */
-    var scrollSensitiveHeight: Int = 0
-
-    private var dragUpdater: Runnable? = null
-
-    /**
-     * Use with [com.habitrpg.android.habitica.ui.views.DragLinearLayout.setOnViewSwapListener]
-     * to listen for draggable view swaps.
-     */
-    interface OnViewSwapListener {
         /**
-         * Invoked right before the two items are swapped due to a drag event.
-         * After the swap, the firstView will be in the secondPosition, and vice versa.
-         *
-         *
-         * No guarantee is made as to which of the two has a lesser/greater position.
+         * Sets the height from upper / lower edge at which a container [android.widget.ScrollView],
+         * if one is registered via [.setContainerScrollView],
+         * is scrolled.
          */
-        fun onSwap(firstView: View?, firstPosition: Int, secondView: View, secondPosition: Int)
-    }
+        var scrollSensitiveHeight: Int = 0
+
+        private var dragUpdater: Runnable? = null
 
-    private class DraggableChild {
         /**
-         * If non-null, a reference to an on-going position animation.
+         * Use with [com.habitrpg.android.habitica.ui.views.DragLinearLayout.setOnViewSwapListener]
+         * to listen for draggable view swaps.
          */
-        var swapAnimation: ValueAnimator? = null
-
-        fun endExistingAnimation() {
-            swapAnimation?.end()
+        interface OnViewSwapListener {
+            /**
+             * Invoked right before the two items are swapped due to a drag event.
+             * After the swap, the firstView will be in the secondPosition, and vice versa.
+             *
+             *
+             * No guarantee is made as to which of the two has a lesser/greater position.
+             */
+            fun onSwap(
+                firstView: View?,
+                firstPosition: Int,
+                secondView: View,
+                secondPosition: Int,
+            )
         }
 
-        fun cancelExistingAnimation() {
-            swapAnimation?.cancel()
+        private class DraggableChild {
+            /**
+             * If non-null, a reference to an on-going position animation.
+             */
+            var swapAnimation: ValueAnimator? = null
+
+            fun endExistingAnimation() {
+                swapAnimation?.end()
+            }
+
+            fun cancelExistingAnimation() {
+                swapAnimation?.cancel()
+            }
         }
-    }
 
-    /**
-     * Holds state information about the currently dragged item.
-     *
-     *
-     * Rough lifecycle:
-     *  * #startDetectingOnPossibleDrag - #detecting == true
-     *  *      if drag is recognised, #onDragStart - #dragging == true
-     *  *      if drag ends, #onDragStop - #dragging == false, #settling == true
-     *  * if gesture ends without drag, or settling finishes, #stopDetecting - #detecting == false
-     */
-    private inner class DragItem {
-        var view: View? = null
-        private var startVisibility: Int = 0
-        var viewDrawable: BitmapDrawable? = null
-        var position: Int = 0
-        var startTop: Int = 0
-        var height: Int = 0
-        var totalDragOffset: Int = 0
-        var targetTopOffset: Int = 0
-        var settleAnimation: ValueAnimator? = null
+        /**
+         * Holds state information about the currently dragged item.
+         *
+         *
+         * Rough lifecycle:
+         *  * #startDetectingOnPossibleDrag - #detecting == true
+         *  *      if drag is recognised, #onDragStart - #dragging == true
+         *  *      if drag ends, #onDragStop - #dragging == false, #settling == true
+         *  * if gesture ends without drag, or settling finishes, #stopDetecting - #detecting == false
+         */
+        private inner class DragItem {
+            var view: View? = null
+            private var startVisibility: Int = 0
+            var viewDrawable: BitmapDrawable? = null
+            var position: Int = 0
+            var startTop: Int = 0
+            var height: Int = 0
+            var totalDragOffset: Int = 0
+            var targetTopOffset: Int = 0
+            var settleAnimation: ValueAnimator? = null
 
-        var detecting: Boolean = false
-        var dragging: Boolean = false
+            var detecting: Boolean = false
+            var dragging: Boolean = false
+
+            init {
+                stopDetecting()
+            }
+
+            fun startDetectingOnPossibleDrag(
+                view: View,
+                position: Int,
+            ) {
+                this.view = view
+                this.startVisibility = view.visibility
+                this.viewDrawable = getDragDrawable(view)
+                this.position = position
+                this.startTop = view.top
+                this.height = view.height
+                this.totalDragOffset = 0
+                this.targetTopOffset = 0
+                this.settleAnimation = null
+
+                this.detecting = true
+            }
+
+            fun onDragStart() {
+                view?.visibility = View.INVISIBLE
+                this.dragging = true
+            }
+
+            fun setTotalOffset(offset: Int) {
+                totalDragOffset = offset
+                updateTargetTop()
+            }
+
+            fun updateTargetTop() {
+                targetTopOffset = startTop - (view?.top ?: 0) + totalDragOffset
+            }
+
+            fun onDragStop() {
+                this.dragging = false
+            }
+
+            fun settling(): Boolean {
+                return null != settleAnimation
+            }
+
+            fun stopDetecting() {
+                this.detecting = false
+                if (null != view) view?.visibility = startVisibility
+                view = null
+                startVisibility = -1
+                viewDrawable = null
+                position = -1
+                startTop = -1
+                height = -1
+                totalDragOffset = 0
+                targetTopOffset = 0
+                if (null != settleAnimation) settleAnimation?.end()
+                settleAnimation = null
+            }
+        }
 
         init {
-            stopDetecting()
+
+            orientation = VERTICAL
+
+            draggableChildren = SparseArray()
+
+            draggedItem = DragItem()
+            val vc = ViewConfiguration.get(context)
+            slop = vc.scaledTouchSlop
+
+            val resources = resources
+            dragTopShadowDrawable =
+                ContextCompat.getDrawable(context, R.drawable.ab_solid_shadow_holo_flipped)
+            dragBottomShadowDrawable =
+                ContextCompat.getDrawable(context, R.drawable.ab_solid_shadow_holo)
+            dragShadowHeight = resources.getDimensionPixelSize(R.dimen.downwards_drop_shadow_height)
+
+            scrollSensitiveHeight =
+                (DEFAULT_SCROLL_SENSITIVE_AREA_HEIGHT_DP * resources.displayMetrics.density + 0.5f).toInt()
+
+            nominalDistanceScaled =
+                (NOMINAL_DISTANCE * resources.displayMetrics.density + 0.5f).toInt().toFloat()
         }
 
-        fun startDetectingOnPossibleDrag(view: View, position: Int) {
-            this.view = view
-            this.startVisibility = view.visibility
-            this.viewDrawable = getDragDrawable(view)
-            this.position = position
-            this.startTop = view.top
-            this.height = view.height
-            this.totalDragOffset = 0
-            this.targetTopOffset = 0
-            this.settleAnimation = null
-
-            this.detecting = true
-        }
-
-        fun onDragStart() {
-            view?.visibility = View.INVISIBLE
-            this.dragging = true
-        }
-
-        fun setTotalOffset(offset: Int) {
-            totalDragOffset = offset
-            updateTargetTop()
-        }
-
-        fun updateTargetTop() {
-            targetTopOffset = startTop - (view?.top ?: 0) + totalDragOffset
-        }
-
-        fun onDragStop() {
-            this.dragging = false
-        }
-
-        fun settling(): Boolean {
-            return null != settleAnimation
-        }
-
-        fun stopDetecting() {
-            this.detecting = false
-            if (null != view) view?.visibility = startVisibility
-            view = null
-            startVisibility = -1
-            viewDrawable = null
-            position = -1
-            startTop = -1
-            height = -1
-            totalDragOffset = 0
-            targetTopOffset = 0
-            if (null != settleAnimation) settleAnimation?.end()
-            settleAnimation = null
-        }
-    }
-
-    init {
-
-        orientation = VERTICAL
-
-        draggableChildren = SparseArray()
-
-        draggedItem = DragItem()
-        val vc = ViewConfiguration.get(context)
-        slop = vc.scaledTouchSlop
-
-        val resources = resources
-        dragTopShadowDrawable = ContextCompat.getDrawable(context, R.drawable.ab_solid_shadow_holo_flipped)
-        dragBottomShadowDrawable = ContextCompat.getDrawable(context, R.drawable.ab_solid_shadow_holo)
-        dragShadowHeight = resources.getDimensionPixelSize(R.dimen.downwards_drop_shadow_height)
-
-        scrollSensitiveHeight = (DEFAULT_SCROLL_SENSITIVE_AREA_HEIGHT_DP * resources.displayMetrics.density + 0.5f).toInt()
-
-        nominalDistanceScaled = (NOMINAL_DISTANCE * resources.displayMetrics.density + 0.5f).toInt().toFloat()
-    }
-
-    override fun setOrientation(orientation: Int) {
-        // enforce VERTICAL orientation; remove if HORIZONTAL support is ever added
-        if (HORIZONTAL == orientation) {
-            throw IllegalArgumentException("DragLinearLayout must be VERTICAL.")
-        }
-        super.setOrientation(orientation)
-    }
-
-    /**
-     * Makes the child a candidate for dragging. Must be an existing child of this layout.
-     */
-    fun setViewDraggable(child: View, dragHandle: View) {
-        if (this === child.parent) {
-            dragHandle.setOnTouchListener(DragHandleOnTouchListener(child))
-            draggableChildren.put(indexOfChild(child), DraggableChild())
-        } else {
-            Log.e(LOG_TAG, "$child is not a child, cannot make draggable.")
-        }
-    }
-
-    /**
-     * Makes the child a candidate for dragging. Must be an existing child of this layout.
-     */
-    fun removeViewDraggable(child: View) {
-        if (this === child.parent) {
-            draggableChildren.remove(indexOfChild(child))
-            draggableChildren.put(indexOfChild(child), DraggableChild())
-        }
-    }
-
-    override fun removeAllViews() {
-        super.removeAllViews()
-        draggableChildren.clear()
-    }
-
-    /**
-     * See [com.habitrpg.android.habitica.ui.views.DragLinearLayout.OnViewSwapListener].
-     */
-    fun setOnViewSwapListener(swapListener: OnViewSwapListener) {
-        this.swapListener = swapListener
-    }
-
-    /**
-     * A linear relationship b/w distance and duration, bounded.
-     */
-    private fun getTranslateAnimationDuration(distance: Float): Long {
-        return min(MAX_SWITCH_DURATION, max(MIN_SWITCH_DURATION, (NOMINAL_SWITCH_DURATION * abs(distance) / nominalDistanceScaled).toLong()))
-    }
-
-    /**
-     * Initiates a new [.draggedItem] unless the current one is still
-     * [com.habitrpg.android.habitica.ui.views.DragLinearLayout.DragItem.detecting].
-     */
-    private fun startDetectingDrag(child: View) {
-        if (draggedItem.detecting) {
-            return // existing drag in process, only one at a time is allowed
-        }
-
-        val position = indexOfChild(child)
-
-        // complete any existing animations, both for the newly selected child and the previous dragged one
-        draggableChildren.get(position).endExistingAnimation()
-
-        draggedItem.startDetectingOnPossibleDrag(child, position)
-        containerScrollView?.requestDisallowInterceptTouchEvent(true)
-    }
-
-    private fun startDrag() {
-        // remove layout transition, it conflicts with drag animation
-        // we will restore it after drag animation end, see onDragStop()
-        layoutTransition = layoutTransition
-        if (layoutTransition != null) {
-            layoutTransition = null
-        }
-
-        draggedItem.onDragStart()
-        requestDisallowInterceptTouchEvent(true)
-    }
-
-    /**
-     * Animates the dragged item to its final resting position.
-     */
-    private fun onDragStop() {
-        draggedItem.settleAnimation = ValueAnimator.ofFloat(
-            draggedItem.totalDragOffset.toFloat(),
-            (draggedItem.totalDragOffset - draggedItem.targetTopOffset).toFloat()
-        )
-            .setDuration(getTranslateAnimationDuration(draggedItem.targetTopOffset.toFloat()))
-        draggedItem.settleAnimation?.addUpdateListener(
-            ValueAnimator.AnimatorUpdateListener { animation ->
-                if (!draggedItem.detecting) return@AnimatorUpdateListener // already stopped
-
-                draggedItem.setTotalOffset((animation.animatedValue as? Float)?.toInt() ?: 0)
-
-                val shadowAlpha = ((1 - animation.animatedFraction) * 255).toInt()
-                if (null != dragTopShadowDrawable) dragTopShadowDrawable.alpha = shadowAlpha
-                dragBottomShadowDrawable?.alpha = shadowAlpha
-                invalidate()
-            }
-        )
-        draggedItem.settleAnimation?.addListener(object : AnimatorListenerAdapter() {
-            override fun onAnimationStart(animation: Animator) {
-                draggedItem.onDragStop()
+        override fun setOrientation(orientation: Int) {
+            // enforce VERTICAL orientation; remove if HORIZONTAL support is ever added
+            if (HORIZONTAL == orientation) {
+                throw IllegalArgumentException("DragLinearLayout must be VERTICAL.")
             }
+            super.setOrientation(orientation)
+        }
 
-            override fun onAnimationEnd(animation: Animator) {
-                if (!draggedItem.detecting) {
-                    return // already stopped
-                }
-
-                draggedItem.settleAnimation = null
-                draggedItem.stopDetecting()
-
-                if (null != dragTopShadowDrawable) dragTopShadowDrawable.alpha = 255
-                dragBottomShadowDrawable?.alpha = 255
-
-                // restore layout transition
-                if (layoutTransition != null && layoutTransition == null) {
-                    layoutTransition = layoutTransition
-                }
-            }
-        })
-        draggedItem.settleAnimation?.start()
-    }
-
-    /**
-     * Updates the dragged item with the given total offset from its starting position.
-     * Evaluates and executes draggable view swaps.
-     */
-    private fun onDrag(offset: Int) {
-        draggedItem.setTotalOffset(offset)
-        invalidate()
-
-        val currentTop = draggedItem.startTop + draggedItem.totalDragOffset
-
-        handleContainerScroll(currentTop)
-
-        val belowPosition = nextDraggablePosition(draggedItem.position)
-        val abovePosition = previousDraggablePosition(draggedItem.position)
-
-        val belowView = getChildAt(belowPosition)
-        val aboveView = getChildAt(abovePosition)
-
-        val isBelow = belowView != null && currentTop + draggedItem.height > belowView.top + belowView.height / 2
-        val isAbove = aboveView != null && currentTop < aboveView.top + aboveView.height / 2
-
-        if (isBelow || isAbove) {
-            val switchView = if (isBelow) belowView else aboveView
-
-            // swap elements
-            val originalPosition = draggedItem.position
-            val switchPosition = if (isBelow) belowPosition else abovePosition
-
-            draggableChildren.get(switchPosition).cancelExistingAnimation()
-            val switchViewStartY = switchView.y
-
-            if (null != swapListener) {
-                swapListener?.onSwap(draggedItem.view, draggedItem.position, switchView, switchPosition)
-            }
-
-            if (isBelow) {
-                removeViewAt(originalPosition)
-                removeViewAt(switchPosition - 1)
-
-                addView(belowView, originalPosition)
-                addView(draggedItem.view, switchPosition)
+        /**
+         * Makes the child a candidate for dragging. Must be an existing child of this layout.
+         */
+        fun setViewDraggable(
+            child: View,
+            dragHandle: View,
+        ) {
+            if (this === child.parent) {
+                dragHandle.setOnTouchListener(DragHandleOnTouchListener(child))
+                draggableChildren.put(indexOfChild(child), DraggableChild())
             } else {
-                removeViewAt(switchPosition)
-                removeViewAt(originalPosition - 1)
-
-                addView(draggedItem.view, switchPosition)
-                addView(aboveView, originalPosition)
+                Log.e(LOG_TAG, "$child is not a child, cannot make draggable.")
             }
-            draggedItem.position = switchPosition
+        }
 
-            val switchViewObserver = switchView.viewTreeObserver
-            switchViewObserver.addOnPreDrawListener(object : OnPreDrawListener {
-                override fun onPreDraw(): Boolean {
-                    switchViewObserver.removeOnPreDrawListener(this)
+        /**
+         * Makes the child a candidate for dragging. Must be an existing child of this layout.
+         */
+        fun removeViewDraggable(child: View) {
+            if (this === child.parent) {
+                draggableChildren.remove(indexOfChild(child))
+                draggableChildren.put(indexOfChild(child), DraggableChild())
+            }
+        }
 
-                    val switchAnimator = ObjectAnimator.ofFloat(switchView, "y", switchViewStartY, switchView.top.toFloat())
-                        .setDuration(getTranslateAnimationDuration(switchView.top - switchViewStartY))
-                    switchAnimator.addListener(object : AnimatorListenerAdapter() {
-                        override fun onAnimationStart(animation: Animator) {
-                            draggableChildren.get(originalPosition).swapAnimation = switchAnimator
-                        }
+        override fun removeAllViews() {
+            super.removeAllViews()
+            draggableChildren.clear()
+        }
 
-                        override fun onAnimationEnd(animation: Animator) {
-                            draggableChildren.get(originalPosition).swapAnimation = null
-                        }
-                    })
-                    switchAnimator.start()
+        /**
+         * See [com.habitrpg.android.habitica.ui.views.DragLinearLayout.OnViewSwapListener].
+         */
+        fun setOnViewSwapListener(swapListener: OnViewSwapListener) {
+            this.swapListener = swapListener
+        }
 
-                    return true
-                }
-            })
+        /**
+         * A linear relationship b/w distance and duration, bounded.
+         */
+        private fun getTranslateAnimationDuration(distance: Float): Long {
+            return min(
+                MAX_SWITCH_DURATION,
+                max(
+                    MIN_SWITCH_DURATION,
+                    (NOMINAL_SWITCH_DURATION * abs(distance) / nominalDistanceScaled).toLong(),
+                ),
+            )
+        }
 
-            val observer = draggedItem.view!!.viewTreeObserver
-            observer.addOnPreDrawListener(object : OnPreDrawListener {
-                override fun onPreDraw(): Boolean {
-                    observer.removeOnPreDrawListener(this)
-                    draggedItem.updateTargetTop()
+        /**
+         * Initiates a new [.draggedItem] unless the current one is still
+         * [com.habitrpg.android.habitica.ui.views.DragLinearLayout.DragItem.detecting].
+         */
+        private fun startDetectingDrag(child: View) {
+            if (draggedItem.detecting) {
+                return // existing drag in process, only one at a time is allowed
+            }
 
-                    // TODO test if still necessary..
-                    // because draggedItem#view#getTop() is only up-to-date NOW
-                    // (and not right after the #addView() swaps above)
-                    // we may need to update an ongoing settle animation
-                    if (draggedItem.settling()) {
-                        Log.d(LOG_TAG, "Updating settle animation")
-                        draggedItem.settleAnimation!!.removeAllListeners()
-                        draggedItem.settleAnimation!!.cancel()
-                        onDragStop()
+            val position = indexOfChild(child)
+
+            // complete any existing animations, both for the newly selected child and the previous dragged one
+            draggableChildren.get(position).endExistingAnimation()
+
+            draggedItem.startDetectingOnPossibleDrag(child, position)
+            containerScrollView?.requestDisallowInterceptTouchEvent(true)
+        }
+
+        private fun startDrag() {
+            // remove layout transition, it conflicts with drag animation
+            // we will restore it after drag animation end, see onDragStop()
+            layoutTransition = layoutTransition
+            if (layoutTransition != null) {
+                layoutTransition = null
+            }
+
+            draggedItem.onDragStart()
+            requestDisallowInterceptTouchEvent(true)
+        }
+
+        /**
+         * Animates the dragged item to its final resting position.
+         */
+        private fun onDragStop() {
+            draggedItem.settleAnimation =
+                ValueAnimator.ofFloat(
+                    draggedItem.totalDragOffset.toFloat(),
+                    (draggedItem.totalDragOffset - draggedItem.targetTopOffset).toFloat(),
+                )
+                    .setDuration(getTranslateAnimationDuration(draggedItem.targetTopOffset.toFloat()))
+            draggedItem.settleAnimation?.addUpdateListener(
+                ValueAnimator.AnimatorUpdateListener { animation ->
+                    if (!draggedItem.detecting) return@AnimatorUpdateListener // already stopped
+
+                    draggedItem.setTotalOffset((animation.animatedValue as? Float)?.toInt() ?: 0)
+
+                    val shadowAlpha = ((1 - animation.animatedFraction) * 255).toInt()
+                    if (null != dragTopShadowDrawable) dragTopShadowDrawable.alpha = shadowAlpha
+                    dragBottomShadowDrawable?.alpha = shadowAlpha
+                    invalidate()
+                },
+            )
+            draggedItem.settleAnimation?.addListener(
+                object : AnimatorListenerAdapter() {
+                    override fun onAnimationStart(animation: Animator) {
+                        draggedItem.onDragStop()
                     }
-                    return true
-                }
-            })
+
+                    override fun onAnimationEnd(animation: Animator) {
+                        if (!draggedItem.detecting) {
+                            return // already stopped
+                        }
+
+                        draggedItem.settleAnimation = null
+                        draggedItem.stopDetecting()
+
+                        if (null != dragTopShadowDrawable) dragTopShadowDrawable.alpha = 255
+                        dragBottomShadowDrawable?.alpha = 255
+
+                        // restore layout transition
+                        if (layoutTransition != null && layoutTransition == null) {
+                            layoutTransition = layoutTransition
+                        }
+                    }
+                },
+            )
+            draggedItem.settleAnimation?.start()
         }
-    }
 
-    private fun previousDraggablePosition(position: Int): Int {
-        val startIndex = draggableChildren.indexOfKey(position)
-        return if (startIndex < 1 || startIndex > draggableChildren.size()) -1 else draggableChildren.keyAt(startIndex - 1)
-    }
+        /**
+         * Updates the dragged item with the given total offset from its starting position.
+         * Evaluates and executes draggable view swaps.
+         */
+        private fun onDrag(offset: Int) {
+            draggedItem.setTotalOffset(offset)
+            invalidate()
 
-    private fun nextDraggablePosition(position: Int): Int {
-        val startIndex = draggableChildren.indexOfKey(position)
-        return if (startIndex < -1 || startIndex > draggableChildren.size() - 2) -1 else draggableChildren.keyAt(startIndex + 1)
-    }
+            val currentTop = draggedItem.startTop + draggedItem.totalDragOffset
 
-    private fun handleContainerScroll(currentTop: Int) {
-        if (null != containerScrollView) {
-            val startScrollY = containerScrollView!!.scrollY
-            val absTop = top - startScrollY + currentTop
-            val height = containerScrollView!!.height
+            handleContainerScroll(currentTop)
 
-            val delta: Int = when {
-                absTop < scrollSensitiveHeight -> {
-                    (-MAX_DRAG_SCROLL_SPEED * smootherStep(scrollSensitiveHeight.toFloat(), 0f, absTop.toFloat())).toInt()
+            val belowPosition = nextDraggablePosition(draggedItem.position)
+            val abovePosition = previousDraggablePosition(draggedItem.position)
+
+            val belowView = getChildAt(belowPosition)
+            val aboveView = getChildAt(abovePosition)
+
+            val isBelow =
+                belowView != null && currentTop + draggedItem.height > belowView.top + belowView.height / 2
+            val isAbove = aboveView != null && currentTop < aboveView.top + aboveView.height / 2
+
+            if (isBelow || isAbove) {
+                val switchView = if (isBelow) belowView else aboveView
+
+                // swap elements
+                val originalPosition = draggedItem.position
+                val switchPosition = if (isBelow) belowPosition else abovePosition
+
+                draggableChildren.get(switchPosition).cancelExistingAnimation()
+                val switchViewStartY = switchView.y
+
+                if (null != swapListener) {
+                    swapListener?.onSwap(
+                        draggedItem.view,
+                        draggedItem.position,
+                        switchView,
+                        switchPosition,
+                    )
                 }
-                absTop > height - scrollSensitiveHeight -> {
-                    (MAX_DRAG_SCROLL_SPEED * smootherStep((height - scrollSensitiveHeight).toFloat(), height.toFloat(), absTop.toFloat())).toInt()
-                }
-                else -> {
-                    0
+
+                if (isBelow) {
+                    removeViewAt(originalPosition)
+                    removeViewAt(switchPosition - 1)
+
+                    addView(belowView, originalPosition)
+                    addView(draggedItem.view, switchPosition)
+                } else {
+                    removeViewAt(switchPosition)
+                    removeViewAt(originalPosition - 1)
+
+                    addView(draggedItem.view, switchPosition)
+                    addView(aboveView, originalPosition)
                 }
+                draggedItem.position = switchPosition
+
+                val switchViewObserver = switchView.viewTreeObserver
+                switchViewObserver.addOnPreDrawListener(
+                    object : OnPreDrawListener {
+                        override fun onPreDraw(): Boolean {
+                            switchViewObserver.removeOnPreDrawListener(this)
+
+                            val switchAnimator =
+                                ObjectAnimator.ofFloat(
+                                    switchView,
+                                    "y",
+                                    switchViewStartY,
+                                    switchView.top.toFloat(),
+                                )
+                                    .setDuration(getTranslateAnimationDuration(switchView.top - switchViewStartY))
+                            switchAnimator.addListener(
+                                object : AnimatorListenerAdapter() {
+                                    override fun onAnimationStart(animation: Animator) {
+                                        draggableChildren.get(originalPosition).swapAnimation = switchAnimator
+                                    }
+
+                                    override fun onAnimationEnd(animation: Animator) {
+                                        draggableChildren.get(originalPosition).swapAnimation = null
+                                    }
+                                },
+                            )
+                            switchAnimator.start()
+
+                            return true
+                        }
+                    },
+                )
+
+                val observer = draggedItem.view!!.viewTreeObserver
+                observer.addOnPreDrawListener(
+                    object : OnPreDrawListener {
+                        override fun onPreDraw(): Boolean {
+                            observer.removeOnPreDrawListener(this)
+                            draggedItem.updateTargetTop()
+
+                            // TODO test if still necessary..
+                            // because draggedItem#view#getTop() is only up-to-date NOW
+                            // (and not right after the #addView() swaps above)
+                            // we may need to update an ongoing settle animation
+                            if (draggedItem.settling()) {
+                                Log.d(LOG_TAG, "Updating settle animation")
+                                draggedItem.settleAnimation!!.removeAllListeners()
+                                draggedItem.settleAnimation!!.cancel()
+                                onDragStop()
+                            }
+                            return true
+                        }
+                    },
+                )
             }
-
-            containerScrollView?.removeCallbacks(dragUpdater)
-            containerScrollView?.smoothScrollBy(0, delta)
-            dragUpdater = Runnable {
-                if (draggedItem.dragging && startScrollY != containerScrollView!!.scrollY) {
-                    onDrag(draggedItem.totalDragOffset + delta)
-                }
-            }
-            containerScrollView?.post(dragUpdater)
         }
-    }
 
-    override fun dispatchDraw(canvas: Canvas) {
-        super.dispatchDraw(canvas)
-
-        if (draggedItem.detecting && (draggedItem.dragging || draggedItem.settling())) {
-            canvas.save()
-            canvas.translate(0f, draggedItem.totalDragOffset.toFloat())
-            draggedItem.viewDrawable?.draw(canvas)
-
-            val left = draggedItem.viewDrawable?.bounds?.left ?: 0
-            val right = draggedItem.viewDrawable?.bounds?.right ?: 0
-            val top = draggedItem.viewDrawable?.bounds?.top ?: 0
-            val bottom = draggedItem.viewDrawable?.bounds?.bottom ?: 0
-
-            dragBottomShadowDrawable?.setBounds(left, bottom, right, bottom + dragShadowHeight)
-            dragBottomShadowDrawable?.draw(canvas)
-
-            if (null != dragTopShadowDrawable) {
-                dragTopShadowDrawable.setBounds(left, top - dragShadowHeight, right, top)
-                dragTopShadowDrawable.draw(canvas)
+        private fun previousDraggablePosition(position: Int): Int {
+            val startIndex = draggableChildren.indexOfKey(position)
+            return if (startIndex < 1 || startIndex > draggableChildren.size()) {
+                -1
+            } else {
+                draggableChildren.keyAt(
+                    startIndex - 1,
+                )
+            }
+        }
+
+        private fun nextDraggablePosition(position: Int): Int {
+            val startIndex = draggableChildren.indexOfKey(position)
+            return if (startIndex < -1 || startIndex > draggableChildren.size() - 2) {
+                -1
+            } else {
+                draggableChildren.keyAt(
+                    startIndex + 1,
+                )
+            }
+        }
+
+        private fun handleContainerScroll(currentTop: Int) {
+            if (null != containerScrollView) {
+                val startScrollY = containerScrollView!!.scrollY
+                val absTop = top - startScrollY + currentTop
+                val height = containerScrollView!!.height
+
+                val delta: Int =
+                    when {
+                        absTop < scrollSensitiveHeight -> {
+                            (
+                                -MAX_DRAG_SCROLL_SPEED *
+                                    smootherStep(
+                                        scrollSensitiveHeight.toFloat(),
+                                        0f,
+                                        absTop.toFloat(),
+                                    )
+                            ).toInt()
+                        }
+
+                        absTop > height - scrollSensitiveHeight -> {
+                            (
+                                MAX_DRAG_SCROLL_SPEED *
+                                    smootherStep(
+                                        (height - scrollSensitiveHeight).toFloat(),
+                                        height.toFloat(),
+                                        absTop.toFloat(),
+                                    )
+                            ).toInt()
+                        }
+
+                        else -> {
+                            0
+                        }
+                    }
+
+                containerScrollView?.removeCallbacks(dragUpdater)
+                containerScrollView?.smoothScrollBy(0, delta)
+                dragUpdater =
+                    Runnable {
+                        if (draggedItem.dragging && startScrollY != containerScrollView!!.scrollY) {
+                            onDrag(draggedItem.totalDragOffset + delta)
+                        }
+                    }
+                containerScrollView?.post(dragUpdater)
+            }
+        }
+
+        override fun dispatchDraw(canvas: Canvas) {
+            super.dispatchDraw(canvas)
+
+            if (draggedItem.detecting && (draggedItem.dragging || draggedItem.settling())) {
+                canvas.save()
+                canvas.translate(0f, draggedItem.totalDragOffset.toFloat())
+                draggedItem.viewDrawable?.draw(canvas)
+
+                val left = draggedItem.viewDrawable?.bounds?.left ?: 0
+                val right = draggedItem.viewDrawable?.bounds?.right ?: 0
+                val top = draggedItem.viewDrawable?.bounds?.top ?: 0
+                val bottom = draggedItem.viewDrawable?.bounds?.bottom ?: 0
+
+                dragBottomShadowDrawable?.setBounds(left, bottom, right, bottom + dragShadowHeight)
+                dragBottomShadowDrawable?.draw(canvas)
+
+                if (null != dragTopShadowDrawable) {
+                    dragTopShadowDrawable.setBounds(left, top - dragShadowHeight, right, top)
+                    dragTopShadowDrawable.draw(canvas)
+                }
+
+                canvas.restore()
             }
-
-            canvas.restore()
         }
-    }
 
     /*
      * Note regarding touch handling:
@@ -501,79 +578,95 @@ open class DragLinearLayout @JvmOverloads constructor(context: Context, attrs: A
      * triggers #onTouchEnd and the draggedItem, if detecting, is #stopDetecting.
      */
 
-    override fun onInterceptTouchEvent(event: MotionEvent): Boolean {
-        when (event.action) {
-            MotionEvent.ACTION_DOWN -> {
-                if (draggedItem.detecting) return false // an existing item is (likely) settling
-                downY = event.y.toInt()
-                activePointerId = event.getPointerId(0)
+        override fun onInterceptTouchEvent(event: MotionEvent): Boolean {
+            when (event.action) {
+                MotionEvent.ACTION_DOWN -> {
+                    if (draggedItem.detecting) return false // an existing item is (likely) settling
+                    downY = event.y.toInt()
+                    activePointerId = event.getPointerId(0)
+                }
+
+                MotionEvent.ACTION_MOVE -> {
+                    if (!draggedItem.detecting) return false
+                    if (INVALID_POINTER_ID == activePointerId) return false
+                    val y = event.y
+                    val dy = y - downY
+                    if (abs(dy) > slop) {
+                        startDrag()
+                        return true
+                    }
+                    return false
+                }
+
+                MotionEvent.ACTION_POINTER_UP -> {
+                    run {
+                        val pointerIndex = event.actionIndex
+                        val pointerId = event.getPointerId(pointerIndex)
+
+                        if (pointerId != activePointerId) {
+                            return false // if active pointer, fall through and cancel!
+                        }
+                    }
+                    run {
+                        onTouchEnd()
+
+                        if (draggedItem.detecting) draggedItem.stopDetecting()
+                        return false
+                    }
+                }
+
+                MotionEvent.ACTION_CANCEL, MotionEvent.ACTION_UP -> {
+                    onTouchEnd()
+                    if (draggedItem.detecting) draggedItem.stopDetecting()
+                }
             }
-            MotionEvent.ACTION_MOVE -> {
-                if (!draggedItem.detecting) return false
-                if (INVALID_POINTER_ID == activePointerId) return false
-                val y = event.y
-                val dy = y - downY
-                if (abs(dy) > slop) {
+
+            return false
+        }
+
+        override fun onTouchEvent(event: MotionEvent): Boolean {
+            when (event.actionMasked) {
+                MotionEvent.ACTION_DOWN -> {
+                    if (!draggedItem.detecting || draggedItem.settling()) return false
                     startDrag()
                     return true
                 }
-                return false
-            }
-            MotionEvent.ACTION_POINTER_UP -> {
-                run {
-                    val pointerIndex = event.actionIndex
-                    val pointerId = event.getPointerId(pointerIndex)
 
-                    if (pointerId != activePointerId) {
-                        return false // if active pointer, fall through and cancel!
+                MotionEvent.ACTION_MOVE -> {
+                    if (!draggedItem.dragging) return false
+                    if (INVALID_POINTER_ID == activePointerId) return false
+
+                    val pointerIndex = event.findPointerIndex(activePointerId)
+                    val lastEventY = event.getY(pointerIndex).toInt()
+                    val deltaY = lastEventY - downY
+
+                    onDrag(deltaY)
+                    return true
+                }
+
+                MotionEvent.ACTION_POINTER_UP -> {
+                    run {
+                        val pointerIndex = event.actionIndex
+                        val pointerId = event.getPointerId(pointerIndex)
+
+                        if (pointerId != activePointerId) {
+                            return false // if active pointer, fall through and cancel!
+                        }
+                    }
+                    run {
+                        onTouchEnd()
+
+                        if (draggedItem.dragging) {
+                            onDragStop()
+                        } else if (draggedItem.detecting) {
+                            draggedItem.stopDetecting()
+                        }
+                        return true
                     }
                 }
-                run {
+
+                MotionEvent.ACTION_CANCEL, MotionEvent.ACTION_UP -> {
                     onTouchEnd()
-
-                    if (draggedItem.detecting) draggedItem.stopDetecting()
-                    return false
-                }
-            }
-            MotionEvent.ACTION_CANCEL, MotionEvent.ACTION_UP -> {
-                onTouchEnd()
-                if (draggedItem.detecting) draggedItem.stopDetecting()
-            }
-        }
-
-        return false
-    }
-
-    override fun onTouchEvent(event: MotionEvent): Boolean {
-        when (event.actionMasked) {
-            MotionEvent.ACTION_DOWN -> {
-                if (!draggedItem.detecting || draggedItem.settling()) return false
-                startDrag()
-                return true
-            }
-            MotionEvent.ACTION_MOVE -> {
-                if (!draggedItem.dragging) return false
-                if (INVALID_POINTER_ID == activePointerId) return false
-
-                val pointerIndex = event.findPointerIndex(activePointerId)
-                val lastEventY = event.getY(pointerIndex).toInt()
-                val deltaY = lastEventY - downY
-
-                onDrag(deltaY)
-                return true
-            }
-            MotionEvent.ACTION_POINTER_UP -> {
-                run {
-                    val pointerIndex = event.actionIndex
-                    val pointerId = event.getPointerId(pointerIndex)
-
-                    if (pointerId != activePointerId) {
-                        return false // if active pointer, fall through and cancel!
-                    }
-                }
-                run {
-                    onTouchEnd()
-
                     if (draggedItem.dragging) {
                         onDragStop()
                     } else if (draggedItem.detecting) {
@@ -582,76 +675,72 @@ open class DragLinearLayout @JvmOverloads constructor(context: Context, attrs: A
                     return true
                 }
             }
-            MotionEvent.ACTION_CANCEL, MotionEvent.ACTION_UP -> {
-                onTouchEnd()
-                if (draggedItem.dragging) {
-                    onDragStop()
-                } else if (draggedItem.detecting) {
-                    draggedItem.stopDetecting()
-                }
-                return true
-            }
-        }
-        return false
-    }
-
-    private fun onTouchEnd() {
-        downY = -1
-        activePointerId = INVALID_POINTER_ID
-    }
-
-    private inner class DragHandleOnTouchListener(private val view: View) : OnTouchListener {
-
-        override fun onTouch(v: View, event: MotionEvent): Boolean {
-            view.performClick()
-            if (MotionEvent.ACTION_DOWN == event.actionMasked) {
-                startDetectingDrag(view)
-            }
             return false
         }
-    }
 
-    private fun getDragDrawable(view: View): BitmapDrawable {
-        val top = view.top
-        val left = view.left
-
-        val bitmap = getBitmapFromView(view)
-
-        val drawable = BitmapDrawable(resources, bitmap)
-
-        drawable.bounds = Rect(left, top, left + view.width, top + view.height)
-
-        return drawable
-    }
-
-    companion object {
-        private val LOG_TAG = DragLinearLayout::class.java.simpleName
-        private const val NOMINAL_SWITCH_DURATION: Long = 150
-        private const val MIN_SWITCH_DURATION = NOMINAL_SWITCH_DURATION
-        private const val MAX_SWITCH_DURATION = NOMINAL_SWITCH_DURATION * 2
-        private const val NOMINAL_DISTANCE = 20f
-
-        private const val INVALID_POINTER_ID = -1
-        private const val DEFAULT_SCROLL_SENSITIVE_AREA_HEIGHT_DP = 48
-        private const val MAX_DRAG_SCROLL_SPEED = 16
-
-        /**
-         * By Ken Perlin. See [Smoothstep - Wikipedia](http://en.wikipedia.org/wiki/Smoothstep).
-         */
-        private fun smootherStep(edge1: Float, edge2: Float, `val`: Float): Float {
-            var value = `val`
-            value = max(0f, min((value - edge1) / (edge2 - edge1), 1f))
-            return value * value * value * (value * (value * 6 - 15) + 10)
+        private fun onTouchEnd() {
+            downY = -1
+            activePointerId = INVALID_POINTER_ID
         }
 
-        /**
-         * @return a bitmap showing a screenshot of the view passed in.
-         */
-        private fun getBitmapFromView(view: View): Bitmap {
-            val bitmap = Bitmap.createBitmap(view.width, view.height, Bitmap.Config.ARGB_8888)
-            val canvas = Canvas(bitmap)
-            view.draw(canvas)
-            return bitmap
+        private inner class DragHandleOnTouchListener(private val view: View) : OnTouchListener {
+            override fun onTouch(
+                v: View,
+                event: MotionEvent,
+            ): Boolean {
+                view.performClick()
+                if (MotionEvent.ACTION_DOWN == event.actionMasked) {
+                    startDetectingDrag(view)
+                }
+                return false
+            }
+        }
+
+        private fun getDragDrawable(view: View): BitmapDrawable {
+            val top = view.top
+            val left = view.left
+
+            val bitmap = getBitmapFromView(view)
+
+            val drawable = BitmapDrawable(resources, bitmap)
+
+            drawable.bounds = Rect(left, top, left + view.width, top + view.height)
+
+            return drawable
+        }
+
+        companion object {
+            private val LOG_TAG = DragLinearLayout::class.java.simpleName
+            private const val NOMINAL_SWITCH_DURATION: Long = 150
+            private const val MIN_SWITCH_DURATION = NOMINAL_SWITCH_DURATION
+            private const val MAX_SWITCH_DURATION = NOMINAL_SWITCH_DURATION * 2
+            private const val NOMINAL_DISTANCE = 20f
+
+            private const val INVALID_POINTER_ID = -1
+            private const val DEFAULT_SCROLL_SENSITIVE_AREA_HEIGHT_DP = 48
+            private const val MAX_DRAG_SCROLL_SPEED = 16
+
+            /**
+             * By Ken Perlin. See [Smoothstep - Wikipedia](http://en.wikipedia.org/wiki/Smoothstep).
+             */
+            private fun smootherStep(
+                edge1: Float,
+                edge2: Float,
+                `val`: Float,
+            ): Float {
+                var value = `val`
+                value = max(0f, min((value - edge1) / (edge2 - edge1), 1f))
+                return value * value * value * (value * (value * 6 - 15) + 10)
+            }
+
+            /**
+             * @return a bitmap showing a screenshot of the view passed in.
+             */
+            private fun getBitmapFromView(view: View): Bitmap {
+                val bitmap = Bitmap.createBitmap(view.width, view.height, Bitmap.Config.ARGB_8888)
+                val canvas = Canvas(bitmap)
+                view.draw(canvas)
+                return bitmap
+            }
         }
     }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/EllipsisTextView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/EllipsisTextView.kt
index 2f70aeabf..bbb345af2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/EllipsisTextView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/EllipsisTextView.kt
@@ -18,7 +18,6 @@ import android.util.AttributeSet
 import androidx.appcompat.widget.AppCompatTextView
 
 class EllipsisTextView : AppCompatTextView {
-
     private val ellipsesListeners = ArrayList<EllipsisListener>()
 
     private var ellipses: Boolean = false
@@ -31,7 +30,11 @@ class EllipsisTextView : AppCompatTextView {
 
     constructor(context: Context, attrs: AttributeSet) : super(context, attrs)
 
-    constructor(context: Context, attrs: AttributeSet, defStyle: Int) : super(context, attrs, defStyle)
+    constructor(context: Context, attrs: AttributeSet, defStyle: Int) : super(
+        context,
+        attrs,
+        defStyle,
+    )
 
     fun addEllipsesListener(listener: EllipsisListener?) {
         if (listener == null) {
@@ -48,7 +51,12 @@ class EllipsisTextView : AppCompatTextView {
         return ellipses
     }
 
-    override fun layout(l: Int, t: Int, r: Int, b: Int) {
+    override fun layout(
+        l: Int,
+        t: Int,
+        r: Int,
+        b: Int,
+    ) {
         super.layout(l, t, r, b)
 
         ellipses = false
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/ExtraLabelPreference.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/ExtraLabelPreference.kt
index 6e007a492..c09a0734b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/ExtraLabelPreference.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/ExtraLabelPreference.kt
@@ -9,7 +9,7 @@ import com.habitrpg.android.habitica.R
 
 class ExtraLabelPreference(
     context: Context,
-    attrs: AttributeSet?
+    attrs: AttributeSet?,
 ) : Preference(context, attrs) {
     var extraText: String? = null
     var extraTextColor: Int? = null
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/FlowLayout.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/FlowLayout.kt
index 6283ab84b..8665d051d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/FlowLayout.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/FlowLayout.kt
@@ -5,47 +5,49 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.layout.Layout
 import androidx.compose.ui.layout.MeasurePolicy
 
-fun flowLayoutMeasurePolicy(spacing: Int = 0) = MeasurePolicy { measurables, constraints ->
-    layout(constraints.maxWidth, constraints.maxHeight) {
-        val placeables = measurables.map { measurable ->
-            measurable.measure(constraints)
-        }
-        var yPos = 0
-        var xPos = 0
-        var maxY = 0
-        placeables.forEach { placeable ->
-            if (xPos != 0) {
-                xPos += spacing
-            }
-            if (xPos + placeable.width >
-                constraints.maxWidth
-            ) {
-                xPos = 0
-                yPos += maxY + spacing
-                maxY = 0
-            }
-            placeable.placeRelative(
-                x = xPos,
-                y = yPos
-            )
-            xPos += placeable.width
-            if (maxY < placeable.height) {
-                maxY = placeable.height
+fun flowLayoutMeasurePolicy(spacing: Int = 0) =
+    MeasurePolicy { measurables, constraints ->
+        layout(constraints.maxWidth, constraints.maxHeight) {
+            val placeables =
+                measurables.map { measurable ->
+                    measurable.measure(constraints)
+                }
+            var yPos = 0
+            var xPos = 0
+            var maxY = 0
+            placeables.forEach { placeable ->
+                if (xPos != 0) {
+                    xPos += spacing
+                }
+                if (xPos + placeable.width >
+                    constraints.maxWidth
+                ) {
+                    xPos = 0
+                    yPos += maxY + spacing
+                    maxY = 0
+                }
+                placeable.placeRelative(
+                    x = xPos,
+                    y = yPos,
+                )
+                xPos += placeable.width
+                if (maxY < placeable.height) {
+                    maxY = placeable.height
+                }
             }
         }
     }
-}
 
 @Composable
 fun FlowLayout(
     modifier: Modifier = Modifier,
     spacing: Int = 0,
-    content: @Composable () -> Unit
+    content: @Composable () -> Unit,
 ) {
     val measurePolicy = flowLayoutMeasurePolicy(spacing)
     Layout(
         measurePolicy = measurePolicy,
         content = content,
-        modifier = modifier
+        modifier = modifier,
     )
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/GroupPlanMemberList.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/GroupPlanMemberList.kt
index 8082c09db..f7d801897 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/GroupPlanMemberList.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/GroupPlanMemberList.kt
@@ -54,9 +54,10 @@ fun GroupPlanMemberList(
                 fontWeight = FontWeight.Medium,
                 color = HabiticaTheme.colors.textTertiary,
                 textAlign = TextAlign.Center,
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(bottom = 20.dp)
+                modifier =
+                    Modifier
+                        .fillMaxWidth()
+                        .padding(bottom = 20.dp),
             )
         }
         for (
@@ -64,19 +65,20 @@ fun GroupPlanMemberList(
             ?: emptyList()
         ) {
             item {
-                val role = if (group?.isLeader(member.id) == true) {
-                    stringResource(R.string.owner)
-                } else if (group?.isManager(member.id) == true) {
-                    stringResource(R.string.manager)
-                } else {
-                    stringResource(R.string.member)
-                }
+                val role =
+                    if (group?.isLeader(member.id) == true) {
+                        stringResource(R.string.owner)
+                    } else if (group?.isManager(member.id) == true) {
+                        stringResource(R.string.manager)
+                    } else {
+                        stringResource(R.string.member)
+                    }
                 MemberItem(
                     member,
                     role,
                     onMemberClicked,
                     configManager,
-                    modifier = Modifier.padding(horizontal = 8.dp, vertical = 4.dp)
+                    modifier = Modifier.padding(horizontal = 8.dp, vertical = 4.dp),
                 )
             }
         }
@@ -89,7 +91,7 @@ fun MemberItem(
     role: String,
     onMemberClicked: (String) -> Unit,
     configManager: AppConfigManager,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     Box(
         modifier
@@ -98,54 +100,56 @@ fun MemberItem(
             .background(HabiticaTheme.colors.windowBackground)
             .clickable {
                 onMemberClicked(member.id)
-            }
+            },
     ) {
         Row(
             horizontalArrangement = Arrangement.spacedBy(10.dp),
-            modifier = Modifier.padding(8.dp)
+            modifier = Modifier.padding(8.dp),
         ) {
             ComposableAvatarView(
                 avatar = member,
                 configManager = configManager,
-                modifier = Modifier
-                    .padding(6.dp)
-                    .size(94.dp, 98.dp)
+                modifier =
+                    Modifier
+                        .padding(6.dp)
+                        .size(94.dp, 98.dp),
             )
             Column(
                 verticalArrangement = Arrangement.SpaceBetween,
-                modifier = Modifier
-                    .height(104.dp)
-                    .padding(end = 6.dp)
+                modifier =
+                    Modifier
+                        .height(104.dp)
+                        .padding(end = 6.dp),
             ) {
                 Text(
                     member.displayName,
                     fontWeight = FontWeight.SemiBold,
                     fontSize = 16.sp,
-                    color = HabiticaTheme.colors.textPrimary
+                    color = HabiticaTheme.colors.textPrimary,
                 )
                 Row(
                     horizontalArrangement = Arrangement.spacedBy(8.dp),
-                    verticalAlignment = Alignment.CenterVertically
+                    verticalAlignment = Alignment.CenterVertically,
                 ) {
                     Text(
                         member.formattedUsername ?: "",
-                        color = HabiticaTheme.colors.textTertiary
+                        color = HabiticaTheme.colors.textTertiary,
                     )
                     Spacer(
                         Modifier
-                            .weight(1.0f)
+                            .weight(1.0f),
                     )
                     ClassIcon(
                         member.stats?.habitClass,
                         member.hasClass,
-                        modifier = Modifier.size(18.dp)
+                        modifier = Modifier.size(18.dp),
                     )
                     BuffIcon(member.stats?.isBuffed)
                     CurrencyText(
                         currency = "gold",
                         value = (member.stats?.gp) ?: 0.0,
                         decimals = 0,
-                        animated = false
+                        animated = false,
                     )
                 }
                 LabeledBar(
@@ -155,7 +159,7 @@ fun MemberItem(
                     maxValue = (member.stats?.maxHealth ?: 0).toDouble(),
                     displayCompact = true,
                     barHeight = 5.dp,
-                    animated = false
+                    animated = false,
                 )
                 LabeledBar(
                     color = colorResource(R.color.xpColor),
@@ -164,7 +168,7 @@ fun MemberItem(
                     maxValue = (member.stats?.toNextLevel ?: 0).toDouble(),
                     displayCompact = true,
                     barHeight = 5.dp,
-                    animated = false
+                    animated = false,
                 )
                 if (member.hasClass) {
                     LabeledBar(
@@ -174,7 +178,7 @@ fun MemberItem(
                         maxValue = (member.stats?.maxMP ?: 0).toDouble(),
                         displayCompact = true,
                         barHeight = 5.dp,
-                        animated = false
+                        animated = false,
                     )
                 }
                 Row(horizontalArrangement = Arrangement.SpaceBetween) {
@@ -182,14 +186,14 @@ fun MemberItem(
                         stringResource(R.string.level_unabbreviated, member.stats?.lvl ?: 0),
                         fontSize = 14.sp,
                         fontWeight = FontWeight.Normal,
-                        color = HabiticaTheme.colors.textTertiary
+                        color = HabiticaTheme.colors.textTertiary,
                     )
                     Spacer(Modifier.weight(1f))
                     Text(
                         role,
                         fontWeight = FontWeight.SemiBold,
                         fontSize = 14.sp,
-                        color = HabiticaTheme.colors.textSecondary
+                        color = HabiticaTheme.colors.textSecondary,
                     )
                 }
             }
@@ -225,6 +229,8 @@ private class MemberProvider : PreviewParameterProvider<Member> {
 
 @Composable
 @Preview
-private fun Preview(@PreviewParameter(MemberProvider::class) member: Member) {
+private fun Preview(
+    @PreviewParameter(MemberProvider::class) member: Member,
+) {
     MemberItem(member = member, role = "Manager", onMemberClicked = {}, AppConfigManager(null))
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaAutocompleteTextView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaAutocompleteTextView.kt
index 4ee70b4b8..24d97f721 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaAutocompleteTextView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaAutocompleteTextView.kt
@@ -5,8 +5,8 @@ import android.text.InputType
 import android.util.AttributeSet
 import androidx.appcompat.widget.AppCompatMultiAutoCompleteTextView
 
-class HabiticaAutocompleteTextView(context: Context, attrs: AttributeSet?) : AppCompatMultiAutoCompleteTextView(context, attrs) {
-
+class HabiticaAutocompleteTextView(context: Context, attrs: AttributeSet?) :
+    AppCompatMultiAutoCompleteTextView(context, attrs) {
     init {
         val removed = this.inputType and (this.inputType xor InputType.TYPE_TEXT_FLAG_AUTO_COMPLETE)
         this.inputType = removed
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaButton.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaButton.kt
index 35ec08438..2cd3ec4ba 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaButton.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaButton.kt
@@ -26,22 +26,24 @@ fun HabiticaButton(
     modifier: Modifier = Modifier,
     contentPadding: PaddingValues = PaddingValues(8.dp),
     fontSize: TextUnit = 16.sp,
-    content: @Composable () -> Unit
+    content: @Composable () -> Unit,
 ) {
     Box(
         contentAlignment = Alignment.Center,
-        modifier = modifier
-            .background(background, HabiticaTheme.shapes.medium)
-            .clickable { onClick() }
-            .fillMaxWidth()
-            .padding(contentPadding)
+        modifier =
+            modifier
+                .background(background, HabiticaTheme.shapes.medium)
+                .clickable { onClick() }
+                .fillMaxWidth()
+                .padding(contentPadding),
     ) {
         ProvideTextStyle(
-            value = TextStyle(
-                fontSize = fontSize,
-                fontWeight = FontWeight.SemiBold,
-                color = color
-            )
+            value =
+                TextStyle(
+                    fontSize = fontSize,
+                    fontWeight = FontWeight.SemiBold,
+                    color = color,
+                ),
         ) {
             content()
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIcons.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIcons.java
index 2650dabe4..358fdd5ee 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIcons.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIcons.java
@@ -21,7 +21,6 @@ import android.text.TextPaint;
 import java.util.Stack;
 
 
-
 /**
  * Created by Phillip Thelen on 9. Apr 2021.
  * Copyright © 2021 HabitRPG Inc.. All rights reserved.
@@ -35,7 +34,7 @@ public class HabiticaIcons {
         static PaintCodeBitmap rageStrikeNPC = new PaintCodeBitmap();
         static PorterDuffXfermode blendModeSourceIn = new PorterDuffXfermode(PorterDuff.Mode.SRC_IN);
     }
-    
+
     // Resizing Behavior
     public enum ResizingBehavior {
         AspectFit, //!< The content is proportionally resized to fit into the target rectangle.
@@ -43,10 +42,10 @@ public class HabiticaIcons {
         Stretch, //!< The content is stretched to match the entire target rectangle.
         Center, //!< The content is centered in the target rectangle, but it is NOT resized.
     }
-    
+
     // Canvas Drawings
     // Tab
-    
+
     private static class CacheForHeart {
         private static final Paint paint = new Paint();
         private static final RectF originalFrame = new RectF(0f, 0f, 18f, 18f);
@@ -74,15 +73,15 @@ public class HabiticaIcons {
         private static final RectF bezier11Rect = new RectF();
         private static final Path bezier11Path = new Path();
     }
-    
+
     public static void drawHeart(Canvas canvas, boolean darkBackground) {
         HabiticaIcons.drawHeart(canvas, new RectF(0f, 0f, 18f, 18f), ResizingBehavior.AspectFit, darkBackground);
     }
-    
+
     public static void drawHeart(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, boolean darkBackground) {
         // General Declarations
         Paint paint = CacheForHeart.paint;
-        
+
         // Local Colors
         int fillColor6 = Color.argb(128, 181, 36, 40);
         int fillColor4 = Color.argb(89, 181, 36, 40);
@@ -91,17 +90,17 @@ public class HabiticaIcons {
         int fillColor5 = Color.argb(64, 255, 255, 255);
         int heartDarkBackground = Color.argb(178, 255, 255, 255);
         int heartLightBackground = Color.argb(255, 247, 78, 82);
-        
+
         // Local Variables
         int expression = darkBackground ? heartDarkBackground : heartLightBackground;
-        
+
         // Resize to Target Frame
         canvas.save();
         RectF resizedFrame = CacheForHeart.resizedFrame;
         HabiticaIcons.resizingBehaviorApply(resizing, CacheForHeart.originalFrame, targetFrame, resizedFrame);
         canvas.translate(resizedFrame.left, resizedFrame.top);
         canvas.scale(resizedFrame.width() / 18f, resizedFrame.height() / 18f);
-        
+
         // Group 2
         {
             // Bezier
@@ -121,14 +120,14 @@ public class HabiticaIcons {
             bezierPath.lineTo(2f, 9f);
             bezierPath.lineTo(2f, 3.75f);
             bezierPath.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezierPath.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(expression);
             canvas.drawPath(bezierPath, paint);
-            
+
             // Bezier 2
             RectF bezier2Rect = CacheForHeart.bezier2Rect;
             bezier2Rect.set(3.17f, 3.34f, 14.83f, 14.54f);
@@ -146,14 +145,14 @@ public class HabiticaIcons {
             bezier2Path.lineTo(9f, 14.54f);
             bezier2Path.lineTo(5.73f, 12.27f);
             bezier2Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier2Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor2);
             canvas.drawPath(bezier2Path, paint);
-            
+
             // Bezier 3
             RectF bezier3Rect = CacheForHeart.bezier3Rect;
             bezier3Rect.set(9f, 10.46f, 12.27f, 14.54f);
@@ -164,14 +163,14 @@ public class HabiticaIcons {
             bezier3Path.lineTo(9f, 14.54f);
             bezier3Path.lineTo(9f, 10.46f);
             bezier3Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier3Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor3);
             canvas.drawPath(bezier3Path, paint);
-            
+
             // Bezier 4
             RectF bezier4Rect = CacheForHeart.bezier4Rect;
             bezier4Rect.set(5.73f, 10.46f, 9f, 14.54f);
@@ -182,14 +181,14 @@ public class HabiticaIcons {
             bezier4Path.lineTo(9f, 14.54f);
             bezier4Path.lineTo(9f, 10.46f);
             bezier4Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier4Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor4);
             canvas.drawPath(bezier4Path, paint);
-            
+
             // Bezier 5
             RectF bezier5Rect = CacheForHeart.bezier5Rect;
             bezier5Rect.set(3.17f, 8.65f, 9f, 12.27f);
@@ -200,14 +199,14 @@ public class HabiticaIcons {
             bezier5Path.lineTo(9f, 10.46f);
             bezier5Path.lineTo(5.73f, 12.27f);
             bezier5Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier5Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor5);
             canvas.drawPath(bezier5Path, paint);
-            
+
             // Bezier 6
             RectF bezier6Rect = CacheForHeart.bezier6Rect;
             bezier6Rect.set(9f, 8.65f, 14.83f, 12.27f);
@@ -218,14 +217,14 @@ public class HabiticaIcons {
             bezier6Path.lineTo(9f, 10.46f);
             bezier6Path.lineTo(12.27f, 12.27f);
             bezier6Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier6Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor6);
             canvas.drawPath(bezier6Path, paint);
-            
+
             // Bezier 7
             RectF bezier7Rect = CacheForHeart.bezier7Rect;
             bezier7Rect.set(9f, 3.34f, 14.83f, 10.46f);
@@ -237,14 +236,14 @@ public class HabiticaIcons {
             bezier7Path.lineTo(14.83f, 8.65f);
             bezier7Path.lineTo(9f, 10.46f);
             bezier7Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier7Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor4);
             canvas.drawPath(bezier7Path, paint);
-            
+
             // Bezier 8
             RectF bezier8Rect = CacheForHeart.bezier8Rect;
             bezier8Rect.set(3.17f, 3.34f, 9f, 10.46f);
@@ -256,14 +255,14 @@ public class HabiticaIcons {
             bezier8Path.lineTo(3.17f, 8.65f);
             bezier8Path.lineTo(9f, 10.46f);
             bezier8Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier8Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor6);
             canvas.drawPath(bezier8Path, paint);
-            
+
             // Bezier 9
             RectF bezier9Rect = CacheForHeart.bezier9Rect;
             bezier9Rect.set(4.92f, 3.34f, 9f, 10.46f);
@@ -274,14 +273,14 @@ public class HabiticaIcons {
             bezier9Path.lineTo(9f, 5.56f);
             bezier9Path.lineTo(9f, 10.46f);
             bezier9Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier9Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor3);
             canvas.drawPath(bezier9Path, paint);
-            
+
             // Bezier 10
             RectF bezier10Rect = CacheForHeart.bezier10Rect;
             bezier10Rect.set(9f, 3.34f, 13.08f, 10.46f);
@@ -292,14 +291,14 @@ public class HabiticaIcons {
             bezier10Path.lineTo(9f, 5.56f);
             bezier10Path.lineTo(9f, 10.46f);
             bezier10Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier10Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor5);
             canvas.drawPath(bezier10Path, paint);
-            
+
             // Bezier 11
             RectF bezier11Rect = CacheForHeart.bezier11Rect;
             bezier11Rect.set(4.92f, 5.38f, 13.08f, 12.44f);
@@ -317,7 +316,7 @@ public class HabiticaIcons {
             bezier11Path.lineTo(9f, 12.44f);
             bezier11Path.lineTo(7.02f, 10.98f);
             bezier11Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier11Path.setFillType(Path.FillType.EVEN_ODD);
@@ -325,10 +324,10 @@ public class HabiticaIcons {
             paint.setColor(fillColor3);
             canvas.drawPath(bezier11Path, paint);
         }
-        
+
         canvas.restore();
     }
-    
+
     private static class CacheForExperience {
         private static final Paint paint = new Paint();
         private static final RectF originalFrame = new RectF(0f, 0f, 18f, 18f);
@@ -354,29 +353,29 @@ public class HabiticaIcons {
         private static final RectF star2Rect = new RectF();
         private static final Path star2Path = new Path();
     }
-    
+
     public static void drawExperience(Canvas canvas) {
         HabiticaIcons.drawExperience(canvas, new RectF(0f, 0f, 18f, 18f), ResizingBehavior.AspectFit);
     }
-    
+
     public static void drawExperience(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
         // General Declarations
         Paint paint = CacheForExperience.paint;
-        
+
         // Local Colors
         int fillColor12 = Color.argb(128, 191, 125, 26);
         int fillColor3 = Color.argb(128, 255, 255, 255);
         int fillColor11 = Color.argb(64, 191, 125, 26);
         int fillColor5 = Color.argb(64, 255, 255, 255);
         int fillColor10 = Color.argb(255, 255, 166, 35);
-        
+
         // Resize to Target Frame
         canvas.save();
         RectF resizedFrame = CacheForExperience.resizedFrame;
         HabiticaIcons.resizingBehaviorApply(resizing, CacheForExperience.originalFrame, targetFrame, resizedFrame);
         canvas.translate(resizedFrame.left, resizedFrame.top);
         canvas.scale(resizedFrame.width() / 18f, resizedFrame.height() / 18f);
-        
+
         // Star
         RectF starRect = CacheForExperience.starRect;
         starRect.set(0f, 0f, 18f, 18f);
@@ -392,13 +391,13 @@ public class HabiticaIcons {
         starPath.lineTo(5.99f, 5.99f);
         starPath.lineTo(9f, 0f);
         starPath.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor10);
         canvas.drawPath(starPath, paint);
-        
+
         // Bezier
         RectF bezierRect = CacheForExperience.bezierRect;
         bezierRect.set(3.38f, 7.13f, 9f, 9f);
@@ -409,14 +408,14 @@ public class HabiticaIcons {
         bezierPath.lineTo(9f, 9f);
         bezierPath.lineTo(3.38f, 9f);
         bezierPath.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         bezierPath.setFillType(Path.FillType.EVEN_ODD);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor5);
         canvas.drawPath(bezierPath, paint);
-        
+
         // Bezier 2
         RectF bezier2Rect = CacheForExperience.bezier2Rect;
         bezier2Rect.set(7.13f, 9f, 9f, 14.63f);
@@ -427,14 +426,14 @@ public class HabiticaIcons {
         bezier2Path.lineTo(9f, 9f);
         bezier2Path.lineTo(9f, 14.63f);
         bezier2Path.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         bezier2Path.setFillType(Path.FillType.EVEN_ODD);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor5);
         canvas.drawPath(bezier2Path, paint);
-        
+
         // Bezier 3
         RectF bezier3Rect = CacheForExperience.bezier3Rect;
         bezier3Rect.set(9f, 9f, 14.63f, 10.88f);
@@ -445,14 +444,14 @@ public class HabiticaIcons {
         bezier3Path.lineTo(9f, 9f);
         bezier3Path.lineTo(14.63f, 9f);
         bezier3Path.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         bezier3Path.setFillType(Path.FillType.EVEN_ODD);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor5);
         canvas.drawPath(bezier3Path, paint);
-        
+
         // Bezier 4
         RectF bezier4Rect = CacheForExperience.bezier4Rect;
         bezier4Rect.set(9f, 3.38f, 10.88f, 9f);
@@ -463,14 +462,14 @@ public class HabiticaIcons {
         bezier4Path.lineTo(9f, 9f);
         bezier4Path.lineTo(9f, 3.38f);
         bezier4Path.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         bezier4Path.setFillType(Path.FillType.EVEN_ODD);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor5);
         canvas.drawPath(bezier4Path, paint);
-        
+
         // Bezier 5
         RectF bezier5Rect = CacheForExperience.bezier5Rect;
         bezier5Rect.set(9f, 7.13f, 14.63f, 9f);
@@ -481,14 +480,14 @@ public class HabiticaIcons {
         bezier5Path.lineTo(9f, 9f);
         bezier5Path.lineTo(14.63f, 9f);
         bezier5Path.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         bezier5Path.setFillType(Path.FillType.EVEN_ODD);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor11);
         canvas.drawPath(bezier5Path, paint);
-        
+
         // Bezier 6
         RectF bezier6Rect = CacheForExperience.bezier6Rect;
         bezier6Rect.set(9f, 9f, 10.88f, 14.63f);
@@ -499,14 +498,14 @@ public class HabiticaIcons {
         bezier6Path.lineTo(9f, 9f);
         bezier6Path.lineTo(9f, 14.63f);
         bezier6Path.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         bezier6Path.setFillType(Path.FillType.EVEN_ODD);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor12);
         canvas.drawPath(bezier6Path, paint);
-        
+
         // Bezier 7
         RectF bezier7Rect = CacheForExperience.bezier7Rect;
         bezier7Rect.set(3.38f, 9f, 9f, 10.88f);
@@ -517,14 +516,14 @@ public class HabiticaIcons {
         bezier7Path.lineTo(9f, 9f);
         bezier7Path.lineTo(3.38f, 9f);
         bezier7Path.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         bezier7Path.setFillType(Path.FillType.EVEN_ODD);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor3);
         canvas.drawPath(bezier7Path, paint);
-        
+
         // Bezier 8
         RectF bezier8Rect = CacheForExperience.bezier8Rect;
         bezier8Rect.set(7.13f, 3.38f, 9f, 9f);
@@ -535,14 +534,14 @@ public class HabiticaIcons {
         bezier8Path.lineTo(9f, 9f);
         bezier8Path.lineTo(9f, 3.38f);
         bezier8Path.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         bezier8Path.setFillType(Path.FillType.EVEN_ODD);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor3);
         canvas.drawPath(bezier8Path, paint);
-        
+
         // Star 2
         RectF star2Rect = CacheForExperience.star2Rect;
         star2Rect.set(6.35f, 6.35f, 11.65f, 11.65f);
@@ -558,16 +557,16 @@ public class HabiticaIcons {
         star2Path.lineTo(8.12f, 8.12f);
         star2Path.lineTo(9f, 6.35f);
         star2Path.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor3);
         canvas.drawPath(star2Path, paint);
-        
+
         canvas.restore();
     }
-    
+
     private static class CacheForMagic {
         private static final Paint paint = new Paint();
         private static final RectF originalFrame = new RectF(0f, 0f, 18f, 18f);
@@ -585,29 +584,29 @@ public class HabiticaIcons {
         private static final RectF bezier6Rect = new RectF();
         private static final Path bezier6Path = new Path();
     }
-    
+
     public static void drawMagic(Canvas canvas) {
         HabiticaIcons.drawMagic(canvas, new RectF(0f, 0f, 18f, 18f), ResizingBehavior.AspectFit);
     }
-    
+
     public static void drawMagic(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
         // General Declarations
         Paint paint = CacheForMagic.paint;
-        
+
         // Local Colors
         int fillColor5 = Color.argb(64, 255, 255, 255);
         int fillColor9 = Color.argb(64, 31, 112, 154);
         int fillColor8 = Color.argb(255, 80, 181, 233);
         int fillColor7 = Color.argb(255, 41, 149, 205);
         int fillColor3 = Color.argb(128, 255, 255, 255);
-        
+
         // Resize to Target Frame
         canvas.save();
         RectF resizedFrame = CacheForMagic.resizedFrame;
         HabiticaIcons.resizingBehaviorApply(resizing, CacheForMagic.originalFrame, targetFrame, resizedFrame);
         canvas.translate(resizedFrame.left, resizedFrame.top);
         canvas.scale(resizedFrame.width() / 18f, resizedFrame.height() / 18f);
-        
+
         // Bezier
         RectF bezierRect = CacheForMagic.bezierRect;
         bezierRect.set(2f, 1f, 16f, 18f);
@@ -619,14 +618,14 @@ public class HabiticaIcons {
         bezierPath.lineTo(9f, 1f);
         bezierPath.lineTo(16f, 11.63f);
         bezierPath.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         bezierPath.setFillType(Path.FillType.EVEN_ODD);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor7);
         canvas.drawPath(bezierPath, paint);
-        
+
         // Bezier 2
         RectF bezier2Rect = CacheForMagic.bezier2Rect;
         bezier2Rect.set(3.82f, 9.29f, 9f, 16.09f);
@@ -637,14 +636,14 @@ public class HabiticaIcons {
         bezier2Path.lineTo(9f, 16.09f);
         bezier2Path.lineTo(3.82f, 11.41f);
         bezier2Path.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         bezier2Path.setFillType(Path.FillType.EVEN_ODD);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor8);
         canvas.drawPath(bezier2Path, paint);
-        
+
         // Bezier 3
         RectF bezier3Rect = CacheForMagic.bezier3Rect;
         bezier3Rect.set(9f, 9.29f, 14.18f, 16.09f);
@@ -655,14 +654,14 @@ public class HabiticaIcons {
         bezier3Path.lineTo(9f, 16.09f);
         bezier3Path.lineTo(9f, 9.29f);
         bezier3Path.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         bezier3Path.setFillType(Path.FillType.EVEN_ODD);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor9);
         canvas.drawPath(bezier3Path, paint);
-        
+
         // Bezier 4
         RectF bezier4Rect = CacheForMagic.bezier4Rect;
         bezier4Rect.set(9f, 3.55f, 14.18f, 11.41f);
@@ -673,14 +672,14 @@ public class HabiticaIcons {
         bezier4Path.lineTo(14.18f, 11.41f);
         bezier4Path.lineTo(9f, 9.29f);
         bezier4Path.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         bezier4Path.setFillType(Path.FillType.EVEN_ODD);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor5);
         canvas.drawPath(bezier4Path, paint);
-        
+
         // Bezier 5
         RectF bezier5Rect = CacheForMagic.bezier5Rect;
         bezier5Rect.set(3.82f, 3.55f, 9f, 11.41f);
@@ -691,14 +690,14 @@ public class HabiticaIcons {
         bezier5Path.lineTo(9f, 9.29f);
         bezier5Path.lineTo(3.82f, 11.41f);
         bezier5Path.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         bezier5Path.setFillType(Path.FillType.EVEN_ODD);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor3);
         canvas.drawPath(bezier5Path, paint);
-        
+
         // Bezier 6
         RectF bezier6Rect = CacheForMagic.bezier6Rect;
         bezier6Rect.set(5.64f, 6.1f, 12.36f, 14.17f);
@@ -710,17 +709,17 @@ public class HabiticaIcons {
         bezier6Path.lineTo(9f, 14.17f);
         bezier6Path.lineTo(5.64f, 11.13f);
         bezier6Path.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         bezier6Path.setFillType(Path.FillType.EVEN_ODD);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor3);
         canvas.drawPath(bezier6Path, paint);
-        
+
         canvas.restore();
     }
-    
+
     private static class CacheForGold {
         private static final Paint paint = new Paint();
         private static final RectF originalFrame = new RectF(0f, 0f, 18f, 18f);
@@ -736,29 +735,29 @@ public class HabiticaIcons {
         private static final RectF bezier5Rect = new RectF();
         private static final Path bezier5Path = new Path();
     }
-    
+
     public static void drawGold(Canvas canvas) {
         HabiticaIcons.drawGold(canvas, new RectF(0f, 0f, 18f, 18f), ResizingBehavior.AspectFit);
     }
-    
+
     public static void drawGold(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
         // General Declarations
         Paint paint = CacheForGold.paint;
-        
+
         // Local Colors
         int fillColor12 = Color.argb(128, 191, 125, 26);
         int fillColor5 = Color.argb(64, 255, 255, 255);
         int fillColor3 = Color.argb(128, 255, 255, 255);
         int fillColor10 = Color.argb(255, 255, 166, 35);
         int fillColor13 = Color.argb(191, 191, 125, 26);
-        
+
         // Resize to Target Frame
         canvas.save();
         RectF resizedFrame = CacheForGold.resizedFrame;
         HabiticaIcons.resizingBehaviorApply(resizing, CacheForGold.originalFrame, targetFrame, resizedFrame);
         canvas.translate(resizedFrame.left, resizedFrame.top);
         canvas.scale(resizedFrame.width() / 18f, resizedFrame.height() / 18f);
-        
+
         // Bezier
         RectF bezierRect = CacheForGold.bezierRect;
         bezierRect.set(0f, 0f, 18f, 18f);
@@ -770,14 +769,14 @@ public class HabiticaIcons {
         bezierPath.cubicTo(4.03f, 0f, 0f, 4.03f, 0f, 9f);
         bezierPath.cubicTo(0f, 13.97f, 4.03f, 18f, 9f, 18f);
         bezierPath.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         bezierPath.setFillType(Path.FillType.EVEN_ODD);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor10);
         canvas.drawPath(bezierPath, paint);
-        
+
         // Bezier 2
         RectF bezier2Rect = CacheForGold.bezier2Rect;
         bezier2Rect.set(2.98f, 3.06f, 13.2f, 13.28f);
@@ -786,14 +785,14 @@ public class HabiticaIcons {
         bezier2Path.moveTo(4.72f, 13.28f);
         bezier2Path.cubicTo(2.4f, 10.95f, 2.4f, 7.13f, 4.72f, 4.8f);
         bezier2Path.cubicTo(7.05f, 2.48f, 10.88f, 2.48f, 13.2f, 4.8f);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         bezier2Path.setFillType(Path.FillType.EVEN_ODD);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor3);
         canvas.drawPath(bezier2Path, paint);
-        
+
         // Bezier 3
         RectF bezier3Rect = CacheForGold.bezier3Rect;
         bezier3Rect.set(4.8f, 4.72f, 15.02f, 14.94f);
@@ -802,14 +801,14 @@ public class HabiticaIcons {
         bezier3Path.moveTo(13.28f, 4.72f);
         bezier3Path.cubicTo(15.6f, 7.05f, 15.6f, 10.88f, 13.28f, 13.2f);
         bezier3Path.cubicTo(10.95f, 15.53f, 7.13f, 15.53f, 4.8f, 13.2f);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         bezier3Path.setFillType(Path.FillType.EVEN_ODD);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor5);
         canvas.drawPath(bezier3Path, paint);
-        
+
         // Bezier 4
         RectF bezier4Rect = CacheForGold.bezier4Rect;
         bezier4Rect.set(1.5f, 1.5f, 16.5f, 16.5f);
@@ -829,14 +828,14 @@ public class HabiticaIcons {
         bezier4Path.cubicTo(15f, 12.3f, 12.3f, 15f, 9f, 15f);
         bezier4Path.lineTo(9f, 15f);
         bezier4Path.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         bezier4Path.setFillType(Path.FillType.EVEN_ODD);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor12);
         canvas.drawPath(bezier4Path, paint);
-        
+
         // Bezier 5
         RectF bezier5Rect = CacheForGold.bezier5Rect;
         bezier5Rect.set(6.75f, 6.75f, 11.25f, 11.25f);
@@ -856,17 +855,17 @@ public class HabiticaIcons {
         bezier5Path.lineTo(11.25f, 6.75f);
         bezier5Path.lineTo(9.75f, 6.75f);
         bezier5Path.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         bezier5Path.setFillType(Path.FillType.EVEN_ODD);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor13);
         canvas.drawPath(bezier5Path, paint);
-        
+
         canvas.restore();
     }
-    
+
     private static class CacheForGem {
         private static final Paint paint = new Paint();
         private static final RectF originalFrame = new RectF(0f, 0f, 18f, 18f);
@@ -890,28 +889,28 @@ public class HabiticaIcons {
         private static final RectF bezier9Rect = new RectF();
         private static final Path bezier9Path = new Path();
     }
-    
+
     public static void drawGem(Canvas canvas) {
         HabiticaIcons.drawGem(canvas, new RectF(0f, 0f, 18f, 18f), ResizingBehavior.AspectFit);
     }
-    
+
     public static void drawGem(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
         // General Declarations
         Paint paint = CacheForGem.paint;
-        
+
         // Local Colors
         int fillColor3 = Color.argb(128, 255, 255, 255);
         int fillColor15 = Color.argb(89, 27, 153, 107);
         int fillColor14 = Color.argb(255, 36, 204, 143);
         int fillColor5 = Color.argb(64, 255, 255, 255);
-        
+
         // Resize to Target Frame
         canvas.save();
         RectF resizedFrame = CacheForGem.resizedFrame;
         HabiticaIcons.resizingBehaviorApply(resizing, CacheForGem.originalFrame, targetFrame, resizedFrame);
         canvas.translate(resizedFrame.left, resizedFrame.top);
         canvas.scale(resizedFrame.width() / 18f, resizedFrame.height() / 18f);
-        
+
         // Group
         {
             // Bezier
@@ -926,14 +925,14 @@ public class HabiticaIcons {
             bezierPath.lineTo(9f, 16.5f);
             bezierPath.lineTo(0f, 6.75f);
             bezierPath.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezierPath.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor14);
             canvas.drawPath(bezierPath, paint);
-            
+
             // Bezier 2
             RectF bezier2Rect = CacheForGem.bezier2Rect;
             bezier2Rect.set(4.5f, 3f, 9f, 6.6f);
@@ -944,14 +943,14 @@ public class HabiticaIcons {
             bezier2Path.lineTo(9f, 3f);
             bezier2Path.lineTo(5.25f, 6.6f);
             bezier2Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier2Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor5);
             canvas.drawPath(bezier2Path, paint);
-            
+
             // Bezier 3
             RectF bezier3Rect = CacheForGem.bezier3Rect;
             bezier3Rect.set(9f, 3f, 13.5f, 6.6f);
@@ -962,14 +961,14 @@ public class HabiticaIcons {
             bezier3Path.lineTo(9f, 3f);
             bezier3Path.lineTo(12.75f, 6.6f);
             bezier3Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier3Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor5);
             canvas.drawPath(bezier3Path, paint);
-            
+
             // Bezier 4
             RectF bezier4Rect = CacheForGem.bezier4Rect;
             bezier4Rect.set(5.25f, 3f, 12.75f, 6.6f);
@@ -980,14 +979,14 @@ public class HabiticaIcons {
             bezier4Path.lineTo(12.75f, 6.6f);
             bezier4Path.lineTo(5.25f, 6.6f);
             bezier4Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier4Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor3);
             canvas.drawPath(bezier4Path, paint);
-            
+
             // Bezier 5
             RectF bezier5Rect = CacheForGem.bezier5Rect;
             bezier5Rect.set(1.95f, 3f, 5.25f, 6.6f);
@@ -998,14 +997,14 @@ public class HabiticaIcons {
             bezier5Path.lineTo(5.25f, 6.6f);
             bezier5Path.lineTo(1.95f, 6.6f);
             bezier5Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier5Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor3);
             canvas.drawPath(bezier5Path, paint);
-            
+
             // Bezier 6
             RectF bezier6Rect = CacheForGem.bezier6Rect;
             bezier6Rect.set(12.75f, 3f, 16.05f, 6.6f);
@@ -1016,14 +1015,14 @@ public class HabiticaIcons {
             bezier6Path.lineTo(12.75f, 6.6f);
             bezier6Path.lineTo(16.05f, 6.6f);
             bezier6Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier6Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor15);
             canvas.drawPath(bezier6Path, paint);
-            
+
             // Bezier 7
             RectF bezier7Rect = CacheForGem.bezier7Rect;
             bezier7Rect.set(1.95f, 6.6f, 9f, 14.33f);
@@ -1034,14 +1033,14 @@ public class HabiticaIcons {
             bezier7Path.lineTo(9f, 14.33f);
             bezier7Path.lineTo(1.95f, 6.6f);
             bezier7Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier7Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor15);
             canvas.drawPath(bezier7Path, paint);
-            
+
             // Bezier 8
             RectF bezier8Rect = CacheForGem.bezier8Rect;
             bezier8Rect.set(9f, 6.6f, 16.05f, 14.33f);
@@ -1052,14 +1051,14 @@ public class HabiticaIcons {
             bezier8Path.lineTo(9f, 14.33f);
             bezier8Path.lineTo(16.05f, 6.6f);
             bezier8Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier8Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor3);
             canvas.drawPath(bezier8Path, paint);
-            
+
             // Bezier 9
             RectF bezier9Rect = CacheForGem.bezier9Rect;
             bezier9Rect.set(5.25f, 6.6f, 12.75f, 14.33f);
@@ -1070,7 +1069,7 @@ public class HabiticaIcons {
             bezier9Path.lineTo(9f, 14.33f);
             bezier9Path.lineTo(5.25f, 6.6f);
             bezier9Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier9Path.setFillType(Path.FillType.EVEN_ODD);
@@ -1078,10 +1077,10 @@ public class HabiticaIcons {
             paint.setColor(fillColor5);
             canvas.drawPath(bezier9Path, paint);
         }
-        
+
         canvas.restore();
     }
-    
+
     private static class CacheForHourglass {
         private static final Paint paint = new Paint();
         private static final RectF originalFrame = new RectF(0f, 0f, 18f, 18f);
@@ -1099,28 +1098,28 @@ public class HabiticaIcons {
         private static final RectF bezier6Rect = new RectF();
         private static final Path bezier6Path = new Path();
     }
-    
+
     public static void drawHourglass(Canvas canvas) {
         HabiticaIcons.drawHourglass(canvas, new RectF(0f, 0f, 18f, 18f), ResizingBehavior.AspectFit);
     }
-    
+
     public static void drawHourglass(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
         // General Declarations
         Paint paint = CacheForHourglass.paint;
-        
+
         // Local Colors
         int fillColor18 = Color.argb(255, 154, 98, 255);
         int fillColor19 = Color.argb(255, 79, 42, 147);
         int fillColor17 = Color.argb(230, 255, 255, 255);
         int fillColor16 = Color.argb(204, 169, 220, 246);
-        
+
         // Resize to Target Frame
         canvas.save();
         RectF resizedFrame = CacheForHourglass.resizedFrame;
         HabiticaIcons.resizingBehaviorApply(resizing, CacheForHourglass.originalFrame, targetFrame, resizedFrame);
         canvas.translate(resizedFrame.left, resizedFrame.top);
         canvas.scale(resizedFrame.width() / 18f, resizedFrame.height() / 18f);
-        
+
         // Group
         {
             // Bezier
@@ -1146,14 +1145,14 @@ public class HabiticaIcons {
             bezierPath.cubicTo(5.8f, 8.75f, 5.8f, 9.37f, 5.38f, 9.68f);
             bezierPath.cubicTo(3.95f, 10.73f, 3f, 12.5f, 3f, 14.35f);
             bezierPath.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezierPath.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor16);
             canvas.drawPath(bezierPath, paint);
-            
+
             // Bezier 2
             RectF bezier2Rect = CacheForHourglass.bezier2Rect;
             bezier2Rect.set(4.51f, 1.51f, 12.06f, 16.61f);
@@ -1177,14 +1176,14 @@ public class HabiticaIcons {
             bezier2Path.lineTo(4.51f, 2.18f);
             bezier2Path.cubicTo(5.23f, 1.82f, 6.57f, 1.51f, 8.29f, 1.51f);
             bezier2Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier2Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor17);
             canvas.drawPath(bezier2Path, paint);
-            
+
             // Bezier 3
             RectF bezier3Rect = CacheForHourglass.bezier3Rect;
             bezier3Rect.set(5.79f, 2.64f, 10.98f, 5.83f);
@@ -1198,14 +1197,14 @@ public class HabiticaIcons {
             bezier3Path.cubicTo(10.86f, 4.19f, 10.99f, 3.44f, 10.98f, 3.14f);
             bezier3Path.cubicTo(10.97f, 2.73f, 9.75f, 2.64f, 8.46f, 2.64f);
             bezier3Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier3Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor18);
             canvas.drawPath(bezier3Path, paint);
-            
+
             // Bezier 4
             RectF bezier4Rect = CacheForHourglass.bezier4Rect;
             bezier4Rect.set(8.88f, 2.66f, 10.98f, 5.7f);
@@ -1219,14 +1218,14 @@ public class HabiticaIcons {
             bezier4Path.cubicTo(8.93f, 5.55f, 8.98f, 5.63f, 9.04f, 5.7f);
             bezier4Path.cubicTo(9.32f, 5.5f, 9.5f, 5.12f, 10.05f, 4.75f);
             bezier4Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier4Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor19);
             canvas.drawPath(bezier4Path, paint);
-            
+
             // Bezier 5
             RectF bezier5Rect = CacheForHourglass.bezier5Rect;
             bezier5Rect.set(5.62f, 10.44f, 10.81f, 14.86f);
@@ -1241,14 +1240,14 @@ public class HabiticaIcons {
             bezier5Path.cubicTo(10.66f, 12.79f, 10.28f, 12.34f, 9.58f, 11.82f);
             bezier5Path.cubicTo(8.9f, 11.32f, 8.68f, 10.44f, 8.29f, 10.44f);
             bezier5Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier5Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor18);
             canvas.drawPath(bezier5Path, paint);
-            
+
             // Bezier 6
             RectF bezier6Rect = CacheForHourglass.bezier6Rect;
             bezier6Rect.set(5.66f, 13.3f, 10.76f, 14.86f);
@@ -1262,7 +1261,7 @@ public class HabiticaIcons {
             bezier6Path.cubicTo(6.75f, 13.62f, 5.65f, 14.07f, 5.66f, 14.57f);
             bezier6Path.cubicTo(5.7f, 14.67f, 5.77f, 14.7f, 5.85f, 14.72f);
             bezier6Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier6Path.setFillType(Path.FillType.EVEN_ODD);
@@ -1270,10 +1269,10 @@ public class HabiticaIcons {
             paint.setColor(fillColor19);
             canvas.drawPath(bezier6Path, paint);
         }
-        
+
         canvas.restore();
     }
-    
+
     private static class CacheForWarrior {
         private static final Paint paint = new Paint();
         private static final RectF originalFrame = new RectF(0f, 0f, 32f, 32f);
@@ -1383,13 +1382,13 @@ public class HabiticaIcons {
         private static final RectF rectangle10Rect = new RectF();
         private static final Path rectangle10Path = new Path();
     }
-    
+
     public static void drawWarrior(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, boolean darkBackground) {
         // General Declarations
         Stack<Matrix> currentTransformation = new Stack<>();
         currentTransformation.push(new Matrix());
         Paint paint = CacheForWarrior.paint;
-        
+
         // Local Colors
         int fillColor42 = Color.argb(255, 255, 149, 152);
         int fillColor23 = Color.argb(255, 229, 65, 77);
@@ -1399,17 +1398,17 @@ public class HabiticaIcons {
         int fillColor21 = Color.argb(255, 255, 182, 184);
         int fillColor43 = Color.argb(255, 200, 43, 43);
         int fillColor22 = Color.argb(255, 242, 123, 134);
-        
+
         // Local Variables
         boolean lightBackground = !darkBackground;
-        
+
         // Resize to Target Frame
         canvas.save();
         RectF resizedFrame = CacheForWarrior.resizedFrame;
         HabiticaIcons.resizingBehaviorApply(resizing, CacheForWarrior.originalFrame, targetFrame, resizedFrame);
         canvas.translate(resizedFrame.left, resizedFrame.top);
         canvas.scale(resizedFrame.width() / 32f, resizedFrame.height() / 32f);
-        
+
         // Group 2
         if (darkBackground) {
             // Bezier
@@ -1430,14 +1429,14 @@ public class HabiticaIcons {
             bezierPath.cubicTo(10.67f, 15.76f, 10.93f, 15.93f, 11.06f, 16.2f);
             bezierPath.lineTo(12.58f, 19.5f);
             bezierPath.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezierPath.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor);
             canvas.drawPath(bezierPath, paint);
-            
+
             // Bezier 2
             RectF bezier2Rect = CacheForWarrior.bezier2Rect;
             bezier2Rect.set(3.18f, 4.9f, 27.18f, 28.91f);
@@ -1467,14 +1466,14 @@ public class HabiticaIcons {
             bezier2Path.lineTo(4.6f, 27.48f);
             bezier2Path.lineTo(4.6f, 27.48f);
             bezier2Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier2Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor20);
             canvas.drawPath(bezier2Path, paint);
-            
+
             // Rectangle
             canvas.save();
             canvas.translate(9f, 23.05f);
@@ -1490,14 +1489,14 @@ public class HabiticaIcons {
             rectanglePath.lineTo(rectangleRect.right, rectangleRect.bottom);
             rectanglePath.lineTo(rectangleRect.left, rectangleRect.bottom);
             rectanglePath.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor);
             canvas.drawPath(rectanglePath, paint);
             canvas.restore();
-            
+
             // Bezier 3
             RectF bezier3Rect = CacheForWarrior.bezier3Rect;
             bezier3Rect.set(4.76f, 23.66f, 8.42f, 27.32f);
@@ -1511,14 +1510,14 @@ public class HabiticaIcons {
             bezier3Path.lineTo(6.61f, 27.32f);
             bezier3Path.lineTo(4.76f, 25.47f);
             bezier3Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier3Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor);
             canvas.drawPath(bezier3Path, paint);
-            
+
             // Bezier 4
             RectF bezier4Rect = CacheForWarrior.bezier4Rect;
             bezier4Rect.set(20.67f, 7.02f, 25.05f, 11.25f);
@@ -1529,14 +1528,14 @@ public class HabiticaIcons {
             bezier4Path.lineTo(25.05f, 7.03f);
             bezier4Path.cubicTo(24.98f, 6.95f, 21.79f, 7.32f, 20.67f, 7.92f);
             bezier4Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier4Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor41);
             canvas.drawPath(bezier4Path, paint);
-            
+
             // Bezier 5
             RectF bezier5Rect = CacheForWarrior.bezier5Rect;
             bezier5Rect.set(11.68f, 7.92f, 20.83f, 18.12f);
@@ -1549,14 +1548,14 @@ public class HabiticaIcons {
             bezier5Path.lineTo(20.67f, 7.92f);
             bezier5Path.cubicTo(20.65f, 7.93f, 20.6f, 7.96f, 20.6f, 7.96f);
             bezier5Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier5Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor22);
             canvas.drawPath(bezier5Path, paint);
-            
+
             // Bezier 6
             RectF bezier6Rect = CacheForWarrior.bezier6Rect;
             bezier6Rect.set(11.6f, 17.32f, 13.96f, 19.51f);
@@ -1568,14 +1567,14 @@ public class HabiticaIcons {
             bezier6Path.lineTo(13.96f, 18.12f);
             bezier6Path.lineTo(11.68f, 17.32f);
             bezier6Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier6Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor22);
             canvas.drawPath(bezier6Path, paint);
-            
+
             // Bezier 7
             RectF bezier7Rect = CacheForWarrior.bezier7Rect;
             bezier7Rect.set(20.83f, 7.03f, 25.06f, 11.41f);
@@ -1586,14 +1585,14 @@ public class HabiticaIcons {
             bezier7Path.lineTo(25.05f, 7.03f);
             bezier7Path.cubicTo(25.13f, 7.1f, 24.76f, 10.29f, 24.16f, 11.41f);
             bezier7Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier7Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor22);
             canvas.drawPath(bezier7Path, paint);
-            
+
             // Bezier 8
             RectF bezier8Rect = CacheForWarrior.bezier8Rect;
             bezier8Rect.set(13.96f, 11.25f, 24.16f, 20.4f);
@@ -1606,14 +1605,14 @@ public class HabiticaIcons {
             bezier8Path.lineTo(24.16f, 11.41f);
             bezier8Path.cubicTo(24.14f, 11.43f, 24.12f, 11.48f, 24.12f, 11.48f);
             bezier8Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier8Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor23);
             canvas.drawPath(bezier8Path, paint);
-            
+
             // Bezier 9
             RectF bezier9Rect = CacheForWarrior.bezier9Rect;
             bezier9Rect.set(12.57f, 18.12f, 14.76f, 20.48f);
@@ -1625,14 +1624,14 @@ public class HabiticaIcons {
             bezier9Path.lineTo(13.96f, 18.12f);
             bezier9Path.lineTo(14.76f, 20.4f);
             bezier9Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier9Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor23);
             canvas.drawPath(bezier9Path, paint);
-            
+
             // Bezier 10
             RectF bezier10Rect = CacheForWarrior.bezier10Rect;
             bezier10Rect.set(4.89f, 23.66f, 6.58f, 25.09f);
@@ -1643,14 +1642,14 @@ public class HabiticaIcons {
             bezier10Path.lineTo(4.89f, 23.79f);
             bezier10Path.lineTo(6.58f, 23.66f);
             bezier10Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier10Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor42);
             canvas.drawPath(bezier10Path, paint);
-            
+
             // Bezier 11
             RectF bezier11Rect = CacheForWarrior.bezier11Rect;
             bezier11Rect.set(6.99f, 25.5f, 8.42f, 27.19f);
@@ -1661,14 +1660,14 @@ public class HabiticaIcons {
             bezier11Path.lineTo(8.29f, 27.19f);
             bezier11Path.lineTo(8.42f, 25.5f);
             bezier11Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier11Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor42);
             canvas.drawPath(bezier11Path, paint);
-            
+
             // Bezier 12
             RectF bezier12Rect = CacheForWarrior.bezier12Rect;
             bezier12Rect.set(6.19f, 23.66f, 8.42f, 25.89f);
@@ -1680,14 +1679,14 @@ public class HabiticaIcons {
             bezier12Path.lineTo(6.19f, 25.09f);
             bezier12Path.lineTo(6.58f, 23.66f);
             bezier12Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier12Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor42);
             canvas.drawPath(bezier12Path, paint);
-            
+
             // Bezier 13
             RectF bezier13Rect = CacheForWarrior.bezier13Rect;
             bezier13Rect.set(4.76f, 23.79f, 6.19f, 25.48f);
@@ -1698,14 +1697,14 @@ public class HabiticaIcons {
             bezier13Path.lineTo(4.89f, 23.79f);
             bezier13Path.lineTo(4.76f, 25.48f);
             bezier13Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier13Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor22);
             canvas.drawPath(bezier13Path, paint);
-            
+
             // Bezier 14
             RectF bezier14Rect = CacheForWarrior.bezier14Rect;
             bezier14Rect.set(6.6f, 25.89f, 8.29f, 27.32f);
@@ -1716,14 +1715,14 @@ public class HabiticaIcons {
             bezier14Path.lineTo(8.29f, 27.19f);
             bezier14Path.lineTo(6.6f, 27.32f);
             bezier14Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier14Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor22);
             canvas.drawPath(bezier14Path, paint);
-            
+
             // Bezier 15
             RectF bezier15Rect = CacheForWarrior.bezier15Rect;
             bezier15Rect.set(4.76f, 25.09f, 6.99f, 27.32f);
@@ -1735,14 +1734,14 @@ public class HabiticaIcons {
             bezier15Path.lineTo(6.19f, 25.09f);
             bezier15Path.lineTo(4.76f, 25.48f);
             bezier15Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier15Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor22);
             canvas.drawPath(bezier15Path, paint);
-            
+
             // Rectangle 2
             canvas.save();
             canvas.translate(10.3f, 21.8f);
@@ -1758,14 +1757,14 @@ public class HabiticaIcons {
             rectangle2Path.lineTo(rectangle2Rect.right, rectangle2Rect.bottom);
             rectangle2Path.lineTo(rectangle2Rect.left, rectangle2Rect.bottom);
             rectangle2Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor23);
             canvas.drawPath(rectangle2Path, paint);
             canvas.restore();
-            
+
             // Rectangle 3
             canvas.save();
             canvas.translate(9.15f, 22.9f);
@@ -1781,14 +1780,14 @@ public class HabiticaIcons {
             rectangle3Path.lineTo(rectangle3Rect.right, rectangle3Rect.bottom);
             rectangle3Path.lineTo(rectangle3Rect.left, rectangle3Rect.bottom);
             rectangle3Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor);
             canvas.drawPath(rectangle3Path, paint);
             canvas.restore();
-            
+
             // Rectangle 4
             canvas.save();
             canvas.translate(8.05f, 24f);
@@ -1804,14 +1803,14 @@ public class HabiticaIcons {
             rectangle4Path.lineTo(rectangle4Rect.right, rectangle4Rect.bottom);
             rectangle4Path.lineTo(rectangle4Rect.left, rectangle4Rect.bottom);
             rectangle4Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor23);
             canvas.drawPath(rectangle4Path, paint);
             canvas.restore();
-            
+
             // Bezier 16
             RectF bezier16Rect = CacheForWarrior.bezier16Rect;
             bezier16Rect.set(7.75f, 15.19f, 12.58f, 20.49f);
@@ -1828,14 +1827,14 @@ public class HabiticaIcons {
             bezier16Path.lineTo(12.58f, 19.5f);
             bezier16Path.lineTo(12.58f, 19.5f);
             bezier16Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier16Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor42);
             canvas.drawPath(bezier16Path, paint);
-            
+
             // Bezier 17
             RectF bezier17Rect = CacheForWarrior.bezier17Rect;
             bezier17Rect.set(7.65f, 15.37f, 11.6f, 21.59f);
@@ -1849,14 +1848,14 @@ public class HabiticaIcons {
             bezier17Path.lineTo(11.6f, 20.49f);
             bezier17Path.lineTo(9.97f, 17.26f);
             bezier17Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier17Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor);
             canvas.drawPath(bezier17Path, paint);
-            
+
             // Bezier 18
             RectF bezier18Rect = CacheForWarrior.bezier18Rect;
             bezier18Rect.set(11.6f, 19.5f, 16.89f, 24.33f);
@@ -1873,14 +1872,14 @@ public class HabiticaIcons {
             bezier18Path.lineTo(16.72f, 24.33f);
             bezier18Path.cubicTo(16.83f, 24.25f, 16.9f, 24.11f, 16.89f, 23.95f);
             bezier18Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier18Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor22);
             canvas.drawPath(bezier18Path, paint);
-            
+
             // Bezier 19
             RectF bezier19Rect = CacheForWarrior.bezier19Rect;
             bezier19Rect.set(10.5f, 20.49f, 16.72f, 24.43f);
@@ -1894,20 +1893,20 @@ public class HabiticaIcons {
             bezier19Path.lineTo(11.6f, 20.49f);
             bezier19Path.lineTo(14.82f, 22.12f);
             bezier19Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier19Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor23);
             canvas.drawPath(bezier19Path, paint);
-            
+
             // Group 3
             {
                 RectF group3 = CacheForWarrior.group3;
                 group3.set(15.81f, 9.27f, 19.35f, 16.27f);
                 canvas.save();
-                
+
                 // Clip
                 Path clipPath = CacheForWarrior.clipPath;
                 clipPath.reset();
@@ -1919,7 +1918,7 @@ public class HabiticaIcons {
                 clipPath.lineTo(19.35f, 9.27f);
                 clipPath.close();
                 canvas.clipPath(clipPath);
-                
+
                 // Bezier 20
                 RectF bezier20Rect = CacheForWarrior.bezier20Rect;
                 bezier20Rect.set(18.35f, 9f, 18.86f, 16.65f);
@@ -1932,13 +1931,13 @@ public class HabiticaIcons {
                 bezier20Path.cubicTo(18.86f, 11.56f, 18.86f, 16.65f, 18.86f, 16.65f);
                 bezier20Path.lineTo(18.86f, 16.61f);
                 bezier20Path.close();
-                
+
                 paint.reset();
                 paint.setFlags(Paint.ANTI_ALIAS_FLAG);
                 paint.setStyle(Paint.Style.FILL);
                 paint.setColor(fillColor42);
                 canvas.drawPath(bezier20Path, paint);
-                
+
                 // Rectangle 5
                 RectF rectangle5Rect = CacheForWarrior.rectangle5Rect;
                 rectangle5Rect.set(15.8f, 9.88f, 17.3f, 17.02f);
@@ -1949,17 +1948,17 @@ public class HabiticaIcons {
                 rectangle5Path.lineTo(rectangle5Rect.right, rectangle5Rect.bottom);
                 rectangle5Path.lineTo(rectangle5Rect.left, rectangle5Rect.bottom);
                 rectangle5Path.close();
-                
+
                 paint.reset();
                 paint.setFlags(Paint.ANTI_ALIAS_FLAG);
                 paint.setStyle(Paint.Style.FILL);
                 paint.setColor(fillColor42);
                 canvas.drawPath(rectangle5Path, paint);
-                
+
                 canvas.restore();
             }
         }
-        
+
         // Group 4
         if (lightBackground) {
             // Bezier 21
@@ -1980,14 +1979,14 @@ public class HabiticaIcons {
             bezier21Path.cubicTo(10.67f, 15.76f, 10.93f, 15.93f, 11.06f, 16.2f);
             bezier21Path.lineTo(12.58f, 19.5f);
             bezier21Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier21Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor);
             canvas.drawPath(bezier21Path, paint);
-            
+
             // Bezier 22
             RectF bezier22Rect = CacheForWarrior.bezier22Rect;
             bezier22Rect.set(3.18f, 4.9f, 27.18f, 28.91f);
@@ -2017,14 +2016,14 @@ public class HabiticaIcons {
             bezier22Path.lineTo(4.6f, 27.48f);
             bezier22Path.lineTo(4.6f, 27.48f);
             bezier22Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier22Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor43);
             canvas.drawPath(bezier22Path, paint);
-            
+
             // Rectangle 6
             canvas.save();
             canvas.translate(9f, 23.05f);
@@ -2040,14 +2039,14 @@ public class HabiticaIcons {
             rectangle6Path.lineTo(rectangle6Rect.right, rectangle6Rect.bottom);
             rectangle6Path.lineTo(rectangle6Rect.left, rectangle6Rect.bottom);
             rectangle6Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor);
             canvas.drawPath(rectangle6Path, paint);
             canvas.restore();
-            
+
             // Bezier 23
             RectF bezier23Rect = CacheForWarrior.bezier23Rect;
             bezier23Rect.set(4.76f, 23.66f, 8.42f, 27.32f);
@@ -2061,14 +2060,14 @@ public class HabiticaIcons {
             bezier23Path.lineTo(6.61f, 27.32f);
             bezier23Path.lineTo(4.76f, 25.47f);
             bezier23Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier23Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor);
             canvas.drawPath(bezier23Path, paint);
-            
+
             // Bezier 24
             RectF bezier24Rect = CacheForWarrior.bezier24Rect;
             bezier24Rect.set(20.67f, 7.02f, 25.05f, 11.25f);
@@ -2079,14 +2078,14 @@ public class HabiticaIcons {
             bezier24Path.lineTo(25.05f, 7.03f);
             bezier24Path.cubicTo(24.98f, 6.95f, 21.79f, 7.32f, 20.67f, 7.92f);
             bezier24Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier24Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor21);
             canvas.drawPath(bezier24Path, paint);
-            
+
             // Bezier 25
             RectF bezier25Rect = CacheForWarrior.bezier25Rect;
             bezier25Rect.set(11.68f, 7.92f, 20.83f, 18.12f);
@@ -2099,14 +2098,14 @@ public class HabiticaIcons {
             bezier25Path.lineTo(20.67f, 7.92f);
             bezier25Path.cubicTo(20.65f, 7.93f, 20.6f, 7.96f, 20.6f, 7.96f);
             bezier25Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier25Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor22);
             canvas.drawPath(bezier25Path, paint);
-            
+
             // Bezier 26
             RectF bezier26Rect = CacheForWarrior.bezier26Rect;
             bezier26Rect.set(11.6f, 17.32f, 13.96f, 19.51f);
@@ -2118,14 +2117,14 @@ public class HabiticaIcons {
             bezier26Path.lineTo(13.96f, 18.12f);
             bezier26Path.lineTo(11.68f, 17.32f);
             bezier26Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier26Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor22);
             canvas.drawPath(bezier26Path, paint);
-            
+
             // Bezier 27
             RectF bezier27Rect = CacheForWarrior.bezier27Rect;
             bezier27Rect.set(20.83f, 7.03f, 25.06f, 11.41f);
@@ -2136,14 +2135,14 @@ public class HabiticaIcons {
             bezier27Path.lineTo(25.05f, 7.03f);
             bezier27Path.cubicTo(25.13f, 7.1f, 24.76f, 10.29f, 24.16f, 11.41f);
             bezier27Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier27Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor22);
             canvas.drawPath(bezier27Path, paint);
-            
+
             // Bezier 28
             RectF bezier28Rect = CacheForWarrior.bezier28Rect;
             bezier28Rect.set(13.96f, 11.25f, 24.16f, 20.4f);
@@ -2156,14 +2155,14 @@ public class HabiticaIcons {
             bezier28Path.lineTo(24.16f, 11.41f);
             bezier28Path.cubicTo(24.14f, 11.43f, 24.12f, 11.48f, 24.12f, 11.48f);
             bezier28Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier28Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor23);
             canvas.drawPath(bezier28Path, paint);
-            
+
             // Bezier 29
             RectF bezier29Rect = CacheForWarrior.bezier29Rect;
             bezier29Rect.set(12.57f, 18.12f, 14.76f, 20.48f);
@@ -2175,14 +2174,14 @@ public class HabiticaIcons {
             bezier29Path.lineTo(13.96f, 18.12f);
             bezier29Path.lineTo(14.76f, 20.4f);
             bezier29Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier29Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor23);
             canvas.drawPath(bezier29Path, paint);
-            
+
             // Bezier 30
             RectF bezier30Rect = CacheForWarrior.bezier30Rect;
             bezier30Rect.set(4.89f, 23.66f, 6.58f, 25.09f);
@@ -2193,14 +2192,14 @@ public class HabiticaIcons {
             bezier30Path.lineTo(4.89f, 23.79f);
             bezier30Path.lineTo(6.58f, 23.66f);
             bezier30Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier30Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor21);
             canvas.drawPath(bezier30Path, paint);
-            
+
             // Bezier 31
             RectF bezier31Rect = CacheForWarrior.bezier31Rect;
             bezier31Rect.set(6.99f, 25.5f, 8.42f, 27.19f);
@@ -2211,14 +2210,14 @@ public class HabiticaIcons {
             bezier31Path.lineTo(8.29f, 27.19f);
             bezier31Path.lineTo(8.42f, 25.5f);
             bezier31Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier31Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor21);
             canvas.drawPath(bezier31Path, paint);
-            
+
             // Bezier 32
             RectF bezier32Rect = CacheForWarrior.bezier32Rect;
             bezier32Rect.set(6.19f, 23.66f, 8.42f, 25.89f);
@@ -2230,14 +2229,14 @@ public class HabiticaIcons {
             bezier32Path.lineTo(6.19f, 25.09f);
             bezier32Path.lineTo(6.58f, 23.66f);
             bezier32Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier32Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor21);
             canvas.drawPath(bezier32Path, paint);
-            
+
             // Bezier 33
             RectF bezier33Rect = CacheForWarrior.bezier33Rect;
             bezier33Rect.set(4.76f, 23.79f, 6.19f, 25.48f);
@@ -2248,14 +2247,14 @@ public class HabiticaIcons {
             bezier33Path.lineTo(4.89f, 23.79f);
             bezier33Path.lineTo(4.76f, 25.48f);
             bezier33Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier33Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor22);
             canvas.drawPath(bezier33Path, paint);
-            
+
             // Bezier 34
             RectF bezier34Rect = CacheForWarrior.bezier34Rect;
             bezier34Rect.set(6.6f, 25.89f, 8.29f, 27.32f);
@@ -2266,14 +2265,14 @@ public class HabiticaIcons {
             bezier34Path.lineTo(8.29f, 27.19f);
             bezier34Path.lineTo(6.6f, 27.32f);
             bezier34Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier34Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor22);
             canvas.drawPath(bezier34Path, paint);
-            
+
             // Bezier 35
             RectF bezier35Rect = CacheForWarrior.bezier35Rect;
             bezier35Rect.set(4.76f, 25.09f, 6.99f, 27.32f);
@@ -2285,14 +2284,14 @@ public class HabiticaIcons {
             bezier35Path.lineTo(6.19f, 25.09f);
             bezier35Path.lineTo(4.76f, 25.48f);
             bezier35Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier35Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor22);
             canvas.drawPath(bezier35Path, paint);
-            
+
             // Rectangle 7
             canvas.save();
             canvas.translate(10.3f, 21.8f);
@@ -2308,14 +2307,14 @@ public class HabiticaIcons {
             rectangle7Path.lineTo(rectangle7Rect.right, rectangle7Rect.bottom);
             rectangle7Path.lineTo(rectangle7Rect.left, rectangle7Rect.bottom);
             rectangle7Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor23);
             canvas.drawPath(rectangle7Path, paint);
             canvas.restore();
-            
+
             // Rectangle 8
             canvas.save();
             canvas.translate(9.15f, 22.9f);
@@ -2331,14 +2330,14 @@ public class HabiticaIcons {
             rectangle8Path.lineTo(rectangle8Rect.right, rectangle8Rect.bottom);
             rectangle8Path.lineTo(rectangle8Rect.left, rectangle8Rect.bottom);
             rectangle8Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor);
             canvas.drawPath(rectangle8Path, paint);
             canvas.restore();
-            
+
             // Rectangle 9
             canvas.save();
             canvas.translate(8.05f, 24f);
@@ -2354,14 +2353,14 @@ public class HabiticaIcons {
             rectangle9Path.lineTo(rectangle9Rect.right, rectangle9Rect.bottom);
             rectangle9Path.lineTo(rectangle9Rect.left, rectangle9Rect.bottom);
             rectangle9Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor23);
             canvas.drawPath(rectangle9Path, paint);
             canvas.restore();
-            
+
             // Bezier 36
             RectF bezier36Rect = CacheForWarrior.bezier36Rect;
             bezier36Rect.set(7.75f, 15.19f, 12.58f, 20.49f);
@@ -2378,14 +2377,14 @@ public class HabiticaIcons {
             bezier36Path.lineTo(12.58f, 19.5f);
             bezier36Path.lineTo(12.58f, 19.5f);
             bezier36Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier36Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor21);
             canvas.drawPath(bezier36Path, paint);
-            
+
             // Bezier 37
             RectF bezier37Rect = CacheForWarrior.bezier37Rect;
             bezier37Rect.set(7.65f, 15.37f, 11.6f, 21.59f);
@@ -2399,14 +2398,14 @@ public class HabiticaIcons {
             bezier37Path.lineTo(11.6f, 20.49f);
             bezier37Path.lineTo(9.97f, 17.26f);
             bezier37Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier37Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor);
             canvas.drawPath(bezier37Path, paint);
-            
+
             // Bezier 38
             RectF bezier38Rect = CacheForWarrior.bezier38Rect;
             bezier38Rect.set(11.6f, 19.5f, 16.89f, 24.33f);
@@ -2423,14 +2422,14 @@ public class HabiticaIcons {
             bezier38Path.lineTo(16.72f, 24.33f);
             bezier38Path.cubicTo(16.83f, 24.25f, 16.9f, 24.11f, 16.89f, 23.95f);
             bezier38Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier38Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor22);
             canvas.drawPath(bezier38Path, paint);
-            
+
             // Bezier 39
             RectF bezier39Rect = CacheForWarrior.bezier39Rect;
             bezier39Rect.set(10.5f, 20.49f, 16.72f, 24.43f);
@@ -2444,20 +2443,20 @@ public class HabiticaIcons {
             bezier39Path.lineTo(11.6f, 20.49f);
             bezier39Path.lineTo(14.82f, 22.12f);
             bezier39Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier39Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor23);
             canvas.drawPath(bezier39Path, paint);
-            
+
             // Group 5
             {
                 RectF group5 = CacheForWarrior.group5;
                 group5.set(15.81f, 9.27f, 19.35f, 16.27f);
                 canvas.save();
-                
+
                 // Clip 2
                 Path clip2Path = CacheForWarrior.clip2Path;
                 clip2Path.reset();
@@ -2469,7 +2468,7 @@ public class HabiticaIcons {
                 clip2Path.lineTo(19.35f, 9.27f);
                 clip2Path.close();
                 canvas.clipPath(clip2Path);
-                
+
                 // Bezier 40
                 RectF bezier40Rect = CacheForWarrior.bezier40Rect;
                 bezier40Rect.set(18.35f, 9f, 18.86f, 16.65f);
@@ -2482,13 +2481,13 @@ public class HabiticaIcons {
                 bezier40Path.cubicTo(18.86f, 11.56f, 18.86f, 16.65f, 18.86f, 16.65f);
                 bezier40Path.lineTo(18.86f, 16.61f);
                 bezier40Path.close();
-                
+
                 paint.reset();
                 paint.setFlags(Paint.ANTI_ALIAS_FLAG);
                 paint.setStyle(Paint.Style.FILL);
                 paint.setColor(fillColor21);
                 canvas.drawPath(bezier40Path, paint);
-                
+
                 // Rectangle 10
                 RectF rectangle10Rect = CacheForWarrior.rectangle10Rect;
                 rectangle10Rect.set(15.8f, 9.88f, 17.3f, 17.02f);
@@ -2499,20 +2498,20 @@ public class HabiticaIcons {
                 rectangle10Path.lineTo(rectangle10Rect.right, rectangle10Rect.bottom);
                 rectangle10Path.lineTo(rectangle10Rect.left, rectangle10Rect.bottom);
                 rectangle10Path.close();
-                
+
                 paint.reset();
                 paint.setFlags(Paint.ANTI_ALIAS_FLAG);
                 paint.setStyle(Paint.Style.FILL);
                 paint.setColor(fillColor21);
                 canvas.drawPath(rectangle10Path, paint);
-                
+
                 canvas.restore();
             }
         }
-        
+
         canvas.restore();
     }
-    
+
     private static class CacheForStarSmall {
         private static final Paint paint = new Paint();
         private static final RectF originalFrame = new RectF(0f, 0f, 9f, 9f);
@@ -2528,94 +2527,94 @@ public class HabiticaIcons {
         private static final RectF rectangle5Rect = new RectF();
         private static final Path rectangle5Path = new Path();
     }
-    
+
     public static void drawStarSmall(Canvas canvas) {
         HabiticaIcons.drawStarSmall(canvas, new RectF(0f, 0f, 9f, 9f), ResizingBehavior.AspectFit);
     }
-    
+
     public static void drawStarSmall(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
         // General Declarations
         Paint paint = CacheForStarSmall.paint;
-        
+
         // Local Colors
         int fillColor26 = Color.argb(102, 229, 220, 255);
         int fillColor27 = Color.argb(255, 229, 220, 255);
-        
+
         // Resize to Target Frame
         canvas.save();
         RectF resizedFrame = CacheForStarSmall.resizedFrame;
         HabiticaIcons.resizingBehaviorApply(resizing, CacheForStarSmall.originalFrame, targetFrame, resizedFrame);
         canvas.translate(resizedFrame.left, resizedFrame.top);
         canvas.scale(resizedFrame.width() / 9f, resizedFrame.height() / 9f);
-        
+
         // Rectangle
         RectF rectangleRect = CacheForStarSmall.rectangleRect;
         rectangleRect.set(3f, 0f, 6f, 3f);
         Path rectanglePath = CacheForStarSmall.rectanglePath;
         rectanglePath.reset();
         rectanglePath.addRect(rectangleRect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor26);
         canvas.drawPath(rectanglePath, paint);
-        
+
         // Rectangle 2
         RectF rectangle2Rect = CacheForStarSmall.rectangle2Rect;
         rectangle2Rect.set(6f, 3f, 9f, 6f);
         Path rectangle2Path = CacheForStarSmall.rectangle2Path;
         rectangle2Path.reset();
         rectangle2Path.addRect(rectangle2Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor26);
         canvas.drawPath(rectangle2Path, paint);
-        
+
         // Rectangle 3
         RectF rectangle3Rect = CacheForStarSmall.rectangle3Rect;
         rectangle3Rect.set(0f, 3f, 3f, 6f);
         Path rectangle3Path = CacheForStarSmall.rectangle3Path;
         rectangle3Path.reset();
         rectangle3Path.addRect(rectangle3Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor26);
         canvas.drawPath(rectangle3Path, paint);
-        
+
         // Rectangle 4
         RectF rectangle4Rect = CacheForStarSmall.rectangle4Rect;
         rectangle4Rect.set(3f, 6f, 6f, 9f);
         Path rectangle4Path = CacheForStarSmall.rectangle4Path;
         rectangle4Path.reset();
         rectangle4Path.addRect(rectangle4Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor26);
         canvas.drawPath(rectangle4Path, paint);
-        
+
         // Rectangle 5
         RectF rectangle5Rect = CacheForStarSmall.rectangle5Rect;
         rectangle5Rect.set(3f, 3f, 6f, 6f);
         Path rectangle5Path = CacheForStarSmall.rectangle5Path;
         rectangle5Path.reset();
         rectangle5Path.addRect(rectangle5Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor27);
         canvas.drawPath(rectangle5Path, paint);
-        
+
         canvas.restore();
     }
-    
+
     private static class CacheForStarLarge {
         private static final Paint paint = new Paint();
         private static final RectF originalFrame = new RectF(0f, 0f, 27f, 27f);
@@ -2671,29 +2670,29 @@ public class HabiticaIcons {
         private static final RectF rectangle24Rect = new RectF();
         private static final Path rectangle24Path = new Path();
     }
-    
+
     public static void drawStarLarge(Canvas canvas) {
         HabiticaIcons.drawStarLarge(canvas, new RectF(0f, 0f, 27f, 27f), ResizingBehavior.AspectFit);
     }
-    
+
     public static void drawStarLarge(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
         // General Declarations
         Paint paint = CacheForStarLarge.paint;
-        
+
         // Local Colors
         int fillColor31 = Color.argb(191, 229, 220, 255);
         int fillColor28 = Color.argb(64, 229, 220, 255);
         int fillColor30 = Color.argb(166, 229, 220, 255);
         int fillColor29 = Color.argb(128, 229, 220, 255);
         int fillColor27 = Color.argb(255, 229, 220, 255);
-        
+
         // Resize to Target Frame
         canvas.save();
         RectF resizedFrame = CacheForStarLarge.resizedFrame;
         HabiticaIcons.resizingBehaviorApply(resizing, CacheForStarLarge.originalFrame, targetFrame, resizedFrame);
         canvas.translate(resizedFrame.left, resizedFrame.top);
         canvas.scale(resizedFrame.width() / 27f, resizedFrame.height() / 27f);
-        
+
         // Bezier
         RectF bezierRect = CacheForStarLarge.bezierRect;
         bezierRect.set(9f, 9f, 18f, 18f);
@@ -2713,329 +2712,329 @@ public class HabiticaIcons {
         bezierPath.lineTo(9f, 15f);
         bezierPath.lineTo(9f, 12f);
         bezierPath.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         bezierPath.setFillType(Path.FillType.EVEN_ODD);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor27);
         canvas.drawPath(bezierPath, paint);
-        
+
         // Rectangle
         RectF rectangleRect = CacheForStarLarge.rectangleRect;
         rectangleRect.set(9f, 6f, 12f, 9f);
         Path rectanglePath = CacheForStarLarge.rectanglePath;
         rectanglePath.reset();
         rectanglePath.addRect(rectangleRect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor28);
         canvas.drawPath(rectanglePath, paint);
-        
+
         // Rectangle 2
         RectF rectangle2Rect = CacheForStarLarge.rectangle2Rect;
         rectangle2Rect.set(12f, 0f, 15f, 3f);
         Path rectangle2Path = CacheForStarLarge.rectangle2Path;
         rectangle2Path.reset();
         rectangle2Path.addRect(rectangle2Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor28);
         canvas.drawPath(rectangle2Path, paint);
-        
+
         // Rectangle 3
         RectF rectangle3Rect = CacheForStarLarge.rectangle3Rect;
         rectangle3Rect.set(12f, 3f, 15f, 6f);
         Path rectangle3Path = CacheForStarLarge.rectangle3Path;
         rectangle3Path.reset();
         rectangle3Path.addRect(rectangle3Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor29);
         canvas.drawPath(rectangle3Path, paint);
-        
+
         // Rectangle 4
         RectF rectangle4Rect = CacheForStarLarge.rectangle4Rect;
         rectangle4Rect.set(21f, 12f, 24f, 15f);
         Path rectangle4Path = CacheForStarLarge.rectangle4Path;
         rectangle4Path.reset();
         rectangle4Path.addRect(rectangle4Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor29);
         canvas.drawPath(rectangle4Path, paint);
-        
+
         // Rectangle 5
         RectF rectangle5Rect = CacheForStarLarge.rectangle5Rect;
         rectangle5Rect.set(3f, 12f, 6f, 15f);
         Path rectangle5Path = CacheForStarLarge.rectangle5Path;
         rectangle5Path.reset();
         rectangle5Path.addRect(rectangle5Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor29);
         canvas.drawPath(rectangle5Path, paint);
-        
+
         // Rectangle 6
         RectF rectangle6Rect = CacheForStarLarge.rectangle6Rect;
         rectangle6Rect.set(12f, 21f, 15f, 24f);
         Path rectangle6Path = CacheForStarLarge.rectangle6Path;
         rectangle6Path.reset();
         rectangle6Path.addRect(rectangle6Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor29);
         canvas.drawPath(rectangle6Path, paint);
-        
+
         // Rectangle 7
         RectF rectangle7Rect = CacheForStarLarge.rectangle7Rect;
         rectangle7Rect.set(9f, 15f, 12f, 18f);
         Path rectangle7Path = CacheForStarLarge.rectangle7Path;
         rectangle7Path.reset();
         rectangle7Path.addRect(rectangle7Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor30);
         canvas.drawPath(rectangle7Path, paint);
-        
+
         // Rectangle 8
         RectF rectangle8Rect = CacheForStarLarge.rectangle8Rect;
         rectangle8Rect.set(15f, 15f, 18f, 18f);
         Path rectangle8Path = CacheForStarLarge.rectangle8Path;
         rectangle8Path.reset();
         rectangle8Path.addRect(rectangle8Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor30);
         canvas.drawPath(rectangle8Path, paint);
-        
+
         // Rectangle 9
         RectF rectangle9Rect = CacheForStarLarge.rectangle9Rect;
         rectangle9Rect.set(15f, 9f, 18f, 12f);
         Path rectangle9Path = CacheForStarLarge.rectangle9Path;
         rectangle9Path.reset();
         rectangle9Path.addRect(rectangle9Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor30);
         canvas.drawPath(rectangle9Path, paint);
-        
+
         // Rectangle 10
         RectF rectangle10Rect = CacheForStarLarge.rectangle10Rect;
         rectangle10Rect.set(9f, 9f, 12f, 12f);
         Path rectangle10Path = CacheForStarLarge.rectangle10Path;
         rectangle10Path.reset();
         rectangle10Path.addRect(rectangle10Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor30);
         canvas.drawPath(rectangle10Path, paint);
-        
+
         // Rectangle 11
         RectF rectangle11Rect = CacheForStarLarge.rectangle11Rect;
         rectangle11Rect.set(12f, 18f, 15f, 21f);
         Path rectangle11Path = CacheForStarLarge.rectangle11Path;
         rectangle11Path.reset();
         rectangle11Path.addRect(rectangle11Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor31);
         canvas.drawPath(rectangle11Path, paint);
-        
+
         // Rectangle 12
         RectF rectangle12Rect = CacheForStarLarge.rectangle12Rect;
         rectangle12Rect.set(6f, 12f, 9f, 15f);
         Path rectangle12Path = CacheForStarLarge.rectangle12Path;
         rectangle12Path.reset();
         rectangle12Path.addRect(rectangle12Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor31);
         canvas.drawPath(rectangle12Path, paint);
-        
+
         // Rectangle 13
         RectF rectangle13Rect = CacheForStarLarge.rectangle13Rect;
         rectangle13Rect.set(12f, 6f, 15f, 9f);
         Path rectangle13Path = CacheForStarLarge.rectangle13Path;
         rectangle13Path.reset();
         rectangle13Path.addRect(rectangle13Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor31);
         canvas.drawPath(rectangle13Path, paint);
-        
+
         // Rectangle 14
         RectF rectangle14Rect = CacheForStarLarge.rectangle14Rect;
         rectangle14Rect.set(18f, 12f, 21f, 15f);
         Path rectangle14Path = CacheForStarLarge.rectangle14Path;
         rectangle14Path.reset();
         rectangle14Path.addRect(rectangle14Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor31);
         canvas.drawPath(rectangle14Path, paint);
-        
+
         // Rectangle 15
         RectF rectangle15Rect = CacheForStarLarge.rectangle15Rect;
         rectangle15Rect.set(9f, 18f, 12f, 21f);
         Path rectangle15Path = CacheForStarLarge.rectangle15Path;
         rectangle15Path.reset();
         rectangle15Path.addRect(rectangle15Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor28);
         canvas.drawPath(rectangle15Path, paint);
-        
+
         // Rectangle 16
         RectF rectangle16Rect = CacheForStarLarge.rectangle16Rect;
         rectangle16Rect.set(15f, 18f, 18f, 21f);
         Path rectangle16Path = CacheForStarLarge.rectangle16Path;
         rectangle16Path.reset();
         rectangle16Path.addRect(rectangle16Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor28);
         canvas.drawPath(rectangle16Path, paint);
-        
+
         // Rectangle 17
         RectF rectangle17Rect = CacheForStarLarge.rectangle17Rect;
         rectangle17Rect.set(12f, 24f, 15f, 27f);
         Path rectangle17Path = CacheForStarLarge.rectangle17Path;
         rectangle17Path.reset();
         rectangle17Path.addRect(rectangle17Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor28);
         canvas.drawPath(rectangle17Path, paint);
-        
+
         // Rectangle 18
         RectF rectangle18Rect = CacheForStarLarge.rectangle18Rect;
         rectangle18Rect.set(15f, 6f, 18f, 9f);
         Path rectangle18Path = CacheForStarLarge.rectangle18Path;
         rectangle18Path.reset();
         rectangle18Path.addRect(rectangle18Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor28);
         canvas.drawPath(rectangle18Path, paint);
-        
+
         // Rectangle 19
         RectF rectangle19Rect = CacheForStarLarge.rectangle19Rect;
         rectangle19Rect.set(6f, 9f, 9f, 12f);
         Path rectangle19Path = CacheForStarLarge.rectangle19Path;
         rectangle19Path.reset();
         rectangle19Path.addRect(rectangle19Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor28);
         canvas.drawPath(rectangle19Path, paint);
-        
+
         // Rectangle 20
         RectF rectangle20Rect = CacheForStarLarge.rectangle20Rect;
         rectangle20Rect.set(6f, 15f, 9f, 18f);
         Path rectangle20Path = CacheForStarLarge.rectangle20Path;
         rectangle20Path.reset();
         rectangle20Path.addRect(rectangle20Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor28);
         canvas.drawPath(rectangle20Path, paint);
-        
+
         // Rectangle 21
         RectF rectangle21Rect = CacheForStarLarge.rectangle21Rect;
         rectangle21Rect.set(0f, 12f, 3f, 15f);
         Path rectangle21Path = CacheForStarLarge.rectangle21Path;
         rectangle21Path.reset();
         rectangle21Path.addRect(rectangle21Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor28);
         canvas.drawPath(rectangle21Path, paint);
-        
+
         // Rectangle 22
         RectF rectangle22Rect = CacheForStarLarge.rectangle22Rect;
         rectangle22Rect.set(18f, 15f, 21f, 18f);
         Path rectangle22Path = CacheForStarLarge.rectangle22Path;
         rectangle22Path.reset();
         rectangle22Path.addRect(rectangle22Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor28);
         canvas.drawPath(rectangle22Path, paint);
-        
+
         // Rectangle 23
         RectF rectangle23Rect = CacheForStarLarge.rectangle23Rect;
         rectangle23Rect.set(24f, 12f, 27f, 15f);
         Path rectangle23Path = CacheForStarLarge.rectangle23Path;
         rectangle23Path.reset();
         rectangle23Path.addRect(rectangle23Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor28);
         canvas.drawPath(rectangle23Path, paint);
-        
+
         // Rectangle 24
         RectF rectangle24Rect = CacheForStarLarge.rectangle24Rect;
         rectangle24Rect.set(18f, 9f, 21f, 12f);
         Path rectangle24Path = CacheForStarLarge.rectangle24Path;
         rectangle24Path.reset();
         rectangle24Path.addRect(rectangle24Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor28);
         canvas.drawPath(rectangle24Path, paint);
-        
+
         canvas.restore();
     }
-    
+
     private static class CacheForStarMedium {
         private static final Paint paint = new Paint();
         private static final RectF originalFrame = new RectF(0f, 0f, 21f, 21f);
@@ -3075,252 +3074,252 @@ public class HabiticaIcons {
         private static final RectF rectangle17Rect = new RectF();
         private static final Path rectangle17Path = new Path();
     }
-    
+
     public static void drawStarMedium(Canvas canvas) {
         HabiticaIcons.drawStarMedium(canvas, new RectF(0f, 0f, 21f, 21f), ResizingBehavior.AspectFit);
     }
-    
+
     public static void drawStarMedium(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
         // General Declarations
         Paint paint = CacheForStarMedium.paint;
-        
+
         // Local Colors
         int fillColor27 = Color.argb(255, 229, 220, 255);
         int fillColor33 = Color.argb(77, 229, 220, 255);
         int fillColor32 = Color.argb(153, 229, 220, 255);
         int fillColor34 = Color.argb(38, 229, 220, 255);
-        
+
         // Resize to Target Frame
         canvas.save();
         RectF resizedFrame = CacheForStarMedium.resizedFrame;
         HabiticaIcons.resizingBehaviorApply(resizing, CacheForStarMedium.originalFrame, targetFrame, resizedFrame);
         canvas.translate(resizedFrame.left, resizedFrame.top);
         canvas.scale(resizedFrame.width() / 21f, resizedFrame.height() / 21f);
-        
+
         // Rectangle
         RectF rectangleRect = CacheForStarMedium.rectangleRect;
         rectangleRect.set(9f, 6f, 12f, 9f);
         Path rectanglePath = CacheForStarMedium.rectanglePath;
         rectanglePath.reset();
         rectanglePath.addRect(rectangleRect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor32);
         canvas.drawPath(rectanglePath, paint);
-        
+
         // Rectangle 2
         RectF rectangle2Rect = CacheForStarMedium.rectangle2Rect;
         rectangle2Rect.set(12f, 9f, 15f, 12f);
         Path rectangle2Path = CacheForStarMedium.rectangle2Path;
         rectangle2Path.reset();
         rectangle2Path.addRect(rectangle2Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor32);
         canvas.drawPath(rectangle2Path, paint);
-        
+
         // Rectangle 3
         RectF rectangle3Rect = CacheForStarMedium.rectangle3Rect;
         rectangle3Rect.set(6f, 9f, 9f, 12f);
         Path rectangle3Path = CacheForStarMedium.rectangle3Path;
         rectangle3Path.reset();
         rectangle3Path.addRect(rectangle3Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor32);
         canvas.drawPath(rectangle3Path, paint);
-        
+
         // Rectangle 4
         RectF rectangle4Rect = CacheForStarMedium.rectangle4Rect;
         rectangle4Rect.set(9f, 12f, 12f, 15f);
         Path rectangle4Path = CacheForStarMedium.rectangle4Path;
         rectangle4Path.reset();
         rectangle4Path.addRect(rectangle4Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor32);
         canvas.drawPath(rectangle4Path, paint);
-        
+
         // Rectangle 5
         RectF rectangle5Rect = CacheForStarMedium.rectangle5Rect;
         rectangle5Rect.set(9f, 15f, 12f, 18f);
         Path rectangle5Path = CacheForStarMedium.rectangle5Path;
         rectangle5Path.reset();
         rectangle5Path.addRect(rectangle5Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor33);
         canvas.drawPath(rectangle5Path, paint);
-        
+
         // Rectangle 6
         RectF rectangle6Rect = CacheForStarMedium.rectangle6Rect;
         rectangle6Rect.set(6f, 12f, 9f, 15f);
         Path rectangle6Path = CacheForStarMedium.rectangle6Path;
         rectangle6Path.reset();
         rectangle6Path.addRect(rectangle6Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor33);
         canvas.drawPath(rectangle6Path, paint);
-        
+
         // Rectangle 7
         RectF rectangle7Rect = CacheForStarMedium.rectangle7Rect;
         rectangle7Rect.set(6f, 6f, 9f, 9f);
         Path rectangle7Path = CacheForStarMedium.rectangle7Path;
         rectangle7Path.reset();
         rectangle7Path.addRect(rectangle7Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor33);
         canvas.drawPath(rectangle7Path, paint);
-        
+
         // Rectangle 8
         RectF rectangle8Rect = CacheForStarMedium.rectangle8Rect;
         rectangle8Rect.set(12f, 6f, 15f, 9f);
         Path rectangle8Path = CacheForStarMedium.rectangle8Path;
         rectangle8Path.reset();
         rectangle8Path.addRect(rectangle8Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor33);
         canvas.drawPath(rectangle8Path, paint);
-        
+
         // Rectangle 9
         RectF rectangle9Rect = CacheForStarMedium.rectangle9Rect;
         rectangle9Rect.set(12f, 12f, 15f, 15f);
         Path rectangle9Path = CacheForStarMedium.rectangle9Path;
         rectangle9Path.reset();
         rectangle9Path.addRect(rectangle9Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor33);
         canvas.drawPath(rectangle9Path, paint);
-        
+
         // Rectangle 10
         RectF rectangle10Rect = CacheForStarMedium.rectangle10Rect;
         rectangle10Rect.set(9f, 3f, 12f, 6f);
         Path rectangle10Path = CacheForStarMedium.rectangle10Path;
         rectangle10Path.reset();
         rectangle10Path.addRect(rectangle10Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor33);
         canvas.drawPath(rectangle10Path, paint);
-        
+
         // Rectangle 11
         RectF rectangle11Rect = CacheForStarMedium.rectangle11Rect;
         rectangle11Rect.set(15f, 9f, 18f, 12f);
         Path rectangle11Path = CacheForStarMedium.rectangle11Path;
         rectangle11Path.reset();
         rectangle11Path.addRect(rectangle11Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor33);
         canvas.drawPath(rectangle11Path, paint);
-        
+
         // Rectangle 12
         RectF rectangle12Rect = CacheForStarMedium.rectangle12Rect;
         rectangle12Rect.set(3f, 9f, 6f, 12f);
         Path rectangle12Path = CacheForStarMedium.rectangle12Path;
         rectangle12Path.reset();
         rectangle12Path.addRect(rectangle12Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor33);
         canvas.drawPath(rectangle12Path, paint);
-        
+
         // Rectangle 13
         RectF rectangle13Rect = CacheForStarMedium.rectangle13Rect;
         rectangle13Rect.set(0f, 9f, 3f, 12f);
         Path rectangle13Path = CacheForStarMedium.rectangle13Path;
         rectangle13Path.reset();
         rectangle13Path.addRect(rectangle13Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor34);
         canvas.drawPath(rectangle13Path, paint);
-        
+
         // Rectangle 14
         RectF rectangle14Rect = CacheForStarMedium.rectangle14Rect;
         rectangle14Rect.set(9f, 0f, 12f, 3f);
         Path rectangle14Path = CacheForStarMedium.rectangle14Path;
         rectangle14Path.reset();
         rectangle14Path.addRect(rectangle14Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor34);
         canvas.drawPath(rectangle14Path, paint);
-        
+
         // Rectangle 15
         RectF rectangle15Rect = CacheForStarMedium.rectangle15Rect;
         rectangle15Rect.set(18f, 9f, 21f, 12f);
         Path rectangle15Path = CacheForStarMedium.rectangle15Path;
         rectangle15Path.reset();
         rectangle15Path.addRect(rectangle15Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor34);
         canvas.drawPath(rectangle15Path, paint);
-        
+
         // Rectangle 16
         RectF rectangle16Rect = CacheForStarMedium.rectangle16Rect;
         rectangle16Rect.set(9f, 18f, 12f, 21f);
         Path rectangle16Path = CacheForStarMedium.rectangle16Path;
         rectangle16Path.reset();
         rectangle16Path.addRect(rectangle16Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor34);
         canvas.drawPath(rectangle16Path, paint);
-        
+
         // Rectangle 17
         RectF rectangle17Rect = CacheForStarMedium.rectangle17Rect;
         rectangle17Rect.set(9f, 9f, 12f, 12f);
         Path rectangle17Path = CacheForStarMedium.rectangle17Path;
         rectangle17Path.reset();
         rectangle17Path.addRect(rectangle17Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor27);
         canvas.drawPath(rectangle17Path, paint);
-        
+
         canvas.restore();
     }
-    
+
     private static class CacheForPinnedItem {
         private static final Paint paint = new Paint();
         private static final RectF originalFrame = new RectF(0f, 0f, 16f, 16f);
@@ -3328,25 +3327,25 @@ public class HabiticaIcons {
         private static final RectF bezierRect = new RectF();
         private static final Path bezierPath = new Path();
     }
-    
+
     public static void drawPinnedItem(Canvas canvas) {
         HabiticaIcons.drawPinnedItem(canvas, new RectF(0f, 0f, 16f, 16f), ResizingBehavior.AspectFit);
     }
-    
+
     public static void drawPinnedItem(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
         // General Declarations
         Paint paint = CacheForPinnedItem.paint;
-        
+
         // Local Colors
         int fillColor35 = Color.argb(255, 195, 192, 199);
-        
+
         // Resize to Target Frame
         canvas.save();
         RectF resizedFrame = CacheForPinnedItem.resizedFrame;
         HabiticaIcons.resizingBehaviorApply(resizing, CacheForPinnedItem.originalFrame, targetFrame, resizedFrame);
         canvas.translate(resizedFrame.left, resizedFrame.top);
         canvas.scale(resizedFrame.width() / 16f, resizedFrame.height() / 16f);
-        
+
         // Bezier
         RectF bezierRect = CacheForPinnedItem.bezierRect;
         bezierRect.set(2f, 1f, 15f, 14f);
@@ -3383,17 +3382,17 @@ public class HabiticaIcons {
         bezierPath.cubicTo(15.1f, 6.8f, 15.1f, 6.14f, 14.69f, 5.73f);
         bezierPath.lineTo(14.69f, 5.73f);
         bezierPath.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         bezierPath.setFillType(Path.FillType.EVEN_ODD);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor35);
         canvas.drawPath(bezierPath, paint);
-        
+
         canvas.restore();
     }
-    
+
     private static class CacheForAddRemovePin {
         private static final Paint paint = new Paint();
         private static final RectF originalFrame = new RectF(0f, 0f, 24f, 24f);
@@ -3405,29 +3404,29 @@ public class HabiticaIcons {
         private static final RectF bezier3Rect = new RectF();
         private static final Path bezier3Path = new Path();
     }
-    
+
     public static void drawAddRemovePin(Canvas canvas, boolean addPin) {
         HabiticaIcons.drawAddRemovePin(canvas, new RectF(0f, 0f, 24f, 24f), ResizingBehavior.AspectFit, addPin);
     }
-    
+
     public static void drawAddRemovePin(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, boolean addPin) {
         // General Declarations
         Paint paint = CacheForAddRemovePin.paint;
-        
+
         // Local Colors
         int fillColor2 = Color.argb(255, 255, 97, 101);
         int fillColor36 = Color.argb(255, 97, 51, 180);
-        
+
         // Local Variables
         int pinColor = addPin ? fillColor36 : fillColor2;
-        
+
         // Resize to Target Frame
         canvas.save();
         RectF resizedFrame = CacheForAddRemovePin.resizedFrame;
         HabiticaIcons.resizingBehaviorApply(resizing, CacheForAddRemovePin.originalFrame, targetFrame, resizedFrame);
         canvas.translate(resizedFrame.left, resizedFrame.top);
         canvas.scale(resizedFrame.width() / 24f, resizedFrame.height() / 24f);
-        
+
         // Bezier
         RectF bezierRect = CacheForAddRemovePin.bezierRect;
         bezierRect.set(2f, 4f, 8f, 4f);
@@ -3435,7 +3434,7 @@ public class HabiticaIcons {
         bezierPath.reset();
         bezierPath.moveTo(8f, 4f);
         bezierPath.lineTo(2f, 4f);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStrokeWidth(2f);
@@ -3446,7 +3445,7 @@ public class HabiticaIcons {
         paint.setColor(pinColor);
         canvas.drawPath(bezierPath, paint);
         canvas.restore();
-        
+
         // Bezier 2
         if (addPin) {
             RectF bezier2Rect = CacheForAddRemovePin.bezier2Rect;
@@ -3455,7 +3454,7 @@ public class HabiticaIcons {
             bezier2Path.reset();
             bezier2Path.moveTo(5f, 1f);
             bezier2Path.lineTo(5f, 7f);
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStrokeWidth(2f);
@@ -3467,7 +3466,7 @@ public class HabiticaIcons {
             canvas.drawPath(bezier2Path, paint);
             canvas.restore();
         }
-        
+
         // Bezier 3
         RectF bezier3Rect = CacheForAddRemovePin.bezier3Rect;
         bezier3Rect.set(4f, 4f, 24f, 24f);
@@ -3513,17 +3512,17 @@ public class HabiticaIcons {
         bezier3Path.cubicTo(24.11f, 11.73f, 24.11f, 11.03f, 23.68f, 10.6f);
         bezier3Path.lineTo(23.68f, 10.6f);
         bezier3Path.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         bezier3Path.setFillType(Path.FillType.EVEN_ODD);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(pinColor);
         canvas.drawPath(bezier3Path, paint);
-        
+
         canvas.restore();
     }
-    
+
     private static class CacheForItemIndicator {
         private static final Paint paint = new Paint();
         private static final Paint shadowPaint = new Paint();
@@ -3539,47 +3538,47 @@ public class HabiticaIcons {
         private static final RectF symbolRect = new RectF();
         private static final RectF symbolTargetRect = new RectF();
     }
-    
+
     public static void drawItemIndicator(Canvas canvas, int indicatorLocked, int lockColor, int indicatorLockedDark, int itemIndicatorColorBackground, boolean isLocked, boolean isLimited, boolean isDark) {
         HabiticaIcons.drawItemIndicator(canvas, new RectF(0f, 0f, 28f, 28f), ResizingBehavior.AspectFit, indicatorLocked, lockColor, indicatorLockedDark, itemIndicatorColorBackground, isLocked, isLimited, isDark);
     }
-    
+
     public static void drawItemIndicator(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, int indicatorLocked, int lockColor, int indicatorLockedDark, int itemIndicatorColorBackground, boolean isLocked, boolean isLimited, boolean isDark) {
         // General Declarations
         Paint paint = CacheForItemIndicator.paint;
-        
+
         // Local Colors
         int shadowTint = Color.argb(255, 26, 24, 29);
         int fillColor39 = Color.argb(255, 189, 168, 255);
         int strokeColor2 = Color.argb(255, 189, 168, 255);
         int strokeColor = Color.argb(255, 97, 51, 180);
-        
+
         // Local Shadows
         PaintCodeShadow shadow = CacheForItemIndicator.shadow.get(PaintCodeColor.colorByChangingAlpha(shadowTint, (int) (Color.alpha(shadowTint) * 0.12f * 255f)));
-        
+
         // Local Variables
         int itemIndicatorColor = isLocked ? (isDark ? indicatorLockedDark : indicatorLocked) : (isLimited ? strokeColor : (isDark ? indicatorLockedDark : itemIndicatorColorBackground));
-        
+
         // Resize to Target Frame
         canvas.save();
         RectF resizedFrame = CacheForItemIndicator.resizedFrame;
         HabiticaIcons.resizingBehaviorApply(resizing, CacheForItemIndicator.originalFrame, targetFrame, resizedFrame);
         canvas.translate(resizedFrame.left, resizedFrame.top);
         canvas.scale(resizedFrame.width() / 28f, resizedFrame.height() / 28f);
-        
+
         // Oval 2
         RectF oval2Rect = CacheForItemIndicator.oval2Rect;
         oval2Rect.set(2f, 2f, 26f, 26f);
         Path oval2Path = CacheForItemIndicator.oval2Path;
         oval2Path.reset();
         oval2Path.addOval(oval2Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         canvas.saveLayerAlpha(null, 255, Canvas.ALL_SAVE_FLAG);
         {
             canvas.translate(shadow.dx, shadow.dy);
-            
+
             Paint shadowPaint = CacheForItemIndicator.shadowPaint;
             shadowPaint.set(paint);
             shadow.setBlurOfPaint(shadowPaint);
@@ -3595,7 +3594,7 @@ public class HabiticaIcons {
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(itemIndicatorColor);
         canvas.drawPath(oval2Path, paint);
-        
+
         // Group 2
         if (isLimited) {
             // Bezier
@@ -3615,14 +3614,14 @@ public class HabiticaIcons {
             bezierPath.cubicTo(10.69f, 20f, 8f, 17.31f, 8f, 14f);
             bezierPath.cubicTo(8f, 10.69f, 10.69f, 8f, 14f, 8f);
             bezierPath.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezierPath.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor39);
             canvas.drawPath(bezierPath, paint);
-            
+
             // Bezier 2
             RectF bezier2Rect = CacheForItemIndicator.bezier2Rect;
             bezier2Rect.set(14f, 11f, 16f, 16f);
@@ -3631,7 +3630,7 @@ public class HabiticaIcons {
             bezier2Path.moveTo(14f, 11f);
             bezier2Path.lineTo(14f, 14.03f);
             bezier2Path.lineTo(16f, 16f);
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStrokeWidth(2f);
@@ -3643,7 +3642,7 @@ public class HabiticaIcons {
             canvas.drawPath(bezier2Path, paint);
             canvas.restore();
         }
-        
+
         // Symbol
         if (isLocked) {
             RectF symbolRect = CacheForItemIndicator.symbolRect;
@@ -3656,7 +3655,7 @@ public class HabiticaIcons {
             HabiticaIcons.drawLocked(canvas, symbolTargetRect, ResizingBehavior.Stretch, lockColor);
             canvas.restore();
         }
-        
+
         canvas.restore();
     }
 
@@ -3666,11 +3665,11 @@ public class HabiticaIcons {
         private static final RectF symbolRect = new RectF();
         private static final RectF symbolTargetRect = new RectF();
     }
-    
+
     public static void drawWarriorLightBg(Canvas canvas) {
         HabiticaIcons.drawWarriorLightBg(canvas, new RectF(0f, 0f, 32f, 32f), ResizingBehavior.AspectFit);
     }
-    
+
     public static void drawWarriorLightBg(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
         // Resize to Target Frame
         canvas.save();
@@ -3678,7 +3677,7 @@ public class HabiticaIcons {
         HabiticaIcons.resizingBehaviorApply(resizing, CacheForWarriorLightBg.originalFrame, targetFrame, resizedFrame);
         canvas.translate(resizedFrame.left, resizedFrame.top);
         canvas.scale(resizedFrame.width() / 32f, resizedFrame.height() / 32f);
-        
+
         // Symbol
         RectF symbolRect = CacheForWarriorLightBg.symbolRect;
         symbolRect.set(0f, 0f, 32f, 32f);
@@ -3689,7 +3688,7 @@ public class HabiticaIcons {
         symbolTargetRect.set(0f, 0f, symbolRect.width(), symbolRect.height());
         HabiticaIcons.drawWarrior(canvas, symbolTargetRect, ResizingBehavior.Stretch, false);
         canvas.restore();
-        
+
         canvas.restore();
     }
 
@@ -3759,13 +3758,13 @@ public class HabiticaIcons {
         private static final Path bezier27Path = new Path();
     }
 
-    
+
     public static void drawRogue(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, boolean darkBackground) {
         // General Declarations
         Stack<Matrix> currentTransformation = new Stack<>();
         currentTransformation.push(new Matrix());
         Paint paint = CacheForRogue.paint;
-        
+
         // Local Colors
         int fillColor19 = Color.argb(255, 79, 42, 147);
         int fillColor47 = Color.argb(255, 198, 182, 228);
@@ -3774,17 +3773,17 @@ public class HabiticaIcons {
         int fillColor45 = Color.argb(255, 155, 129, 226);
         int fillColor46 = Color.argb(255, 122, 84, 192);
         int fillColor44 = Color.argb(255, 204, 190, 237);
-        
+
         // Local Variables
         boolean lightBackground = !darkBackground;
-        
+
         // Resize to Target Frame
         canvas.save();
         RectF resizedFrame = CacheForRogue.resizedFrame;
         HabiticaIcons.resizingBehaviorApply(resizing, CacheForRogue.originalFrame, targetFrame, resizedFrame);
         canvas.translate(resizedFrame.left, resizedFrame.top);
         canvas.scale(resizedFrame.width() / 32f, resizedFrame.height() / 32f);
-        
+
         // Group 2
         if (darkBackground) {
             // Bezier
@@ -3818,14 +3817,14 @@ public class HabiticaIcons {
             bezierPath.lineTo(26.6f, 21.59f);
             bezierPath.lineTo(24.35f, 22.01f);
             bezierPath.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezierPath.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor44);
             canvas.drawPath(bezierPath, paint);
-            
+
             // Bezier 2
             RectF bezier2Rect = CacheForRogue.bezier2Rect;
             bezier2Rect.set(7.21f, 7.84f, 16.8f, 18.7f);
@@ -3836,14 +3835,14 @@ public class HabiticaIcons {
             bezier2Path.lineTo(16.8f, 17.4f);
             bezier2Path.lineTo(7.24f, 7.84f);
             bezier2Path.cubicTo(7.16f, 7.93f, 7.27f, 8.19f, 7.43f, 8.5f);
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier2Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor45);
             canvas.drawPath(bezier2Path, paint);
-            
+
             // Bezier 3
             RectF bezier3Rect = CacheForRogue.bezier3Rect;
             bezier3Rect.set(13.14f, 17.4f, 19.07f, 20.1f);
@@ -3856,14 +3855,14 @@ public class HabiticaIcons {
             bezier3Path.lineTo(16.8f, 17.4f);
             bezier3Path.lineTo(13.14f, 18.71f);
             bezier3Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier3Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor46);
             canvas.drawPath(bezier3Path, paint);
-            
+
             // Bezier 4
             RectF bezier4Rect = CacheForRogue.bezier4Rect;
             bezier4Rect.set(7.24f, 7.81f, 18.11f, 17.4f);
@@ -3874,14 +3873,14 @@ public class HabiticaIcons {
             bezier4Path.lineTo(16.8f, 17.4f);
             bezier4Path.lineTo(7.24f, 7.84f);
             bezier4Path.cubicTo(7.33f, 7.76f, 7.58f, 7.86f, 7.89f, 8.01f);
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier4Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor36);
             canvas.drawPath(bezier4Path, paint);
-            
+
             // Bezier 5
             RectF bezier5Rect = CacheForRogue.bezier5Rect;
             bezier5Rect.set(16.8f, 13.74f, 19.5f, 19.67f);
@@ -3894,14 +3893,14 @@ public class HabiticaIcons {
             bezier5Path.lineTo(16.8f, 17.4f);
             bezier5Path.lineTo(18.11f, 13.74f);
             bezier5Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier5Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor19);
             canvas.drawPath(bezier5Path, paint);
-            
+
             // Bezier 6
             RectF bezier6Rect = CacheForRogue.bezier6Rect;
             bezier6Rect.set(20.38f, 20.33f, 21.32f, 22.57f);
@@ -3913,14 +3912,14 @@ public class HabiticaIcons {
             bezier6Path.lineTo(21.32f, 21.05f);
             bezier6Path.lineTo(21.1f, 22.57f);
             bezier6Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier6Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor46);
             canvas.drawPath(bezier6Path, paint);
-            
+
             // Bezier 7
             RectF bezier7Rect = CacheForRogue.bezier7Rect;
             bezier7Rect.set(21.82f, 21.77f, 22.76f, 24f);
@@ -3932,14 +3931,14 @@ public class HabiticaIcons {
             bezier7Path.lineTo(22.76f, 22.48f);
             bezier7Path.lineTo(22.53f, 24f);
             bezier7Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier7Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor46);
             canvas.drawPath(bezier7Path, paint);
-            
+
             // Bezier 8
             RectF bezier8Rect = CacheForRogue.bezier8Rect;
             bezier8Rect.set(18.63f, 19.23f, 19.89f, 21.14f);
@@ -3949,14 +3948,14 @@ public class HabiticaIcons {
             bezier8Path.lineTo(19.89f, 19.62f);
             bezier8Path.lineTo(19.67f, 21.14f);
             bezier8Path.lineTo(18.63f, 20.1f);
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier8Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor46);
             canvas.drawPath(bezier8Path, paint);
-            
+
             // Bezier 9
             RectF bezier9Rect = CacheForRogue.bezier9Rect;
             bezier9Rect.set(19.67f, 19.62f, 20.61f, 21.86f);
@@ -3968,14 +3967,14 @@ public class HabiticaIcons {
             bezier9Path.lineTo(20.61f, 20.33f);
             bezier9Path.lineTo(20.38f, 21.86f);
             bezier9Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier9Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor19);
             canvas.drawPath(bezier9Path, paint);
-            
+
             // Bezier 10
             RectF bezier10Rect = CacheForRogue.bezier10Rect;
             bezier10Rect.set(21.1f, 21.05f, 22.04f, 23.29f);
@@ -3987,14 +3986,14 @@ public class HabiticaIcons {
             bezier10Path.lineTo(22.04f, 21.77f);
             bezier10Path.lineTo(21.82f, 23.29f);
             bezier10Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier10Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor19);
             canvas.drawPath(bezier10Path, paint);
-            
+
             // Bezier 11
             RectF bezier11Rect = CacheForRogue.bezier11Rect;
             bezier11Rect.set(22.53f, 22.48f, 24.12f, 24.72f);
@@ -4006,14 +4005,14 @@ public class HabiticaIcons {
             bezier11Path.lineTo(24.12f, 23.85f);
             bezier11Path.lineTo(23.25f, 24.72f);
             bezier11Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier11Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor19);
             canvas.drawPath(bezier11Path, paint);
-            
+
             // Star
             canvas.save();
             canvas.translate(19.05f, 19.65f);
@@ -4030,14 +4029,14 @@ public class HabiticaIcons {
             starPath.lineTo(-0.5f, 0f);
             starPath.lineTo(0f, -0.6f);
             starPath.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor45);
             canvas.drawPath(starPath, paint);
             canvas.restore();
-            
+
             // Star 2
             canvas.save();
             canvas.translate(23.8f, 24.4f);
@@ -4054,7 +4053,7 @@ public class HabiticaIcons {
             star2Path.lineTo(-0.95f, 0f);
             star2Path.lineTo(0f, -1.4f);
             star2Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
@@ -4062,7 +4061,7 @@ public class HabiticaIcons {
             canvas.drawPath(star2Path, paint);
             canvas.restore();
         }
-        
+
         // Group 3
         if (lightBackground) {
             // Bezier 12
@@ -4089,14 +4088,14 @@ public class HabiticaIcons {
             bezier12Path.lineTo(4.86f, 21.95f);
             bezier12Path.lineTo(7.11f, 22.37f);
             bezier12Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier12Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor19);
             canvas.drawPath(bezier12Path, paint);
-            
+
             // Bezier 13
             RectF bezier13Rect = CacheForRogue.bezier13Rect;
             bezier13Rect.set(5.27f, 6.25f, 26.46f, 27.45f);
@@ -4121,14 +4120,14 @@ public class HabiticaIcons {
             bezier13Path.lineTo(20.86f, 27.45f);
             bezier13Path.lineTo(21.27f, 25.2f);
             bezier13Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier13Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor19);
             canvas.drawPath(bezier13Path, paint);
-            
+
             // Bezier 14
             RectF bezier14Rect = CacheForRogue.bezier14Rect;
             bezier14Rect.set(7.08f, 8.09f, 16.66f, 18.96f);
@@ -4139,14 +4138,14 @@ public class HabiticaIcons {
             bezier14Path.lineTo(16.66f, 17.65f);
             bezier14Path.lineTo(7.11f, 8.09f);
             bezier14Path.cubicTo(7.03f, 8.18f, 7.13f, 8.44f, 7.29f, 8.75f);
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier14Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor47);
             canvas.drawPath(bezier14Path, paint);
-            
+
             // Bezier 15
             RectF bezier15Rect = CacheForRogue.bezier15Rect;
             bezier15Rect.set(13f, 17.65f, 18.93f, 20.36f);
@@ -4159,14 +4158,14 @@ public class HabiticaIcons {
             bezier15Path.lineTo(16.66f, 17.65f);
             bezier15Path.lineTo(13f, 18.96f);
             bezier15Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier15Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor48);
             canvas.drawPath(bezier15Path, paint);
-            
+
             // Bezier 16
             RectF bezier16Rect = CacheForRogue.bezier16Rect;
             bezier16Rect.set(7.11f, 8.07f, 17.97f, 17.65f);
@@ -4177,14 +4176,14 @@ public class HabiticaIcons {
             bezier16Path.lineTo(16.67f, 17.65f);
             bezier16Path.lineTo(7.11f, 8.09f);
             bezier16Path.cubicTo(7.19f, 8.02f, 7.45f, 8.11f, 7.75f, 8.27f);
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier16Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor46);
             canvas.drawPath(bezier16Path, paint);
-            
+
             // Bezier 17
             RectF bezier17Rect = CacheForRogue.bezier17Rect;
             bezier17Rect.set(16.67f, 13.99f, 19.37f, 19.92f);
@@ -4197,14 +4196,14 @@ public class HabiticaIcons {
             bezier17Path.lineTo(16.67f, 17.65f);
             bezier17Path.lineTo(17.97f, 13.99f);
             bezier17Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier17Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor36);
             canvas.drawPath(bezier17Path, paint);
-            
+
             // Bezier 18
             RectF bezier18Rect = CacheForRogue.bezier18Rect;
             bezier18Rect.set(20.25f, 20.59f, 21.19f, 22.82f);
@@ -4216,14 +4215,14 @@ public class HabiticaIcons {
             bezier18Path.lineTo(21.19f, 21.3f);
             bezier18Path.lineTo(20.96f, 22.82f);
             bezier18Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier18Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor48);
             canvas.drawPath(bezier18Path, paint);
-            
+
             // Bezier 19
             RectF bezier19Rect = CacheForRogue.bezier19Rect;
             bezier19Rect.set(21.68f, 22.02f, 22.62f, 24.26f);
@@ -4235,14 +4234,14 @@ public class HabiticaIcons {
             bezier19Path.lineTo(22.62f, 22.73f);
             bezier19Path.lineTo(22.4f, 24.26f);
             bezier19Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier19Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor48);
             canvas.drawPath(bezier19Path, paint);
-            
+
             // Bezier 20
             RectF bezier20Rect = CacheForRogue.bezier20Rect;
             bezier20Rect.set(18.49f, 19.48f, 19.76f, 21.39f);
@@ -4252,14 +4251,14 @@ public class HabiticaIcons {
             bezier20Path.lineTo(19.76f, 19.87f);
             bezier20Path.lineTo(19.53f, 21.39f);
             bezier20Path.lineTo(18.49f, 20.36f);
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier20Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor48);
             canvas.drawPath(bezier20Path, paint);
-            
+
             // Bezier 21
             RectF bezier21Rect = CacheForRogue.bezier21Rect;
             bezier21Rect.set(19.53f, 19.87f, 20.47f, 22.11f);
@@ -4271,14 +4270,14 @@ public class HabiticaIcons {
             bezier21Path.lineTo(20.47f, 20.59f);
             bezier21Path.lineTo(20.25f, 22.11f);
             bezier21Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier21Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor36);
             canvas.drawPath(bezier21Path, paint);
-            
+
             // Bezier 22
             RectF bezier22Rect = CacheForRogue.bezier22Rect;
             bezier22Rect.set(20.96f, 21.3f, 21.9f, 23.54f);
@@ -4290,14 +4289,14 @@ public class HabiticaIcons {
             bezier22Path.lineTo(21.9f, 22.02f);
             bezier22Path.lineTo(21.68f, 23.54f);
             bezier22Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier22Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor36);
             canvas.drawPath(bezier22Path, paint);
-            
+
             // Bezier 23
             RectF bezier23Rect = CacheForRogue.bezier23Rect;
             bezier23Rect.set(22.4f, 22.73f, 23.98f, 24.97f);
@@ -4309,14 +4308,14 @@ public class HabiticaIcons {
             bezier23Path.lineTo(23.98f, 24.1f);
             bezier23Path.lineTo(23.11f, 24.97f);
             bezier23Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier23Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor36);
             canvas.drawPath(bezier23Path, paint);
-            
+
             // Star 3
             canvas.save();
             canvas.translate(18.95f, 19.9f);
@@ -4333,14 +4332,14 @@ public class HabiticaIcons {
             star3Path.lineTo(-0.5f, 0f);
             star3Path.lineTo(0f, -0.6f);
             star3Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor47);
             canvas.drawPath(star3Path, paint);
             canvas.restore();
-            
+
             // Bezier 24
             RectF bezier24Rect = CacheForRogue.bezier24Rect;
             bezier24Rect.set(22.69f, 23.98f, 23.66f, 25.62f);
@@ -4352,14 +4351,14 @@ public class HabiticaIcons {
             bezier24Path.lineTo(23.66f, 24.65f);
             bezier24Path.lineTo(22.99f, 23.98f);
             bezier24Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier24Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor47);
             canvas.drawPath(bezier24Path, paint);
-            
+
             // Bezier 25
             RectF bezier25Rect = CacheForRogue.bezier25Rect;
             bezier25Rect.set(22.99f, 23.67f, 24.64f, 24.65f);
@@ -4370,14 +4369,14 @@ public class HabiticaIcons {
             bezier25Path.lineTo(23.66f, 24.65f);
             bezier25Path.lineTo(24.64f, 23.67f);
             bezier25Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier25Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor47);
             canvas.drawPath(bezier25Path, paint);
-            
+
             // Bezier 26
             RectF bezier26Rect = CacheForRogue.bezier26Rect;
             bezier26Rect.set(22.69f, 24.65f, 24.33f, 25.62f);
@@ -4388,14 +4387,14 @@ public class HabiticaIcons {
             bezier26Path.lineTo(24.33f, 25.32f);
             bezier26Path.lineTo(23.66f, 24.65f);
             bezier26Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier26Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor47);
             canvas.drawPath(bezier26Path, paint);
-            
+
             // Bezier 27
             RectF bezier27Rect = CacheForRogue.bezier27Rect;
             bezier27Rect.set(23.66f, 23.67f, 24.64f, 25.32f);
@@ -4407,7 +4406,7 @@ public class HabiticaIcons {
             bezier27Path.lineTo(23.66f, 24.65f);
             bezier27Path.lineTo(24.33f, 25.32f);
             bezier27Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier27Path.setFillType(Path.FillType.EVEN_ODD);
@@ -4415,21 +4414,21 @@ public class HabiticaIcons {
             paint.setColor(fillColor47);
             canvas.drawPath(bezier27Path, paint);
         }
-        
+
         canvas.restore();
     }
-    
+
     private static class CacheForRogueLightBg {
         private static final RectF originalFrame = new RectF(0f, 0f, 32f, 32f);
         private static final RectF resizedFrame = new RectF();
         private static final RectF symbolRect = new RectF();
         private static final RectF symbolTargetRect = new RectF();
     }
-    
+
     public static void drawRogueLightBg(Canvas canvas) {
         HabiticaIcons.drawRogueLightBg(canvas, new RectF(0f, 0f, 32f, 32f), ResizingBehavior.AspectFit);
     }
-    
+
     public static void drawRogueLightBg(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
         // Resize to Target Frame
         canvas.save();
@@ -4437,7 +4436,7 @@ public class HabiticaIcons {
         HabiticaIcons.resizingBehaviorApply(resizing, CacheForRogueLightBg.originalFrame, targetFrame, resizedFrame);
         canvas.translate(resizedFrame.left, resizedFrame.top);
         canvas.scale(resizedFrame.width() / 32f, resizedFrame.height() / 32f);
-        
+
         // Symbol
         RectF symbolRect = CacheForRogueLightBg.symbolRect;
         symbolRect.set(0f, 0f, 32f, 32f);
@@ -4448,7 +4447,7 @@ public class HabiticaIcons {
         symbolTargetRect.set(0f, 0f, symbolRect.width(), symbolRect.height());
         HabiticaIcons.drawRogue(canvas, symbolTargetRect, ResizingBehavior.Stretch, false);
         canvas.restore();
-        
+
         canvas.restore();
     }
 
@@ -4521,11 +4520,11 @@ public class HabiticaIcons {
         private static final RectF bezier32Rect = new RectF();
         private static final Path bezier32Path = new Path();
     }
-    
+
     public static void drawHealer(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, boolean darkBackground) {
         // General Declarations
         Paint paint = CacheForHealer.paint;
-        
+
         // Local Colors
         int fillColor53 = Color.argb(255, 206, 129, 41);
         int fillColor51 = Color.argb(255, 229, 144, 37);
@@ -4539,17 +4538,17 @@ public class HabiticaIcons {
         int fillColor56 = Color.argb(255, 255, 166, 35);
         int fillColor49 = Color.argb(255, 255, 215, 168);
         int fillColor10 = Color.argb(255, 255, 166, 35);
-        
+
         // Local Variables
         boolean lightBackground = !darkBackground;
-        
+
         // Resize to Target Frame
         canvas.save();
         RectF resizedFrame = CacheForHealer.resizedFrame;
         HabiticaIcons.resizingBehaviorApply(resizing, CacheForHealer.originalFrame, targetFrame, resizedFrame);
         canvas.translate(resizedFrame.left, resizedFrame.top);
         canvas.scale(resizedFrame.width() / 32f, resizedFrame.height() / 32f);
-        
+
         // Group 2
         if (darkBackground) {
             // Bezier
@@ -4575,14 +4574,14 @@ public class HabiticaIcons {
             bezierPath.cubicTo(16.19f, 28.41f, 15.26f, 28.79f, 15.26f, 28.79f);
             bezierPath.cubicTo(15.26f, 28.79f, 14.32f, 28.41f, 13.91f, 28.2f);
             bezierPath.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezierPath.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor49);
             canvas.drawPath(bezierPath, paint);
-            
+
             // Bezier 2
             RectF bezier2Rect = CacheForHealer.bezier2Rect;
             bezier2Rect.set(7.21f, 7.04f, 15.26f, 12.42f);
@@ -4598,14 +4597,14 @@ public class HabiticaIcons {
             bezier2Path.lineTo(9.05f, 12.42f);
             bezier2Path.lineTo(9.05f, 12.41f);
             bezier2Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier2Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor50);
             canvas.drawPath(bezier2Path, paint);
-            
+
             // Bezier 3
             RectF bezier3Rect = CacheForHealer.bezier3Rect;
             bezier3Rect.set(6.94f, 7.03f, 15.26f, 26.56f);
@@ -4622,14 +4621,14 @@ public class HabiticaIcons {
             bezier3Path.lineTo(15.26f, 7.03f);
             bezier3Path.cubicTo(15.1f, 7.03f, 14.95f, 7.06f, 14.81f, 7.13f);
             bezier3Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier3Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor10);
             canvas.drawPath(bezier3Path, paint);
-            
+
             // Bezier 4
             RectF bezier4Rect = CacheForHealer.bezier4Rect;
             bezier4Rect.set(15.26f, 7.03f, 23.57f, 26.56f);
@@ -4645,14 +4644,14 @@ public class HabiticaIcons {
             bezier4Path.cubicTo(15.42f, 26.56f, 15.58f, 26.52f, 15.73f, 26.45f);
             bezier4Path.lineTo(15.82f, 26.4f);
             bezier4Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier4Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor51);
             canvas.drawPath(bezier4Path, paint);
-            
+
             // Bezier 5
             RectF bezier5Rect = CacheForHealer.bezier5Rect;
             bezier5Rect.set(7.21f, 7.03f, 15.26f, 12.41f);
@@ -4668,14 +4667,14 @@ public class HabiticaIcons {
             bezier5Path.lineTo(9.05f, 12.41f);
             bezier5Path.lineTo(9.05f, 12.4f);
             bezier5Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier5Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor52);
             canvas.drawPath(bezier5Path, paint);
-            
+
             // Bezier 6
             RectF bezier6Rect = CacheForHealer.bezier6Rect;
             bezier6Rect.set(15.26f, 7.03f, 23.3f, 12.41f);
@@ -4691,14 +4690,14 @@ public class HabiticaIcons {
             bezier6Path.lineTo(23.3f, 11.1f);
             bezier6Path.cubicTo(23.2f, 10.96f, 23.08f, 10.85f, 22.92f, 10.78f);
             bezier6Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier6Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor10);
             canvas.drawPath(bezier6Path, paint);
-            
+
             // Bezier 7
             RectF bezier7Rect = CacheForHealer.bezier7Rect;
             bezier7Rect.set(6.94f, 11.1f, 15.26f, 26.56f);
@@ -4718,14 +4717,14 @@ public class HabiticaIcons {
             bezier7Path.lineTo(15.26f, 24.3f);
             bezier7Path.cubicTo(15.2f, 24.3f, 15.15f, 24.28f, 15.05f, 24.24f);
             bezier7Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier7Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor51);
             canvas.drawPath(bezier7Path, paint);
-            
+
             // Bezier 8
             RectF bezier8Rect = CacheForHealer.bezier8Rect;
             bezier8Rect.set(15.26f, 11.09f, 23.57f, 26.56f);
@@ -4744,14 +4743,14 @@ public class HabiticaIcons {
             bezier8Path.lineTo(21.47f, 12.41f);
             bezier8Path.cubicTo(21.53f, 14.25f, 21.43f, 17.91f, 20.35f, 19.95f);
             bezier8Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier8Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor53);
             canvas.drawPath(bezier8Path, paint);
-            
+
             // Bezier 9
             RectF bezier9Rect = CacheForHealer.bezier9Rect;
             bezier9Rect.set(10.81f, 15.31f, 15.26f, 16.79f);
@@ -4762,14 +4761,14 @@ public class HabiticaIcons {
             bezier9Path.lineTo(15.26f, 16.79f);
             bezier9Path.lineTo(10.81f, 16.79f);
             bezier9Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier9Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor52);
             canvas.drawPath(bezier9Path, paint);
-            
+
             // Bezier 10
             RectF bezier10Rect = CacheForHealer.bezier10Rect;
             bezier10Rect.set(13.77f, 16.79f, 15.26f, 21.24f);
@@ -4780,14 +4779,14 @@ public class HabiticaIcons {
             bezier10Path.lineTo(15.26f, 16.79f);
             bezier10Path.lineTo(15.26f, 21.24f);
             bezier10Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier10Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor52);
             canvas.drawPath(bezier10Path, paint);
-            
+
             // Bezier 11
             RectF bezier11Rect = CacheForHealer.bezier11Rect;
             bezier11Rect.set(15.26f, 16.79f, 19.7f, 18.28f);
@@ -4798,14 +4797,14 @@ public class HabiticaIcons {
             bezier11Path.lineTo(15.26f, 16.79f);
             bezier11Path.lineTo(19.7f, 16.79f);
             bezier11Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier11Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor53);
             canvas.drawPath(bezier11Path, paint);
-            
+
             // Bezier 12
             RectF bezier12Rect = CacheForHealer.bezier12Rect;
             bezier12Rect.set(15.26f, 12.35f, 16.74f, 16.79f);
@@ -4816,14 +4815,14 @@ public class HabiticaIcons {
             bezier12Path.lineTo(15.26f, 16.79f);
             bezier12Path.lineTo(15.26f, 12.35f);
             bezier12Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier12Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor53);
             canvas.drawPath(bezier12Path, paint);
-            
+
             // Bezier 13
             RectF bezier13Rect = CacheForHealer.bezier13Rect;
             bezier13Rect.set(15.26f, 15.31f, 19.7f, 16.79f);
@@ -4834,14 +4833,14 @@ public class HabiticaIcons {
             bezier13Path.lineTo(15.26f, 16.79f);
             bezier13Path.lineTo(19.7f, 16.79f);
             bezier13Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier13Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor53);
             canvas.drawPath(bezier13Path, paint);
-            
+
             // Bezier 14
             RectF bezier14Rect = CacheForHealer.bezier14Rect;
             bezier14Rect.set(15.26f, 16.79f, 16.74f, 21.24f);
@@ -4852,14 +4851,14 @@ public class HabiticaIcons {
             bezier14Path.lineTo(15.26f, 16.79f);
             bezier14Path.lineTo(15.26f, 21.24f);
             bezier14Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier14Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor53);
             canvas.drawPath(bezier14Path, paint);
-            
+
             // Bezier 15
             RectF bezier15Rect = CacheForHealer.bezier15Rect;
             bezier15Rect.set(10.81f, 16.79f, 15.26f, 18.28f);
@@ -4870,14 +4869,14 @@ public class HabiticaIcons {
             bezier15Path.lineTo(15.26f, 16.79f);
             bezier15Path.lineTo(10.81f, 16.79f);
             bezier15Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier15Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor52);
             canvas.drawPath(bezier15Path, paint);
-            
+
             // Bezier 16
             RectF bezier16Rect = CacheForHealer.bezier16Rect;
             bezier16Rect.set(13.77f, 12.35f, 15.26f, 16.79f);
@@ -4888,7 +4887,7 @@ public class HabiticaIcons {
             bezier16Path.lineTo(15.26f, 16.79f);
             bezier16Path.lineTo(15.26f, 12.35f);
             bezier16Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier16Path.setFillType(Path.FillType.EVEN_ODD);
@@ -4896,7 +4895,7 @@ public class HabiticaIcons {
             paint.setColor(fillColor52);
             canvas.drawPath(bezier16Path, paint);
         }
-        
+
         // Group 3
         if (lightBackground) {
             // Bezier 17
@@ -4922,14 +4921,14 @@ public class HabiticaIcons {
             bezier17Path.lineTo(16.6f, 28.2f);
             bezier17Path.cubicTo(16.19f, 28.41f, 15.26f, 28.79f, 15.26f, 28.79f);
             bezier17Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier17Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor54);
             canvas.drawPath(bezier17Path, paint);
-            
+
             // Bezier 18
             RectF bezier18Rect = CacheForHealer.bezier18Rect;
             bezier18Rect.set(7.21f, 7.04f, 15.26f, 12.42f);
@@ -4945,14 +4944,14 @@ public class HabiticaIcons {
             bezier18Path.lineTo(9.05f, 12.42f);
             bezier18Path.lineTo(9.05f, 12.41f);
             bezier18Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier18Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor50);
             canvas.drawPath(bezier18Path, paint);
-            
+
             // Bezier 19
             RectF bezier19Rect = CacheForHealer.bezier19Rect;
             bezier19Rect.set(6.94f, 7.03f, 15.26f, 26.56f);
@@ -4969,14 +4968,14 @@ public class HabiticaIcons {
             bezier19Path.lineTo(15.26f, 7.03f);
             bezier19Path.cubicTo(15.1f, 7.03f, 14.95f, 7.06f, 14.81f, 7.13f);
             bezier19Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier19Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor55);
             canvas.drawPath(bezier19Path, paint);
-            
+
             // Bezier 20
             RectF bezier20Rect = CacheForHealer.bezier20Rect;
             bezier20Rect.set(15.26f, 7.03f, 23.57f, 26.56f);
@@ -4992,14 +4991,14 @@ public class HabiticaIcons {
             bezier20Path.lineTo(15.26f, 26.56f);
             bezier20Path.cubicTo(15.42f, 26.56f, 15.58f, 26.52f, 15.73f, 26.45f);
             bezier20Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier20Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor56);
             canvas.drawPath(bezier20Path, paint);
-            
+
             // Bezier 21
             RectF bezier21Rect = CacheForHealer.bezier21Rect;
             bezier21Rect.set(7.21f, 7.03f, 15.26f, 12.41f);
@@ -5015,14 +5014,14 @@ public class HabiticaIcons {
             bezier21Path.lineTo(9.05f, 12.41f);
             bezier21Path.lineTo(9.05f, 12.4f);
             bezier21Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier21Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor57);
             canvas.drawPath(bezier21Path, paint);
-            
+
             // Bezier 22
             RectF bezier22Rect = CacheForHealer.bezier22Rect;
             bezier22Rect.set(15.26f, 7.03f, 23.3f, 12.41f);
@@ -5038,14 +5037,14 @@ public class HabiticaIcons {
             bezier22Path.lineTo(23.3f, 11.1f);
             bezier22Path.cubicTo(23.2f, 10.96f, 23.08f, 10.85f, 22.92f, 10.78f);
             bezier22Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier22Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor55);
             canvas.drawPath(bezier22Path, paint);
-            
+
             // Bezier 23
             RectF bezier23Rect = CacheForHealer.bezier23Rect;
             bezier23Rect.set(6.94f, 11.1f, 15.26f, 26.56f);
@@ -5065,14 +5064,14 @@ public class HabiticaIcons {
             bezier23Path.lineTo(15.26f, 24.3f);
             bezier23Path.cubicTo(15.2f, 24.3f, 15.15f, 24.28f, 15.05f, 24.24f);
             bezier23Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier23Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor56);
             canvas.drawPath(bezier23Path, paint);
-            
+
             // Bezier 24
             RectF bezier24Rect = CacheForHealer.bezier24Rect;
             bezier24Rect.set(15.26f, 11.09f, 23.57f, 26.56f);
@@ -5091,14 +5090,14 @@ public class HabiticaIcons {
             bezier24Path.lineTo(21.47f, 12.41f);
             bezier24Path.cubicTo(21.53f, 14.25f, 21.43f, 17.91f, 20.35f, 19.95f);
             bezier24Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier24Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor58);
             canvas.drawPath(bezier24Path, paint);
-            
+
             // Bezier 25
             RectF bezier25Rect = CacheForHealer.bezier25Rect;
             bezier25Rect.set(10.81f, 15.31f, 15.26f, 16.79f);
@@ -5109,14 +5108,14 @@ public class HabiticaIcons {
             bezier25Path.lineTo(15.26f, 16.79f);
             bezier25Path.lineTo(10.81f, 16.79f);
             bezier25Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier25Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor59);
             canvas.drawPath(bezier25Path, paint);
-            
+
             // Bezier 26
             RectF bezier26Rect = CacheForHealer.bezier26Rect;
             bezier26Rect.set(13.77f, 16.79f, 15.26f, 21.24f);
@@ -5127,14 +5126,14 @@ public class HabiticaIcons {
             bezier26Path.lineTo(15.26f, 16.79f);
             bezier26Path.lineTo(15.26f, 21.24f);
             bezier26Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier26Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor59);
             canvas.drawPath(bezier26Path, paint);
-            
+
             // Bezier 27
             RectF bezier27Rect = CacheForHealer.bezier27Rect;
             bezier27Rect.set(15.26f, 16.79f, 19.7f, 18.28f);
@@ -5145,14 +5144,14 @@ public class HabiticaIcons {
             bezier27Path.lineTo(15.26f, 16.79f);
             bezier27Path.lineTo(19.7f, 16.79f);
             bezier27Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier27Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor58);
             canvas.drawPath(bezier27Path, paint);
-            
+
             // Bezier 28
             RectF bezier28Rect = CacheForHealer.bezier28Rect;
             bezier28Rect.set(15.26f, 12.35f, 16.74f, 16.79f);
@@ -5163,14 +5162,14 @@ public class HabiticaIcons {
             bezier28Path.lineTo(15.26f, 16.79f);
             bezier28Path.lineTo(15.26f, 12.35f);
             bezier28Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier28Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor58);
             canvas.drawPath(bezier28Path, paint);
-            
+
             // Bezier 29
             RectF bezier29Rect = CacheForHealer.bezier29Rect;
             bezier29Rect.set(15.26f, 15.31f, 19.7f, 16.79f);
@@ -5181,14 +5180,14 @@ public class HabiticaIcons {
             bezier29Path.lineTo(15.26f, 16.79f);
             bezier29Path.lineTo(19.7f, 16.79f);
             bezier29Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier29Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor58);
             canvas.drawPath(bezier29Path, paint);
-            
+
             // Bezier 30
             RectF bezier30Rect = CacheForHealer.bezier30Rect;
             bezier30Rect.set(15.26f, 16.79f, 16.74f, 21.24f);
@@ -5199,14 +5198,14 @@ public class HabiticaIcons {
             bezier30Path.lineTo(15.26f, 16.79f);
             bezier30Path.lineTo(15.26f, 21.24f);
             bezier30Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier30Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor58);
             canvas.drawPath(bezier30Path, paint);
-            
+
             // Bezier 31
             RectF bezier31Rect = CacheForHealer.bezier31Rect;
             bezier31Rect.set(10.81f, 16.79f, 15.26f, 18.28f);
@@ -5217,14 +5216,14 @@ public class HabiticaIcons {
             bezier31Path.lineTo(15.26f, 16.79f);
             bezier31Path.lineTo(10.81f, 16.79f);
             bezier31Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier31Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor59);
             canvas.drawPath(bezier31Path, paint);
-            
+
             // Bezier 32
             RectF bezier32Rect = CacheForHealer.bezier32Rect;
             bezier32Rect.set(13.77f, 12.35f, 15.26f, 16.79f);
@@ -5235,7 +5234,7 @@ public class HabiticaIcons {
             bezier32Path.lineTo(15.26f, 16.79f);
             bezier32Path.lineTo(15.26f, 12.35f);
             bezier32Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier32Path.setFillType(Path.FillType.EVEN_ODD);
@@ -5243,21 +5242,21 @@ public class HabiticaIcons {
             paint.setColor(fillColor59);
             canvas.drawPath(bezier32Path, paint);
         }
-        
+
         canvas.restore();
     }
-    
+
     private static class CacheForHealerLightBg {
         private static final RectF originalFrame = new RectF(0f, 0f, 32f, 32f);
         private static final RectF resizedFrame = new RectF();
         private static final RectF symbolRect = new RectF();
         private static final RectF symbolTargetRect = new RectF();
     }
-    
+
     public static void drawHealerLightBg(Canvas canvas) {
         HabiticaIcons.drawHealerLightBg(canvas, new RectF(0f, 0f, 32f, 32f), ResizingBehavior.AspectFit);
     }
-    
+
     public static void drawHealerLightBg(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
         // Resize to Target Frame
         canvas.save();
@@ -5265,7 +5264,7 @@ public class HabiticaIcons {
         HabiticaIcons.resizingBehaviorApply(resizing, CacheForHealerLightBg.originalFrame, targetFrame, resizedFrame);
         canvas.translate(resizedFrame.left, resizedFrame.top);
         canvas.scale(resizedFrame.width() / 32f, resizedFrame.height() / 32f);
-        
+
         // Symbol
         RectF symbolRect = CacheForHealerLightBg.symbolRect;
         symbolRect.set(0f, 0f, 32f, 32f);
@@ -5276,10 +5275,10 @@ public class HabiticaIcons {
         symbolTargetRect.set(0f, 0f, symbolRect.width(), symbolRect.height());
         HabiticaIcons.drawHealer(canvas, symbolTargetRect, ResizingBehavior.Stretch, false);
         canvas.restore();
-        
+
         canvas.restore();
     }
-    
+
     private static class CacheForMage {
         private static final Paint paint = new Paint();
         private static final RectF originalFrame = new RectF(0f, 0f, 32f, 32f);
@@ -5325,7 +5324,7 @@ public class HabiticaIcons {
     public static void drawMage(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, boolean darkBackground) {
         // General Declarations
         Paint paint = CacheForMage.paint;
-        
+
         // Local Colors
         int fillColor64 = Color.argb(255, 77, 178, 214);
         int fillColor61 = Color.argb(255, 39, 138, 191);
@@ -5338,17 +5337,17 @@ public class HabiticaIcons {
         int fillColor62 = Color.argb(255, 83, 180, 229);
         int fillColor68 = Color.argb(255, 31, 110, 162);
         int fillColor60 = Color.argb(255, 182, 225, 247);
-        
+
         // Local Variables
         boolean lightBackground = !darkBackground;
-        
+
         // Resize to Target Frame
         canvas.save();
         RectF resizedFrame = CacheForMage.resizedFrame;
         HabiticaIcons.resizingBehaviorApply(resizing, CacheForMage.originalFrame, targetFrame, resizedFrame);
         canvas.translate(resizedFrame.left, resizedFrame.top);
         canvas.scale(resizedFrame.width() / 32f, resizedFrame.height() / 32f);
-        
+
         // Group 2
         if (darkBackground) {
             // Bezier
@@ -5370,14 +5369,14 @@ public class HabiticaIcons {
             bezierPath.cubicTo(19.55f, 12.69f, 17.66f, 7.01f, 15.74f, 5.08f);
             bezierPath.lineTo(15.74f, 5.08f);
             bezierPath.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezierPath.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor60);
             canvas.drawPath(bezierPath, paint);
-            
+
             // Bezier 2
             RectF bezier2Rect = CacheForMage.bezier2Rect;
             bezier2Rect.set(15.74f, 18.72f, 25.66f, 26.81f);
@@ -5394,14 +5393,14 @@ public class HabiticaIcons {
             bezier2Path.lineTo(15.74f, 26.81f);
             bezier2Path.lineTo(15.74f, 21.2f);
             bezier2Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier2Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor61);
             canvas.drawPath(bezier2Path, paint);
-            
+
             // Bezier 3
             RectF bezier3Rect = CacheForMage.bezier3Rect;
             bezier3Rect.set(20.73f, 16.3f, 25.66f, 20.13f);
@@ -5416,14 +5415,14 @@ public class HabiticaIcons {
             bezier3Path.cubicTo(21.89f, 17.81f, 21f, 18.56f, 20.78f, 18.22f);
             bezier3Path.cubicTo(20.47f, 17.73f, 21.84f, 16.58f, 21.96f, 16.48f);
             bezier3Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier3Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor62);
             canvas.drawPath(bezier3Path, paint);
-            
+
             // Bezier 4
             RectF bezier4Rect = CacheForMage.bezier4Rect;
             bezier4Rect.set(11f, 8.04f, 15.74f, 23.26f);
@@ -5435,14 +5434,14 @@ public class HabiticaIcons {
             bezier4Path.lineTo(15.74f, 8.04f);
             bezier4Path.cubicTo(15.55f, 8.04f, 15.37f, 8.15f, 15.29f, 8.38f);
             bezier4Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier4Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor63);
             canvas.drawPath(bezier4Path, paint);
-            
+
             // Bezier 5
             RectF bezier5Rect = CacheForMage.bezier5Rect;
             bezier5Rect.set(15.74f, 8.04f, 20.48f, 23.26f);
@@ -5454,14 +5453,14 @@ public class HabiticaIcons {
             bezier5Path.lineTo(20.48f, 20.78f);
             bezier5Path.cubicTo(20.48f, 20.78f, 19f, 16.41f, 16.19f, 8.38f);
             bezier5Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier5Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor61);
             canvas.drawPath(bezier5Path, paint);
-            
+
             // Bezier 6
             RectF bezier6Rect = CacheForMage.bezier6Rect;
             bezier6Rect.set(5.82f, 18.72f, 15.74f, 26.81f);
@@ -5478,14 +5477,14 @@ public class HabiticaIcons {
             bezier6Path.lineTo(15.74f, 26.81f);
             bezier6Path.lineTo(15.74f, 21.2f);
             bezier6Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier6Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor64);
             canvas.drawPath(bezier6Path, paint);
-            
+
             // Bezier 7
             RectF bezier7Rect = CacheForMage.bezier7Rect;
             bezier7Rect.set(5.82f, 16.3f, 10.75f, 20.13f);
@@ -5500,14 +5499,14 @@ public class HabiticaIcons {
             bezier7Path.cubicTo(9.59f, 17.81f, 10.48f, 18.56f, 10.7f, 18.22f);
             bezier7Path.cubicTo(11.01f, 17.73f, 9.64f, 16.58f, 9.52f, 16.48f);
             bezier7Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier7Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor65);
             canvas.drawPath(bezier7Path, paint);
-            
+
             // Bezier 8
             RectF bezier8Rect = CacheForMage.bezier8Rect;
             bezier8Rect.set(11.22f, 17.9f, 15.74f, 22.71f);
@@ -5519,14 +5518,14 @@ public class HabiticaIcons {
             bezier8Path.lineTo(11.22f, 20.01f);
             bezier8Path.lineTo(15.74f, 22.71f);
             bezier8Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier8Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor66);
             canvas.drawPath(bezier8Path, paint);
-            
+
             // Bezier 9
             RectF bezier9Rect = CacheForMage.bezier9Rect;
             bezier9Rect.set(15.74f, 17.9f, 20.27f, 22.71f);
@@ -5538,7 +5537,7 @@ public class HabiticaIcons {
             bezier9Path.lineTo(20.27f, 20.01f);
             bezier9Path.lineTo(15.74f, 22.71f);
             bezier9Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier9Path.setFillType(Path.FillType.EVEN_ODD);
@@ -5546,7 +5545,7 @@ public class HabiticaIcons {
             paint.setColor(fillColor67);
             canvas.drawPath(bezier9Path, paint);
         }
-        
+
         // Group 3
         if (lightBackground) {
             // Bezier 10
@@ -5568,14 +5567,14 @@ public class HabiticaIcons {
             bezier10Path.cubicTo(19.55f, 12.69f, 17.66f, 7.01f, 15.74f, 5.08f);
             bezier10Path.lineTo(15.74f, 5.08f);
             bezier10Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier10Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor68);
             canvas.drawPath(bezier10Path, paint);
-            
+
             // Bezier 11
             RectF bezier11Rect = CacheForMage.bezier11Rect;
             bezier11Rect.set(15.74f, 18.72f, 25.66f, 26.81f);
@@ -5592,14 +5591,14 @@ public class HabiticaIcons {
             bezier11Path.lineTo(15.74f, 26.81f);
             bezier11Path.lineTo(15.74f, 21.2f);
             bezier11Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier11Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor61);
             canvas.drawPath(bezier11Path, paint);
-            
+
             // Bezier 12
             RectF bezier12Rect = CacheForMage.bezier12Rect;
             bezier12Rect.set(20.73f, 16.3f, 25.66f, 20.13f);
@@ -5614,14 +5613,14 @@ public class HabiticaIcons {
             bezier12Path.cubicTo(21.89f, 17.81f, 21f, 18.56f, 20.78f, 18.22f);
             bezier12Path.cubicTo(20.47f, 17.73f, 21.84f, 16.58f, 21.96f, 16.48f);
             bezier12Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier12Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor62);
             canvas.drawPath(bezier12Path, paint);
-            
+
             // Bezier 13
             RectF bezier13Rect = CacheForMage.bezier13Rect;
             bezier13Rect.set(11f, 8.04f, 15.74f, 23.26f);
@@ -5633,14 +5632,14 @@ public class HabiticaIcons {
             bezier13Path.lineTo(15.74f, 8.04f);
             bezier13Path.cubicTo(15.55f, 8.04f, 15.37f, 8.15f, 15.29f, 8.38f);
             bezier13Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier13Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor63);
             canvas.drawPath(bezier13Path, paint);
-            
+
             // Bezier 14
             RectF bezier14Rect = CacheForMage.bezier14Rect;
             bezier14Rect.set(15.74f, 8.04f, 20.48f, 23.26f);
@@ -5652,14 +5651,14 @@ public class HabiticaIcons {
             bezier14Path.lineTo(20.48f, 20.78f);
             bezier14Path.cubicTo(20.48f, 20.78f, 19f, 16.41f, 16.19f, 8.38f);
             bezier14Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier14Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor61);
             canvas.drawPath(bezier14Path, paint);
-            
+
             // Bezier 15
             RectF bezier15Rect = CacheForMage.bezier15Rect;
             bezier15Rect.set(5.82f, 18.72f, 15.74f, 26.81f);
@@ -5676,14 +5675,14 @@ public class HabiticaIcons {
             bezier15Path.lineTo(15.74f, 26.81f);
             bezier15Path.lineTo(15.74f, 21.2f);
             bezier15Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier15Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor64);
             canvas.drawPath(bezier15Path, paint);
-            
+
             // Bezier 16
             RectF bezier16Rect = CacheForMage.bezier16Rect;
             bezier16Rect.set(5.82f, 16.3f, 10.75f, 20.13f);
@@ -5698,14 +5697,14 @@ public class HabiticaIcons {
             bezier16Path.cubicTo(9.59f, 17.81f, 10.48f, 18.56f, 10.7f, 18.22f);
             bezier16Path.cubicTo(11.01f, 17.73f, 9.64f, 16.58f, 9.52f, 16.48f);
             bezier16Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier16Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor65);
             canvas.drawPath(bezier16Path, paint);
-            
+
             // Bezier 17
             RectF bezier17Rect = CacheForMage.bezier17Rect;
             bezier17Rect.set(11.22f, 17.9f, 15.74f, 22.71f);
@@ -5717,14 +5716,14 @@ public class HabiticaIcons {
             bezier17Path.lineTo(11.22f, 20.01f);
             bezier17Path.lineTo(15.74f, 22.71f);
             bezier17Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier17Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor69);
             canvas.drawPath(bezier17Path, paint);
-            
+
             // Bezier 18
             RectF bezier18Rect = CacheForMage.bezier18Rect;
             bezier18Rect.set(15.74f, 17.9f, 20.27f, 22.71f);
@@ -5736,7 +5735,7 @@ public class HabiticaIcons {
             bezier18Path.lineTo(20.27f, 20.01f);
             bezier18Path.lineTo(15.74f, 22.71f);
             bezier18Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier18Path.setFillType(Path.FillType.EVEN_ODD);
@@ -5744,21 +5743,21 @@ public class HabiticaIcons {
             paint.setColor(fillColor70);
             canvas.drawPath(bezier18Path, paint);
         }
-        
+
         canvas.restore();
     }
-    
+
     private static class CacheForMageLightBg {
         private static final RectF originalFrame = new RectF(0f, 0f, 32f, 32f);
         private static final RectF resizedFrame = new RectF();
         private static final RectF symbolRect = new RectF();
         private static final RectF symbolTargetRect = new RectF();
     }
-    
+
     public static void drawMageLightBg(Canvas canvas) {
         HabiticaIcons.drawMageLightBg(canvas, new RectF(0f, 0f, 32f, 32f), ResizingBehavior.AspectFit);
     }
-    
+
     public static void drawMageLightBg(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
         // Resize to Target Frame
         canvas.save();
@@ -5766,7 +5765,7 @@ public class HabiticaIcons {
         HabiticaIcons.resizingBehaviorApply(resizing, CacheForMageLightBg.originalFrame, targetFrame, resizedFrame);
         canvas.translate(resizedFrame.left, resizedFrame.top);
         canvas.scale(resizedFrame.width() / 32f, resizedFrame.height() / 32f);
-        
+
         // Symbol
         RectF symbolRect = CacheForMageLightBg.symbolRect;
         symbolRect.set(0f, 0f, 32f, 32f);
@@ -5777,10 +5776,10 @@ public class HabiticaIcons {
         symbolTargetRect.set(0f, 0f, symbolRect.width(), symbolRect.height());
         HabiticaIcons.drawMage(canvas, symbolTargetRect, ResizingBehavior.Stretch, false);
         canvas.restore();
-        
+
         canvas.restore();
     }
-    
+
     private static class CacheForCheckmark {
         private static final Paint paint = new Paint();
         private static final RectF originalFrame = new RectF(0f, 0f, 16f, 12f);
@@ -5789,25 +5788,25 @@ public class HabiticaIcons {
         private static final Path bezierPath = new Path();
         private static final PaintCodeDashPathEffect bezierPathDashEffect = new PaintCodeDashPathEffect();
     }
-    
+
     public static void drawCheckmark(Canvas canvas, int checkmarkColor, float percentage) {
         HabiticaIcons.drawCheckmark(canvas, new RectF(0f, 0f, 16f, 12f), ResizingBehavior.AspectFit, checkmarkColor, percentage);
     }
-    
+
     public static void drawCheckmark(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, int checkmarkColor, float percentage) {
         // General Declarations
         Paint paint = CacheForCheckmark.paint;
-        
+
         // Local Variables
         float checkmarkVisibility = percentage * 20f;
-        
+
         // Resize to Target Frame
         canvas.save();
         RectF resizedFrame = CacheForCheckmark.resizedFrame;
         HabiticaIcons.resizingBehaviorApply(resizing, CacheForCheckmark.originalFrame, targetFrame, resizedFrame);
         canvas.translate(resizedFrame.left, resizedFrame.top);
         canvas.scale(resizedFrame.width() / 16f, resizedFrame.height() / 12f);
-        
+
         // Bezier
         RectF bezierRect = CacheForCheckmark.bezierRect;
         bezierRect.set(1f, 1f, 15f, 10f);
@@ -5816,7 +5815,7 @@ public class HabiticaIcons {
         bezierPath.moveTo(1f, 5f);
         bezierPath.lineTo(6f, 10f);
         bezierPath.lineTo(15f, 1f);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStrokeWidth(2f);
@@ -5827,10 +5826,10 @@ public class HabiticaIcons {
         paint.setColor(checkmarkColor);
         canvas.drawPath(bezierPath, paint);
         canvas.restore();
-        
+
         canvas.restore();
     }
-    
+
     private static class CacheForHourglassShop {
         private static final Paint paint = new Paint();
         private static final RectF originalFrame = new RectF(0f, 0f, 42f, 53f);
@@ -5854,28 +5853,28 @@ public class HabiticaIcons {
         private static final RectF bezier6Rect = new RectF();
         private static final Path bezier6Path = new Path();
     }
-    
+
     public static void drawHourglassShop(Canvas canvas) {
         HabiticaIcons.drawHourglassShop(canvas, new RectF(0f, 0f, 42f, 53f), ResizingBehavior.AspectFit);
     }
-    
+
     public static void drawHourglassShop(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
         // General Declarations
         Paint paint = CacheForHourglassShop.paint;
-        
+
         // Local Colors
         int fillColor18 = Color.argb(255, 154, 98, 255);
         int fillColor19 = Color.argb(255, 79, 42, 147);
         int fillColor17 = Color.argb(230, 255, 255, 255);
         int fillColor16 = Color.argb(204, 169, 220, 246);
-        
+
         // Resize to Target Frame
         canvas.save();
         RectF resizedFrame = CacheForHourglassShop.resizedFrame;
         HabiticaIcons.resizingBehaviorApply(resizing, CacheForHourglassShop.originalFrame, targetFrame, resizedFrame);
         canvas.translate(resizedFrame.left, resizedFrame.top);
         canvas.scale(resizedFrame.width() / 42f, resizedFrame.height() / 53f);
-        
+
         // Rectangle
         RectF rectangleRect = CacheForHourglassShop.rectangleRect;
         rectangleRect.set(19f, 0f, 22f, 10f);
@@ -5891,13 +5890,13 @@ public class HabiticaIcons {
         rectanglePath.cubicTo(19.63f, 0f, 19f, 0.63f, 19f, 1.4f);
         rectanglePath.lineTo(19f, 8.6f);
         rectanglePath.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor18);
         canvas.drawPath(rectanglePath, paint);
-        
+
         // Clip
         RectF clipRect = CacheForHourglassShop.clipRect;
         clipRect.set(1f, 6f, 9.03f, 14.03f);
@@ -5913,13 +5912,13 @@ public class HabiticaIcons {
         clipPath.cubicTo(2.98f, 5.86f, 2.1f, 5.86f, 1.55f, 6.41f);
         clipPath.lineTo(1.41f, 6.55f);
         clipPath.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor18);
         canvas.drawPath(clipPath, paint);
-        
+
         // Clip 2
         RectF clip2Rect = CacheForHourglassShop.clip2Rect;
         clip2Rect.set(33f, 6f, 41.03f, 14.03f);
@@ -5935,13 +5934,13 @@ public class HabiticaIcons {
         clip2Path.cubicTo(32.86f, 12.05f, 32.86f, 12.93f, 33.41f, 13.48f);
         clip2Path.lineTo(33.55f, 13.62f);
         clip2Path.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor18);
         canvas.drawPath(clip2Path, paint);
-        
+
         // Bezier
         RectF bezierRect = CacheForHourglassShop.bezierRect;
         bezierRect.set(10f, 16f, 31.14f, 52.24f);
@@ -5965,14 +5964,14 @@ public class HabiticaIcons {
         bezierPath.cubicTo(15.6f, 33.51f, 15.6f, 34.73f, 14.76f, 35.35f);
         bezierPath.cubicTo(11.89f, 37.46f, 10f, 41f, 10f, 44.69f);
         bezierPath.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         bezierPath.setFillType(Path.FillType.EVEN_ODD);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor16);
         canvas.drawPath(bezierPath, paint);
-        
+
         // Bezier 2
         RectF bezier2Rect = CacheForHourglassShop.bezier2Rect;
         bezier2Rect.set(13.02f, 19.02f, 28.12f, 49.22f);
@@ -5996,14 +5995,14 @@ public class HabiticaIcons {
         bezier2Path.lineTo(13.02f, 20.36f);
         bezier2Path.cubicTo(14.46f, 19.64f, 17.14f, 19.02f, 20.57f, 19.02f);
         bezier2Path.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         bezier2Path.setFillType(Path.FillType.EVEN_ODD);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor17);
         canvas.drawPath(bezier2Path, paint);
-        
+
         // Bezier 3
         RectF bezier3Rect = CacheForHourglassShop.bezier3Rect;
         bezier3Rect.set(15.58f, 21.29f, 25.96f, 27.66f);
@@ -6017,14 +6016,14 @@ public class HabiticaIcons {
         bezier3Path.cubicTo(25.72f, 24.38f, 25.98f, 22.88f, 25.96f, 22.29f);
         bezier3Path.cubicTo(25.94f, 21.46f, 23.49f, 21.29f, 20.92f, 21.29f);
         bezier3Path.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         bezier3Path.setFillType(Path.FillType.EVEN_ODD);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor18);
         canvas.drawPath(bezier3Path, paint);
-        
+
         // Bezier 4
         RectF bezier4Rect = CacheForHourglassShop.bezier4Rect;
         bezier4Rect.set(21.76f, 21.32f, 25.96f, 27.39f);
@@ -6038,14 +6037,14 @@ public class HabiticaIcons {
         bezier4Path.cubicTo(21.86f, 27.09f, 21.96f, 27.26f, 22.08f, 27.39f);
         bezier4Path.cubicTo(22.64f, 27.01f, 23.01f, 26.25f, 24.11f, 25.49f);
         bezier4Path.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         bezier4Path.setFillType(Path.FillType.EVEN_ODD);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor19);
         canvas.drawPath(bezier4Path, paint);
-        
+
         // Bezier 5
         RectF bezier5Rect = CacheForHourglassShop.bezier5Rect;
         bezier5Rect.set(15.23f, 36.87f, 25.61f, 45.73f);
@@ -6060,14 +6059,14 @@ public class HabiticaIcons {
         bezier5Path.cubicTo(25.33f, 41.59f, 24.56f, 40.68f, 23.15f, 39.63f);
         bezier5Path.cubicTo(21.8f, 38.63f, 21.36f, 36.87f, 20.57f, 36.87f);
         bezier5Path.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         bezier5Path.setFillType(Path.FillType.EVEN_ODD);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor18);
         canvas.drawPath(bezier5Path, paint);
-        
+
         // Bezier 6
         RectF bezier6Rect = CacheForHourglassShop.bezier6Rect;
         bezier6Rect.set(15.32f, 42.59f, 25.52f, 45.73f);
@@ -6081,17 +6080,17 @@ public class HabiticaIcons {
         bezier6Path.cubicTo(17.51f, 43.24f, 15.31f, 44.14f, 15.32f, 45.15f);
         bezier6Path.cubicTo(15.4f, 45.33f, 15.54f, 45.39f, 15.7f, 45.44f);
         bezier6Path.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         bezier6Path.setFillType(Path.FillType.EVEN_ODD);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor19);
         canvas.drawPath(bezier6Path, paint);
-        
+
         canvas.restore();
     }
-    
+
     private static class CacheForAttributeSparklesLeft {
         private static final Paint paint = new Paint();
         private static final RectF originalFrame = new RectF(0f, 0f, 77f, 24f);
@@ -6105,28 +6104,28 @@ public class HabiticaIcons {
         private static final RectF star4Rect = new RectF();
         private static final Path star4Path = new Path();
     }
-    
+
     public static void drawAttributeSparklesLeft(Canvas canvas) {
         HabiticaIcons.drawAttributeSparklesLeft(canvas, new RectF(0f, 0f, 77f, 24f), ResizingBehavior.AspectFit);
     }
-    
+
     public static void drawAttributeSparklesLeft(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
         // General Declarations
         Paint paint = CacheForAttributeSparklesLeft.paint;
-        
+
         // Local Colors
         int fillColor18 = Color.argb(255, 154, 98, 255);
         int fillColor71 = Color.argb(255, 80, 181, 233);
         int fillColor73 = Color.argb(255, 255, 180, 69);
         int fillColor72 = Color.argb(255, 255, 97, 101);
-        
+
         // Resize to Target Frame
         canvas.save();
         RectF resizedFrame = CacheForAttributeSparklesLeft.resizedFrame;
         HabiticaIcons.resizingBehaviorApply(resizing, CacheForAttributeSparklesLeft.originalFrame, targetFrame, resizedFrame);
         canvas.translate(resizedFrame.left, resizedFrame.top);
         canvas.scale(resizedFrame.width() / 77f, resizedFrame.height() / 24f);
-        
+
         // Star
         RectF starRect = CacheForAttributeSparklesLeft.starRect;
         starRect.set(36f, 0f, 49f, 13f);
@@ -6142,13 +6141,13 @@ public class HabiticaIcons {
         starPath.lineTo(40.34f, 4.34f);
         starPath.lineTo(42.5f, 0f);
         starPath.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor71);
         canvas.drawPath(starPath, paint);
-        
+
         // Star 2
         RectF star2Rect = CacheForAttributeSparklesLeft.star2Rect;
         star2Rect.set(61f, 6f, 77f, 22f);
@@ -6164,13 +6163,13 @@ public class HabiticaIcons {
         star2Path.lineTo(66.35f, 11.35f);
         star2Path.lineTo(69f, 6f);
         star2Path.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor18);
         canvas.drawPath(star2Path, paint);
-        
+
         // Star 3
         RectF star3Rect = CacheForAttributeSparklesLeft.star3Rect;
         star3Rect.set(17f, 14f, 27f, 24f);
@@ -6186,13 +6185,13 @@ public class HabiticaIcons {
         star3Path.lineTo(20.34f, 17.34f);
         star3Path.lineTo(22f, 14f);
         star3Path.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor72);
         canvas.drawPath(star3Path, paint);
-        
+
         // Star 4
         RectF star4Rect = CacheForAttributeSparklesLeft.star4Rect;
         star4Rect.set(0f, 9f, 7f, 16f);
@@ -6208,16 +6207,16 @@ public class HabiticaIcons {
         star4Path.lineTo(2.33f, 11.33f);
         star4Path.lineTo(3.5f, 9f);
         star4Path.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor73);
         canvas.drawPath(star4Path, paint);
-        
+
         canvas.restore();
     }
-    
+
     private static class CacheForAttributeSparklesRight {
         private static final Paint paint = new Paint();
         private static final RectF originalFrame = new RectF(0f, 0f, 77f, 24f);
@@ -6231,28 +6230,28 @@ public class HabiticaIcons {
         private static final RectF star4Rect = new RectF();
         private static final Path star4Path = new Path();
     }
-    
+
     public static void drawAttributeSparklesRight(Canvas canvas) {
         HabiticaIcons.drawAttributeSparklesRight(canvas, new RectF(0f, 0f, 77f, 24f), ResizingBehavior.AspectFit);
     }
-    
+
     public static void drawAttributeSparklesRight(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
         // General Declarations
         Paint paint = CacheForAttributeSparklesRight.paint;
-        
+
         // Local Colors
         int fillColor18 = Color.argb(255, 154, 98, 255);
         int fillColor74 = Color.argb(255, 255, 190, 93);
         int fillColor72 = Color.argb(255, 255, 97, 101);
         int fillColor71 = Color.argb(255, 80, 181, 233);
-        
+
         // Resize to Target Frame
         canvas.save();
         RectF resizedFrame = CacheForAttributeSparklesRight.resizedFrame;
         HabiticaIcons.resizingBehaviorApply(resizing, CacheForAttributeSparklesRight.originalFrame, targetFrame, resizedFrame);
         canvas.translate(resizedFrame.left, resizedFrame.top);
         canvas.scale(resizedFrame.width() / 77f, resizedFrame.height() / 24f);
-        
+
         // Star
         RectF starRect = CacheForAttributeSparklesRight.starRect;
         starRect.set(28f, 0f, 41f, 13f);
@@ -6268,13 +6267,13 @@ public class HabiticaIcons {
         starPath.lineTo(32.34f, 4.34f);
         starPath.lineTo(34.5f, 0f);
         starPath.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor72);
         canvas.drawPath(starPath, paint);
-        
+
         // Star 2
         RectF star2Rect = CacheForAttributeSparklesRight.star2Rect;
         star2Rect.set(0f, 6f, 16f, 22f);
@@ -6290,13 +6289,13 @@ public class HabiticaIcons {
         star2Path.lineTo(5.35f, 11.35f);
         star2Path.lineTo(8f, 6f);
         star2Path.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor74);
         canvas.drawPath(star2Path, paint);
-        
+
         // Star 3
         RectF star3Rect = CacheForAttributeSparklesRight.star3Rect;
         star3Rect.set(50f, 14f, 60f, 24f);
@@ -6312,13 +6311,13 @@ public class HabiticaIcons {
         star3Path.lineTo(53.34f, 17.34f);
         star3Path.lineTo(55f, 14f);
         star3Path.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor18);
         canvas.drawPath(star3Path, paint);
-        
+
         // Star 4
         RectF star4Rect = CacheForAttributeSparklesRight.star4Rect;
         star4Rect.set(70f, 9f, 77f, 16f);
@@ -6334,16 +6333,16 @@ public class HabiticaIcons {
         star4Path.lineTo(72.33f, 11.33f);
         star4Path.lineTo(73.5f, 9f);
         star4Path.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor71);
         canvas.drawPath(star4Path, paint);
-        
+
         canvas.restore();
     }
-    
+
     private static class CacheForAttributeAllocateButton {
         private static final Paint paint = new Paint();
         private static final RectF originalFrame = new RectF(0f, 0f, 24f, 15f);
@@ -6351,25 +6350,25 @@ public class HabiticaIcons {
         private static final RectF bezierRect = new RectF();
         private static final Path bezierPath = new Path();
     }
-    
+
     public static void drawAttributeAllocateButton(Canvas canvas) {
         HabiticaIcons.drawAttributeAllocateButton(canvas, new RectF(0f, 0f, 24f, 15f), ResizingBehavior.AspectFit);
     }
-    
+
     public static void drawAttributeAllocateButton(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
         // General Declarations
         Paint paint = CacheForAttributeAllocateButton.paint;
-        
+
         // Local Colors
         int fillColor75 = Color.argb(255, 135, 129, 144);
-        
+
         // Resize to Target Frame
         canvas.save();
         RectF resizedFrame = CacheForAttributeAllocateButton.resizedFrame;
         HabiticaIcons.resizingBehaviorApply(resizing, CacheForAttributeAllocateButton.originalFrame, targetFrame, resizedFrame);
         canvas.translate(resizedFrame.left, resizedFrame.top);
         canvas.scale(resizedFrame.width() / 24f, resizedFrame.height() / 15f);
-        
+
         // Bezier
         RectF bezierRect = CacheForAttributeAllocateButton.bezierRect;
         bezierRect.set(0f, 0f, 24f, 15f);
@@ -6380,17 +6379,17 @@ public class HabiticaIcons {
         bezierPath.lineTo(24f, 15f);
         bezierPath.lineTo(0f, 15f);
         bezierPath.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         bezierPath.setFillType(Path.FillType.EVEN_ODD);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor75);
         canvas.drawPath(bezierPath, paint);
-        
+
         canvas.restore();
     }
-    
+
     private static class CacheForInfoIcon {
         private static final Paint paint = new Paint();
         private static final RectF originalFrame = new RectF(0f, 0f, 20f, 20f);
@@ -6398,22 +6397,22 @@ public class HabiticaIcons {
         private static final RectF bezierRect = new RectF();
         private static final Path bezierPath = new Path();
     }
-    
+
     public static void drawInfoIcon(Canvas canvas, int infoIconColor) {
         HabiticaIcons.drawInfoIcon(canvas, new RectF(0f, 0f, 20f, 20f), ResizingBehavior.AspectFit, infoIconColor);
     }
-    
+
     public static void drawInfoIcon(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, int infoIconColor) {
         // General Declarations
         Paint paint = CacheForInfoIcon.paint;
-        
+
         // Resize to Target Frame
         canvas.save();
         RectF resizedFrame = CacheForInfoIcon.resizedFrame;
         HabiticaIcons.resizingBehaviorApply(resizing, CacheForInfoIcon.originalFrame, targetFrame, resizedFrame);
         canvas.translate(resizedFrame.left, resizedFrame.top);
         canvas.scale(resizedFrame.width() / 20f, resizedFrame.height() / 20f);
-        
+
         // Bezier
         RectF bezierRect = CacheForInfoIcon.bezierRect;
         bezierRect.set(0f, 0f, 20f, 20f);
@@ -6445,17 +6444,17 @@ public class HabiticaIcons {
         bezierPath.lineTo(9f, 9f);
         bezierPath.lineTo(9f, 15f);
         bezierPath.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         bezierPath.setFillType(Path.FillType.EVEN_ODD);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(infoIconColor);
         canvas.drawPath(bezierPath, paint);
-        
+
         canvas.restore();
     }
-    
+
     private static class CacheForContributorBadge {
         private static final Paint paint = new Paint();
         private static final RectF originalFrame = new RectF(0f, 0f, 16f, 16f);
@@ -6481,17 +6480,17 @@ public class HabiticaIcons {
         private static final RectF bezier4Rect = new RectF();
         private static final Path bezier4Path = new Path();
     }
-    
+
     public static void drawContributorBadge(Canvas canvas, float _1, boolean isNPC) {
         HabiticaIcons.drawContributorBadge(canvas, new RectF(0f, 0f, 16f, 16f), ResizingBehavior.AspectFit, _1, isNPC);
     }
-    
+
     public static void drawContributorBadge(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, float _1, boolean isNPC) {
         // General Declarations
         Stack<Matrix> currentTransformation = new Stack<>();
         currentTransformation.push(new Matrix());
         Paint paint = CacheForContributorBadge.paint;
-        
+
         // Local Colors
         int strokeColor3 = Color.argb(255, 253, 124, 127);
         int fillColor83 = Color.argb(255, 119, 244, 199);
@@ -6513,7 +6512,7 @@ public class HabiticaIcons {
         int strokeColor10 = Color.argb(255, 5, 112, 168);
         int strokeColor4 = Color.argb(255, 136, 10, 10);
         int fillColor76 = Color.argb(255, 255, 182, 184);
-        
+
         // Local Variables
         boolean isTier1 = _1 == 1f && !isNPC;
         boolean isTier2 = _1 == 2f && !isNPC;
@@ -6524,14 +6523,14 @@ public class HabiticaIcons {
         boolean isTier7 = _1 == 7f && !isNPC;
         boolean isTier8 = _1 == 8f && !isNPC;
         boolean isTier9 = _1 == 9f && !isNPC;
-        
+
         // Resize to Target Frame
         canvas.save();
         RectF resizedFrame = CacheForContributorBadge.resizedFrame;
         HabiticaIcons.resizingBehaviorApply(resizing, CacheForContributorBadge.originalFrame, targetFrame, resizedFrame);
         canvas.translate(resizedFrame.left, resizedFrame.top);
         canvas.scale(resizedFrame.width() / 16f, resizedFrame.height() / 16f);
-        
+
         // Tier1
         if (isTier1) {
             RectF tier1Rect = CacheForContributorBadge.tier1Rect;
@@ -6546,13 +6545,13 @@ public class HabiticaIcons {
             tier1Path.lineTo(3.6f, 6.25f);
             tier1Path.lineTo(7.5f, 4f);
             tier1Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor76);
             canvas.drawPath(tier1Path, paint);
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStrokeWidth(1f);
@@ -6563,7 +6562,7 @@ public class HabiticaIcons {
             canvas.drawPath(tier1Path, paint);
             canvas.restore();
         }
-        
+
         // Tier2
         if (isTier2) {
             RectF tier2Rect = CacheForContributorBadge.tier2Rect;
@@ -6578,13 +6577,13 @@ public class HabiticaIcons {
             tier2Path.lineTo(3.6f, 6.25f);
             tier2Path.lineTo(7.5f, 4f);
             tier2Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor77);
             canvas.drawPath(tier2Path, paint);
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStrokeWidth(1f);
@@ -6595,7 +6594,7 @@ public class HabiticaIcons {
             canvas.drawPath(tier2Path, paint);
             canvas.restore();
         }
-        
+
         // Tier3
         if (isTier3) {
             RectF tier3Rect = CacheForContributorBadge.tier3Rect;
@@ -6607,13 +6606,13 @@ public class HabiticaIcons {
             tier3Path.lineTo(3.5f, 12.5f);
             tier3Path.lineTo(8f, 3.5f);
             tier3Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor2);
             canvas.drawPath(tier3Path, paint);
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStrokeWidth(1f);
@@ -6624,7 +6623,7 @@ public class HabiticaIcons {
             canvas.drawPath(tier3Path, paint);
             canvas.restore();
         }
-        
+
         // Tier4
         if (isTier4) {
             RectF tier4Rect = CacheForContributorBadge.tier4Rect;
@@ -6636,13 +6635,13 @@ public class HabiticaIcons {
             tier4Path.lineTo(3.5f, 12.5f);
             tier4Path.lineTo(8f, 3.5f);
             tier4Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor78);
             canvas.drawPath(tier4Path, paint);
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStrokeWidth(1f);
@@ -6653,7 +6652,7 @@ public class HabiticaIcons {
             canvas.drawPath(tier4Path, paint);
             canvas.restore();
         }
-        
+
         // Tier5
         if (isTier5) {
             RectF tier5Rect = CacheForContributorBadge.tier5Rect;
@@ -6665,13 +6664,13 @@ public class HabiticaIcons {
             tier5Path.lineTo(tier5Rect.right, tier5Rect.bottom);
             tier5Path.lineTo(tier5Rect.left, tier5Rect.bottom);
             tier5Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor79);
             canvas.drawPath(tier5Path, paint);
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStrokeWidth(1f);
@@ -6682,7 +6681,7 @@ public class HabiticaIcons {
             canvas.drawPath(tier5Path, paint);
             canvas.restore();
         }
-        
+
         // Tier6
         if (isTier6) {
             RectF tier6Rect = CacheForContributorBadge.tier6Rect;
@@ -6694,13 +6693,13 @@ public class HabiticaIcons {
             tier6Path.lineTo(tier6Rect.right, tier6Rect.bottom);
             tier6Path.lineTo(tier6Rect.left, tier6Rect.bottom);
             tier6Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor80);
             canvas.drawPath(tier6Path, paint);
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStrokeWidth(1f);
@@ -6711,7 +6710,7 @@ public class HabiticaIcons {
             canvas.drawPath(tier6Path, paint);
             canvas.restore();
         }
-        
+
         // Tier7
         if (isTier7) {
             canvas.save();
@@ -6724,13 +6723,13 @@ public class HabiticaIcons {
             Path tier7Path = CacheForContributorBadge.tier7Path;
             tier7Path.reset();
             tier7Path.addRect(tier7Rect, Path.Direction.CW);
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor81);
             canvas.drawPath(tier7Path, paint);
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStrokeWidth(1f);
@@ -6742,7 +6741,7 @@ public class HabiticaIcons {
             canvas.restore();
             canvas.restore();
         }
-        
+
         // TierMod
         if (isTier8) {
             RectF tierModRect = CacheForContributorBadge.tierModRect;
@@ -6761,13 +6760,13 @@ public class HabiticaIcons {
             tierModPath.lineTo(5.56f, 5.83f);
             tierModPath.lineTo(7.5f, 2.5f);
             tierModPath.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor7);
             canvas.drawPath(tierModPath, paint);
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStrokeWidth(1f);
@@ -6778,7 +6777,7 @@ public class HabiticaIcons {
             canvas.drawPath(tierModPath, paint);
             canvas.restore();
         }
-        
+
         // TierStaff
         if (isTier9) {
             RectF tierStaffRect = CacheForContributorBadge.tierStaffRect;
@@ -6794,13 +6793,13 @@ public class HabiticaIcons {
             tierStaffPath.lineTo(5.5f, 7.5f);
             tierStaffPath.lineTo(2.5f, 4.5f);
             tierStaffPath.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor82);
             canvas.drawPath(tierStaffPath, paint);
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStrokeWidth(1f);
@@ -6811,7 +6810,7 @@ public class HabiticaIcons {
             canvas.drawPath(tierStaffPath, paint);
             canvas.restore();
         }
-        
+
         // Bezier 4
         if (isNPC) {
             RectF bezier4Rect = CacheForContributorBadge.bezier4Rect;
@@ -6828,13 +6827,13 @@ public class HabiticaIcons {
             bezier4Path.lineTo(7.5f, 3.5f);
             bezier4Path.lineTo(11.5f, 3.5f);
             bezier4Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor83);
             canvas.drawPath(bezier4Path, paint);
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStrokeWidth(1f);
@@ -6845,10 +6844,10 @@ public class HabiticaIcons {
             canvas.drawPath(bezier4Path, paint);
             canvas.restore();
         }
-        
+
         canvas.restore();
     }
-    
+
     private static class CacheForQuestBackground {
         private static final Paint paint = new Paint();
         private static final RectF rectangleRect = new RectF();
@@ -6886,18 +6885,18 @@ public class HabiticaIcons {
         private static final RectF rectangle15Rect = new RectF();
         private static final Path rectangle15Path = new Path();
     }
-    
-    
+
+
     public static void drawQuestBackground(Canvas canvas, RectF frame, int bossColorDark, int bossColorMedium, int bossColorLight) {
         // General Declarations
         Paint paint = CacheForQuestBackground.paint;
-        
+
         // Rectangle
         RectF rectangleRect = CacheForQuestBackground.rectangleRect;
         rectangleRect.set(frame.left,
-            frame.top,
-            frame.left + (float) Math.floor(frame.width() + 0.5f),
-            frame.top + (float) Math.floor(frame.height() + 0.5f));
+                frame.top,
+                frame.left + (float) Math.floor(frame.width() + 0.5f),
+                frame.top + (float) Math.floor(frame.height() + 0.5f));
         Path rectanglePath = CacheForQuestBackground.rectanglePath;
         rectanglePath.reset();
         rectanglePath.moveTo(rectangleRect.left, rectangleRect.top);
@@ -6905,27 +6904,27 @@ public class HabiticaIcons {
         rectanglePath.lineTo(rectangleRect.right, rectangleRect.bottom);
         rectanglePath.lineTo(rectangleRect.left, rectangleRect.bottom);
         rectanglePath.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(bossColorMedium);
         canvas.drawPath(rectanglePath, paint);
-        
+
         // Group
         {
             RectF group = CacheForQuestBackground.group;
             group.set(frame.left + 2f,
-                frame.bottom - 8f,
-                frame.left + 8f,
-                frame.bottom - 2f);
-            
+                    frame.bottom - 8f,
+                    frame.left + 8f,
+                    frame.bottom - 2f);
+
             // Rectangle 2
             RectF rectangle2Rect = CacheForQuestBackground.rectangle2Rect;
             rectangle2Rect.set(group.left,
-                group.top,
-                group.left + (float) Math.floor(group.width() + 0.5f),
-                group.top + (float) Math.floor(group.height() + 0.5f));
+                    group.top,
+                    group.left + (float) Math.floor(group.width() + 0.5f),
+                    group.top + (float) Math.floor(group.height() + 0.5f));
             Path rectangle2Path = CacheForQuestBackground.rectangle2Path;
             rectangle2Path.reset();
             rectangle2Path.moveTo(rectangle2Rect.left, rectangle2Rect.top);
@@ -6933,19 +6932,19 @@ public class HabiticaIcons {
             rectangle2Path.lineTo(rectangle2Rect.right, rectangle2Rect.bottom);
             rectangle2Path.lineTo(rectangle2Rect.left, rectangle2Rect.bottom);
             rectangle2Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(bossColorLight);
             canvas.drawPath(rectangle2Path, paint);
-            
+
             // Rectangle 3
             RectF rectangle3Rect = CacheForQuestBackground.rectangle3Rect;
             rectangle3Rect.set(group.left + (float) Math.floor(group.width() * 0.33333f + 0.5f),
-                group.top + (float) Math.floor(group.height() * 0.33333f + 0.5f),
-                group.left + (float) Math.floor(group.width() * 0.66667f + 0.5f),
-                group.top + (float) Math.floor(group.height() * 0.66667f + 0.5f));
+                    group.top + (float) Math.floor(group.height() * 0.33333f + 0.5f),
+                    group.left + (float) Math.floor(group.width() * 0.66667f + 0.5f),
+                    group.top + (float) Math.floor(group.height() * 0.66667f + 0.5f));
             Path rectangle3Path = CacheForQuestBackground.rectangle3Path;
             rectangle3Path.reset();
             rectangle3Path.moveTo(rectangle3Rect.left, rectangle3Rect.top);
@@ -6953,28 +6952,28 @@ public class HabiticaIcons {
             rectangle3Path.lineTo(rectangle3Rect.right, rectangle3Rect.bottom);
             rectangle3Path.lineTo(rectangle3Rect.left, rectangle3Rect.bottom);
             rectangle3Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(bossColorDark);
             canvas.drawPath(rectangle3Path, paint);
         }
-        
+
         // Group 2
         {
             RectF group2 = CacheForQuestBackground.group2;
             group2.set(frame.left + 2f,
-                frame.top + 2f,
-                frame.left + 8f,
-                frame.top + 8f);
-            
+                    frame.top + 2f,
+                    frame.left + 8f,
+                    frame.top + 8f);
+
             // Rectangle 4
             RectF rectangle4Rect = CacheForQuestBackground.rectangle4Rect;
             rectangle4Rect.set(group2.left,
-                group2.top,
-                group2.left + (float) Math.floor(group2.width() + 0.5f),
-                group2.top + (float) Math.floor(group2.height() + 0.5f));
+                    group2.top,
+                    group2.left + (float) Math.floor(group2.width() + 0.5f),
+                    group2.top + (float) Math.floor(group2.height() + 0.5f));
             Path rectangle4Path = CacheForQuestBackground.rectangle4Path;
             rectangle4Path.reset();
             rectangle4Path.moveTo(rectangle4Rect.left, rectangle4Rect.top);
@@ -6982,19 +6981,19 @@ public class HabiticaIcons {
             rectangle4Path.lineTo(rectangle4Rect.right, rectangle4Rect.bottom);
             rectangle4Path.lineTo(rectangle4Rect.left, rectangle4Rect.bottom);
             rectangle4Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(bossColorLight);
             canvas.drawPath(rectangle4Path, paint);
-            
+
             // Rectangle 5
             RectF rectangle5Rect = CacheForQuestBackground.rectangle5Rect;
             rectangle5Rect.set(group2.left + (float) Math.floor(group2.width() * 0.33333f + 0.5f),
-                group2.top + (float) Math.floor(group2.height() * 0.33333f + 0.5f),
-                group2.left + (float) Math.floor(group2.width() * 0.66667f + 0.5f),
-                group2.top + (float) Math.floor(group2.height() * 0.66667f + 0.5f));
+                    group2.top + (float) Math.floor(group2.height() * 0.33333f + 0.5f),
+                    group2.left + (float) Math.floor(group2.width() * 0.66667f + 0.5f),
+                    group2.top + (float) Math.floor(group2.height() * 0.66667f + 0.5f));
             Path rectangle5Path = CacheForQuestBackground.rectangle5Path;
             rectangle5Path.reset();
             rectangle5Path.moveTo(rectangle5Rect.left, rectangle5Rect.top);
@@ -7002,28 +7001,28 @@ public class HabiticaIcons {
             rectangle5Path.lineTo(rectangle5Rect.right, rectangle5Rect.bottom);
             rectangle5Path.lineTo(rectangle5Rect.left, rectangle5Rect.bottom);
             rectangle5Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(bossColorDark);
             canvas.drawPath(rectangle5Path, paint);
         }
-        
+
         // Group 3
         {
             RectF group3 = CacheForQuestBackground.group3;
             group3.set(frame.right - 8f,
-                frame.top + 2f,
-                frame.right - 2f,
-                frame.top + 8f);
-            
+                    frame.top + 2f,
+                    frame.right - 2f,
+                    frame.top + 8f);
+
             // Rectangle 6
             RectF rectangle6Rect = CacheForQuestBackground.rectangle6Rect;
             rectangle6Rect.set(group3.left,
-                group3.top,
-                group3.left + (float) Math.floor(group3.width() + 0.5f),
-                group3.top + (float) Math.floor(group3.height() + 0.5f));
+                    group3.top,
+                    group3.left + (float) Math.floor(group3.width() + 0.5f),
+                    group3.top + (float) Math.floor(group3.height() + 0.5f));
             Path rectangle6Path = CacheForQuestBackground.rectangle6Path;
             rectangle6Path.reset();
             rectangle6Path.moveTo(rectangle6Rect.left, rectangle6Rect.top);
@@ -7031,19 +7030,19 @@ public class HabiticaIcons {
             rectangle6Path.lineTo(rectangle6Rect.right, rectangle6Rect.bottom);
             rectangle6Path.lineTo(rectangle6Rect.left, rectangle6Rect.bottom);
             rectangle6Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(bossColorLight);
             canvas.drawPath(rectangle6Path, paint);
-            
+
             // Rectangle 7
             RectF rectangle7Rect = CacheForQuestBackground.rectangle7Rect;
             rectangle7Rect.set(group3.left + (float) Math.floor(group3.width() * 0.33333f + 0.5f),
-                group3.top + (float) Math.floor(group3.height() * 0.33333f + 0.5f),
-                group3.left + (float) Math.floor(group3.width() * 0.66667f + 0.5f),
-                group3.top + (float) Math.floor(group3.height() * 0.66667f + 0.5f));
+                    group3.top + (float) Math.floor(group3.height() * 0.33333f + 0.5f),
+                    group3.left + (float) Math.floor(group3.width() * 0.66667f + 0.5f),
+                    group3.top + (float) Math.floor(group3.height() * 0.66667f + 0.5f));
             Path rectangle7Path = CacheForQuestBackground.rectangle7Path;
             rectangle7Path.reset();
             rectangle7Path.moveTo(rectangle7Rect.left, rectangle7Rect.top);
@@ -7051,28 +7050,28 @@ public class HabiticaIcons {
             rectangle7Path.lineTo(rectangle7Rect.right, rectangle7Rect.bottom);
             rectangle7Path.lineTo(rectangle7Rect.left, rectangle7Rect.bottom);
             rectangle7Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(bossColorDark);
             canvas.drawPath(rectangle7Path, paint);
         }
-        
+
         // Group 4
         {
             RectF group4 = CacheForQuestBackground.group4;
             group4.set(frame.right - 8f,
-                frame.bottom - 8f,
-                frame.right - 2f,
-                frame.bottom - 2f);
-            
+                    frame.bottom - 8f,
+                    frame.right - 2f,
+                    frame.bottom - 2f);
+
             // Rectangle 8
             RectF rectangle8Rect = CacheForQuestBackground.rectangle8Rect;
             rectangle8Rect.set(group4.left,
-                group4.top,
-                group4.left + (float) Math.floor(group4.width() + 0.5f),
-                group4.top + (float) Math.floor(group4.height() + 0.5f));
+                    group4.top,
+                    group4.left + (float) Math.floor(group4.width() + 0.5f),
+                    group4.top + (float) Math.floor(group4.height() + 0.5f));
             Path rectangle8Path = CacheForQuestBackground.rectangle8Path;
             rectangle8Path.reset();
             rectangle8Path.moveTo(rectangle8Rect.left, rectangle8Rect.top);
@@ -7080,19 +7079,19 @@ public class HabiticaIcons {
             rectangle8Path.lineTo(rectangle8Rect.right, rectangle8Rect.bottom);
             rectangle8Path.lineTo(rectangle8Rect.left, rectangle8Rect.bottom);
             rectangle8Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(bossColorLight);
             canvas.drawPath(rectangle8Path, paint);
-            
+
             // Rectangle 9
             RectF rectangle9Rect = CacheForQuestBackground.rectangle9Rect;
             rectangle9Rect.set(group4.left + (float) Math.floor(group4.width() * 0.33333f + 0.5f),
-                group4.top + (float) Math.floor(group4.height() * 0.33333f + 0.5f),
-                group4.left + (float) Math.floor(group4.width() * 0.66667f + 0.5f),
-                group4.top + (float) Math.floor(group4.height() * 0.66667f + 0.5f));
+                    group4.top + (float) Math.floor(group4.height() * 0.33333f + 0.5f),
+                    group4.left + (float) Math.floor(group4.width() * 0.66667f + 0.5f),
+                    group4.top + (float) Math.floor(group4.height() * 0.66667f + 0.5f));
             Path rectangle9Path = CacheForQuestBackground.rectangle9Path;
             rectangle9Path.reset();
             rectangle9Path.moveTo(rectangle9Rect.left, rectangle9Rect.top);
@@ -7100,20 +7099,20 @@ public class HabiticaIcons {
             rectangle9Path.lineTo(rectangle9Rect.right, rectangle9Rect.bottom);
             rectangle9Path.lineTo(rectangle9Rect.left, rectangle9Rect.bottom);
             rectangle9Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(bossColorDark);
             canvas.drawPath(rectangle9Path, paint);
         }
-        
+
         // Rectangle 10
         RectF rectangle10Rect = CacheForQuestBackground.rectangle10Rect;
         rectangle10Rect.set(frame.right - 4f,
-            frame.top + 10f,
-            frame.right - 2f,
-            frame.bottom - 10f);
+                frame.top + 10f,
+                frame.right - 2f,
+                frame.bottom - 10f);
         Path rectangle10Path = CacheForQuestBackground.rectangle10Path;
         rectangle10Path.reset();
         rectangle10Path.moveTo(rectangle10Rect.left, rectangle10Rect.top);
@@ -7121,19 +7120,19 @@ public class HabiticaIcons {
         rectangle10Path.lineTo(rectangle10Rect.right, rectangle10Rect.bottom);
         rectangle10Path.lineTo(rectangle10Rect.left, rectangle10Rect.bottom);
         rectangle10Path.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(bossColorLight);
         canvas.drawPath(rectangle10Path, paint);
-        
+
         // Rectangle 11
         RectF rectangle11Rect = CacheForQuestBackground.rectangle11Rect;
         rectangle11Rect.set(frame.left + 10f,
-            frame.bottom - 4f,
-            frame.right - 10f,
-            frame.bottom - 2f);
+                frame.bottom - 4f,
+                frame.right - 10f,
+                frame.bottom - 2f);
         Path rectangle11Path = CacheForQuestBackground.rectangle11Path;
         rectangle11Path.reset();
         rectangle11Path.moveTo(rectangle11Rect.left, rectangle11Rect.top);
@@ -7141,19 +7140,19 @@ public class HabiticaIcons {
         rectangle11Path.lineTo(rectangle11Rect.right, rectangle11Rect.bottom);
         rectangle11Path.lineTo(rectangle11Rect.left, rectangle11Rect.bottom);
         rectangle11Path.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(bossColorLight);
         canvas.drawPath(rectangle11Path, paint);
-        
+
         // Rectangle 12
         RectF rectangle12Rect = CacheForQuestBackground.rectangle12Rect;
         rectangle12Rect.set(frame.left + 10f,
-            frame.top + 2f,
-            frame.right - 10f,
-            frame.top + 4f);
+                frame.top + 2f,
+                frame.right - 10f,
+                frame.top + 4f);
         Path rectangle12Path = CacheForQuestBackground.rectangle12Path;
         rectangle12Path.reset();
         rectangle12Path.moveTo(rectangle12Rect.left, rectangle12Rect.top);
@@ -7161,19 +7160,19 @@ public class HabiticaIcons {
         rectangle12Path.lineTo(rectangle12Rect.right, rectangle12Rect.bottom);
         rectangle12Path.lineTo(rectangle12Rect.left, rectangle12Rect.bottom);
         rectangle12Path.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(bossColorLight);
         canvas.drawPath(rectangle12Path, paint);
-        
+
         // Rectangle 13
         RectF rectangle13Rect = CacheForQuestBackground.rectangle13Rect;
         rectangle13Rect.set(frame.left + 10f,
-            frame.top + 4f,
-            frame.right - 10f,
-            frame.bottom - 4f);
+                frame.top + 4f,
+                frame.right - 10f,
+                frame.bottom - 4f);
         Path rectangle13Path = CacheForQuestBackground.rectangle13Path;
         rectangle13Path.reset();
         rectangle13Path.moveTo(rectangle13Rect.left, rectangle13Rect.top);
@@ -7181,19 +7180,19 @@ public class HabiticaIcons {
         rectangle13Path.lineTo(rectangle13Rect.right, rectangle13Rect.bottom);
         rectangle13Path.lineTo(rectangle13Rect.left, rectangle13Rect.bottom);
         rectangle13Path.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(bossColorDark);
         canvas.drawPath(rectangle13Path, paint);
-        
+
         // Rectangle 14
         RectF rectangle14Rect = CacheForQuestBackground.rectangle14Rect;
         rectangle14Rect.set(frame.left + 4f,
-            frame.top + 10f,
-            frame.right - 4f,
-            frame.bottom - 10f);
+                frame.top + 10f,
+                frame.right - 4f,
+                frame.bottom - 10f);
         Path rectangle14Path = CacheForQuestBackground.rectangle14Path;
         rectangle14Path.reset();
         rectangle14Path.moveTo(rectangle14Rect.left, rectangle14Rect.top);
@@ -7201,19 +7200,19 @@ public class HabiticaIcons {
         rectangle14Path.lineTo(rectangle14Rect.right, rectangle14Rect.bottom);
         rectangle14Path.lineTo(rectangle14Rect.left, rectangle14Rect.bottom);
         rectangle14Path.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(bossColorDark);
         canvas.drawPath(rectangle14Path, paint);
-        
+
         // Rectangle 15
         RectF rectangle15Rect = CacheForQuestBackground.rectangle15Rect;
         rectangle15Rect.set(frame.left + 2f,
-            frame.top + 10f,
-            frame.left + 4f,
-            frame.bottom - 10f);
+                frame.top + 10f,
+                frame.left + 4f,
+                frame.bottom - 10f);
         Path rectangle15Path = CacheForQuestBackground.rectangle15Path;
         rectangle15Path.reset();
         rectangle15Path.moveTo(rectangle15Rect.left, rectangle15Rect.top);
@@ -7221,14 +7220,14 @@ public class HabiticaIcons {
         rectangle15Path.lineTo(rectangle15Rect.right, rectangle15Rect.bottom);
         rectangle15Path.lineTo(rectangle15Rect.left, rectangle15Rect.bottom);
         rectangle15Path.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(bossColorLight);
         canvas.drawPath(rectangle15Path, paint);
     }
-    
+
     private static class CacheForDamage {
         private static final Paint paint = new Paint();
         private static final RectF originalFrame = new RectF(0f, 0f, 18f, 18f);
@@ -7276,17 +7275,17 @@ public class HabiticaIcons {
         private static final RectF bezier16Rect = new RectF();
         private static final Path bezier16Path = new Path();
     }
-    
+
     public static void drawDamage(Canvas canvas) {
         HabiticaIcons.drawDamage(canvas, new RectF(0f, 0f, 18f, 18f), ResizingBehavior.AspectFit);
     }
-    
+
     public static void drawDamage(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
         // General Declarations
         Stack<Matrix> currentTransformation = new Stack<>();
         currentTransformation.push(new Matrix());
         Paint paint = CacheForDamage.paint;
-        
+
         // Local Colors
         int fillColor37 = Color.argb(255, 255, 255, 255);
         int fillColor84 = Color.argb(255, 240, 97, 102);
@@ -7300,14 +7299,14 @@ public class HabiticaIcons {
         int fillColor88 = Color.argb(255, 179, 98, 19);
         int fillColor87 = Color.argb(255, 189, 168, 255);
         int fillColor35 = Color.argb(255, 195, 192, 199);
-        
+
         // Resize to Target Frame
         canvas.save();
         RectF resizedFrame = CacheForDamage.resizedFrame;
         HabiticaIcons.resizingBehaviorApply(resizing, CacheForDamage.originalFrame, targetFrame, resizedFrame);
         canvas.translate(resizedFrame.left, resizedFrame.top);
         canvas.scale(resizedFrame.width() / 18f, resizedFrame.height() / 18f);
-        
+
         // Group 2
         {
             // Bezier
@@ -7330,13 +7329,13 @@ public class HabiticaIcons {
             bezierPath.cubicTo(12.47f, 8.46f, 12.29f, 8.59f, 12.2f, 8.79f);
             bezierPath.lineTo(11.1f, 11.16f);
             bezierPath.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor84);
             canvas.drawPath(bezierPath, paint);
-            
+
             // Bezier 2
             RectF bezier2Rect = CacheForDamage.bezier2Rect;
             bezier2Rect.set(0.59f, 0.65f, 17.87f, 17.93f);
@@ -7366,13 +7365,13 @@ public class HabiticaIcons {
             bezier2Path.lineTo(16.85f, 16.91f);
             bezier2Path.lineTo(16.85f, 16.91f);
             bezier2Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor90);
             canvas.drawPath(bezier2Path, paint);
-            
+
             // Rectangle
             canvas.save();
             canvas.translate(13.65f, 13.75f);
@@ -7388,14 +7387,14 @@ public class HabiticaIcons {
             rectanglePath.lineTo(rectangleRect.right, rectangleRect.bottom);
             rectanglePath.lineTo(rectangleRect.left, rectangleRect.bottom);
             rectanglePath.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor84);
             canvas.drawPath(rectanglePath, paint);
             canvas.restore();
-            
+
             // Bezier 3
             RectF bezier3Rect = CacheForDamage.bezier3Rect;
             bezier3Rect.set(14.1f, 14.15f, 16.73f, 16.79f);
@@ -7409,13 +7408,13 @@ public class HabiticaIcons {
             bezier3Path.lineTo(15.4f, 16.79f);
             bezier3Path.lineTo(16.73f, 15.46f);
             bezier3Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor84);
             canvas.drawPath(bezier3Path, paint);
-            
+
             // Bezier 4
             RectF bezier4Rect = CacheForDamage.bezier4Rect;
             bezier4Rect.set(2.12f, 2.17f, 5.27f, 5.22f);
@@ -7426,13 +7425,13 @@ public class HabiticaIcons {
             bezier4Path.lineTo(2.12f, 2.18f);
             bezier4Path.cubicTo(2.18f, 2.13f, 4.47f, 2.39f, 5.27f, 2.82f);
             bezier4Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor37);
             canvas.drawPath(bezier4Path, paint);
-            
+
             // Bezier 5
             RectF bezier5Rect = CacheForDamage.bezier5Rect;
             bezier5Rect.set(5.16f, 2.82f, 11.75f, 10.16f);
@@ -7445,13 +7444,13 @@ public class HabiticaIcons {
             bezier5Path.lineTo(5.27f, 2.82f);
             bezier5Path.lineTo(5.33f, 2.85f);
             bezier5Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor85);
             canvas.drawPath(bezier5Path, paint);
-            
+
             // Bezier 6
             RectF bezier6Rect = CacheForDamage.bezier6Rect;
             bezier6Rect.set(2.12f, 2.18f, 11.81f, 11.17f);
@@ -7469,13 +7468,13 @@ public class HabiticaIcons {
             bezier6Path.lineTo(2.12f, 2.18f);
             bezier6Path.cubicTo(2.07f, 2.24f, 2.33f, 4.53f, 2.77f, 5.33f);
             bezier6Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor85);
             canvas.drawPath(bezier6Path, paint);
-            
+
             // Bezier 7
             RectF bezier7Rect = CacheForDamage.bezier7Rect;
             bezier7Rect.set(2.77f, 5.22f, 10.11f, 11.81f);
@@ -7488,13 +7487,13 @@ public class HabiticaIcons {
             bezier7Path.lineTo(2.77f, 5.33f);
             bezier7Path.cubicTo(2.78f, 5.35f, 2.79f, 5.37f, 2.79f, 5.39f);
             bezier7Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor25);
             canvas.drawPath(bezier7Path, paint);
-            
+
             // Bezier 8
             RectF bezier8Rect = CacheForDamage.bezier8Rect;
             bezier8Rect.set(9.53f, 10.17f, 11.11f, 11.87f);
@@ -7507,13 +7506,13 @@ public class HabiticaIcons {
             bezier8Path.lineTo(9.53f, 11.81f);
             bezier8Path.lineTo(9.53f, 11.81f);
             bezier8Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor25);
             canvas.drawPath(bezier8Path, paint);
-            
+
             // Bezier 9
             RectF bezier9Rect = CacheForDamage.bezier9Rect;
             bezier9Rect.set(14.1f, 14.15f, 16.64f, 16.69f);
@@ -7529,13 +7528,13 @@ public class HabiticaIcons {
             bezier9Path.lineTo(14.19f, 16.69f);
             bezier9Path.lineTo(14.1f, 15.48f);
             bezier9Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor86);
             canvas.drawPath(bezier9Path, paint);
-            
+
             // Bezier 10
             RectF bezier10Rect = CacheForDamage.bezier10Rect;
             bezier10Rect.set(14.1f, 14.15f, 15.71f, 15.76f);
@@ -7547,13 +7546,13 @@ public class HabiticaIcons {
             bezier10Path.lineTo(15.71f, 15.18f);
             bezier10Path.lineTo(15.43f, 14.15f);
             bezier10Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor87);
             canvas.drawPath(bezier10Path, paint);
-            
+
             // Bezier 11
             RectF bezier11Rect = CacheForDamage.bezier11Rect;
             bezier11Rect.set(14.19f, 14.25f, 16.73f, 16.79f);
@@ -7569,13 +7568,13 @@ public class HabiticaIcons {
             bezier11Path.lineTo(14.19f, 16.7f);
             bezier11Path.lineTo(15.41f, 16.79f);
             bezier11Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor87);
             canvas.drawPath(bezier11Path, paint);
-            
+
             // Bezier 12
             RectF bezier12Rect = CacheForDamage.bezier12Rect;
             bezier12Rect.set(15.12f, 15.18f, 16.73f, 16.79f);
@@ -7587,13 +7586,13 @@ public class HabiticaIcons {
             bezier12Path.lineTo(15.7f, 15.18f);
             bezier12Path.lineTo(16.73f, 15.46f);
             bezier12Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor86);
             canvas.drawPath(bezier12Path, paint);
-            
+
             // Rectangle 2
             canvas.save();
             canvas.translate(12.75f, 12.8f);
@@ -7609,14 +7608,14 @@ public class HabiticaIcons {
             rectangle2Path.lineTo(rectangle2Rect.right, rectangle2Rect.bottom);
             rectangle2Path.lineTo(rectangle2Rect.left, rectangle2Rect.bottom);
             rectangle2Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor88);
             canvas.drawPath(rectangle2Path, paint);
             canvas.restore();
-            
+
             // Rectangle 3
             canvas.save();
             canvas.translate(13.55f, 13.6f);
@@ -7632,14 +7631,14 @@ public class HabiticaIcons {
             rectangle3Path.lineTo(rectangle3Rect.right, rectangle3Rect.bottom);
             rectangle3Path.lineTo(rectangle3Rect.left, rectangle3Rect.bottom);
             rectangle3Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor89);
             canvas.drawPath(rectangle3Path, paint);
             canvas.restore();
-            
+
             // Rectangle 4
             canvas.save();
             canvas.translate(14.35f, 14.4f);
@@ -7655,14 +7654,14 @@ public class HabiticaIcons {
             rectangle4Path.lineTo(rectangle4Rect.right, rectangle4Rect.bottom);
             rectangle4Path.lineTo(rectangle4Rect.left, rectangle4Rect.bottom);
             rectangle4Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor88);
             canvas.drawPath(rectangle4Path, paint);
             canvas.restore();
-            
+
             // Bezier 13
             RectF bezier13Rect = CacheForDamage.bezier13Rect;
             bezier13Rect.set(11.1f, 8.06f, 14.58f, 11.87f);
@@ -7680,13 +7679,13 @@ public class HabiticaIcons {
             bezier13Path.lineTo(11.1f, 11.16f);
             bezier13Path.lineTo(11.1f, 11.16f);
             bezier13Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor35);
             canvas.drawPath(bezier13Path, paint);
-            
+
             // Bezier 14
             RectF bezier14Rect = CacheForDamage.bezier14Rect;
             bezier14Rect.set(8f, 8.19f, 14.65f, 14.64f);
@@ -7711,13 +7710,13 @@ public class HabiticaIcons {
             bezier14Path.lineTo(8.12f, 14.64f);
             bezier14Path.cubicTo(8.04f, 14.58f, 7.99f, 14.47f, 8f, 14.37f);
             bezier14Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor40);
             canvas.drawPath(bezier14Path, paint);
-            
+
             // Bezier 15
             RectF bezier15Rect = CacheForDamage.bezier15Rect;
             bezier15Rect.set(8.12f, 11.87f, 12.6f, 14.71f);
@@ -7732,19 +7731,19 @@ public class HabiticaIcons {
             bezier15Path.lineTo(9.49f, 13.04f);
             bezier15Path.lineTo(9.49f, 13.04f);
             bezier15Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor75);
             canvas.drawPath(bezier15Path, paint);
-            
+
             // Group 3
             {
                 RectF group3 = CacheForDamage.group3;
                 group3.set(6.23f, 3.79f, 8.78f, 8.83f);
                 canvas.save();
-                
+
                 // Clip
                 Path clipPath = CacheForDamage.clipPath;
                 clipPath.reset();
@@ -7755,7 +7754,7 @@ public class HabiticaIcons {
                 clipPath.lineTo(6.23f, 3.79f);
                 clipPath.close();
                 canvas.clipPath(clipPath);
-                
+
                 // Bezier 16
                 RectF bezier16Rect = CacheForDamage.bezier16Rect;
                 bezier16Rect.set(6.58f, 3f, 8.78f, 9f);
@@ -7775,20 +7774,20 @@ public class HabiticaIcons {
                 bezier16Path.cubicTo(6.95f, 4.34f, 6.95f, 8.3f, 6.95f, 9f);
                 bezier16Path.lineTo(6.95f, 8.96f);
                 bezier16Path.close();
-                
+
                 paint.reset();
                 paint.setFlags(Paint.ANTI_ALIAS_FLAG);
                 paint.setStyle(Paint.Style.FILL);
                 paint.setColor(fillColor37);
                 canvas.drawPath(bezier16Path, paint);
-                
+
                 canvas.restore();
             }
         }
-        
+
         canvas.restore();
     }
-    
+
     private static class CacheForCaret {
         private static final Paint paint = new Paint();
         private static final RectF originalFrame = new RectF(0f, 0f, 16f, 16f);
@@ -7796,27 +7795,27 @@ public class HabiticaIcons {
         private static final RectF bezierRect = new RectF();
         private static final Path bezierPath = new Path();
     }
-    
+
     public static void drawCaret(Canvas canvas, int caretColor, boolean pointsUp) {
         HabiticaIcons.drawCaret(canvas, new RectF(0f, 0f, 16f, 16f), ResizingBehavior.AspectFit, caretColor, pointsUp);
     }
-    
+
     public static void drawCaret(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, int caretColor, boolean pointsUp) {
         // General Declarations
         Stack<Matrix> currentTransformation = new Stack<>();
         currentTransformation.push(new Matrix());
         Paint paint = CacheForCaret.paint;
-        
+
         // Local Variables
         float caretRotation = pointsUp ? 180f : 0f;
-        
+
         // Resize to Target Frame
         canvas.save();
         RectF resizedFrame = CacheForCaret.resizedFrame;
         HabiticaIcons.resizingBehaviorApply(resizing, CacheForCaret.originalFrame, targetFrame, resizedFrame);
         canvas.translate(resizedFrame.left, resizedFrame.top);
         canvas.scale(resizedFrame.width() / 16f, resizedFrame.height() / 16f);
-        
+
         // Bezier
         canvas.saveLayerAlpha(null, 138, Canvas.ALL_SAVE_FLAG);
         {
@@ -7836,7 +7835,7 @@ public class HabiticaIcons {
             bezierPath.lineTo(0f, 0.9f);
             bezierPath.lineTo(4.6f, -3.7f);
             bezierPath.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezierPath.setFillType(Path.FillType.EVEN_ODD);
@@ -7845,10 +7844,10 @@ public class HabiticaIcons {
             canvas.drawPath(bezierPath, paint);
         }
         canvas.restore();
-        
+
         canvas.restore();
     }
-    
+
     private static class CacheForRageStrikeInactive {
         private static final Paint paint = new Paint();
         private static final RectF originalFrame = new RectF(0f, 0f, 63f, 82f);
@@ -7862,28 +7861,28 @@ public class HabiticaIcons {
         private static final RectF labelRect = new RectF();
         private static final Path labelPath = new Path();
     }
-    
+
     public static void drawRageStrikeInactive(Canvas canvas) {
         HabiticaIcons.drawRageStrikeInactive(canvas, new RectF(0f, 0f, 63f, 82f), ResizingBehavior.AspectFit);
     }
-    
+
     public static void drawRageStrikeInactive(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
         // General Declarations
         Paint paint = CacheForRageStrikeInactive.paint;
-        
+
         // Local Colors
         int strokeColor14 = Color.argb(255, 255, 148, 76);
         int strokeColor13 = Color.argb(255, 244, 120, 37);
         int fillColor91 = Color.argb(255, 255, 200, 167);
         int textForeground = Color.argb(255, 183, 90, 28);
-        
+
         // Resize to Target Frame
         canvas.save();
         RectF resizedFrame = CacheForRageStrikeInactive.resizedFrame;
         HabiticaIcons.resizingBehaviorApply(resizing, CacheForRageStrikeInactive.originalFrame, targetFrame, resizedFrame);
         canvas.translate(resizedFrame.left, resizedFrame.top);
         canvas.scale(resizedFrame.width() / 63f, resizedFrame.height() / 82f);
-        
+
         // Group 3
         {
             // Bezier 2
@@ -7901,7 +7900,7 @@ public class HabiticaIcons {
             bezier2Path.lineTo(31f, 61f);
             bezier2Path.lineTo(17f, 48.08f);
             bezier2Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStrokeWidth(16f);
@@ -7911,7 +7910,7 @@ public class HabiticaIcons {
             paint.setColor(strokeColor13);
             canvas.drawPath(bezier2Path, paint);
             canvas.restore();
-            
+
             // Bezier 4
             RectF bezier4Rect = CacheForRageStrikeInactive.bezier4Rect;
             bezier4Rect.set(17f, 21f, 45f, 61f);
@@ -7927,7 +7926,7 @@ public class HabiticaIcons {
             bezier4Path.lineTo(31f, 61f);
             bezier4Path.lineTo(17f, 48.08f);
             bezier4Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStrokeWidth(8f);
@@ -7937,7 +7936,7 @@ public class HabiticaIcons {
             paint.setColor(strokeColor14);
             canvas.drawPath(bezier4Path, paint);
             canvas.restore();
-            
+
             // Bezier
             RectF bezierRect = CacheForRageStrikeInactive.bezierRect;
             bezierRect.set(17f, 21f, 45f, 61f);
@@ -7953,13 +7952,13 @@ public class HabiticaIcons {
             bezierPath.lineTo(31f, 61f);
             bezierPath.lineTo(17f, 48.08f);
             bezierPath.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor91);
             canvas.drawPath(bezierPath, paint);
-            
+
             // Label
             RectF labelRect = CacheForRageStrikeInactive.labelRect;
             labelRect.set(27.1f, 34.38f, 35.8f, 49f);
@@ -8005,17 +8004,17 @@ public class HabiticaIcons {
             labelPath.cubicTo(27.89f, 36.18f, 27.6f, 36.69f, 27.39f, 37.28f);
             labelPath.cubicTo(27.18f, 37.87f, 27.09f, 38.5f, 27.1f, 39.18f);
             labelPath.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(textForeground);
             canvas.drawPath(labelPath, paint);
         }
-        
+
         canvas.restore();
     }
-    
+
     private static class CacheForRageStrikeActive {
         private static final Paint paint = new Paint();
         private static final RectF originalFrame = new RectF(0f, 0f, 63f, 82f);
@@ -8027,30 +8026,30 @@ public class HabiticaIcons {
         private static final RectF bezier2Rect = new RectF();
         private static final Path bezier2Path = new Path();
     }
-    
+
     public static void drawRageStrikeActive(Canvas canvas, Context context, Bitmap rageStrikeNPC) {
         HabiticaIcons.drawRageStrikeActive(canvas, context, new RectF(0f, 0f, 63f, 82f), ResizingBehavior.AspectFit, rageStrikeNPC);
     }
-    
+
     public static void drawRageStrikeActive(Canvas canvas, Context context, RectF targetFrame, ResizingBehavior resizing, Bitmap rageStrikeNPC) {
         // General Declarations
         float displayDensity = context.getResources().getDisplayMetrics().density;
         Paint paint = CacheForRageStrikeActive.paint;
-        
+
         // Local Colors
         int strokeColor14 = Color.argb(255, 255, 148, 76);
         int strokeColor13 = Color.argb(255, 244, 120, 37);
-        
+
         // Local Images
         PaintCodeBitmap pc_rageStrikeNPC = GlobalCache.rageStrikeNPC.get(rageStrikeNPC);
-        
+
         // Resize to Target Frame
         canvas.save();
         RectF resizedFrame = CacheForRageStrikeActive.resizedFrame;
         HabiticaIcons.resizingBehaviorApply(resizing, CacheForRageStrikeActive.originalFrame, targetFrame, resizedFrame);
         canvas.translate(resizedFrame.left, resizedFrame.top);
         canvas.scale(resizedFrame.width() / 63f, resizedFrame.height() / 82f);
-        
+
         // Bezier
         RectF bezierRect = CacheForRageStrikeActive.bezierRect;
         bezierRect.set(10.39f, 10.89f, 52.39f, 70.89f);
@@ -8066,7 +8065,7 @@ public class HabiticaIcons {
         bezierPath.lineTo(31.39f, 70.89f);
         bezierPath.lineTo(10.39f, 51.5f);
         bezierPath.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStrokeWidth(16f);
@@ -8076,7 +8075,7 @@ public class HabiticaIcons {
         paint.setColor(strokeColor13);
         canvas.drawPath(bezierPath, paint);
         canvas.restore();
-        
+
         // Bezier 3
         RectF bezier3Rect = CacheForRageStrikeActive.bezier3Rect;
         bezier3Rect.set(10.39f, 10.89f, 52.39f, 70.89f);
@@ -8092,7 +8091,7 @@ public class HabiticaIcons {
         bezier3Path.lineTo(31.39f, 70.89f);
         bezier3Path.lineTo(10.39f, 51.5f);
         bezier3Path.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStrokeWidth(8f);
@@ -8102,7 +8101,7 @@ public class HabiticaIcons {
         paint.setColor(strokeColor14);
         canvas.drawPath(bezier3Path, paint);
         canvas.restore();
-        
+
         // Bezier 2
         RectF bezier2Rect = CacheForRageStrikeActive.bezier2Rect;
         bezier2Rect.set(10f, 11f, 52f, 71f);
@@ -8118,11 +8117,11 @@ public class HabiticaIcons {
         bezier2Path.lineTo(31f, 71f);
         bezier2Path.lineTo(10f, 51.61f);
         bezier2Path.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setShader(pc_rageStrikeNPC.getShader());
-        
+
         canvas.save();
         canvas.clipPath(bezier2Path);
         canvas.translate(bezier2Rect.left - 27f, bezier2Rect.top - 18f);
@@ -8130,10 +8129,10 @@ public class HabiticaIcons {
         canvas.clipRect(pc_rageStrikeNPC.getBounds());
         canvas.drawPaint(paint);
         canvas.restore();
-        
+
         canvas.restore();
     }
-    
+
     private static class CacheForRage {
         private static final Paint paint = new Paint();
         private static final RectF originalFrame = new RectF(0f, 0f, 18f, 18f);
@@ -8167,15 +8166,15 @@ public class HabiticaIcons {
         private static final RectF bezier14Rect = new RectF();
         private static final Path bezier14Path = new Path();
     }
-    
+
     public static void drawRage(Canvas canvas) {
         HabiticaIcons.drawRage(canvas, new RectF(0f, 0f, 18f, 18f), ResizingBehavior.AspectFit);
     }
-    
+
     public static void drawRage(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
         // General Declarations
         Paint paint = CacheForRage.paint;
-        
+
         // Local Colors
         int fillColor14 = Color.argb(255, 36, 204, 143);
         int fillColor93 = Color.argb(255, 244, 120, 37);
@@ -8184,14 +8183,14 @@ public class HabiticaIcons {
         int fillColor92 = Color.argb(255, 90, 228, 178);
         int fillColor5 = Color.argb(64, 255, 255, 255);
         int fillColor15 = Color.argb(89, 27, 153, 107);
-        
+
         // Resize to Target Frame
         canvas.save();
         RectF resizedFrame = CacheForRage.resizedFrame;
         HabiticaIcons.resizingBehaviorApply(resizing, CacheForRage.originalFrame, targetFrame, resizedFrame);
         canvas.translate(resizedFrame.left, resizedFrame.top);
         canvas.scale(resizedFrame.width() / 18f, resizedFrame.height() / 18f);
-        
+
         // Group
         {
             // Bezier
@@ -8205,13 +8204,13 @@ public class HabiticaIcons {
             bezierPath.lineTo(8.67f, 17f);
             bezierPath.lineTo(2f, 7f);
             bezierPath.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor14);
             canvas.drawPath(bezierPath, paint);
-            
+
             // Bezier 2
             RectF bezier2Rect = CacheForRage.bezier2Rect;
             bezier2Rect.set(2f, 1f, 15.33f, 17f);
@@ -8223,13 +8222,13 @@ public class HabiticaIcons {
             bezier2Path.lineTo(8.67f, 17f);
             bezier2Path.lineTo(2f, 7f);
             bezier2Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor14);
             canvas.drawPath(bezier2Path, paint);
-            
+
             // Bezier 3
             RectF bezier3Rect = CacheForRage.bezier3Rect;
             bezier3Rect.set(8.67f, 2.8f, 13.6f, 7.2f);
@@ -8240,13 +8239,13 @@ public class HabiticaIcons {
             bezier3Path.lineTo(8.67f, 2.8f);
             bezier3Path.lineTo(13.6f, 7.2f);
             bezier3Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor5);
             canvas.drawPath(bezier3Path, paint);
-            
+
             // Bezier 4
             RectF bezier4Rect = CacheForRage.bezier4Rect;
             bezier4Rect.set(3.73f, 2.8f, 8.67f, 7.2f);
@@ -8257,13 +8256,13 @@ public class HabiticaIcons {
             bezier4Path.lineTo(8.67f, 2.8f);
             bezier4Path.lineTo(8.67f, 6.2f);
             bezier4Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor3);
             canvas.drawPath(bezier4Path, paint);
-            
+
             // Bezier 5
             RectF bezier5Rect = CacheForRage.bezier5Rect;
             bezier5Rect.set(3.73f, 6.2f, 8.67f, 14.6f);
@@ -8274,13 +8273,13 @@ public class HabiticaIcons {
             bezier5Path.lineTo(3.73f, 7.2f);
             bezier5Path.lineTo(8.67f, 6.2f);
             bezier5Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor92);
             canvas.drawPath(bezier5Path, paint);
-            
+
             // Bezier 6
             RectF bezier6Rect = CacheForRage.bezier6Rect;
             bezier6Rect.set(8.67f, 6.2f, 13.6f, 14.6f);
@@ -8291,13 +8290,13 @@ public class HabiticaIcons {
             bezier6Path.lineTo(8.67f, 6.2f);
             bezier6Path.lineTo(13.6f, 7.2f);
             bezier6Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor15);
             canvas.drawPath(bezier6Path, paint);
-            
+
             // Bezier 7
             RectF bezier7Rect = CacheForRage.bezier7Rect;
             bezier7Rect.set(2f, 1f, 15.33f, 17f);
@@ -8313,13 +8312,13 @@ public class HabiticaIcons {
             bezier7Path.lineTo(14f, 9f);
             bezier7Path.lineTo(15.33f, 7f);
             bezier7Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor93);
             canvas.drawPath(bezier7Path, paint);
-            
+
             // Bezier 8
             RectF bezier8Rect = CacheForRage.bezier8Rect;
             bezier8Rect.set(8.67f, 2.8f, 13.6f, 7.2f);
@@ -8330,13 +8329,13 @@ public class HabiticaIcons {
             bezier8Path.lineTo(8.67f, 2.8f);
             bezier8Path.lineTo(13.6f, 7.2f);
             bezier8Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor5);
             canvas.drawPath(bezier8Path, paint);
-            
+
             // Bezier 9
             RectF bezier9Rect = CacheForRage.bezier9Rect;
             bezier9Rect.set(3.73f, 2.8f, 8.67f, 7.2f);
@@ -8347,13 +8346,13 @@ public class HabiticaIcons {
             bezier9Path.lineTo(8.67f, 2.8f);
             bezier9Path.lineTo(8.67f, 6.2f);
             bezier9Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor3);
             canvas.drawPath(bezier9Path, paint);
-            
+
             // Bezier 10
             RectF bezier10Rect = CacheForRage.bezier10Rect;
             bezier10Rect.set(3.73f, 3.4f, 13.6f, 14.6f);
@@ -8371,13 +8370,13 @@ public class HabiticaIcons {
             bezier10Path.lineTo(13.6f, 10.8f);
             bezier10Path.lineTo(8.67f, 11.8f);
             bezier10Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor5);
             canvas.drawPath(bezier10Path, paint);
-            
+
             // Bezier 11
             RectF bezier11Rect = CacheForRage.bezier11Rect;
             bezier11Rect.set(3.73f, 6.2f, 13.6f, 15.2f);
@@ -8393,13 +8392,13 @@ public class HabiticaIcons {
             bezier11Path.lineTo(8.67f, 15.2f);
             bezier11Path.lineTo(3.73f, 10.8f);
             bezier11Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor94);
             canvas.drawPath(bezier11Path, paint);
-            
+
             // Bezier 12
             RectF bezier12Rect = CacheForRage.bezier12Rect;
             bezier12Rect.set(8.67f, 10.8f, 13.6f, 15.2f);
@@ -8410,13 +8409,13 @@ public class HabiticaIcons {
             bezier12Path.lineTo(8.67f, 15.2f);
             bezier12Path.lineTo(8.67f, 11.8f);
             bezier12Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor3);
             canvas.drawPath(bezier12Path, paint);
-            
+
             // Bezier 13
             RectF bezier13Rect = CacheForRage.bezier13Rect;
             bezier13Rect.set(3.73f, 3.4f, 8.67f, 11.8f);
@@ -8427,13 +8426,13 @@ public class HabiticaIcons {
             bezier13Path.lineTo(8.67f, 11.8f);
             bezier13Path.lineTo(3.73f, 10.8f);
             bezier13Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor5);
             canvas.drawPath(bezier13Path, paint);
-            
+
             // Bezier 14
             RectF bezier14Rect = CacheForRage.bezier14Rect;
             bezier14Rect.set(5.5f, 4.67f, 11.83f, 13.33f);
@@ -8449,17 +8448,17 @@ public class HabiticaIcons {
             bezier14Path.lineTo(8.67f, 13.33f);
             bezier14Path.lineTo(5.5f, 10.53f);
             bezier14Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor3);
             canvas.drawPath(bezier14Path, paint);
         }
-        
+
         canvas.restore();
     }
-    
+
     private static class CacheForTaskDifficultyStars {
         private static final RectF originalFrame = new RectF(0f, 0f, 36f, 36f);
         private static final RectF resizedFrame = new RectF();
@@ -8484,25 +8483,25 @@ public class HabiticaIcons {
         private static final RectF symbolRect = new RectF();
         private static final RectF symbolTargetRect = new RectF();
     }
-    
+
     public static void drawTaskDifficultyStars(Canvas canvas, int taskTintColor, float difficulty, boolean isActive) {
         HabiticaIcons.drawTaskDifficultyStars(canvas, new RectF(0f, 0f, 36f, 36f), ResizingBehavior.AspectFit, taskTintColor, difficulty, isActive);
     }
-    
+
     public static void drawTaskDifficultyStars(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, int taskTintColor, float difficulty, boolean isActive) {
         // Local Variables
         boolean isHard = difficulty == 2f;
         boolean isMedium = difficulty == 1.5f;
         boolean isEasy = difficulty == 1f;
         boolean isTrivial = difficulty == 0.1f;
-        
+
         // Resize to Target Frame
         canvas.save();
         RectF resizedFrame = CacheForTaskDifficultyStars.resizedFrame;
         HabiticaIcons.resizingBehaviorApply(resizing, CacheForTaskDifficultyStars.originalFrame, targetFrame, resizedFrame);
         canvas.translate(resizedFrame.left, resizedFrame.top);
         canvas.scale(resizedFrame.width() / 36f, resizedFrame.height() / 36f);
-        
+
         // Group
         if (isEasy) {
             // Symbol 2
@@ -8515,7 +8514,7 @@ public class HabiticaIcons {
             symbol2TargetRect.set(0f, 0f, symbol2Rect.width(), symbol2Rect.height());
             HabiticaIcons.drawTaskFormDifficultyStar(canvas, symbol2TargetRect, ResizingBehavior.Stretch, taskTintColor, isActive);
             canvas.restore();
-            
+
             // Symbol 3
             RectF symbol3Rect = CacheForTaskDifficultyStars.symbol3Rect;
             symbol3Rect.set(20f, 9f, 36f, 25f);
@@ -8527,7 +8526,7 @@ public class HabiticaIcons {
             HabiticaIcons.drawTaskFormDifficultyStar(canvas, symbol3TargetRect, ResizingBehavior.Stretch, taskTintColor, isActive);
             canvas.restore();
         }
-        
+
         // Group 2
         if (isMedium) {
             // Symbol 4
@@ -8540,7 +8539,7 @@ public class HabiticaIcons {
             symbol4TargetRect.set(0f, 0f, symbol4Rect.width(), symbol4Rect.height());
             HabiticaIcons.drawTaskFormDifficultyStar(canvas, symbol4TargetRect, ResizingBehavior.Stretch, taskTintColor, isActive);
             canvas.restore();
-            
+
             // Symbol 5
             RectF symbol5Rect = CacheForTaskDifficultyStars.symbol5Rect;
             symbol5Rect.set(20f, 13f, 36f, 29f);
@@ -8551,7 +8550,7 @@ public class HabiticaIcons {
             symbol5TargetRect.set(0f, 0f, symbol5Rect.width(), symbol5Rect.height());
             HabiticaIcons.drawTaskFormDifficultyStar(canvas, symbol5TargetRect, ResizingBehavior.Stretch, taskTintColor, isActive);
             canvas.restore();
-            
+
             // Symbol 6
             RectF symbol6Rect = CacheForTaskDifficultyStars.symbol6Rect;
             symbol6Rect.set(0f, 13f, 16f, 29f);
@@ -8563,7 +8562,7 @@ public class HabiticaIcons {
             HabiticaIcons.drawTaskFormDifficultyStar(canvas, symbol6TargetRect, ResizingBehavior.Stretch, taskTintColor, isActive);
             canvas.restore();
         }
-        
+
         // Group 3
         if (isHard) {
             // Symbol 7
@@ -8576,7 +8575,7 @@ public class HabiticaIcons {
             symbol7TargetRect.set(0f, 0f, symbol7Rect.width(), symbol7Rect.height());
             HabiticaIcons.drawTaskFormDifficultyStar(canvas, symbol7TargetRect, ResizingBehavior.Stretch, taskTintColor, isActive);
             canvas.restore();
-            
+
             // Symbol 8
             RectF symbol8Rect = CacheForTaskDifficultyStars.symbol8Rect;
             symbol8Rect.set(20f, 0f, 36f, 16f);
@@ -8587,7 +8586,7 @@ public class HabiticaIcons {
             symbol8TargetRect.set(0f, 0f, symbol8Rect.width(), symbol8Rect.height());
             HabiticaIcons.drawTaskFormDifficultyStar(canvas, symbol8TargetRect, ResizingBehavior.Stretch, taskTintColor, isActive);
             canvas.restore();
-            
+
             // Symbol 9
             RectF symbol9Rect = CacheForTaskDifficultyStars.symbol9Rect;
             symbol9Rect.set(0f, 20f, 16f, 36f);
@@ -8598,7 +8597,7 @@ public class HabiticaIcons {
             symbol9TargetRect.set(0f, 0f, symbol9Rect.width(), symbol9Rect.height());
             HabiticaIcons.drawTaskFormDifficultyStar(canvas, symbol9TargetRect, ResizingBehavior.Stretch, taskTintColor, isActive);
             canvas.restore();
-            
+
             // Symbol 10
             RectF symbol10Rect = CacheForTaskDifficultyStars.symbol10Rect;
             symbol10Rect.set(20f, 20f, 36f, 36f);
@@ -8610,7 +8609,7 @@ public class HabiticaIcons {
             HabiticaIcons.drawTaskFormDifficultyStar(canvas, symbol10TargetRect, ResizingBehavior.Stretch, taskTintColor, isActive);
             canvas.restore();
         }
-        
+
         // Symbol
         if (isTrivial) {
             RectF symbolRect = CacheForTaskDifficultyStars.symbolRect;
@@ -8623,10 +8622,10 @@ public class HabiticaIcons {
             HabiticaIcons.drawTaskFormDifficultyStar(canvas, symbolTargetRect, ResizingBehavior.Stretch, taskTintColor, isActive);
             canvas.restore();
         }
-        
+
         canvas.restore();
     }
-    
+
     private static class CacheForTaskFormDifficultyStar {
         private static final Paint paint = new Paint();
         private static final RectF originalFrame = new RectF(0f, 0f, 16f, 16f);
@@ -8638,22 +8637,22 @@ public class HabiticaIcons {
     public static void drawTaskFormDifficultyStar(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, int taskTintColor, boolean isActive) {
         // General Declarations
         Paint paint = CacheForTaskFormDifficultyStar.paint;
-        
+
         // Local Colors
         int transparent = Color.argb(0, 204, 82, 82);
         int strokeColor15 = Color.argb(255, 195, 192, 199);
-        
+
         // Local Variables
         int starFillColor = isActive ? taskTintColor : transparent;
         int borderColor = isActive ? taskTintColor : strokeColor15;
-        
+
         // Resize to Target Frame
         canvas.save();
         RectF resizedFrame = CacheForTaskFormDifficultyStar.resizedFrame;
         HabiticaIcons.resizingBehaviorApply(resizing, CacheForTaskFormDifficultyStar.originalFrame, targetFrame, resizedFrame);
         canvas.translate(resizedFrame.left, resizedFrame.top);
         canvas.scale(resizedFrame.width() / 16f, resizedFrame.height() / 16f);
-        
+
         // Star 3
         RectF star3Rect = CacheForTaskFormDifficultyStar.star3Rect;
         star3Rect.set(1f, 1f, 15f, 15f);
@@ -8669,13 +8668,13 @@ public class HabiticaIcons {
         star3Path.lineTo(5.67f, 5.67f);
         star3Path.lineTo(8f, 1f);
         star3Path.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(starFillColor);
         canvas.drawPath(star3Path, paint);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStrokeWidth(1f);
@@ -8685,10 +8684,10 @@ public class HabiticaIcons {
         paint.setColor(borderColor);
         canvas.drawPath(star3Path, paint);
         canvas.restore();
-        
+
         canvas.restore();
     }
-    
+
     private static class CacheForLocked {
         private static final Paint paint = new Paint();
         private static final RectF originalFrame = new RectF(0f, 0f, 15f, 17f);
@@ -8708,14 +8707,14 @@ public class HabiticaIcons {
     public static void drawLocked(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, int lockColor) {
         // General Declarations
         Paint paint = CacheForLocked.paint;
-        
+
         // Resize to Target Frame
         canvas.save();
         RectF resizedFrame = CacheForLocked.resizedFrame;
         HabiticaIcons.resizingBehaviorApply(resizing, CacheForLocked.originalFrame, targetFrame, resizedFrame);
         canvas.translate(resizedFrame.left, resizedFrame.top);
         canvas.scale(resizedFrame.width() / 15f, resizedFrame.height() / 17f);
-        
+
         // Group 3
         {
             // Rectangle
@@ -8724,19 +8723,19 @@ public class HabiticaIcons {
             Path rectanglePath = CacheForLocked.rectanglePath;
             rectanglePath.reset();
             rectanglePath.addRect(rectangleRect, Path.Direction.CW);
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(lockColor);
             canvas.drawPath(rectanglePath, paint);
-            
+
             // Group
             {
                 RectF group = CacheForLocked.group;
                 group.set(0f, 6f, 15f, 17f);
                 canvas.save();
-                
+
                 // Clip
                 Path clipPath = CacheForLocked.clipPath;
                 clipPath.reset();
@@ -8751,7 +8750,7 @@ public class HabiticaIcons {
                 clipPath.cubicTo(0f, 6.9f, 0.9f, 6f, 2f, 6f);
                 clipPath.close();
                 canvas.clipPath(clipPath);
-                
+
                 // Bezier
                 RectF bezierRect = CacheForLocked.bezierRect;
                 bezierRect.set(0f, 6f, 15f, 17f);
@@ -8767,7 +8766,7 @@ public class HabiticaIcons {
                 bezierPath.lineTo(0f, 8f);
                 bezierPath.cubicTo(0f, 6.9f, 0.9f, 6f, 2f, 6f);
                 bezierPath.close();
-                
+
                 paint.reset();
                 paint.setFlags(Paint.ANTI_ALIAS_FLAG);
                 paint.setStrokeWidth(4f);
@@ -8777,16 +8776,16 @@ public class HabiticaIcons {
                 paint.setColor(lockColor);
                 canvas.drawPath(bezierPath, paint);
                 canvas.restore();
-                
+
                 canvas.restore();
             }
-            
+
             // Group 2
             {
                 RectF group2 = CacheForLocked.group2;
                 group2.set(2f, 0f, 13f, 8f);
                 canvas.save();
-                
+
                 // Clip 2
                 Path clip2Path = CacheForLocked.clip2Path;
                 clip2Path.reset();
@@ -8799,7 +8798,7 @@ public class HabiticaIcons {
                 clip2Path.cubicTo(2f, 2.46f, 4.46f, 0f, 7.5f, 0f);
                 clip2Path.close();
                 canvas.clipPath(clip2Path);
-                
+
                 // Bezier 3
                 RectF bezier3Rect = CacheForLocked.bezier3Rect;
                 bezier3Rect.set(2f, 0f, 13f, 8f);
@@ -8813,7 +8812,7 @@ public class HabiticaIcons {
                 bezier3Path.lineTo(2f, 5.5f);
                 bezier3Path.cubicTo(2f, 2.46f, 4.46f, 0f, 7.5f, 0f);
                 bezier3Path.close();
-                
+
                 paint.reset();
                 paint.setFlags(Paint.ANTI_ALIAS_FLAG);
                 paint.setStrokeWidth(4f);
@@ -8823,14 +8822,14 @@ public class HabiticaIcons {
                 paint.setColor(lockColor);
                 canvas.drawPath(bezier3Path, paint);
                 canvas.restore();
-                
+
                 canvas.restore();
             }
         }
-        
+
         canvas.restore();
     }
-    
+
     private static class CacheForGuildCrest {
         private static final Paint paint = new Paint();
         private static final RectF originalFrame = new RectF(0f, 0f, 40f, 38f);
@@ -8877,11 +8876,11 @@ public class HabiticaIcons {
         private static final TextPaint labelTextPaint = new TextPaint();
         private static final PaintCodeStaticLayout labelStaticLayout = new PaintCodeStaticLayout();
     }
-    
+
     public static void drawGuildCrest(Canvas canvas, boolean isOwner, boolean isPublic, float memberCount, String memberCountLabel) {
         HabiticaIcons.drawGuildCrest(canvas, new RectF(0f, 0f, 40f, 38f), ResizingBehavior.AspectFit, isOwner, isPublic, memberCount, memberCountLabel);
     }
-    
+
     public static void drawGuildCrest(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, boolean isOwner, boolean isPublic, float memberCount, String memberCountLabel) {
         // General Declarations
         Stack<Matrix> currentTransformation = new Stack<>();
@@ -8907,7 +8906,7 @@ public class HabiticaIcons {
         int crestSilver4 = Color.argb(255, 175, 175, 175);
         int crestSilver6 = Color.argb(255, 141, 141, 141);
         int crestGold2 = Color.argb(255, 255, 210, 145);
-        
+
         // Local Variables
         int crestColor4 = memberCount < 100f ? crestBronze4 : (memberCount < 1000f ? crestSilver4 : crestGold4);
         int crestColor3 = memberCount < 100f ? crestBronze3 : (memberCount < 1000f ? crestSilver3 : crestGold3);
@@ -8916,20 +8915,20 @@ public class HabiticaIcons {
         int crestColor6 = memberCount < 100f ? crestBronze6 : (memberCount < 1000f ? crestSilver6 : crestGold6);
         int crestColor5 = memberCount < 100f ? crestBronze5 : (memberCount < 1000f ? crestSilver5 : crestGold5);
         boolean isPrivate = !isPublic;
-        
+
         // Resize to Target Frame
         canvas.save();
         RectF resizedFrame = CacheForGuildCrest.resizedFrame;
         HabiticaIcons.resizingBehaviorApply(resizing, CacheForGuildCrest.originalFrame, targetFrame, resizedFrame);
         canvas.translate(resizedFrame.left, resizedFrame.top);
         canvas.scale(resizedFrame.width() / 40f, resizedFrame.height() / 38f);
-        
+
         // Group
         if (isPublic) {
             RectF group = CacheForGuildCrest.group;
             group.set(0f, 0f, 40f, 38f);
             canvas.save();
-            
+
             // Clip 5
             Path clip5Path = CacheForGuildCrest.clip5Path;
             clip5Path.reset();
@@ -8942,20 +8941,20 @@ public class HabiticaIcons {
             clip5Path.lineTo(20.5f, 38f);
             clip5Path.close();
             canvas.clipPath(clip5Path);
-            
+
             // Rectangle
             RectF rectangleRect = CacheForGuildCrest.rectangleRect;
             rectangleRect.set(-5f, -5f, 45f, 43f);
             Path rectanglePath = CacheForGuildCrest.rectanglePath;
             rectanglePath.reset();
             rectanglePath.addRect(rectangleRect, Path.Direction.CW);
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(crestColor1);
             canvas.drawPath(rectanglePath, paint);
-            
+
             // Rectangle 2
             canvas.save();
             canvas.translate(23.03f, 23.53f);
@@ -8971,14 +8970,14 @@ public class HabiticaIcons {
             rectangle2Path.lineTo(rectangle2Rect.right, rectangle2Rect.bottom);
             rectangle2Path.lineTo(rectangle2Rect.left, rectangle2Rect.bottom);
             rectangle2Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(crestColor2);
             canvas.drawPath(rectangle2Path, paint);
             canvas.restore();
-            
+
             // Rectangle 4
             canvas.save();
             canvas.translate(35f, 22f);
@@ -8990,14 +8989,14 @@ public class HabiticaIcons {
             Path rectangle4Path = CacheForGuildCrest.rectangle4Path;
             rectangle4Path.reset();
             rectangle4Path.addRect(rectangle4Rect, Path.Direction.CW);
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(crestColor2);
             canvas.drawPath(rectangle4Path, paint);
             canvas.restore();
-            
+
             // Bezier 2
             RectF bezier2Rect = CacheForGuildCrest.bezier2Rect;
             bezier2Rect.set(0f, 0f, 40f, 38f);
@@ -9011,7 +9010,7 @@ public class HabiticaIcons {
             bezier2Path.cubicTo(6.19f, 13.48f, 6.99f, 22.28f, 6.86f, 30.6f);
             bezier2Path.lineTo(20.5f, 38f);
             bezier2Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStrokeWidth(10f);
@@ -9021,7 +9020,7 @@ public class HabiticaIcons {
             paint.setColor(crestColor3);
             canvas.drawPath(bezier2Path, paint);
             canvas.restore();
-            
+
             // Bezier 4
             RectF bezier4Rect = CacheForGuildCrest.bezier4Rect;
             bezier4Rect.set(0f, -0f, 40f, 38f);
@@ -9035,7 +9034,7 @@ public class HabiticaIcons {
             bezier4Path.cubicTo(6.19f, 13.48f, 6.99f, 22.28f, 6.86f, 30.6f);
             bezier4Path.lineTo(20.5f, 38f);
             bezier4Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStrokeWidth(6f);
@@ -9045,7 +9044,7 @@ public class HabiticaIcons {
             paint.setColor(crestColor4);
             canvas.drawPath(bezier4Path, paint);
             canvas.restore();
-            
+
             // Bezier 7
             if (isOwner) {
                 RectF bezier7Rect = CacheForGuildCrest.bezier7Rect;
@@ -9069,7 +9068,7 @@ public class HabiticaIcons {
                 bezier7Path.cubicTo(15.04f, 13.09f, 14.72f, 13.32f, 14.23f, 13.05f);
                 bezier7Path.lineTo(13.3f, 12.54f);
                 bezier7Path.close();
-                
+
                 paint.reset();
                 paint.setFlags(Paint.ANTI_ALIAS_FLAG);
                 bezier7Path.setFillType(Path.FillType.EVEN_ODD);
@@ -9077,7 +9076,7 @@ public class HabiticaIcons {
                 paint.setColor(crestColor6);
                 canvas.drawPath(bezier7Path, paint);
             }
-            
+
             // Bezier 8
             if (isOwner) {
                 RectF bezier8Rect = CacheForGuildCrest.bezier8Rect;
@@ -9101,7 +9100,7 @@ public class HabiticaIcons {
                 bezier8Path.cubicTo(28.44f, 13.09f, 28.12f, 13.32f, 27.63f, 13.05f);
                 bezier8Path.lineTo(26.7f, 12.54f);
                 bezier8Path.close();
-                
+
                 paint.reset();
                 paint.setFlags(Paint.ANTI_ALIAS_FLAG);
                 bezier8Path.setFillType(Path.FillType.EVEN_ODD);
@@ -9109,16 +9108,16 @@ public class HabiticaIcons {
                 paint.setColor(crestColor6);
                 canvas.drawPath(bezier8Path, paint);
             }
-            
+
             canvas.restore();
         }
-        
+
         // Group 8
         if (isPrivate) {
             RectF group8 = CacheForGuildCrest.group8;
             group8.set(3f, 0f, 37f, 38f);
             canvas.save();
-            
+
             // Clip 14
             Path clip14Path = CacheForGuildCrest.clip14Path;
             clip14Path.reset();
@@ -9129,20 +9128,20 @@ public class HabiticaIcons {
             clip14Path.lineTo(20f, 0f);
             clip14Path.close();
             canvas.clipPath(clip14Path);
-            
+
             // Rectangle 3
             RectF rectangle3Rect = CacheForGuildCrest.rectangle3Rect;
             rectangle3Rect.set(2f, 0f, 37f, 38f);
             Path rectangle3Path = CacheForGuildCrest.rectangle3Path;
             rectangle3Path.reset();
             rectangle3Path.addRect(rectangle3Rect, Path.Direction.CW);
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(crestColor1);
             canvas.drawPath(rectangle3Path, paint);
-            
+
             // Rectangle 8
             canvas.save();
             canvas.translate(23.7f, 10.7f);
@@ -9154,14 +9153,14 @@ public class HabiticaIcons {
             Path rectangle8Path = CacheForGuildCrest.rectangle8Path;
             rectangle8Path.reset();
             rectangle8Path.addRect(rectangle8Rect, Path.Direction.CW);
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(crestColor2);
             canvas.drawPath(rectangle8Path, paint);
             canvas.restore();
-            
+
             // Rectangle 5
             canvas.save();
             canvas.translate(17.73f, 24f);
@@ -9173,14 +9172,14 @@ public class HabiticaIcons {
             Path rectangle5Path = CacheForGuildCrest.rectangle5Path;
             rectangle5Path.reset();
             rectangle5Path.addRect(rectangle5Rect, Path.Direction.CW);
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(crestColor2);
             canvas.drawPath(rectangle5Path, paint);
             canvas.restore();
-            
+
             // Bezier 3
             RectF bezier3Rect = CacheForGuildCrest.bezier3Rect;
             bezier3Rect.set(3f, 0f, 37f, 38f);
@@ -9192,7 +9191,7 @@ public class HabiticaIcons {
             bezier3Path.cubicTo(34.93f, 31.47f, 37f, 22.85f, 37f, 7.62f);
             bezier3Path.lineTo(20f, 0f);
             bezier3Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStrokeWidth(10f);
@@ -9202,7 +9201,7 @@ public class HabiticaIcons {
             paint.setColor(crestColor3);
             canvas.drawPath(bezier3Path, paint);
             canvas.restore();
-            
+
             // Bezier 6
             RectF bezier6Rect = CacheForGuildCrest.bezier6Rect;
             bezier6Rect.set(3f, 0f, 37f, 38f);
@@ -9214,7 +9213,7 @@ public class HabiticaIcons {
             bezier6Path.cubicTo(34.93f, 31.47f, 37f, 22.85f, 37f, 7.62f);
             bezier6Path.lineTo(20f, 0f);
             bezier6Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStrokeWidth(6f);
@@ -9224,7 +9223,7 @@ public class HabiticaIcons {
             paint.setColor(crestColor4);
             canvas.drawPath(bezier6Path, paint);
             canvas.restore();
-            
+
             // Bezier 14
             if (isOwner) {
                 RectF bezier14Rect = CacheForGuildCrest.bezier14Rect;
@@ -9248,7 +9247,7 @@ public class HabiticaIcons {
                 bezier14Path.cubicTo(30.04f, 15.69f, 29.72f, 15.92f, 29.23f, 15.65f);
                 bezier14Path.lineTo(28.3f, 15.14f);
                 bezier14Path.close();
-                
+
                 paint.reset();
                 paint.setFlags(Paint.ANTI_ALIAS_FLAG);
                 bezier14Path.setFillType(Path.FillType.EVEN_ODD);
@@ -9256,7 +9255,7 @@ public class HabiticaIcons {
                 paint.setColor(crestColor6);
                 canvas.drawPath(bezier14Path, paint);
             }
-            
+
             // Bezier 15
             if (isOwner) {
                 RectF bezier15Rect = CacheForGuildCrest.bezier15Rect;
@@ -9280,7 +9279,7 @@ public class HabiticaIcons {
                 bezier15Path.cubicTo(13.44f, 15.69f, 13.12f, 15.92f, 12.63f, 15.65f);
                 bezier15Path.lineTo(11.7f, 15.14f);
                 bezier15Path.close();
-                
+
                 paint.reset();
                 paint.setFlags(Paint.ANTI_ALIAS_FLAG);
                 bezier15Path.setFillType(Path.FillType.EVEN_ODD);
@@ -9288,10 +9287,10 @@ public class HabiticaIcons {
                 paint.setColor(crestColor6);
                 canvas.drawPath(bezier15Path, paint);
             }
-            
+
             canvas.restore();
         }
-        
+
         // Bezier 13
         RectF bezier13Rect = CacheForGuildCrest.bezier13Rect;
         bezier13Rect.set(15f, 7f, 25f, 17f);
@@ -9310,14 +9309,14 @@ public class HabiticaIcons {
         bezier13Path.cubicTo(21.18f, 11.29f, 22.14f, 10.33f, 22.14f, 9.14f);
         bezier13Path.cubicTo(22.14f, 7.96f, 21.18f, 7f, 20f, 7f);
         bezier13Path.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         bezier13Path.setFillType(Path.FillType.EVEN_ODD);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(crestColor6);
         canvas.drawPath(bezier13Path, paint);
-        
+
         // Bezier 10
         RectF bezier10Rect = CacheForGuildCrest.bezier10Rect;
         bezier10Rect.set(2f, 19f, 38f, 34f);
@@ -9333,14 +9332,14 @@ public class HabiticaIcons {
         bezier10Path.cubicTo(5.36f, 34f, 2f, 30.63f, 2f, 26.5f);
         bezier10Path.lineTo(2f, 26.5f);
         bezier10Path.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         bezier10Path.setFillType(Path.FillType.EVEN_ODD);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(Color.WHITE);
         canvas.drawPath(bezier10Path, paint);
-        
+
         // Bezier 11
         RectF bezier11Rect = CacheForGuildCrest.bezier11Rect;
         bezier11Rect.set(2f, 19f, 38f, 34f);
@@ -9356,7 +9355,7 @@ public class HabiticaIcons {
         bezier11Path.cubicTo(5.36f, 34f, 2f, 30.63f, 2f, 26.5f);
         bezier11Path.lineTo(2f, 26.5f);
         bezier11Path.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStrokeWidth(2f);
@@ -9366,7 +9365,7 @@ public class HabiticaIcons {
         paint.setColor(crestColor3);
         canvas.drawPath(bezier11Path, paint);
         canvas.restore();
-        
+
         // Label
         RectF labelRect = CacheForGuildCrest.labelRect;
         labelRect.set(4f, 20f, 36f, 33f);
@@ -9381,40 +9380,40 @@ public class HabiticaIcons {
         canvas.translate(labelRect.left, labelRect.top + (labelRect.height() - labelStaticLayout.getHeight()) / 2f);
         labelStaticLayout.draw(canvas);
         canvas.restore();
-        
+
         canvas.restore();
     }
-    
+
     private static class CacheForGuildCrestMedium {
-        private static Paint paint = new Paint();
-        private static RectF originalFrame = new RectF(0f, 0f, 30f, 34f);
-        private static RectF resizedFrame = new RectF();
-        private static RectF group = new RectF();
-        private static Path clip5Path = new Path();
-        private static RectF rectangleRect = new RectF();
-        private static Path rectanglePath = new Path();
-        private static RectF rectangle2Rect = new RectF();
-        private static Path rectangle2Path = new Path();
-        private static RectF rectangle4Rect = new RectF();
-        private static Path rectangle4Path = new Path();
-        private static RectF bezier2Rect = new RectF();
-        private static Path bezier2Path = new Path();
-        private static RectF bezier4Rect = new RectF();
-        private static Path bezier4Path = new Path();
-        private static RectF bezier6Rect = new RectF();
-        private static Path bezier6Path = new Path();
+        private static final Paint paint = new Paint();
+        private static final RectF originalFrame = new RectF(0f, 0f, 30f, 34f);
+        private static final RectF resizedFrame = new RectF();
+        private static final RectF group = new RectF();
+        private static final Path clip5Path = new Path();
+        private static final RectF rectangleRect = new RectF();
+        private static final Path rectanglePath = new Path();
+        private static final RectF rectangle2Rect = new RectF();
+        private static final Path rectangle2Path = new Path();
+        private static final RectF rectangle4Rect = new RectF();
+        private static final Path rectangle4Path = new Path();
+        private static final RectF bezier2Rect = new RectF();
+        private static final Path bezier2Path = new Path();
+        private static final RectF bezier4Rect = new RectF();
+        private static final Path bezier4Path = new Path();
+        private static final RectF bezier6Rect = new RectF();
+        private static final Path bezier6Path = new Path();
     }
-    
+
     public static void drawGuildCrestMedium(Canvas canvas, float memberCount) {
         HabiticaIcons.drawGuildCrestMedium(canvas, new RectF(0f, 0f, 30f, 34f), ResizingBehavior.AspectFit, memberCount);
     }
-    
+
     public static void drawGuildCrestMedium(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, float memberCount) {
         // General Declarations
         Stack<Matrix> currentTransformation = new Stack<Matrix>();
         currentTransformation.push(new Matrix());
         Paint paint = CacheForGuildCrestMedium.paint;
-        
+
         // Local Colors
         int crestBronze2 = Color.argb(255, 244, 165, 89);
         int crestGold4 = Color.argb(255, 255, 166, 35);
@@ -9431,27 +9430,27 @@ public class HabiticaIcons {
         int crestSilver4 = Color.argb(255, 175, 175, 175);
         int crestSilver6 = Color.argb(255, 141, 141, 141);
         int crestGold2 = Color.argb(255, 255, 210, 145);
-        
+
         // Local Variables
         int crestColor6 = memberCount < 100f ? crestBronze6 : (memberCount < 1000f ? crestSilver6 : crestGold6);
         int crestColor1 = memberCount < 100f ? crestBronze1 : (memberCount < 1000f ? crestSilver1 : crestGold1);
         int crestColor2 = memberCount < 100f ? crestBronze2 : (memberCount < 1000f ? crestSilver2 : crestGold2);
         int crestColor3 = memberCount < 100f ? crestBronze3 : (memberCount < 1000f ? crestSilver3 : crestGold3);
         int crestColor4 = memberCount < 100f ? crestBronze4 : (memberCount < 1000f ? crestSilver4 : crestGold4);
-        
+
         // Resize to Target Frame
         canvas.save();
         RectF resizedFrame = CacheForGuildCrestMedium.resizedFrame;
         HabiticaIcons.resizingBehaviorApply(resizing, CacheForGuildCrestMedium.originalFrame, targetFrame, resizedFrame);
         canvas.translate(resizedFrame.left, resizedFrame.top);
         canvas.scale(resizedFrame.width() / 30f, resizedFrame.height() / 34f);
-        
+
         // Group
         {
             RectF group = CacheForGuildCrestMedium.group;
             group.set(0f, 0f, 30f, 34f);
             canvas.save();
-            
+
             // Clip 5
             Path clip5Path = CacheForGuildCrestMedium.clip5Path;
             clip5Path.reset();
@@ -9462,20 +9461,20 @@ public class HabiticaIcons {
             clip5Path.lineTo(15f, 0f);
             clip5Path.close();
             canvas.clipPath(clip5Path);
-            
+
             // Rectangle
             RectF rectangleRect = CacheForGuildCrestMedium.rectangleRect;
             rectangleRect.set(-5f, -5f, 35f, 39f);
             Path rectanglePath = CacheForGuildCrestMedium.rectanglePath;
             rectanglePath.reset();
             rectanglePath.addRect(rectangleRect, Path.Direction.CW);
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(crestColor1);
             canvas.drawPath(rectanglePath, paint);
-            
+
             // Rectangle 2
             canvas.save();
             canvas.translate(14.44f, 17.06f);
@@ -9491,14 +9490,14 @@ public class HabiticaIcons {
             rectangle2Path.lineTo(rectangle2Rect.right, rectangle2Rect.bottom);
             rectangle2Path.lineTo(rectangle2Rect.left, rectangle2Rect.bottom);
             rectangle2Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(crestColor2);
             canvas.drawPath(rectangle2Path, paint);
             canvas.restore();
-            
+
             // Rectangle 4
             canvas.save();
             canvas.translate(17.86f, 10.71f);
@@ -9514,14 +9513,14 @@ public class HabiticaIcons {
             rectangle4Path.lineTo(rectangle4Rect.right, rectangle4Rect.bottom);
             rectangle4Path.lineTo(rectangle4Rect.left, rectangle4Rect.bottom);
             rectangle4Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(crestColor2);
             canvas.drawPath(rectangle4Path, paint);
             canvas.restore();
-            
+
             // Bezier 2
             RectF bezier2Rect = CacheForGuildCrestMedium.bezier2Rect;
             bezier2Rect.set(0f, 0f, 30f, 34f);
@@ -9533,7 +9532,7 @@ public class HabiticaIcons {
             bezier2Path.cubicTo(29f, 28f, 30f, 21f, 30f, 7f);
             bezier2Path.lineTo(15f, 0f);
             bezier2Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStrokeWidth(10f);
@@ -9543,7 +9542,7 @@ public class HabiticaIcons {
             paint.setColor(crestColor3);
             canvas.drawPath(bezier2Path, paint);
             canvas.restore();
-            
+
             // Bezier 4
             RectF bezier4Rect = CacheForGuildCrestMedium.bezier4Rect;
             bezier4Rect.set(0f, 0f, 30f, 34f);
@@ -9555,7 +9554,7 @@ public class HabiticaIcons {
             bezier4Path.cubicTo(29f, 28f, 30f, 21f, 30f, 7f);
             bezier4Path.lineTo(15f, 0f);
             bezier4Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStrokeWidth(6f);
@@ -9565,7 +9564,7 @@ public class HabiticaIcons {
             paint.setColor(crestColor4);
             canvas.drawPath(bezier4Path, paint);
             canvas.restore();
-            
+
             // Bezier 6
             RectF bezier6Rect = CacheForGuildCrestMedium.bezier6Rect;
             bezier6Rect.set(10f, 11f, 20f, 21f);
@@ -9584,20 +9583,20 @@ public class HabiticaIcons {
             bezier6Path.cubicTo(16.18f, 15.29f, 17.14f, 14.33f, 17.14f, 13.14f);
             bezier6Path.cubicTo(17.14f, 11.96f, 16.18f, 11f, 15f, 11f);
             bezier6Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             bezier6Path.setFillType(Path.FillType.EVEN_ODD);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(crestColor6);
             canvas.drawPath(bezier6Path, paint);
-            
+
             canvas.restore();
         }
-        
+
         canvas.restore();
     }
-    
+
     private static class CacheForGuildCrestSmall {
         private static final Paint paint = new Paint();
         private static final RectF originalFrame = new RectF(0f, 0f, 16f, 16f);
@@ -9607,31 +9606,31 @@ public class HabiticaIcons {
         private static final RectF bezier2Rect = new RectF();
         private static final Path bezier2Path = new Path();
     }
-    
+
     public static void drawGuildCrestSmall(Canvas canvas, float memberCount) {
         HabiticaIcons.drawGuildCrestSmall(canvas, new RectF(0f, 0f, 16f, 16f), ResizingBehavior.AspectFit, memberCount);
     }
-    
+
     public static void drawGuildCrestSmall(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, float memberCount) {
         // General Declarations
         Paint paint = CacheForGuildCrestSmall.paint;
-        
+
         // Local Colors
         int crestGold4 = Color.argb(255, 255, 166, 35);
         int fillColor37 = Color.argb(255, 255, 255, 255);
         int crestSilver4 = Color.argb(255, 175, 175, 175);
         int crestBronze4 = Color.argb(255, 215, 122, 32);
-        
+
         // Local Variables
         int crestColor4 = memberCount < 100f ? crestBronze4 : (memberCount < 1000f ? crestSilver4 : crestGold4);
-        
+
         // Resize to Target Frame
         canvas.save();
         RectF resizedFrame = CacheForGuildCrestSmall.resizedFrame;
         HabiticaIcons.resizingBehaviorApply(resizing, CacheForGuildCrestSmall.originalFrame, targetFrame, resizedFrame);
         canvas.translate(resizedFrame.left, resizedFrame.top);
         canvas.scale(resizedFrame.width() / 16f, resizedFrame.height() / 16f);
-        
+
         // Bezier
         RectF bezierRect = CacheForGuildCrestSmall.bezierRect;
         bezierRect.set(0f, 0f, 16f, 16f);
@@ -9646,14 +9645,14 @@ public class HabiticaIcons {
         bezierPath.cubicTo(7.65f, 16.05f, 8.35f, 16.07f, 8.9f, 15.81f);
         bezierPath.cubicTo(16.95f, 12.24f, 15.98f, 5.65f, 15.94f, 3.41f);
         bezierPath.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         bezierPath.setFillType(Path.FillType.EVEN_ODD);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(crestColor4);
         canvas.drawPath(bezierPath, paint);
-        
+
         // Bezier 2
         RectF bezier2Rect = CacheForGuildCrestSmall.bezier2Rect;
         bezier2Rect.set(4f, 3f, 12f, 11f);
@@ -9672,17 +9671,17 @@ public class HabiticaIcons {
         bezier2Path.cubicTo(8.95f, 6.43f, 9.71f, 5.66f, 9.71f, 4.71f);
         bezier2Path.cubicTo(9.71f, 3.77f, 8.95f, 3f, 8f, 3f);
         bezier2Path.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         bezier2Path.setFillType(Path.FillType.EVEN_ODD);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor37);
         canvas.drawPath(bezier2Path, paint);
-        
+
         canvas.restore();
     }
-    
+
     private static class CacheForTwoHandedIcon {
         private static final Paint paint = new Paint();
         private static final RectF originalFrame = new RectF(0f, 0f, 15f, 15f);
@@ -9690,25 +9689,25 @@ public class HabiticaIcons {
         private static final RectF bezierRect = new RectF();
         private static final Path bezierPath = new Path();
     }
-    
+
     public static void drawTwoHandedIcon(Canvas canvas) {
         HabiticaIcons.drawTwoHandedIcon(canvas, new RectF(0f, 0f, 15f, 15f), ResizingBehavior.AspectFit);
     }
-    
+
     public static void drawTwoHandedIcon(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
         // General Declarations
         Paint paint = CacheForTwoHandedIcon.paint;
-        
+
         // Local Colors
         int fillColor39 = Color.argb(255, 189, 168, 255);
-        
+
         // Resize to Target Frame
         canvas.save();
         RectF resizedFrame = CacheForTwoHandedIcon.resizedFrame;
         HabiticaIcons.resizingBehaviorApply(resizing, CacheForTwoHandedIcon.originalFrame, targetFrame, resizedFrame);
         canvas.translate(resizedFrame.left, resizedFrame.top);
         canvas.scale(resizedFrame.width() / 15f, resizedFrame.height() / 15f);
-        
+
         // Bezier
         RectF bezierRect = CacheForTwoHandedIcon.bezierRect;
         bezierRect.set(0f, 0f, 14.85f, 14.59f);
@@ -9790,14 +9789,14 @@ public class HabiticaIcons {
         bezierPath.lineTo(14.85f, 4.9f);
         bezierPath.cubicTo(14.85f, 4.13f, 14.22f, 3.5f, 13.45f, 3.5f);
         bezierPath.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         bezierPath.setFillType(Path.FillType.EVEN_ODD);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor39);
         canvas.drawPath(bezierPath, paint);
-        
+
         canvas.restore();
     }
 
@@ -9810,39 +9809,39 @@ public class HabiticaIcons {
         private static final RectF bezier2Rect = new RectF();
         private static final Path bezier2Path = new Path();
     }
-    
+
     public static void drawBuffIcon(Canvas canvas) {
         HabiticaIcons.drawBuffIcon(canvas, new RectF(0f, 0f, 15f, 15f), ResizingBehavior.AspectFit);
     }
-    
+
     public static void drawBuffIcon(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
         // General Declarations
         Paint paint = CacheForBuffIcon.paint;
-        
+
         // Local Colors
         int fillColor18 = Color.argb(255, 154, 98, 255);
         int fillColor85 = Color.argb(255, 237, 236, 238);
-        
+
         // Resize to Target Frame
         canvas.save();
         RectF resizedFrame = CacheForBuffIcon.resizedFrame;
         HabiticaIcons.resizingBehaviorApply(resizing, CacheForBuffIcon.originalFrame, targetFrame, resizedFrame);
         canvas.translate(resizedFrame.left, resizedFrame.top);
         canvas.scale(resizedFrame.width() / 15f, resizedFrame.height() / 15f);
-        
+
         // Rectangle
         RectF rectangleRect = CacheForBuffIcon.rectangleRect;
         rectangleRect.set(0f, 0f, 15f, 15f);
         Path rectanglePath = CacheForBuffIcon.rectanglePath;
         rectanglePath.reset();
         rectanglePath.addRoundRect(rectangleRect, 2f, 2f, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor85);
         canvas.drawPath(rectanglePath, paint);
-        
+
         // Bezier 2
         RectF bezier2Rect = CacheForBuffIcon.bezier2Rect;
         bezier2Rect.set(3.75f, 3f, 11.25f, 12f);
@@ -9869,17 +9868,17 @@ public class HabiticaIcons {
         bezier2Path.lineTo(6f, 12f);
         bezier2Path.lineTo(6f, 11.25f);
         bezier2Path.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         bezier2Path.setFillType(Path.FillType.EVEN_ODD);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor18);
         canvas.drawPath(bezier2Path, paint);
-        
+
         canvas.restore();
     }
-    
+
     private static class CacheForParticipantsIcon {
         private static final Paint paint = new Paint();
         private static final RectF originalFrame = new RectF(0f, 0f, 20f, 20f);
@@ -9891,27 +9890,27 @@ public class HabiticaIcons {
         private static final RectF bezier3Rect = new RectF();
         private static final Path bezier3Path = new Path();
     }
-    
+
     public static void drawParticipantsIcon(Canvas canvas) {
         HabiticaIcons.drawParticipantsIcon(canvas, new RectF(0f, 0f, 20f, 20f), ResizingBehavior.AspectFit);
     }
-    
+
     public static void drawParticipantsIcon(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
         // General Declarations
         Paint paint = CacheForParticipantsIcon.paint;
-        
+
         // Local Colors
         int fillColor104 = Color.argb(255, 249, 249, 249);
         int fillColor39 = Color.argb(255, 189, 168, 255);
         int fillColor25 = Color.argb(255, 225, 224, 227);
-        
+
         // Resize to Target Frame
         canvas.save();
         RectF resizedFrame = CacheForParticipantsIcon.resizedFrame;
         HabiticaIcons.resizingBehaviorApply(resizing, CacheForParticipantsIcon.originalFrame, targetFrame, resizedFrame);
         canvas.translate(resizedFrame.left, resizedFrame.top);
         canvas.scale(resizedFrame.width() / 20f, resizedFrame.height() / 20f);
-        
+
         // Bezier
         RectF bezierRect = CacheForParticipantsIcon.bezierRect;
         bezierRect.set(1f, 3f, 13f, 17f);
@@ -9933,14 +9932,14 @@ public class HabiticaIcons {
         bezierPath.lineTo(7f, 3f);
         bezierPath.lineTo(5f, 3f);
         bezierPath.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         bezierPath.setFillType(Path.FillType.EVEN_ODD);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor104);
         canvas.drawPath(bezierPath, paint);
-        
+
         // Bezier 2
         RectF bezier2Rect = CacheForParticipantsIcon.bezier2Rect;
         bezier2Rect.set(10f, 3f, 19f, 17f);
@@ -9962,14 +9961,14 @@ public class HabiticaIcons {
         bezier2Path.lineTo(13f, 3f);
         bezier2Path.lineTo(15f, 3f);
         bezier2Path.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         bezier2Path.setFillType(Path.FillType.EVEN_ODD);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor25);
         canvas.drawPath(bezier2Path, paint);
-        
+
         // Bezier 3
         RectF bezier3Rect = CacheForParticipantsIcon.bezier3Rect;
         bezier3Rect.set(0f, 2f, 20f, 18f);
@@ -10019,17 +10018,17 @@ public class HabiticaIcons {
         bezier3Path.cubicTo(20f, 13.58f, 18.57f, 11.5f, 16.51f, 10.56f);
         bezier3Path.lineTo(16.51f, 10.56f);
         bezier3Path.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         bezier3Path.setFillType(Path.FillType.EVEN_ODD);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor39);
         canvas.drawPath(bezier3Path, paint);
-        
+
         canvas.restore();
     }
-    
+
     private static class CacheForChatReplyIcon {
         private static final Paint paint = new Paint();
         private static final RectF originalFrame = new RectF(0f, 0f, 17f, 17f);
@@ -10039,31 +10038,31 @@ public class HabiticaIcons {
         private static final RectF bezierRect = new RectF();
         private static final Path bezierPath = new Path();
     }
-    
+
     public static void drawChatReplyIcon(Canvas canvas) {
         HabiticaIcons.drawChatReplyIcon(canvas, new RectF(0f, 0f, 17f, 17f), ResizingBehavior.AspectFit);
     }
-    
+
     public static void drawChatReplyIcon(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
         // General Declarations
         Paint paint = CacheForChatReplyIcon.paint;
-        
+
         // Local Colors
         int strokeColor15 = Color.argb(255, 195, 192, 199);
-        
+
         // Resize to Target Frame
         canvas.save();
         RectF resizedFrame = CacheForChatReplyIcon.resizedFrame;
         HabiticaIcons.resizingBehaviorApply(resizing, CacheForChatReplyIcon.originalFrame, targetFrame, resizedFrame);
         canvas.translate(resizedFrame.left, resizedFrame.top);
         canvas.scale(resizedFrame.width() / 17f, resizedFrame.height() / 17f);
-        
+
         // Group
         {
             RectF group = CacheForChatReplyIcon.group;
             group.set(-10f, -9f, 27f, 26f);
             canvas.save();
-            
+
             // Clip
             Path clipPath = CacheForChatReplyIcon.clipPath;
             clipPath.reset();
@@ -10082,7 +10081,7 @@ public class HabiticaIcons {
             clipPath.lineTo(6.54f, 3f);
             clipPath.close();
             canvas.clipPath(clipPath);
-            
+
             // Bezier
             RectF bezierRect = CacheForChatReplyIcon.bezierRect;
             bezierRect.set(2f, 3f, 15f, 14f);
@@ -10096,7 +10095,7 @@ public class HabiticaIcons {
             bezierPath.cubicTo(15.57f, 8.67f, 12.78f, 6.15f, 6.54f, 6.44f);
             bezierPath.lineTo(6.54f, 3f);
             bezierPath.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStrokeWidth(4f);
@@ -10107,13 +10106,13 @@ public class HabiticaIcons {
             paint.setColor(strokeColor15);
             canvas.drawPath(bezierPath, paint);
             canvas.restore();
-            
+
             canvas.restore();
         }
-        
+
         canvas.restore();
     }
-    
+
     private static class CacheForChatCopyIcon {
         private static final Paint paint = new Paint();
         private static final RectF originalFrame = new RectF(0f, 0f, 17f, 17f);
@@ -10121,25 +10120,25 @@ public class HabiticaIcons {
         private static final RectF bezierRect = new RectF();
         private static final Path bezierPath = new Path();
     }
-    
+
     public static void drawChatCopyIcon(Canvas canvas) {
         HabiticaIcons.drawChatCopyIcon(canvas, new RectF(0f, 0f, 17f, 17f), ResizingBehavior.AspectFit);
     }
-    
+
     public static void drawChatCopyIcon(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
         // General Declarations
         Paint paint = CacheForChatCopyIcon.paint;
-        
+
         // Local Colors
         int fillColor35 = Color.argb(255, 195, 192, 199);
-        
+
         // Resize to Target Frame
         canvas.save();
         RectF resizedFrame = CacheForChatCopyIcon.resizedFrame;
         HabiticaIcons.resizingBehaviorApply(resizing, CacheForChatCopyIcon.originalFrame, targetFrame, resizedFrame);
         canvas.translate(resizedFrame.left, resizedFrame.top);
         canvas.scale(resizedFrame.width() / 17f, resizedFrame.height() / 17f);
-        
+
         // Bezier
         RectF bezierRect = CacheForChatCopyIcon.bezierRect;
         bezierRect.set(0f, 1f, 16f, 17f);
@@ -10173,17 +10172,17 @@ public class HabiticaIcons {
         bezierPath.cubicTo(16f, 3.9f, 15.11f, 3f, 14f, 3f);
         bezierPath.lineTo(14f, 3f);
         bezierPath.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         bezierPath.setFillType(Path.FillType.EVEN_ODD);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor35);
         canvas.drawPath(bezierPath, paint);
-        
+
         canvas.restore();
     }
-    
+
     private static class CacheForChatReportIcon {
         private static final Paint paint = new Paint();
         private static final RectF originalFrame = new RectF(0f, 0f, 17f, 18f);
@@ -10191,25 +10190,25 @@ public class HabiticaIcons {
         private static final RectF bezierRect = new RectF();
         private static final Path bezierPath = new Path();
     }
-    
+
     public static void drawChatReportIcon(Canvas canvas) {
         HabiticaIcons.drawChatReportIcon(canvas, new RectF(0f, 0f, 17f, 18f), ResizingBehavior.AspectFit);
     }
-    
+
     public static void drawChatReportIcon(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
         // General Declarations
         Paint paint = CacheForChatReportIcon.paint;
-        
+
         // Local Colors
         int fillColor35 = Color.argb(255, 195, 192, 199);
-        
+
         // Resize to Target Frame
         canvas.save();
         RectF resizedFrame = CacheForChatReportIcon.resizedFrame;
         HabiticaIcons.resizingBehaviorApply(resizing, CacheForChatReportIcon.originalFrame, targetFrame, resizedFrame);
         canvas.translate(resizedFrame.left, resizedFrame.top);
         canvas.scale(resizedFrame.width() / 17f, resizedFrame.height() / 18f);
-        
+
         // Bezier
         RectF bezierRect = CacheForChatReportIcon.bezierRect;
         bezierRect.set(0f, 1f, 16f, 17f);
@@ -10250,17 +10249,17 @@ public class HabiticaIcons {
         bezierPath.cubicTo(16f, 5.9f, 15.11f, 5f, 14f, 5f);
         bezierPath.lineTo(14f, 5f);
         bezierPath.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         bezierPath.setFillType(Path.FillType.EVEN_ODD);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor35);
         canvas.drawPath(bezierPath, paint);
-        
+
         canvas.restore();
     }
-    
+
     private static class CacheForChatDeleteIcon {
         private static final Paint paint = new Paint();
         private static final RectF originalFrame = new RectF(0f, 0f, 17f, 17f);
@@ -10268,25 +10267,25 @@ public class HabiticaIcons {
         private static final RectF bezierRect = new RectF();
         private static final Path bezierPath = new Path();
     }
-    
+
     public static void drawChatDeleteIcon(Canvas canvas) {
         HabiticaIcons.drawChatDeleteIcon(canvas, new RectF(0f, 0f, 17f, 17f), ResizingBehavior.AspectFit);
     }
-    
+
     public static void drawChatDeleteIcon(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
         // General Declarations
         Paint paint = CacheForChatDeleteIcon.paint;
-        
+
         // Local Colors
         int fillColor35 = Color.argb(255, 195, 192, 199);
-        
+
         // Resize to Target Frame
         canvas.save();
         RectF resizedFrame = CacheForChatDeleteIcon.resizedFrame;
         HabiticaIcons.resizingBehaviorApply(resizing, CacheForChatDeleteIcon.originalFrame, targetFrame, resizedFrame);
         canvas.translate(resizedFrame.left, resizedFrame.top);
         canvas.scale(resizedFrame.width() / 17f, resizedFrame.height() / 17f);
-        
+
         // Bezier
         RectF bezierRect = CacheForChatDeleteIcon.bezierRect;
         bezierRect.set(1f, 1f, 15f, 17f);
@@ -10330,17 +10329,17 @@ public class HabiticaIcons {
         bezierPath.lineTo(6f, 7f);
         bezierPath.lineTo(6f, 13f);
         bezierPath.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         bezierPath.setFillType(Path.FillType.EVEN_ODD);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor35);
         canvas.drawPath(bezierPath, paint);
-        
+
         canvas.restore();
     }
-    
+
     private static class CacheForAlertIcon {
         private static final Paint paint = new Paint();
         private static final RectF originalFrame = new RectF(0f, 0f, 16f, 16f);
@@ -10348,25 +10347,25 @@ public class HabiticaIcons {
         private static final RectF bezierRect = new RectF();
         private static final Path bezierPath = new Path();
     }
-    
+
     public static void drawAlertIcon(Canvas canvas) {
         HabiticaIcons.drawAlertIcon(canvas, new RectF(0f, 0f, 16f, 16f), ResizingBehavior.AspectFit);
     }
-    
+
     public static void drawAlertIcon(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
         // General Declarations
         Paint paint = CacheForAlertIcon.paint;
-        
+
         // Local Colors
         int fillColor105 = Color.argb(255, 255, 97, 101);
-        
+
         // Resize to Target Frame
         canvas.save();
         RectF resizedFrame = CacheForAlertIcon.resizedFrame;
         HabiticaIcons.resizingBehaviorApply(resizing, CacheForAlertIcon.originalFrame, targetFrame, resizedFrame);
         canvas.translate(resizedFrame.left, resizedFrame.top);
         canvas.scale(resizedFrame.width() / 16f, resizedFrame.height() / 16f);
-        
+
         // Bezier
         RectF bezierRect = CacheForAlertIcon.bezierRect;
         bezierRect.set(0.01f, 0.05f, 16.01f, 16.05f);
@@ -10402,14 +10401,14 @@ public class HabiticaIcons {
         bezierPath.lineTo(7.01f, 12.05f);
         bezierPath.lineTo(7.01f, 10.05f);
         bezierPath.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         bezierPath.setFillType(Path.FillType.EVEN_ODD);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor105);
         canvas.drawPath(bezierPath, paint);
-        
+
         canvas.restore();
     }
 
@@ -10446,15 +10445,15 @@ public class HabiticaIcons {
         private static final RectF rectangle11Rect = new RectF();
         private static final Path rectangle11Path = new Path();
     }
-    
+
     public static void drawStats(Canvas canvas) {
         HabiticaIcons.drawStats(canvas, new RectF(0f, 0f, 30f, 22f), ResizingBehavior.AspectFit);
     }
-    
+
     public static void drawStats(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
         // General Declarations
         Paint paint = CacheForStats.paint;
-        
+
         // Local Colors
         int fillColor35 = Color.argb(255, 195, 192, 199);
         int fillColor25 = Color.argb(255, 225, 224, 227);
@@ -10463,14 +10462,14 @@ public class HabiticaIcons {
         int strokeColor21 = Color.argb(255, 135, 129, 144);
         int fillColor106 = Color.argb(255, 216, 216, 216);
         int fillColor40 = Color.argb(255, 165, 161, 172);
-        
+
         // Resize to Target Frame
         canvas.save();
         RectF resizedFrame = CacheForStats.resizedFrame;
         HabiticaIcons.resizingBehaviorApply(resizing, CacheForStats.originalFrame, targetFrame, resizedFrame);
         canvas.translate(resizedFrame.left, resizedFrame.top);
         canvas.scale(resizedFrame.width() / 30f, resizedFrame.height() / 22f);
-        
+
         // Bezier
         RectF bezierRect = CacheForStats.bezierRect;
         bezierRect.set(1.75f, 1.75f, 28.25f, 20.25f);
@@ -10510,20 +10509,20 @@ public class HabiticaIcons {
         bezierPath.lineTo(11.25f, 14.25f);
         bezierPath.lineTo(11.25f, 19f);
         bezierPath.close();
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         bezierPath.setFillType(Path.FillType.EVEN_ODD);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor106);
         canvas.drawPath(bezierPath, paint);
-        
+
         // Group
         {
             RectF group = CacheForStats.group;
             group.set(-22f, -22f, 52f, 44f);
             canvas.save();
-            
+
             // Clip
             Path clipPath = CacheForStats.clipPath;
             clipPath.reset();
@@ -10556,7 +10555,7 @@ public class HabiticaIcons {
             clipPath.lineTo(10f, 19f);
             clipPath.close();
             canvas.clipPath(clipPath);
-            
+
             // Bezier 2
             RectF bezier2Rect = CacheForStats.bezier2Rect;
             bezier2Rect.set(3f, 3f, 27f, 19f);
@@ -10584,7 +10583,7 @@ public class HabiticaIcons {
             bezier2Path.lineTo(10f, 13f);
             bezier2Path.lineTo(10f, 19f);
             bezier2Path.close();
-            
+
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStrokeWidth(5f);
@@ -10594,153 +10593,153 @@ public class HabiticaIcons {
             paint.setColor(strokeColor21);
             canvas.drawPath(bezier2Path, paint);
             canvas.restore();
-            
+
             canvas.restore();
         }
-        
+
         // Rectangle
         RectF rectangleRect = CacheForStats.rectangleRect;
         rectangleRect.set(3f, 6f, 6f, 16f);
         Path rectanglePath = CacheForStats.rectanglePath;
         rectanglePath.reset();
         rectanglePath.addRect(rectangleRect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor40);
         canvas.drawPath(rectanglePath, paint);
-        
+
         // Rectangle 2
         RectF rectangle2Rect = CacheForStats.rectangle2Rect;
         rectangle2Rect.set(24f, 6f, 27f, 16f);
         Path rectangle2Path = CacheForStats.rectangle2Path;
         rectangle2Path.reset();
         rectangle2Path.addRect(rectangle2Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor40);
         canvas.drawPath(rectangle2Path, paint);
-        
+
         // Rectangle 3
         RectF rectangle3Rect = CacheForStats.rectangle3Rect;
         rectangle3Rect.set(10f, 9f, 20f, 13f);
         Path rectangle3Path = CacheForStats.rectangle3Path;
         rectangle3Path.reset();
         rectangle3Path.addRect(rectangle3Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor107);
         canvas.drawPath(rectangle3Path, paint);
-        
+
         // Rectangle 4
         RectF rectangle4Rect = CacheForStats.rectangle4Rect;
         rectangle4Rect.set(12f, 9f, 14f, 13f);
         Path rectangle4Path = CacheForStats.rectangle4Path;
         rectangle4Path.reset();
         rectangle4Path.addRect(rectangle4Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor89);
         canvas.drawPath(rectangle4Path, paint);
-        
+
         // Rectangle 5
         RectF rectangle5Rect = CacheForStats.rectangle5Rect;
         rectangle5Rect.set(16f, 9f, 18f, 13f);
         Path rectangle5Path = CacheForStats.rectangle5Path;
         rectangle5Path.reset();
         rectangle5Path.addRect(rectangle5Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor89);
         canvas.drawPath(rectangle5Path, paint);
-        
+
         // Rectangle 6
         RectF rectangle6Rect = CacheForStats.rectangle6Rect;
         rectangle6Rect.set(6f, 3f, 10f, 19f);
         Path rectangle6Path = CacheForStats.rectangle6Path;
         rectangle6Path.reset();
         rectangle6Path.addRect(rectangle6Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor35);
         canvas.drawPath(rectangle6Path, paint);
-        
+
         // Rectangle 7
         RectF rectangle7Rect = CacheForStats.rectangle7Rect;
         rectangle7Rect.set(20f, 3f, 24f, 19f);
         Path rectangle7Path = CacheForStats.rectangle7Path;
         rectangle7Path.reset();
         rectangle7Path.addRect(rectangle7Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor35);
         canvas.drawPath(rectangle7Path, paint);
-        
+
         // Rectangle 8
         RectF rectangle8Rect = CacheForStats.rectangle8Rect;
         rectangle8Rect.set(6f, 3f, 10f, 11f);
         Path rectangle8Path = CacheForStats.rectangle8Path;
         rectangle8Path.reset();
         rectangle8Path.addRect(rectangle8Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor25);
         canvas.drawPath(rectangle8Path, paint);
-        
+
         // Rectangle 9
         RectF rectangle9Rect = CacheForStats.rectangle9Rect;
         rectangle9Rect.set(3f, 6f, 6f, 11f);
         Path rectangle9Path = CacheForStats.rectangle9Path;
         rectangle9Path.reset();
         rectangle9Path.addRect(rectangle9Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor35);
         canvas.drawPath(rectangle9Path, paint);
-        
+
         // Rectangle 10
         RectF rectangle10Rect = CacheForStats.rectangle10Rect;
         rectangle10Rect.set(24f, 6f, 27f, 11f);
         Path rectangle10Path = CacheForStats.rectangle10Path;
         rectangle10Path.reset();
         rectangle10Path.addRect(rectangle10Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor35);
         canvas.drawPath(rectangle10Path, paint);
-        
+
         // Rectangle 11
         RectF rectangle11Rect = CacheForStats.rectangle11Rect;
         rectangle11Rect.set(20f, 3f, 24f, 11f);
         Path rectangle11Path = CacheForStats.rectangle11Path;
         rectangle11Path.reset();
         rectangle11Path.addRect(rectangle11Rect, Path.Direction.CW);
-        
+
         paint.reset();
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(fillColor25);
         canvas.drawPath(rectangle11Path, paint);
-        
+
         canvas.restore();
     }
 
@@ -10750,16 +10749,16 @@ public class HabiticaIcons {
             result.set(rect);
             return;
         }
-        
+
         if (behavior == ResizingBehavior.Stretch) {
             result.set(target);
             return;
         }
-        
+
         float xRatio = Math.abs(target.width() / rect.width());
         float yRatio = Math.abs(target.height() / rect.height());
         float scale = 0f;
-        
+
         switch (behavior) {
             case AspectFit: {
                 scale = Math.min(xRatio, yRatio);
@@ -10774,16 +10773,16 @@ public class HabiticaIcons {
                 break;
             }
         }
-        
+
         float newWidth = Math.abs(rect.width() * scale);
         float newHeight = Math.abs(rect.height() * scale);
         result.set(target.centerX() - newWidth / 2,
-            target.centerY() - newHeight / 2,
-            target.centerX() + newWidth / 2,
-            target.centerY() + newHeight / 2);
+                target.centerY() - newHeight / 2,
+                target.centerX() + newWidth / 2,
+                target.centerY() + newHeight / 2);
     }
-    
-    
+
+
 }
 
 class PaintCodeColor extends Color {
@@ -10796,46 +10795,47 @@ class PaintCodeColor extends Color {
     public static float hue(int color) {
         return ColorToHSV(color)[0];
     }
-    
+
 
     public static float brightness(int color) {
         return ColorToHSV(color)[2];
     }
-    
+
     public static int colorByChangingAlpha(int color, int newAlpha) {
         return argb(newAlpha, red(color), green(color), blue(color));
     }
 }
+
 class PaintCodeShadow {
     int color;
     float dx, dy;
     private float radius;
     private BlurMaskFilter blurMaskFilter;
-    
+
     PaintCodeShadow() {
-        
+
     }
-    
+
     PaintCodeShadow get(int color) {
         this.color = color;
         this.dx = (float) 0.0;
         this.dy = (float) 1.0;
-        
+
         if (this.radius != (float) 1.0) {
             this.blurMaskFilter = null;
             this.radius = (float) 1.0;
         }
-        
+
         return this;
     }
-    
+
     void setBlurOfPaint(Paint paint) {
         if (this.radius <= 0)
             return;
-        
+
         if (this.blurMaskFilter == null)
             this.blurMaskFilter = new BlurMaskFilter(this.radius, BlurMaskFilter.Blur.NORMAL);
-        
+
         paint.setMaskFilter(this.blurMaskFilter);
     }
 }
@@ -10854,11 +10854,11 @@ class PaintCodeBitmap {
         }
         return this;
     }
-    
+
     BitmapShader getShader() {
         return this.shader;
     }
-    
+
     RectF getBounds() {
         return this.bounds;
     }
@@ -10868,7 +10868,7 @@ class PaintCodeBitmap {
 class PaintCodeDashPathEffect {
     private DashPathEffect effect;
     private float dash, gap, phase;
-    
+
     DashPathEffect get(float dash) {
         if (this.dash != dash || this.gap != (float) 20.0 || this.phase != (float) 0.0) {
             this.dash = dash;
@@ -10887,7 +10887,7 @@ class PaintCodeStaticLayout {
     private Layout.Alignment alignment;
     private CharSequence source;
     private TextPaint paint;
-    
+
     StaticLayout get(int width, CharSequence source, TextPaint paint) {
         if (this.layout == null || this.width != width || this.alignment != Layout.Alignment.ALIGN_CENTER || !this.source.equals(source) || !this.paint.equals(paint)) {
             this.width = width;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIconsHelper.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIconsHelper.java
index 1fc350352..25447c4fb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIconsHelper.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIconsHelper.java
@@ -25,6 +25,7 @@ public class HabiticaIconsHelper {
     }
 
     private static Bitmap imageOfExperience = null;
+
     public static Bitmap imageOfExperience() {
         if (imageOfExperience != null)
             return imageOfExperience;
@@ -39,6 +40,7 @@ public class HabiticaIconsHelper {
     }
 
     private static Bitmap imageOfMagic = null;
+
     public static Bitmap imageOfMagic() {
         if (imageOfMagic != null)
             return imageOfMagic;
@@ -53,6 +55,7 @@ public class HabiticaIconsHelper {
     }
 
     private static Bitmap imageOfMagicLarge = null;
+
     public static Bitmap imageOfMagicLarge() {
         if (imageOfMagicLarge != null)
             return imageOfMagicLarge;
@@ -66,6 +69,7 @@ public class HabiticaIconsHelper {
     }
 
     private static Bitmap imageOfGold = null;
+
     public static Bitmap imageOfGold() {
         if (imageOfGold != null)
             return imageOfGold;
@@ -80,6 +84,7 @@ public class HabiticaIconsHelper {
     }
 
     private static Bitmap imageOfGem = null;
+
     public static Bitmap imageOfGem() {
         if (imageOfGem != null)
             return imageOfGem;
@@ -94,6 +99,7 @@ public class HabiticaIconsHelper {
     }
 
     private static Bitmap imageOfHourglass = null;
+
     public static Bitmap imageOfHourglass() {
         if (imageOfHourglass != null)
             return imageOfHourglass;
@@ -108,6 +114,7 @@ public class HabiticaIconsHelper {
     }
 
     private static Bitmap imageOfHourglassLarge = null;
+
     public static Bitmap imageOfHourglassLarge() {
         if (imageOfHourglassLarge != null)
             return imageOfHourglassLarge;
@@ -121,6 +128,7 @@ public class HabiticaIconsHelper {
     }
 
     private static Bitmap imageOfExperienceReward = null;
+
     public static Bitmap imageOfExperienceReward() {
         if (imageOfExperienceReward != null)
             return imageOfExperienceReward;
@@ -134,6 +142,7 @@ public class HabiticaIconsHelper {
     }
 
     private static Bitmap imageOfGoldReward = null;
+
     public static Bitmap imageOfGoldReward() {
         if (imageOfGoldReward != null)
             return imageOfGoldReward;
@@ -147,6 +156,7 @@ public class HabiticaIconsHelper {
     }
 
     private static Bitmap imageOfHeartDarkBg = null;
+
     public static Bitmap imageOfHeartDarkBg() {
         if (imageOfHeartDarkBg != null)
             return imageOfHeartDarkBg;
@@ -161,6 +171,7 @@ public class HabiticaIconsHelper {
     }
 
     private static Bitmap imageOfHeartLightBg = null;
+
     public static Bitmap imageOfHeartLightBg() {
         if (imageOfHeartLightBg != null)
             return imageOfHeartLightBg;
@@ -175,6 +186,7 @@ public class HabiticaIconsHelper {
     }
 
     private static Bitmap imageOfHeartLarge = null;
+
     public static Bitmap imageOfHeartLarge() {
         if (imageOfHeartLarge != null)
             return imageOfHeartLarge;
@@ -188,6 +200,7 @@ public class HabiticaIconsHelper {
     }
 
     private static Bitmap imageOfStarSmall = null;
+
     public static Bitmap imageOfStarSmall() {
         if (imageOfStarSmall != null)
             return imageOfStarSmall;
@@ -202,6 +215,7 @@ public class HabiticaIconsHelper {
     }
 
     private static Bitmap imageOfStarLarge = null;
+
     public static Bitmap imageOfStarLarge() {
         if (imageOfStarLarge != null)
             return imageOfStarLarge;
@@ -216,6 +230,7 @@ public class HabiticaIconsHelper {
     }
 
     private static Bitmap imageOfStarMedium = null;
+
     public static Bitmap imageOfStarMedium() {
         if (imageOfStarMedium != null)
             return imageOfStarMedium;
@@ -230,6 +245,7 @@ public class HabiticaIconsHelper {
     }
 
     private static Bitmap imageOfPinnedItem = null;
+
     public static Bitmap imageOfPinnedItem() {
         if (imageOfPinnedItem != null)
             return imageOfPinnedItem;
@@ -244,6 +260,7 @@ public class HabiticaIconsHelper {
     }
 
     private static Bitmap imageOfPinItem = null;
+
     public static Bitmap imageOfPinItem() {
         if (imageOfPinItem != null)
             return imageOfPinItem;
@@ -258,6 +275,7 @@ public class HabiticaIconsHelper {
     }
 
     private static Bitmap imageOfUnpinItem = null;
+
     public static Bitmap imageOfUnpinItem() {
         if (imageOfUnpinItem != null)
             return imageOfUnpinItem;
@@ -334,6 +352,7 @@ public class HabiticaIconsHelper {
     }
 
     private static Bitmap imageOfItemIndicatorLimited = null;
+
     public static Bitmap imageOfItemIndicatorLimited() {
         if (imageOfItemIndicatorLimited != null)
             return imageOfItemIndicatorLimited;
@@ -348,6 +367,7 @@ public class HabiticaIconsHelper {
     }
 
     private static Bitmap imageOfGem_36 = null;
+
     public static Bitmap imageOfGem_36() {
         if (imageOfGem_36 != null)
             return imageOfGem_36;
@@ -362,6 +382,7 @@ public class HabiticaIconsHelper {
     }
 
     private static Bitmap imageOfWarriorLightBg = null;
+
     public static Bitmap imageOfWarriorLightBg() {
         if (imageOfWarriorLightBg != null)
             return imageOfWarriorLightBg;
@@ -376,6 +397,7 @@ public class HabiticaIconsHelper {
     }
 
     private static Bitmap imageOfRogueLightBg = null;
+
     public static Bitmap imageOfRogueLightBg() {
         if (imageOfRogueLightBg != null)
             return imageOfRogueLightBg;
@@ -390,6 +412,7 @@ public class HabiticaIconsHelper {
     }
 
     private static Bitmap imageOfHealerLightBg = null;
+
     public static Bitmap imageOfHealerLightBg() {
         if (imageOfHealerLightBg != null)
             return imageOfHealerLightBg;
@@ -404,6 +427,7 @@ public class HabiticaIconsHelper {
     }
 
     private static Bitmap imageOfMageLightBg = null;
+
     public static Bitmap imageOfMageLightBg() {
         if (imageOfMageLightBg != null)
             return imageOfMageLightBg;
@@ -418,6 +442,7 @@ public class HabiticaIconsHelper {
     }
 
     private static Bitmap imageOfHourglassShop = null;
+
     public static Bitmap imageOfHourglassShop() {
         if (imageOfHourglassShop != null)
             return imageOfHourglassShop;
@@ -431,6 +456,7 @@ public class HabiticaIconsHelper {
     }
 
     private static Bitmap imageOfAttributeSparklesLeft = null;
+
     public static Bitmap imageOfAttributeSparklesLeft() {
         if (imageOfAttributeSparklesLeft != null)
             return imageOfAttributeSparklesLeft;
@@ -444,6 +470,7 @@ public class HabiticaIconsHelper {
     }
 
     private static Bitmap imageOfAttributeSparklesRight = null;
+
     public static Bitmap imageOfAttributeSparklesRight() {
         if (imageOfAttributeSparklesRight != null)
             return imageOfAttributeSparklesRight;
@@ -457,6 +484,7 @@ public class HabiticaIconsHelper {
     }
 
     private static Bitmap imageOfAttributeAllocateButton = null;
+
     public static Bitmap imageOfAttributeAllocateButton() {
         if (imageOfAttributeAllocateButton != null)
             return imageOfAttributeAllocateButton;
@@ -470,6 +498,7 @@ public class HabiticaIconsHelper {
     }
 
     private static Bitmap imageOfInfoIcon = null;
+
     public static Bitmap imageOfInfoIcon(@ColorInt int iconColor) {
         if (imageOfInfoIcon != null)
             return imageOfInfoIcon;
@@ -494,6 +523,7 @@ public class HabiticaIconsHelper {
     }
 
     private static Bitmap imageOfDamage = null;
+
     public static Bitmap imageOfDamage() {
         if (imageOfDamage != null)
             return imageOfDamage;
@@ -518,6 +548,7 @@ public class HabiticaIconsHelper {
     }
 
     private static Bitmap imageOfRageStrikeInactive = null;
+
     public static Bitmap imageOfRageStrikeInactive() {
         if (imageOfRageStrikeInactive != null)
             return imageOfRageStrikeInactive;
@@ -540,6 +571,7 @@ public class HabiticaIconsHelper {
     }
 
     private static Bitmap imageOfRage = null;
+
     public static Bitmap imageOfRage() {
         if (imageOfRage != null)
             return imageOfRage;
@@ -566,6 +598,7 @@ public class HabiticaIconsHelper {
     }
 
     private static Bitmap imageOfParticipantsIcon = null;
+
     public static Bitmap imageOfParticipantsIcon() {
         if (imageOfParticipantsIcon != null)
             return imageOfParticipantsIcon;
@@ -580,6 +613,7 @@ public class HabiticaIconsHelper {
     }
 
     private static Bitmap imageOfChatReplyIcon = null;
+
     public static Bitmap imageOfChatReplyIcon() {
         if (imageOfChatReplyIcon != null)
             return imageOfChatReplyIcon;
@@ -594,6 +628,7 @@ public class HabiticaIconsHelper {
     }
 
     private static Bitmap imageOfChatCopyIcon = null;
+
     public static Bitmap imageOfChatCopyIcon() {
         if (imageOfChatCopyIcon != null)
             return imageOfChatCopyIcon;
@@ -608,6 +643,7 @@ public class HabiticaIconsHelper {
     }
 
     private static Bitmap imageOfChatReportIcon = null;
+
     public static Bitmap imageOfChatReportIcon() {
         if (imageOfChatReportIcon != null)
             return imageOfChatReportIcon;
@@ -622,6 +658,7 @@ public class HabiticaIconsHelper {
     }
 
     private static Bitmap imageOfChatDeleteIcon = null;
+
     public static Bitmap imageOfChatDeleteIcon() {
         if (imageOfChatDeleteIcon != null)
             return imageOfChatDeleteIcon;
@@ -636,6 +673,7 @@ public class HabiticaIconsHelper {
     }
 
     private static Bitmap imageOfTwoHandedIcon = null;
+
     public static Bitmap imageOfTwoHandedIcon() {
         if (imageOfTwoHandedIcon != null)
             return imageOfTwoHandedIcon;
@@ -659,6 +697,7 @@ public class HabiticaIconsHelper {
     }
 
     private static Bitmap imageOfAlertIcon = null;
+
     public static Bitmap imageOfAlertIcon() {
         if (imageOfAlertIcon != null)
             return imageOfAlertIcon;
@@ -673,6 +712,7 @@ public class HabiticaIconsHelper {
     }
 
     private static Bitmap imageOfBuffIcon = null;
+
     public static Bitmap imageOfBuffIcon() {
         if (imageOfBuffIcon != null)
             return imageOfBuffIcon;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaListPreference.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaListPreference.kt
index f507f6448..0bb0719f9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaListPreference.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaListPreference.kt
@@ -8,7 +8,6 @@ import androidx.preference.ListPreference
 import com.habitrpg.android.habitica.R
 import com.habitrpg.common.habitica.extensions.setScaledPadding
 import kotlin.math.max
-import kotlin.math.min
 
 class HabiticaListPreference : ListPreference {
     constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int) :
@@ -24,13 +23,15 @@ class HabiticaListPreference : ListPreference {
     override fun onClick() {
         val subtitleText = TextView(context)
         subtitleText.setText(R.string.cds_subtitle)
-        val builder = AlertDialog.Builder(context).setSingleChoiceItems(entries, getValueIndex() + 1) { dialog, index ->
-            val actualIndex = max(0, index - 1)
-            setValueIndex(actualIndex)
-            dialog.dismiss()
-        }
-            .setNegativeButton(R.string.cancel) { dialog, _ -> dialog.dismiss() }
-            .setTitle(title)
+        val builder =
+            AlertDialog.Builder(context)
+                .setSingleChoiceItems(entries, getValueIndex() + 1) { dialog, index ->
+                    val actualIndex = max(0, index - 1)
+                    setValueIndex(actualIndex)
+                    dialog.dismiss()
+                }
+                .setNegativeButton(R.string.cancel) { dialog, _ -> dialog.dismiss() }
+                .setTitle(title)
 
         val dialog = builder.create()
         subtitleText.setScaledPadding(context, 24, 0, 24, 8)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaSnackbar.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaSnackbar.kt
index b3b0b6a52..c9b2b165e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaSnackbar.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaSnackbar.kt
@@ -18,367 +18,405 @@ import com.plattysoft.leonids.ParticleSystem
 
 class HabiticaSnackbar
 /**
- * Constructor for the transient bottom bar.
- *
- * @param parent The parent for this transient bottom bar.
- * @param content The content view for this transient bottom bar.
- * @param callback The content view callback for this transient bottom bar.
- */
-private constructor(parent: ViewGroup, content: View, callback: ContentViewCallback) :
+     * Constructor for the transient bottom bar.
+     *
+     * @param parent The parent for this transient bottom bar.
+     * @param content The content view for this transient bottom bar.
+     * @param callback The content view callback for this transient bottom bar.
+     */
+    private constructor(parent: ViewGroup, content: View, callback: ContentViewCallback) :
     BaseTransientBottomBar<HabiticaSnackbar>(parent, content, callback) {
         val binding: SnackbarViewBinding = SnackbarViewBinding.bind(content)
 
-    fun setTitle(title: CharSequence?): HabiticaSnackbar {
-        binding.snackbarTitle.text = title
-        binding.snackbarTitle.visibility = if (title != null) View.VISIBLE else View.GONE
-        return this
-    }
-
-    fun setText(text: CharSequence?): HabiticaSnackbar {
-        binding.snackbarText.text = text
-        binding.snackbarText.visibility = if (text != null) View.VISIBLE else View.GONE
-        return this
-    }
-
-    fun setTitleColor(color: Int): HabiticaSnackbar {
-        binding.snackbarTitle.setTextColor(color)
-        return this
-    }
-
-    fun setTextColor(color: Int): HabiticaSnackbar {
-        binding.snackbarText.setTextColor(color)
-        return this
-    }
-
-    fun setRightDiff(icon: Drawable?, textColor: Int, text: String?): HabiticaSnackbar {
-        if (icon == null) {
+        fun setTitle(title: CharSequence?): HabiticaSnackbar {
+            binding.snackbarTitle.text = title
+            binding.snackbarTitle.visibility = if (title != null) View.VISIBLE else View.GONE
             return this
         }
-        binding.rightView.visibility = View.VISIBLE
-        binding.rightIconView.setImageDrawable(icon)
-        binding.rightTextView.setTextColor(textColor)
-        binding.rightTextView.text = text
-        return this
-    }
 
-    fun setLeftIcon(image: Drawable?): HabiticaSnackbar {
-        binding.leftImageView.setImageDrawable(image)
-        binding.leftImageView.visibility = if (image != null) View.VISIBLE else View.GONE
-        return this
-    }
-
-    fun setBackgroundColor(@ColorInt color: Int): HabiticaSnackbar {
-        view.setBackgroundColor(color)
-        return this
-    }
-
-    fun setBackgroundResource(resourceId: Int): HabiticaSnackbar {
-        binding.snackbarView.setBackgroundResource(resourceId)
-        view.setBackgroundColor(ContextCompat.getColor(context, R.color.transparent))
-        return this
-    }
-
-    private fun setSpecialView(specialView: View?): HabiticaSnackbar {
-        if (specialView != null) {
-            binding.contentContainer.addView(specialView)
-        }
-        return this
-    }
-
-    private class ContentViewCallback(private val content: View) :
-        com.google.android.material.snackbar.ContentViewCallback {
-
-        @Suppress("SameParameterValue")
-        override fun animateContentIn(delay: Int, duration: Int) {
-            content.scaleY = 0f
-            content.scaleX = 0f
-            ViewCompat.animate(content).scaleY(1f).setDuration(duration.toLong()).startDelay =
-                delay.toLong()
-            ViewCompat.animate(content).scaleX(1f).setDuration(duration.toLong()).startDelay =
-                delay.toLong()
-            ViewCompat.animate(content).alpha(1f).setDuration(duration.toLong()).startDelay =
-                delay.toLong()
+        fun setText(text: CharSequence?): HabiticaSnackbar {
+            binding.snackbarText.text = text
+            binding.snackbarText.visibility = if (text != null) View.VISIBLE else View.GONE
+            return this
         }
 
-        override fun animateContentOut(delay: Int, duration: Int) {
-            content.scaleY = 1f
-            content.scaleX = 1f
-            ViewCompat.animate(content).scaleY(0f).setDuration(duration.toLong()).startDelay =
-                delay.toLong()
-            ViewCompat.animate(content).scaleX(0f).setDuration(duration.toLong()).startDelay =
-                delay.toLong()
-            ViewCompat.animate(content).alpha(0f).setDuration(duration.toLong()).startDelay =
-                delay.toLong()
-        }
-    }
-
-    enum class SnackbarDisplayType {
-        NORMAL, FAILURE, FAILURE_BLUE, DROP, SUCCESS, BLUE, BLACK, SUBSCRIBER_BENEFIT
-    }
-
-    companion object {
-
-        const val MIN_LEVEL_FOR_SKILLS = 11
-
-        private fun make(parent: ViewGroup, duration: Int): HabiticaSnackbar {
-            val inflater = LayoutInflater.from(parent.context)
-            val content = inflater.inflate(R.layout.snackbar_view, parent, false)
-            val viewCallback = ContentViewCallback(content)
-            val customSnackbar = HabiticaSnackbar(parent, content, viewCallback)
-            customSnackbar.duration = duration
-            return customSnackbar
+        fun setTitleColor(color: Int): HabiticaSnackbar {
+            binding.snackbarTitle.setTextColor(color)
+            return this
         }
 
-        fun showSnackbar(
-            container: ViewGroup,
-            content: CharSequence?,
-            displayType: SnackbarDisplayType,
-            isCelebratory: Boolean = false,
-            isSubscriberBenefit: Boolean = false,
-            duration: Int = Snackbar.LENGTH_LONG
-        ) {
-            showSnackbar(
-                container,
-                null,
-                null,
-                content,
-                null,
-                null,
-                0,
-                null,
-                displayType,
-                isCelebratory,
-                isSubscriberBenefit,
-                duration
-            )
+        fun setTextColor(color: Int): HabiticaSnackbar {
+            binding.snackbarText.setTextColor(color)
+            return this
         }
 
-        fun showSnackbar(
-            container: ViewGroup,
-            leftImage: Drawable,
-            title: CharSequence?,
-            content: CharSequence?,
-            displayType: SnackbarDisplayType,
-            isCelebratory: Boolean = false,
-            isSubscriberBenefit: Boolean = false,
-            duration: Int = Snackbar.LENGTH_LONG
-        ) {
-            showSnackbar(
-                container,
-                leftImage,
-                title,
-                content,
-                null,
-                null,
-                0,
-                null,
-                displayType,
-                isCelebratory,
-                isSubscriberBenefit,
-                duration
-            )
-        }
-
-        fun showSnackbar(
-            container: ViewGroup,
-            title: CharSequence?,
-            content: CharSequence?,
-            rightIcon: Drawable,
-            rightTextColor: Int?,
-            rightText: String,
-            displayType: SnackbarDisplayType,
-            isCelebratory: Boolean = false,
-            isSubscriberBenefit: Boolean = false,
-            duration: Int = Snackbar.LENGTH_LONG
-        ) {
-            showSnackbar(
-                container,
-                null,
-                title,
-                content,
-                null,
-                rightIcon,
-                rightTextColor,
-                rightText,
-                displayType,
-                isCelebratory,
-                isSubscriberBenefit,
-                duration
-            )
-        }
-
-        fun showSnackbar(
-            container: ViewGroup,
-            title: CharSequence?,
-            content: CharSequence?,
-            specialView: View?,
-            displayType: SnackbarDisplayType,
-            isCelebratory: Boolean = false,
-            isSubscriberBenefit: Boolean = false,
-            duration: Int = Snackbar.LENGTH_LONG
-        ) {
-            showSnackbar(
-                container,
-                null,
-                title,
-                content,
-                specialView,
-                null,
-                0,
-                null,
-                displayType,
-                isCelebratory,
-                isSubscriberBenefit,
-                duration
-            )
-        }
-
-        fun showSnackbar(
-            container: ViewGroup,
-            leftImage: Drawable?,
-            title: CharSequence?,
-            content: CharSequence?,
-            specialView: View?,
-            rightIcon: Drawable?,
-            rightTextColor: Int?,
-            rightText: String?,
-            displayType: SnackbarDisplayType,
-            isCelebratory: Boolean = false,
-            isSubscriberBenefit: Boolean = false,
-            duration: Int = Snackbar.LENGTH_LONG
-        ) {
-            val snackbar = make(container, duration)
-                .setSpecialView(specialView)
-                .setLeftIcon(leftImage)
-            if (title?.isNotBlank() == true) {
-                snackbar.setTitle(title)
+        fun setRightDiff(
+            icon: Drawable?,
+            textColor: Int,
+            text: String?,
+        ): HabiticaSnackbar {
+            if (icon == null) {
+                return this
             }
-            if (content?.isNotBlank() == true) {
-                if (title?.isNotBlank() != true) {
-                    snackbar.setTitle(content)
-                } else {
-                    snackbar.setText(content)
+            binding.rightView.visibility = View.VISIBLE
+            binding.rightIconView.setImageDrawable(icon)
+            binding.rightTextView.setTextColor(textColor)
+            binding.rightTextView.text = text
+            return this
+        }
+
+        fun setLeftIcon(image: Drawable?): HabiticaSnackbar {
+            binding.leftImageView.setImageDrawable(image)
+            binding.leftImageView.visibility = if (image != null) View.VISIBLE else View.GONE
+            return this
+        }
+
+        fun setBackgroundColor(
+            @ColorInt color: Int,
+        ): HabiticaSnackbar {
+            view.setBackgroundColor(color)
+            return this
+        }
+
+        fun setBackgroundResource(resourceId: Int): HabiticaSnackbar {
+            binding.snackbarView.setBackgroundResource(resourceId)
+            view.setBackgroundColor(ContextCompat.getColor(context, R.color.transparent))
+            return this
+        }
+
+        private fun setSpecialView(specialView: View?): HabiticaSnackbar {
+            if (specialView != null) {
+                binding.contentContainer.addView(specialView)
+            }
+            return this
+        }
+
+        private class ContentViewCallback(private val content: View) :
+            com.google.android.material.snackbar.ContentViewCallback {
+            @Suppress("SameParameterValue")
+            override fun animateContentIn(
+                delay: Int,
+                duration: Int,
+            ) {
+                content.scaleY = 0f
+                content.scaleX = 0f
+                ViewCompat.animate(content).scaleY(1f).setDuration(duration.toLong()).startDelay =
+                    delay.toLong()
+                ViewCompat.animate(content).scaleX(1f).setDuration(duration.toLong()).startDelay =
+                    delay.toLong()
+                ViewCompat.animate(content).alpha(1f).setDuration(duration.toLong()).startDelay =
+                    delay.toLong()
+            }
+
+            override fun animateContentOut(
+                delay: Int,
+                duration: Int,
+            ) {
+                content.scaleY = 1f
+                content.scaleX = 1f
+                ViewCompat.animate(content).scaleY(0f).setDuration(duration.toLong()).startDelay =
+                    delay.toLong()
+                ViewCompat.animate(content).scaleX(0f).setDuration(duration.toLong()).startDelay =
+                    delay.toLong()
+                ViewCompat.animate(content).alpha(0f).setDuration(duration.toLong()).startDelay =
+                    delay.toLong()
+            }
+        }
+
+        enum class SnackbarDisplayType {
+            NORMAL,
+            FAILURE,
+            FAILURE_BLUE,
+            DROP,
+            SUCCESS,
+            BLUE,
+            BLACK,
+            SUBSCRIBER_BENEFIT,
+        }
+
+        companion object {
+            const val MIN_LEVEL_FOR_SKILLS = 11
+
+            private fun make(
+                parent: ViewGroup,
+                duration: Int,
+            ): HabiticaSnackbar {
+                val inflater = LayoutInflater.from(parent.context)
+                val content = inflater.inflate(R.layout.snackbar_view, parent, false)
+                val viewCallback = ContentViewCallback(content)
+                val customSnackbar = HabiticaSnackbar(parent, content, viewCallback)
+                customSnackbar.duration = duration
+                return customSnackbar
+            }
+
+            fun showSnackbar(
+                container: ViewGroup,
+                content: CharSequence?,
+                displayType: SnackbarDisplayType,
+                isCelebratory: Boolean = false,
+                isSubscriberBenefit: Boolean = false,
+                duration: Int = Snackbar.LENGTH_LONG,
+            ) {
+                showSnackbar(
+                    container,
+                    null,
+                    null,
+                    content,
+                    null,
+                    null,
+                    0,
+                    null,
+                    displayType,
+                    isCelebratory,
+                    isSubscriberBenefit,
+                    duration,
+                )
+            }
+
+            fun showSnackbar(
+                container: ViewGroup,
+                leftImage: Drawable,
+                title: CharSequence?,
+                content: CharSequence?,
+                displayType: SnackbarDisplayType,
+                isCelebratory: Boolean = false,
+                isSubscriberBenefit: Boolean = false,
+                duration: Int = Snackbar.LENGTH_LONG,
+            ) {
+                showSnackbar(
+                    container,
+                    leftImage,
+                    title,
+                    content,
+                    null,
+                    null,
+                    0,
+                    null,
+                    displayType,
+                    isCelebratory,
+                    isSubscriberBenefit,
+                    duration,
+                )
+            }
+
+            fun showSnackbar(
+                container: ViewGroup,
+                title: CharSequence?,
+                content: CharSequence?,
+                rightIcon: Drawable,
+                rightTextColor: Int?,
+                rightText: String,
+                displayType: SnackbarDisplayType,
+                isCelebratory: Boolean = false,
+                isSubscriberBenefit: Boolean = false,
+                duration: Int = Snackbar.LENGTH_LONG,
+            ) {
+                showSnackbar(
+                    container,
+                    null,
+                    title,
+                    content,
+                    null,
+                    rightIcon,
+                    rightTextColor,
+                    rightText,
+                    displayType,
+                    isCelebratory,
+                    isSubscriberBenefit,
+                    duration,
+                )
+            }
+
+            fun showSnackbar(
+                container: ViewGroup,
+                title: CharSequence?,
+                content: CharSequence?,
+                specialView: View?,
+                displayType: SnackbarDisplayType,
+                isCelebratory: Boolean = false,
+                isSubscriberBenefit: Boolean = false,
+                duration: Int = Snackbar.LENGTH_LONG,
+            ) {
+                showSnackbar(
+                    container,
+                    null,
+                    title,
+                    content,
+                    specialView,
+                    null,
+                    0,
+                    null,
+                    displayType,
+                    isCelebratory,
+                    isSubscriberBenefit,
+                    duration,
+                )
+            }
+
+            fun showSnackbar(
+                container: ViewGroup,
+                leftImage: Drawable?,
+                title: CharSequence?,
+                content: CharSequence?,
+                specialView: View?,
+                rightIcon: Drawable?,
+                rightTextColor: Int?,
+                rightText: String?,
+                displayType: SnackbarDisplayType,
+                isCelebratory: Boolean = false,
+                isSubscriberBenefit: Boolean = false,
+                duration: Int = Snackbar.LENGTH_LONG,
+            ) {
+                val snackbar =
+                    make(container, duration)
+                        .setSpecialView(specialView)
+                        .setLeftIcon(leftImage)
+                if (title?.isNotBlank() == true) {
+                    snackbar.setTitle(title)
+                }
+                if (content?.isNotBlank() == true) {
+                    if (title?.isNotBlank() != true) {
+                        snackbar.setTitle(content)
+                    } else {
+                        snackbar.setText(content)
+                    }
+                }
+                rightTextColor?.let {
+                    snackbar.setRightDiff(rightIcon, rightTextColor, rightText)
                 }
-            }
-            rightTextColor?.let {
-                snackbar.setRightDiff(rightIcon, rightTextColor, rightText)
-            }
 
-            when (displayType) {
-                SnackbarDisplayType.FAILURE -> snackbar.setBackgroundResource(R.drawable.snackbar_background_red)
-                SnackbarDisplayType.BLACK -> snackbar.setBackgroundResource(R.drawable.snackbar_background_black)
-                SnackbarDisplayType.FAILURE_BLUE, SnackbarDisplayType.BLUE -> snackbar.setBackgroundResource(
-                    R.drawable.snackbar_background_blue
-                )
-                SnackbarDisplayType.DROP, SnackbarDisplayType.NORMAL -> snackbar.setBackgroundResource(
-                    R.drawable.snackbar_background_gray
-                )
-                SnackbarDisplayType.SUCCESS -> snackbar.setBackgroundResource(R.drawable.snackbar_background_green)
-                SnackbarDisplayType.SUBSCRIBER_BENEFIT -> {
-                    snackbar.setBackgroundResource(R.drawable.subscriber_benefit_snackbar_bg)
-                    snackbar.setTitleColor(ContextCompat.getColor(container.context, R.color.green_1))
-                    snackbar.setTextColor(ContextCompat.getColor(container.context, R.color.green_1))
+                when (displayType) {
+                    SnackbarDisplayType.FAILURE -> snackbar.setBackgroundResource(R.drawable.snackbar_background_red)
+                    SnackbarDisplayType.BLACK -> snackbar.setBackgroundResource(R.drawable.snackbar_background_black)
+                    SnackbarDisplayType.FAILURE_BLUE, SnackbarDisplayType.BLUE ->
+                        snackbar.setBackgroundResource(
+                            R.drawable.snackbar_background_blue,
+                        )
+
+                    SnackbarDisplayType.DROP, SnackbarDisplayType.NORMAL ->
+                        snackbar.setBackgroundResource(
+                            R.drawable.snackbar_background_gray,
+                        )
+
+                    SnackbarDisplayType.SUCCESS -> snackbar.setBackgroundResource(R.drawable.snackbar_background_green)
+                    SnackbarDisplayType.SUBSCRIBER_BENEFIT -> {
+                        snackbar.setBackgroundResource(R.drawable.subscriber_benefit_snackbar_bg)
+                        snackbar.setTitleColor(
+                            ContextCompat.getColor(
+                                container.context,
+                                R.color.green_1,
+                            ),
+                        )
+                        snackbar.setTextColor(
+                            ContextCompat.getColor(
+                                container.context,
+                                R.color.green_1,
+                            ),
+                        )
+                    }
+                }
+
+                if (isCelebratory) {
+                    showConfettiAnimation(container)
+                } else if (isSubscriberBenefit) {
+                    showSubscriberBenefitAnimation(container, snackbar)
+                }
+
+                snackbar.show()
+                if (displayType == SnackbarDisplayType.FAILURE || displayType == SnackbarDisplayType.FAILURE_BLUE) {
+                    container.postDelayed({
+                        snackbar.getView().startAnimation(Animations.negativeShakeAnimation())
+                    }, 600L)
                 }
             }
 
-            if (isCelebratory) {
-                showConfettiAnimation(container)
-            } else if (isSubscriberBenefit) {
-                showSubscriberBenefitAnimation(container, snackbar)
+            private fun showSubscriberBenefitAnimation(
+                container: ViewGroup,
+                snackbar: HabiticaSnackbar,
+            ) {
+                container.postDelayed(
+                    {
+                        ParticleSystem(
+                            container,
+                            300,
+                            ContextCompat.getDrawable(container.context, R.drawable.confetti_subs),
+                            800L,
+                        )
+                            .setFadeOut(200L)
+                            .setSpeedRange(0.05f, 0.2f)
+                            .setScaleRange(0.8f, 1.2f)
+                            .setRotationSpeedRange(134f, 164f)
+                            .emit(snackbar.getView(), 200, 600)
+                    },
+                    500L,
+                )
             }
 
-            snackbar.show()
-            if (displayType == SnackbarDisplayType.FAILURE || displayType == SnackbarDisplayType.FAILURE_BLUE) {
-                container.postDelayed({
-                    snackbar.getView().startAnimation(Animations.negativeShakeAnimation())
-                }, 600L)
+            private fun showConfettiAnimation(container: ViewGroup) {
+                container.postDelayed(
+                    {
+                        ParticleSystem(
+                            container,
+                            30,
+                            ContextCompat.getDrawable(container.context, R.drawable.confetti_blue),
+                            6000,
+                        )
+                            .setAcceleration(0.00070f, 90)
+                            .setRotationSpeedRange(134f, 164f)
+                            .setScaleRange(0.8f, 1.2f)
+                            .setSpeedByComponentsRange(-0.15f, 0.15f, -0.15f, -0.45f)
+                            .setFadeOut(200, AccelerateInterpolator())
+                            .emitWithGravity(container, Gravity.BOTTOM, 7, 1000)
+                        ParticleSystem(
+                            container,
+                            30,
+                            ContextCompat.getDrawable(container.context, R.drawable.confetti_red),
+                            6000,
+                        )
+                            .setAcceleration(0.00060f, 90)
+                            .setRotationSpeedRange(134f, 164f)
+                            .setScaleRange(0.8f, 1.2f)
+                            .setSpeedByComponentsRange(-0.15f, 0.15f, -0.15f, -0.45f)
+                            .setFadeOut(200, AccelerateInterpolator())
+                            .emitWithGravity(container, Gravity.BOTTOM, 7, 1000)
+                        ParticleSystem(
+                            container,
+                            30,
+                            ContextCompat.getDrawable(
+                                container.context,
+                                R.drawable.confetti_yellow,
+                            ),
+                            6000,
+                        )
+                            .setAcceleration(0.00070f, 90)
+                            .setRotationSpeedRange(134f, 164f)
+                            .setScaleRange(0.8f, 1.2f)
+                            .setSpeedByComponentsRange(-0.15f, 0.15f, -0.15f, -0.45f)
+                            .setFadeOut(200, AccelerateInterpolator())
+                            .emitWithGravity(container, Gravity.BOTTOM, 7, 1000)
+                        ParticleSystem(
+                            container,
+                            30,
+                            ContextCompat.getDrawable(
+                                container.context,
+                                R.drawable.confetti_purple,
+                            ),
+                            6000,
+                        )
+                            .setAcceleration(0.00090f, 90)
+                            .setRotationSpeedRange(134f, 164f)
+                            .setScaleRange(0.8f, 1.2f)
+                            .setSpeedByComponentsRange(-0.15f, 0.15f, -0.15f, -0.45f)
+                            .setFadeOut(200, AccelerateInterpolator())
+                            .emitWithGravity(container, Gravity.BOTTOM, 7, 1000)
+                    },
+                    500,
+                )
             }
         }
-
-        private fun showSubscriberBenefitAnimation(container: ViewGroup, snackbar: HabiticaSnackbar) {
-            container.postDelayed(
-                {
-                    ParticleSystem(
-                        container,
-                        300,
-                        ContextCompat.getDrawable(container.context, R.drawable.confetti_subs),
-                        800L
-                    )
-                        .setFadeOut(200L)
-                        .setSpeedRange(0.05f, 0.2f)
-                        .setScaleRange(0.8f, 1.2f)
-                        .setRotationSpeedRange(134f, 164f)
-                        .emit(snackbar.getView(), 200, 600)
-                }, 500L
-            )
-        }
-
-        private fun showConfettiAnimation(container: ViewGroup) {
-            container.postDelayed(
-                {
-                    ParticleSystem(
-                        container,
-                        30,
-                        ContextCompat.getDrawable(container.context, R.drawable.confetti_blue),
-                        6000
-                    )
-                        .setAcceleration(0.00070f, 90)
-                        .setRotationSpeedRange(134f, 164f)
-                        .setScaleRange(0.8f, 1.2f)
-                        .setSpeedByComponentsRange(-0.15f, 0.15f, -0.15f, -0.45f)
-                        .setFadeOut(200, AccelerateInterpolator())
-                        .emitWithGravity(container, Gravity.BOTTOM, 7, 1000)
-                    ParticleSystem(
-                        container,
-                        30,
-                        ContextCompat.getDrawable(container.context, R.drawable.confetti_red),
-                        6000
-                    )
-                        .setAcceleration(0.00060f, 90)
-                        .setRotationSpeedRange(134f, 164f)
-                        .setScaleRange(0.8f, 1.2f)
-                        .setSpeedByComponentsRange(-0.15f, 0.15f, -0.15f, -0.45f)
-                        .setFadeOut(200, AccelerateInterpolator())
-                        .emitWithGravity(container, Gravity.BOTTOM, 7, 1000)
-                    ParticleSystem(
-                        container,
-                        30,
-                        ContextCompat.getDrawable(
-                            container.context,
-                            R.drawable.confetti_yellow
-                        ),
-                        6000
-                    )
-                        .setAcceleration(0.00070f, 90)
-                        .setRotationSpeedRange(134f, 164f)
-                        .setScaleRange(0.8f, 1.2f)
-                        .setSpeedByComponentsRange(-0.15f, 0.15f, -0.15f, -0.45f)
-                        .setFadeOut(200, AccelerateInterpolator())
-                        .emitWithGravity(container, Gravity.BOTTOM, 7, 1000)
-                    ParticleSystem(
-                        container,
-                        30,
-                        ContextCompat.getDrawable(
-                            container.context,
-                            R.drawable.confetti_purple
-                        ),
-                        6000
-                    )
-                        .setAcceleration(0.00090f, 90)
-                        .setRotationSpeedRange(134f, 164f)
-                        .setScaleRange(0.8f, 1.2f)
-                        .setSpeedByComponentsRange(-0.15f, 0.15f, -0.15f, -0.45f)
-                        .setFadeOut(200, AccelerateInterpolator())
-                        .emitWithGravity(container, Gravity.BOTTOM, 7, 1000)
-                },
-                500
-            )
-        }
     }
-}
 
 interface SnackbarActivity {
-
     fun snackbarContainer(): ViewGroup
 
     fun showSnackbar(
@@ -390,7 +428,7 @@ interface SnackbarActivity {
         rightTextColor: Int? = null,
         rightText: String? = null,
         displayType: HabiticaSnackbar.SnackbarDisplayType = HabiticaSnackbar.SnackbarDisplayType.NORMAL,
-        isCelebratory: Boolean = false
+        isCelebratory: Boolean = false,
     ) {
         HabiticaSnackbar.showSnackbar(
             snackbarContainer(),
@@ -402,7 +440,7 @@ interface SnackbarActivity {
             rightTextColor,
             rightText,
             displayType,
-            isCelebratory
+            isCelebratory,
         )
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/LabeledBar.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/LabeledBar.kt
index c50bdb5ca..5ca9be128 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/LabeledBar.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/LabeledBar.kt
@@ -43,8 +43,8 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.ui.theme.colors
-import com.habitrpg.common.habitica.theme.HabiticaTheme
 import com.habitrpg.common.habitica.helpers.NumberAbbreviator
+import com.habitrpg.common.habitica.theme.HabiticaTheme
 import java.text.NumberFormat
 
 @Composable
@@ -61,44 +61,47 @@ fun LabeledBar(
     disabled: Boolean = false,
     abbreviateValue: Boolean = true,
     abbreviateMax: Boolean = true,
-    animated: Boolean = true
+    animated: Boolean = true,
 ) {
     val cleanedMaxValue = java.lang.Double.max(1.0, maxValue)
 
-    val animatedValue = if (animated) {
-        animateFloatAsState(
-            targetValue = value.toFloat(),
-            animationSpec = spring()
-        ).value
-    } else {
-        value.toFloat()
-    }
+    val animatedValue =
+        if (animated) {
+            animateFloatAsState(
+                targetValue = value.toFloat(),
+                animationSpec = spring(),
+            ).value
+        } else {
+            value.toFloat()
+        }
     val formatter = NumberFormat.getNumberInstance()
     formatter.minimumFractionDigits = 0
     formatter.maximumFractionDigits = 2
 
-    val animatedPadding = animateDpAsState(
-        targetValue = if (displayCompact) {
-            0.dp
-        } else {
-            24.dp
-        }
-    )
+    val animatedPadding =
+        animateDpAsState(
+            targetValue =
+                if (displayCompact) {
+                    0.dp
+                } else {
+                    24.dp
+                },
+        )
 
     Box(
-        modifier = modifier.alpha(if (disabled) 0.5f else 1.0f)
+        modifier = modifier.alpha(if (disabled) 0.5f else 1.0f),
     ) {
         icon?.let {
             AnimatedVisibility(
                 visible = !displayCompact,
                 enter = fadeIn() + slideInHorizontally { -18 },
                 exit = fadeOut() + slideOutHorizontally { -18 },
-                modifier = Modifier.align(Alignment.CenterStart)
+                modifier = Modifier.align(Alignment.CenterStart),
             ) {
                 Image(
                     it.asImageBitmap(),
                     null,
-                    modifier = Modifier
+                    modifier = Modifier,
                 )
             }
         }
@@ -110,36 +113,38 @@ fun LabeledBar(
                     .clip(CircleShape)
                     .height(barHeight),
                 backgroundColor = barColor,
-                color = color
+                color = color,
             )
             AnimatedVisibility(visible = !displayCompact) {
                 Row(
                     verticalAlignment = Alignment.CenterVertically,
-                    modifier = Modifier.padding(top = 2.dp)
+                    modifier = Modifier.padding(top = 2.dp),
                 ) {
                     if (!disabled) {
-                        val currentValueText = if (abbreviateValue) {
-                            NumberAbbreviator.abbreviate(
-                                LocalContext.current,
-                                animatedValue,
-                                0
-                            )
-                        } else {
-                            formatter.format(animatedValue)
-                        }
-                        val maxValueText = if (abbreviateMax) {
-                            NumberAbbreviator.abbreviate(
-                                LocalContext.current,
-                                cleanedMaxValue,
-                                0
-                            )
-                        } else {
-                            formatter.format(cleanedMaxValue)
-                        }
+                        val currentValueText =
+                            if (abbreviateValue) {
+                                NumberAbbreviator.abbreviate(
+                                    LocalContext.current,
+                                    animatedValue,
+                                    0,
+                                )
+                            } else {
+                                formatter.format(animatedValue)
+                            }
+                        val maxValueText =
+                            if (abbreviateMax) {
+                                NumberAbbreviator.abbreviate(
+                                    LocalContext.current,
+                                    cleanedMaxValue,
+                                    0,
+                                )
+                            } else {
+                                formatter.format(cleanedMaxValue)
+                            }
                         Text(
                             "$currentValueText / $maxValueText",
                             fontSize = 12.sp,
-                            color = colorResource(R.color.text_ternary)
+                            color = colorResource(R.color.text_ternary),
                         )
                     }
                     Spacer(Modifier.weight(1f))
@@ -158,12 +163,13 @@ private fun Preview() {
     var compact: Boolean by remember { mutableStateOf(false) }
     Column(
         verticalArrangement = Arrangement.spacedBy(10.dp),
-        modifier = Modifier
-            .width(240.dp)
-            .padding(8.dp)
-            .clickable {
-                compact = !compact
-            }
+        modifier =
+            Modifier
+                .width(240.dp)
+                .padding(8.dp)
+                .clickable {
+                    compact = !compact
+                },
     ) {
         LabeledBar(
             icon = HabiticaIconsHelper.imageOfHeartLightBg(),
@@ -171,7 +177,7 @@ private fun Preview() {
             color = colorResource(R.color.hpColor),
             value = 10.0,
             maxValue = 50.0,
-            displayCompact = compact
+            displayCompact = compact,
         )
         LabeledBar(
             icon = HabiticaIconsHelper.imageOfExperience(),
@@ -180,7 +186,7 @@ private fun Preview() {
             value = 100123.0,
             maxValue = 50000000000000.0,
             displayCompact = compact,
-            abbreviateValue = false
+            abbreviateValue = false,
         )
         LabeledBar(
             icon = HabiticaIconsHelper.imageOfExperience(),
@@ -190,7 +196,7 @@ private fun Preview() {
             maxValue = 500000000000.0,
             displayCompact = compact,
             abbreviateValue = false,
-            abbreviateMax = false
+            abbreviateMax = false,
         )
         LabeledBar(
             icon = HabiticaIconsHelper.imageOfMagic(),
@@ -199,7 +205,7 @@ private fun Preview() {
             value = 10.0,
             maxValue = 5000.0,
             displayCompact = compact,
-            disabled = false
+            disabled = false,
         )
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/LoadingButton.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/LoadingButton.kt
index e8a94515d..76b37449e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/LoadingButton.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/LoadingButton.kt
@@ -13,7 +13,7 @@ import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.animation.scaleIn
 import androidx.compose.animation.slideInHorizontally
-import androidx.compose.animation.with
+import androidx.compose.animation.togetherWith
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Arrangement
@@ -61,12 +61,12 @@ enum class LoadingButtonState {
     DISABLED,
     LOADING,
     FAILED,
-    SUCCESS
+    SUCCESS,
 }
 
 enum class LoadingButtonType {
     NORMAL,
-    DESTRUCTIVE
+    DESTRUCTIVE,
 }
 
 @OptIn(ExperimentalAnimationApi::class)
@@ -83,54 +83,62 @@ fun LoadingButton(
     contentPadding: PaddingValues = ButtonDefaults.ContentPadding,
     successContent: (@Composable RowScope.() -> Unit)? = null,
     failedContent: (@Composable RowScope.() -> Unit)? = null,
-    content: @Composable RowScope.() -> Unit
+    content: @Composable RowScope.() -> Unit,
 ) {
-    val colorStyle = if (type == LoadingButtonType.DESTRUCTIVE) {
-        ButtonDefaults.buttonColors(
-            backgroundColor = HabiticaTheme.colors.errorBackground,
-            contentColor = Color.White,
-            disabledBackgroundColor = HabiticaTheme.colors.offsetBackground,
-            disabledContentColor = HabiticaTheme.colors.textQuad
-        )
-    } else {
-        ButtonDefaults.buttonColors(
-            backgroundColor = HabiticaTheme.colors.tintedUiSub,
-            contentColor = Color.White,
-            disabledBackgroundColor = HabiticaTheme.colors.offsetBackground,
-            disabledContentColor = HabiticaTheme.colors.textQuad
-        )
-    }
-    val colorSpec = tween<Color>(350)
-    val backgroundColor = animateColorAsState(
-        targetValue = when (state) {
-            LoadingButtonState.FAILED -> HabiticaTheme.colors.errorBackground
-            LoadingButtonState.SUCCESS -> Color.Transparent
-            else -> colorStyle.backgroundColor(enabled = state != LoadingButtonState.DISABLED).value
-        },
-        animationSpec = colorSpec
-    )
-    val contentColor = animateColorAsState(
-        targetValue = when (state) {
-            LoadingButtonState.FAILED -> Color.White
-            LoadingButtonState.SUCCESS -> if (type == LoadingButtonType.DESTRUCTIVE) HabiticaTheme.colors.errorColor else HabiticaTheme.colors.successColor
-            else -> colorStyle.contentColor(enabled = state != LoadingButtonState.DISABLED).value
-        },
-        animationSpec = colorSpec
-    )
-    val borderWidth = animateDpAsState(
-        targetValue = if (state == LoadingButtonState.SUCCESS) {
-            3.dp
+    val colorStyle =
+        if (type == LoadingButtonType.DESTRUCTIVE) {
+            ButtonDefaults.buttonColors(
+                backgroundColor = HabiticaTheme.colors.errorBackground,
+                contentColor = Color.White,
+                disabledBackgroundColor = HabiticaTheme.colors.offsetBackground,
+                disabledContentColor = HabiticaTheme.colors.textQuad,
+            )
         } else {
-            border?.width ?: 0.dp
+            ButtonDefaults.buttonColors(
+                backgroundColor = HabiticaTheme.colors.tintedUiSub,
+                contentColor = Color.White,
+                disabledBackgroundColor = HabiticaTheme.colors.offsetBackground,
+                disabledContentColor = HabiticaTheme.colors.textQuad,
+            )
         }
-    )
+    val colorSpec = tween<Color>(350)
+    val backgroundColor =
+        animateColorAsState(
+            targetValue =
+                when (state) {
+                    LoadingButtonState.FAILED -> HabiticaTheme.colors.errorBackground
+                    LoadingButtonState.SUCCESS -> Color.Transparent
+                    else -> colorStyle.backgroundColor(enabled = state != LoadingButtonState.DISABLED).value
+                },
+            animationSpec = colorSpec,
+        )
+    val contentColor =
+        animateColorAsState(
+            targetValue =
+                when (state) {
+                    LoadingButtonState.FAILED -> Color.White
+                    LoadingButtonState.SUCCESS -> if (type == LoadingButtonType.DESTRUCTIVE) HabiticaTheme.colors.errorColor else HabiticaTheme.colors.successColor
+                    else -> colorStyle.contentColor(enabled = state != LoadingButtonState.DISABLED).value
+                },
+            animationSpec = colorSpec,
+        )
+    val borderWidth =
+        animateDpAsState(
+            targetValue =
+                if (state == LoadingButtonState.SUCCESS) {
+                    3.dp
+                } else {
+                    border?.width ?: 0.dp
+                },
+        )
 
-    val buttonColors = ButtonDefaults.buttonColors(
-        backgroundColor = backgroundColor.value,
-        contentColor = contentColor.value,
-        disabledBackgroundColor = backgroundColor.value,
-        disabledContentColor = contentColor.value
-    )
+    val buttonColors =
+        ButtonDefaults.buttonColors(
+            backgroundColor = backgroundColor.value,
+            contentColor = contentColor.value,
+            disabledBackgroundColor = backgroundColor.value,
+            disabledContentColor = contentColor.value,
+        )
     Button(
         {
             if (state == LoadingButtonState.CONTENT || state == LoadingButtonState.FAILED) {
@@ -143,16 +151,17 @@ fun LoadingButton(
         state != LoadingButtonState.DISABLED,
         elevation = elevation,
         shape = shape,
-        border = if (state == LoadingButtonState.SUCCESS) {
-            BorderStroke(
-                borderWidth.value,
-                if (type == LoadingButtonType.DESTRUCTIVE) HabiticaTheme.colors.errorColor else HabiticaTheme.colors.successColor
-            )
-        } else {
-            border
-        },
+        border =
+            if (state == LoadingButtonState.SUCCESS) {
+                BorderStroke(
+                    borderWidth.value,
+                    if (type == LoadingButtonType.DESTRUCTIVE) HabiticaTheme.colors.errorColor else HabiticaTheme.colors.successColor,
+                )
+            } else {
+                border
+            },
         colors = buttonColors,
-        contentPadding = PaddingValues(0.dp)
+        contentPadding = PaddingValues(0.dp),
     ) {
         ProvideTextStyle(value = TextStyle(fontSize = 16.sp, fontWeight = FontWeight.SemiBold)) {
             AnimatedContent(
@@ -163,35 +172,43 @@ fun LoadingButton(
                     val isTargetShowingContent =
                         targetState == LoadingButtonState.CONTENT || targetState == LoadingButtonState.DISABLED || (targetState == LoadingButtonState.SUCCESS && successContent == null)
                     if (targetState == LoadingButtonState.FAILED) {
-                        fadeIn(
-                            animationSpec = tween(220, delayMillis = 90)
-                        ) +
-                            slideInHorizontally(
-                                animationSpec = spring(
-                                    dampingRatio = 0.2f,
-                                    stiffness = StiffnessMediumLow
+                        (
+                            fadeIn(
+                                animationSpec = tween(220, delayMillis = 90),
+                            ) +
+                                slideInHorizontally(
+                                    animationSpec =
+                                        spring(
+                                            dampingRatio = 0.2f,
+                                            stiffness = StiffnessMediumLow,
+                                        ),
                                 )
-                            ) with
-                            fadeOut(animationSpec = tween(90))
+                        ).togetherWith(fadeOut(animationSpec = tween(90)))
                     } else if (isInitialShowingContent && isTargetShowingContent) {
-                        fadeIn() with fadeOut()
+                        fadeIn() togetherWith fadeOut()
                     } else {
-                        fadeIn(animationSpec = tween(220, delayMillis = 90)) +
-                            scaleIn(
-                                initialScale = 0.92f,
-                                animationSpec = tween(220, delayMillis = 90, FastOutSlowInEasing)
-                            ) with
-                            fadeOut(animationSpec = tween(90))
+                        (
+                            fadeIn(animationSpec = tween(220, delayMillis = 90)) +
+                                scaleIn(
+                                    initialScale = 0.92f,
+                                    animationSpec =
+                                        tween(
+                                            220,
+                                            delayMillis = 90,
+                                            FastOutSlowInEasing,
+                                        ),
+                                )
+                        ).togetherWith(fadeOut(animationSpec = tween(90)))
                     }
                 },
                 contentAlignment = Alignment.Center,
-                modifier = Modifier.padding(contentPadding)
+                modifier = Modifier.padding(contentPadding),
             ) { state ->
                 when (state) {
                     LoadingButtonState.LOADING ->
                         CircularProgressIndicator(
                             color = contentColor.value,
-                            modifier = Modifier.size(16.dp)
+                            modifier = Modifier.size(16.dp),
                         )
 
                     LoadingButtonState.SUCCESS -> successContent?.let { it() } ?: content()
@@ -199,8 +216,9 @@ fun LoadingButton(
                         failedContent?.let { it() } ?: Image(
                             painterResource(R.drawable.failed_loading),
                             stringResource(R.string.failed),
-                            Modifier.padding(horizontal = 8.dp)
+                            Modifier.padding(horizontal = 8.dp),
                         )
+
                     else -> content()
                 }
             }
@@ -216,9 +234,10 @@ private fun Preview() {
     Column(
         horizontalAlignment = Alignment.CenterHorizontally,
         verticalArrangement = Arrangement.spacedBy(8.dp),
-        modifier = Modifier
-            .width(200.dp)
-            .padding(8.dp)
+        modifier =
+            Modifier
+                .width(200.dp)
+                .padding(8.dp),
     ) {
         LoadingButton(state, {
             scope.launch {
@@ -235,20 +254,21 @@ private fun Preview() {
                 state = LoadingButtonState.CONTENT
             }
         }, successContent = {
-                Text("I did it!")
-            }, content = {
-                Text("Do something")
-            }, modifier = Modifier.fillMaxWidth())
+            Text("I did it!")
+        }, content = {
+            Text("Do something")
+        }, modifier = Modifier.fillMaxWidth())
         LoadingButton(
             LoadingButtonState.LOADING,
             {},
-            colors = ButtonDefaults.buttonColors(
-                backgroundColor = HabiticaTheme.colors.successBackground,
-                contentColor = Color.White
-            ),
+            colors =
+                ButtonDefaults.buttonColors(
+                    backgroundColor = HabiticaTheme.colors.successBackground,
+                    contentColor = Color.White,
+                ),
             content = {
                 Text("Do something")
-            }
+            },
         )
         LoadingButton(LoadingButtonState.LOADING, {}, content = {
             Text("Do something")
@@ -259,15 +279,15 @@ private fun Preview() {
         LoadingButton(LoadingButtonState.FAILED, {}, failedContent = {
             Text("Didn't work :(")
         }, content = {
-                Text("Do something")
-            })
+            Text("Do something")
+        })
         LoadingButton(LoadingButtonState.SUCCESS, {}, content = {
             Text("Do something")
         })
         LoadingButton(LoadingButtonState.SUCCESS, {}, successContent = {
             Text("Success!")
         }, content = {
-                Text("Do something")
-            })
+            Text("Do something")
+        })
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/PixelArtView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/PixelArtView.kt
index 99a610d9a..bb4af6f9b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/PixelArtView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/PixelArtView.kt
@@ -12,7 +12,7 @@ import com.habitrpg.common.habitica.views.PixelArtView
 fun PixelArtView(
     imageName: String?,
     modifier: Modifier = Modifier,
-    imageFormat: String? = null
+    imageFormat: String? = null,
 ) {
     AndroidView(
         modifier = modifier, // Occupy the max size in the Compose UI tree
@@ -25,7 +25,7 @@ fun PixelArtView(
             } else {
                 view.bitmap = null
             }
-        }
+        },
     )
 }
 
@@ -41,6 +41,6 @@ fun PixelArtView(
         },
         update = { view ->
             view.bitmap = bitmap.asAndroidBitmap()
-        }
+        },
     )
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/SegmentedControl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/SegmentedControl.kt
index 293e68077..81e672783 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/SegmentedControl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/SegmentedControl.kt
@@ -36,105 +36,115 @@ fun SegmentedControl(
     useFixedWidth: Boolean = false,
     itemWidth: Dp = 120.dp,
     cornerRadius: Int = 10,
-    onItemSelection: (selectedItemIndex: Int) -> Unit
+    onItemSelection: (selectedItemIndex: Int) -> Unit,
 ) {
     val selectedIndex = remember { mutableIntStateOf(defaultSelectedItemIndex) }
     val color = MaterialTheme.colors.primary
     Row(
-        modifier = Modifier
+        modifier = Modifier,
     ) {
         items.forEachIndexed { index, item ->
             OutlinedButton(
-                modifier = when (index) {
-                    0 -> {
-                        if (useFixedWidth) {
-                            Modifier
-                                .width(itemWidth)
-                                .offset(0.dp, 0.dp)
-                                .zIndex(if (selectedIndex.value == 0) 1f else 0f)
-                        } else {
-                            Modifier
-                                .wrapContentSize()
-                                .offset(0.dp, 0.dp)
-                                .zIndex(if (selectedIndex.value == 0) 1f else 0f)
+                modifier =
+                    when (index) {
+                        0 -> {
+                            if (useFixedWidth) {
+                                Modifier
+                                    .width(itemWidth)
+                                    .offset(0.dp, 0.dp)
+                                    .zIndex(if (selectedIndex.value == 0) 1f else 0f)
+                            } else {
+                                Modifier
+                                    .wrapContentSize()
+                                    .offset(0.dp, 0.dp)
+                                    .zIndex(if (selectedIndex.value == 0) 1f else 0f)
+                            }
                         }
-                    } else -> {
-                        if (useFixedWidth) {
-                            Modifier
-                                .width(itemWidth)
-                                .offset((-1 * index).dp, 0.dp)
-                                .zIndex(if (selectedIndex.value == index) 1f else 0f)
-                        } else {
-                            Modifier
-                                .wrapContentSize()
-                                .offset((-1 * index).dp, 0.dp)
-                                .zIndex(if (selectedIndex.value == index) 1f else 0f)
+
+                        else -> {
+                            if (useFixedWidth) {
+                                Modifier
+                                    .width(itemWidth)
+                                    .offset((-1 * index).dp, 0.dp)
+                                    .zIndex(if (selectedIndex.value == index) 1f else 0f)
+                            } else {
+                                Modifier
+                                    .wrapContentSize()
+                                    .offset((-1 * index).dp, 0.dp)
+                                    .zIndex(if (selectedIndex.value == index) 1f else 0f)
+                            }
                         }
-                    }
-                },
+                    },
                 onClick = {
                     selectedIndex.value = index
                     onItemSelection(selectedIndex.value)
                 },
-                shape = when (index) {
-                    /**
-                     * left outer button
-                     */
-                    0 -> RoundedCornerShape(
-                        topStartPercent = cornerRadius,
-                        topEndPercent = 0,
-                        bottomStartPercent = cornerRadius,
-                        bottomEndPercent = 0
-                    )
-                    /**
-                     * right outer button
-                     */
-                    items.size - 1 -> RoundedCornerShape(
-                        topStartPercent = 0,
-                        topEndPercent = cornerRadius,
-                        bottomStartPercent = 0,
-                        bottomEndPercent = cornerRadius
-                    )
-                    /**
-                     * middle button
-                     */
-                    else -> RoundedCornerShape(
-                        topStartPercent = 0,
-                        topEndPercent = 0,
-                        bottomStartPercent = 0,
-                        bottomEndPercent = 0
-                    )
-                },
-                border = BorderStroke(
-                    1.dp,
+                shape =
+                    when (index) {
+                        /**
+                         * left outer button
+                         */
+                        0 ->
+                            RoundedCornerShape(
+                                topStartPercent = cornerRadius,
+                                topEndPercent = 0,
+                                bottomStartPercent = cornerRadius,
+                                bottomEndPercent = 0,
+                            )
+                        /**
+                         * right outer button
+                         */
+                        items.size - 1 ->
+                            RoundedCornerShape(
+                                topStartPercent = 0,
+                                topEndPercent = cornerRadius,
+                                bottomStartPercent = 0,
+                                bottomEndPercent = cornerRadius,
+                            )
+                        /**
+                         * middle button
+                         */
+                        else ->
+                            RoundedCornerShape(
+                                topStartPercent = 0,
+                                topEndPercent = 0,
+                                bottomStartPercent = 0,
+                                bottomEndPercent = 0,
+                            )
+                    },
+                border =
+                    BorderStroke(
+                        1.dp,
+                        if (selectedIndex.value == index) {
+                            color
+                        } else {
+                            color.copy(alpha = 0.75f)
+                        },
+                    ),
+                colors =
                     if (selectedIndex.value == index) {
-                        color
+                        /**
+                         * selected colors
+                         */
+                        ButtonDefaults.outlinedButtonColors(
+                            backgroundColor = color,
+                        )
                     } else {
-                        color.copy(alpha = 0.75f)
-                    }
-                ),
-                colors = if (selectedIndex.value == index) {
-                    /**
-                     * selected colors
-                     */
-                    ButtonDefaults.outlinedButtonColors(
-                        backgroundColor = color
-                    )
-                } else {
-                    /**
-                     * not selected colors
-                     */
-                    ButtonDefaults.outlinedButtonColors(backgroundColor = Color.Transparent)
-                }
+                        /**
+                         * not selected colors
+                         */
+                        ButtonDefaults.outlinedButtonColors(backgroundColor = Color.Transparent)
+                    },
             ) {
                 Text(
                     text = item,
                     fontWeight = FontWeight.Normal,
-                    color = if (selectedIndex.value == index) {
-                        Color.White
-                    } else {
-                        color.copy(alpha = 0.9f)
-                    }
+                    color =
+                        if (selectedIndex.value == index) {
+                            Color.White
+                        } else {
+                            color.copy(alpha = 0.9f)
+                        },
                 )
             }
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/SparkView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/SparkView.kt
index e1f8cb7f7..368b8fb61 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/SparkView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/SparkView.kt
@@ -14,93 +14,129 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.common.habitica.extensions.dpToPx
 import kotlin.math.min
 
-class SparkView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
-) : View(context, attrs, defStyleAttr) {
-    private var spacing: Float = 0f
-        set(value) {
-            field = value
-            invalidate()
-        }
-    private var paint: Paint = Paint()
+class SparkView
+    @JvmOverloads
+    constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0,
+    ) : View(context, attrs, defStyleAttr) {
+        private var spacing: Float = 0f
+            set(value) {
+                field = value
+                invalidate()
+            }
+        private var paint: Paint = Paint()
 
-    var thickness = 3.dpToPx(context)
-    var length = 6.dpToPx(context)
-    var maxSpacing = 5.dpToPx(context)
-    var animationDuration = 2500L
-    var color: Int
-        get() {
-            return paint.color
-        }
-        set(value) {
-            paint.color = value
+        var thickness = 3.dpToPx(context)
+        var length = 6.dpToPx(context)
+        var maxSpacing = 5.dpToPx(context)
+        var animationDuration = 2500L
+        var color: Int
+            get() {
+                return paint.color
+            }
+            set(value) {
+                paint.color = value
+            }
+
+        init {
+            spacing = maxSpacing.toFloat()
+            context.theme?.obtainStyledAttributes(attrs, R.styleable.SparkView, 0, 0)?.let {
+                thickness = it.getDimensionPixelSize(R.styleable.SparkView_thickness, 3.dpToPx(context))
+                length = it.getDimensionPixelSize(R.styleable.SparkView_length, 6.dpToPx(context))
+                maxSpacing =
+                    it.getDimensionPixelSize(R.styleable.SparkView_maxSpacing, 5.dpToPx(context))
+                animationDuration = it.getInt(R.styleable.SparkView_duration, 2500).toLong()
+                color =
+                    it.getInt(
+                        R.styleable.SparkView_color,
+                        ContextCompat.getColor(context, R.color.white),
+                    )
+            }
+
+            paint.style = Paint.Style.FILL
         }
 
-    init {
-        spacing = maxSpacing.toFloat()
-        context.theme?.obtainStyledAttributes(attrs, R.styleable.SparkView, 0, 0)?.let {
-            thickness = it.getDimensionPixelSize(R.styleable.SparkView_thickness, 3.dpToPx(context))
-            length = it.getDimensionPixelSize(R.styleable.SparkView_length, 6.dpToPx(context))
-            maxSpacing = it.getDimensionPixelSize(R.styleable.SparkView_maxSpacing, 5.dpToPx(context))
-            animationDuration = it.getInt(R.styleable.SparkView_duration, 2500).toLong()
-            color = it.getInt(R.styleable.SparkView_color, ContextCompat.getColor(context, R.color.white))
+        fun startAnimating() {
+            val anim = ObjectAnimator.ofFloat(thickness.toFloat(), maxSpacing.toFloat())
+            anim.addUpdateListener {
+                spacing = it.animatedValue as Float
+            }
+            anim.interpolator = AccelerateDecelerateInterpolator()
+            anim.repeatCount = Animation.INFINITE
+            anim.repeatMode = ValueAnimator.REVERSE
+            anim.duration = animationDuration
+            anim.start()
         }
 
-        paint.style = Paint.Style.FILL
+        override fun onMeasure(
+            widthMeasureSpec: Int,
+            heightMeasureSpec: Int,
+        ) {
+            val widthSize = MeasureSpec.getSize(widthMeasureSpec)
+            val heightSize = MeasureSpec.getSize(heightMeasureSpec)
+            val desiredSize = (length * 2 + maxSpacing)
+
+            val width =
+                when (MeasureSpec.getMode(widthMeasureSpec)) {
+                    MeasureSpec.EXACTLY -> widthSize
+                    MeasureSpec.AT_MOST -> min(desiredSize, widthSize)
+                    else -> desiredSize
+                }
+
+            val height =
+                when (MeasureSpec.getMode(heightMeasureSpec)) {
+                    MeasureSpec.EXACTLY -> heightSize
+                    MeasureSpec.AT_MOST -> min(desiredSize, heightSize)
+                    else -> desiredSize
+                }
+
+            setMeasuredDimension(width, height)
+        }
+
+        override fun onDraw(canvas: Canvas) {
+            super.onDraw(canvas)
+            val thisCanvas = canvas
+            val centerHorizontal = width / 2f
+            val centerVertical = height / 2f
+            val offset = (maxSpacing - spacing) / 2
+            drawHorizontal(thisCanvas, offset, centerVertical)
+            drawHorizontal(thisCanvas, width - length.toFloat() - offset, centerVertical)
+
+            drawVertical(thisCanvas, centerHorizontal, offset)
+            drawVertical(thisCanvas, centerVertical, height - length.toFloat() - offset)
+        }
+
+        private fun drawVertical(
+            canvas: Canvas,
+            x: Float,
+            y: Float,
+        ) {
+            canvas.drawRoundRect(
+                x - (thickness / 2),
+                y,
+                x + (thickness / 2),
+                y + length,
+                thickness / 2f,
+                thickness / 2f,
+                paint,
+            )
+        }
+
+        private fun drawHorizontal(
+            canvas: Canvas,
+            x: Float,
+            y: Float,
+        ) {
+            canvas.drawRoundRect(
+                x,
+                y - (thickness / 2),
+                x + length,
+                y + (thickness / 2),
+                thickness / 2f,
+                thickness / 2f,
+                paint,
+            )
+        }
     }
-
-    fun startAnimating() {
-        val anim = ObjectAnimator.ofFloat(thickness.toFloat(), maxSpacing.toFloat())
-        anim.addUpdateListener {
-            spacing = it.animatedValue as Float
-        }
-        anim.interpolator = AccelerateDecelerateInterpolator()
-        anim.repeatCount = Animation.INFINITE
-        anim.repeatMode = ValueAnimator.REVERSE
-        anim.duration = animationDuration
-        anim.start()
-    }
-
-    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-        val widthSize = MeasureSpec.getSize(widthMeasureSpec)
-        val heightSize = MeasureSpec.getSize(heightMeasureSpec)
-        val desiredSize = (length * 2 + maxSpacing)
-
-        val width = when (MeasureSpec.getMode(widthMeasureSpec)) {
-            MeasureSpec.EXACTLY -> widthSize
-            MeasureSpec.AT_MOST -> min(desiredSize, widthSize)
-            else -> desiredSize
-        }
-
-        val height = when (MeasureSpec.getMode(heightMeasureSpec)) {
-            MeasureSpec.EXACTLY -> heightSize
-            MeasureSpec.AT_MOST -> min(desiredSize, heightSize)
-            else -> desiredSize
-        }
-
-        setMeasuredDimension(width, height)
-    }
-
-    override fun onDraw(canvas: Canvas) {
-        super.onDraw(canvas)
-        val thisCanvas = canvas ?: return
-        val centerHorizontal = width / 2f
-        val centerVertical = height / 2f
-        val offset = (maxSpacing - spacing) / 2
-        drawHorizontal(thisCanvas, offset, centerVertical)
-        drawHorizontal(thisCanvas, width - length.toFloat() - offset, centerVertical)
-
-        drawVertical(thisCanvas, centerHorizontal, offset)
-        drawVertical(thisCanvas, centerVertical, height - length.toFloat() - offset)
-    }
-
-    private fun drawVertical(canvas: Canvas, x: Float, y: Float) {
-        canvas.drawRoundRect(x - (thickness / 2), y, x + (thickness / 2), y + length, thickness / 2f, thickness / 2f, paint)
-    }
-
-    private fun drawHorizontal(canvas: Canvas, x: Float, y: Float) {
-        canvas.drawRoundRect(x, y - (thickness / 2), x + length, y + (thickness / 2), thickness / 2f, thickness / 2f, paint)
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/SupportCollapsibleSection.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/SupportCollapsibleSection.kt
index 3342c142a..4f10c5ba4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/SupportCollapsibleSection.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/SupportCollapsibleSection.kt
@@ -21,25 +21,39 @@ class SupportCollapsibleSection : LinearLayout {
         init(attrs, 0)
     }
 
-    constructor(context: Context, attrs: AttributeSet, defStyle: Int) : super(context, attrs, defStyle) {
+    constructor(context: Context, attrs: AttributeSet, defStyle: Int) : super(
+        context,
+        attrs,
+        defStyle,
+    ) {
         init(attrs, defStyle)
     }
 
-    private fun init(attrs: AttributeSet?, defStyle: Int) {
+    private fun init(
+        attrs: AttributeSet?,
+        defStyle: Int,
+    ) {
         val binding = SupportCollapsibleSectionBinding.inflate(context.layoutInflater, this)
-        val a = context.obtainStyledAttributes(
-            attrs,
-            R.styleable.SupportCollapsibleSection,
-            defStyle,
-            0
-        )
+        val a =
+            context.obtainStyledAttributes(
+                attrs,
+                R.styleable.SupportCollapsibleSection,
+                defStyle,
+                0,
+            )
 
         orientation = VERTICAL
 
         binding.titleView.text = a.getString(R.styleable.SupportCollapsibleSection_title)
         binding.subtitleView.text = a.getString(R.styleable.SupportCollapsibleSection_subtitle)
-        binding.descriptionView.text = MarkdownParser.parseMarkdown(a.getString(R.styleable.SupportCollapsibleSection_description))
-        binding.titleView.setTextColor(a.getColor(R.styleable.SupportCollapsibleSection_titleColor, ContextCompat.getColor(context, R.color.text_primary)))
+        binding.descriptionView.text =
+            MarkdownParser.parseMarkdown(a.getString(R.styleable.SupportCollapsibleSection_description))
+        binding.titleView.setTextColor(
+            a.getColor(
+                R.styleable.SupportCollapsibleSection_titleColor,
+                ContextCompat.getColor(context, R.color.text_primary),
+            ),
+        )
 
         background = ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_window)
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/Typewriter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/Typewriter.kt
index 6b95d279e..54301fb63 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/Typewriter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/Typewriter.kt
@@ -46,18 +46,24 @@ class Typewriter : androidx.appcompat.widget.AppCompatTextView {
 
     fun animateText(text: CharSequence) {
         stringBuilder = SpannableStringBuilder(text)
-        stringBuilder?.setSpan(hiddenSpan, 0, stringBuilder?.length ?: 0, Spannable.SPAN_INCLUSIVE_EXCLUSIVE)
+        stringBuilder?.setSpan(
+            hiddenSpan,
+            0,
+            stringBuilder?.length ?: 0,
+            Spannable.SPAN_INCLUSIVE_EXCLUSIVE,
+        )
         index = 0
 
         setText(stringBuilder)
         job?.cancel()
-        job = MainScope().launch(Dispatchers.Main) {
-            while (index <= (stringBuilder?.length ?: 0)) {
-                stringBuilder?.setSpan(visibleSpan, 0, index++, Spannable.SPAN_INCLUSIVE_INCLUSIVE)
-                setText(stringBuilder)
-                delay(delay)
+        job =
+            MainScope().launch(Dispatchers.Main) {
+                while (index <= (stringBuilder?.length ?: 0)) {
+                    stringBuilder?.setSpan(visibleSpan, 0, index++, Spannable.SPAN_INCLUSIVE_INCLUSIVE)
+                    setText(stringBuilder)
+                    delay(delay)
+                }
             }
-        }
     }
 
     fun stopTextAnimation() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/UserRow.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/UserRow.kt
index 2bf876c12..49c237087 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/UserRow.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/UserRow.kt
@@ -32,15 +32,19 @@ fun UserRow(
     extraContent: @Composable (() -> Unit)? = null,
     endContent: @Composable (() -> Unit)? = null,
     color: Color? = null,
-    configManager: AppConfigManager
+    configManager: AppConfigManager,
 ) {
     Row(verticalAlignment = Alignment.CenterVertically, modifier = modifier.fillMaxWidth()) {
         Box(
-            modifier = Modifier
-                .padding(end = 12.dp)
-                .clip(CircleShape)
-                .size(40.dp)
-                .padding(end = 12.dp, top = if (avatar?.currentMount?.isNotBlank() == true) 24.dp else 12.dp)
+            modifier =
+                Modifier
+                    .padding(end = 12.dp)
+                    .clip(CircleShape)
+                    .size(40.dp)
+                    .padding(
+                        end = 12.dp,
+                        top = if (avatar?.currentMount?.isNotBlank() == true) 24.dp else 12.dp,
+                    ),
         ) {
             if (avatar != null) {
                 ComposableAvatarView(
@@ -48,7 +52,7 @@ fun UserRow(
                     configManager,
                     Modifier
                         .size(96.dp)
-                        .requiredSize(96.dp)
+                        .requiredSize(96.dp),
                 )
             }
         }
@@ -58,7 +62,7 @@ fun UserRow(
                 "@$username",
                 fontSize = 16.sp,
                 fontWeight = FontWeight.Medium,
-                color = color ?: MaterialTheme.colors.primary
+                color = color ?: MaterialTheme.colors.primary,
             )
             if (extraContent != null) {
                 extraContent()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/UsernameLabel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/UsernameLabel.kt
index e7acccf1f..5ab138e93 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/UsernameLabel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/UsernameLabel.kt
@@ -30,79 +30,106 @@ import androidx.core.content.ContextCompat
 import com.habitrpg.common.habitica.R
 import com.habitrpg.common.habitica.models.PlayerTier
 
-class UsernameLabel @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null
-) : LinearLayout(context, attrs) {
+class UsernameLabel
+    @JvmOverloads
+    constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+    ) : LinearLayout(context, attrs) {
+        private val textView = TextView(context)
+        private val tierIconView = ImageView(context)
 
-    private val textView = TextView(context)
-    private val tierIconView = ImageView(context)
-
-    var username: String? = ""
-        set(value) {
-            field = value
-            textView.text = value
-        }
-
-    var isNPC: Boolean = false
-        set(value) {
-            field = value
-            tier = tier
-        }
-
-    var tier: Int = 0
-        set(value) {
-            field = value
-            if (isNPC) {
-                textView.setTextColor(ContextCompat.getColor(context, R.color.contributor_npc))
-            } else {
-                textView.setTextColor(PlayerTier.getColorForTier(context, value))
+        var username: String? = ""
+            set(value) {
+                field = value
+                textView.text = value
             }
-            if (value == 0) {
-                tierIconView.visibility = View.GONE
-            } else {
-                tierIconView.visibility = View.VISIBLE
-                tierIconView.setImageBitmap(HabiticaIconsHelper.imageOfContributorBadge(value.toFloat(), isNPC))
-            }
-        }
 
-    init {
-        val textViewParams = LayoutParams(
-            FrameLayout.LayoutParams.WRAP_CONTENT,
-            FrameLayout.LayoutParams.WRAP_CONTENT
-        )
-        textViewParams.gravity = Gravity.CENTER_VERTICAL
-        textViewParams.weight = 1.0f
-        addView(textView, textViewParams)
-        val padding = context.resources.getDimension(R.dimen.spacing_small).toInt()
-        textView.setPadding(0, 0, padding, 0)
-        textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14f)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            textView.typeface = Typeface.create(null, 600, false)
+        var isNPC: Boolean = false
+            set(value) {
+                field = value
+                tier = tier
+            }
+
+        var tier: Int = 0
+            set(value) {
+                field = value
+                if (isNPC) {
+                    textView.setTextColor(ContextCompat.getColor(context, R.color.contributor_npc))
+                } else {
+                    textView.setTextColor(PlayerTier.getColorForTier(context, value))
+                }
+                if (value == 0) {
+                    tierIconView.visibility = View.GONE
+                } else {
+                    tierIconView.visibility = View.VISIBLE
+                    tierIconView.setImageBitmap(
+                        HabiticaIconsHelper.imageOfContributorBadge(
+                            value.toFloat(),
+                            isNPC,
+                        ),
+                    )
+                }
+            }
+
+        init {
+            val textViewParams =
+                LayoutParams(
+                    FrameLayout.LayoutParams.WRAP_CONTENT,
+                    FrameLayout.LayoutParams.WRAP_CONTENT,
+                )
+            textViewParams.gravity = Gravity.CENTER_VERTICAL
+            textViewParams.weight = 1.0f
+            addView(textView, textViewParams)
+            val padding = context.resources.getDimension(R.dimen.spacing_small).toInt()
+            textView.setPadding(0, 0, padding, 0)
+            textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14f)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+                textView.typeface = Typeface.create(null, 600, false)
+            }
+            val iconViewParams =
+                LayoutParams(
+                    FrameLayout.LayoutParams.WRAP_CONTENT,
+                    FrameLayout.LayoutParams.WRAP_CONTENT,
+                )
+            iconViewParams.gravity = Gravity.CENTER_VERTICAL
+            addView(tierIconView, iconViewParams)
         }
-        val iconViewParams = LayoutParams(
-            FrameLayout.LayoutParams.WRAP_CONTENT,
-            FrameLayout.LayoutParams.WRAP_CONTENT
-        )
-        iconViewParams.gravity = Gravity.CENTER_VERTICAL
-        addView(tierIconView, iconViewParams)
     }
-}
 
 @Composable
 fun ComposableUsernameLabel(
     username: String,
     tier: Int,
     modifier: Modifier = Modifier,
-    isNPC: Boolean = false
+    isNPC: Boolean = false,
 ) {
-    Row(horizontalArrangement = Arrangement.spacedBy(2.dp), verticalAlignment = Alignment.CenterVertically, modifier = modifier) {
+    Row(
+        horizontalArrangement = Arrangement.spacedBy(2.dp),
+        verticalAlignment = Alignment.CenterVertically,
+        modifier = modifier,
+    ) {
         ProvideTextStyle(value = TextStyle(fontWeight = FontWeight.SemiBold)) {
-            Text(username, color = if (isNPC) colorResource(id = R.color.contributor_npc) else Color(PlayerTier.getColorForTier(LocalContext.current, tier)))
+            Text(
+                username,
+                color =
+                    if (isNPC) {
+                        colorResource(id = R.color.contributor_npc)
+                    } else {
+                        Color(
+                            PlayerTier.getColorForTier(
+                                LocalContext.current,
+                                tier,
+                            ),
+                        )
+                    },
+            )
             if (tier > 0) {
                 Image(
-                    bitmap = HabiticaIconsHelper.imageOfContributorBadge(tier.toFloat(), isNPC).asImageBitmap(),
-                    contentDescription = null
+                    bitmap =
+                        HabiticaIconsHelper.imageOfContributorBadge(tier.toFloat(), isNPC)
+                            .asImageBitmap(),
+                    contentDescription = null,
                 )
             }
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/ValidatingEditText.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/ValidatingEditText.kt
index 95c000fcf..a763a9a2f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/ValidatingEditText.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/ValidatingEditText.kt
@@ -10,61 +10,68 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.ValidatingEditTextBinding
 import com.habitrpg.common.habitica.extensions.layoutInflater
 
-class ValidatingEditText @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null
-) : LinearLayout(context, attrs) {
+class ValidatingEditText
+    @JvmOverloads
+    constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+    ) : LinearLayout(context, attrs) {
+        private var binding: ValidatingEditTextBinding =
+            ValidatingEditTextBinding.inflate(context.layoutInflater, this)
 
-    private var binding: ValidatingEditTextBinding = ValidatingEditTextBinding.inflate(context.layoutInflater, this)
+        var text: String?
+            get() = binding.editText.text?.toString()
+            set(value) = binding.editText.setText(value)
+        var errorText: String?
+            get() = binding.errorText.text?.toString()
+            set(value) {
+                binding.errorText.text = value
+            }
+        var hint: CharSequence?
+            get() = binding.editText.hint
+            set(value) {
+                binding.editText.hint = value
+                binding.inputLayout.hint = value
+            }
+        var validator: ((String?) -> Boolean)? = null
 
-    var text: String?
-        get() = binding.editText.text?.toString()
-        set(value) = binding.editText.setText(value)
-    var errorText: String?
-        get() = binding.errorText.text?.toString()
-        set(value) {
-            binding.errorText.text = value
-        }
-    var hint: CharSequence?
-        get() = binding.editText.hint
-        set(value) {
-            binding.editText.hint = value
-            binding.inputLayout.hint = value
-        }
-    var validator: ((String?) -> Boolean)? = null
+        val isValid: Boolean
+            get() = validator?.invoke(text) != false
 
-    val isValid: Boolean
-        get() = validator?.invoke(text) != false
+        init {
+            orientation = VERTICAL
+            context.theme?.obtainStyledAttributes(
+                attrs,
+                R.styleable.ValidatingEditText,
+                0,
+                0,
+            )?.let { attributes ->
+                binding.inputLayout.hint = attributes.getString(R.styleable.ValidatingEditText_hint)
+                binding.editText.maxLines =
+                    attributes.getInt(R.styleable.ValidatingEditText_android_maxLines, 20)
+                binding.editText.inputType =
+                    attributes.getInt(
+                        R.styleable.ValidatingEditText_android_inputType,
+                        InputType.TYPE_CLASS_TEXT,
+                    )
+            }
 
-    init {
-        orientation = VERTICAL
-        context.theme?.obtainStyledAttributes(
-            attrs,
-            R.styleable.ValidatingEditText,
-            0,
-            0
-        )?.let { attributes ->
-            binding.inputLayout.hint = attributes.getString(R.styleable.ValidatingEditText_hint)
-            binding.editText.maxLines = attributes.getInt(R.styleable.ValidatingEditText_android_maxLines, 20)
-            binding.editText.inputType = attributes.getInt(R.styleable.ValidatingEditText_android_inputType, InputType.TYPE_CLASS_TEXT)
+            binding.editText.setOnFocusChangeListener { _, isEditing ->
+                if (isEditing) return@setOnFocusChangeListener
+                showErrorIfNecessary()
+            }
+            binding.editText.doOnTextChanged { text, _, _, _ ->
+                if (binding.errorText.visibility == View.VISIBLE) {
+                    showErrorIfNecessary(text.toString())
+                }
+            }
         }
 
-        binding.editText.setOnFocusChangeListener { _, isEditing ->
-            if (isEditing) return@setOnFocusChangeListener
-            showErrorIfNecessary()
-        }
-        binding.editText.doOnTextChanged { text, _, _, _ ->
-            if (binding.errorText.visibility == View.VISIBLE) {
-                showErrorIfNecessary(text.toString())
+        fun showErrorIfNecessary(currentText: String? = null) {
+            if (validator?.invoke(currentText ?: text) == true || errorText?.isNotBlank() != true) {
+                binding.errorText.visibility = View.GONE
+            } else {
+                binding.errorText.visibility = View.VISIBLE
             }
         }
     }
-
-    fun showErrorIfNecessary(currentText: String? = null) {
-        if (validator?.invoke(currentText ?: text) == true || errorText?.isNotBlank() != true) {
-            binding.errorText.visibility = View.GONE
-        } else {
-            binding.errorText.visibility = View.VISIBLE
-        }
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/ads/AdButton.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/ads/AdButton.kt
index b0c52c6f0..840e4fd12 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/ads/AdButton.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/ads/AdButton.kt
@@ -22,103 +22,131 @@ import java.util.Date
 import kotlin.time.DurationUnit
 import kotlin.time.toDuration
 
-class AdButton @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null
-) : LinearLayout(context, attrs) {
-    var state: State = State.READY
-        set(value) {
-            field = value
-            updateViews()
-        }
-
-    enum class State {
-        EMPTY,
-        READY,
-        LOADING,
-        UNAVAILABLE
-    }
-
-    private var updateJob: Job? = null
-    private var nextAdDate: Date? = null
-    private val binding = AdButtonBinding.inflate(context.layoutInflater, this)
-
-    private var activeBackgroundRes: Int = R.drawable.ad_button_background
-
-    var text: String = ""
-        set(value) {
-            field = value
-            updateViews()
-        }
-
-    init {
-        context.theme?.obtainStyledAttributes(
-            attrs,
-            R.styleable.AdButton,
-            0,
-            0
-        )?.let { attributes ->
-            text = attributes.getString(R.styleable.AdButton_text) ?: ""
-            binding.currencyView.currency = attributes.getString(R.styleable.AdButton_currency)
-            activeBackgroundRes = attributes.getResourceId(R.styleable.AdButton_activeBackground, R.drawable.ad_button_background)
-            binding.textView.setTextColor(attributes.getColor(R.styleable.AdButton_textColor, ContextCompat.getColor(context, R.color.white)))
-        }
-        binding.currencyView.setTextColor(ContextCompat.getColor(context, R.color.white))
-        binding.currencyView.value = 0.0
-        if (binding.currencyView.currency?.isNotBlank() != true) {
-            binding.currencyView.visibility = View.GONE
-        }
-        gravity = Gravity.CENTER
-        state = State.READY
-    }
-
-    private fun updateViews() {
-        when (state) {
-            State.READY -> {
-                binding.loadingIndicator.visibility = GONE
-                binding.textView.text = text
-                binding.textView.alpha = 1.0f
-                binding.textView.visibility = VISIBLE
-                binding.currencyView.visibility = VISIBLE
-                setBackgroundResource(activeBackgroundRes)
+class AdButton
+    @JvmOverloads
+    constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+    ) : LinearLayout(context, attrs) {
+        var state: State = State.READY
+            set(value) {
+                field = value
+                updateViews()
             }
-            State.UNAVAILABLE -> {
-                binding.loadingIndicator.visibility = GONE
-                binding.textView.text = context.getString(R.string.available_in, nextAdDate?.getShortRemainingString() ?: "")
-                binding.textView.alpha = 0.75f
-                binding.textView.visibility = VISIBLE
-                binding.currencyView.visibility = GONE
-                setBackgroundResource(R.drawable.ad_button_background_disabled)
-            }
-            State.EMPTY -> {
-                binding.loadingIndicator.visibility = GONE
-                binding.textView.visibility = GONE
-                binding.currencyView.visibility = GONE
-            }
-            State.LOADING -> {
-                binding.loadingIndicator.visibility = VISIBLE
-                binding.textView.visibility = GONE
-                binding.currencyView.visibility = GONE
-            }
-        }
-        isEnabled = state == State.READY
-    }
 
-    fun updateForAdType(type: AdType, lifecycleScope: LifecycleCoroutineScope) {
-        if (updateJob?.isActive == true) {
-            updateJob?.cancel()
+        enum class State {
+            EMPTY,
+            READY,
+            LOADING,
+            UNAVAILABLE,
         }
-        nextAdDate = AdHandler.nextAdAllowedDate(type)
-        if (nextAdDate?.after(Date()) == true) {
-            updateJob = lifecycleScope.launch(Dispatchers.Main) {
-                while (nextAdDate?.after(Date()) == true) {
-                    val remaining = ((nextAdDate?.time ?: 0L) - Date().time).toDuration(DurationUnit.MILLISECONDS)
-                    state = if (remaining.isNegative()) State.READY else State.UNAVAILABLE
-                    updateViews()
-                    delay(1.toDuration(remaining.getMinuteOrSeconds()))
+
+        private var updateJob: Job? = null
+        private var nextAdDate: Date? = null
+        private val binding = AdButtonBinding.inflate(context.layoutInflater, this)
+
+        private var activeBackgroundRes: Int = R.drawable.ad_button_background
+
+        var text: String = ""
+            set(value) {
+                field = value
+                updateViews()
+            }
+
+        init {
+            context.theme?.obtainStyledAttributes(
+                attrs,
+                R.styleable.AdButton,
+                0,
+                0,
+            )?.let { attributes ->
+                text = attributes.getString(R.styleable.AdButton_text) ?: ""
+                binding.currencyView.currency = attributes.getString(R.styleable.AdButton_currency)
+                activeBackgroundRes =
+                    attributes.getResourceId(
+                        R.styleable.AdButton_activeBackground,
+                        R.drawable.ad_button_background,
+                    )
+                binding.textView.setTextColor(
+                    attributes.getColor(
+                        R.styleable.AdButton_textColor,
+                        ContextCompat.getColor(context, R.color.white),
+                    ),
+                )
+            }
+            binding.currencyView.setTextColor(ContextCompat.getColor(context, R.color.white))
+            binding.currencyView.value = 0.0
+            if (binding.currencyView.currency?.isNotBlank() != true) {
+                binding.currencyView.visibility = View.GONE
+            }
+            gravity = Gravity.CENTER
+            state = State.READY
+        }
+
+        private fun updateViews() {
+            when (state) {
+                State.READY -> {
+                    binding.loadingIndicator.visibility = GONE
+                    binding.textView.text = text
+                    binding.textView.alpha = 1.0f
+                    binding.textView.visibility = VISIBLE
+                    binding.currencyView.visibility = VISIBLE
+                    setBackgroundResource(activeBackgroundRes)
                 }
-                state = State.READY
+
+                State.UNAVAILABLE -> {
+                    binding.loadingIndicator.visibility = GONE
+                    binding.textView.text =
+                        context.getString(
+                            R.string.available_in,
+                            nextAdDate?.getShortRemainingString() ?: "",
+                        )
+                    binding.textView.alpha = 0.75f
+                    binding.textView.visibility = VISIBLE
+                    binding.currencyView.visibility = GONE
+                    setBackgroundResource(R.drawable.ad_button_background_disabled)
+                }
+
+                State.EMPTY -> {
+                    binding.loadingIndicator.visibility = GONE
+                    binding.textView.visibility = GONE
+                    binding.currencyView.visibility = GONE
+                }
+
+                State.LOADING -> {
+                    binding.loadingIndicator.visibility = VISIBLE
+                    binding.textView.visibility = GONE
+                    binding.currencyView.visibility = GONE
+                }
+            }
+            isEnabled = state == State.READY
+        }
+
+        fun updateForAdType(
+            type: AdType,
+            lifecycleScope: LifecycleCoroutineScope,
+        ) {
+            if (updateJob?.isActive == true) {
+                updateJob?.cancel()
+            }
+            nextAdDate = AdHandler.nextAdAllowedDate(type)
+            if (nextAdDate?.after(Date()) == true) {
+                updateJob =
+                    lifecycleScope.launch(Dispatchers.Main) {
+                        while (nextAdDate?.after(Date()) == true) {
+                            val remaining =
+                                (
+                                    (
+                                        nextAdDate?.time
+                                            ?: 0L
+                                    ) - Date().time
+                                ).toDuration(DurationUnit.MILLISECONDS)
+                            state = if (remaining.isNegative()) State.READY else State.UNAVAILABLE
+                            updateViews()
+                            delay(1.toDuration(remaining.getMinuteOrSeconds()))
+                        }
+                        state = State.READY
+                    }
             }
         }
     }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/AchievementDetailDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/AchievementDetailDialog.kt
index b85607738..f24ff2ae3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/AchievementDetailDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/AchievementDetailDialog.kt
@@ -11,8 +11,8 @@ import com.habitrpg.common.habitica.extensions.fromHtml
 import com.habitrpg.common.habitica.extensions.loadImage
 import com.habitrpg.common.habitica.views.PixelArtView
 
-class AchievementDetailDialog(val achievement: Achievement, context: Context) : HabiticaAlertDialog(context) {
-
+class AchievementDetailDialog(val achievement: Achievement, context: Context) :
+    HabiticaAlertDialog(context) {
     private var iconView: PixelArtView?
     private var descriptionView: TextView?
 
@@ -25,11 +25,12 @@ class AchievementDetailDialog(val achievement: Achievement, context: Context) :
         setAdditionalContentView(binding.root)
         setTitle(achievement.title)
         descriptionView?.setText(achievement.text?.fromHtml(), TextView.BufferType.SPANNABLE)
-        val iconName = if (achievement.earned) {
-            achievement.icon + "2x"
-        } else {
-            "achievement-unearned2x"
-        }
+        val iconName =
+            if (achievement.earned) {
+                achievement.icon + "2x"
+            } else {
+                "achievement-unearned2x"
+            }
         iconView?.loadImage(iconName)
         addCloseButton(true)
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/AchievementDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/AchievementDialog.kt
index 49482fbe6..d495778b4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/AchievementDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/AchievementDialog.kt
@@ -7,48 +7,139 @@ import android.view.View
 import android.widget.TextView
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.DialogAchievementDetailBinding
-import com.habitrpg.common.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.common.habitica.extensions.fromHtml
 import com.habitrpg.common.habitica.extensions.layoutInflater
 import com.habitrpg.common.habitica.extensions.loadImage
+import com.habitrpg.common.habitica.helpers.MainNavigationController
 import com.habitrpg.common.habitica.models.Notification
 
 class AchievementDialog(context: Context) : HabiticaAlertDialog(context) {
     var isLastOnboardingAchievement: Boolean = false
 
-    private val binding: DialogAchievementDetailBinding = DialogAchievementDetailBinding.inflate(context.layoutInflater)
+    private val binding: DialogAchievementDetailBinding =
+        DialogAchievementDetailBinding.inflate(context.layoutInflater)
 
     init {
         binding.titleView.visibility = View.VISIBLE
         setAdditionalContentView(binding.root)
     }
 
-    fun setType(type: String, message: String?, text: String?) {
+    fun setType(
+        type: String,
+        message: String?,
+        text: String?,
+    ) {
         when (type) {
-            Notification.Type.ACHIEVEMENT_PARTY_UP.type -> configure(R.string.partyUpTitle, R.string.partyUpDescription, "partyUp")
-            Notification.Type.ACHIEVEMENT_PARTY_ON.type -> configure(R.string.partyOnTitle, R.string.partyOnDescription, "partyOn")
-            Notification.Type.ACHIEVEMENT_BEAST_MASTER.type -> configure(R.string.beastMasterTitle, R.string.beastMasterDescription, "rat")
-            Notification.Type.ACHIEVEMENT_MOUNT_MASTER.type -> configure(R.string.mountMasterTitle, R.string.mountMasterDescription, "wolf")
-            Notification.Type.ACHIEVEMENT_TRIAD_BINGO.type -> configure(R.string.triadBingoTitle, R.string.triadBingoDescription, "triadbingo")
-            Notification.Type.ACHIEVEMENT_GUILD_JOINED.type -> configure(R.string.joinedGuildTitle, R.string.joinedGuildDescription, "guild")
-            Notification.Type.ACHIEVEMENT_CHALLENGE_JOINED.type -> configure(R.string.joinedChallengeTitle, R.string.joinedChallengeDescription, "challenge")
-            Notification.Type.ACHIEVEMENT_INVITED_FRIEND.type -> configure(R.string.inviteFriendTitle, R.string.inviteFriendDescription, "friends")
-            "createdTask" -> configure(R.string.createdTaskTitle, R.string.createdTaskDescription, type)
-            "completedTask" -> configure(R.string.completedTaskTitle, R.string.completedTaskDescription, type)
-            "hatchedPet" -> configure(R.string.hatchedPetTitle, R.string.hatchedPetDescription, type)
+            Notification.Type.ACHIEVEMENT_PARTY_UP.type ->
+                configure(
+                    R.string.partyUpTitle,
+                    R.string.partyUpDescription,
+                    "partyUp",
+                )
+
+            Notification.Type.ACHIEVEMENT_PARTY_ON.type ->
+                configure(
+                    R.string.partyOnTitle,
+                    R.string.partyOnDescription,
+                    "partyOn",
+                )
+
+            Notification.Type.ACHIEVEMENT_BEAST_MASTER.type ->
+                configure(
+                    R.string.beastMasterTitle,
+                    R.string.beastMasterDescription,
+                    "rat",
+                )
+
+            Notification.Type.ACHIEVEMENT_MOUNT_MASTER.type ->
+                configure(
+                    R.string.mountMasterTitle,
+                    R.string.mountMasterDescription,
+                    "wolf",
+                )
+
+            Notification.Type.ACHIEVEMENT_TRIAD_BINGO.type ->
+                configure(
+                    R.string.triadBingoTitle,
+                    R.string.triadBingoDescription,
+                    "triadbingo",
+                )
+
+            Notification.Type.ACHIEVEMENT_GUILD_JOINED.type ->
+                configure(
+                    R.string.joinedGuildTitle,
+                    R.string.joinedGuildDescription,
+                    "guild",
+                )
+
+            Notification.Type.ACHIEVEMENT_CHALLENGE_JOINED.type ->
+                configure(
+                    R.string.joinedChallengeTitle,
+                    R.string.joinedChallengeDescription,
+                    "challenge",
+                )
+
+            Notification.Type.ACHIEVEMENT_INVITED_FRIEND.type ->
+                configure(
+                    R.string.inviteFriendTitle,
+                    R.string.inviteFriendDescription,
+                    "friends",
+                )
+
+            "createdTask" ->
+                configure(
+                    R.string.createdTaskTitle,
+                    R.string.createdTaskDescription,
+                    type,
+                )
+
+            "completedTask" ->
+                configure(
+                    R.string.completedTaskTitle,
+                    R.string.completedTaskDescription,
+                    type,
+                )
+
+            "hatchedPet" ->
+                configure(
+                    R.string.hatchedPetTitle,
+                    R.string.hatchedPetDescription,
+                    type,
+                )
+
             "fedPet" -> configure(R.string.fedPetTitle, R.string.fedPetDescription, type)
-            "purchasedEquipment" -> configure(R.string.purchasedEquipmentTitle, R.string.purchasedEquipmentDescription, type)
-            Notification.Type.ACHIEVEMENT_ONBOARDING_COMPLETE.type -> configure(R.string.onboardingCompleteTitle, R.string.onboardingCompleteDescription, "onboardingComplete")
+            "purchasedEquipment" ->
+                configure(
+                    R.string.purchasedEquipmentTitle,
+                    R.string.purchasedEquipmentDescription,
+                    type,
+                )
+
+            Notification.Type.ACHIEVEMENT_ONBOARDING_COMPLETE.type ->
+                configure(
+                    R.string.onboardingCompleteTitle,
+                    R.string.onboardingCompleteDescription,
+                    "onboardingComplete",
+                )
+
             else -> configure(message ?: "", text ?: "", type)
         }
     }
 
-    private fun configure(titleID: Int, descriptionID: Int, iconName: String) {
+    private fun configure(
+        titleID: Int,
+        descriptionID: Int,
+        iconName: String,
+    ) {
         configure(context.getString(titleID), context.getString(descriptionID), iconName)
     }
 
-    private fun configure(title: String, description: String, iconName: String) {
+    private fun configure(
+        title: String,
+        description: String,
+        iconName: String,
+    ) {
         binding.titleView.text = title
         binding.descriptionView.setText(description.fromHtml(), TextView.BufferType.SPANNABLE)
         binding.iconView.loadImage("achievement-${iconName}2x")
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/DetailDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/DetailDialog.kt
index 2b7d5088f..eb96cccd2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/DetailDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/DetailDialog.kt
@@ -6,7 +6,6 @@ import com.habitrpg.android.habitica.models.inventory.QuestContent
 import com.habitrpg.android.habitica.ui.views.shops.PurchaseDialogQuestContent
 
 class DetailDialog(context: Context) : HabiticaAlertDialog(context) {
-
     var quest: QuestContent? = null
         set(value) {
             field = value
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/FirstDropDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/FirstDropDialog.kt
index d09ed1b51..716c39c46 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/FirstDropDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/FirstDropDialog.kt
@@ -3,12 +3,11 @@ package com.habitrpg.android.habitica.ui.views.dialogs
 import android.content.Context
 import android.view.LayoutInflater
 import com.habitrpg.android.habitica.R
-import com.habitrpg.common.habitica.helpers.MainNavigationController
 import com.habitrpg.common.habitica.extensions.loadImage
+import com.habitrpg.common.habitica.helpers.MainNavigationController
 import com.habitrpg.common.habitica.views.PixelArtView
 
 class FirstDropDialog(context: Context) : HabiticaAlertDialog(context) {
-
     private var eggView: PixelArtView?
     private var hatchingPotionView: PixelArtView?
 
@@ -25,7 +24,10 @@ class FirstDropDialog(context: Context) : HabiticaAlertDialog(context) {
         setTitle(R.string.first_drop_title)
     }
 
-    fun configure(egg: String, hatchingPotion: String) {
+    fun configure(
+        egg: String,
+        hatchingPotion: String,
+    ) {
         eggView?.loadImage("Pet_Egg_$egg")
         hatchingPotionView?.loadImage("Pet_HatchingPotion_$hatchingPotion")
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/HabiticaBottomSheetDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/HabiticaBottomSheetDialog.kt
index 06d164dcd..e9fc673fe 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/HabiticaBottomSheetDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/HabiticaBottomSheetDialog.kt
@@ -6,7 +6,8 @@ import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.BottomSheetWrapperBinding
 
-open class HabiticaBottomSheetDialog(context: Context) : BottomSheetDialog(context, R.style.SheetDialog) {
+open class HabiticaBottomSheetDialog(context: Context) :
+    BottomSheetDialog(context, R.style.SheetDialog) {
     private val wrapperBinding = BottomSheetWrapperBinding.inflate(layoutInflater)
 
     init {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/HabiticaProgressDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/HabiticaProgressDialog.kt
index 295e7944d..2c7dee600 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/HabiticaProgressDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/HabiticaProgressDialog.kt
@@ -13,13 +13,19 @@ import com.habitrpg.common.habitica.theme.HabiticaTheme
 import com.habitrpg.common.habitica.views.HabiticaCircularProgressView
 
 class HabiticaProgressDialog(context: Context) : HabiticaAlertDialog(context) {
-
     companion object {
-        fun show(context: FragmentActivity, titleID: Int): HabiticaProgressDialog {
+        fun show(
+            context: FragmentActivity,
+            titleID: Int,
+        ): HabiticaProgressDialog {
             return show(context, context.getString(titleID))
         }
 
-        fun show(context: FragmentActivity, title: String?, dialogWidth: Int = 300): HabiticaProgressDialog {
+        fun show(
+            context: FragmentActivity,
+            title: String?,
+            dialogWidth: Int = 300,
+        ): HabiticaProgressDialog {
             val dialog = HabiticaProgressDialog(context)
             val composeView = ComposeView(context)
             dialog.setAdditionalContentView(composeView)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/OpenedMysteryitemDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/OpenedMysteryitemDialog.kt
index ab364d980..347cee265 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/OpenedMysteryitemDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/OpenedMysteryitemDialog.kt
@@ -6,7 +6,6 @@ import com.habitrpg.common.habitica.extensions.dpToPx
 import com.habitrpg.common.habitica.extensions.layoutInflater
 
 class OpenedMysteryitemDialog(context: Context) : HabiticaAlertDialog(context) {
-
     val binding = DialogOpenMysteryitemBinding.inflate(context.layoutInflater)
 
     init {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/PetSuggestHatchDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/PetSuggestHatchDialog.kt
index f9de0e4e9..f3aeb7f11 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/PetSuggestHatchDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/PetSuggestHatchDialog.kt
@@ -32,11 +32,11 @@ import dagger.hilt.components.SingletonComponent
 import java.util.Locale
 
 class PetSuggestHatchDialog(context: Context) : HabiticaAlertDialog(context) {
-
     @EntryPoint
     @InstallIn(SingletonComponent::class)
     interface PetSuggestHatchDialogEntryPoint {
         fun useCase(): HatchPetUseCase
+
         fun mainUserViewModel(): MainUserViewModel
     }
 
@@ -51,7 +51,11 @@ class PetSuggestHatchDialog(context: Context) : HabiticaAlertDialog(context) {
         setAdditionalContentView(binding.root)
         binding.shimmerView.startShimmer()
 
-        val hiltEntryPoint = EntryPointAccessors.fromApplication(context, PetSuggestHatchDialogEntryPoint::class.java)
+        val hiltEntryPoint =
+            EntryPointAccessors.fromApplication(
+                context,
+                PetSuggestHatchDialogEntryPoint::class.java,
+            )
         hatchPetUseCase = hiltEntryPoint.useCase()
         userViewModel = hiltEntryPoint.mainUserViewModel()
     }
@@ -73,7 +77,7 @@ class PetSuggestHatchDialog(context: Context) : HabiticaAlertDialog(context) {
         potionCount: Int,
         hasUnlockedEgg: Boolean,
         hasUnlockedPotion: Boolean,
-        hasMount: Boolean
+        hasMount: Boolean,
     ) {
         binding.eggView.loadImage("Pet_Egg_${pet.animal}")
         binding.hatchingPotionView.loadImage("Pet_HatchingPotion_${pet.color}")
@@ -85,24 +89,26 @@ class PetSuggestHatchDialog(context: Context) : HabiticaAlertDialog(context) {
         binding.eggView.alpha = if (hasEgg) 1.0f else 0.5f
         binding.hatchingPotionView.alpha = if (hasPotion) 1.0f else 0.5f
 
-        val eggName = egg?.text ?: pet.animal.replaceFirstChar {
-            if (it.isLowerCase()) {
-                it.titlecase(
-                    Locale.getDefault()
-                )
-            } else {
-                it.toString()
+        val eggName =
+            egg?.text ?: pet.animal.replaceFirstChar {
+                if (it.isLowerCase()) {
+                    it.titlecase(
+                        Locale.getDefault(),
+                    )
+                } else {
+                    it.toString()
+                }
             }
-        }
-        val potionName = potion?.text ?: pet.color.replaceFirstChar {
-            if (it.isLowerCase()) {
-                it.titlecase(
-                    Locale.getDefault()
-                )
-            } else {
-                it.toString()
+        val potionName =
+            potion?.text ?: pet.color.replaceFirstChar {
+                if (it.isLowerCase()) {
+                    it.titlecase(
+                        Locale.getDefault(),
+                    )
+                } else {
+                    it.toString()
+                }
             }
-        }
 
         if (hasEgg) {
             binding.eggCountView.visibility = View.VISIBLE
@@ -118,11 +124,12 @@ class PetSuggestHatchDialog(context: Context) : HabiticaAlertDialog(context) {
         }
 
         if (hasEgg && hasPotion) {
-            binding.descriptionView.text = context.getString(
-                R.string.can_hatch_pet,
-                eggName,
-                potionName
-            )
+            binding.descriptionView.text =
+                context.getString(
+                    R.string.can_hatch_pet,
+                    eggName,
+                    potionName,
+                )
             addButton(R.string.hatch, true, false) { _, _ ->
                 val thisPotion = potion ?: return@addButton
                 val thisEgg = egg ?: return@addButton
@@ -138,19 +145,36 @@ class PetSuggestHatchDialog(context: Context) : HabiticaAlertDialog(context) {
         } else {
             if (hasMount) {
                 if (!hasEgg && !hasPotion) {
-                    binding.descriptionView.text = context.getString(R.string.suggest_pet_hatch_again_missing_both, eggName, potionName)
+                    binding.descriptionView.text =
+                        context.getString(
+                            R.string.suggest_pet_hatch_again_missing_both,
+                            eggName,
+                            potionName,
+                        )
                 } else if (!hasEgg) {
-                    binding.descriptionView.text = context.getString(R.string.suggest_pet_hatch_again_missing_egg, eggName)
+                    binding.descriptionView.text =
+                        context.getString(R.string.suggest_pet_hatch_again_missing_egg, eggName)
                 } else {
-                    binding.descriptionView.text = context.getString(R.string.suggest_pet_hatch_again_missing_potion, potionName)
+                    binding.descriptionView.text =
+                        context.getString(
+                            R.string.suggest_pet_hatch_again_missing_potion,
+                            potionName,
+                        )
                 }
             } else {
                 if (!hasEgg && !hasPotion) {
-                    binding.descriptionView.text = context.getString(R.string.suggest_pet_hatch_missing_both, eggName, potionName)
+                    binding.descriptionView.text =
+                        context.getString(
+                            R.string.suggest_pet_hatch_missing_both,
+                            eggName,
+                            potionName,
+                        )
                 } else if (!hasEgg) {
-                    binding.descriptionView.text = context.getString(R.string.suggest_pet_hatch_missing_egg, eggName)
+                    binding.descriptionView.text =
+                        context.getString(R.string.suggest_pet_hatch_missing_egg, eggName)
                 } else {
-                    binding.descriptionView.text = context.getString(R.string.suggest_pet_hatch_missing_potion, potionName)
+                    binding.descriptionView.text =
+                        context.getString(R.string.suggest_pet_hatch_missing_potion, potionName)
                 }
             }
 
@@ -169,10 +193,20 @@ class PetSuggestHatchDialog(context: Context) : HabiticaAlertDialog(context) {
                 binding.currencyView.currency = "gems"
                 binding.currencyView.setTextColor(ContextCompat.getColor(context, R.color.white))
                 addButton(binding.root, true) { _, _ ->
-                    val activity = (getActivity() as? MainActivity) ?: (HabiticaBaseApplication.getInstance(context)?.currentActivity?.get() as? MainActivity) ?: return@addButton
+                    val activity =
+                        (getActivity() as? MainActivity) ?: (
+                            HabiticaBaseApplication.getInstance(
+                                context,
+                            )?.currentActivity?.get() as? MainActivity
+                        ) ?: return@addButton
                     if ((userViewModel.user.value?.gemCount ?: hatchPrice) < hatchPrice) {
                         InsufficientGemsDialog(activity, hatchPrice).show()
-                        Analytics.sendEvent("show insufficient gems modal", EventCategory.BEHAVIOUR, HitType.EVENT, mapOf("reason" to "pet suggest modal"))
+                        Analytics.sendEvent(
+                            "show insufficient gems modal",
+                            EventCategory.BEHAVIOUR,
+                            HitType.EVENT,
+                            mapOf("reason" to "pet suggest modal"),
+                        )
                         return@addButton
                     }
                     val thisPotion = potion ?: return@addButton
@@ -185,7 +219,7 @@ class PetSuggestHatchDialog(context: Context) : HabiticaAlertDialog(context) {
                             activity.inventoryRepository.purchaseItem(
                                 "hatchingPotions",
                                 thisPotion.key,
-                                1
+                                1,
                             )
                         }
                         activity.userRepository.retrieveUser(true, forced = true)
@@ -202,26 +236,34 @@ class PetSuggestHatchDialog(context: Context) : HabiticaAlertDialog(context) {
         val imageName = "stable_Pet-${pet.animal}-${pet.color}"
         DataBindingUtils.loadImage(context, imageName) {
             val resources = context.resources ?: return@loadImage
-            val drawable = if (hasMount) it else BitmapDrawable(resources, it.toBitmap().extractAlpha())
+            val drawable =
+                if (hasMount) it else BitmapDrawable(resources, it.toBitmap().extractAlpha())
             lifecycleScope.launchCatching {
                 binding.petView.bitmap = drawable.toBitmap()
             }
         }
     }
 
-    private fun hatchPet(potion: HatchingPotion, egg: Egg) {
+    private fun hatchPet(
+        potion: HatchingPotion,
+        egg: Egg,
+    ) {
         longLivingScope.launchCatching {
             hatchPetUseCase.callInteractor(
                 HatchPetUseCase.RequestValues(
                     potion,
                     egg,
-                    context
-                )
+                    context,
+                ),
             )
         }
     }
 
-    private fun getItemPrice(pet: Animal, item: Item?, hasUnlocked: Boolean): Int {
+    private fun getItemPrice(
+        pet: Animal,
+        item: Item?,
+        hasUnlocked: Boolean,
+    ): Int {
         if (pet.type == "drop" || (pet.type == "quest" && hasUnlocked)) {
             return item?.value ?: 0
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/QuestCompletedDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/QuestCompletedDialog.kt
index 6bd9feb02..f45db300b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/QuestCompletedDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/QuestCompletedDialog.kt
@@ -8,7 +8,6 @@ import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.launch
 
 class QuestCompletedDialog(context: Context) : HabiticaAlertDialog(context) {
-
     lateinit var userRepository: UserRepository
 
     var quest: QuestContent? = null
@@ -32,7 +31,11 @@ class QuestCompletedDialog(context: Context) : HabiticaAlertDialog(context) {
     companion object {
         private var isShowingDialog = false
 
-        fun showWithQuest(context: Context, quest: QuestContent, userRepository: UserRepository) {
+        fun showWithQuest(
+            context: Context,
+            quest: QuestContent,
+            userRepository: UserRepository,
+        ) {
             if (isShowingDialog) return
 
             val dialog = QuestCompletedDialog(context)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/QuestCompletedDialogContent.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/QuestCompletedDialogContent.kt
index 69062e050..81317c73e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/QuestCompletedDialogContent.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/QuestCompletedDialogContent.kt
@@ -20,7 +20,6 @@ import com.habitrpg.common.habitica.extensions.loadImage
 import com.habitrpg.common.habitica.views.PixelArtView
 
 class QuestCompletedDialogContent : LinearLayout {
-
     private lateinit var binding: DialogCompletedQuestContentBinding
 
     constructor(context: Context) : super(context) {
@@ -40,7 +39,10 @@ class QuestCompletedDialogContent : LinearLayout {
 
     fun setQuestContent(questContent: QuestContent) {
         binding.titleTextView.setText(questContent.text.fromHtml(), TextView.BufferType.SPANNABLE)
-        binding.notesTextView.setText(questContent.completion.fromHtml(), TextView.BufferType.SPANNABLE)
+        binding.notesTextView.setText(
+            questContent.completion.fromHtml(),
+            TextView.BufferType.SPANNABLE,
+        )
         binding.imageView.loadImage("quest_" + questContent.key)
 
         val inflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as? LayoutInflater
@@ -63,17 +65,28 @@ class QuestCompletedDialogContent : LinearLayout {
             }
 
             if ((questContent.drop?.exp ?: 0) > 0) {
-                val view = inflater?.inflate(R.layout.row_quest_reward_imageview, binding.rewardsList, false) as? ViewGroup
+                val view =
+                    inflater?.inflate(
+                        R.layout.row_quest_reward_imageview,
+                        binding.rewardsList,
+                        false,
+                    ) as? ViewGroup
                 val imageView = view?.findViewById<ImageView>(R.id.imageView)
                 imageView?.scaleType = ImageView.ScaleType.CENTER
                 imageView?.setImageBitmap(HabiticaIconsHelper.imageOfExperienceReward())
                 val titleTextView = view?.findViewById<TextView>(R.id.titleTextView)
-                titleTextView?.text = context.getString(R.string.experience_reward, questContent.drop?.exp)
+                titleTextView?.text =
+                    context.getString(R.string.experience_reward, questContent.drop?.exp)
                 binding.rewardsList.addView(view)
             }
 
             if ((questContent.drop?.gp ?: 0) > 0) {
-                val view = inflater?.inflate(R.layout.row_quest_reward_imageview, binding.rewardsList, false) as? ViewGroup
+                val view =
+                    inflater?.inflate(
+                        R.layout.row_quest_reward_imageview,
+                        binding.rewardsList,
+                        false,
+                    ) as? ViewGroup
                 val imageView = view?.findViewById<ImageView>(R.id.imageView)
                 imageView?.scaleType = ImageView.ScaleType.CENTER
                 imageView?.setImageBitmap(HabiticaIconsHelper.imageOfGoldReward())
@@ -87,14 +100,15 @@ class QuestCompletedDialogContent : LinearLayout {
     private fun addRewardsRow(
         inflater: LayoutInflater?,
         item: QuestDropItem,
-        containerView: ViewGroup?
+        containerView: ViewGroup?,
     ) {
         val view = inflater?.inflate(R.layout.row_quest_reward, containerView, false) as? ViewGroup
         val imageView = view?.findViewById(R.id.imageView) as? PixelArtView
         val titleTextView = view?.findViewById(R.id.titleTextView) as? TextView
         imageView?.loadImage(item.imageName)
         if (item.count > 1) {
-            titleTextView?.text = context.getString(R.string.quest_reward_count, item.text, item.count)
+            titleTextView?.text =
+                context.getString(R.string.quest_reward_count, item.text, item.count)
         } else {
             titleTextView?.text = item.text
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/WonChallengeDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/WonChallengeDialog.kt
index 3cacdf2d8..063d944d0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/WonChallengeDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/WonChallengeDialog.kt
@@ -17,15 +17,19 @@ class WonChallengeDialog(context: Context) : HabiticaAlertDialog(context) {
         imageView?.loadImage("achievement-karaoke-2x")
 
         if (data?.name != null) {
-            additionalContentView?.findViewById<TextView>(R.id.description_view)?.text = context.getString(R.string.won_achievement_description, data.name).fromHtml()
+            additionalContentView?.findViewById<TextView>(R.id.description_view)?.text =
+                context.getString(R.string.won_achievement_description, data.name).fromHtml()
         }
         if ((data?.prize ?: 0) > 0) {
             addButton(context.getString(R.string.claim_x_gems, data?.prize), true)
-            additionalContentView?.findViewById<ImageView>(R.id.achievement_confetti_left)?.visibility = View.GONE
-            additionalContentView?.findViewById<ImageView>(R.id.achievement_confetti_right)?.visibility = View.GONE
+            additionalContentView?.findViewById<ImageView>(R.id.achievement_confetti_left)?.visibility =
+                View.GONE
+            additionalContentView?.findViewById<ImageView>(R.id.achievement_confetti_right)?.visibility =
+                View.GONE
         } else {
             addButton(R.string.hurray, true)
-            additionalContentView?.findViewById<ImageView>(R.id.achievement_confetti_view)?.visibility = View.GONE
+            additionalContentView?.findViewById<ImageView>(R.id.achievement_confetti_view)?.visibility =
+                View.GONE
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/equipment/EquipmentOverviewView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/equipment/EquipmentOverviewView.kt
index 01d75e36f..8e98fb78b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/equipment/EquipmentOverviewView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/equipment/EquipmentOverviewView.kt
@@ -28,38 +28,45 @@ import com.habitrpg.android.habitica.models.user.Outfit
 import com.habitrpg.android.habitica.models.user.Preferences
 import com.habitrpg.android.habitica.ui.theme.colors
 import com.habitrpg.android.habitica.ui.theme.pixelArtBackground
+import com.habitrpg.android.habitica.ui.views.PixelArtView
 import com.habitrpg.common.habitica.theme.HabiticaTheme
 import com.habitrpg.common.habitica.theme.caption2
-import com.habitrpg.android.habitica.ui.views.PixelArtView
 
 @Composable
 fun OverviewItem(
     text: String,
     iconName: String?,
     modifier: Modifier = Modifier,
-    isTwoHanded: Boolean = false
+    isTwoHanded: Boolean = false,
 ) {
-    val hasIcon = isTwoHanded || (iconName?.isNotBlank() == true && iconName != "shirt_" && !iconName.endsWith("_none") && !iconName.endsWith("_base_0") && !iconName.endsWith("_"))
+    val hasIcon =
+        isTwoHanded || (
+            iconName?.isNotBlank() == true && iconName != "shirt_" &&
+                !iconName.endsWith(
+                    "_none",
+                ) && !iconName.endsWith("_base_0") && !iconName.endsWith("_")
+        )
     Column(
         horizontalAlignment = Alignment.CenterHorizontally,
-        modifier = modifier
-            .width(70.dp)
+        modifier =
+            modifier
+                .width(70.dp),
     ) {
         Box(
             Modifier
                 .size(70.dp)
                 .clip(MaterialTheme.shapes.small)
                 .background(HabiticaTheme.colors.pixelArtBackground(hasIcon)),
-            contentAlignment = Alignment.Center
+            contentAlignment = Alignment.Center,
         ) {
             if (isTwoHanded) {
                 Image(painterResource(R.drawable.equipment_two_handed), null)
             } else if (hasIcon) {
                 PixelArtView(
                     imageName = iconName,
-                    modifier = Modifier
-                        .size(70.dp)
-
+                    modifier =
+                        Modifier
+                            .size(70.dp),
                 )
             } else {
                 Image(painterResource(R.drawable.empty_slot), null)
@@ -70,7 +77,7 @@ fun OverviewItem(
             style = HabiticaTheme.typography.caption2,
             color = colorResource(R.color.text_ternary),
             textAlign = TextAlign.Center,
-            modifier = Modifier.padding(top = 4.dp)
+            modifier = Modifier.padding(top = 4.dp),
         )
     }
 }
@@ -80,75 +87,84 @@ fun EquipmentOverviewView(
     outfit: Outfit?,
     isUsingTwohanded: Boolean,
     onEquipmentTap: (String, String?) -> Unit,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     Column(
         verticalArrangement = Arrangement.spacedBy(18.dp),
-        modifier = modifier
-            .fillMaxWidth()
-            .clip(MaterialTheme.shapes.medium)
-            .background(colorResource(R.color.equipment_column_background))
-            .padding(12.dp)
+        modifier =
+            modifier
+                .fillMaxWidth()
+                .clip(MaterialTheme.shapes.medium)
+                .background(colorResource(R.color.equipment_column_background))
+                .padding(12.dp),
     ) {
         Row(horizontalArrangement = Arrangement.SpaceBetween, modifier = Modifier.fillMaxWidth()) {
             OverviewItem(
                 stringResource(R.string.outfit_weapon),
                 outfit?.weapon.let { "shop_$it" },
-                modifier = Modifier.clickable {
-                    onEquipmentTap("weapon", outfit?.weapon)
-                }
+                modifier =
+                    Modifier.clickable {
+                        onEquipmentTap("weapon", outfit?.weapon)
+                    },
             )
             OverviewItem(
                 stringResource(R.string.outfit_shield),
                 outfit?.shield.let { "shop_$it" },
-                modifier = Modifier.clickable {
-                    onEquipmentTap("shield", outfit?.shield)
-                },
-                isUsingTwohanded
+                modifier =
+                    Modifier.clickable {
+                        onEquipmentTap("shield", outfit?.shield)
+                    },
+                isUsingTwohanded,
             )
             OverviewItem(
                 stringResource(R.string.outfit_head),
                 outfit?.head.let { "shop_$it" },
-                modifier = Modifier.clickable {
-                    onEquipmentTap("head", outfit?.head)
-                }
+                modifier =
+                    Modifier.clickable {
+                        onEquipmentTap("head", outfit?.head)
+                    },
             )
             OverviewItem(
                 stringResource(R.string.outfit_armor),
                 outfit?.armor.let { "shop_$it" },
-                modifier = Modifier.clickable {
-                    onEquipmentTap("armor", outfit?.armor)
-                }
+                modifier =
+                    Modifier.clickable {
+                        onEquipmentTap("armor", outfit?.armor)
+                    },
             )
         }
         Row(horizontalArrangement = Arrangement.SpaceBetween, modifier = Modifier.fillMaxWidth()) {
             OverviewItem(
                 stringResource(R.string.outfit_headAccessory),
                 outfit?.headAccessory.let { "shop_$it" },
-                modifier = Modifier.clickable {
-                    onEquipmentTap("headAccessory", outfit?.headAccessory)
-                }
+                modifier =
+                    Modifier.clickable {
+                        onEquipmentTap("headAccessory", outfit?.headAccessory)
+                    },
             )
             OverviewItem(
                 stringResource(R.string.outfit_body),
                 outfit?.body.let { "shop_$it" },
-                modifier = Modifier.clickable {
-                    onEquipmentTap("body", outfit?.body)
-                }
+                modifier =
+                    Modifier.clickable {
+                        onEquipmentTap("body", outfit?.body)
+                    },
             )
             OverviewItem(
                 stringResource(R.string.outfit_back),
                 outfit?.back.let { "shop_$it" },
-                modifier = Modifier.clickable {
-                    onEquipmentTap("back", outfit?.back)
-                }
+                modifier =
+                    Modifier.clickable {
+                        onEquipmentTap("back", outfit?.back)
+                    },
             )
             OverviewItem(
                 stringResource(R.string.outfit_eyewear),
                 outfit?.eyeWear.let { "shop_$it" },
-                modifier = Modifier.clickable {
-                    onEquipmentTap("eyewear", outfit?.eyeWear)
-                }
+                modifier =
+                    Modifier.clickable {
+                        onEquipmentTap("eyewear", outfit?.eyeWear)
+                    },
             )
         }
     }
@@ -160,104 +176,117 @@ fun AvatarCustomizationOverviewView(
     outfit: Outfit?,
     onCustomizationTap: (String, String?) -> Unit,
     onAvatarEquipmentTap: (String, String?) -> Unit,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     Column(
         verticalArrangement = Arrangement.spacedBy(18.dp),
-        modifier = modifier
-            .fillMaxWidth()
-            .clip(MaterialTheme.shapes.medium)
-            .background(colorResource(R.color.equipment_column_background))
-            .padding(12.dp)
+        modifier =
+            modifier
+                .fillMaxWidth()
+                .clip(MaterialTheme.shapes.medium)
+                .background(colorResource(R.color.equipment_column_background))
+                .padding(12.dp),
     ) {
         Row(horizontalArrangement = Arrangement.SpaceBetween, modifier = Modifier.fillMaxWidth()) {
             OverviewItem(
                 stringResource(R.string.avatar_shirt),
                 preferences?.shirt.let { "icon_${preferences?.size}_shirt_$it" },
-                modifier = Modifier.clickable {
-                    onCustomizationTap("shirt", null)
-                }
+                modifier =
+                    Modifier.clickable {
+                        onCustomizationTap("shirt", null)
+                    },
             )
             OverviewItem(
                 stringResource(R.string.avatar_skin),
                 preferences?.skin.let { "icon_skin_$it" },
-                modifier = Modifier.clickable {
-                    onCustomizationTap("skin", null)
-                }
+                modifier =
+                    Modifier.clickable {
+                        onCustomizationTap("skin", null)
+                    },
             )
             OverviewItem(
                 stringResource(R.string.avatar_hair_color),
                 if (preferences?.hair?.color != null && preferences.hair?.color != "") "icon_hair_bangs_1_" + preferences.hair?.color else "",
-                modifier = Modifier.clickable {
-                    onCustomizationTap("hair", "color")
-                }
+                modifier =
+                    Modifier.clickable {
+                        onCustomizationTap("hair", "color")
+                    },
             )
             OverviewItem(
                 stringResource(R.string.avatar_hair_bangs),
                 if (preferences?.hair?.bangs != null && preferences.hair?.bangs != 0) "icon_hair_bangs_" + preferences.hair?.bangs + "_" + preferences.hair?.color else "",
-                modifier = Modifier.clickable {
-                    onCustomizationTap("hair", "bangs")
-                }
+                modifier =
+                    Modifier.clickable {
+                        onCustomizationTap("hair", "bangs")
+                    },
             )
         }
         Row(horizontalArrangement = Arrangement.SpaceBetween, modifier = Modifier.fillMaxWidth()) {
             OverviewItem(
                 stringResource(R.string.avatar_style),
                 if (preferences?.hair?.base != null && preferences.hair?.base != 0) "icon_hair_base_" + preferences.hair?.base + "_" + preferences.hair?.color else "",
-                modifier = Modifier.clickable {
-                    onCustomizationTap("hair", "base")
-                }
+                modifier =
+                    Modifier.clickable {
+                        onCustomizationTap("hair", "base")
+                    },
             )
             OverviewItem(
                 stringResource(R.string.avatar_mustache),
                 if (preferences?.hair?.mustache != null && preferences.hair?.mustache != 0) "icon_hair_mustache_" + preferences.hair?.mustache + "_" + preferences.hair?.color else "",
-                modifier = Modifier.clickable {
-                    onCustomizationTap("hair", "mustache")
-                }
+                modifier =
+                    Modifier.clickable {
+                        onCustomizationTap("hair", "mustache")
+                    },
             )
             OverviewItem(
                 stringResource(R.string.avatar_beard),
                 if (preferences?.hair?.beard != null && preferences.hair?.beard != 0) "icon_hair_beard_" + preferences.hair?.beard + "_" + preferences.hair?.color else "",
-                modifier = Modifier.clickable {
-                    onCustomizationTap("hair", "beard")
-                }
+                modifier =
+                    Modifier.clickable {
+                        onCustomizationTap("hair", "beard")
+                    },
             )
             OverviewItem(
                 stringResource(R.string.avatar_flower),
                 if (preferences?.hair?.flower != null && preferences.hair?.flower != 0) "icon_hair_flower_" + preferences.hair?.flower else "",
-                modifier = Modifier.clickable {
-                    onCustomizationTap("hair", "flower")
-                }
+                modifier =
+                    Modifier.clickable {
+                        onCustomizationTap("hair", "flower")
+                    },
             )
         }
         Row(horizontalArrangement = Arrangement.SpaceBetween, modifier = Modifier.fillMaxWidth()) {
             OverviewItem(
                 stringResource(R.string.avatar_wheelchair),
                 preferences?.chair?.let { if (it.startsWith("handleless")) "icon_chair_$it" else "icon_$it" },
-                modifier = Modifier.clickable {
-                    onCustomizationTap("chair", null)
-                }
+                modifier =
+                    Modifier.clickable {
+                        onCustomizationTap("chair", null)
+                    },
             )
             OverviewItem(
                 stringResource(R.string.avatar_background),
                 preferences?.background.let { "icon_background_$it" },
-                modifier = Modifier.clickable {
-                    onCustomizationTap("background", null)
-                }
+                modifier =
+                    Modifier.clickable {
+                        onCustomizationTap("background", null)
+                    },
             )
             OverviewItem(
                 stringResource(R.string.animal_ears),
                 outfit?.headAccessory.let { "shop_$it" },
-                modifier = Modifier.clickable {
-                    onAvatarEquipmentTap("headAccessory", "animal")
-                }
+                modifier =
+                    Modifier.clickable {
+                        onAvatarEquipmentTap("headAccessory", "animal")
+                    },
             )
             OverviewItem(
                 stringResource(R.string.animal_tail),
                 outfit?.back.let { "shop_$it" },
-                modifier = Modifier.clickable {
-                    onAvatarEquipmentTap("back", "animal")
-                }
+                modifier =
+                    Modifier.clickable {
+                        onAvatarEquipmentTap("back", "animal")
+                    },
             )
         }
     }
@@ -269,7 +298,7 @@ fun EquipmentOverviewItemPreview() {
     Column(Modifier.width(320.dp)) {
         Row(
             modifier = Modifier.background(colorResource(id = R.color.equipment_overview_background)),
-            horizontalArrangement = Arrangement.spacedBy(8.dp)
+            horizontalArrangement = Arrangement.spacedBy(8.dp),
         ) {
             OverviewItem("Main-Hand", "shop_weapon_warrior_1")
             OverviewItem("Off-Hand", null, isTwoHanded = true)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientCurrencyDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientCurrencyDialog.kt
index bfb88bdfe..c0f6a8446 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientCurrencyDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientCurrencyDialog.kt
@@ -13,7 +13,6 @@ import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
  */
 
 abstract class InsufficientCurrencyDialog(context: Context) : HabiticaAlertDialog(context) {
-
     protected lateinit var imageView: ImageView
     protected lateinit var textView: TextView
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientGemsDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientGemsDialog.kt
index 5057f5429..24cd56fc4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientGemsDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientGemsDialog.kt
@@ -11,10 +11,10 @@ import com.google.firebase.analytics.FirebaseAnalytics
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.extensions.addCloseButton
 import com.habitrpg.android.habitica.helpers.AppConfigManager
-import com.habitrpg.common.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.helpers.PurchaseHandler
 import com.habitrpg.android.habitica.helpers.PurchaseTypes
 import com.habitrpg.android.habitica.interactors.InsufficientGemsUseCase
+import com.habitrpg.common.habitica.helpers.MainNavigationController
 import com.habitrpg.common.habitica.helpers.launchCatching
 import dagger.hilt.EntryPoint
 import dagger.hilt.InstallIn
@@ -25,13 +25,13 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import javax.inject.Inject
 
 /**
  * Created by phillip on 27.09.17.
  */
 
-class InsufficientGemsDialog(val parentActivity: Activity, var gemPrice: Int) : InsufficientCurrencyDialog(parentActivity) {
+class InsufficientGemsDialog(val parentActivity: Activity, var gemPrice: Int) :
+    InsufficientCurrencyDialog(parentActivity) {
     var configManager: AppConfigManager
     var purchaseHandler: PurchaseHandler
 
@@ -39,13 +39,20 @@ class InsufficientGemsDialog(val parentActivity: Activity, var gemPrice: Int) :
     @InstallIn(SingletonComponent::class)
     interface InsufficientGemsDialogEntryPoint {
         fun configManager(): AppConfigManager
+
         fun purchaseHandler(): PurchaseHandler
+
         fun insufficientGemsUseCase(): InsufficientGemsUseCase
     }
+
     var insufficientGemsUseCase: InsufficientGemsUseCase
 
     init {
-        val hiltEntryPoint = EntryPointAccessors.fromApplication(parentActivity, InsufficientGemsDialogEntryPoint::class.java)
+        val hiltEntryPoint =
+            EntryPointAccessors.fromApplication(
+                parentActivity,
+                InsufficientGemsDialogEntryPoint::class.java,
+            )
         insufficientGemsUseCase = hiltEntryPoint.insufficientGemsUseCase()
         configManager = hiltEntryPoint.configManager()
         purchaseHandler = hiltEntryPoint.purchaseHandler()
@@ -58,7 +65,15 @@ class InsufficientGemsDialog(val parentActivity: Activity, var gemPrice: Int) :
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         textView.setText(R.string.insufficientGems)
-        addButton(R.string.see_other_options, true) { _, _ -> MainNavigationController.navigate(R.id.gemPurchaseActivity, bundleOf(Pair("openSubscription", false))) }
+        addButton(
+            R.string.see_other_options,
+            true,
+        ) { _, _ ->
+            MainNavigationController.navigate(
+                R.id.gemPurchaseActivity,
+                bundleOf(Pair("openSubscription", false)),
+            )
+        }
         addCloseButton()
         contentView.setPadding(0, 0, 0, 0)
     }
@@ -68,16 +83,18 @@ class InsufficientGemsDialog(val parentActivity: Activity, var gemPrice: Int) :
         val purchaseTextView = contentView.findViewById<TextView>(R.id.purchase_textview)
         val purchaseButton = contentView.findViewById<Button>(R.id.purchase_button)
         purchaseHandler.startListening()
-        val gemSku = if (gemPrice > 4) {
-            purchaseTextView.text = "21"
-            PurchaseTypes.Purchase21Gems
-        } else {
-            purchaseTextView.text = "4"
-            PurchaseTypes.Purchase4Gems
-        }
+        val gemSku =
+            if (gemPrice > 4) {
+                purchaseTextView.text = "21"
+                PurchaseTypes.PURCHASE_21_GEMS
+            } else {
+                purchaseTextView.text = "4"
+                PurchaseTypes.PURCHASE_4_GEMS
+            }
         CoroutineScope(Dispatchers.IO).launch {
-            val sku = purchaseHandler.getInAppPurchaseSKU(gemSku)
-                ?: return@launch
+            val sku =
+                purchaseHandler.getInAppPurchaseSKU(gemSku)
+                    ?: return@launch
             withContext(Dispatchers.Main) {
                 purchaseButton?.text = sku.oneTimePurchaseOfferDetails?.formattedPrice
                 contentView.findViewById<ProgressBar>(R.id.loading_indicator).isVisible = false
@@ -86,14 +103,14 @@ class InsufficientGemsDialog(val parentActivity: Activity, var gemPrice: Int) :
                 purchaseButton?.setOnClickListener {
                     FirebaseAnalytics.getInstance(context).logEvent(
                         "purchased_gems_from_insufficient",
-                        bundleOf(Pair("gemPrice", gemPrice), Pair("sku", ""))
+                        bundleOf(Pair("gemPrice", gemPrice), Pair("sku", "")),
                     )
                     MainScope().launchCatching {
                         insufficientGemsUseCase.callInteractor(
                             InsufficientGemsUseCase.RequestValues(
                                 gemPrice,
-                                parentActivity
-                            )
+                                parentActivity,
+                            ),
                         )
                     }
                 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientGoldDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientGoldDialog.kt
index 71a6200c6..0c1828427 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientGoldDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientGoldDialog.kt
@@ -5,7 +5,6 @@ import android.os.Bundle
 import com.habitrpg.android.habitica.R
 
 class InsufficientGoldDialog(context: Context) : InsufficientCurrencyDialog(context) {
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         imageView.setImageResource(R.drawable.gold_multiple)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientHourglassesDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientHourglassesDialog.kt
index b63249fbd..3cab53d00 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientHourglassesDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientHourglassesDialog.kt
@@ -5,8 +5,8 @@ import android.os.Bundle
 import androidx.core.os.bundleOf
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.extensions.addCloseButton
-import com.habitrpg.common.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
+import com.habitrpg.common.habitica.helpers.MainNavigationController
 
 class InsufficientHourglassesDialog(context: Context) : InsufficientCurrencyDialog(context) {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -14,7 +14,15 @@ class InsufficientHourglassesDialog(context: Context) : InsufficientCurrencyDial
         imageView.setImageBitmap(HabiticaIconsHelper.imageOfHourglassShop())
         textView.setText(R.string.insufficientHourglasses)
 
-        addButton(R.string.get_hourglasses, true) { _, _ -> MainNavigationController.navigate(R.id.gemPurchaseActivity, bundleOf(Pair("openSubscription", true))) }
+        addButton(
+            R.string.get_hourglasses,
+            true,
+        ) { _, _ ->
+            MainNavigationController.navigate(
+                R.id.gemPurchaseActivity,
+                bundleOf(Pair("openSubscription", true)),
+            )
+        }
         addCloseButton()
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/LockableScrollView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/LockableScrollView.kt
index 2604272f4..faacdd87d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/LockableScrollView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/LockableScrollView.kt
@@ -6,7 +6,6 @@ import android.view.MotionEvent
 import androidx.core.widget.NestedScrollView
 
 class LockableScrollView(context: Context, attrs: AttributeSet) : NestedScrollView(context, attrs) {
-
     var isScrollable = true
 
     override fun onTouchEvent(ev: MotionEvent): Boolean {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/LoginBackgroundView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/LoginBackgroundView.kt
index 49f6c7716..4cd9933c2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/LoginBackgroundView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/LoginBackgroundView.kt
@@ -40,13 +40,14 @@ class LoginBackgroundView(context: Context, attrs: AttributeSet?) : RelativeLayo
     init {
         val metrics = DisplayMetrics()
         val windowManager = context.getSystemService(Context.WINDOW_SERVICE) as WindowManager
-        viewHeight = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            windowManager.currentWindowMetrics.bounds.height()
-        } else {
-            @Suppress("DEPRECATION")
-            windowManager.defaultDisplay.getMetrics(metrics)
-            (metrics.heightPixels * SIZE_FACTOR).toInt()
-        }
+        viewHeight =
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                windowManager.currentWindowMetrics.bounds.height()
+            } else {
+                @Suppress("DEPRECATION")
+                windowManager.defaultDisplay.getMetrics(metrics)
+                (metrics.heightPixels * SIZE_FACTOR).toInt()
+            }
     }
 
     override fun onFinishInflate() {
@@ -59,17 +60,22 @@ class LoginBackgroundView(context: Context, attrs: AttributeSet?) : RelativeLayo
     }
 
     private fun animateClouds() {
-        val leftAnimator = ObjectAnimator.ofFloat(leftCloudView, View.TRANSLATION_Y, 10.0f).setDuration(5000)
+        val leftAnimator =
+            ObjectAnimator.ofFloat(leftCloudView, View.TRANSLATION_Y, 10.0f).setDuration(5000)
         leftAnimator.repeatCount = ValueAnimator.INFINITE
         leftAnimator.repeatMode = ValueAnimator.REVERSE
         leftAnimator.start()
-        val rightAnimator = ObjectAnimator.ofFloat(rightCloudView, View.TRANSLATION_Y, -10.0f).setDuration(8000)
+        val rightAnimator =
+            ObjectAnimator.ofFloat(rightCloudView, View.TRANSLATION_Y, -10.0f).setDuration(8000)
         rightAnimator.repeatCount = ValueAnimator.INFINITE
         rightAnimator.repeatMode = ValueAnimator.REVERSE
         rightAnimator.start()
     }
 
-    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+    override fun onMeasure(
+        widthMeasureSpec: Int,
+        heightMeasureSpec: Int,
+    ) {
         this.viewWidth = MeasureSpec.getSize(widthMeasureSpec)
         this.setMeasuredDimension(viewWidth, viewHeight)
         params.width = viewWidth
@@ -78,7 +84,13 @@ class LoginBackgroundView(context: Context, attrs: AttributeSet?) : RelativeLayo
         super.onMeasure(widthMeasureSpec, heightMeasureSpec)
     }
 
-    override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) {
+    override fun onLayout(
+        changed: Boolean,
+        l: Int,
+        t: Int,
+        r: Int,
+        b: Int,
+    ) {
         super.onLayout(changed, l, t, r, b)
         updateStarLayoutParams()
     }
@@ -87,7 +99,11 @@ class LoginBackgroundView(context: Context, attrs: AttributeSet?) : RelativeLayo
         generateStars(1, 12, 25)
     }
 
-    private fun generateStars(largeCount: Int, mediumCount: Int, smallCount: Int) {
+    private fun generateStars(
+        largeCount: Int,
+        mediumCount: Int,
+        smallCount: Int,
+    ) {
         removeStarViews()
         repeat((0 until largeCount).count()) { generateStar(2) }
         repeat((0 until mediumCount).count()) { generateStar(1) }
@@ -127,7 +143,6 @@ class LoginBackgroundView(context: Context, attrs: AttributeSet?) : RelativeLayo
     }
 
     companion object {
-
         private const val SIZE_FACTOR = 1.5f
         private const val STAR_SIZE = 30
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/StarView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/StarView.kt
index 979916af4..cd2c0f95d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/StarView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/StarView.kt
@@ -11,7 +11,6 @@ import androidx.appcompat.widget.AppCompatImageView
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 
 class StarView : AppCompatImageView {
-
     private var blinkDurations: List<Int>? = null
     private var blinkIndex = 0
 
@@ -26,9 +25,11 @@ class StarView : AppCompatImageView {
             0 -> {
                 this.setImageBitmap(HabiticaIconsHelper.imageOfStarSmall())
             }
+
             1 -> {
                 this.setImageBitmap(HabiticaIconsHelper.imageOfStarMedium())
             }
+
             2 -> {
                 this.setImageBitmap(HabiticaIconsHelper.imageOfStarLarge())
             }
@@ -49,12 +50,14 @@ class StarView : AppCompatImageView {
         animator.startDelay = blinkDurations?.get(blinkIndex)?.toLong() ?: 0
         animator.repeatCount = 1
         animator.repeatMode = ValueAnimator.REVERSE
-        animator.addListener(object : AnimatorListenerAdapter() {
-            override fun onAnimationEnd(animation: Animator) {
-                blinkIndex++
-                runBlink()
-            }
-        })
+        animator.addListener(
+            object : AnimatorListenerAdapter() {
+                override fun onAnimationEnd(animation: Animator) {
+                    blinkIndex++
+                    runBlink()
+                }
+            },
+        )
         try {
             animator.start()
         } catch (ignored: NullPointerException) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/BottomNavigationItem.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/BottomNavigationItem.kt
index ece808ec7..d0143eece 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/BottomNavigationItem.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/BottomNavigationItem.kt
@@ -9,67 +9,84 @@ import android.widget.RelativeLayout
 import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.BottomNavigationItemBinding
-import com.habitrpg.common.habitica.extensions.setTintWith
 import com.habitrpg.common.habitica.extensions.getThemeColor
 import com.habitrpg.common.habitica.extensions.isUsingNightModeResources
 import com.habitrpg.common.habitica.extensions.layoutInflater
+import com.habitrpg.common.habitica.extensions.setTintWith
 
-class BottomNavigationItem @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
-) : RelativeLayout(context, attrs, defStyleAttr) {
-    private var selectedIcon: Drawable? = null
-    private var icon: Drawable? = null
-    private val binding = BottomNavigationItemBinding.inflate(context.layoutInflater, this)
+class BottomNavigationItem
+    @JvmOverloads
+    constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0,
+    ) : RelativeLayout(context, attrs, defStyleAttr) {
+        private var selectedIcon: Drawable? = null
+        private var icon: Drawable? = null
+        private val binding = BottomNavigationItemBinding.inflate(context.layoutInflater, this)
 
-    private var selectedVisibility = View.VISIBLE
-    private var deselectedVisibility = View.VISIBLE
+        private var selectedVisibility = View.VISIBLE
+        private var deselectedVisibility = View.VISIBLE
 
-    var isActive = false
-        set(value) {
-            field = value
-            if (isActive) {
-                binding.selectedTitleView.visibility = selectedVisibility
-                binding.titleView.visibility = View.GONE
-                binding.iconView.setImageDrawable(selectedIcon)
-                if (context.isUsingNightModeResources()) {
-                    binding.iconView.drawable.setTintWith(context.getThemeColor(R.attr.colorPrimaryDistinct), PorterDuff.Mode.SRC_ATOP)
+        var isActive = false
+            set(value) {
+                field = value
+                if (isActive) {
+                    binding.selectedTitleView.visibility = selectedVisibility
+                    binding.titleView.visibility = View.GONE
+                    binding.iconView.setImageDrawable(selectedIcon)
+                    if (context.isUsingNightModeResources()) {
+                        binding.iconView.drawable.setTintWith(
+                            context.getThemeColor(R.attr.colorPrimaryDistinct),
+                            PorterDuff.Mode.SRC_ATOP,
+                        )
+                    } else {
+                        binding.iconView.drawable.setTintWith(
+                            ContextCompat.getColor(
+                                context,
+                                R.color.white,
+                            ),
+                            PorterDuff.Mode.SRC_ATOP,
+                        )
+                    }
                 } else {
-                    binding.iconView.drawable.setTintWith(ContextCompat.getColor(context, R.color.white), PorterDuff.Mode.SRC_ATOP)
+                    binding.selectedTitleView.visibility = View.GONE
+                    binding.iconView.setImageDrawable(icon)
+                    binding.titleView.visibility = deselectedVisibility
+                    binding.iconView.drawable.setTintWith(
+                        context.getThemeColor(R.attr.textColorPrimaryDark),
+                        PorterDuff.Mode.SRC_ATOP,
+                    )
                 }
-            } else {
-                binding.selectedTitleView.visibility = View.GONE
+            }
+
+        var badgeCount: Int = 0
+            set(value) {
+                field = value
+                if (value == 0) {
+                    binding.badge.visibility = View.INVISIBLE
+                } else {
+                    binding.badge.visibility = View.VISIBLE
+                    binding.badge.text = value.toString()
+                }
+            }
+
+        init {
+            val attributes =
+                context.theme?.obtainStyledAttributes(
+                    attrs,
+                    R.styleable.BottomNavigationItem,
+                    0,
+                    0,
+                )
+            if (attributes != null) {
+                icon = attributes.getDrawable(R.styleable.BottomNavigationItem_iconDrawable)
+                selectedIcon =
+                    attributes.getDrawable(R.styleable.BottomNavigationItem_selectedIconDrawable)
                 binding.iconView.setImageDrawable(icon)
-                binding.titleView.visibility = deselectedVisibility
-                binding.iconView.drawable.setTintWith(context.getThemeColor(R.attr.textColorPrimaryDark), PorterDuff.Mode.SRC_ATOP)
+                binding.titleView.text = attributes.getString(R.styleable.BottomNavigationItem_title)
+                binding.selectedTitleView.text =
+                    attributes.getString(R.styleable.BottomNavigationItem_title)
             }
         }
-
-    var badgeCount: Int = 0
-        set(value) {
-            field = value
-            if (value == 0) {
-                binding.badge.visibility = View.INVISIBLE
-            } else {
-                binding.badge.visibility = View.VISIBLE
-                binding.badge.text = value.toString()
-            }
-        }
-
-    init {
-        val attributes = context.theme?.obtainStyledAttributes(
-            attrs,
-            R.styleable.BottomNavigationItem,
-            0,
-            0
-        )
-        if (attributes != null) {
-            icon = attributes.getDrawable(R.styleable.BottomNavigationItem_iconDrawable)
-            selectedIcon = attributes.getDrawable(R.styleable.BottomNavigationItem_selectedIconDrawable)
-            binding.iconView.setImageDrawable(icon)
-            binding.titleView.text = attributes.getString(R.styleable.BottomNavigationItem_title)
-            binding.selectedTitleView.text = attributes.getString(R.styleable.BottomNavigationItem_title)
-        }
     }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/BottomNavigationSubmenuItem.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/BottomNavigationSubmenuItem.kt
index ae537db51..4383636af 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/BottomNavigationSubmenuItem.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/BottomNavigationSubmenuItem.kt
@@ -7,40 +7,42 @@ import android.widget.RelativeLayout
 import com.habitrpg.android.habitica.databinding.BottomNavigationSubmenuBinding
 import com.habitrpg.common.habitica.extensions.layoutInflater
 
-class BottomNavigationSubmenuItem @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
-) : RelativeLayout(context, attrs, defStyleAttr) {
-    private val binding = BottomNavigationSubmenuBinding.inflate(context.layoutInflater, this)
+class BottomNavigationSubmenuItem
+    @JvmOverloads
+    constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0,
+    ) : RelativeLayout(context, attrs, defStyleAttr) {
+        private val binding = BottomNavigationSubmenuBinding.inflate(context.layoutInflater, this)
 
-    var onAddListener: (() -> Unit)? = null
+        var onAddListener: (() -> Unit)? = null
 
-    val measuredTitleWidth: Int
-        get() {
-            binding.titleView.measure(width, height)
-            return binding.titleView.measuredWidth
+        val measuredTitleWidth: Int
+            get() {
+                binding.titleView.measure(width, height)
+                return binding.titleView.measuredWidth
+            }
+
+        var icon: Drawable? = null
+            set(value) {
+                field = value
+                binding.iconView.setImageDrawable(value)
+            }
+        var title: String? = null
+            set(value) {
+                field = value
+                binding.titleView.text = title
+            }
+
+        init {
+            binding.iconView.setOnClickListener { onAddListener?.invoke() }
+            binding.titleView.setOnClickListener { onAddListener?.invoke() }
         }
 
-    var icon: Drawable? = null
-        set(value) {
-            field = value
-            binding.iconView.setImageDrawable(value)
+        fun setTitleWidth(width: Int) {
+            val layoutParams = binding.titleView.layoutParams as? LayoutParams
+            layoutParams?.width = width
+            binding.titleView.layoutParams = layoutParams
         }
-    var title: String? = null
-        set(value) {
-            field = value
-            binding.titleView.text = title
-        }
-
-    init {
-        binding.iconView.setOnClickListener { onAddListener?.invoke() }
-        binding.titleView.setOnClickListener { onAddListener?.invoke() }
     }
-
-    fun setTitleWidth(width: Int) {
-        val layoutParams = binding.titleView.layoutParams as? LayoutParams
-        layoutParams?.width = width
-        binding.titleView.layoutParams = layoutParams
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/HabiticaBottomNavigationView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/HabiticaBottomNavigationView.kt
index f4abc290a..d4a396b96 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/HabiticaBottomNavigationView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/HabiticaBottomNavigationView.kt
@@ -15,237 +15,275 @@ import androidx.core.view.ViewCompat
 import androidx.core.view.children
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.MainNavigationViewBinding
-import com.habitrpg.common.habitica.extensions.setTintWith
 import com.habitrpg.common.habitica.extensions.getThemeColor
 import com.habitrpg.common.habitica.extensions.layoutInflater
+import com.habitrpg.common.habitica.extensions.setTintWith
 import com.habitrpg.shared.habitica.models.tasks.TaskType
 
 interface HabiticaBottomNavigationViewListener {
-    fun onTabSelected(taskType: TaskType, smooth: Boolean)
+    fun onTabSelected(
+        taskType: TaskType,
+        smooth: Boolean,
+    )
+
     fun onAdd(taskType: TaskType)
 }
 
-class HabiticaBottomNavigationView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
-) : RelativeLayout(context, attrs, defStyleAttr) {
-    private val binding = MainNavigationViewBinding.inflate(context.layoutInflater, this)
+class HabiticaBottomNavigationView
+    @JvmOverloads
+    constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0,
+    ) : RelativeLayout(context, attrs, defStyleAttr) {
+        private val binding = MainNavigationViewBinding.inflate(context.layoutInflater, this)
 
-    private var isShowingSubmenu: Boolean = false
-    var selectedPosition: Int
-        get() {
-            return when (activeTaskType) {
-                TaskType.DAILY -> 1
-                TaskType.REWARD -> 2
-                TaskType.TODO -> 3
-                else -> 0
-            }
-        }
-        set(value) {
-            activeTaskType = when (value) {
-                1 -> TaskType.DAILY
-                2 -> TaskType.TODO
-                3 -> TaskType.REWARD
-                else -> TaskType.HABIT
-            }
-        }
-    var listener: HabiticaBottomNavigationViewListener? = null
-    var activeTaskType: TaskType = TaskType.HABIT
-        set(value) {
-            val wasChanged = field != value
-            field = value
-            if (wasChanged) {
-                updateItemSelection()
-                listener?.onTabSelected(value, true)
-            }
-        }
-
-    var canAddTasks = true
-        set(value) {
-            if (field == value) return
-            field = value
-            binding.addButton.isEnabled = value
-            val animator = ObjectAnimator.ofFloat(0f, 1.0f)
-            if (field) {
-                binding.addButtonBackground.animate()
-                    .translationY(0f)
-                    .alpha(1f)
-                    .setDuration(200)
-            } else {
-                binding.addButtonBackground.animate()
-                    .translationY(-binding.addButtonBackground.height.toFloat() / 2)
-                    .alpha(0.0f)
-                    .setDuration(200)
-            }
-            animator.duration = 200
-            animator.start()
-        }
-
-    val barHeight: Int
-        get() = binding.itemWrapper.measuredHeight
-
-    init {
-        binding.habitsTab.setOnClickListener { activeTaskType = TaskType.HABIT }
-        binding.dailiesTab.setOnClickListener { activeTaskType = TaskType.DAILY }
-        binding.todosTab.setOnClickListener { activeTaskType = TaskType.TODO }
-        binding.rewardsTab.setOnClickListener { activeTaskType = TaskType.REWARD }
-        binding.addButton.setOnClickListener {
-            if (isShowingSubmenu) {
-                hideSubmenu()
-            } else {
-                listener?.onAdd(activeTaskType)
-            }
-            animateButtonTap()
-        }
-        binding.addButton.setOnLongClickListener {
-            showSubmenu()
-            animateButtonTap()
-            true
-        }
-        binding.addButton.setOnTouchListener { _, event ->
-            if (event.action == MotionEvent.ACTION_DOWN) {
-                val animX = ObjectAnimator.ofFloat(binding.addButton, "scaleX", 1f, 1.1f)
-                animX.duration = 100
-                animX.interpolator = LinearInterpolator()
-                animX.start()
-                val animY = ObjectAnimator.ofFloat(binding.addButton, "scaleY", 1f, 1.1f)
-                animY.duration = 100
-                animY.interpolator = LinearInterpolator()
-                animY.start()
-                val animXBackground = ObjectAnimator.ofFloat(binding.addButtonBackground, "scaleX", 1f, 0.9f)
-                animXBackground.duration = 100
-                animXBackground.interpolator = LinearInterpolator()
-                animXBackground.start()
-                val animYBackground = ObjectAnimator.ofFloat(binding.addButtonBackground, "scaleY", 1f, 0.9f)
-                animYBackground.duration = 100
-                animYBackground.interpolator = LinearInterpolator()
-                animYBackground.start()
-            }
-            false
-        }
-        binding.submenuWrapper.setOnClickListener { hideSubmenu() }
-        updateItemSelection()
-
-        val cutout = ContextCompat.getDrawable(context, R.drawable.bottom_navigation_inset)
-        cutout?.setTintWith(context.getThemeColor(R.attr.barColor), PorterDuff.Mode.MULTIPLY)
-        binding.cutoutBackground.setImageDrawable(cutout)
-        val fabBackground = ContextCompat.getDrawable(context, R.drawable.fab_background)
-        fabBackground?.setTintWith(context.getThemeColor(R.attr.colorAccent), PorterDuff.Mode.MULTIPLY)
-        binding.addButtonBackground.background = fabBackground
-    }
-
-    private fun animateButtonTap() {
-        val animX = ObjectAnimator.ofFloat(binding.addButton, "scaleX", 1.3f, 1f)
-        animX.duration = 400
-        animX.interpolator = BounceInterpolator()
-        animX.start()
-        val animY = ObjectAnimator.ofFloat(binding.addButton, "scaleY", 1.3f, 1f)
-        animY.duration = 400
-        animY.interpolator = BounceInterpolator()
-        animY.start()
-        val animXBackground = ObjectAnimator.ofFloat(binding.addButtonBackground, "scaleX", 0.9f, 1f)
-        animXBackground.duration = 600
-        animXBackground.interpolator = BounceInterpolator()
-        animXBackground.start()
-        val animYBackground = ObjectAnimator.ofFloat(binding.addButtonBackground, "scaleY", 0.9f, 1f)
-        animYBackground.duration = 600
-        animYBackground.interpolator = BounceInterpolator()
-        animYBackground.start()
-    }
-
-    private fun showSubmenu() {
-        if (isShowingSubmenu) return
-        isShowingSubmenu = true
-
-        val rotate = RotateAnimation(0f, 135f, Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f)
-        rotate.duration = 250
-        rotate.interpolator = LinearInterpolator()
-        rotate.fillAfter = true
-        binding.addButton.startAnimation(rotate)
-
-        var pos = 4
-        binding.submenuWrapper.removeAllViews()
-        for (taskType in listOf(TaskType.HABIT, TaskType.DAILY, TaskType.TODO, TaskType.REWARD)) {
-            val view = BottomNavigationSubmenuItem(context)
-            when (taskType) {
-                TaskType.HABIT -> {
-                    view.icon = ContextCompat.getDrawable(context, R.drawable.add_habit)
-                    view.title = context.getString(R.string.habit)
-                }
-                TaskType.DAILY -> {
-                    view.icon = ContextCompat.getDrawable(context, R.drawable.add_daily)
-                    view.title = context.getString(R.string.daily)
-                }
-                TaskType.TODO -> {
-                    view.icon = ContextCompat.getDrawable(context, R.drawable.add_todo)
-                    view.title = context.getString(R.string.todo)
-                }
-                TaskType.REWARD -> {
-                    view.icon = ContextCompat.getDrawable(context, R.drawable.add_rewards)
-                    view.title = context.getString(R.string.reward)
+        private var isShowingSubmenu: Boolean = false
+        var selectedPosition: Int
+            get() {
+                return when (activeTaskType) {
+                    TaskType.DAILY -> 1
+                    TaskType.REWARD -> 2
+                    TaskType.TODO -> 3
+                    else -> 0
                 }
             }
-            view.onAddListener = {
-                listener?.onAdd(taskType)
-                hideSubmenu()
+            set(value) {
+                activeTaskType =
+                    when (value) {
+                        1 -> TaskType.DAILY
+                        2 -> TaskType.TODO
+                        3 -> TaskType.REWARD
+                        else -> TaskType.HABIT
+                    }
             }
-            binding.submenuWrapper.addView(view)
-            view.alpha = 0f
-            view.scaleY = 0.7f
-            ViewCompat.animate(view).alpha(1f).setDuration(250.toLong()).startDelay = (100 * pos).toLong()
-            ViewCompat.animate(view).scaleY(1f).setDuration(250.toLong()).startDelay = (100 * pos).toLong()
-            pos -= 1
+        var listener: HabiticaBottomNavigationViewListener? = null
+        var activeTaskType: TaskType = TaskType.HABIT
+            set(value) {
+                val wasChanged = field != value
+                field = value
+                if (wasChanged) {
+                    updateItemSelection()
+                    listener?.onTabSelected(value, true)
+                }
+            }
+
+        var canAddTasks = true
+            set(value) {
+                if (field == value) return
+                field = value
+                binding.addButton.isEnabled = value
+                val animator = ObjectAnimator.ofFloat(0f, 1.0f)
+                if (field) {
+                    binding.addButtonBackground.animate()
+                        .translationY(0f)
+                        .alpha(1f)
+                        .setDuration(200)
+                } else {
+                    binding.addButtonBackground.animate()
+                        .translationY(-binding.addButtonBackground.height.toFloat() / 2)
+                        .alpha(0.0f)
+                        .setDuration(200)
+                }
+                animator.duration = 200
+                animator.start()
+            }
+
+        val barHeight: Int
+            get() = binding.itemWrapper.measuredHeight
+
+        init {
+            binding.habitsTab.setOnClickListener { activeTaskType = TaskType.HABIT }
+            binding.dailiesTab.setOnClickListener { activeTaskType = TaskType.DAILY }
+            binding.todosTab.setOnClickListener { activeTaskType = TaskType.TODO }
+            binding.rewardsTab.setOnClickListener { activeTaskType = TaskType.REWARD }
+            binding.addButton.setOnClickListener {
+                if (isShowingSubmenu) {
+                    hideSubmenu()
+                } else {
+                    listener?.onAdd(activeTaskType)
+                }
+                animateButtonTap()
+            }
+            binding.addButton.setOnLongClickListener {
+                showSubmenu()
+                animateButtonTap()
+                true
+            }
+            binding.addButton.setOnTouchListener { _, event ->
+                if (event.action == MotionEvent.ACTION_DOWN) {
+                    val animX = ObjectAnimator.ofFloat(binding.addButton, "scaleX", 1f, 1.1f)
+                    animX.duration = 100
+                    animX.interpolator = LinearInterpolator()
+                    animX.start()
+                    val animY = ObjectAnimator.ofFloat(binding.addButton, "scaleY", 1f, 1.1f)
+                    animY.duration = 100
+                    animY.interpolator = LinearInterpolator()
+                    animY.start()
+                    val animXBackground =
+                        ObjectAnimator.ofFloat(binding.addButtonBackground, "scaleX", 1f, 0.9f)
+                    animXBackground.duration = 100
+                    animXBackground.interpolator = LinearInterpolator()
+                    animXBackground.start()
+                    val animYBackground =
+                        ObjectAnimator.ofFloat(binding.addButtonBackground, "scaleY", 1f, 0.9f)
+                    animYBackground.duration = 100
+                    animYBackground.interpolator = LinearInterpolator()
+                    animYBackground.start()
+                }
+                false
+            }
+            binding.submenuWrapper.setOnClickListener { hideSubmenu() }
+            updateItemSelection()
+
+            val cutout = ContextCompat.getDrawable(context, R.drawable.bottom_navigation_inset)
+            cutout?.setTintWith(context.getThemeColor(R.attr.barColor), PorterDuff.Mode.MULTIPLY)
+            binding.cutoutBackground.setImageDrawable(cutout)
+            val fabBackground = ContextCompat.getDrawable(context, R.drawable.fab_background)
+            fabBackground?.setTintWith(
+                context.getThemeColor(R.attr.colorAccent),
+                PorterDuff.Mode.MULTIPLY,
+            )
+            binding.addButtonBackground.background = fabBackground
         }
-        var widestWidth = 0
-        for (view in binding.submenuWrapper.children) {
-            if (view is BottomNavigationSubmenuItem) {
-                val width = view.measuredTitleWidth
-                if (widestWidth < width) {
-                    widestWidth = width
+
+        private fun animateButtonTap() {
+            val animX = ObjectAnimator.ofFloat(binding.addButton, "scaleX", 1.3f, 1f)
+            animX.duration = 400
+            animX.interpolator = BounceInterpolator()
+            animX.start()
+            val animY = ObjectAnimator.ofFloat(binding.addButton, "scaleY", 1.3f, 1f)
+            animY.duration = 400
+            animY.interpolator = BounceInterpolator()
+            animY.start()
+            val animXBackground =
+                ObjectAnimator.ofFloat(binding.addButtonBackground, "scaleX", 0.9f, 1f)
+            animXBackground.duration = 600
+            animXBackground.interpolator = BounceInterpolator()
+            animXBackground.start()
+            val animYBackground =
+                ObjectAnimator.ofFloat(binding.addButtonBackground, "scaleY", 0.9f, 1f)
+            animYBackground.duration = 600
+            animYBackground.interpolator = BounceInterpolator()
+            animYBackground.start()
+        }
+
+        private fun showSubmenu() {
+            if (isShowingSubmenu) return
+            isShowingSubmenu = true
+
+            val rotate =
+                RotateAnimation(
+                    0f,
+                    135f,
+                    Animation.RELATIVE_TO_SELF,
+                    0.5f,
+                    Animation.RELATIVE_TO_SELF,
+                    0.5f,
+                )
+            rotate.duration = 250
+            rotate.interpolator = LinearInterpolator()
+            rotate.fillAfter = true
+            binding.addButton.startAnimation(rotate)
+
+            var pos = 4
+            binding.submenuWrapper.removeAllViews()
+            for (taskType in listOf(TaskType.HABIT, TaskType.DAILY, TaskType.TODO, TaskType.REWARD)) {
+                val view = BottomNavigationSubmenuItem(context)
+                when (taskType) {
+                    TaskType.HABIT -> {
+                        view.icon = ContextCompat.getDrawable(context, R.drawable.add_habit)
+                        view.title = context.getString(R.string.habit)
+                    }
+
+                    TaskType.DAILY -> {
+                        view.icon = ContextCompat.getDrawable(context, R.drawable.add_daily)
+                        view.title = context.getString(R.string.daily)
+                    }
+
+                    TaskType.TODO -> {
+                        view.icon = ContextCompat.getDrawable(context, R.drawable.add_todo)
+                        view.title = context.getString(R.string.todo)
+                    }
+
+                    TaskType.REWARD -> {
+                        view.icon = ContextCompat.getDrawable(context, R.drawable.add_rewards)
+                        view.title = context.getString(R.string.reward)
+                    }
+                }
+                view.onAddListener = {
+                    listener?.onAdd(taskType)
+                    hideSubmenu()
+                }
+                binding.submenuWrapper.addView(view)
+                view.alpha = 0f
+                view.scaleY = 0.7f
+                ViewCompat.animate(view).alpha(1f).setDuration(250.toLong()).startDelay =
+                    (100 * pos).toLong()
+                ViewCompat.animate(view).scaleY(1f).setDuration(250.toLong()).startDelay =
+                    (100 * pos).toLong()
+                pos -= 1
+            }
+            var widestWidth = 0
+            for (view in binding.submenuWrapper.children) {
+                if (view is BottomNavigationSubmenuItem) {
+                    val width = view.measuredTitleWidth
+                    if (widestWidth < width) {
+                        widestWidth = width
+                    }
+                }
+            }
+            for (view in binding.submenuWrapper.children) {
+                if (view is BottomNavigationSubmenuItem) {
+                    view.setTitleWidth(widestWidth)
                 }
             }
         }
-        for (view in binding.submenuWrapper.children) {
-            if (view is BottomNavigationSubmenuItem) {
-                view.setTitleWidth(widestWidth)
+
+        private fun hideSubmenu() {
+            isShowingSubmenu = false
+            var pos = 0
+
+            val rotate =
+                RotateAnimation(
+                    135f,
+                    0f,
+                    Animation.RELATIVE_TO_SELF,
+                    0.5f,
+                    Animation.RELATIVE_TO_SELF,
+                    0.5f,
+                )
+            rotate.duration = 250
+            rotate.interpolator = LinearInterpolator()
+            rotate.fillAfter = true
+            binding.addButton.startAnimation(rotate)
+
+            for (view in binding.submenuWrapper.children) {
+                view.alpha = 1f
+                view.scaleY = 1f
+                ViewCompat.animate(view).alpha(0f).setDuration(200.toLong()).startDelay =
+                    (150 * pos).toLong()
+                ViewCompat.animate(view).scaleY(0.7f).setDuration(250.toLong())
+                    .setStartDelay((100 * pos).toLong())
+                    .withEndAction { binding.submenuWrapper.removeView(view) }
+                pos += 1
             }
         }
-    }
 
-    private fun hideSubmenu() {
-        isShowingSubmenu = false
-        var pos = 0
+        fun tabWithId(id: Int): BottomNavigationItem? {
+            return when (id) {
+                R.id.habits_tab -> binding.habitsTab
+                R.id.dailies_tab -> binding.dailiesTab
+                R.id.todos_tab -> binding.todosTab
+                R.id.rewards_tab -> binding.rewardsTab
+                else -> null
+            }
+        }
 
-        val rotate = RotateAnimation(135f, 0f, Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f)
-        rotate.duration = 250
-        rotate.interpolator = LinearInterpolator()
-        rotate.fillAfter = true
-        binding.addButton.startAnimation(rotate)
-
-        for (view in binding.submenuWrapper.children) {
-            view.alpha = 1f
-            view.scaleY = 1f
-            ViewCompat.animate(view).alpha(0f).setDuration(200.toLong()).startDelay = (150 * pos).toLong()
-            ViewCompat.animate(view).scaleY(0.7f).setDuration(250.toLong()).setStartDelay((100 * pos).toLong()).withEndAction { binding.submenuWrapper.removeView(view) }
-            pos += 1
+        private fun updateItemSelection() {
+            binding.habitsTab.isActive = activeTaskType == TaskType.HABIT
+            binding.dailiesTab.isActive = activeTaskType == TaskType.DAILY
+            binding.todosTab.isActive = activeTaskType == TaskType.TODO
+            binding.rewardsTab.isActive = activeTaskType == TaskType.REWARD
         }
     }
-
-    fun tabWithId(id: Int): BottomNavigationItem? {
-        return when (id) {
-            R.id.habits_tab -> binding.habitsTab
-            R.id.dailies_tab -> binding.dailiesTab
-            R.id.todos_tab -> binding.todosTab
-            R.id.rewards_tab -> binding.rewardsTab
-            else -> null
-        }
-    }
-
-    private fun updateItemSelection() {
-        binding.habitsTab.isActive = activeTaskType == TaskType.HABIT
-        binding.dailiesTab.isActive = activeTaskType == TaskType.DAILY
-        binding.todosTab.isActive = activeTaskType == TaskType.TODO
-        binding.rewardsTab.isActive = activeTaskType == TaskType.REWARD
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/preferences/PauseResumeDamageView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/preferences/PauseResumeDamageView.kt
index 54661a7d1..08f716dc0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/preferences/PauseResumeDamageView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/preferences/PauseResumeDamageView.kt
@@ -15,20 +15,21 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.ui.theme.colors
-import com.habitrpg.common.habitica.theme.HabiticaTheme
 import com.habitrpg.android.habitica.ui.views.HabiticaButton
+import com.habitrpg.common.habitica.theme.HabiticaTheme
 
 @Composable
 fun PauseResumeDamageView(
     isPaused: Boolean,
     onClick: () -> Unit,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     Column(
         horizontalAlignment = Alignment.Start,
-        modifier = modifier
-            .fillMaxWidth()
-            .padding(horizontal = 16.dp)
+        modifier =
+            modifier
+                .fillMaxWidth()
+                .padding(horizontal = 16.dp),
     ) {
         if (isPaused) {
             Text(
@@ -36,47 +37,48 @@ fun PauseResumeDamageView(
                 color = HabiticaTheme.colors.textSecondary,
                 fontSize = 16.sp,
                 textAlign = TextAlign.Center,
-                modifier = Modifier
-                    .padding(bottom = 18.dp)
-                    .fillMaxWidth()
+                modifier =
+                    Modifier
+                        .padding(bottom = 18.dp)
+                        .fillMaxWidth(),
             )
             Text(
                 stringResource(R.string.resume_damage_1_title),
                 color = HabiticaTheme.colors.textPrimary,
-                fontSize = 16.sp
+                fontSize = 16.sp,
             )
             Text(
                 stringResource(R.string.resume_damage_1_description),
                 color = HabiticaTheme.colors.textSecondary,
                 fontSize = 14.sp,
-                modifier = Modifier.padding(bottom = 12.dp)
+                modifier = Modifier.padding(bottom = 12.dp),
             )
             Text(
                 stringResource(R.string.resume_damage_2_title),
                 color = HabiticaTheme.colors.textPrimary,
-                fontSize = 16.sp
+                fontSize = 16.sp,
             )
             Text(
                 stringResource(R.string.resume_damage_2_description),
                 color = HabiticaTheme.colors.textSecondary,
                 fontSize = 14.sp,
-                modifier = Modifier.padding(bottom = 12.dp)
+                modifier = Modifier.padding(bottom = 12.dp),
             )
             Text(
                 stringResource(R.string.resume_damage_3_title),
                 color = HabiticaTheme.colors.textPrimary,
-                fontSize = 16.sp
+                fontSize = 16.sp,
             )
             Text(
                 stringResource(R.string.resume_damage_3_description),
                 color = HabiticaTheme.colors.textSecondary,
                 fontSize = 14.sp,
-                modifier = Modifier.padding(bottom = 18.dp)
+                modifier = Modifier.padding(bottom = 18.dp),
             )
             HabiticaButton(
                 background = colorResource(R.color.yellow_100),
                 color = colorResource(R.color.yellow_1),
-                onClick = { onClick() }
+                onClick = { onClick() },
             ) {
                 Text(stringResource(R.string.resume_damage))
             }
@@ -86,53 +88,54 @@ fun PauseResumeDamageView(
                 color = HabiticaTheme.colors.textSecondary,
                 fontSize = 16.sp,
                 textAlign = TextAlign.Center,
-                modifier = Modifier
-                    .padding(bottom = 18.dp)
-                    .fillMaxWidth()
+                modifier =
+                    Modifier
+                        .padding(bottom = 18.dp)
+                        .fillMaxWidth(),
             )
             Text(
                 stringResource(R.string.pause_damage_1_title),
                 color = HabiticaTheme.colors.textPrimary,
                 fontWeight = FontWeight.Normal,
-                fontSize = 16.sp
+                fontSize = 16.sp,
             )
             Text(
                 stringResource(R.string.pause_damage_1_description),
                 color = HabiticaTheme.colors.textSecondary,
                 fontSize = 14.sp,
                 fontWeight = FontWeight.Normal,
-                modifier = Modifier.padding(bottom = 12.dp)
+                modifier = Modifier.padding(bottom = 12.dp),
             )
             Text(
                 stringResource(R.string.pause_damage_2_title),
                 color = HabiticaTheme.colors.textPrimary,
                 fontWeight = FontWeight.Normal,
-                fontSize = 16.sp
+                fontSize = 16.sp,
             )
             Text(
                 stringResource(R.string.pause_damage_2_description),
                 color = HabiticaTheme.colors.textSecondary,
                 fontSize = 14.sp,
                 fontWeight = FontWeight.Normal,
-                modifier = Modifier.padding(bottom = 12.dp)
+                modifier = Modifier.padding(bottom = 12.dp),
             )
             Text(
                 stringResource(R.string.pause_damage_3_title),
                 color = HabiticaTheme.colors.textPrimary,
                 fontWeight = FontWeight.Normal,
-                fontSize = 16.sp
+                fontSize = 16.sp,
             )
             Text(
                 stringResource(R.string.pause_damage_3_description),
                 color = HabiticaTheme.colors.textSecondary,
                 fontSize = 14.sp,
                 fontWeight = FontWeight.Normal,
-                modifier = Modifier.padding(bottom = 18.dp)
+                modifier = Modifier.padding(bottom = 18.dp),
             )
             HabiticaButton(
                 background = colorResource(R.color.yellow_100),
                 color = colorResource(R.color.yellow_1),
-                onClick = { onClick() }
+                onClick = { onClick() },
             ) {
                 Text(stringResource(R.string.pause_damage))
             }
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 b42dfa2ae..49ef3da86 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
@@ -36,12 +36,12 @@ fun HabiticaPullRefreshIndicator(
     state: PullRefreshState,
     modifier: Modifier = Modifier,
     backgroundColor: Color = MaterialTheme.colors.surface,
-    scale: Boolean = true
+    scale: Boolean = true,
 ) {
     AnimatedVisibility(
         visible = isInitial && isRefreshing,
         enter = fadeIn(),
-        exit = fadeOut()
+        exit = fadeOut(),
     ) {
         Box(contentAlignment = Alignment.Center, modifier = Modifier.fillMaxSize()) {
             HabiticaCircularProgressView(Modifier)
@@ -49,26 +49,28 @@ fun HabiticaPullRefreshIndicator(
     }
     if (!isInitial) {
         Surface(
-            modifier = modifier
-                .pullRefreshIndicatorTransform(state, scale),
+            modifier =
+                modifier
+                    .pullRefreshIndicatorTransform(state, scale),
             shape = CircleShape,
             color = backgroundColor,
-            elevation = if (isRefreshing) 6.dp else (min(1f, state.progress * 2) * 6f).dp
+            elevation = if (isRefreshing) 6.dp else (min(1f, state.progress * 2) * 6f).dp,
         ) {
             AnimatedVisibility(
                 visible = isRefreshing || state.progress > 0f,
                 enter = fadeIn(),
-                exit = fadeOut()
+                exit = fadeOut(),
             ) {
                 HabiticaCircularProgressView(
                     partialDisplay = if (isRefreshing) 1f else state.progress,
                     animate = isRefreshing,
                     indicatorSize = 40.dp,
                     strokeWidth = 6.dp,
-                    modifier = Modifier
-                        .border(1.dp, HabiticaTheme.colors.windowBackground, CircleShape)
-                        .padding(4.dp)
-                        .background(MaterialTheme.colors.surface, CircleShape)
+                    modifier =
+                        Modifier
+                            .border(1.dp, HabiticaTheme.colors.windowBackground, CircleShape)
+                            .padding(4.dp)
+                            .background(MaterialTheme.colors.surface, CircleShape),
                 )
             }
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/promo/BirthdayMenuView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/promo/BirthdayMenuView.kt
index c456d7645..c3e593b6b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/promo/BirthdayMenuView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/promo/BirthdayMenuView.kt
@@ -44,81 +44,88 @@ import kotlin.time.Duration.Companion.minutes
 import kotlin.time.Duration.Companion.seconds
 
 @Composable
-fun BirthdayBanner(endDate: Date, modifier: Modifier = Modifier) {
+fun BirthdayBanner(
+    endDate: Date,
+    modifier: Modifier = Modifier,
+) {
     Column(
         modifier
             .fillMaxWidth()
             .clickable {
                 MainNavigationController.navigate(R.id.birthdayActivity)
-            }
+            },
     ) {
         Column(Modifier.fillMaxWidth()) {
             Box(
                 contentAlignment = Alignment.CenterStart,
-                modifier = Modifier
-                    .height(67.dp)
-                    .fillMaxWidth()
-                    .background(colorResource(R.color.brand_100))
+                modifier =
+                    Modifier
+                        .height(67.dp)
+                        .fillMaxWidth()
+                        .background(colorResource(R.color.brand_100)),
             ) {
                 Row(
-                    Modifier.align(Alignment.CenterEnd)
+                    Modifier.align(Alignment.CenterEnd),
                 ) {
                     Image(
                         painterResource(R.drawable.birthday_menu_gems),
                         null,
-                        modifier = Modifier
-                            .align(Alignment.Top)
-                            .offset((40).dp)
+                        modifier =
+                            Modifier
+                                .align(Alignment.Top)
+                                .offset((40).dp),
                     )
                     PixelArtView(
                         imageName = "stable_Pet-Gryphatrice-Jubilant",
                         Modifier
                             .requiredSize(104.dp)
                             .scale(-1f, 1f)
-                            .offset((-30).dp)
+                            .offset((-30).dp),
                     )
                 }
                 Column(
-                    verticalArrangement = Arrangement.spacedBy(
-                        2.dp,
-                        Alignment.CenterVertically
-                    ),
-                    modifier = Modifier.padding(start = 8.dp)
+                    verticalArrangement =
+                        Arrangement.spacedBy(
+                            2.dp,
+                            Alignment.CenterVertically,
+                        ),
+                    modifier = Modifier.padding(start = 8.dp),
                 ) {
                     Image(
                         painterResource(R.drawable.birthday_menu_text),
-                        null
+                        null,
                     )
                     Text(
                         stringResource(R.string.exclusive_items_await),
                         color = colorResource(R.color.yellow_100),
                         fontSize = 14.sp,
                         fontWeight = FontWeight.SemiBold,
-                        modifier = Modifier.padding(start = 2.dp)
+                        modifier = Modifier.padding(start = 2.dp),
                     )
                 }
             }
             Row(
                 verticalAlignment = Alignment.CenterVertically,
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .height(33.dp)
-                    .background(colorResource(R.color.brand_300))
-                    .padding(horizontal = 10.dp)
+                modifier =
+                    Modifier
+                        .fillMaxWidth()
+                        .height(33.dp)
+                        .background(colorResource(R.color.brand_300))
+                        .padding(horizontal = 10.dp),
             ) {
                 TimeRemainingText(
                     endDate,
                     R.string.ends_in_x,
                     color = colorResource(R.color.yellow_50),
                     fontSize = 12.sp,
-                    fontWeight = FontWeight.Bold
+                    fontWeight = FontWeight.Bold,
                 )
                 Spacer(Modifier.weight(1f))
                 Text(
                     stringResource(R.string.see_more).uppercase(),
                     color = colorResource(R.color.white),
                     fontSize = 12.sp,
-                    fontWeight = FontWeight.Bold
+                    fontWeight = FontWeight.Bold,
                 )
             }
         }
@@ -129,11 +136,11 @@ fun BirthdayBanner(endDate: Date, modifier: Modifier = Modifier) {
 private fun buildString(
     value: Int,
     endDate: Date,
-    formatString: Int
+    formatString: Int,
 ): String {
     return stringResource(
         formatString,
-        endDate.getShortRemainingString()
+        endDate.getShortRemainingString(),
     ).uppercase()
 }
 
@@ -143,7 +150,7 @@ fun TimeRemainingText(
     formatString: Int,
     color: Color,
     fontSize: TextUnit,
-    fontWeight: FontWeight
+    fontWeight: FontWeight,
 ) {
     var value by remember { mutableIntStateOf(0) }
     LaunchedEffect(value) {
@@ -161,6 +168,6 @@ fun TimeRemainingText(
         buildString(value = value, endDate = endDate, formatString = formatString),
         color = color,
         fontSize = fontSize,
-        fontWeight = fontWeight
+        fontWeight = fontWeight,
     )
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/promo/PromoMenuView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/promo/PromoMenuView.kt
index 90cc53e3e..880c4419e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/promo/PromoMenuView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/promo/PromoMenuView.kt
@@ -12,62 +12,72 @@ import com.habitrpg.android.habitica.databinding.PromoMenuBinding
 import com.habitrpg.common.habitica.extensions.getThemeColor
 import com.habitrpg.common.habitica.extensions.layoutInflater
 
-class PromoMenuView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
-) : RelativeLayout(context, attrs, defStyleAttr) {
+class PromoMenuView
+    @JvmOverloads
+    constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0,
+    ) : RelativeLayout(context, attrs, defStyleAttr) {
+        var canClose: Boolean = false
+            set(value) {
+                field = value
+                binding.closeButton.visibility = if (value) View.VISIBLE else View.GONE
+            }
+        var binding: PromoMenuBinding = PromoMenuBinding.inflate(context.layoutInflater, this)
 
-    var canClose: Boolean = false
-        set(value) {
-            field = value
-            binding.closeButton.visibility = if (value) View.VISIBLE else View.GONE
+        init {
+            setBackgroundColor(context.getThemeColor(R.attr.colorWindowBackground))
+            clipToPadding = false
+            clipChildren = false
+            clipToOutline = false
         }
-    var binding: PromoMenuBinding = PromoMenuBinding.inflate(context.layoutInflater, this)
 
-    init {
-        setBackgroundColor(context.getThemeColor(R.attr.colorWindowBackground))
-        clipToPadding = false
-        clipChildren = false
-        clipToOutline = false
-    }
+        fun setTitleText(title: String?) {
+            setText(binding.titleTextView, title)
+        }
 
-    fun setTitleText(title: String?) {
-        setText(binding.titleTextView, title)
-    }
+        fun setSubtitleText(subtitle: String?) {
+            setText(binding.descriptionView, subtitle)
+        }
 
-    fun setSubtitleText(subtitle: String?) {
-        setText(binding.descriptionView, subtitle)
-    }
+        fun setTitleImage(title: Drawable?) {
+            setImage(binding.titleImageView, title)
+        }
 
-    fun setTitleImage(title: Drawable?) {
-        setImage(binding.titleImageView, title)
-    }
+        fun setSubtitleImage(subtitle: Drawable?) {
+            setImage(binding.descriptionImageView, subtitle)
+        }
 
-    fun setSubtitleImage(subtitle: Drawable?) {
-        setImage(binding.descriptionImageView, subtitle)
-    }
+        fun setDecoration(
+            leftDrawable: Drawable?,
+            rightDrawable: Drawable?,
+        ) {
+            binding.leftImageView.setImageDrawable(leftDrawable)
+            binding.rightImageView.setImageDrawable(rightDrawable)
+        }
 
-    fun setDecoration(leftDrawable: Drawable?, rightDrawable: Drawable?) {
-        binding.leftImageView.setImageDrawable(leftDrawable)
-        binding.rightImageView.setImageDrawable(rightDrawable)
-    }
+        private fun setImage(
+            view: ImageView,
+            drawable: Drawable?,
+        ) {
+            if (drawable != null) {
+                view.setImageDrawable(drawable)
+                view.visibility = View.VISIBLE
+            } else {
+                view.visibility = View.GONE
+            }
+        }
 
-    private fun setImage(view: ImageView, drawable: Drawable?) {
-        if (drawable != null) {
-            view.setImageDrawable(drawable)
-            view.visibility = View.VISIBLE
-        } else {
-            view.visibility = View.GONE
+        private fun setText(
+            view: TextView,
+            text: String?,
+        ) {
+            if (text != null) {
+                view.text = text
+                view.visibility = View.VISIBLE
+            } else {
+                view.visibility = View.GONE
+            }
         }
     }
-
-    private fun setText(view: TextView, text: String?) {
-        if (text != null) {
-            view.text = text
-            view.visibility = View.VISIBLE
-        } else {
-            view.visibility = View.GONE
-        }
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/promo/PromoMenuViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/promo/PromoMenuViewHolder.kt
index d3a18a31c..ba6775a21 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/promo/PromoMenuViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/promo/PromoMenuViewHolder.kt
@@ -4,7 +4,6 @@ import androidx.recyclerview.widget.RecyclerView
 import com.habitrpg.android.habitica.models.promotions.HabiticaPromotion
 
 class PromoMenuViewHolder(val promoView: PromoMenuView) : RecyclerView.ViewHolder(promoView) {
-
     fun bind(promo: HabiticaPromotion) {
         promo.configurePromoMenuView(promoView)
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/promo/SubscriptionBuyGemsPromoView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/promo/SubscriptionBuyGemsPromoView.kt
index 9c05b4ff3..ecbd8c55d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/promo/SubscriptionBuyGemsPromoView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/promo/SubscriptionBuyGemsPromoView.kt
@@ -7,21 +7,27 @@ import android.widget.RelativeLayout
 import androidx.core.os.bundleOf
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.extensions.inflate
-import com.habitrpg.common.habitica.helpers.MainNavigationController
 import com.habitrpg.common.habitica.extensions.getThemeColor
+import com.habitrpg.common.habitica.helpers.MainNavigationController
 
-class SubscriptionBuyGemsPromoView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
-) : RelativeLayout(context, attrs, defStyleAttr) {
-
-    init {
-        inflate(R.layout.promo_subscription_buy_gems, true)
-        setBackgroundColor(context.getThemeColor(R.attr.colorWindowBackground))
-        clipToPadding = false
-        clipChildren = false
-        clipToOutline = false
-        findViewById<Button>(R.id.button).setOnClickListener { MainNavigationController.navigate(R.id.gemPurchaseActivity, bundleOf(Pair("openSubscription", true))) }
+class SubscriptionBuyGemsPromoView
+    @JvmOverloads
+    constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0,
+    ) : RelativeLayout(context, attrs, defStyleAttr) {
+        init {
+            inflate(R.layout.promo_subscription_buy_gems, true)
+            setBackgroundColor(context.getThemeColor(R.attr.colorWindowBackground))
+            clipToPadding = false
+            clipChildren = false
+            clipToOutline = false
+            findViewById<Button>(R.id.button).setOnClickListener {
+                MainNavigationController.navigate(
+                    R.id.gemPurchaseActivity,
+                    bundleOf(Pair("openSubscription", true)),
+                )
+            }
+        }
     }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/setup/AvatarCategoryView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/setup/AvatarCategoryView.kt
index 3e2764517..11928d40a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/setup/AvatarCategoryView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/setup/AvatarCategoryView.kt
@@ -12,7 +12,6 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.common.habitica.extensions.setTintWith
 
 class AvatarCategoryView(context: Context, attrs: AttributeSet?) : LinearLayout(context, attrs) {
-
     private val icon: Drawable?
     private val textView: TextView
 
@@ -20,12 +19,13 @@ class AvatarCategoryView(context: Context, attrs: AttributeSet?) : LinearLayout(
         View.inflate(context, R.layout.avatar_category, this)
 
         textView = findViewById(R.id.text_view)
-        val a = context.theme.obtainStyledAttributes(
-            attrs,
-            R.styleable.AvatarCategoryView,
-            0,
-            0
-        )
+        val a =
+            context.theme.obtainStyledAttributes(
+                attrs,
+                R.styleable.AvatarCategoryView,
+                0,
+                0,
+            )
 
         textView.text = a.getText(R.styleable.AvatarCategoryView_categoryTitle)
 
@@ -37,11 +37,12 @@ class AvatarCategoryView(context: Context, attrs: AttributeSet?) : LinearLayout(
     }
 
     fun setActive(active: Boolean) {
-        val color: Int = if (active) {
-            ContextCompat.getColor(context, R.color.white)
-        } else {
-            ContextCompat.getColor(context, R.color.white_50_alpha)
-        }
+        val color: Int =
+            if (active) {
+                ContextCompat.getColor(context, R.color.white)
+            } else {
+                ContextCompat.getColor(context, R.color.white_50_alpha)
+            }
         textView.setTextColor(color)
         if (icon != null) {
             icon.setTintWith(color, PorterDuff.Mode.MULTIPLY)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/setup/AvatarCustomizationDrawer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/setup/AvatarCustomizationDrawer.kt
index 37fc233cf..58ec343c7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/setup/AvatarCustomizationDrawer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/setup/AvatarCustomizationDrawer.kt
@@ -6,6 +6,7 @@ import android.widget.LinearLayout
 import com.habitrpg.android.habitica.databinding.AvatarSetupDrawerBinding
 import com.habitrpg.common.habitica.extensions.layoutInflater
 
-class AvatarCustomizationDrawer(context: Context, attrs: AttributeSet?) : LinearLayout(context, attrs) {
+class AvatarCustomizationDrawer(context: Context, attrs: AttributeSet?) :
+    LinearLayout(context, attrs) {
     val binding = AvatarSetupDrawerBinding.inflate(context.layoutInflater, this, true)
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogBackgroundContent.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogBackgroundContent.kt
index ee5114996..d2cc34f8e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogBackgroundContent.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogBackgroundContent.kt
@@ -22,7 +22,10 @@ class PurchaseDialogBackgroundContent(context: Context) : PurchaseDialogContent(
         binding.notesTextView.text = item.notes
     }
 
-    fun setAvatarWithBackgroundPreview(avatar: Avatar, item: ShopItem) {
+    fun setAvatarWithBackgroundPreview(
+        avatar: Avatar,
+        item: ShopItem,
+    ) {
         val layerMap = EnumMap<AvatarView.LayerType, String>(AvatarView.LayerType::class.java)
         layerMap[AvatarView.LayerType.BACKGROUND] = item.imageName?.removePrefix("icon_")
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogContent.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogContent.kt
index 2f767f1eb..4fa71fa66 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogContent.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogContent.kt
@@ -12,35 +12,36 @@ import com.habitrpg.common.habitica.extensions.fromHtml
 import com.habitrpg.common.habitica.extensions.loadImage
 import com.habitrpg.common.habitica.views.PixelArtView
 
-abstract class PurchaseDialogContent @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
-) : LinearLayout(context, attrs, defStyleAttr) {
+abstract class PurchaseDialogContent
+    @JvmOverloads
+    constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0,
+    ) : LinearLayout(context, attrs, defStyleAttr) {
+        abstract val imageView: PixelArtView
+        abstract val titleTextView: TextView
 
-    abstract val imageView: PixelArtView
-    abstract val titleTextView: TextView
-
-    init {
-        orientation = VERTICAL
-        gravity = Gravity.CENTER
-    }
-
-    open fun setItem(item: ShopItem) {
-        if (item.path?.contains("timeTravelBackgrounds") == true) {
-            imageView.loadImage(item.imageName?.replace("icon_", ""))
-            val params = imageView.layoutParams
-            params.height = 147.dpToPx(context)
-            params.width = 140.dpToPx(context)
-            imageView.layoutParams = params
-        } else {
-            imageView.loadImage(item.imageName)
+        init {
+            orientation = VERTICAL
+            gravity = Gravity.CENTER
         }
-        titleTextView.text = item.text
-    }
 
-    open fun setQuestContentItem(questContent: QuestContent) {
-        imageView.loadImage("inventory_quest_scroll_" + questContent.key)
-        titleTextView.setText(questContent.text.fromHtml(), TextView.BufferType.SPANNABLE)
+        open fun setItem(item: ShopItem) {
+            if (item.path?.contains("timeTravelBackgrounds") == true) {
+                imageView.loadImage(item.imageName?.replace("icon_", ""))
+                val params = imageView.layoutParams
+                params.height = 147.dpToPx(context)
+                params.width = 140.dpToPx(context)
+                imageView.layoutParams = params
+            } else {
+                imageView.loadImage(item.imageName)
+            }
+            titleTextView.text = item.text
+        }
+
+        open fun setQuestContentItem(questContent: QuestContent) {
+            imageView.loadImage("inventory_quest_scroll_" + questContent.key)
+            titleTextView.setText(questContent.text.fromHtml(), TextView.BufferType.SPANNABLE)
+        }
     }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogCustomizationSetContent.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogCustomizationSetContent.kt
index ea63a995e..a5f38e6f2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogCustomizationSetContent.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogCustomizationSetContent.kt
@@ -25,7 +25,8 @@ class PurchaseDialogCustomizationSetContent(context: Context) : PurchaseDialogCo
             val imageView = PixelArtView(context)
             imageView.setBackgroundResource(R.drawable.layout_rounded_bg_window)
             imageView.loadImage(it)
-            imageView.layoutParams = FlexboxLayout.LayoutParams(76.dpToPx(context), 76.dpToPx(context))
+            imageView.layoutParams =
+                FlexboxLayout.LayoutParams(76.dpToPx(context), 76.dpToPx(context))
             binding.imageViewWrapper.addView(imageView)
         }
         if (item.key == "facialHair") {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogGearContent.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogGearContent.kt
index a2444966a..193481127 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogGearContent.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogGearContent.kt
@@ -27,7 +27,7 @@ internal class PurchaseDialogGearContent(context: Context) : PurchaseDialogConte
             configureFieldsForValue(binding.strLabel, binding.strValue, equipment.str)
             configureFieldsForValue(binding.perLabel, binding.perValue, equipment.per)
             configureFieldsForValue(binding.conLabel, binding.conValue, equipment.con)
-            configureFieldsForValue(binding.intLabel, binding.intValue, equipment._int)
+            configureFieldsForValue(binding.intLabel, binding.intValue, equipment.intelligence)
         } else {
             configureFieldsForValue(binding.strLabel, binding.strValue, 0)
             configureFieldsForValue(binding.perLabel, binding.perValue, 0)
@@ -36,7 +36,11 @@ internal class PurchaseDialogGearContent(context: Context) : PurchaseDialogConte
         }
     }
 
-    private fun configureFieldsForValue(labelView: TextView?, valueTextView: TextView?, value: Int) {
+    private fun configureFieldsForValue(
+        labelView: TextView?,
+        valueTextView: TextView?,
+        value: Int,
+    ) {
         valueTextView?.text = "+$value"
         if (value == 0) {
             labelView?.setTextColor(ContextCompat.getColor(context, R.color.text_dimmed))
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogGemsContent.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogGemsContent.kt
index 826fb0f01..6ea15a505 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogGemsContent.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogGemsContent.kt
@@ -17,7 +17,8 @@ internal class PurchaseDialogGemsContent(context: Context) : PurchaseDialogConte
         get() = binding.titleTextView
 
     init {
-        binding.stepperView.iconDrawable = HabiticaIconsHelper.imageOfGem().asDrawable(context.resources)
+        binding.stepperView.iconDrawable =
+            HabiticaIconsHelper.imageOfGem().asDrawable(context.resources)
     }
 
     override fun setItem(item: ShopItem) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogQuestContent.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogQuestContent.kt
index d1a6c9a8c..b737c478e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogQuestContent.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogQuestContent.kt
@@ -66,17 +66,28 @@ class PurchaseDialogQuestContent(context: Context) : PurchaseDialogContent(conte
             }
 
             if ((questContent.drop?.exp ?: 0) > 0) {
-                val view = inflater?.inflate(R.layout.row_quest_reward_imageview, binding.rewardsList, false) as? ViewGroup
+                val view =
+                    inflater?.inflate(
+                        R.layout.row_quest_reward_imageview,
+                        binding.rewardsList,
+                        false,
+                    ) as? ViewGroup
                 val imageView = view?.findViewById<ImageView>(R.id.imageView)
                 imageView?.scaleType = ImageView.ScaleType.CENTER
                 imageView?.setImageBitmap(HabiticaIconsHelper.imageOfExperienceReward())
                 val titleTextView = view?.findViewById<TextView>(R.id.titleTextView)
-                titleTextView?.text = context.getString(R.string.experience_reward, questContent.drop?.exp)
+                titleTextView?.text =
+                    context.getString(R.string.experience_reward, questContent.drop?.exp)
                 binding.rewardsList.addView(view)
             }
 
             if ((questContent.drop?.gp ?: 0) > 0) {
-                val view = inflater?.inflate(R.layout.row_quest_reward_imageview, binding.rewardsList, false) as? ViewGroup
+                val view =
+                    inflater?.inflate(
+                        R.layout.row_quest_reward_imageview,
+                        binding.rewardsList,
+                        false,
+                    ) as? ViewGroup
                 val imageView = view?.findViewById<ImageView>(R.id.imageView)
                 imageView?.scaleType = ImageView.ScaleType.CENTER
                 imageView?.setImageBitmap(HabiticaIconsHelper.imageOfGoldReward())
@@ -90,14 +101,15 @@ class PurchaseDialogQuestContent(context: Context) : PurchaseDialogContent(conte
     private fun addRewardsRow(
         inflater: LayoutInflater?,
         item: QuestDropItem,
-        containerView: ViewGroup?
+        containerView: ViewGroup?,
     ) {
         val view = inflater?.inflate(R.layout.row_quest_reward, containerView, false) as? ViewGroup
         val imageView = view?.findViewById(R.id.imageView) as? PixelArtView
         val titleTextView = view?.findViewById(R.id.titleTextView) as? TextView
         imageView?.loadImage(item.imageName)
         if (item.count > 1) {
-            titleTextView?.text = context.getString(R.string.quest_reward_count, item.text, item.count)
+            titleTextView?.text =
+                context.getString(R.string.quest_reward_count, item.text, item.count)
         } else {
             titleTextView?.text = item.text
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/ChatBarView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/ChatBarView.kt
index 9767dd4f4..ffe8454eb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/ChatBarView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/ChatBarView.kt
@@ -9,15 +9,14 @@ import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.ChatBarViewBinding
 import com.habitrpg.android.habitica.extensions.OnChangeTextWatcher
-import com.habitrpg.common.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.models.social.ChatMessage
 import com.habitrpg.android.habitica.ui.helpers.AutocompleteAdapter
 import com.habitrpg.android.habitica.ui.helpers.AutocompleteTokenizer
 import com.habitrpg.common.habitica.extensions.getThemeColor
 import com.habitrpg.common.habitica.extensions.layoutInflater
+import com.habitrpg.common.habitica.helpers.MainNavigationController
 
 class ChatBarView : LinearLayout {
-
     var hasAcceptedGuidelines: Boolean = false
         set(value) {
             field = value
@@ -74,7 +73,7 @@ class ChatBarView : LinearLayout {
             OnChangeTextWatcher { _, _, _, _ ->
                 setSendButtonEnabled(binding.chatEditText.text.isNotEmpty() && binding.chatEditText.text.length <= maxChatLength)
                 updateTextIndicator(binding.chatEditText.text.toString())
-            }
+            },
         )
 
         binding.sendButton.setOnClickListener { sendButtonPressed() }
@@ -97,11 +96,12 @@ class ChatBarView : LinearLayout {
             binding.textIndicator.visibility = View.VISIBLE
             binding.indicatorSpacing.visibility = View.VISIBLE
             binding.textIndicator.text = "${text.length}/$maxChatLength"
-            val color = when {
-                text.length > maxChatLength -> R.color.text_red
-                text.length > (maxChatLength * 0.95) -> R.color.text_yellow
-                else -> R.color.text_dimmed
-            }
+            val color =
+                when {
+                    text.length > maxChatLength -> R.color.text_red
+                    text.length > (maxChatLength * 0.95) -> R.color.text_yellow
+                    else -> R.color.text_dimmed
+                }
             binding.textIndicator.setTextColor(ContextCompat.getColor(context, color))
         } else {
             binding.textIndicator.visibility = View.GONE
@@ -110,11 +110,12 @@ class ChatBarView : LinearLayout {
     }
 
     private fun setSendButtonEnabled(enabled: Boolean) {
-        val tintColor: Int = if (enabled) {
-            context.getThemeColor(R.attr.colorAccent)
-        } else {
-            ContextCompat.getColor(context, R.color.disabled_background)
-        }
+        val tintColor: Int =
+            if (enabled) {
+                context.getThemeColor(R.attr.colorAccent)
+            } else {
+                ContextCompat.getColor(context, R.color.disabled_background)
+            }
         binding.sendButton.setColorFilter(tintColor)
         binding.sendButton.isEnabled = enabled
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/InvitationsView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/InvitationsView.kt
index 4bab2fd51..62fa0fe2c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/InvitationsView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/InvitationsView.kt
@@ -9,69 +9,70 @@ import androidx.lifecycle.lifecycleScope
 import com.habitrpg.android.habitica.MainNavDirections
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.ViewInvitationBinding
-import com.habitrpg.common.habitica.extensions.flash
 import com.habitrpg.android.habitica.helpers.HapticFeedbackManager
-import com.habitrpg.common.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.models.invitations.GenericInvitation
 import com.habitrpg.android.habitica.models.members.Member
+import com.habitrpg.common.habitica.extensions.flash
 import com.habitrpg.common.habitica.extensions.layoutInflater
+import com.habitrpg.common.habitica.helpers.MainNavigationController
 import com.habitrpg.common.habitica.helpers.setMarkdown
 import kotlinx.coroutines.launch
 
-class InvitationsView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
-) : LinearLayout(context, attrs, defStyleAttr) {
+class InvitationsView
+    @JvmOverloads
+    constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0,
+    ) : LinearLayout(context, attrs, defStyleAttr) {
+        var acceptCall: ((String) -> Unit)? = null
+        var rejectCall: ((String) -> Unit)? = null
+        var getLeader: (suspend (String) -> Member?)? = null
 
-    var acceptCall: ((String) -> Unit)? = null
-    var rejectCall: ((String) -> Unit)? = null
-    var getLeader: (suspend (String) -> Member?)? = null
+        init {
+            orientation = VERTICAL
+        }
 
-    init {
-        orientation = VERTICAL
-    }
+        fun setInvitations(invitations: List<GenericInvitation>) {
+            removeAllViews()
+            for (invitation in invitations) {
+                val leaderID = invitation.inviter
+                val binding = ViewInvitationBinding.inflate(context.layoutInflater, this, true)
+                binding.groupleaderTextView.movementMethod = LinkMovementMethod.getInstance()
 
-    fun setInvitations(invitations: List<GenericInvitation>) {
-        removeAllViews()
-        for (invitation in invitations) {
-            val leaderID = invitation.inviter
-            val binding = ViewInvitationBinding.inflate(context.layoutInflater, this, true)
-            binding.groupleaderTextView.movementMethod = LinkMovementMethod.getInstance()
-
-            findViewTreeLifecycleOwner()?.lifecycleScope?.launch {
-                leaderID?.let {
-                    val leader = getLeader?.invoke(it) ?: return@launch
-                    binding.groupleaderAvatarView.setAvatar(leader)
-                    binding.groupleaderTextView.setMarkdown(
-                        context.getString(
-                            R.string.invitation_title,
-                            "[${leader.formattedUsername}](https://habitica.com/profile/$leaderID)",
-                            invitation.name
+                findViewTreeLifecycleOwner()?.lifecycleScope?.launch {
+                    leaderID?.let {
+                        val leader = getLeader?.invoke(it) ?: return@launch
+                        binding.groupleaderAvatarView.setAvatar(leader)
+                        binding.groupleaderTextView.setMarkdown(
+                            context.getString(
+                                R.string.invitation_title,
+                                "[${leader.formattedUsername}](https://habitica.com/profile/$leaderID)",
+                                invitation.name,
+                            ),
                         )
-                    )
+                    }
                 }
-            }
 
-            binding.root.setOnClickListener {
-                leaderID?.let { id ->
-                    it.flash()
+                binding.root.setOnClickListener {
+                    leaderID?.let { id ->
+                        it.flash()
+                        HapticFeedbackManager.tap(it)
+                        val profileDirections = MainNavDirections.openProfileActivity(id)
+                        MainNavigationController.navigate(profileDirections)
+                    }
+                }
+
+                binding.acceptButton.setOnClickListener {
+                    binding.root.flash()
                     HapticFeedbackManager.tap(it)
-                    val profileDirections = MainNavDirections.openProfileActivity(id)
-                    MainNavigationController.navigate(profileDirections)
+                    invitation.id?.let { it1 -> acceptCall?.invoke(it1) }
+                }
+                binding.rejectButton.setOnClickListener {
+                    binding.root.flash()
+                    HapticFeedbackManager.tap(it)
+                    invitation.id?.let { it1 -> rejectCall?.invoke(it1) }
                 }
-            }
-
-            binding.acceptButton.setOnClickListener {
-                binding.root.flash()
-                HapticFeedbackManager.tap(it)
-                invitation.id?.let { it1 -> acceptCall?.invoke(it1) }
-            }
-            binding.rejectButton.setOnClickListener {
-                binding.root.flash()
-                HapticFeedbackManager.tap(it)
-                invitation.id?.let { it1 -> rejectCall?.invoke(it1) }
             }
         }
     }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/OldQuestProgressView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/OldQuestProgressView.kt
index b48e83c3d..0827061eb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/OldQuestProgressView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/OldQuestProgressView.kt
@@ -7,13 +7,13 @@ import android.widget.LinearLayout
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.QuestCollectBinding
 import com.habitrpg.android.habitica.databinding.QuestProgressOldBinding
-import com.habitrpg.common.habitica.extensions.setScaledPadding
 import com.habitrpg.android.habitica.models.inventory.QuestContent
 import com.habitrpg.android.habitica.models.inventory.QuestProgress
 import com.habitrpg.android.habitica.models.inventory.QuestProgressCollect
 import com.habitrpg.common.habitica.extensions.dpToPx
 import com.habitrpg.common.habitica.extensions.layoutInflater
 import com.habitrpg.common.habitica.extensions.loadImage
+import com.habitrpg.common.habitica.extensions.setScaledPadding
 
 class OldQuestProgressView : LinearLayout {
     private val binding = QuestProgressOldBinding.inflate(context.layoutInflater, this)
@@ -34,7 +34,10 @@ class OldQuestProgressView : LinearLayout {
         setScaledPadding(context, 16, 16, 16, 16)
     }
 
-    fun setData(quest: QuestContent, progress: QuestProgress?) {
+    fun setData(
+        quest: QuestContent,
+        progress: QuestProgress?,
+    ) {
         binding.collectionContainer.removeAllViews()
         if (quest.isBossQuest) {
             binding.bossNameView.text = quest.boss?.name
@@ -60,10 +63,14 @@ class OldQuestProgressView : LinearLayout {
                 val inflater = LayoutInflater.from(context)
                 for (collect in progress.collect ?: emptyList<QuestProgressCollect>()) {
                     val contentCollect = quest.getCollectWithKey(collect.key) ?: continue
-                    val collectBinding = QuestCollectBinding.inflate(inflater, binding.collectionContainer, true)
+                    val collectBinding =
+                        QuestCollectBinding.inflate(inflater, binding.collectionContainer, true)
                     collectBinding.iconView.loadImage("quest_" + quest.key + "_" + collect.key)
                     collectBinding.nameView.text = contentCollect.text
-                    collectBinding.valueView.set(collect.count.toDouble(), contentCollect.count.toDouble())
+                    collectBinding.valueView.set(
+                        collect.count.toDouble(),
+                        contentCollect.count.toDouble(),
+                    )
                     collectBinding.valueView.barHeight = 5.dpToPx(context)
                 }
             }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/PartySeekingListItem.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/PartySeekingListItem.kt
index 7d1778fc9..32b1860c1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/PartySeekingListItem.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/PartySeekingListItem.kt
@@ -26,7 +26,6 @@ import androidx.compose.ui.unit.sp
 import com.habitrpg.android.habitica.MainNavDirections
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.helpers.AppConfigManager
-import com.habitrpg.common.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.models.auth.LocalAuthentication
 import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.models.members.MemberFlags
@@ -37,12 +36,13 @@ import com.habitrpg.android.habitica.models.user.Profile
 import com.habitrpg.android.habitica.models.user.Stats
 import com.habitrpg.android.habitica.ui.fragments.social.party.InviteButton
 import com.habitrpg.android.habitica.ui.theme.colors
-import com.habitrpg.common.habitica.theme.HabiticaTheme
 import com.habitrpg.android.habitica.ui.views.ClassText
-import com.habitrpg.common.habitica.views.ComposableAvatarView
 import com.habitrpg.android.habitica.ui.views.ComposableUsernameLabel
 import com.habitrpg.android.habitica.ui.views.LoadingButtonState
 import com.habitrpg.common.habitica.extensions.toLocale
+import com.habitrpg.common.habitica.helpers.MainNavigationController
+import com.habitrpg.common.habitica.theme.HabiticaTheme
+import com.habitrpg.common.habitica.views.ComposableAvatarView
 import java.util.Locale
 import kotlin.random.Random
 
@@ -66,62 +66,62 @@ fun PartySeekingListItem(
             }
             .padding(bottom = 6.dp)
             .background(HabiticaTheme.colors.windowBackground, HabiticaTheme.shapes.large)
-            .padding(14.dp)
+            .padding(14.dp),
     ) {
         Row(
             horizontalArrangement = Arrangement.spacedBy(14.dp),
-            verticalAlignment = Alignment.Top
+            verticalAlignment = Alignment.Top,
         ) {
             ComposableAvatarView(
                 user,
                 configManager,
                 Modifier
                     .size(94.dp, 98.dp)
-                    .padding(top = 4.dp)
+                    .padding(top = 4.dp),
             )
             Column(
                 verticalArrangement = Arrangement.Top,
-                modifier = Modifier.fillMaxWidth()
+                modifier = Modifier.fillMaxWidth(),
             ) {
                 if (showHeader) {
                     Text(
                         stringResource(R.string.pending_invite).uppercase(),
                         fontSize = 12.sp,
                         color = HabiticaTheme.colors.textQuad,
-                        modifier = Modifier.padding(bottom = 4.dp)
+                        modifier = Modifier.padding(bottom = 4.dp),
                     )
                 }
                 ProvideTextStyle(value = TextStyle(fontSize = 14.sp)) {
                     ComposableUsernameLabel(
                         user.displayName,
-                        user.contributor?.level ?: 0
+                        user.contributor?.level ?: 0,
                     )
                 }
                 Text(
                     user.formattedUsername ?: "",
                     fontSize = 14.sp,
-                    color = HabiticaTheme.colors.textTertiary
+                    color = HabiticaTheme.colors.textTertiary,
                 )
                 Divider(
                     color = colorResource(R.color.divider_color),
                     thickness = 1.dp,
-                    modifier = Modifier.padding(vertical = 6.dp)
+                    modifier = Modifier.padding(vertical = 6.dp),
                 )
                 Row(
                     horizontalArrangement = Arrangement.SpaceBetween,
-                    modifier = Modifier.fillMaxWidth()
+                    modifier = Modifier.fillMaxWidth(),
                 ) {
                     Text(
                         stringResource(R.string.level_abbreviated, user.stats?.lvl ?: 0),
                         fontWeight = FontWeight.Medium,
                         fontSize = 14.sp,
-                        color = HabiticaTheme.colors.textPrimary
+                        color = HabiticaTheme.colors.textPrimary,
                     )
                     ClassText(
                         user.stats?.habitClass,
                         fontSize = 14.sp,
                         iconSize = 18.dp,
-                        hasClass = user.hasClass
+                        hasClass = user.hasClass,
                     )
                 }
                 if (showExtendedInfo) {
@@ -129,13 +129,16 @@ fun PartySeekingListItem(
                         stringResource(R.string.x_checkins, user.loginIncentives),
                         fontWeight = FontWeight.Medium,
                         fontSize = 14.sp,
-                        color = HabiticaTheme.colors.textPrimary
+                        color = HabiticaTheme.colors.textPrimary,
                     )
                     Text(
-                        "Language: ${user.preferences?.language?.toLocale()?.getDisplayLanguage(Locale.getDefault())}",
+                        "Language: ${
+                            user.preferences?.language?.toLocale()
+                                ?.getDisplayLanguage(Locale.getDefault())
+                        }",
                         fontWeight = FontWeight.Medium,
                         fontSize = 14.sp,
-                        color = HabiticaTheme.colors.textPrimary
+                        color = HabiticaTheme.colors.textPrimary,
                     )
                 }
             }
@@ -143,18 +146,18 @@ fun PartySeekingListItem(
         InviteButton(
             state = inviteState,
             isAlreadyInvited = isInvited,
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(top = 8.dp),
+            modifier =
+                Modifier
+                    .fillMaxWidth()
+                    .padding(top = 8.dp),
             onClick = {
                 onInvite(user)
-            }
+            },
         )
     }
 }
 
 private class MemberProvider : PreviewParameterProvider<Member> {
-
     private fun generateMember(): Member {
         val member = Member()
         member.profile = Profile()
@@ -208,6 +211,8 @@ private class MemberProvider : PreviewParameterProvider<Member> {
 
 @Preview
 @Composable
-private fun Preview(@PreviewParameter(MemberProvider::class) data: Member) {
+private fun Preview(
+    @PreviewParameter(MemberProvider::class) data: Member,
+) {
     PartySeekingListItem(user = data, onInvite = {}, configManager = AppConfigManager(null))
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stable/MountBottomSheet.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stable/MountBottomSheet.kt
index e76bc4d6f..1251a43e1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stable/MountBottomSheet.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stable/MountBottomSheet.kt
@@ -64,7 +64,7 @@ private fun getBackgroundPainter(): ImageBitmap {
             Calendar.NOVEMBER -> R.drawable.stable_tile_november
             Calendar.DECEMBER -> R.drawable.stable_tile_december
             else -> R.drawable.stable_tile_may
-        }
+        },
     )
 }
 
@@ -74,26 +74,27 @@ fun MountBottomSheet(
     isCurrentMount: Boolean,
     onEquip: ((String) -> Unit)?,
     onDismiss: () -> Unit,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     val infiniteTransition = rememberInfiniteTransition()
 
     Column(
         horizontalAlignment = Alignment.CenterHorizontally,
-        modifier = modifier.padding(horizontal = 22.dp)
+        modifier = modifier.padding(horizontal = 22.dp),
     ) {
         Text(
             mount.text ?: "",
             fontSize = 16.sp,
             fontWeight = FontWeight.Medium,
-            color = HabiticaTheme.colors.textTertiary
+            color = HabiticaTheme.colors.textTertiary,
         )
         Box(
-            modifier = Modifier
-                .padding(top = 9.dp, bottom = 16.dp)
-                .fillMaxWidth()
-                .height(124.dp)
-                .clip(HabiticaTheme.shapes.medium)
+            modifier =
+                Modifier
+                    .padding(top = 9.dp, bottom = 16.dp)
+                    .fillMaxWidth()
+                    .height(124.dp)
+                    .clip(HabiticaTheme.shapes.medium),
         ) {
             BackgroundScene()
 
@@ -104,38 +105,50 @@ fun MountBottomSheet(
                 infiniteTransition.animateFloat(
                     initialValue = 4f,
                     targetValue = 0f,
-                    animationSpec = infiniteRepeatable(
-                        tween(
-                            2500,
-                            easing = CubicBezierEasing(0.3f, 0.0f, 0.2f, 1.0f)
-                        ), RepeatMode.Reverse
-                    ),
-                    label = "animalPosition"
+                    animationSpec =
+                        infiniteRepeatable(
+                            tween(
+                                2500,
+                                easing = CubicBezierEasing(0.3f, 0.0f, 0.2f, 1.0f),
+                            ),
+                            RepeatMode.Reverse,
+                        ),
+                    label = "animalPosition",
                 )
             } else {
                 infiniteTransition.animateFloat(
                     initialValue = regularPosition,
                     targetValue = highJump,
-                    animationSpec = infiniteRepeatable(animation = keyframes {
-                        durationMillis = 6000
-                        regularPosition at 0 with LinearOutSlowInEasing
-                        highJump at 150 with LinearOutSlowInEasing
-                        regularPosition at 300 with FastOutSlowInEasing
-                        regularPosition at 1800 with FastOutSlowInEasing
-                        lowJump at 1850 with LinearOutSlowInEasing
-                        regularPosition at 1900 with LinearOutSlowInEasing
-                        regularPosition at 2100 with FastOutSlowInEasing
-                        lowJump at 2200 with LinearOutSlowInEasing
-                        regularPosition at 2350 with LinearOutSlowInEasing
-                        regularPosition at 6000
-                    }, RepeatMode.Restart, StartOffset(1500)), label = "animalPosition"
+                    animationSpec =
+                        infiniteRepeatable(
+                            animation =
+                                keyframes {
+                                    durationMillis = 6000
+                                    regularPosition at 0 using LinearOutSlowInEasing
+                                    highJump at 150 using LinearOutSlowInEasing
+                                    regularPosition at 300 using FastOutSlowInEasing
+                                    regularPosition at 1800 using FastOutSlowInEasing
+                                    lowJump at 1850 using LinearOutSlowInEasing
+                                    regularPosition at 1900 using LinearOutSlowInEasing
+                                    regularPosition at 2100 using FastOutSlowInEasing
+                                    lowJump at 2200 using LinearOutSlowInEasing
+                                    regularPosition at 2350 using LinearOutSlowInEasing
+                                    regularPosition at 6000
+                                },
+                            RepeatMode.Restart,
+                            StartOffset(1500),
+                        ),
+                    label = "animalPosition",
                 )
             }
-            MountView(mount, modifier = Modifier
-                    .offset(0.dp, position.dp)
-                    .size(81.dp, 99.dp)
-                    .align(Alignment.TopCenter)
-                    .zIndex(2f)
+            MountView(
+                mount,
+                modifier =
+                    Modifier
+                        .offset(0.dp, position.dp)
+                        .size(81.dp, 99.dp)
+                        .align(Alignment.TopCenter)
+                        .zIndex(2f),
             )
         }
         val context = LocalContext.current
@@ -150,11 +163,13 @@ fun MountBottomSheet(
                         ShareMountUseCase.RequestValues(
                             mount.key,
                             "",
-                            context
-                        ))
+                            context,
+                        ),
+                    )
                 }
                 onDismiss()
-            }) {
+            },
+        ) {
             Text(stringResource(id = R.string.share))
         }
         HabiticaButton(
@@ -164,7 +179,8 @@ fun MountBottomSheet(
             onClick = {
                 onEquip?.invoke(mount.key)
                 onDismiss()
-            }) {
+            },
+        ) {
             if (isCurrentMount) {
                 Text(stringResource(id = R.string.unequip))
             } else {
@@ -177,14 +193,16 @@ fun MountBottomSheet(
 fun isAnimalFlying(animal: Animal): Boolean {
     if (listOf(
             "FlyingPig",
-            "Bee"
+            "Bee",
         ).contains(animal.animal)
-    ) return true
+    ) {
+        return true
+    }
     return listOf(
         "Ghost",
         "Cupid",
         "Fairy",
         "SolarSystem",
-        "Vampire"
+        "Vampire",
     ).contains(animal.color)
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stable/MountView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stable/MountView.kt
index db89e5964..1a96694ed 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stable/MountView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stable/MountView.kt
@@ -11,38 +11,47 @@ import com.habitrpg.android.habitica.models.inventory.Mount
 import com.habitrpg.common.habitica.extensions.loadImage
 import com.habitrpg.common.habitica.views.PixelArtView
 
-class MountView @JvmOverloads constructor(
-    context: Context, attrs: AttributeSet? = null
-) : FrameLayout(context, attrs) {
+class MountView
+    @JvmOverloads
+    constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+    ) : FrameLayout(context, attrs) {
+        val hasLoadedImages: Boolean
+            get() {
+                return bodyView.bitmap != null && headView.bitmap != null
+            }
+        private val bodyView: PixelArtView = PixelArtView(context)
+        private val headView: PixelArtView = PixelArtView(context)
 
-    val hasLoadedImages: Boolean
-        get() {
-            return bodyView.bitmap != null && headView.bitmap != null
+        fun setMount(key: String) {
+            bodyView.loadImage("Mount_Body_$key")
+            headView.loadImage("Mount_Head_$key")
         }
-    private val bodyView: PixelArtView = PixelArtView(context)
-    private val headView: PixelArtView = PixelArtView(context)
 
-    fun setMount(key: String) {
-        bodyView.loadImage("Mount_Body_$key")
-        headView.loadImage("Mount_Head_$key")
+        init {
+            addView(bodyView)
+            bodyView.layoutParams =
+                LayoutParams(LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)
+            addView(headView)
+            headView.layoutParams =
+                LayoutParams(LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)
+        }
     }
 
-    init {
-        addView(bodyView)
-        bodyView.layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)
-        addView(headView)
-        headView.layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)
-    }
-
-}
-
 @Composable
-fun MountView(mount: Mount, modifier: Modifier = Modifier) {
+fun MountView(
+    mount: Mount,
+    modifier: Modifier = Modifier,
+) {
     MountView(mount.key, modifier)
 }
 
 @Composable
-fun MountView(mountKey: String, modifier: Modifier = Modifier) {
+fun MountView(
+    mountKey: String,
+    modifier: Modifier = Modifier,
+) {
     AndroidView(
         modifier = modifier,
         factory = { context ->
@@ -50,6 +59,6 @@ fun MountView(mountKey: String, modifier: Modifier = Modifier) {
         },
         update = { view ->
             view.setMount(mountKey)
-        }
+        },
     )
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stable/PetBottomSheet.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stable/PetBottomSheet.kt
index 39194a336..5418b5612 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stable/PetBottomSheet.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stable/PetBottomSheet.kt
@@ -88,7 +88,7 @@ private fun getFoodPainter(petColor: String): ImageBitmap {
             "White" -> R.drawable.feed_white
             "Zombie" -> R.drawable.feed_zombie
             else -> R.drawable.feed_base
-        }
+        },
     )
 }
 
@@ -102,7 +102,7 @@ fun PetBottomSheet(
     onEquip: ((String) -> Unit)?,
     onFeed: (suspend (Pet, Food?) -> FeedResponse?)?,
     onDismiss: () -> Unit,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     val infiniteTransition = rememberInfiniteTransition()
     val coroutineScope = rememberCoroutineScope()
@@ -118,69 +118,80 @@ fun PetBottomSheet(
 
     Column(
         horizontalAlignment = Alignment.CenterHorizontally,
-        modifier = modifier.padding(horizontal = 22.dp)
+        modifier = modifier.padding(horizontal = 22.dp),
     ) {
         Text(
             pet.text ?: "",
             fontSize = 16.sp,
             fontWeight = FontWeight.Medium,
-            color = HabiticaTheme.colors.textTertiary
+            color = HabiticaTheme.colors.textTertiary,
         )
         Box(
-            modifier = Modifier
-                .padding(top = 9.dp, bottom = 16.dp)
-                .fillMaxWidth()
-                .height(124.dp)
-                .clip(HabiticaTheme.shapes.medium)
+            modifier =
+                Modifier
+                    .padding(top = 9.dp, bottom = 16.dp)
+                    .fillMaxWidth()
+                    .height(124.dp)
+                    .clip(HabiticaTheme.shapes.medium),
         ) {
             BackgroundScene()
 
             this@Column.AnimatedVisibility(
-                visible = showFeedResponse, modifier = Modifier
-                    .offset(y = 90.dp)
-                    .align(Alignment.TopCenter)
-                    .zIndex(4f), enter = fadeIn(), exit = fadeOut()
+                visible = showFeedResponse,
+                modifier =
+                    Modifier
+                        .offset(y = 90.dp)
+                        .align(Alignment.TopCenter)
+                        .zIndex(4f),
+                enter = fadeIn(),
+                exit = fadeOut(),
             ) {
                 Text(
                     feedMessage,
                     color = HabiticaTheme.colors.textPrimary,
                     fontSize = 12.sp,
                     textAlign = TextAlign.Center,
-                    modifier = Modifier
-                        .padding(horizontal = 8.dp)
-                        .background(
-                            HabiticaTheme.colors.windowBackground,
-                            HabiticaTheme.shapes.medium
-                        )
-                        .padding(8.dp, 3.dp)
-                        .alpha(0.65f)
+                    modifier =
+                        Modifier
+                            .padding(horizontal = 8.dp)
+                            .background(
+                                HabiticaTheme.colors.windowBackground,
+                                HabiticaTheme.shapes.medium,
+                            )
+                            .padding(8.dp, 3.dp)
+                            .alpha(0.65f),
                 )
             }
 
             this@Column.AnimatedVisibility(
                 visible = showFeedResponse,
-                modifier = Modifier
-                    .offset(y = 6.dp)
-                    .align(Alignment.TopCenter)
-                    .zIndex(4f), enter = fadeIn() + scaleIn(), exit = fadeOut()
+                modifier =
+                    Modifier
+                        .offset(y = 6.dp)
+                        .align(Alignment.TopCenter)
+                        .zIndex(4f),
+                enter = fadeIn() + scaleIn(),
+                exit = fadeOut(),
             ) {
-                val progressAnimation = animateFloatAsState(
-                    targetValue = feedValue / 50f,
-                    animationSpec = tween(durationMillis = 400, easing = FastOutSlowInEasing)
-                )
+                val progressAnimation =
+                    animateFloatAsState(
+                        targetValue = feedValue / 50f,
+                        animationSpec = tween(durationMillis = 400, easing = FastOutSlowInEasing),
+                    )
                 val scale = (sin((progressAnimation.value - oldFeedValue) * 120) * 0.02f)
                 LinearProgressIndicator(
                     progress = progressAnimation.value,
                     color = HabiticaTheme.colors.successColor,
                     strokeCap = StrokeCap.Round,
-                    modifier = Modifier
-                        .width(200.dp)
-                        .scale(1.0f + scale)
-                        .background(
-                            HabiticaTheme.colors.windowBackground,
-                            HabiticaTheme.shapes.medium
-                        )
-                        .padding(3.dp)
+                    modifier =
+                        Modifier
+                            .width(200.dp)
+                            .scale(1.0f + scale)
+                            .background(
+                                HabiticaTheme.colors.windowBackground,
+                                HabiticaTheme.shapes.medium,
+                            )
+                            .padding(3.dp),
                 )
             }
 
@@ -189,63 +200,81 @@ fun PetBottomSheet(
             val midJump = 37f
             val lowJump = 40f
             val position by if (showFeedResponse) {
-                    infiniteTransition.animateFloat(
-                        initialValue = regularPosition,
-                        targetValue = highJump,
-                        animationSpec = infiniteRepeatable(animation = keyframes {
-                            durationMillis = 800
-                            regularPosition at 0 with FastOutSlowInEasing
-                            lowJump at 50 with LinearOutSlowInEasing
-                            regularPosition at 100 with LinearOutSlowInEasing
-                            regularPosition at 300 with FastOutSlowInEasing
-                            midJump at 400 with LinearOutSlowInEasing
-                            regularPosition at 550 with LinearOutSlowInEasing
-                            regularPosition at 800
-                        }, RepeatMode.Restart, StartOffset(1500)), label = "animalPosition"
-                    )
-                } else if (isAnimalFlying(pet)) {
-                        infiniteTransition.animateFloat(
-                            initialValue = 24f,
-                            targetValue = 16f,
-                            animationSpec = infiniteRepeatable(
-                                tween(
-                                    2500,
-                                    easing = CubicBezierEasing(0.3f, 0.0f, 0.2f, 1.0f)
-                                ), RepeatMode.Reverse
+                infiniteTransition.animateFloat(
+                    initialValue = regularPosition,
+                    targetValue = highJump,
+                    animationSpec =
+                        infiniteRepeatable(
+                            animation =
+                                keyframes {
+                                    durationMillis = 800
+                                    regularPosition at 0 using FastOutSlowInEasing
+                                    lowJump at 50 using LinearOutSlowInEasing
+                                    regularPosition at 100 using LinearOutSlowInEasing
+                                    regularPosition at 300 using FastOutSlowInEasing
+                                    midJump at 400 using LinearOutSlowInEasing
+                                    regularPosition at 550 using LinearOutSlowInEasing
+                                    regularPosition at 800
+                                },
+                            RepeatMode.Restart,
+                            StartOffset(1500),
+                        ),
+                    label = "animalPosition",
+                )
+            } else if (isAnimalFlying(pet)) {
+                infiniteTransition.animateFloat(
+                    initialValue = 24f,
+                    targetValue = 16f,
+                    animationSpec =
+                        infiniteRepeatable(
+                            tween(
+                                2500,
+                                easing = CubicBezierEasing(0.3f, 0.0f, 0.2f, 1.0f),
                             ),
-                            label = "animalPosition"
-                        )
-                    } else {
-                        infiniteTransition.animateFloat(
-                            initialValue = regularPosition,
-                            targetValue = highJump,
-                            animationSpec = infiniteRepeatable(animation = keyframes {
-                                durationMillis = 6000
-                                regularPosition at 0 with LinearOutSlowInEasing
-                                highJump at 150 with LinearOutSlowInEasing
-                                regularPosition at 300 with FastOutSlowInEasing
-                                regularPosition at 1800 with FastOutSlowInEasing
-                                lowJump at 1850 with LinearOutSlowInEasing
-                                regularPosition at 1900 with LinearOutSlowInEasing
-                                regularPosition at 2100 with FastOutSlowInEasing
-                                lowJump at 2200 with LinearOutSlowInEasing
-                                regularPosition at 2350 with LinearOutSlowInEasing
-                                regularPosition at 6000
-                            }, RepeatMode.Restart, StartOffset(1500)), label = "animalPosition"
-                        )
-                    }
+                            RepeatMode.Reverse,
+                        ),
+                    label = "animalPosition",
+                )
+            } else {
+                infiniteTransition.animateFloat(
+                    initialValue = regularPosition,
+                    targetValue = highJump,
+                    animationSpec =
+                        infiniteRepeatable(
+                            animation =
+                                keyframes {
+                                    durationMillis = 6000
+                                    regularPosition at 0 using LinearOutSlowInEasing
+                                    highJump at 150 using LinearOutSlowInEasing
+                                    regularPosition at 300 using FastOutSlowInEasing
+                                    regularPosition at 1800 using FastOutSlowInEasing
+                                    lowJump at 1850 using LinearOutSlowInEasing
+                                    regularPosition at 1900 using LinearOutSlowInEasing
+                                    regularPosition at 2100 using FastOutSlowInEasing
+                                    lowJump at 2200 using LinearOutSlowInEasing
+                                    regularPosition at 2350 using LinearOutSlowInEasing
+                                    regularPosition at 6000
+                                },
+                            RepeatMode.Restart,
+                            StartOffset(1500),
+                        ),
+                    label = "animalPosition",
+                )
+            }
             PixelArtView(
-                imageName = "stable_Pet-${pet.animal}-${pet.color}", modifier = Modifier
-                    .offset(0.dp, position.dp)
-                    .size(68.dp)
-                    .align(Alignment.TopCenter)
-                    .zIndex(2f)
+                imageName = "stable_Pet-${pet.animal}-${pet.color}",
+                modifier =
+                    Modifier
+                        .offset(0.dp, position.dp)
+                        .size(68.dp)
+                        .align(Alignment.TopCenter)
+                        .zIndex(2f),
             )
         }
         if (canRaiseToMount) {
             Row(
                 horizontalArrangement = Arrangement.spacedBy(16.dp),
-                modifier = Modifier.padding(bottom = 16.dp)
+                modifier = Modifier.padding(bottom = 16.dp),
             ) {
                 val context = LocalContext.current
                 HabiticaButton(
@@ -269,14 +298,16 @@ fun PetBottomSheet(
                             dialog.show()
                         }
                         onDismiss()
-                    }, modifier = Modifier
-                        .weight(1.0f)
-                        .heightIn(min = 101.dp)
+                    },
+                    modifier =
+                        Modifier
+                            .weight(1.0f)
+                            .heightIn(min = 101.dp),
                 ) {
                     Column(horizontalAlignment = Alignment.CenterHorizontally) {
                         PixelArtView(
                             ImageBitmap.imageResource(R.drawable.feed_saddle),
-                            modifier = Modifier.size(64.dp, 50.dp)
+                            modifier = Modifier.size(64.dp, 50.dp),
                         )
                         Text(stringResource(id = R.string.use_saddle))
                     }
@@ -291,7 +322,8 @@ fun PetBottomSheet(
                             showFeedResponse = true
                             delay(700)
                             oldFeedValue = feedValue
-                            feedValue = if (response?.value == -1) 50 else (response?.value ?: feedValue)
+                            feedValue =
+                                if (response?.value == -1) 50 else (response?.value ?: feedValue)
 
                             delay(1800)
                             showFeedResponse = false
@@ -299,14 +331,16 @@ fun PetBottomSheet(
                                 onDismiss()
                             }
                         }
-                    }, modifier = Modifier
-                        .weight(1.0f)
-                        .heightIn(min = 101.dp)
+                    },
+                    modifier =
+                        Modifier
+                            .weight(1.0f)
+                            .heightIn(min = 101.dp),
                 ) {
                     Column(horizontalAlignment = Alignment.CenterHorizontally) {
                         PixelArtView(
                             getFoodPainter(pet.color),
-                            modifier = Modifier.size(64.dp, 50.dp)
+                            modifier = Modifier.size(64.dp, 50.dp),
                         )
                         Text(stringResource(id = R.string.feed))
                     }
@@ -325,11 +359,13 @@ fun PetBottomSheet(
                         SharePetUseCase.RequestValues(
                             pet.key,
                             "",
-                            context
-                        ))
+                            context,
+                        ),
+                    )
                 }
                 onDismiss()
-            }) {
+            },
+        ) {
             Text(stringResource(id = R.string.share))
         }
         HabiticaButton(
@@ -339,7 +375,8 @@ fun PetBottomSheet(
             onClick = {
                 onEquip?.invoke(pet.key)
                 onDismiss()
-            }) {
+            },
+        ) {
             if (isCurrentPet) {
                 Text(stringResource(id = R.string.unequip))
             } else {
@@ -352,14 +389,16 @@ fun PetBottomSheet(
 fun isAnimalFlying(pet: Pet): Boolean {
     if (listOf(
             "FlyingPig",
-            "Bee"
+            "Bee",
         ).contains(pet.animal)
-    ) return true
+    ) {
+        return true
+    }
     return listOf(
         "Ghost",
         "Cupid",
         "Fairy",
         "SolarSystem",
-        "Vampire"
+        "Vampire",
     ).contains(pet.color)
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/BulkAllocateStatsDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/BulkAllocateStatsDialog.kt
index d37460899..c690f7b36 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/BulkAllocateStatsDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/BulkAllocateStatsDialog.kt
@@ -17,7 +17,8 @@ import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.launch
 
-class BulkAllocateStatsDialog(context: Context, private val userRepository: UserRepository) : AlertDialog(context) {
+class BulkAllocateStatsDialog(context: Context, private val userRepository: UserRepository) :
+    AlertDialog(context) {
     private val binding = DialogBulkAllocateBinding.inflate(context.layoutInflater)
 
     private val allocatedPoints: Int
@@ -57,7 +58,7 @@ class BulkAllocateStatsDialog(context: Context, private val userRepository: User
                 binding.strengthSliderView.currentValue,
                 binding.intelligenceSliderView.currentValue,
                 binding.constitutionSliderView.currentValue,
-                binding.perceptionSliderView.currentValue
+                binding.perceptionSliderView.currentValue,
             )
             dismiss()
         }
@@ -103,13 +104,16 @@ class BulkAllocateStatsDialog(context: Context, private val userRepository: User
                 highestSlider = getSliderWithHigherValue(null, binding.strengthSliderView)
             }
             if (excludedSlider != binding.intelligenceSliderView) {
-                highestSlider = getSliderWithHigherValue(highestSlider, binding.intelligenceSliderView)
+                highestSlider =
+                    getSliderWithHigherValue(highestSlider, binding.intelligenceSliderView)
             }
             if (excludedSlider != binding.constitutionSliderView) {
-                highestSlider = getSliderWithHigherValue(highestSlider, binding.constitutionSliderView)
+                highestSlider =
+                    getSliderWithHigherValue(highestSlider, binding.constitutionSliderView)
             }
             if (excludedSlider != binding.perceptionSliderView) {
-                highestSlider = getSliderWithHigherValue(highestSlider, binding.perceptionSliderView)
+                highestSlider =
+                    getSliderWithHigherValue(highestSlider, binding.perceptionSliderView)
             }
             if (highestSlider != null) {
                 highestSlider.currentValue -= diff
@@ -119,7 +123,7 @@ class BulkAllocateStatsDialog(context: Context, private val userRepository: User
 
     private fun getSliderWithHigherValue(
         firstSlider: StatsSliderView?,
-        secondSlider: StatsSliderView?
+        secondSlider: StatsSliderView?,
     ): StatsSliderView? {
         return if ((firstSlider?.currentValue ?: 0) > (secondSlider?.currentValue ?: 0)) {
             firstSlider
@@ -134,7 +138,12 @@ class BulkAllocateStatsDialog(context: Context, private val userRepository: User
         if (allocatedPoints > 0) {
             binding.titleView.setBackgroundColor(context.getThemeColor(R.attr.colorAccent))
         } else {
-            binding.titleView.setBackgroundColor(ContextCompat.getColor(context, R.color.disabled_background))
+            binding.titleView.setBackgroundColor(
+                ContextCompat.getColor(
+                    context,
+                    R.color.disabled_background,
+                ),
+            )
         }
 
         getButton(BUTTON_POSITIVE).isEnabled = allocatedPoints > 0
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/StatsSliderView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/StatsSliderView.kt
index 3ed4e7878..7b661e2bd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/StatsSliderView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/StatsSliderView.kt
@@ -11,9 +11,9 @@ import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.StatsSliderViewBinding
 import com.habitrpg.android.habitica.extensions.AfterChangeTextWatcher
-import com.habitrpg.common.habitica.extensions.setTintWith
 import com.habitrpg.android.habitica.extensions.styledAttributes
 import com.habitrpg.common.habitica.extensions.layoutInflater
+import com.habitrpg.common.habitica.extensions.setTintWith
 
 class StatsSliderView(context: Context, attrs: AttributeSet?) : LinearLayout(context, attrs) {
     private val binding = StatsSliderViewBinding.inflate(context.layoutInflater, this)
@@ -48,9 +48,15 @@ class StatsSliderView(context: Context, attrs: AttributeSet?) : LinearLayout(con
         val attributes = attrs?.styledAttributes(context, R.styleable.StatsSliderView)
 
         if (attributes != null) {
-            binding.statTypeTitle.text = attributes.getString(R.styleable.StatsSliderView_statsTitle)
+            binding.statTypeTitle.text =
+                attributes.getString(R.styleable.StatsSliderView_statsTitle)
             val statColor = attributes.getColor(R.styleable.StatsSliderView_statsColor, 0)
-            binding.statTypeTitle.setTextColor(attributes.getColor(R.styleable.StatsSliderView_statsTextColor, 0))
+            binding.statTypeTitle.setTextColor(
+                attributes.getColor(
+                    R.styleable.StatsSliderView_statsTextColor,
+                    0,
+                ),
+            )
             binding.statsSeekBar.progressTintList = ColorStateList.valueOf(statColor)
             val thumbDrawable = ContextCompat.getDrawable(context, R.drawable.seekbar_thumb)
             thumbDrawable?.setTintWith(statColor, PorterDuff.Mode.MULTIPLY)
@@ -59,11 +65,12 @@ class StatsSliderView(context: Context, attrs: AttributeSet?) : LinearLayout(con
 
         binding.valueEditText.addTextChangedListener(
             AfterChangeTextWatcher { s ->
-                val newValue = try {
-                    s.toString().toInt()
-                } catch (e: NumberFormatException) {
-                    0
-                }
+                val newValue =
+                    try {
+                        s.toString().toInt()
+                    } catch (e: NumberFormatException) {
+                        0
+                    }
                 if (newValue != currentValue && newValue <= maxValue && newValue > 0) {
                     currentValue = newValue
                     allocateAction?.invoke(currentValue)
@@ -71,21 +78,29 @@ class StatsSliderView(context: Context, attrs: AttributeSet?) : LinearLayout(con
                     binding.valueEditText.setText(currentValue.toString())
                     binding.valueEditText.setSelection(binding.valueEditText.length())
                 }
-            }
+            },
         )
 
-        binding.statsSeekBar.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
-            override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {
-                currentValue = progress
-                if (fromUser) {
-                    allocateAction?.invoke(currentValue)
+        binding.statsSeekBar.setOnSeekBarChangeListener(
+            object : SeekBar.OnSeekBarChangeListener {
+                override fun onProgressChanged(
+                    seekBar: SeekBar?,
+                    progress: Int,
+                    fromUser: Boolean,
+                ) {
+                    currentValue = progress
+                    if (fromUser) {
+                        allocateAction?.invoke(currentValue)
+                    }
                 }
-            }
 
-            override fun onStartTrackingTouch(seekBar: SeekBar?) { /* no-on */ }
+                override fun onStartTrackingTouch(seekBar: SeekBar?) { // no-on
+                }
 
-            override fun onStopTrackingTouch(seekBar: SeekBar?) { /* no-on */ }
-        })
+                override fun onStopTrackingTouch(seekBar: SeekBar?) { // no-on
+                }
+            },
+        )
 
         currentValue = 0
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/StatsView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/StatsView.kt
index e5f498ce7..e5f253152 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/StatsView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/StatsView.kt
@@ -33,11 +33,11 @@ import androidx.compose.ui.unit.sp
 import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.StatsViewBinding
-import com.habitrpg.common.habitica.extensions.setTintWith
 import com.habitrpg.android.habitica.helpers.HapticFeedbackManager
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.common.habitica.extensions.getThemeColor
 import com.habitrpg.common.habitica.extensions.layoutInflater
+import com.habitrpg.common.habitica.extensions.setTintWith
 
 @Composable
 fun StatsViewComposable(
@@ -48,12 +48,12 @@ fun StatsViewComposable(
     buffValue: Int,
     allocatedValue: Int,
     canAllocate: Boolean,
-    allocateAction: () -> Unit
+    allocateAction: () -> Unit,
 ) {
     Column(
         Modifier
             .background(colorResource(R.color.window_background))
-            .clip(MaterialTheme.shapes.large)
+            .clip(MaterialTheme.shapes.large),
     ) {
         Row(
             Modifier
@@ -62,38 +62,74 @@ fun StatsViewComposable(
                 .background(statColor)
                 .padding(horizontal = 12.dp),
             horizontalArrangement = Arrangement.SpaceBetween,
-            verticalAlignment = Alignment.CenterVertically
+            verticalAlignment = Alignment.CenterVertically,
         ) {
             Text(statText, color = colorResource(R.color.white))
-            Text("${levelValue + equipmentValue + buffValue + allocatedValue}", color = colorResource(R.color.white))
+            Text(
+                "${levelValue + equipmentValue + buffValue + allocatedValue}",
+                color = colorResource(R.color.white),
+            )
         }
         Row(
             Modifier.height(61.dp),
             horizontalArrangement = Arrangement.SpaceEvenly,
-            verticalAlignment = Alignment.CenterVertically
+            verticalAlignment = Alignment.CenterVertically,
         ) {
-            Column(modifier = Modifier.weight(1f), verticalArrangement = Arrangement.Center, Alignment.CenterHorizontally) {
+            Column(
+                modifier = Modifier.weight(1f),
+                verticalArrangement = Arrangement.Center,
+                Alignment.CenterHorizontally,
+            ) {
                 Text(text = "$levelValue", fontSize = 20.sp)
-                Text(text = stringResource(R.string.level), color = colorResource(R.color.text_quad), fontSize = 12.sp)
-            }
-            Column(modifier = Modifier.weight(1f), verticalArrangement = Arrangement.Center, Alignment.CenterHorizontally) {
-                Text(text = "$equipmentValue", fontSize = 20.sp)
-                Text(text = stringResource(R.string.sidebar_equipment), color = colorResource(R.color.text_quad), fontSize = 12.sp)
-            }
-            Column(modifier = Modifier.weight(1f), verticalArrangement = Arrangement.Center, Alignment.CenterHorizontally) {
-                Text(text = "$buffValue", fontSize = 20.sp)
-                Text(text = stringResource(R.string.buffs), color = colorResource(R.color.text_quad), fontSize = 12.sp)
+                Text(
+                    text = stringResource(R.string.level),
+                    color = colorResource(R.color.text_quad),
+                    fontSize = 12.sp,
+                )
             }
             Column(
-                modifier = Modifier
-                    .weight(1f)
-                    .fillMaxHeight()
-                    .background(colorResource(if (canAllocate) R.color.offset_background_30 else R.color.window_background)),
+                modifier = Modifier.weight(1f),
                 verticalArrangement = Arrangement.Center,
-                Alignment.CenterHorizontally
+                Alignment.CenterHorizontally,
             ) {
-                Text(text = "$allocatedValue", fontSize = 20.sp, color = if (canAllocate) statColor else colorResource(R.color.text_primary))
-                Text(text = stringResource(R.string.allocated), color = if (canAllocate) statColor else colorResource(R.color.text_quad), fontSize = 12.sp)
+                Text(text = "$equipmentValue", fontSize = 20.sp)
+                Text(
+                    text = stringResource(R.string.sidebar_equipment),
+                    color = colorResource(R.color.text_quad),
+                    fontSize = 12.sp,
+                )
+            }
+            Column(
+                modifier = Modifier.weight(1f),
+                verticalArrangement = Arrangement.Center,
+                Alignment.CenterHorizontally,
+            ) {
+                Text(text = "$buffValue", fontSize = 20.sp)
+                Text(
+                    text = stringResource(R.string.buffs),
+                    color = colorResource(R.color.text_quad),
+                    fontSize = 12.sp,
+                )
+            }
+            Column(
+                modifier =
+                    Modifier
+                        .weight(1f)
+                        .fillMaxHeight()
+                        .background(colorResource(if (canAllocate) R.color.offset_background_30 else R.color.window_background)),
+                verticalArrangement = Arrangement.Center,
+                Alignment.CenterHorizontally,
+            ) {
+                Text(
+                    text = "$allocatedValue",
+                    fontSize = 20.sp,
+                    color = if (canAllocate) statColor else colorResource(R.color.text_primary),
+                )
+                Text(
+                    text = stringResource(R.string.allocated),
+                    color = if (canAllocate) statColor else colorResource(R.color.text_quad),
+                    fontSize = 12.sp,
+                )
             }
             AnimatedVisibility(visible = canAllocate) {
                 TextButton(
@@ -102,10 +138,13 @@ fun StatsViewComposable(
                         .width(48.dp)
                         .fillMaxHeight()
                         .background(
-                            colorResource(id = R.color.offset_background_30)
-                        )
+                            colorResource(id = R.color.offset_background_30),
+                        ),
                 ) {
-                    Image(HabiticaIconsHelper.imageOfAttributeAllocateButton().asImageBitmap(), null)
+                    Image(
+                        HabiticaIconsHelper.imageOfAttributeAllocateButton().asImageBitmap(),
+                        null,
+                    )
                 }
             }
         }
@@ -123,7 +162,7 @@ fun StatsViewPreview() {
             equipmentValue = 5,
             buffValue = 4,
             allocatedValue = 8,
-            canAllocate = false
+            canAllocate = false,
         ) {}
         StatsViewComposable(
             statText = "Intelligence",
@@ -132,7 +171,7 @@ fun StatsViewPreview() {
             equipmentValue = 5,
             buffValue = 4,
             allocatedValue = 20,
-            canAllocate = true
+            canAllocate = true,
         ) {}
     }
 }
@@ -172,15 +211,35 @@ class StatsView(context: Context, attrs: AttributeSet?) : LinearLayout(context,
             field = value
             binding.allocateButton.visibility = if (value) View.VISIBLE else View.GONE
             if (value) {
-                binding.allocatedWrapper.setBackgroundColor(ContextCompat.getColor(context, R.color.offset_background_30))
-                binding.allocateButton.setBackgroundColor(ContextCompat.getColor(context, R.color.offset_background_30))
+                binding.allocatedWrapper.setBackgroundColor(
+                    ContextCompat.getColor(
+                        context,
+                        R.color.offset_background_30,
+                    ),
+                )
+                binding.allocateButton.setBackgroundColor(
+                    ContextCompat.getColor(
+                        context,
+                        R.color.offset_background_30,
+                    ),
+                )
                 binding.allocatedValueTextView.setTextColor(statColor)
                 binding.allocatedLabelView.setTextColor(statColor)
             } else {
                 binding.allocatedWrapper.setBackgroundColor(context.getThemeColor(R.attr.colorWindowBackground))
                 binding.allocateButton.setBackgroundColor(context.getThemeColor(R.attr.colorWindowBackground))
-                binding.allocatedValueTextView.setTextColor(ContextCompat.getColor(context, R.color.text_primary))
-                binding.allocatedLabelView.setTextColor(ContextCompat.getColor(context, R.color.text_quad))
+                binding.allocatedValueTextView.setTextColor(
+                    ContextCompat.getColor(
+                        context,
+                        R.color.text_primary,
+                    ),
+                )
+                binding.allocatedLabelView.setTextColor(
+                    ContextCompat.getColor(
+                        context,
+                        R.color.text_quad,
+                    ),
+                )
             }
         }
 
@@ -189,17 +248,25 @@ class StatsView(context: Context, attrs: AttributeSet?) : LinearLayout(context,
     private var statColor: Int = 0
 
     init {
-        val attributes = context.theme?.obtainStyledAttributes(
-            attrs,
-            R.styleable.StatsView,
-            0,
-            0
-        )
+        val attributes =
+            context.theme?.obtainStyledAttributes(
+                attrs,
+                R.styleable.StatsView,
+                0,
+                0,
+            )
 
-        val backgroundDrawable = ContextCompat.getDrawable(context, R.drawable.layout_top_rounded_bg_white)
+        val backgroundDrawable =
+            ContextCompat.getDrawable(context, R.drawable.layout_top_rounded_bg_white)
         if (attributes != null) {
             statColor = attributes.getColor(R.styleable.StatsView_statsColor, 0)
-            backgroundDrawable?.setTintWith(attributes.getColor(R.styleable.StatsView_titleBackgroundColor, 0), PorterDuff.Mode.MULTIPLY)
+            backgroundDrawable?.setTintWith(
+                attributes.getColor(
+                    R.styleable.StatsView_titleBackgroundColor,
+                    0,
+                ),
+                PorterDuff.Mode.MULTIPLY,
+            )
             binding.titleTextView.text = attributes.getString(R.styleable.StatsView_statsTitle)
         }
         binding.titleWrapper.background = backgroundDrawable
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriberBenefitView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriberBenefitView.kt
index 3edb350da..b96f8a4d8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriberBenefitView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriberBenefitView.kt
@@ -19,60 +19,66 @@ import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.flow.firstOrNull
 import javax.inject.Inject
 
-class SubscriberBenefitView @JvmOverloads constructor(
-    context: Context, attrs: AttributeSet? = null
-) : LinearLayout(context, attrs) {
-    private val binding: SubscriptionBenefitsBinding
+class SubscriberBenefitView
+    @JvmOverloads
+    constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+    ) : LinearLayout(context, attrs) {
+        private val binding: SubscriptionBenefitsBinding
 
-    @Inject
-    lateinit var configManager: AppConfigManager
-    @Inject
-    lateinit var inventoryRepository: InventoryRepository
+        @Inject
+        lateinit var configManager: AppConfigManager
 
-    @EntryPoint
-    @InstallIn(SingletonComponent::class)
-    interface ThisEntryPoint {
-        fun configManager(): AppConfigManager
-        fun inventoryRepository(): InventoryRepository
-    }
+        @Inject
+        lateinit var inventoryRepository: InventoryRepository
 
-    init {
-        binding = SubscriptionBenefitsBinding.inflate(context.layoutInflater, this)
-        orientation = VERTICAL
-        val hiltEntryPoint = EntryPointAccessors.fromApplication(context, ThisEntryPoint::class.java)
-        configManager = hiltEntryPoint.configManager()
-        inventoryRepository = hiltEntryPoint.inventoryRepository()
+        @EntryPoint
+        @InstallIn(SingletonComponent::class)
+        interface ThisEntryPoint {
+            fun configManager(): AppConfigManager
 
-        MainScope().launchCatching {
-            val item = inventoryRepository.getLatestMysteryItem().firstOrNull()
-            binding.subBenefitsMysteryItemIcon.loadImage(
-                "shop_set_mystery_${
-                    item?.key?.split(
-                        "_"
-                    )?.last()
-                }"
-            )
-            binding.subBenefitsMysteryItemText.text =
-                context.getString(R.string.subscribe_listitem3_description_new, item?.text)
+            fun inventoryRepository(): InventoryRepository
         }
 
-        binding.benefitArmoireWrapper.isVisible = configManager.enableArmoireSubs()
-        binding.benefitFaintWrapper.isVisible = configManager.enableFaintSubs()
-    }
+        init {
+            binding = SubscriptionBenefitsBinding.inflate(context.layoutInflater, this)
+            orientation = VERTICAL
+            val hiltEntryPoint =
+                EntryPointAccessors.fromApplication(context, ThisEntryPoint::class.java)
+            configManager = hiltEntryPoint.configManager()
+            inventoryRepository = hiltEntryPoint.inventoryRepository()
 
-    fun hideDeathBenefit() {
-        binding.benefitFaintWrapper.isVisible = false
-    }
+            MainScope().launchCatching {
+                val item = inventoryRepository.getLatestMysteryItem().firstOrNull()
+                binding.subBenefitsMysteryItemIcon.loadImage(
+                    "shop_set_mystery_${
+                        item?.key?.split(
+                            "_",
+                        )?.last()
+                    }",
+                )
+                binding.subBenefitsMysteryItemText.text =
+                    context.getString(R.string.subscribe_listitem3_description_new, item?.text)
+            }
 
-    fun hideArmoireBenefit() {
-        binding.benefitArmoireWrapper.isVisible = false
-    }
+            binding.benefitArmoireWrapper.isVisible = configManager.enableArmoireSubs()
+            binding.benefitFaintWrapper.isVisible = configManager.enableFaintSubs()
+        }
 
-    fun hideGemsForGoldBenefit() {
-        binding.benefitGemsForGoldWrapper.isVisible = false
-    }
+        fun hideDeathBenefit() {
+            binding.benefitFaintWrapper.isVisible = false
+        }
 
-    fun hideMysticHourglassBenefit() {
-        binding.benefitHourglassesWrapper.isVisible = false
+        fun hideArmoireBenefit() {
+            binding.benefitArmoireWrapper.isVisible = false
+        }
+
+        fun hideGemsForGoldBenefit() {
+            binding.benefitGemsForGoldWrapper.isVisible = false
+        }
+
+        fun hideMysticHourglassBenefit() {
+            binding.benefitHourglassesWrapper.isVisible = false
+        }
     }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionDetailsView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionDetailsView.kt
index f49ab6c78..d2073c881 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionDetailsView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionDetailsView.kt
@@ -1,208 +1,237 @@
-package com.habitrpg.android.habitica.ui.views.subscriptions
-
-import android.content.Context
-import android.content.Intent
-import android.graphics.drawable.BitmapDrawable
-import android.net.Uri
-import android.util.AttributeSet
-import android.view.View
-import android.widget.LinearLayout
-import androidx.core.view.isVisible
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.databinding.SubscriptionDetailsBinding
-import com.habitrpg.android.habitica.models.user.SubscriptionPlan
-import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import com.habitrpg.common.habitica.extensions.layoutInflater
-import java.text.DateFormat
-import java.time.LocalDate
-import java.time.format.DateTimeFormatter
-import java.util.Date
-
-class SubscriptionDetailsView : LinearLayout {
-
-    lateinit var binding: SubscriptionDetailsBinding
-
-    private var plan: SubscriptionPlan? = null
-
-    var onShowSubscriptionOptions: (() -> Unit)? = null
-
-    var currentUserID: String? = null
-
-    constructor(context: Context, attributeSet: AttributeSet) : super(context, attributeSet) {
-        setupView()
-    }
-
-    constructor(context: Context) : super(context) {
-        setupView()
-    }
-
-    private fun setupView() {
-        binding = SubscriptionDetailsBinding.inflate(context.layoutInflater, this, true)
-        binding.changeSubscriptionButton.setOnClickListener { changeSubscriptionButtonTapped() }
-        binding.heartIcon.setImageDrawable(BitmapDrawable(context.resources, HabiticaIconsHelper.imageOfHeartLightBg()))
-    }
-
-    fun setPlan(plan: SubscriptionPlan) {
-        this.plan = plan
-
-        updateSubscriptionStatusPill(plan)
-
-        var duration: String? = null
-
-        if (plan.planId != null && plan.dateTerminated == null) {
-            when (plan.planId) {
-                SubscriptionPlan.PLANID_BASIC, SubscriptionPlan.PLANID_BASICEARNED -> {
-                    duration = resources.getString(R.string.month)
-                }
-                SubscriptionPlan.PLANID_BASIC3MONTH -> {
-                    duration = resources.getString(R.string.three_months)
-                }
-                SubscriptionPlan.PLANID_BASIC6MONTH, SubscriptionPlan.PLANID_GOOGLE6MONTH -> {
-                    duration = resources.getString(R.string.six_months)
-                }
-                SubscriptionPlan.PLANID_BASIC12MONTH -> {
-                    duration = resources.getString(R.string.twelve_months)
-                }
-            }
-        }
-
-        when {
-            duration != null -> binding.subscriptionDurationTextView.text = resources.getString(R.string.subscription_duration, duration)
-            plan.isGroupPlanSub -> binding.subscriptionDurationTextView.setText(R.string.member_group_plan)
-            plan.dateTerminated != null -> binding.subscriptionDurationTextView.text = resources.getString(R.string.ending_on, DateFormat.getDateInstance().format(plan.dateTerminated ?: Date()))
-        }
-
-        if ((plan.extraMonths ?: 0) > 0) {
-            binding.subscriptionCreditCard.visibility = View.VISIBLE
-            if (plan.extraMonths == 1) {
-                binding.subscriptionCreditTextView.text = resources.getString(R.string.subscription_credit_canceling, 1)
-            } else {
-                binding.subscriptionCreditTextView.text = resources.getString(R.string.subscription_credit_canceling, plan.extraMonths)
-            }
-        } else {
-            binding.subscriptionCreditCard.visibility = View.GONE
-        }
-
-        when (plan.paymentMethod) {
-            "Amazon Payments" -> {
-                binding.paymentProcessorImageView.setImageResource(R.drawable.payment_amazon)
-                binding.subscriptionPaymentMethodTextview.text = context.getString(R.string.amazon)
-            }
-            "Apple" -> {
-                binding.paymentProcessorImageView.setImageResource(R.drawable.payment_apple)
-                binding.subscriptionPaymentMethodTextview.text = context.getString(R.string.apple_pay)
-            }
-            "Google" -> {
-                binding.paymentProcessorImageView.setImageResource(R.drawable.payment_google)
-                binding.subscriptionPaymentMethodTextview.text = context.getString(R.string.google_pay)
-            }
-            "PayPal" -> {
-                binding.paymentProcessorImageView.setImageResource(R.drawable.payment_paypal)
-                binding.subscriptionPaymentMethodTextview.text = context.getString(R.string.paypal)
-            }
-            "Stripe" -> {
-                binding.paymentProcessorImageView.setImageResource(R.drawable.payment_stripe)
-                binding.subscriptionPaymentMethodTextview.text = context.getString(R.string.stripe_payment)
-            }
-            else -> {
-                if (plan.isGiftedSub) {
-                    binding.paymentProcessorImageView.setImageResource(R.drawable.payment_gift)
-                    binding.subscriptionPaymentMethodTextview.text = context.getString(R.string.gifted)
-                } else {
-                    binding.paymentProcessorWrapper.visibility = View.GONE
-                }
-            }
-        }
-
-        binding.monthsSubscribedTextView.text = plan.consecutive?.count.toString()
-
-        binding.gemCapTextView.text = plan.totalNumberOfGems.toString()
-
-        if (plan.isActive && plan.dateTerminated == null) {
-            val now = LocalDate.now()
-            val nextHourglassDate = LocalDate.now().plusMonths(plan.monthsUntilNextHourglass.toLong())
-            val format = if (now.year != nextHourglassDate.year) {
-                "MMM YYYY"
-            } else {
-                "MMMM"
-            }
-            val nextHourglassMonth = nextHourglassDate.format(DateTimeFormatter.ofPattern(format))
-            nextHourglassMonth?.let { binding.nextHourglassTextview.text = it }
-        } else {
-            binding.nextHourglassTextview.text = "--"
-        }
-
-        binding.changeSubscriptionButton.visibility = View.VISIBLE
-        if (plan.paymentMethod != null) {
-            binding.changeSubscriptionTitle.setText(R.string.cancel_subscription)
-            if (plan.paymentMethod == "Google") {
-                binding.changeSubscriptionDescription.setText(R.string.cancel_subscription_google_description)
-                binding.changeSubscriptionButton.setText(R.string.open_in_store)
-            } else {
-                if (plan.isGroupPlanSub) {
-                    /*if (plan.ownerID == currentUserID) {
-                        binding.changeSubscriptionDescription.setText(R.string.cancel_subscription_group_plan_owner)
-                    } else {*/
-                    binding.changeSubscriptionDescription.setText(R.string.cancel_subscription_group_plan)
-                    binding.changeSubscriptionButton.visibility = View.GONE
-                    // }
-                } else {
-                    binding.changeSubscriptionDescription.setText(R.string.cancel_subscription_notgoogle_description)
-                }
-                binding.changeSubscriptionButton.setText(R.string.visit_habitica_website)
-            }
-        }
-        if (plan.dateTerminated != null) {
-            binding.changeSubscriptionTitle.setText(R.string.resubscribe)
-            binding.changeSubscriptionDescription.setText(R.string.resubscribe_description)
-            binding.changeSubscriptionButton.setText(R.string.renew_subscription)
-            // Hide the button until we improve the flow in 4.3
-            binding.changeSubscriptionWrapper.isVisible = false
-        }
-    }
-
-    private fun updateSubscriptionStatusPill(plan: SubscriptionPlan) {
-        if (plan.isActive) {
-            if (plan.dateTerminated != null) {
-                if (plan.isGiftedSub) {
-                    binding.subscriptionStatusNotRecurring.visibility = View.VISIBLE
-                    binding.subscriptionStatusCancelled.visibility = View.GONE
-                } else {
-                    binding.subscriptionStatusNotRecurring.visibility = View.GONE
-                    binding.subscriptionStatusCancelled.visibility = View.VISIBLE
-                }
-                binding.subscriptionStatusActive.visibility = View.GONE
-                binding.subscriptionStatusGroupPlan.visibility = View.GONE
-            } else {
-                if (plan.isGroupPlanSub) {
-                    binding.subscriptionStatusGroupPlan.visibility = View.VISIBLE
-                    binding.subscriptionStatusActive.visibility = View.GONE
-                    binding.subscriptionStatusNotRecurring.visibility = View.GONE
-                } else {
-                    binding.subscriptionStatusActive.visibility = View.VISIBLE
-                    binding.subscriptionStatusNotRecurring.visibility = View.GONE
-                    binding.subscriptionStatusGroupPlan.visibility = View.GONE
-                }
-            }
-            binding.subscriptionStatusInactive.visibility = View.GONE
-        } else {
-            binding.subscriptionStatusActive.visibility = View.GONE
-            binding.subscriptionStatusInactive.visibility = View.VISIBLE
-            binding.subscriptionStatusNotRecurring.visibility = View.GONE
-            binding.subscriptionStatusGroupPlan.visibility = View.GONE
-        }
-    }
-
-    private fun changeSubscriptionButtonTapped() {
-        if (plan?.paymentMethod != null && plan?.dateTerminated == null) {
-            val url = if (plan?.paymentMethod == "Google") {
-                "https://play.google.com/store/account/subscriptions"
-            } else {
-                context.getString(R.string.base_url) + "/"
-            }
-            context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url)))
-        } else if (plan?.dateTerminated != null) {
-            onShowSubscriptionOptions?.invoke()
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.views.subscriptions
+
+import android.content.Context
+import android.content.Intent
+import android.graphics.drawable.BitmapDrawable
+import android.net.Uri
+import android.util.AttributeSet
+import android.view.View
+import android.widget.LinearLayout
+import androidx.core.view.isVisible
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.SubscriptionDetailsBinding
+import com.habitrpg.android.habitica.models.user.SubscriptionPlan
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
+import com.habitrpg.common.habitica.extensions.layoutInflater
+import java.text.DateFormat
+import java.time.LocalDate
+import java.time.format.DateTimeFormatter
+import java.util.Date
+
+class SubscriptionDetailsView : LinearLayout {
+    lateinit var binding: SubscriptionDetailsBinding
+
+    private var plan: SubscriptionPlan? = null
+
+    var onShowSubscriptionOptions: (() -> Unit)? = null
+
+    var currentUserID: String? = null
+
+    constructor(context: Context, attributeSet: AttributeSet) : super(context, attributeSet) {
+        setupView()
+    }
+
+    constructor(context: Context) : super(context) {
+        setupView()
+    }
+
+    private fun setupView() {
+        binding = SubscriptionDetailsBinding.inflate(context.layoutInflater, this, true)
+        binding.changeSubscriptionButton.setOnClickListener { changeSubscriptionButtonTapped() }
+        binding.heartIcon.setImageDrawable(
+            BitmapDrawable(
+                context.resources,
+                HabiticaIconsHelper.imageOfHeartLightBg(),
+            ),
+        )
+    }
+
+    fun setPlan(plan: SubscriptionPlan) {
+        this.plan = plan
+
+        updateSubscriptionStatusPill(plan)
+
+        var duration: String? = null
+
+        if (plan.planId != null && plan.dateTerminated == null) {
+            when (plan.planId) {
+                SubscriptionPlan.PLANID_BASIC, SubscriptionPlan.PLANID_BASICEARNED -> {
+                    duration = resources.getString(R.string.month)
+                }
+
+                SubscriptionPlan.PLANID_BASIC3MONTH -> {
+                    duration = resources.getString(R.string.three_months)
+                }
+
+                SubscriptionPlan.PLANID_BASIC6MONTH, SubscriptionPlan.PLANID_GOOGLE6MONTH -> {
+                    duration = resources.getString(R.string.six_months)
+                }
+
+                SubscriptionPlan.PLANID_BASIC12MONTH -> {
+                    duration = resources.getString(R.string.twelve_months)
+                }
+            }
+        }
+
+        when {
+            duration != null ->
+                binding.subscriptionDurationTextView.text =
+                    resources.getString(R.string.subscription_duration, duration)
+
+            plan.isGroupPlanSub -> binding.subscriptionDurationTextView.setText(R.string.member_group_plan)
+            plan.dateTerminated != null ->
+                binding.subscriptionDurationTextView.text =
+                    resources.getString(
+                        R.string.ending_on,
+                        DateFormat.getDateInstance().format(plan.dateTerminated ?: Date()),
+                    )
+        }
+
+        if ((plan.extraMonths ?: 0) > 0) {
+            binding.subscriptionCreditCard.visibility = View.VISIBLE
+            if (plan.extraMonths == 1) {
+                binding.subscriptionCreditTextView.text =
+                    resources.getString(R.string.subscription_credit_canceling, 1)
+            } else {
+                binding.subscriptionCreditTextView.text =
+                    resources.getString(R.string.subscription_credit_canceling, plan.extraMonths)
+            }
+        } else {
+            binding.subscriptionCreditCard.visibility = View.GONE
+        }
+
+        when (plan.paymentMethod) {
+            "Amazon Payments" -> {
+                binding.paymentProcessorImageView.setImageResource(R.drawable.payment_amazon)
+                binding.subscriptionPaymentMethodTextview.text = context.getString(R.string.amazon)
+            }
+
+            "Apple" -> {
+                binding.paymentProcessorImageView.setImageResource(R.drawable.payment_apple)
+                binding.subscriptionPaymentMethodTextview.text =
+                    context.getString(R.string.apple_pay)
+            }
+
+            "Google" -> {
+                binding.paymentProcessorImageView.setImageResource(R.drawable.payment_google)
+                binding.subscriptionPaymentMethodTextview.text =
+                    context.getString(R.string.google_pay)
+            }
+
+            "PayPal" -> {
+                binding.paymentProcessorImageView.setImageResource(R.drawable.payment_paypal)
+                binding.subscriptionPaymentMethodTextview.text = context.getString(R.string.paypal)
+            }
+
+            "Stripe" -> {
+                binding.paymentProcessorImageView.setImageResource(R.drawable.payment_stripe)
+                binding.subscriptionPaymentMethodTextview.text =
+                    context.getString(R.string.stripe_payment)
+            }
+
+            else -> {
+                if (plan.isGiftedSub) {
+                    binding.paymentProcessorImageView.setImageResource(R.drawable.payment_gift)
+                    binding.subscriptionPaymentMethodTextview.text =
+                        context.getString(R.string.gifted)
+                } else {
+                    binding.paymentProcessorWrapper.visibility = View.GONE
+                }
+            }
+        }
+
+        binding.monthsSubscribedTextView.text = plan.consecutive?.count.toString()
+
+        binding.gemCapTextView.text = plan.totalNumberOfGems.toString()
+
+        if (plan.isActive && plan.dateTerminated == null) {
+            val now = LocalDate.now()
+            val nextHourglassDate =
+                LocalDate.now().plusMonths(plan.monthsUntilNextHourglass.toLong())
+            val format =
+                if (now.year != nextHourglassDate.year) {
+                    "MMM YYYY"
+                } else {
+                    "MMMM"
+                }
+            val nextHourglassMonth = nextHourglassDate.format(DateTimeFormatter.ofPattern(format))
+            nextHourglassMonth?.let { binding.nextHourglassTextview.text = it }
+        } else {
+            binding.nextHourglassTextview.text = "--"
+        }
+
+        binding.changeSubscriptionButton.visibility = View.VISIBLE
+        if (plan.paymentMethod != null) {
+            binding.changeSubscriptionTitle.setText(R.string.cancel_subscription)
+            if (plan.paymentMethod == "Google") {
+                binding.changeSubscriptionDescription.setText(R.string.cancel_subscription_google_description)
+                binding.changeSubscriptionButton.setText(R.string.open_in_store)
+            } else {
+                if (plan.isGroupPlanSub) {
+                    /*if (plan.ownerID == currentUserID) {
+                        binding.changeSubscriptionDescription.setText(R.string.cancel_subscription_group_plan_owner)
+                    } else {*/
+                    binding.changeSubscriptionDescription.setText(R.string.cancel_subscription_group_plan)
+                    binding.changeSubscriptionButton.visibility = View.GONE
+                    // }
+                } else {
+                    binding.changeSubscriptionDescription.setText(R.string.cancel_subscription_notgoogle_description)
+                }
+                binding.changeSubscriptionButton.setText(R.string.visit_habitica_website)
+            }
+        }
+        if (plan.dateTerminated != null) {
+            binding.changeSubscriptionTitle.setText(R.string.resubscribe)
+            binding.changeSubscriptionDescription.setText(R.string.resubscribe_description)
+            binding.changeSubscriptionButton.setText(R.string.renew_subscription)
+            // Hide the button until we improve the flow in 4.3
+            binding.changeSubscriptionWrapper.isVisible = false
+        }
+    }
+
+    private fun updateSubscriptionStatusPill(plan: SubscriptionPlan) {
+        if (plan.isActive) {
+            if (plan.dateTerminated != null) {
+                if (plan.isGiftedSub) {
+                    binding.subscriptionStatusNotRecurring.visibility = View.VISIBLE
+                    binding.subscriptionStatusCancelled.visibility = View.GONE
+                } else {
+                    binding.subscriptionStatusNotRecurring.visibility = View.GONE
+                    binding.subscriptionStatusCancelled.visibility = View.VISIBLE
+                }
+                binding.subscriptionStatusActive.visibility = View.GONE
+                binding.subscriptionStatusGroupPlan.visibility = View.GONE
+            } else {
+                if (plan.isGroupPlanSub) {
+                    binding.subscriptionStatusGroupPlan.visibility = View.VISIBLE
+                    binding.subscriptionStatusActive.visibility = View.GONE
+                    binding.subscriptionStatusNotRecurring.visibility = View.GONE
+                } else {
+                    binding.subscriptionStatusActive.visibility = View.VISIBLE
+                    binding.subscriptionStatusNotRecurring.visibility = View.GONE
+                    binding.subscriptionStatusGroupPlan.visibility = View.GONE
+                }
+            }
+            binding.subscriptionStatusInactive.visibility = View.GONE
+        } else {
+            binding.subscriptionStatusActive.visibility = View.GONE
+            binding.subscriptionStatusInactive.visibility = View.VISIBLE
+            binding.subscriptionStatusNotRecurring.visibility = View.GONE
+            binding.subscriptionStatusGroupPlan.visibility = View.GONE
+        }
+    }
+
+    private fun changeSubscriptionButtonTapped() {
+        if (plan?.paymentMethod != null && plan?.dateTerminated == null) {
+            val url =
+                if (plan?.paymentMethod == "Google") {
+                    "https://play.google.com/store/account/subscriptions"
+                } else {
+                    context.getString(R.string.base_url) + "/"
+                }
+            context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url)))
+        } else if (plan?.dateTerminated != null) {
+            onShowSubscriptionOptions?.invoke()
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionOptionView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionOptionView.kt
index a0c362179..5daf635b4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionOptionView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionOptionView.kt
@@ -10,23 +10,32 @@ import com.habitrpg.android.habitica.databinding.PurchaseSubscriptionViewBinding
 import com.habitrpg.common.habitica.extensions.layoutInflater
 
 class SubscriptionOptionView(context: Context, attrs: AttributeSet) : FrameLayout(context, attrs) {
-
-    private val binding = PurchaseSubscriptionViewBinding.inflate(context.layoutInflater, this, true)
+    private val binding =
+        PurchaseSubscriptionViewBinding.inflate(context.layoutInflater, this, true)
 
     var sku: String? = null
 
     init {
-        val a = context.theme.obtainStyledAttributes(
-            attrs,
-            R.styleable.SubscriptionOptionView,
-            0,
-            0
-        )
+        val a =
+            context.theme.obtainStyledAttributes(
+                attrs,
+                R.styleable.SubscriptionOptionView,
+                0,
+                0,
+            )
 
         if (a.getBoolean(R.styleable.SubscriptionOptionView_isNonRecurring, false)) {
-            binding.descriptionTextView.text = context.getString(R.string.subscription_duration_norenew, a.getText(R.styleable.SubscriptionOptionView_recurringText))
+            binding.descriptionTextView.text =
+                context.getString(
+                    R.string.subscription_duration_norenew,
+                    a.getText(R.styleable.SubscriptionOptionView_recurringText),
+                )
         } else {
-            binding.descriptionTextView.text = context.getString(R.string.subscription_duration, a.getText(R.styleable.SubscriptionOptionView_recurringText))
+            binding.descriptionTextView.text =
+                context.getString(
+                    R.string.subscription_duration,
+                    a.getText(R.styleable.SubscriptionOptionView_recurringText),
+                )
         }
 
         binding.gemCapTextView.text = a.getText(R.styleable.SubscriptionOptionView_gemCapText)
@@ -34,9 +43,11 @@ class SubscriptionOptionView(context: Context, attrs: AttributeSet) : FrameLayou
         val hourGlassCount = a.getInteger(R.styleable.SubscriptionOptionView_hourGlassCount, 0)
         binding.hourglassTextView.visibility = View.VISIBLE
         if (hourGlassCount != 0) {
-            binding.hourglassTextView.text = context.getString(R.string.subscription_hourglasses, hourGlassCount)
+            binding.hourglassTextView.text =
+                context.getString(R.string.subscription_hourglasses, hourGlassCount)
         } else {
-            binding.hourglassTextView.text = context.getString(R.string.subscription_hourglasses_3month_timeframe)
+            binding.hourglassTextView.text =
+                context.getString(R.string.subscription_hourglasses_3month_timeframe)
         }
     }
 
@@ -68,20 +79,50 @@ class SubscriptionOptionView(context: Context, attrs: AttributeSet) : FrameLayou
             binding.hourglassTextView.setBackgroundResource(R.drawable.pill_bg_purple_400)
             binding.hourglassTextView.setTextColor(ContextCompat.getColor(context, R.color.white))
             binding.priceLabel.setTextColor(ContextCompat.getColor(context, R.color.text_brand))
-            binding.descriptionTextView.setTextColor(ContextCompat.getColor(context, R.color.text_brand))
+            binding.descriptionTextView.setTextColor(
+                ContextCompat.getColor(
+                    context,
+                    R.color.text_brand,
+                ),
+            )
         } else {
             binding.wrapper.setBackgroundResource(R.drawable.subscription_type_box_bg)
             binding.subscriptionSelectedView.setBackgroundResource(R.drawable.subscription_unselected)
             binding.gemCapTextView.setBackgroundResource(R.drawable.pill_bg_gray)
-            binding.gemCapTextView.setTextColor(ContextCompat.getColor(context, R.color.text_secondary))
+            binding.gemCapTextView.setTextColor(
+                ContextCompat.getColor(
+                    context,
+                    R.color.text_secondary,
+                ),
+            )
             binding.hourglassTextView.setBackgroundResource(R.drawable.pill_bg_gray)
-            binding.hourglassTextView.setTextColor(ContextCompat.getColor(context, R.color.text_secondary))
+            binding.hourglassTextView.setTextColor(
+                ContextCompat.getColor(
+                    context,
+                    R.color.text_secondary,
+                ),
+            )
             binding.priceLabel.setTextColor(ContextCompat.getColor(context, R.color.text_ternary))
-            binding.descriptionTextView.setTextColor(ContextCompat.getColor(context, R.color.text_ternary))
+            binding.descriptionTextView.setTextColor(
+                ContextCompat.getColor(
+                    context,
+                    R.color.text_ternary,
+                ),
+            )
         }
         val horizontalPadding = resources.getDimension(R.dimen.pill_horizontal_padding).toInt()
         val verticalPadding = resources.getDimension(R.dimen.pill_vertical_padding).toInt()
-        binding.gemCapTextView.setPadding(horizontalPadding, verticalPadding, horizontalPadding, verticalPadding)
-        binding.hourglassTextView.setPadding(horizontalPadding, verticalPadding, horizontalPadding, verticalPadding)
+        binding.gemCapTextView.setPadding(
+            horizontalPadding,
+            verticalPadding,
+            horizontalPadding,
+            verticalPadding,
+        )
+        binding.hourglassTextView.setPadding(
+            horizontalPadding,
+            verticalPadding,
+            horizontalPadding,
+            verticalPadding,
+        )
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/AssignSheet.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/AssignSheet.kt
index 2e827f6f5..517092efe 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/AssignSheet.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/AssignSheet.kt
@@ -49,7 +49,7 @@ fun AssignSheet(
     configManager: AppConfigManager,
     onAssignClick: (String) -> Unit,
     onCloseClick: () -> Unit,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     Column(modifier) {
         Box {
@@ -59,21 +59,27 @@ fun AssignSheet(
                 fontWeight = FontWeight.Medium,
                 color = colorResource(R.color.gray_200),
                 textAlign = TextAlign.Center,
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(top = 8.dp)
+                modifier =
+                    Modifier
+                        .fillMaxWidth()
+                        .padding(top = 8.dp),
             )
             TextButton(
                 onClick = onCloseClick,
                 colors = ButtonDefaults.textButtonColors(),
-                modifier = Modifier.align(Alignment.CenterEnd)
+                modifier = Modifier.align(Alignment.CenterEnd),
             ) {
                 Text(stringResource(R.string.done))
             }
         }
         for (member in members) {
             val isAssigned = assignedMembers.contains(member.id)
-            AssignSheetRow(member = member, isAssigned = isAssigned, configManager, onAssignClick = onAssignClick)
+            AssignSheetRow(
+                member = member,
+                isAssigned = isAssigned,
+                configManager,
+                onAssignClick = onAssignClick,
+            )
         }
     }
 }
@@ -84,7 +90,7 @@ fun AssignSheetRow(
     isAssigned: Boolean,
     configManager: AppConfigManager,
     onAssignClick: (String) -> Unit,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     UserRow(
         username = member.displayName,
@@ -93,70 +99,76 @@ fun AssignSheetRow(
         extraContent = {
             Text(
                 member.formattedUsername ?: "",
-                color = colorResource(R.color.text_ternary)
+                color = colorResource(R.color.text_ternary),
             )
         },
         endContent = {
             IsAssignedIndicator(isAssigned = isAssigned)
         },
         configManager = configManager,
-        modifier = modifier
-            .clickable {
-                onAssignClick(member.id)
-            }
-            .padding(30.dp, 12.dp)
-            .heightIn(min = 24.dp)
-            .fillMaxWidth()
+        modifier =
+            modifier
+                .clickable {
+                    onAssignClick(member.id)
+                }
+                .padding(30.dp, 12.dp)
+                .heightIn(min = 24.dp)
+                .fillMaxWidth(),
     )
 }
 
 @Composable
 private fun IsAssignedIndicator(
     isAssigned: Boolean,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     val transition = updateTransition(isAssigned, label = "isAssigned")
-    val rotation = transition.animateFloat(
-        label = "isAssigned",
-        transitionSpec = { spring(Spring.DampingRatioLowBouncy, Spring.StiffnessMediumLow) }
-    ) {
-        if (it) 0f else 135f
-    }
-    val backgroundColor = transition.animateColor(
-        label = "isAssigned",
-        transitionSpec = { tween(450, easing = FastOutLinearInEasing) }
-    ) {
-        if (it) MaterialTheme.colors.primary else colorResource(id = R.color.transparent)
-    }
-    val color = transition.animateColor(
-        label = "isAssigned",
-        transitionSpec = { tween(450, easing = FastOutLinearInEasing) }
-    ) {
-        colorResource(if (it) R.color.white else R.color.text_dimmed)
-    }
-    val borderColor = transition.animateColor(
-        label = "isAssigned",
-        transitionSpec = { tween(450, easing = FastOutLinearInEasing) }
-    ) {
-        if (it) MaterialTheme.colors.primary else colorResource(id = R.color.text_dimmed)
-    }
+    val rotation =
+        transition.animateFloat(
+            label = "isAssigned",
+            transitionSpec = { spring(Spring.DampingRatioLowBouncy, Spring.StiffnessMediumLow) },
+        ) {
+            if (it) 0f else 135f
+        }
+    val backgroundColor =
+        transition.animateColor(
+            label = "isAssigned",
+            transitionSpec = { tween(450, easing = FastOutLinearInEasing) },
+        ) {
+            if (it) MaterialTheme.colors.primary else colorResource(id = R.color.transparent)
+        }
+    val color =
+        transition.animateColor(
+            label = "isAssigned",
+            transitionSpec = { tween(450, easing = FastOutLinearInEasing) },
+        ) {
+            colorResource(if (it) R.color.white else R.color.text_dimmed)
+        }
+    val borderColor =
+        transition.animateColor(
+            label = "isAssigned",
+            transitionSpec = { tween(450, easing = FastOutLinearInEasing) },
+        ) {
+            if (it) MaterialTheme.colors.primary else colorResource(id = R.color.text_dimmed)
+        }
     Image(
         painterResource(R.drawable.ic_close_white_24dp),
         null,
         colorFilter = ColorFilter.tint(color.value),
-        modifier = modifier
-            .rotate(rotation.value)
-            .size(24.dp)
-            .background(
-                backgroundColor.value,
-                CircleShape
-            )
-            .border(
-                2.dp,
-                borderColor.value,
-                CircleShape
-            )
-            .padding(3.dp)
+        modifier =
+            modifier
+                .rotate(rotation.value)
+                .size(24.dp)
+                .background(
+                    backgroundColor.value,
+                    CircleShape,
+                )
+                .border(
+                    2.dp,
+                    borderColor.value,
+                    CircleShape,
+                )
+                .padding(3.dp),
     )
 }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/AssignedView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/AssignedView.kt
index 252c3cca2..f6a781291 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/AssignedView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/AssignedView.kt
@@ -29,10 +29,9 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.models.Assignable
 import com.habitrpg.android.habitica.ui.theme.colors
-import com.habitrpg.common.habitica.theme.HabiticaTheme
 import com.habitrpg.android.habitica.ui.views.CompletedAt
 import com.habitrpg.android.habitica.ui.views.UserRow
-import com.habitrpg.common.habitica.helpers.MainNavigationController
+import com.habitrpg.common.habitica.theme.HabiticaTheme
 import java.util.Date
 
 @Composable
@@ -45,27 +44,29 @@ fun AssignedView(
     onUndoClick: (String) -> Unit,
     configManager: AppConfigManager,
     modifier: Modifier = Modifier,
-    showEditButton: Boolean = false
+    showEditButton: Boolean = false,
 ) {
     Column(modifier.fillMaxWidth()) {
-        val rowModifier = Modifier
-            .padding(vertical = 4.dp)
-            .background(
-                backgroundColor,
-                MaterialTheme.shapes.medium
-            )
-            .heightIn(min = 66.dp)
-            .padding(start = 16.dp)
-            .fillMaxWidth()
-            .clip(MaterialTheme.shapes.medium)
+        val rowModifier =
+            Modifier
+                .padding(vertical = 4.dp)
+                .background(
+                    backgroundColor,
+                    MaterialTheme.shapes.medium,
+                )
+                .heightIn(min = 66.dp)
+                .padding(start = 16.dp)
+                .fillMaxWidth()
+                .clip(MaterialTheme.shapes.medium)
         for (assignable in assigned) {
             UserRow(
                 username = assignable.identifiableName,
                 avatar = assignable.avatar,
                 modifier = rowModifier,
-                mainContentModifier = Modifier
-                    .padding(vertical = 12.dp)
-                    .heightIn(min = 24.dp),
+                mainContentModifier =
+                    Modifier
+                        .padding(vertical = 12.dp)
+                        .heightIn(min = 24.dp),
                 color = color,
                 extraContent = {
                     completedAt[assignable.id]?.let { CompletedAt(completedAt = it) }
@@ -77,38 +78,39 @@ fun AssignedView(
                             UndoTaskCompletion(
                                 Modifier.clickable {
                                     assignable.id?.let { it1 -> onUndoClick(it1) }
-                                }
+                                },
                             )
                         }
                     }
-                }
+                },
             )
         }
         if (showEditButton) {
             Row(
                 verticalAlignment = Alignment.CenterVertically,
-                modifier = Modifier
-                    .clickable {
-                        onEditClick()
-                    }
-                    .padding(vertical = 4.dp)
-                    .background(
-                        backgroundColor,
-                        MaterialTheme.shapes.medium
-                    )
-                    .padding(15.dp, 12.dp)
-                    .heightIn(min = 24.dp)
-                    .fillMaxWidth()
+                modifier =
+                    Modifier
+                        .clickable {
+                            onEditClick()
+                        }
+                        .padding(vertical = 4.dp)
+                        .background(
+                            backgroundColor,
+                            MaterialTheme.shapes.medium,
+                        )
+                        .padding(15.dp, 12.dp)
+                        .heightIn(min = 24.dp)
+                        .fillMaxWidth(),
             ) {
                 Image(
                     painterResource(R.drawable.edit),
                     null,
-                    colorFilter = ColorFilter.tint(color)
+                    colorFilter = ColorFilter.tint(color),
                 )
                 Text(
                     stringResource(R.string.edit_assignees),
                     color = color,
-                    modifier = Modifier.padding(start = 4.dp)
+                    modifier = Modifier.padding(start = 4.dp),
                 )
             }
         }
@@ -120,24 +122,26 @@ fun UndoTaskCompletion(modifier: Modifier = Modifier) {
     Column(
         horizontalAlignment = Alignment.CenterHorizontally,
         verticalArrangement = Arrangement.Center,
-        modifier = modifier
-            .width(51.dp)
-            .heightIn(min = 66.dp)
-            .fillMaxHeight()
-            .background(HabiticaTheme.colors.contentBackgroundOffset)
+        modifier =
+            modifier
+                .width(51.dp)
+                .heightIn(min = 66.dp)
+                .fillMaxHeight()
+                .background(HabiticaTheme.colors.contentBackgroundOffset),
     ) {
         Image(
             painterResource(R.drawable.checkmark),
             null,
             contentScale = ContentScale.None,
-            modifier = Modifier
-                .size(24.dp)
-                .background(HabiticaTheme.colors.windowBackground, HabiticaTheme.shapes.small)
+            modifier =
+                Modifier
+                    .size(24.dp)
+                    .background(HabiticaTheme.colors.windowBackground, HabiticaTheme.shapes.small),
         )
         Text(
             stringResource(R.string.undo),
             fontSize = 12.sp,
-            color = HabiticaTheme.colors.textSecondary
+            color = HabiticaTheme.colors.textSecondary,
         )
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.kt
index 099d91d0c..f2a2df706 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.kt
@@ -1,436 +1,477 @@
-package com.habitrpg.android.habitica.ui.views.tasks
-
-import android.content.Context
-import android.content.res.ColorStateList
-import android.graphics.Color
-import android.graphics.Typeface
-import android.graphics.drawable.Drawable
-import android.util.TypedValue
-import android.view.LayoutInflater
-import android.view.WindowManager
-import android.widget.RadioGroup
-import android.widget.TextView
-import androidx.annotation.IdRes
-import androidx.appcompat.widget.AppCompatCheckBox
-import androidx.core.content.ContextCompat
-import androidx.core.view.isVisible
-import androidx.core.widget.CompoundButtonCompat
-import androidx.lifecycle.lifecycleScope
-import com.google.android.material.button.MaterialButton
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.data.TagRepository
-import com.habitrpg.android.habitica.databinding.DialogTaskFilterBinding
-import com.habitrpg.android.habitica.databinding.EditTagItemBinding
-import com.habitrpg.android.habitica.extensions.OnChangeTextWatcher
-import com.habitrpg.android.habitica.models.Tag
-import com.habitrpg.android.habitica.models.tasks.Task
-import com.habitrpg.android.habitica.ui.viewmodels.TasksViewModel
-import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaBottomSheetDialog
-import com.habitrpg.common.habitica.extensions.getThemeColor
-import com.habitrpg.common.habitica.helpers.launchCatching
-import com.habitrpg.shared.habitica.models.tasks.TaskType
-import java.util.UUID
-
-class TaskFilterDialog(context: Context, private val repository: TagRepository, private val showTags: Boolean) : HabiticaBottomSheetDialog(context) {
-    lateinit var viewModel: TasksViewModel
-    private val binding = DialogTaskFilterBinding.inflate(layoutInflater)
-
-    var taskType: TaskType = TaskType.HABIT
-        set(value) {
-            field = value
-            when (value) {
-                TaskType.HABIT -> {
-                    binding.taskTypeTitle.setText(R.string.habits)
-                    binding.allTaskFilter.setText(R.string.all)
-                    binding.secondTaskFilter.setText(R.string.weak)
-                    binding.thirdTaskFilter.setText(R.string.strong)
-                }
-                TaskType.DAILY -> {
-                    binding.taskTypeTitle.setText(R.string.dailies)
-                    binding.allTaskFilter.setText(R.string.all)
-                    binding.secondTaskFilter.setText(R.string.due)
-                    binding.thirdTaskFilter.setText(R.string.gray)
-                }
-                TaskType.TODO -> {
-                    binding.taskTypeTitle.setText(R.string.todos)
-                    binding.allTaskFilter.setText(R.string.active)
-                    binding.secondTaskFilter.setText(R.string.dated)
-                    binding.thirdTaskFilter.setText(R.string.completed)
-                }
-                TaskType.REWARD -> {
-                }
-            }
-            setActiveFilter(viewModel.getActiveFilter(value))
-        }
-
-    private var tags = mutableListOf<Tag>()
-    private val editedTags = HashMap<String, Tag>()
-    private val createdTags = HashMap<String, Tag>()
-    private val deletedTags = ArrayList<String>()
-
-    private val addIcon: Drawable?
-    private var isEditingTags: Boolean = false
-
-    init {
-        addIcon = ContextCompat.getDrawable(context, R.drawable.ic_add_purple_300_36dp)
-
-        setTitle(R.string.filters)
-        this.setContentView(binding.root)
-
-        // Need to use this instead of RadioGroup.onCheckedChangeListener, because that fires twice per change
-        binding.allTaskFilter.setOnClickListener {
-            onCheckedChanged(binding.taskFilterWrapper.checkedRadioButtonId)
-        }
-        binding.secondTaskFilter.setOnClickListener {
-            onCheckedChanged(binding.taskFilterWrapper.checkedRadioButtonId)
-        }
-        binding.thirdTaskFilter.setOnClickListener {
-            onCheckedChanged(binding.taskFilterWrapper.checkedRadioButtonId)
-        }
-
-        binding.clearButton.setOnClickListener {
-            if (isEditingTags) {
-                stopEditing()
-            }
-            setActiveFilter(null)
-            setActiveTags(null)
-        }
-
-        if (showTags) {
-            binding.tagEditButton.setOnClickListener { editButtonClicked() }
-        } else {
-            binding.tagsList.isVisible = false
-            binding.tagsTitle.isVisible = false
-            binding.tagEditButton.isVisible = false
-        }
-    }
-
-    override fun show() {
-        if (showTags) {
-            lifecycleScope.launchCatching {
-                viewModel.tagRepository.getTags().collect {
-                    setTags(it)
-                }
-            }
-        }
-        super.show()
-        this.window?.clearFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM)
-    }
-
-    private fun setTags(tags: List<Tag>) {
-        this.tags = repository.getUnmanagedCopy(tags).toMutableList()
-        createTagViews()
-    }
-
-    private fun createTagViews() {
-        binding.tagsList.removeAllViews()
-        val colorStateList = ColorStateList(
-            arrayOf(
-                intArrayOf(-android.R.attr.state_checked), // disabled
-                intArrayOf(android.R.attr.state_checked) // enabled
-            ),
-            intArrayOf(
-                Color.LTGRAY, // disabled
-                context.getThemeColor(R.attr.colorAccent) // enabled
-            )
-        )
-        val leftPadding = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 12f, context.resources.displayMetrics).toInt()
-        val verticalPadding = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 8f, context.resources.displayMetrics).toInt()
-        sortTagPositions()
-        for (tag in tags) {
-            if (tag.id.isBlank()) {
-                // Title for tag group
-                val view = TextView(context)
-                view.setPadding(0, view.paddingTop, view.paddingRight, view.paddingBottom)
-                view.text = tag.name
-                view.setTextColor(context.getThemeColor(R.attr.textColorTintedPrimary))
-                binding.tagsList.addView(view)
-            } else {
-                val tagCheckbox = AppCompatCheckBox(context)
-                tagCheckbox.text = tag.name
-                tagCheckbox.setTextSize(TypedValue.COMPLEX_UNIT_SP, 16f)
-                tagCheckbox.isChecked = viewModel.tags.contains(tag.id)
-                tagCheckbox.setPadding(
-                    tagCheckbox.paddingLeft + leftPadding,
-                    verticalPadding,
-                    tagCheckbox.paddingRight,
-                    verticalPadding
-                )
-                tagCheckbox.setTextColor(ContextCompat.getColor(context, R.color.text_secondary))
-                CompoundButtonCompat.setButtonTintList(tagCheckbox, colorStateList)
-                tagCheckbox.setOnCheckedChangeListener { _, isChecked ->
-                    if (isChecked) {
-                        viewModel.addActiveTag(tag.id)
-                    } else {
-                        viewModel.removeActiveTag(tag.id)
-                    }
-                    filtersChanged()
-                }
-                binding.tagsList.addView(tagCheckbox)
-            }
-        }
-        createAddTagButton()
-    }
-
-    private fun createAddTagButton() {
-        val button = MaterialButton(context)
-        button.setText(R.string.add_tag)
-        button.icon = addIcon
-        button.iconTint = ColorStateList.valueOf(context.getThemeColor(R.attr.colorAccent))
-        button.iconGravity = MaterialButton.ICON_GRAVITY_START
-        button.elevation = 0f
-        button.backgroundTintList = ColorStateList.valueOf(ContextCompat.getColor(context, R.color.gray700_gray10))
-        button.setStrokeColorResource(R.color.content_background)
-        button.strokeWidth = 0
-        button.setTextColor(ContextCompat.getColor(context, R.color.text_secondary))
-        button.setOnClickListener { createTag() }
-
-        binding.tagsList.addView(button)
-    }
-
-
-    private fun createTag() {
-        val tag = Tag()
-        tag.id = UUID.randomUUID().toString()
-        tags.add(tag)
-        createdTags[tag.id] = tag
-        startEditing()
-    }
-
-    private fun startEditing() {
-        isEditingTags = true
-        binding.tagsList.removeAllViews()
-        createTagEditViews()
-        binding.tagEditButton.setText(R.string.done)
-        this.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE)
-    }
-
-    private fun stopEditing() {
-        // Refresh Tags
-        setActiveTags(null)
-        // Filter out tags with empty names
-        val emptyTagsToRemove = createdTags.values.filter { it.name.isBlank() }
-        createdTags.values.removeAll(emptyTagsToRemove.toSet())
-        tags.removeAll(emptyTagsToRemove)
-
-
-        isEditingTags = false
-        binding.tagsList.removeAllViews()
-        createTagViews()
-        binding.tagEditButton.setText(R.string.edit_tag_btn_edit)
-        this.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN)
-        lifecycleScope.launchCatching {
-            repository.updateTags(editedTags.values).forEach { tag ->
-                editedTags.remove(tag.id)
-                tags.remove(tag)
-            }
-            repository.createTags(createdTags.values).forEach { tag ->
-                createdTags.remove(tag.id)
-                tags.remove(tag)
-            }
-            repeat(repository.deleteTags(deletedTags).size) { deletedTags.clear() }
-        }
-    }
-
-    private fun createTagEditViews() {
-        val inflater = LayoutInflater.from(context)
-        for (index in tags.indices) {
-            val tag = tags[index]
-            createTagEditView(inflater, index, tag)
-        }
-        createAddTagButton()
-    }
-
-    private fun createTagEditView(inflater: LayoutInflater, index: Int, tag: Tag) {
-        if (tag.id.isBlank()) {
-            // This is a title tag ("Challenge", "Group", "Your Tags", etc)
-            val view = TextView(context)
-            view.text = tag.name
-            view.setTypeface(view.typeface, Typeface.BOLD)
-            view.setTextColor(ContextCompat.getColor(context, R.color.text_secondary))
-            binding.tagsList.addView(view)
-        } else {
-            if (tag.group != null) {
-                // Make Group tags uneditable
-                val editBinding = EditTagItemBinding.inflate(inflater, binding.tagsList, false)
-                editBinding.editText.setText(tag.name)
-                editBinding.editText.isEnabled = false
-                editBinding.editText.setTextColor(ContextCompat.getColor(context, R.color.disabled_background))
-                editBinding.deleteButton.isEnabled = false
-                editBinding.deleteButton.alpha = .50f
-                binding.tagsList.addView(editBinding.root)
-            } else {
-                // All tags (except group tags) are editable
-                val editBinding = EditTagItemBinding.inflate(inflater, binding.tagsList, false)
-                editBinding.editText.setText(tag.name)
-                editBinding.editText.setTextColor(ContextCompat.getColor(context, R.color.text_secondary))
-                editBinding.editText.addTextChangedListener(
-                    OnChangeTextWatcher { s, _, _, _ ->
-                        if (index >= tags.size) {
-                            return@OnChangeTextWatcher
-                        }
-                        val changedTag = tags[index]
-                        changedTag.name = s.toString()
-                        if (createdTags.containsKey(changedTag.id)) {
-                            createdTags[changedTag.id] = changedTag
-                        } else {
-                            editedTags[changedTag.id] = changedTag
-                        }
-                        tags[index] = changedTag
-                    }
-                )
-                editBinding.deleteButton.setOnClickListener {
-                    deletedTags.add(tag.id)
-                    if (createdTags.containsKey(tag.id)) {
-                        createdTags.remove(tag.id)
-                    }
-                    if (editedTags.containsKey(tag.id)) {
-                        editedTags.remove(tag.id)
-                    }
-                    viewModel.tags.remove(tag.id)
-                    tags.remove(tag)
-                    binding.tagsList.removeView(editBinding.root)
-                }
-                binding.tagsList.addView(editBinding.root)
-            }
-        }
-    }
-
-
-    private fun setActiveTags(tagIds: MutableList<String>?) {
-        if (tagIds == null) {
-            this.viewModel.tags.clear()
-        } else {
-            this.viewModel.tags = tagIds
-        }
-        for (index in 0 until binding.tagsList.childCount - 1) {
-            (binding.tagsList.getChildAt(index) as? AppCompatCheckBox)?.isChecked = false
-        }
-        for (tagId in this.viewModel.tags) {
-            val index = indexForId(tagId)
-            if (index >= 0) {
-                (binding.tagsList.getChildAt(index) as? AppCompatCheckBox)?.isChecked = true
-            }
-        }
-        filtersChanged()
-    }
-
-    private fun indexForId(tagId: String): Int {
-        for (index in tags.indices) {
-            if (tagId == tags[index].id) {
-                return index
-            }
-        }
-        return -1
-    }
-
-    private fun setActiveFilter(activeFilter: String?) {
-        viewModel.setActiveFilter(taskType, activeFilter ?: Task.FILTER_ALL)
-        var checkedId = -1
-        if (activeFilter == null) {
-            checkedId = R.id.all_task_filter
-        } else {
-            when (activeFilter) {
-                Task.FILTER_ALL -> checkedId = R.id.all_task_filter
-                Task.FILTER_WEAK, Task.FILTER_DATED -> checkedId = R.id.second_task_filter
-                Task.FILTER_STRONG, Task.FILTER_GRAY, Task.FILTER_COMPLETED -> checkedId = R.id.third_task_filter
-                Task.FILTER_ACTIVE -> checkedId = if (taskType == TaskType.DAILY) {
-                    R.id.second_task_filter
-                } else {
-                    R.id.all_task_filter
-                }
-            }
-        }
-        binding.taskFilterWrapper.check(checkedId)
-        filtersChanged()
-    }
-
-    private fun onCheckedChanged(@IdRes checkedId: Int) {
-        val newFilter = when (checkedId) {
-            R.id.second_task_filter -> when (taskType) {
-                TaskType.HABIT -> Task.FILTER_WEAK
-                TaskType.DAILY -> Task.FILTER_ACTIVE
-                TaskType.TODO -> Task.FILTER_DATED
-                else -> Task.FILTER_ALL
-            }
-            R.id.third_task_filter -> when (taskType) {
-                TaskType.HABIT -> Task.FILTER_STRONG
-                TaskType.DAILY -> Task.FILTER_GRAY
-                TaskType.TODO -> Task.FILTER_COMPLETED
-                else -> Task.FILTER_ALL
-            }
-            else -> if (taskType != TaskType.TODO) {
-                Task.FILTER_ALL
-            } else {
-                Task.FILTER_ACTIVE
-            }
-        }
-        viewModel.setActiveFilter(taskType, newFilter)
-        filtersChanged()
-    }
-
-    private fun sortTagPositions() {
-        val sortedTagList = arrayListOf<Tag>()
-        val challengeTagList = arrayListOf<Tag>()
-        val groupTagList = arrayListOf<Tag>()
-        val otherTagList = arrayListOf<Tag>()
-
-        val challengesTagTitleName = context.getString(R.string.challenge_tags)
-        val groupsTagTitleName = context.getString(R.string.group_tags)
-        val otherTagTitleName = context.getString(R.string.your_tags)
-
-        tags.forEach {
-            if (it.name == challengesTagTitleName || it.name == groupsTagTitleName || it.name == otherTagTitleName) {
-                // This tag is a title, skip it.
-                return@forEach
-            }
-            if (it.challenge) {
-                challengeTagList.add(it)
-            } else if (it.group != null) {
-                groupTagList.add(it)
-            } else {
-                otherTagList.add(it)
-            }
-        }
-
-        val challengesTagTitle = Tag().apply { name = challengesTagTitleName }
-        val groupsTagTitle = Tag().apply { name = groupsTagTitleName }
-        val otherTagTitle = Tag().apply { name = otherTagTitleName }
-
-        if (challengeTagList.isNotEmpty() && sortedTagList.none { it.name == challengesTagTitleName }) {
-            sortedTagList.add(challengesTagTitle)
-            sortedTagList.addAll(challengeTagList)
-        }
-        if (groupTagList.isNotEmpty() && sortedTagList.none { it.name == groupsTagTitleName }) {
-            sortedTagList.add(groupsTagTitle)
-            sortedTagList.addAll(groupTagList)
-        }
-        if (otherTagList.isNotEmpty() && sortedTagList.none { it.name == otherTagTitleName }) {
-            sortedTagList.add(otherTagTitle)
-            sortedTagList.addAll(otherTagList)
-        }
-
-        tags = sortedTagList
-    }
-
-
-    private fun editButtonClicked() {
-        isEditingTags = !isEditingTags
-        if (isEditingTags) {
-            startEditing()
-        } else {
-            stopEditing()
-        }
-    }
-
-    private fun filtersChanged() {
-        binding.clearButton.isEnabled = viewModel.isFiltering(taskType)
-        binding.clearButton.setTextColor(
-            if (binding.clearButton.isEnabled) {
-                context.getThemeColor(R.attr.colorAccent)
-            } else {
-                ContextCompat.getColor(context, R.color.text_dimmed)
-            }
-        )
-    }
-}
+package com.habitrpg.android.habitica.ui.views.tasks
+
+import android.content.Context
+import android.content.res.ColorStateList
+import android.graphics.Color
+import android.graphics.Typeface
+import android.graphics.drawable.Drawable
+import android.util.TypedValue
+import android.view.LayoutInflater
+import android.view.WindowManager
+import android.widget.TextView
+import androidx.annotation.IdRes
+import androidx.appcompat.widget.AppCompatCheckBox
+import androidx.core.content.ContextCompat
+import androidx.core.view.isVisible
+import androidx.core.widget.CompoundButtonCompat
+import androidx.lifecycle.lifecycleScope
+import com.google.android.material.button.MaterialButton
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.data.TagRepository
+import com.habitrpg.android.habitica.databinding.DialogTaskFilterBinding
+import com.habitrpg.android.habitica.databinding.EditTagItemBinding
+import com.habitrpg.android.habitica.extensions.OnChangeTextWatcher
+import com.habitrpg.android.habitica.models.Tag
+import com.habitrpg.android.habitica.models.tasks.Task
+import com.habitrpg.android.habitica.ui.viewmodels.TasksViewModel
+import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaBottomSheetDialog
+import com.habitrpg.common.habitica.extensions.getThemeColor
+import com.habitrpg.common.habitica.helpers.launchCatching
+import com.habitrpg.shared.habitica.models.tasks.TaskType
+import java.util.UUID
+
+class TaskFilterDialog(
+    context: Context,
+    private val repository: TagRepository,
+    private val showTags: Boolean,
+) : HabiticaBottomSheetDialog(context) {
+    lateinit var viewModel: TasksViewModel
+    private val binding = DialogTaskFilterBinding.inflate(layoutInflater)
+
+    var taskType: TaskType = TaskType.HABIT
+        set(value) {
+            field = value
+            when (value) {
+                TaskType.HABIT -> {
+                    binding.taskTypeTitle.setText(R.string.habits)
+                    binding.allTaskFilter.setText(R.string.all)
+                    binding.secondTaskFilter.setText(R.string.weak)
+                    binding.thirdTaskFilter.setText(R.string.strong)
+                }
+
+                TaskType.DAILY -> {
+                    binding.taskTypeTitle.setText(R.string.dailies)
+                    binding.allTaskFilter.setText(R.string.all)
+                    binding.secondTaskFilter.setText(R.string.due)
+                    binding.thirdTaskFilter.setText(R.string.gray)
+                }
+
+                TaskType.TODO -> {
+                    binding.taskTypeTitle.setText(R.string.todos)
+                    binding.allTaskFilter.setText(R.string.active)
+                    binding.secondTaskFilter.setText(R.string.dated)
+                    binding.thirdTaskFilter.setText(R.string.completed)
+                }
+
+                TaskType.REWARD -> {
+                }
+            }
+            setActiveFilter(viewModel.getActiveFilter(value))
+        }
+
+    private var tags = mutableListOf<Tag>()
+    private val editedTags = HashMap<String, Tag>()
+    private val createdTags = HashMap<String, Tag>()
+    private val deletedTags = ArrayList<String>()
+
+    private val addIcon: Drawable?
+    private var isEditingTags: Boolean = false
+
+    init {
+        addIcon = ContextCompat.getDrawable(context, R.drawable.ic_add_purple_300_36dp)
+
+        setTitle(R.string.filters)
+        this.setContentView(binding.root)
+
+        // Need to use this instead of RadioGroup.onCheckedChangeListener, because that fires twice per change
+        binding.allTaskFilter.setOnClickListener {
+            onCheckedChanged(binding.taskFilterWrapper.checkedRadioButtonId)
+        }
+        binding.secondTaskFilter.setOnClickListener {
+            onCheckedChanged(binding.taskFilterWrapper.checkedRadioButtonId)
+        }
+        binding.thirdTaskFilter.setOnClickListener {
+            onCheckedChanged(binding.taskFilterWrapper.checkedRadioButtonId)
+        }
+
+        binding.clearButton.setOnClickListener {
+            if (isEditingTags) {
+                stopEditing()
+            }
+            setActiveFilter(null)
+            setActiveTags(null)
+        }
+
+        if (showTags) {
+            binding.tagEditButton.setOnClickListener { editButtonClicked() }
+        } else {
+            binding.tagsList.isVisible = false
+            binding.tagsTitle.isVisible = false
+            binding.tagEditButton.isVisible = false
+        }
+    }
+
+    override fun show() {
+        if (showTags) {
+            lifecycleScope.launchCatching {
+                viewModel.tagRepository.getTags().collect {
+                    setTags(it)
+                }
+            }
+        }
+        super.show()
+        this.window?.clearFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM)
+    }
+
+    private fun setTags(tags: List<Tag>) {
+        this.tags = repository.getUnmanagedCopy(tags).toMutableList()
+        createTagViews()
+    }
+
+    private fun createTagViews() {
+        binding.tagsList.removeAllViews()
+        val colorStateList =
+            ColorStateList(
+                arrayOf(
+                    intArrayOf(-android.R.attr.state_checked), // disabled
+                    intArrayOf(android.R.attr.state_checked), // enabled
+                ),
+                intArrayOf(
+                    Color.LTGRAY, // disabled
+                    context.getThemeColor(R.attr.colorAccent), // enabled
+                ),
+            )
+        val leftPadding =
+            TypedValue.applyDimension(
+                TypedValue.COMPLEX_UNIT_DIP,
+                12f,
+                context.resources.displayMetrics,
+            ).toInt()
+        val verticalPadding =
+            TypedValue.applyDimension(
+                TypedValue.COMPLEX_UNIT_DIP,
+                8f,
+                context.resources.displayMetrics,
+            ).toInt()
+        sortTagPositions()
+        for (tag in tags) {
+            if (tag.id.isBlank()) {
+                // Title for tag group
+                val view = TextView(context)
+                view.setPadding(0, view.paddingTop, view.paddingRight, view.paddingBottom)
+                view.text = tag.name
+                view.setTextColor(context.getThemeColor(R.attr.textColorTintedPrimary))
+                binding.tagsList.addView(view)
+            } else {
+                val tagCheckbox = AppCompatCheckBox(context)
+                tagCheckbox.text = tag.name
+                tagCheckbox.setTextSize(TypedValue.COMPLEX_UNIT_SP, 16f)
+                tagCheckbox.isChecked = viewModel.tags.contains(tag.id)
+                tagCheckbox.setPadding(
+                    tagCheckbox.paddingLeft + leftPadding,
+                    verticalPadding,
+                    tagCheckbox.paddingRight,
+                    verticalPadding,
+                )
+                tagCheckbox.setTextColor(ContextCompat.getColor(context, R.color.text_secondary))
+                CompoundButtonCompat.setButtonTintList(tagCheckbox, colorStateList)
+                tagCheckbox.setOnCheckedChangeListener { _, isChecked ->
+                    if (isChecked) {
+                        viewModel.addActiveTag(tag.id)
+                    } else {
+                        viewModel.removeActiveTag(tag.id)
+                    }
+                    filtersChanged()
+                }
+                binding.tagsList.addView(tagCheckbox)
+            }
+        }
+        createAddTagButton()
+    }
+
+    private fun createAddTagButton() {
+        val button = MaterialButton(context)
+        button.setText(R.string.add_tag)
+        button.icon = addIcon
+        button.iconTint = ColorStateList.valueOf(context.getThemeColor(R.attr.colorAccent))
+        button.iconGravity = MaterialButton.ICON_GRAVITY_START
+        button.elevation = 0f
+        button.backgroundTintList =
+            ColorStateList.valueOf(ContextCompat.getColor(context, R.color.gray700_gray10))
+        button.setStrokeColorResource(R.color.content_background)
+        button.strokeWidth = 0
+        button.setTextColor(ContextCompat.getColor(context, R.color.text_secondary))
+        button.setOnClickListener { createTag() }
+
+        binding.tagsList.addView(button)
+    }
+
+    private fun createTag() {
+        val tag = Tag()
+        tag.id = UUID.randomUUID().toString()
+        tags.add(tag)
+        createdTags[tag.id] = tag
+        startEditing()
+    }
+
+    private fun startEditing() {
+        isEditingTags = true
+        binding.tagsList.removeAllViews()
+        createTagEditViews()
+        binding.tagEditButton.setText(R.string.done)
+        this.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE)
+    }
+
+    private fun stopEditing() {
+        // Refresh Tags
+        setActiveTags(null)
+        // Filter out tags with empty names
+        val emptyTagsToRemove = createdTags.values.filter { it.name.isBlank() }
+        createdTags.values.removeAll(emptyTagsToRemove.toSet())
+        tags.removeAll(emptyTagsToRemove)
+
+        isEditingTags = false
+        binding.tagsList.removeAllViews()
+        createTagViews()
+        binding.tagEditButton.setText(R.string.edit_tag_btn_edit)
+        this.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN)
+        lifecycleScope.launchCatching {
+            repository.updateTags(editedTags.values).forEach { tag ->
+                editedTags.remove(tag.id)
+                tags.remove(tag)
+            }
+            repository.createTags(createdTags.values).forEach { tag ->
+                createdTags.remove(tag.id)
+                tags.remove(tag)
+            }
+            repeat(repository.deleteTags(deletedTags).size) { deletedTags.clear() }
+        }
+    }
+
+    private fun createTagEditViews() {
+        val inflater = LayoutInflater.from(context)
+        for (index in tags.indices) {
+            val tag = tags[index]
+            createTagEditView(inflater, index, tag)
+        }
+        createAddTagButton()
+    }
+
+    private fun createTagEditView(
+        inflater: LayoutInflater,
+        index: Int,
+        tag: Tag,
+    ) {
+        if (tag.id.isBlank()) {
+            // This is a title tag ("Challenge", "Group", "Your Tags", etc)
+            val view = TextView(context)
+            view.text = tag.name
+            view.setTypeface(view.typeface, Typeface.BOLD)
+            view.setTextColor(ContextCompat.getColor(context, R.color.text_secondary))
+            binding.tagsList.addView(view)
+        } else {
+            if (tag.group != null) {
+                // Make Group tags uneditable
+                val editBinding = EditTagItemBinding.inflate(inflater, binding.tagsList, false)
+                editBinding.editText.setText(tag.name)
+                editBinding.editText.isEnabled = false
+                editBinding.editText.setTextColor(
+                    ContextCompat.getColor(
+                        context,
+                        R.color.disabled_background,
+                    ),
+                )
+                editBinding.deleteButton.isEnabled = false
+                editBinding.deleteButton.alpha = .50f
+                binding.tagsList.addView(editBinding.root)
+            } else {
+                // All tags (except group tags) are editable
+                val editBinding = EditTagItemBinding.inflate(inflater, binding.tagsList, false)
+                editBinding.editText.setText(tag.name)
+                editBinding.editText.setTextColor(
+                    ContextCompat.getColor(
+                        context,
+                        R.color.text_secondary,
+                    ),
+                )
+                editBinding.editText.addTextChangedListener(
+                    OnChangeTextWatcher { s, _, _, _ ->
+                        if (index >= tags.size) {
+                            return@OnChangeTextWatcher
+                        }
+                        val changedTag = tags[index]
+                        changedTag.name = s.toString()
+                        if (createdTags.containsKey(changedTag.id)) {
+                            createdTags[changedTag.id] = changedTag
+                        } else {
+                            editedTags[changedTag.id] = changedTag
+                        }
+                        tags[index] = changedTag
+                    },
+                )
+                editBinding.deleteButton.setOnClickListener {
+                    deletedTags.add(tag.id)
+                    if (createdTags.containsKey(tag.id)) {
+                        createdTags.remove(tag.id)
+                    }
+                    if (editedTags.containsKey(tag.id)) {
+                        editedTags.remove(tag.id)
+                    }
+                    viewModel.tags.remove(tag.id)
+                    tags.remove(tag)
+                    binding.tagsList.removeView(editBinding.root)
+                }
+                binding.tagsList.addView(editBinding.root)
+            }
+        }
+    }
+
+    private fun setActiveTags(tagIds: MutableList<String>?) {
+        if (tagIds == null) {
+            this.viewModel.tags.clear()
+        } else {
+            this.viewModel.tags = tagIds
+        }
+        for (index in 0 until binding.tagsList.childCount - 1) {
+            (binding.tagsList.getChildAt(index) as? AppCompatCheckBox)?.isChecked = false
+        }
+        for (tagId in this.viewModel.tags) {
+            val index = indexForId(tagId)
+            if (index >= 0) {
+                (binding.tagsList.getChildAt(index) as? AppCompatCheckBox)?.isChecked = true
+            }
+        }
+        filtersChanged()
+    }
+
+    private fun indexForId(tagId: String): Int {
+        for (index in tags.indices) {
+            if (tagId == tags[index].id) {
+                return index
+            }
+        }
+        return -1
+    }
+
+    private fun setActiveFilter(activeFilter: String?) {
+        viewModel.setActiveFilter(taskType, activeFilter ?: Task.FILTER_ALL)
+        var checkedId = -1
+        if (activeFilter == null) {
+            checkedId = R.id.all_task_filter
+        } else {
+            when (activeFilter) {
+                Task.FILTER_ALL -> checkedId = R.id.all_task_filter
+                Task.FILTER_WEAK, Task.FILTER_DATED -> checkedId = R.id.second_task_filter
+                Task.FILTER_STRONG, Task.FILTER_GRAY, Task.FILTER_COMPLETED ->
+                    checkedId =
+                        R.id.third_task_filter
+
+                Task.FILTER_ACTIVE ->
+                    checkedId =
+                        if (taskType == TaskType.DAILY) {
+                            R.id.second_task_filter
+                        } else {
+                            R.id.all_task_filter
+                        }
+            }
+        }
+        binding.taskFilterWrapper.check(checkedId)
+        filtersChanged()
+    }
+
+    private fun onCheckedChanged(
+        @IdRes checkedId: Int,
+    ) {
+        val newFilter =
+            when (checkedId) {
+                R.id.second_task_filter ->
+                    when (taskType) {
+                        TaskType.HABIT -> Task.FILTER_WEAK
+                        TaskType.DAILY -> Task.FILTER_ACTIVE
+                        TaskType.TODO -> Task.FILTER_DATED
+                        else -> Task.FILTER_ALL
+                    }
+
+                R.id.third_task_filter ->
+                    when (taskType) {
+                        TaskType.HABIT -> Task.FILTER_STRONG
+                        TaskType.DAILY -> Task.FILTER_GRAY
+                        TaskType.TODO -> Task.FILTER_COMPLETED
+                        else -> Task.FILTER_ALL
+                    }
+
+                else ->
+                    if (taskType != TaskType.TODO) {
+                        Task.FILTER_ALL
+                    } else {
+                        Task.FILTER_ACTIVE
+                    }
+            }
+        viewModel.setActiveFilter(taskType, newFilter)
+        filtersChanged()
+    }
+
+    private fun sortTagPositions() {
+        val sortedTagList = arrayListOf<Tag>()
+        val challengeTagList = arrayListOf<Tag>()
+        val groupTagList = arrayListOf<Tag>()
+        val otherTagList = arrayListOf<Tag>()
+
+        val challengesTagTitleName = context.getString(R.string.challenge_tags)
+        val groupsTagTitleName = context.getString(R.string.group_tags)
+        val otherTagTitleName = context.getString(R.string.your_tags)
+
+        tags.forEach {
+            if (it.name == challengesTagTitleName || it.name == groupsTagTitleName || it.name == otherTagTitleName) {
+                // This tag is a title, skip it.
+                return@forEach
+            }
+            if (it.challenge) {
+                challengeTagList.add(it)
+            } else if (it.group != null) {
+                groupTagList.add(it)
+            } else {
+                otherTagList.add(it)
+            }
+        }
+
+        val challengesTagTitle = Tag().apply { name = challengesTagTitleName }
+        val groupsTagTitle = Tag().apply { name = groupsTagTitleName }
+        val otherTagTitle = Tag().apply { name = otherTagTitleName }
+
+        if (challengeTagList.isNotEmpty() && sortedTagList.none { it.name == challengesTagTitleName }) {
+            sortedTagList.add(challengesTagTitle)
+            sortedTagList.addAll(challengeTagList)
+        }
+        if (groupTagList.isNotEmpty() && sortedTagList.none { it.name == groupsTagTitleName }) {
+            sortedTagList.add(groupsTagTitle)
+            sortedTagList.addAll(groupTagList)
+        }
+        if (otherTagList.isNotEmpty() && sortedTagList.none { it.name == otherTagTitleName }) {
+            sortedTagList.add(otherTagTitle)
+            sortedTagList.addAll(otherTagList)
+        }
+
+        tags = sortedTagList
+    }
+
+    private fun editButtonClicked() {
+        isEditingTags = !isEditingTags
+        if (isEditingTags) {
+            startEditing()
+        } else {
+            stopEditing()
+        }
+    }
+
+    private fun filtersChanged() {
+        binding.clearButton.isEnabled = viewModel.isFiltering(taskType)
+        binding.clearButton.setTextColor(
+            if (binding.clearButton.isEnabled) {
+                context.getThemeColor(R.attr.colorAccent)
+            } else {
+                ContextCompat.getColor(context, R.color.text_dimmed)
+            },
+        )
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ChecklistContainer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ChecklistContainer.kt
index 5372b858f..a094a736b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ChecklistContainer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ChecklistContainer.kt
@@ -10,92 +10,98 @@ import com.habitrpg.android.habitica.models.tasks.ChecklistItem
 import com.habitrpg.android.habitica.ui.views.DragLinearLayout
 import com.habitrpg.common.habitica.extensions.dpToPx
 
-class ChecklistContainer @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null
-) : DragLinearLayout(context, attrs) {
-    var checklistItems: List<ChecklistItem>
-        get() {
-            val list = mutableListOf<ChecklistItem>()
-            for (child in children) {
-                val view = child as? ChecklistItemFormView ?: continue
-                if (view.item.text?.isNotEmpty() == true) {
-                    list.add(view.item)
+class ChecklistContainer
+    @JvmOverloads
+    constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+    ) : DragLinearLayout(context, attrs) {
+        var checklistItems: List<ChecklistItem>
+            get() {
+                val list = mutableListOf<ChecklistItem>()
+                for (child in children) {
+                    val view = child as? ChecklistItemFormView ?: continue
+                    if (view.item.text?.isNotEmpty() == true) {
+                        list.add(view.item)
+                    }
                 }
+                return list
             }
-            return list
-        }
-        set(value) {
-            val unAnimatedTransitions = LayoutTransition()
-            unAnimatedTransitions.disableTransitionType(LayoutTransition.APPEARING)
-            unAnimatedTransitions.disableTransitionType(LayoutTransition.CHANGING)
-            unAnimatedTransitions.disableTransitionType(LayoutTransition.DISAPPEARING)
-            layoutTransition = unAnimatedTransitions
-            if (childCount > 1) {
-                for (child in children.take(childCount - 1)) {
-                    removeView(child)
+            set(value) {
+                val unAnimatedTransitions = LayoutTransition()
+                unAnimatedTransitions.disableTransitionType(LayoutTransition.APPEARING)
+                unAnimatedTransitions.disableTransitionType(LayoutTransition.CHANGING)
+                unAnimatedTransitions.disableTransitionType(LayoutTransition.DISAPPEARING)
+                layoutTransition = unAnimatedTransitions
+                if (childCount > 1) {
+                    for (child in children.take(childCount - 1)) {
+                        removeView(child)
+                    }
                 }
+                for (item in value) {
+                    addChecklistViewAt(childCount - 1, item)
+                }
+                val animatedTransitions = LayoutTransition()
+                layoutTransition = animatedTransitions
             }
-            for (item in value) {
-                addChecklistViewAt(childCount - 1, item)
-            }
-            val animatedTransitions = LayoutTransition()
-            layoutTransition = animatedTransitions
+
+        init {
+            orientation = VERTICAL
+
+            addChecklistViewAt(0)
         }
 
-    init {
-        orientation = VERTICAL
-
-        addChecklistViewAt(0)
-    }
-
-    private fun addChecklistViewAt(index: Int, item: ChecklistItem? = null) {
-        val view = ChecklistItemFormView(context)
-        item?.let {
-            view.item = it
-            view.isAddButton = false
-        }
-        view.textChangedListener = {
-            if (isLastChild(view)) {
-                addChecklistViewAt(-1)
-                view.animDuration = 300
+        private fun addChecklistViewAt(
+            index: Int,
+            item: ChecklistItem? = null,
+        ) {
+            val view = ChecklistItemFormView(context)
+            item?.let {
+                view.item = it
                 view.isAddButton = false
-                setViewDraggable(view, view.dragGrip)
-            } else if (shouldBecomeNewAddButton(view)) {
-                removeViewAt(childCount - 1)
-                view.animDuration = 300
+            }
+            view.textChangedListener = {
+                if (isLastChild(view)) {
+                    addChecklistViewAt(-1)
+                    view.animDuration = 300
+                    view.isAddButton = false
+                    setViewDraggable(view, view.dragGrip)
+                } else if (shouldBecomeNewAddButton(view)) {
+                    removeViewAt(childCount - 1)
+                    view.animDuration = 300
+                    view.isAddButton = true
+                    removeViewDraggable(view)
+                }
+            }
+            val indexToUse =
+                if (index < 0) {
+                    childCount - index
+                } else {
+                    index
+                }
+            if (childCount <= indexToUse) {
+                addView(view)
                 view.isAddButton = true
-                removeViewDraggable(view)
+            } else {
+                addView(view, indexToUse)
+                setViewDraggable(view, view.dragGrip)
             }
+            val layoutParams = view.layoutParams as? LayoutParams
+            layoutParams?.updateMargins(bottom = 8.dpToPx(context))
+            view.layoutParams = layoutParams
         }
-        val indexToUse = if (index < 0) {
-            childCount - index
-        } else {
-            index
-        }
-        if (childCount <= indexToUse) {
-            addView(view)
-            view.isAddButton = true
-        } else {
-            addView(view, indexToUse)
-            setViewDraggable(view, view.dragGrip)
-        }
-        val layoutParams = view.layoutParams as? LayoutParams
-        layoutParams?.updateMargins(bottom = 8.dpToPx(context))
-        view.layoutParams = layoutParams
-    }
 
-    private fun shouldBecomeNewAddButton(view: ChecklistItemFormView): Boolean {
-        if (childCount > 2 && view.item.text?.isEmpty() != false && children.indexOf(view) == childCount - 2) {
-            val lastView = (getChildAt(childCount - 1) as? ChecklistItemFormView)
-            if (lastView != null && lastView.item.text?.isEmpty() != false) {
-                return true
+        private fun shouldBecomeNewAddButton(view: ChecklistItemFormView): Boolean {
+            if (childCount > 2 && view.item.text?.isEmpty() != false && children.indexOf(view) == childCount - 2) {
+                val lastView = (getChildAt(childCount - 1) as? ChecklistItemFormView)
+                if (lastView != null && lastView.item.text?.isEmpty() != false) {
+                    return true
+                }
             }
+            return false
         }
-        return false
-    }
 
-    private fun isLastChild(view: View): Boolean {
-        return children.lastOrNull() == view
+        private fun isLastChild(view: View): Boolean {
+            return children.lastOrNull() == view
+        }
     }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ChecklistItemFormView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ChecklistItemFormView.kt
index 6927ee0e6..77edeae7e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ChecklistItemFormView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ChecklistItemFormView.kt
@@ -18,87 +18,110 @@ import com.habitrpg.common.habitica.extensions.dpToPx
 import com.habitrpg.common.habitica.extensions.getThemeColor
 import com.habitrpg.common.habitica.extensions.layoutInflater
 
-class ChecklistItemFormView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
-) : LinearLayout(context, attrs, defStyleAttr) {
-    val dragGrip: View
-        get() = binding.dragGrip
-    val binding = TaskFormChecklistItemBinding.inflate(context.layoutInflater, this)
+class ChecklistItemFormView
+    @JvmOverloads
+    constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0,
+    ) : LinearLayout(context, attrs, defStyleAttr) {
+        val dragGrip: View
+            get() = binding.dragGrip
+        val binding = TaskFormChecklistItemBinding.inflate(context.layoutInflater, this)
 
-    var item: ChecklistItem = ChecklistItem()
-        set(value) {
-            field = value
-            binding.editText.setText(item.text)
-        }
-
-    var tintColor: Int = context.getThemeColor(R.attr.tintedUiSub)
-    var textChangedListener: ((String) -> Unit)? = null
-    var animDuration = 0L
-    var isAddButton: Boolean = true
-        set(value) {
-            // Button is only clickable when it is *not* an add button (ie when it is a delete button),
-            // so make screenreaders skip it when it is an add button.
-            binding.button.importantForAccessibility =
-                if (value) {
-                    View.IMPORTANT_FOR_ACCESSIBILITY_NO
-                } else {
-                    View.IMPORTANT_FOR_ACCESSIBILITY_YES
-                }
-            if (field == value) {
-                return
+        var item: ChecklistItem = ChecklistItem()
+            set(value) {
+                field = value
+                binding.editText.setText(item.text)
             }
-            field = value
-            binding.editText.hint = context.getString(if (value) R.string.new_checklist_item else R.string.checklist_text)
-            val rotate = if (value) {
-                contentDescription = context.getString(R.string.new_checklist_item)
-                binding.dragGrip.visibility = View.GONE
-                RotateAnimation(135f, 0f, Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f)
-            } else {
-                binding.dragGrip.visibility = View.VISIBLE
-                RotateAnimation(0f, 135f, Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f)
-            }
-            rotate.duration = animDuration
-            rotate.interpolator = LinearInterpolator()
-            rotate.setAnimationListener(object : Animation.AnimationListener {
-                override fun onAnimationRepeat(animation: Animation?) { /* no-on */ }
 
-                override fun onAnimationEnd(animation: Animation?) {
-                    binding.button.rotation = if (value) {
-                        0f
+        var tintColor: Int = context.getThemeColor(R.attr.tintedUiSub)
+        var textChangedListener: ((String) -> Unit)? = null
+        var animDuration = 0L
+        var isAddButton: Boolean = true
+            set(value) {
+                // Button is only clickable when it is *not* an add button (ie when it is a delete button),
+                // so make screenreaders skip it when it is an add button.
+                binding.button.importantForAccessibility =
+                    if (value) {
+                        View.IMPORTANT_FOR_ACCESSIBILITY_NO
                     } else {
-                        135f
+                        View.IMPORTANT_FOR_ACCESSIBILITY_YES
                     }
+                if (field == value) {
+                    return
                 }
+                field = value
+                binding.editText.hint =
+                    context.getString(if (value) R.string.new_checklist_item else R.string.checklist_text)
+                val rotate =
+                    if (value) {
+                        contentDescription = context.getString(R.string.new_checklist_item)
+                        binding.dragGrip.visibility = View.GONE
+                        RotateAnimation(
+                            135f,
+                            0f,
+                            Animation.RELATIVE_TO_SELF,
+                            0.5f,
+                            Animation.RELATIVE_TO_SELF,
+                            0.5f,
+                        )
+                    } else {
+                        binding.dragGrip.visibility = View.VISIBLE
+                        RotateAnimation(
+                            0f,
+                            135f,
+                            Animation.RELATIVE_TO_SELF,
+                            0.5f,
+                            Animation.RELATIVE_TO_SELF,
+                            0.5f,
+                        )
+                    }
+                rotate.duration = animDuration
+                rotate.interpolator = LinearInterpolator()
+                rotate.setAnimationListener(
+                    object : Animation.AnimationListener {
+                        override fun onAnimationRepeat(animation: Animation?) { // no-on
+                        }
 
-                override fun onAnimationStart(animation: Animation?) { /* no-on */ }
-            })
-            binding.button.startAnimation(rotate)
-        }
+                        override fun onAnimationEnd(animation: Animation?) {
+                            binding.button.rotation =
+                                if (value) {
+                                    0f
+                                } else {
+                                    135f
+                                }
+                        }
 
-    init {
-        minimumHeight = 38.dpToPx(context)
-        background = ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_task_form)
-        background.mutate().setTint(context.getThemeColor(R.attr.colorTintedBackgroundOffset))
-        gravity = Gravity.CENTER_VERTICAL
-
-        binding.button.setOnClickListener {
-            if (!isAddButton) {
-                (parent as? ViewGroup)?.removeView(this)
+                        override fun onAnimationStart(animation: Animation?) { // no-on
+                        }
+                    },
+                )
+                binding.button.startAnimation(rotate)
             }
-        }
-        // It's ok to make the description always be 'Delete ..' because when this button is
-        // a plus button we set it as 'unimportant for accessibility' so it can't be focused.
-        binding.button.contentDescription = context.getString(R.string.delete_checklist_entry)
-        binding.button.drawable.mutate().setTint(tintColor)
-        binding.editText.addTextChangedListener(
-            OnChangeTextWatcher { s, _, _, _ ->
-                item.text = s.toString()
-                contentDescription = s
-                textChangedListener?.let { it(s.toString()) }
+
+        init {
+            minimumHeight = 38.dpToPx(context)
+            background = ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_task_form)
+            background.mutate().setTint(context.getThemeColor(R.attr.colorTintedBackgroundOffset))
+            gravity = Gravity.CENTER_VERTICAL
+
+            binding.button.setOnClickListener {
+                if (!isAddButton) {
+                    (parent as? ViewGroup)?.removeView(this)
+                }
             }
-        )
-        binding.editText.labelFor = binding.button.id
+            // It's ok to make the description always be 'Delete ..' because when this button is
+            // a plus button we set it as 'unimportant for accessibility' so it can't be focused.
+            binding.button.contentDescription = context.getString(R.string.delete_checklist_entry)
+            binding.button.drawable.mutate().setTint(tintColor)
+            binding.editText.addTextChangedListener(
+                OnChangeTextWatcher { s, _, _, _ ->
+                    item.text = s.toString()
+                    contentDescription = s
+                    textChangedListener?.let { it(s.toString()) }
+                },
+            )
+            binding.editText.labelFor = binding.button.id
+        }
     }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/HabitScoringButtonsView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/HabitScoringButtonsView.kt
index a042a7c51..76e1d81b5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/HabitScoringButtonsView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/HabitScoringButtonsView.kt
@@ -1,7 +1,6 @@
 package com.habitrpg.android.habitica.ui.views.tasks.form
 
 import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.animation.animateColor
 import androidx.compose.animation.core.Spring
 import androidx.compose.animation.core.spring
@@ -40,8 +39,8 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.ui.theme.colors
-import com.habitrpg.common.habitica.theme.HabiticaTheme
 import com.habitrpg.common.habitica.extensions.getThemeColor
+import com.habitrpg.common.habitica.theme.HabiticaTheme
 
 @Composable
 fun HabitScoringSelector(
@@ -49,23 +48,23 @@ fun HabitScoringSelector(
     selectedDown: Boolean,
     onSelectUp: () -> Unit,
     onSelectDown: () -> Unit,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     Row(
         horizontalArrangement = Arrangement.spacedBy(30.dp, Alignment.CenterHorizontally),
-        modifier = modifier
+        modifier = modifier,
     ) {
         HabitScoringSelection(
             selected = selectedUp,
             icon = painterResource(id = R.drawable.habit_plus),
             text = stringResource(R.string.positive_habit_form),
-            onSelect = onSelectUp
+            onSelect = onSelectUp,
         )
         HabitScoringSelection(
             selected = selectedDown,
             icon = painterResource(id = R.drawable.habit_minus),
             text = stringResource(R.string.negative_habit_form),
-            onSelect = onSelectDown
+            onSelect = onSelectDown,
         )
     }
 }
@@ -76,43 +75,59 @@ private fun HabitScoringSelection(
     icon: Painter,
     text: String,
     onSelect: () -> Unit,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     val selectedState = updateTransition(selected)
     val context = LocalContext.current
 
-    val borderColor = selectedState.animateColor {
-        if (it) HabiticaTheme.colors.tintedUiMain else Color(context.getThemeColor(R.attr.textColorTintedSecondary))
-    }
-    val iconColor = selectedState.animateColor {
-        if (it) HabiticaTheme.colors.tintedUiDetails else Color(context.getThemeColor(R.attr.textColorTintedSecondary))
-    }
-    val textColor = selectedState.animateColor {
-        if (it) Color(context.getThemeColor(R.attr.textColorTintedPrimary)) else Color(context.getThemeColor(R.attr.textColorTintedSecondary))
-    }
-    Column(horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(12.dp), modifier = modifier) {
+    val borderColor =
+        selectedState.animateColor {
+            if (it) HabiticaTheme.colors.tintedUiMain else Color(context.getThemeColor(R.attr.textColorTintedSecondary))
+        }
+    val iconColor =
+        selectedState.animateColor {
+            if (it) HabiticaTheme.colors.tintedUiDetails else Color(context.getThemeColor(R.attr.textColorTintedSecondary))
+        }
+    val textColor =
+        selectedState.animateColor {
+            if (it) {
+                Color(context.getThemeColor(R.attr.textColorTintedPrimary))
+            } else {
+                Color(
+                    context.getThemeColor(
+                        R.attr.textColorTintedSecondary,
+                    ),
+                )
+            }
+        }
+    Column(
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.spacedBy(12.dp),
+        modifier = modifier,
+    ) {
         Box(
             contentAlignment = Alignment.Center,
-            modifier = Modifier
-                .padding(horizontal = 12.dp)
-                .size(34.dp)
-                .border(
-                    1.dp,
-                    borderColor.value,
-                    CircleShape
-                )
-                .clip(CircleShape)
-                .clickable { onSelect() }
+            modifier =
+                Modifier
+                    .padding(horizontal = 12.dp)
+                    .size(34.dp)
+                    .border(
+                        1.dp,
+                        borderColor.value,
+                        CircleShape,
+                    )
+                    .clip(CircleShape)
+                    .clickable { onSelect() },
         ) {
             this@Column.AnimatedVisibility(
                 selected,
                 enter = scaleIn(spring(Spring.DampingRatioLowBouncy, Spring.StiffnessMedium)),
-                exit = scaleOut(spring(Spring.DampingRatioLowBouncy, Spring.StiffnessMedium))
+                exit = scaleOut(spring(Spring.DampingRatioLowBouncy, Spring.StiffnessMedium)),
             ) {
                 Box(
                     Modifier
                         .size(32.dp)
-                        .background(HabiticaTheme.colors.tintedUiMain, CircleShape)
+                        .background(HabiticaTheme.colors.tintedUiMain, CircleShape),
                 )
             }
             Image(icon, null, colorFilter = ColorFilter.tint(iconColor.value))
@@ -121,7 +136,7 @@ private fun HabitScoringSelection(
             text,
             fontWeight = if (selected) FontWeight.Medium else FontWeight.Normal,
             fontSize = 14.sp,
-            color = textColor.value
+            color = textColor.value,
         )
     }
 }
@@ -135,14 +150,14 @@ private fun Preview() {
         Modifier
             .background(MaterialTheme.colors.background)
             .width(300.dp)
-            .padding(8.dp)
+            .padding(8.dp),
     ) {
         HabitScoringSelector(
             selectedUp.value,
             selectedDown.value,
             { selectedUp.value = !selectedUp.value },
             { selectedDown.value = !selectedDown.value },
-            Modifier.align(Alignment.Center)
+            Modifier.align(Alignment.Center),
         )
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ReminderContainer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ReminderContainer.kt
index 600987c5a..8bbe551e7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ReminderContainer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ReminderContainer.kt
@@ -11,99 +11,107 @@ import com.habitrpg.android.habitica.models.tasks.RemindersItem
 import com.habitrpg.common.habitica.extensions.dpToPx
 import com.habitrpg.shared.habitica.models.tasks.TaskType
 
-class ReminderContainer @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
-) : LinearLayout(context, attrs, defStyleAttr) {
-    var taskType = TaskType.DAILY
-        set(value) {
-            field = value
-            for (view in children) {
-                if (view is ReminderItemFormView) {
-                    view.taskType = taskType
+class ReminderContainer
+    @JvmOverloads
+    constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0,
+    ) : LinearLayout(context, attrs, defStyleAttr) {
+        var taskType = TaskType.DAILY
+            set(value) {
+                field = value
+                for (view in children) {
+                    if (view is ReminderItemFormView) {
+                        view.taskType = taskType
+                    }
                 }
             }
-        }
-    var reminders: List<RemindersItem>
-        get() {
-            val list = mutableListOf<RemindersItem>()
-            for (child in children) {
-                val view = child as? ReminderItemFormView ?: continue
-                if (view.item.time != null) {
-                    list.add(view.item)
+        var reminders: List<RemindersItem>
+            get() {
+                val list = mutableListOf<RemindersItem>()
+                for (child in children) {
+                    val view = child as? ReminderItemFormView ?: continue
+                    if (view.item.time != null) {
+                        list.add(view.item)
+                    }
                 }
+                return list
             }
-            return list
-        }
-        set(value) {
-            val unAnimatedTransitions = LayoutTransition()
-            unAnimatedTransitions.disableTransitionType(LayoutTransition.APPEARING)
-            unAnimatedTransitions.disableTransitionType(LayoutTransition.CHANGING)
-            unAnimatedTransitions.disableTransitionType(LayoutTransition.DISAPPEARING)
-            layoutTransition = unAnimatedTransitions
-            if (childCount > 1) {
-                for (child in children.take(childCount - 1)) {
-                    removeView(child)
+            set(value) {
+                val unAnimatedTransitions = LayoutTransition()
+                unAnimatedTransitions.disableTransitionType(LayoutTransition.APPEARING)
+                unAnimatedTransitions.disableTransitionType(LayoutTransition.CHANGING)
+                unAnimatedTransitions.disableTransitionType(LayoutTransition.DISAPPEARING)
+                layoutTransition = unAnimatedTransitions
+                if (childCount > 1) {
+                    for (child in children.take(childCount - 1)) {
+                        removeView(child)
+                    }
                 }
+                for (item in value) {
+                    addReminderViewAt(childCount - 1, item)
+                }
+                val animatedTransitions = LayoutTransition()
+                layoutTransition = animatedTransitions
             }
-            for (item in value) {
-                addReminderViewAt(childCount - 1, item)
+
+        var firstDayOfWeek: Int? = null
+            set(value) {
+                children
+                    .filterIsInstance<ReminderItemFormView>()
+                    .forEach { it.firstDayOfWeek = value }
+                field = value
             }
-            val animatedTransitions = LayoutTransition()
-            layoutTransition = animatedTransitions
+
+        var showNotifPermission: ((Boolean) -> Unit)? = null
+        var shouldShowNotifPermission = false
+
+        init {
+            orientation = VERTICAL
+
+            addReminderViewAt(0)
         }
 
-    var firstDayOfWeek: Int? = null
-        set(value) {
-            children
-                .filterIsInstance<ReminderItemFormView>()
-                .forEach { it.firstDayOfWeek = value }
-            field = value
-        }
-
-    var showNotifPermission: ((Boolean) -> Unit)? = null
-    var shouldShowNotifPermission = false
-
-    init {
-        orientation = VERTICAL
-
-        addReminderViewAt(0)
-    }
-
-    private fun addReminderViewAt(index: Int, item: RemindersItem? = null) {
-        val view = ReminderItemFormView(context)
-        view.firstDayOfWeek = firstDayOfWeek
-        view.taskType = taskType
-        item?.let {
-            view.item = it
-            view.isAddButton = false
-        }
-        view.valueChangedListener = {
-            if (isLastChild(view)) {
-                addReminderViewAt(-1)
-                view.animDuration = 300
+        private fun addReminderViewAt(
+            index: Int,
+            item: RemindersItem? = null,
+        ) {
+            val view = ReminderItemFormView(context)
+            view.firstDayOfWeek = firstDayOfWeek
+            view.taskType = taskType
+            item?.let {
+                view.item = it
                 view.isAddButton = false
-                if (shouldShowNotifPermission) { showNotifPermission?.invoke(true) }
             }
+            view.valueChangedListener = {
+                if (isLastChild(view)) {
+                    addReminderViewAt(-1)
+                    view.animDuration = 300
+                    view.isAddButton = false
+                    if (shouldShowNotifPermission) {
+                        showNotifPermission?.invoke(true)
+                    }
+                }
+            }
+            val indexToUse =
+                if (index < 0) {
+                    childCount - index
+                } else {
+                    index
+                }
+            if (childCount <= indexToUse) {
+                addView(view)
+                view.isAddButton = true
+            } else {
+                addView(view, indexToUse)
+            }
+            val layoutParams = view.layoutParams as? LayoutParams
+            layoutParams?.updateMargins(bottom = 8.dpToPx(context))
+            view.layoutParams = layoutParams
         }
-        val indexToUse = if (index < 0) {
-            childCount - index
-        } else {
-            index
-        }
-        if (childCount <= indexToUse) {
-            addView(view)
-            view.isAddButton = true
-        } else {
-            addView(view, indexToUse)
-        }
-        val layoutParams = view.layoutParams as? LayoutParams
-        layoutParams?.updateMargins(bottom = 8.dpToPx(context))
-        view.layoutParams = layoutParams
-    }
 
-    private fun isLastChild(view: View): Boolean {
-        return children.lastOrNull() == view
+        private fun isLastChild(view: View): Boolean {
+            return children.lastOrNull() == view
+        }
     }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ReminderItemFormView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ReminderItemFormView.kt
index b1ec9cc1a..787959b6c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ReminderItemFormView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ReminderItemFormView.kt
@@ -27,140 +27,179 @@ import java.time.format.DateTimeFormatter
 import java.util.Date
 import java.util.Locale
 
-class ReminderItemFormView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
-) : LinearLayout(context, attrs, defStyleAttr), TimePickerDialog.OnTimeSetListener, DatePickerDialog.OnDateSetListener {
-    private val formattedTime: CharSequence?
-        get() {
-            return if (item.time != null) {
-                val time = Date.from(item.getLocalZonedDateTimeInstant())
-                formatter.format(time)
-            } else {
-                ""
-            }
-        }
-
-    private val binding = TaskFormReminderItemBinding.inflate(context.layoutInflater, this)
-
-    private val formatter: DateFormat
-        get() {
-            return if (taskType == TaskType.DAILY) {
-                DateFormat.getTimeInstance(DateFormat.SHORT, Locale.getDefault())
-            } else {
-                DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT, Locale.getDefault())
-            }
-        }
-
-    var taskType = TaskType.DAILY
-    var item: RemindersItem = RemindersItem()
-        set(value) {
-            field = value
-            binding.textView.text = formattedTime
-        }
-
-    var firstDayOfWeek: Int? = null
-
-    var tintColor: Int = context.getThemeColor(R.attr.tintedUiSub)
-    var valueChangedListener: ((Date) -> Unit)? = null
-    var animDuration = 0L
-    var isAddButton: Boolean = true
-        set(value) {
-            field = value
-            binding.textView.text = if (value) context.getString(R.string.new_reminder) else formattedTime
-            if (value) {
-                val rotate = RotateAnimation(135f, 0f, Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f)
-                rotate.duration = animDuration
-                rotate.interpolator = LinearInterpolator()
-                rotate.fillAfter = true
-                binding.button.startAnimation(rotate)
-                // This button is not clickable in this state, so make screen readers skip it.
-                binding.button.importantForAccessibility = View.IMPORTANT_FOR_ACCESSIBILITY_NO
-            } else {
-                val rotate = RotateAnimation(0f, 135f, Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f)
-                rotate.duration = animDuration
-                rotate.interpolator = LinearInterpolator()
-                rotate.fillAfter = true
-                binding.button.startAnimation(rotate)
-                // This button IS now clickable, so allow screen readers to focus it.
-                binding.button.importantForAccessibility = View.IMPORTANT_FOR_ACCESSIBILITY_YES
-            }
-        }
-
-    init {
-        minimumHeight = 38.dpToPx(context)
-        background = ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_task_form)
-        background.mutate().setTint(context.getThemeColor(R.attr.colorTintedBackgroundOffset))
-        gravity = Gravity.CENTER_VERTICAL
-
-        binding.button.setOnClickListener {
-            if (!isAddButton) {
-                (parent as? ViewGroup)?.removeView(this)
-            }
-        }
-        // It's ok to make the description always be 'Delete Reminder' because when this button is
-        // a plus button we set it as 'unimportant for accessibility' so it can't be focused.
-        binding.button.contentDescription = context.getString(R.string.delete_reminder)
-        binding.button.drawable.mutate().setTint(tintColor)
-
-        binding.textView.setOnClickListener {
-            if (taskType == TaskType.DAILY) {
-                val timePickerDialog = TimePickerDialog(
-                    context,
-                    this,
-                    item.getZonedDateTime()?.hour ?: ZonedDateTime.now().hour,
-                    item.getZonedDateTime()?.minute ?: ZonedDateTime.now().minute,
-                    android.text.format.DateFormat.is24HourFormat(context)
-                )
-                timePickerDialog.show()
-            } else {
-                val zonedDateTime = (item.getZonedDateTime() ?: ZonedDateTime.now())
-                val timePickerDialog = DatePickerDialog(
-                    context,
-                    this,
-                    zonedDateTime.year,
-                    zonedDateTime.monthValue - 1,
-                    zonedDateTime.dayOfMonth
-                )
-                if ((firstDayOfWeek ?: -1) >= 0) {
-                    timePickerDialog.datePicker.firstDayOfWeek = firstDayOfWeek ?: 0
+class ReminderItemFormView
+    @JvmOverloads
+    constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0,
+    ) : LinearLayout(context, attrs, defStyleAttr),
+        TimePickerDialog.OnTimeSetListener,
+        DatePickerDialog.OnDateSetListener {
+        private val formattedTime: CharSequence?
+            get() {
+                return if (item.time != null) {
+                    val time = Date.from(item.getLocalZonedDateTimeInstant())
+                    formatter.format(time)
+                } else {
+                    ""
                 }
+            }
+
+        private val binding = TaskFormReminderItemBinding.inflate(context.layoutInflater, this)
+
+        private val formatter: DateFormat
+            get() {
+                return if (taskType == TaskType.DAILY) {
+                    DateFormat.getTimeInstance(DateFormat.SHORT, Locale.getDefault())
+                } else {
+                    DateFormat.getDateTimeInstance(
+                        DateFormat.SHORT,
+                        DateFormat.SHORT,
+                        Locale.getDefault(),
+                    )
+                }
+            }
+
+        var taskType = TaskType.DAILY
+        var item: RemindersItem = RemindersItem()
+            set(value) {
+                field = value
+                binding.textView.text = formattedTime
+            }
+
+        var firstDayOfWeek: Int? = null
+
+        var tintColor: Int = context.getThemeColor(R.attr.tintedUiSub)
+        var valueChangedListener: ((Date) -> Unit)? = null
+        var animDuration = 0L
+        var isAddButton: Boolean = true
+            set(value) {
+                field = value
+                binding.textView.text =
+                    if (value) context.getString(R.string.new_reminder) else formattedTime
+                if (value) {
+                    val rotate =
+                        RotateAnimation(
+                            135f,
+                            0f,
+                            Animation.RELATIVE_TO_SELF,
+                            0.5f,
+                            Animation.RELATIVE_TO_SELF,
+                            0.5f,
+                        )
+                    rotate.duration = animDuration
+                    rotate.interpolator = LinearInterpolator()
+                    rotate.fillAfter = true
+                    binding.button.startAnimation(rotate)
+                    // This button is not clickable in this state, so make screen readers skip it.
+                    binding.button.importantForAccessibility = View.IMPORTANT_FOR_ACCESSIBILITY_NO
+                } else {
+                    val rotate =
+                        RotateAnimation(
+                            0f,
+                            135f,
+                            Animation.RELATIVE_TO_SELF,
+                            0.5f,
+                            Animation.RELATIVE_TO_SELF,
+                            0.5f,
+                        )
+                    rotate.duration = animDuration
+                    rotate.interpolator = LinearInterpolator()
+                    rotate.fillAfter = true
+                    binding.button.startAnimation(rotate)
+                    // This button IS now clickable, so allow screen readers to focus it.
+                    binding.button.importantForAccessibility = View.IMPORTANT_FOR_ACCESSIBILITY_YES
+                }
+            }
+
+        init {
+            minimumHeight = 38.dpToPx(context)
+            background = ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_task_form)
+            background.mutate().setTint(context.getThemeColor(R.attr.colorTintedBackgroundOffset))
+            gravity = Gravity.CENTER_VERTICAL
+
+            binding.button.setOnClickListener {
+                if (!isAddButton) {
+                    (parent as? ViewGroup)?.removeView(this)
+                }
+            }
+            // It's ok to make the description always be 'Delete Reminder' because when this button is
+            // a plus button we set it as 'unimportant for accessibility' so it can't be focused.
+            binding.button.contentDescription = context.getString(R.string.delete_reminder)
+            binding.button.drawable.mutate().setTint(tintColor)
+
+            binding.textView.setOnClickListener {
+                if (taskType == TaskType.DAILY) {
+                    val timePickerDialog =
+                        TimePickerDialog(
+                            context,
+                            this,
+                            item.getZonedDateTime()?.hour ?: ZonedDateTime.now().hour,
+                            item.getZonedDateTime()?.minute ?: ZonedDateTime.now().minute,
+                            android.text.format.DateFormat.is24HourFormat(context),
+                        )
+                    timePickerDialog.show()
+                } else {
+                    val zonedDateTime = (item.getZonedDateTime() ?: ZonedDateTime.now())
+                    val timePickerDialog =
+                        DatePickerDialog(
+                            context,
+                            this,
+                            zonedDateTime.year,
+                            zonedDateTime.monthValue - 1,
+                            zonedDateTime.dayOfMonth,
+                        )
+                    if ((firstDayOfWeek ?: -1) >= 0) {
+                        timePickerDialog.datePicker.firstDayOfWeek = firstDayOfWeek ?: 0
+                    }
+                    timePickerDialog.show()
+                }
+            }
+            binding.textView.labelFor = binding.button.id
+        }
+
+        override fun onTimeSet(
+            view: TimePicker?,
+            hourOfDay: Int,
+            minute: Int,
+        ) {
+            valueChangedListener?.let {
+                val zonedDateTime =
+                    (item.getZonedDateTime() ?: ZonedDateTime.now())
+                        .withHour(hourOfDay)
+                        .withMinute(minute)
+                item.time = zonedDateTime.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME)
+                binding.textView.text = formattedTime
+                it(Date.from(item.getLocalZonedDateTimeInstant()))
+            }
+        }
+
+        override fun onDateSet(
+            view: DatePicker?,
+            year: Int,
+            month: Int,
+            dayOfMonth: Int,
+        ) {
+            valueChangedListener?.let {
+                val zonedDateTime =
+                    ZonedDateTime.now()
+                        .withYear(year)
+                        .withMonth(month + 1)
+                        .withDayOfMonth(dayOfMonth)
+                item.time = zonedDateTime.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME)
+                binding.textView.text = formattedTime
+                it(Date.from(item.getLocalZonedDateTimeInstant()))
+
+                val timePickerDialog =
+                    TimePickerDialog(
+                        context,
+                        this,
+                        ZonedDateTime.now().hour,
+                        ZonedDateTime.now().minute,
+                        android.text.format.DateFormat.is24HourFormat(context),
+                    )
                 timePickerDialog.show()
             }
         }
-        binding.textView.labelFor = binding.button.id
     }
-
-    override fun onTimeSet(view: TimePicker?, hourOfDay: Int, minute: Int) {
-        valueChangedListener?.let {
-            val zonedDateTime = (item.getZonedDateTime() ?: ZonedDateTime.now())
-                .withHour(hourOfDay)
-                .withMinute(minute)
-            item.time = zonedDateTime.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME)
-            binding.textView.text = formattedTime
-            it(Date.from(item.getLocalZonedDateTimeInstant()))
-        }
-    }
-
-    override fun onDateSet(view: DatePicker?, year: Int, month: Int, dayOfMonth: Int) {
-        valueChangedListener?.let {
-            val zonedDateTime = ZonedDateTime.now()
-                .withYear(year)
-                .withMonth(month + 1)
-                .withDayOfMonth(dayOfMonth)
-            item.time = zonedDateTime.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME)
-            binding.textView.text = formattedTime
-            it(Date.from(item.getLocalZonedDateTimeInstant()))
-
-            val timePickerDialog = TimePickerDialog(
-                context,
-                this,
-                ZonedDateTime.now().hour,
-                ZonedDateTime.now().minute,
-                android.text.format.DateFormat.is24HourFormat(context)
-            )
-            timePickerDialog.show()
-        }
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/StepperValueFormView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/StepperValueFormView.kt
index f04585429..44d492db1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/StepperValueFormView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/StepperValueFormView.kt
@@ -12,98 +12,105 @@ import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.common.habitica.extensions.layoutInflater
 import java.text.DecimalFormat
 
-class StepperValueFormView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
-) : RelativeLayout(context, attrs, defStyleAttr) {
-    private val binding = FormStepperValueBinding.inflate(context.layoutInflater, this)
+class StepperValueFormView
+    @JvmOverloads
+    constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0,
+    ) : RelativeLayout(context, attrs, defStyleAttr) {
+        private val binding = FormStepperValueBinding.inflate(context.layoutInflater, this)
 
-    var onValueChanged: ((Double) -> Unit)? = null
+        var onValueChanged: ((Double) -> Unit)? = null
 
-    private val decimalFormat = DecimalFormat("0.###")
-    private var editTextIsFocused = false
+        private val decimalFormat = DecimalFormat("0.###")
+        private var editTextIsFocused = false
 
-    var value = 0.0
-        set(new) {
-            var newValue = if (new >= minValue) new else minValue
-            maxValue?.let {
-                if (newValue > it && it > 0) {
-                    newValue = it
+        var value = 0.0
+            set(new) {
+                var newValue = if (new >= minValue) new else minValue
+                maxValue?.let {
+                    if (newValue > it && it > 0) {
+                        newValue = it
+                    }
+                }
+                val oldValue = field
+                field = newValue
+                if (oldValue != new) {
+                    valueString = decimalFormat.format(newValue)
+                }
+                binding.downButton.isEnabled = field > minValue
+                maxValue?.let {
+                    if (it == 0.0) return@let
+                    binding.upButton.isEnabled = value < it
+                }
+
+                onValueChanged?.invoke(value)
+            }
+
+        var maxValue: Double? = null
+        var minValue: Double = 0.0
+
+        private var valueString = ""
+            set(value) {
+                val hasChanged = field != value || binding.editText.text.toString() != field
+                field = value
+                if (value.isEmpty()) {
+                    onValueChanged?.invoke(0.0)
+                    return
+                }
+
+                if (hasChanged) {
+                    binding.editText.setText(field)
+                    if (editTextIsFocused) {
+                        binding.editText.setSelection(field.length)
+                    }
+                }
+                val newValue = field.toDoubleOrNull() ?: 0.0
+                if (this.value != newValue || hasChanged) {
+                    this.value = newValue
                 }
             }
-            val oldValue = field
-            field = newValue
-            if (oldValue != new) {
-                valueString = decimalFormat.format(newValue)
+
+        var iconDrawable: Drawable?
+            get() {
+                return binding.editText.compoundDrawables.firstOrNull()
             }
-            binding.downButton.isEnabled = field > minValue
-            maxValue?.let {
-                if (it == 0.0) return@let
-                binding.upButton.isEnabled = value < it
+            set(value) {
+                binding.editText.setCompoundDrawablesWithIntrinsicBounds(value, null, null, null)
             }
 
-            onValueChanged?.invoke(value)
-        }
+        init {
+            val attributes =
+                context.theme?.obtainStyledAttributes(
+                    attrs,
+                    R.styleable.StepperValueFormView,
+                    0,
+                    0,
+                )
 
-    var maxValue: Double? = null
-    var minValue: Double = 0.0
+            // set value here, so that the setter is called and everything is set up correctly
+            maxValue = attributes?.getFloat(R.styleable.StepperValueFormView_maxValue, 0f)?.toDouble()
+            minValue =
+                attributes?.getFloat(R.styleable.StepperValueFormView_minValue, 0f)?.toDouble() ?: 0.0
+            value =
+                attributes?.getFloat(R.styleable.StepperValueFormView_defaultValue, 10.0f)?.toDouble()
+                    ?: 10.0
+            iconDrawable = attributes?.getDrawable(R.styleable.StepperValueFormView_iconDrawable)
+                ?: HabiticaIconsHelper.imageOfGold().asDrawable(context.resources)
 
-    private var valueString = ""
-        set(value) {
-            val hasChanged = field != value || binding.editText.text.toString() != field
-            field = value
-            if (value.isEmpty()) {
-                onValueChanged?.invoke(0.0)
-                return
+            binding.upButton.setOnClickListener {
+                value += 1
+            }
+            binding.downButton.setOnClickListener {
+                value -= 1
             }
 
-            if (hasChanged) {
-                binding.editText.setText(field)
-                if (editTextIsFocused) {
-                    binding.editText.setSelection(field.length)
-                }
-            }
-            val newValue = field.toDoubleOrNull() ?: 0.0
-            if (this.value != newValue || hasChanged) {
-                this.value = newValue
-            }
+            binding.editText.addTextChangedListener(
+                OnChangeTextWatcher { s, _, _, _ ->
+                    valueString = s.toString()
+                },
+            )
+            binding.editText.setOnFocusChangeListener { _, hasFocus -> editTextIsFocused = hasFocus }
         }
-
-    var iconDrawable: Drawable?
-        get() {
-            return binding.editText.compoundDrawables.firstOrNull()
-        }
-        set(value) {
-            binding.editText.setCompoundDrawablesWithIntrinsicBounds(value, null, null, null)
-        }
-
-    init {
-        val attributes = context.theme?.obtainStyledAttributes(
-            attrs,
-            R.styleable.StepperValueFormView,
-            0,
-            0
-        )
-
-        // set value here, so that the setter is called and everything is set up correctly
-        maxValue = attributes?.getFloat(R.styleable.StepperValueFormView_maxValue, 0f)?.toDouble()
-        minValue = attributes?.getFloat(R.styleable.StepperValueFormView_minValue, 0f)?.toDouble() ?: 0.0
-        value = attributes?.getFloat(R.styleable.StepperValueFormView_defaultValue, 10.0f)?.toDouble() ?: 10.0
-        iconDrawable = attributes?.getDrawable(R.styleable.StepperValueFormView_iconDrawable) ?: HabiticaIconsHelper.imageOfGold().asDrawable(context.resources)
-
-        binding.upButton.setOnClickListener {
-            value += 1
-        }
-        binding.downButton.setOnClickListener {
-            value -= 1
-        }
-
-        binding.editText.addTextChangedListener(
-            OnChangeTextWatcher { s, _, _, _ ->
-                valueString = s.toString()
-            }
-        )
-        binding.editText.setOnFocusChangeListener { _, hasFocus -> editTextIsFocused = hasFocus }
     }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskDifficultyButtons.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskDifficultyButtons.kt
index dbf6481e0..39c16dc21 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskDifficultyButtons.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskDifficultyButtons.kt
@@ -1,7 +1,6 @@
 package com.habitrpg.android.habitica.ui.views.tasks.form
 
 import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.animation.animateColor
 import androidx.compose.animation.core.Spring
 import androidx.compose.animation.core.spring
@@ -42,30 +41,31 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.ui.theme.colors
-import com.habitrpg.common.habitica.theme.HabiticaTheme
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.common.habitica.extensions.getThemeColor
 import com.habitrpg.common.habitica.extensions.nameRes
+import com.habitrpg.common.habitica.theme.HabiticaTheme
 import com.habitrpg.shared.habitica.models.tasks.TaskDifficulty
 
 @Composable
 fun TaskDifficultySelector(
     selected: TaskDifficulty,
     onSelect: (TaskDifficulty) -> Unit,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     Row(horizontalArrangement = Arrangement.SpaceBetween, modifier = modifier.fillMaxWidth()) {
         for (difficulty in TaskDifficulty.values())
             TaskDifficultySelection(
                 value = difficulty,
                 selected = selected == difficulty,
-                icon = HabiticaIconsHelper.imageOfTaskDifficultyStars(
-                    colorResource(R.color.white).toArgb(),
-                    difficulty.value,
-                    true
-                ).asImageBitmap(),
+                icon =
+                    HabiticaIconsHelper.imageOfTaskDifficultyStars(
+                        colorResource(R.color.white).toArgb(),
+                        difficulty.value,
+                        true,
+                    ).asImageBitmap(),
                 text = stringResource(difficulty.nameRes),
-                onSelect = onSelect
+                onSelect = onSelect,
             )
     }
 }
@@ -77,39 +77,54 @@ private fun TaskDifficultySelection(
     icon: ImageBitmap,
     text: String,
     onSelect: (TaskDifficulty) -> Unit,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     val selectedState = updateTransition(selected)
     val context = LocalContext.current
-    val iconColor = selectedState.animateColor {
-        if (it) HabiticaTheme.colors.tintedUiDetails else Color(context.getThemeColor(R.attr.textColorTintedSecondary))
-    }
-    val textColor = selectedState.animateColor {
-        if (it) Color(context.getThemeColor(R.attr.textColorTintedPrimary)) else Color(context.getThemeColor(R.attr.textColorTintedSecondary))
-    }
-    Column(horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(6.dp), modifier = modifier) {
+    val iconColor =
+        selectedState.animateColor {
+            if (it) HabiticaTheme.colors.tintedUiDetails else Color(context.getThemeColor(R.attr.textColorTintedSecondary))
+        }
+    val textColor =
+        selectedState.animateColor {
+            if (it) {
+                Color(context.getThemeColor(R.attr.textColorTintedPrimary))
+            } else {
+                Color(
+                    context.getThemeColor(
+                        R.attr.textColorTintedSecondary,
+                    ),
+                )
+            }
+        }
+    Column(
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.spacedBy(6.dp),
+        modifier = modifier,
+    ) {
         Box(
             contentAlignment = Alignment.Center,
-            modifier = Modifier
-                .size(57.dp)
-                .background(
-                    Color(
-                        LocalContext.current.getThemeColor(R.attr.colorTintedBackgroundOffset)
-                    ),
-                    MaterialTheme.shapes.medium
-                )
-                .clip(MaterialTheme.shapes.medium)
-                .clickable { onSelect(value) }
+            modifier =
+                Modifier
+                    .size(57.dp)
+                    .background(
+                        Color(
+                            LocalContext.current.getThemeColor(R.attr.colorTintedBackgroundOffset),
+                        ),
+                        MaterialTheme.shapes.medium,
+                    )
+                    .clip(MaterialTheme.shapes.medium)
+                    .clickable { onSelect(value) },
         ) {
             this@Column.AnimatedVisibility(
                 selected,
                 enter = scaleIn(spring(Spring.DampingRatioLowBouncy, Spring.StiffnessMedium)),
-                exit = scaleOut(spring(Spring.DampingRatioLowBouncy, Spring.StiffnessMedium))
+                exit = scaleOut(spring(Spring.DampingRatioLowBouncy, Spring.StiffnessMedium)),
             ) {
                 Box(
                     Modifier
                         .size(57.dp)
-                        .background(HabiticaTheme.colors.tintedUiMain, MaterialTheme.shapes.medium)
+                        .background(HabiticaTheme.colors.tintedUiMain, MaterialTheme.shapes.medium),
                 )
             }
             Image(icon, null, colorFilter = ColorFilter.tint(iconColor.value))
@@ -118,7 +133,7 @@ private fun TaskDifficultySelection(
             text,
             fontWeight = if (selected) FontWeight.Medium else FontWeight.Normal,
             fontSize = 14.sp,
-            color = textColor.value
+            color = textColor.value,
         )
     }
 }
@@ -129,7 +144,9 @@ private class DifficultyProvider : PreviewParameterProvider<TaskDifficulty> {
 
 @Preview
 @Composable
-private fun TaskDifficultySelectorPreview(@PreviewParameter(DifficultyProvider::class) difficulty: TaskDifficulty) {
+private fun TaskDifficultySelectorPreview(
+    @PreviewParameter(DifficultyProvider::class) difficulty: TaskDifficulty,
+) {
     val selected = remember { mutableStateOf(difficulty) }
     TaskDifficultySelector(selected.value, { selected.value = it }, Modifier.width(300.dp))
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskFormSelector.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskFormSelector.kt
index 3ea71bed7..d1bde7697 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskFormSelector.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskFormSelector.kt
@@ -1,7 +1,6 @@
 package com.habitrpg.android.habitica.ui.views.tasks.form
 
 import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.animation.animateColor
 import androidx.compose.animation.core.Spring
 import androidx.compose.animation.core.spring
@@ -34,8 +33,8 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.ui.theme.colors
-import com.habitrpg.common.habitica.theme.HabiticaTheme
 import com.habitrpg.common.habitica.extensions.getThemeColor
+import com.habitrpg.common.habitica.theme.HabiticaTheme
 
 data class LabeledValue<V>(val label: String, val value: V)
 
@@ -46,12 +45,12 @@ fun <V> TaskFormSelector(
     onSelect: (V) -> Unit,
     modifier: Modifier = Modifier,
     columnSize: Int = 2,
-    spacing: Dp = 10.dp
+    spacing: Dp = 10.dp,
 ) {
     Column(verticalArrangement = Arrangement.spacedBy(spacing), modifier = modifier) {
         for (row in values.chunked(columnSize)) {
             Row(
-                horizontalArrangement = Arrangement.spacedBy(spacing)
+                horizontalArrangement = Arrangement.spacedBy(spacing),
             ) {
                 for (value in row)
                     TaskFormSelection(
@@ -59,9 +58,10 @@ fun <V> TaskFormSelector(
                         selected = selected == value.value,
                         text = value.label,
                         onSelect = onSelect,
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .weight(1f)
+                        modifier =
+                            Modifier
+                                .fillMaxWidth()
+                                .weight(1f),
                     )
             }
         }
@@ -74,35 +74,37 @@ private fun <V> TaskFormSelection(
     selected: Boolean,
     text: String,
     onSelect: (V) -> Unit,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     val selectedState = updateTransition(selected)
     val context = LocalContext.current
-    val textColor = selectedState.animateColor {
-        if (it) HabiticaTheme.colors.tintedUiDetails else Color(context.getThemeColor(R.attr.textColorTintedSecondary))
-    }
+    val textColor =
+        selectedState.animateColor {
+            if (it) HabiticaTheme.colors.tintedUiDetails else Color(context.getThemeColor(R.attr.textColorTintedSecondary))
+        }
     Box(
         contentAlignment = Alignment.Center,
-        modifier = modifier
-            .background(
-                Color(
-                    LocalContext.current.getThemeColor(R.attr.colorTintedBackgroundOffset)
-                ),
-                MaterialTheme.shapes.medium
-            )
-            .clip(MaterialTheme.shapes.medium)
-            .clickable { onSelect(value) }
+        modifier =
+            modifier
+                .background(
+                    Color(
+                        LocalContext.current.getThemeColor(R.attr.colorTintedBackgroundOffset),
+                    ),
+                    MaterialTheme.shapes.medium,
+                )
+                .clip(MaterialTheme.shapes.medium)
+                .clickable { onSelect(value) },
     ) {
         AnimatedVisibility(
             selected,
             enter = scaleIn(spring(Spring.DampingRatioLowBouncy, Spring.StiffnessMedium)),
             exit = scaleOut(spring(Spring.DampingRatioLowBouncy, Spring.StiffnessMedium)),
-            modifier = Modifier.matchParentSize()
+            modifier = Modifier.matchParentSize(),
         ) {
             Box(
                 Modifier
                     .background(HabiticaTheme.colors.tintedUiMain, MaterialTheme.shapes.medium)
-                    .matchParentSize()
+                    .matchParentSize(),
             )
         }
         Text(
@@ -110,7 +112,7 @@ private fun <V> TaskFormSelection(
             fontWeight = if (selected) FontWeight.Medium else FontWeight.Normal,
             fontSize = 16.sp,
             color = textColor.value,
-            modifier = Modifier.padding(15.dp)
+            modifier = Modifier.padding(15.dp),
         )
     }
 }
@@ -127,9 +129,9 @@ private fun TaskFormSelectorPreview() {
             LabeledValue("Third", "third"),
             LabeledValue("Fourth", "fourth"),
             LabeledValue("Fifth", "Fifth"),
-            LabeledValue("Sixth", "sixth")
+            LabeledValue("Sixth", "sixth"),
         ),
         { selected.value = it },
-        Modifier.width(300.dp)
+        Modifier.width(300.dp),
     )
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskSchedulingControls.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskSchedulingControls.kt
index c3f361a59..a192c77da 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskSchedulingControls.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskSchedulingControls.kt
@@ -33,379 +33,430 @@ import java.util.Collections
 import java.util.Date
 import java.util.Locale
 
-class TaskSchedulingControls @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
-) : LinearLayout(context, attrs, defStyleAttr), DatePickerDialog.OnDateSetListener {
-    private val binding = TaskFormTaskSchedulingBinding.inflate(context.layoutInflater, this)
-    var tintColor: Int = ContextCompat.getColor(context, R.color.brand_300)
+class TaskSchedulingControls
+    @JvmOverloads
+    constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0,
+    ) : LinearLayout(context, attrs, defStyleAttr), DatePickerDialog.OnDateSetListener {
+        private val binding = TaskFormTaskSchedulingBinding.inflate(context.layoutInflater, this)
+        var tintColor: Int = ContextCompat.getColor(context, R.color.brand_300)
 
-    private val dateFormatter = DateFormat.getDateInstance(DateFormat.MEDIUM)
-    private val frequencyAdapter = SimpleSpinnerAdapter(context, R.array.repeatables_frequencies)
+        private val dateFormatter = DateFormat.getDateInstance(DateFormat.MEDIUM)
+        private val frequencyAdapter = SimpleSpinnerAdapter(context, R.array.repeatables_frequencies)
 
-    var taskType = TaskType.DAILY
-        set(value) {
-            field = value
-            configureViewsForType()
-            if (value == TaskType.TODO) {
-                dueDate = null
-            }
-        }
-    var startDate = Date()
-        set(value) {
-            field = value
-            binding.startDateTextview.text = dateFormatter.format(value)
-            startDateCalendar.time = value
-            generateSummary()
-        }
-    private var startDateCalendar = Calendar.getInstance()
-    var dueDate: Date? = null
-        set(value) {
-            field = value
-            if (value != null) {
-                binding.startDateTextview.text = dateFormatter.format(value)
-            } else {
-                binding.startDateTextview.text = null
-            }
-        }
-    var frequency = Frequency.DAILY
-        set(value) {
-            field = value
-            binding.repeatsEverySpinner.setSelection(
-                when (value) {
-                    Frequency.WEEKLY -> 1
-                    Frequency.MONTHLY -> 2
-                    Frequency.YEARLY -> 3
-                    else -> 0
-                }
-            )
-            configureViewsForFrequency()
-            generateSummary()
-        }
-    var everyX
-        get() = (binding.repeatsEveryEdittext.text ?: "1").toString().toIntOrNull() ?: 1
-        set(value) {
-            try {
-                binding.repeatsEveryEdittext.setText(value.toString())
-            } catch (e: NumberFormatException) {
-                binding.repeatsEveryEdittext.setText("1")
-            }
-            generateSummary()
-        }
-    var weeklyRepeat: Days = Days()
-        set(value) {
-            field = value
-            createWeeklyRepeatViews()
-            generateSummary()
-        }
-
-    var daysOfMonth: List<Int>? = null
-        set(value) {
-            field = value
-            configureMonthlyRepeatViews()
-            generateSummary()
-        }
-    var weeksOfMonth: List<Int>? = null
-        set(value) {
-            field = value
-            configureMonthlyRepeatViews()
-            generateSummary()
-        }
-
-    var firstDayOfWeek: Int = -1
-        set(value) {
-            field = value
-            if (value >= 0) {
-                val codes = (1..7).toList()
-                Collections.rotate(codes, -firstDayOfWeek + 1)
-                weekdayOrder = codes
-            }
-        }
-
-    private val weekdays: Array<String> by lazy {
-        DateFormatSymbols().weekdays
-    }
-    private var weekdayOrder: List<Int> = (1..7).toList()
-
-    init {
-        binding.repeatsEverySpinner.adapter = frequencyAdapter
-
-        frequency = Frequency.WEEKLY
-        startDate = Date()
-        everyX = 1
-        weeklyRepeat = Days()
-
-        binding.repeatsEverySpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onNothingSelected(parent: AdapterView<*>?) {
-                frequency = frequency
-            }
-
-            override fun onItemSelected(
-                parent: AdapterView<*>?,
-                view: View?,
-                position: Int,
-                id: Long
-            ) {
-                frequency = when (position) {
-                    1 -> Frequency.WEEKLY
-                    2 -> Frequency.MONTHLY
-                    3 -> Frequency.YEARLY
-                    else -> Frequency.DAILY
-                }
-            }
-        }
-
-        binding.startDateWrapper.setOnClickListener {
-            val datePickerDialog = DatePickerDialog(
-                context,
-                this,
-                startDateCalendar.get(Calendar.YEAR),
-                startDateCalendar.get(Calendar.MONTH),
-                startDateCalendar.get(Calendar.DAY_OF_MONTH)
-            )
-            datePickerDialog.setButton(DialogInterface.BUTTON_NEUTRAL, resources.getString(R.string.today)) { _, _ ->
-                if (taskType == TaskType.TODO) {
-                    dueDate = Date()
-                } else {
-                    startDate = Date()
-                }
-            }
-
-            if (firstDayOfWeek >= 0) {
-                datePickerDialog.datePicker.firstDayOfWeek = firstDayOfWeek
-            }
-            if (taskType == TaskType.TODO) {
-                datePickerDialog.setButton(DialogInterface.BUTTON_NEUTRAL, resources.getString(R.string.clear)) { _, _ ->
+        var taskType = TaskType.DAILY
+            set(value) {
+                field = value
+                configureViewsForType()
+                if (value == TaskType.TODO) {
                     dueDate = null
                 }
             }
-            datePickerDialog.show()
-        }
-
-        binding.monthlyRepeatDays.setOnClickListener {
-            daysOfMonth = mutableListOf(startDateCalendar.get(Calendar.DATE))
-            weeksOfMonth = null
-            generateSummary()
-        }
-        binding.monthlyRepeatWeeks.setOnClickListener {
-            weeksOfMonth = mutableListOf(startDateCalendar.get(Calendar.WEEK_OF_MONTH) - 1)
-            daysOfMonth = null
-            generateSummary()
-        }
-
-        orientation = VERTICAL
-        configureViewsForType()
-        configureViewsForFrequency()
-    }
-
-    override fun setEnabled(isEnabled: Boolean) {
-        super.setEnabled(isEnabled)
-        for (button in binding.weeklyRepeatWrapper.children) {
-            button.isEnabled = isEnabled
-        }
-        binding.startDateWrapper.isEnabled = isEnabled
-        binding.monthlyRepeatDays.isEnabled = isEnabled
-        binding.monthlyRepeatWeeks.isEnabled = isEnabled
-    }
-
-    private fun configureViewsForType() {
-        binding.startDateTitle.text = context.getString(if (taskType == TaskType.DAILY) R.string.start_date else R.string.due_date)
-        binding.repeatsEveryWrapper.visibility = if (taskType == TaskType.DAILY) View.VISIBLE else View.GONE
-        binding.summaryTextview.visibility = if (taskType == TaskType.DAILY) View.VISIBLE else View.GONE
-        binding.weeklyRepeatWrapper.visibility = if (taskType == TaskType.DAILY) View.VISIBLE else View.GONE
-    }
-
-    override fun onDateSet(view: DatePicker?, year: Int, month: Int, dayOfMonth: Int) {
-        startDateCalendar.set(year, month, dayOfMonth)
-        if (taskType == TaskType.TODO) {
-            dueDate = startDateCalendar.time
-        } else {
-            startDate = startDateCalendar.time
-        }
-    }
-
-    private fun configureViewsForFrequency() {
-        binding.repeatsEveryTitle.text = context.getText(
-            when (frequency) {
-                Frequency.WEEKLY -> R.string.weeks
-                Frequency.MONTHLY -> R.string.months
-                Frequency.YEARLY -> R.string.years
-                else -> R.string.days
+        var startDate = Date()
+            set(value) {
+                field = value
+                binding.startDateTextview.text = dateFormatter.format(value)
+                startDateCalendar.time = value
+                generateSummary()
+            }
+        private var startDateCalendar = Calendar.getInstance()
+        var dueDate: Date? = null
+            set(value) {
+                field = value
+                if (value != null) {
+                    binding.startDateTextview.text = dateFormatter.format(value)
+                } else {
+                    binding.startDateTextview.text = null
+                }
+            }
+        var frequency = Frequency.DAILY
+            set(value) {
+                field = value
+                binding.repeatsEverySpinner.setSelection(
+                    when (value) {
+                        Frequency.WEEKLY -> 1
+                        Frequency.MONTHLY -> 2
+                        Frequency.YEARLY -> 3
+                        else -> 0
+                    },
+                )
+                configureViewsForFrequency()
+                generateSummary()
+            }
+        var everyX
+            get() = (binding.repeatsEveryEdittext.text ?: "1").toString().toIntOrNull() ?: 1
+            set(value) {
+                try {
+                    binding.repeatsEveryEdittext.setText(value.toString())
+                } catch (e: NumberFormatException) {
+                    binding.repeatsEveryEdittext.setText("1")
+                }
+                generateSummary()
+            }
+        var weeklyRepeat: Days = Days()
+            set(value) {
+                field = value
+                createWeeklyRepeatViews()
+                generateSummary()
+            }
+
+        var daysOfMonth: List<Int>? = null
+            set(value) {
+                field = value
+                configureMonthlyRepeatViews()
+                generateSummary()
+            }
+        var weeksOfMonth: List<Int>? = null
+            set(value) {
+                field = value
+                configureMonthlyRepeatViews()
+                generateSummary()
+            }
+
+        var firstDayOfWeek: Int = -1
+            set(value) {
+                field = value
+                if (value >= 0) {
+                    val codes = (1..7).toList()
+                    Collections.rotate(codes, -firstDayOfWeek + 1)
+                    weekdayOrder = codes
+                }
+            }
+
+        private val weekdays: Array<String> by lazy {
+            DateFormatSymbols().weekdays
+        }
+        private var weekdayOrder: List<Int> = (1..7).toList()
+
+        init {
+            binding.repeatsEverySpinner.adapter = frequencyAdapter
+
+            frequency = Frequency.WEEKLY
+            startDate = Date()
+            everyX = 1
+            weeklyRepeat = Days()
+
+            binding.repeatsEverySpinner.onItemSelectedListener =
+                object : AdapterView.OnItemSelectedListener {
+                    override fun onNothingSelected(parent: AdapterView<*>?) {
+                        frequency = frequency
+                    }
+
+                    override fun onItemSelected(
+                        parent: AdapterView<*>?,
+                        view: View?,
+                        position: Int,
+                        id: Long,
+                    ) {
+                        frequency =
+                            when (position) {
+                                1 -> Frequency.WEEKLY
+                                2 -> Frequency.MONTHLY
+                                3 -> Frequency.YEARLY
+                                else -> Frequency.DAILY
+                            }
+                    }
+                }
+
+            binding.startDateWrapper.setOnClickListener {
+                val datePickerDialog =
+                    DatePickerDialog(
+                        context,
+                        this,
+                        startDateCalendar.get(Calendar.YEAR),
+                        startDateCalendar.get(Calendar.MONTH),
+                        startDateCalendar.get(Calendar.DAY_OF_MONTH),
+                    )
+                datePickerDialog.setButton(
+                    DialogInterface.BUTTON_NEUTRAL,
+                    resources.getString(R.string.today),
+                ) { _, _ ->
+                    if (taskType == TaskType.TODO) {
+                        dueDate = Date()
+                    } else {
+                        startDate = Date()
+                    }
+                }
+
+                if (firstDayOfWeek >= 0) {
+                    datePickerDialog.datePicker.firstDayOfWeek = firstDayOfWeek
+                }
+                if (taskType == TaskType.TODO) {
+                    datePickerDialog.setButton(
+                        DialogInterface.BUTTON_NEUTRAL,
+                        resources.getString(R.string.clear),
+                    ) { _, _ ->
+                        dueDate = null
+                    }
+                }
+                datePickerDialog.show()
+            }
+
+            binding.monthlyRepeatDays.setOnClickListener {
+                daysOfMonth = mutableListOf(startDateCalendar.get(Calendar.DATE))
+                weeksOfMonth = null
+                generateSummary()
+            }
+            binding.monthlyRepeatWeeks.setOnClickListener {
+                weeksOfMonth = mutableListOf(startDateCalendar.get(Calendar.WEEK_OF_MONTH) - 1)
+                daysOfMonth = null
+                generateSummary()
+            }
+
+            orientation = VERTICAL
+            configureViewsForType()
+            configureViewsForFrequency()
+        }
+
+        override fun setEnabled(isEnabled: Boolean) {
+            super.setEnabled(isEnabled)
+            for (button in binding.weeklyRepeatWrapper.children) {
+                button.isEnabled = isEnabled
+            }
+            binding.startDateWrapper.isEnabled = isEnabled
+            binding.monthlyRepeatDays.isEnabled = isEnabled
+            binding.monthlyRepeatWeeks.isEnabled = isEnabled
+        }
+
+        private fun configureViewsForType() {
+            binding.startDateTitle.text =
+                context.getString(if (taskType == TaskType.DAILY) R.string.start_date else R.string.due_date)
+            binding.repeatsEveryWrapper.visibility =
+                if (taskType == TaskType.DAILY) View.VISIBLE else View.GONE
+            binding.summaryTextview.visibility =
+                if (taskType == TaskType.DAILY) View.VISIBLE else View.GONE
+            binding.weeklyRepeatWrapper.visibility =
+                if (taskType == TaskType.DAILY) View.VISIBLE else View.GONE
+        }
+
+        override fun onDateSet(
+            view: DatePicker?,
+            year: Int,
+            month: Int,
+            dayOfMonth: Int,
+        ) {
+            startDateCalendar.set(year, month, dayOfMonth)
+            if (taskType == TaskType.TODO) {
+                dueDate = startDateCalendar.time
+            } else {
+                startDate = startDateCalendar.time
+            }
+        }
+
+        private fun configureViewsForFrequency() {
+            binding.repeatsEveryTitle.text =
+                context.getText(
+                    when (frequency) {
+                        Frequency.WEEKLY -> R.string.weeks
+                        Frequency.MONTHLY -> R.string.months
+                        Frequency.YEARLY -> R.string.years
+                        else -> R.string.days
+                    },
+                )
+            binding.weeklyRepeatWrapper.visibility =
+                if (frequency == Frequency.WEEKLY && taskType == TaskType.DAILY) View.VISIBLE else View.GONE
+            binding.monthlyRepeatWrapper.visibility =
+                if (frequency == Frequency.MONTHLY && taskType == TaskType.DAILY) View.VISIBLE else View.GONE
+            if (frequency == Frequency.WEEKLY) {
+                createWeeklyRepeatViews()
+            } else if (frequency == Frequency.MONTHLY) {
+                if (weeksOfMonth?.isNotEmpty() != true && daysOfMonth?.isNotEmpty() != true) {
+                    daysOfMonth = listOf(startDateCalendar.get(Calendar.DATE))
+                }
+            }
+        }
+
+        private fun setWeekdayActive(
+            weekday: Int,
+            isActive: Boolean,
+        ) {
+            when (weekday) {
+                2 -> weeklyRepeat.m = isActive
+                3 -> weeklyRepeat.t = isActive
+                4 -> weeklyRepeat.w = isActive
+                5 -> weeklyRepeat.th = isActive
+                6 -> weeklyRepeat.f = isActive
+                7 -> weeklyRepeat.s = isActive
+                1 -> weeklyRepeat.su = isActive
             }
-        )
-        binding.weeklyRepeatWrapper.visibility = if (frequency == Frequency.WEEKLY && taskType == TaskType.DAILY) View.VISIBLE else View.GONE
-        binding.monthlyRepeatWrapper.visibility = if (frequency == Frequency.MONTHLY && taskType == TaskType.DAILY) View.VISIBLE else View.GONE
-        if (frequency == Frequency.WEEKLY) {
             createWeeklyRepeatViews()
-        } else if (frequency == Frequency.MONTHLY) {
-            if (weeksOfMonth?.isNotEmpty() != true && daysOfMonth?.isNotEmpty() != true) {
-                daysOfMonth = listOf(startDateCalendar.get(Calendar.DATE))
-            }
-        }
-    }
-
-    private fun setWeekdayActive(weekday: Int, isActive: Boolean) {
-        when (weekday) {
-            2 -> weeklyRepeat.m = isActive
-            3 -> weeklyRepeat.t = isActive
-            4 -> weeklyRepeat.w = isActive
-            5 -> weeklyRepeat.th = isActive
-            6 -> weeklyRepeat.f = isActive
-            7 -> weeklyRepeat.s = isActive
-            1 -> weeklyRepeat.su = isActive
-        }
-        createWeeklyRepeatViews()
-        binding.weeklyRepeatWrapper.findViewWithTag<TextView>(weekday).sendAccessibilityEvent(
-            AccessibilityEvent.CONTENT_CHANGE_TYPE_CONTENT_DESCRIPTION
-        )
-        generateSummary()
-    }
-
-    private fun isWeekdayActive(weekday: Int): Boolean {
-        return when (weekday) {
-            2 -> weeklyRepeat.m
-            3 -> weeklyRepeat.t
-            4 -> weeklyRepeat.w
-            5 -> weeklyRepeat.th
-            6 -> weeklyRepeat.f
-            7 -> weeklyRepeat.s
-            1 -> weeklyRepeat.su
-            else -> false
-        }
-    }
-
-    private fun createWeeklyRepeatViews() {
-        binding.weeklyRepeatWrapper.removeAllViews()
-        val size = 32.dpToPx(context)
-        val lastWeekday = weekdayOrder.last()
-        for (weekdayCode in weekdayOrder) {
-            val button = TextView(context, null, 0, R.style.TaskFormWeekdayButton)
-            val isActive = isWeekdayActive(weekdayCode)
-            val layoutParams = LayoutParams(size, size)
-            button.layoutParams = layoutParams
-            button.text = weekdays[weekdayCode].first().uppercaseChar().toString()
-            button.contentDescription = toContentDescription(weekdays[weekdayCode], isActive)
-            button.tag = weekdayCode
-            if (isActive) {
-                button.background = ContextCompat.getDrawable(context, R.drawable.habit_scoring_circle_selected)
-                button.setTextColor(context.getThemeColor(R.attr.tintedUiDetails))
-            } else {
-                button.background = ContextCompat.getDrawable(context, R.drawable.habit_scoring_circle)
-                button.setTextColor(context.getThemeColor(R.attr.textColorTintedSecondary))
-            }
-            button.setOnClickListener {
-                setWeekdayActive(weekdayCode, !isActive)
-            }
-            binding.weeklyRepeatWrapper.addView(button)
-            if (weekdayCode != lastWeekday) {
-                val space = Space(context)
-                val spaceLayoutParams = LayoutParams(0, LayoutParams.WRAP_CONTENT)
-                spaceLayoutParams.weight = 1f
-                space.layoutParams = spaceLayoutParams
-                binding.weeklyRepeatWrapper.addView(space)
-            }
-        }
-    }
-
-    private fun configureMonthlyRepeatViews() {
-        if (daysOfMonth?.isEmpty() == false) {
-            styleButtonAsActive(binding.monthlyRepeatDays)
-        } else {
-            styleButtonAsInactive(binding.monthlyRepeatDays)
-        }
-        if (weeksOfMonth?.isEmpty() == false) {
-            styleButtonAsActive(binding.monthlyRepeatWeeks)
-        } else {
-            styleButtonAsInactive(binding.monthlyRepeatWeeks)
-        }
-    }
-
-    private fun styleButtonAsActive(button: TextView) {
-        button.setTextColor(context.getThemeColor(R.attr.tintedUiDetails))
-        button.backgroundTintList = ColorStateList.valueOf(context.getThemeColor(R.attr.tintedUiMain))
-        button.contentDescription = toContentDescription(button.text, true)
-    }
-
-    private fun styleButtonAsInactive(button: TextView) {
-        button.setTextColor(context.getThemeColor(R.attr.textColorTintedSecondary))
-        button.backgroundTintList = ColorStateList.valueOf(context.getThemeColor(R.attr.colorTintedBackgroundOffset))
-        button.contentDescription = toContentDescription(button.text, false)
-    }
-
-    private fun toContentDescription(buttonText: CharSequence, isActive: Boolean): String {
-        val statusString = if (isActive) {
-            context.getString(R.string.selected)
-        } else {
-            context.getString(R.string.not_selected)
-        }
-        return "$buttonText, $statusString"
-    }
-
-    private fun generateSummary() {
-        var frequencyQualifier = ""
-
-        frequencyQualifier = when (frequency) {
-            Frequency.DAILY -> if (everyX == 1) "day" else "days"
-            Frequency.WEEKLY -> if (everyX == 1) "week" else "weeks"
-            Frequency.MONTHLY -> if (everyX == 1) "month" else "months"
-            Frequency.YEARLY -> if (everyX == 1) "year" else "years"
+            binding.weeklyRepeatWrapper.findViewWithTag<TextView>(weekday).sendAccessibilityEvent(
+                AccessibilityEvent.CONTENT_CHANGE_TYPE_CONTENT_DESCRIPTION,
+            )
+            generateSummary()
         }
 
-        var weekdays = if (frequency == Frequency.WEEKLY) {
-            val weekdayStrings = ArrayList<String>()
-            if (weeklyRepeat.m) {
-                weekdayStrings.add("Monday")
+        private fun isWeekdayActive(weekday: Int): Boolean {
+            return when (weekday) {
+                2 -> weeklyRepeat.m
+                3 -> weeklyRepeat.t
+                4 -> weeklyRepeat.w
+                5 -> weeklyRepeat.th
+                6 -> weeklyRepeat.f
+                7 -> weeklyRepeat.s
+                1 -> weeklyRepeat.su
+                else -> false
             }
-            if (weeklyRepeat.t) {
-                weekdayStrings.add("Tuesday")
-            }
-            if (weeklyRepeat.w) {
-                weekdayStrings.add("Wednesday")
-            }
-            if (weeklyRepeat.th) {
-                weekdayStrings.add("Thursday")
-            }
-            if (weeklyRepeat.f) {
-                weekdayStrings.add("Friday")
-            }
-            if (weeklyRepeat.s) {
-                weekdayStrings.add("Saturday")
-            }
-            if (weeklyRepeat.su) {
-                weekdayStrings.add("Sunday")
-            }
-            " on " + TextUtils.join(", ", weekdayStrings)
-        } else {
-            ""
         }
 
-        if (frequency == Frequency.MONTHLY) {
-            weekdays = if (daysOfMonth?.isNotEmpty() == true) {
-                val date = startDateCalendar.get(Calendar.DATE)
-                val formattedDate = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                    val formatter = MessageFormat("{0,ordinal}", Locale.getDefault())
-                    formatter.format(arrayOf(date))
+        private fun createWeeklyRepeatViews() {
+            binding.weeklyRepeatWrapper.removeAllViews()
+            val size = 32.dpToPx(context)
+            val lastWeekday = weekdayOrder.last()
+            for (weekdayCode in weekdayOrder) {
+                val button = TextView(context, null, 0, R.style.TaskFormWeekdayButton)
+                val isActive = isWeekdayActive(weekdayCode)
+                val layoutParams = LayoutParams(size, size)
+                button.layoutParams = layoutParams
+                button.text = weekdays[weekdayCode].first().uppercaseChar().toString()
+                button.contentDescription = toContentDescription(weekdays[weekdayCode], isActive)
+                button.tag = weekdayCode
+                if (isActive) {
+                    button.background =
+                        ContextCompat.getDrawable(context, R.drawable.habit_scoring_circle_selected)
+                    button.setTextColor(context.getThemeColor(R.attr.tintedUiDetails))
                 } else {
-                    date.toString()
+                    button.background =
+                        ContextCompat.getDrawable(context, R.drawable.habit_scoring_circle)
+                    button.setTextColor(context.getThemeColor(R.attr.textColorTintedSecondary))
                 }
-                " on the $formattedDate"
-            } else {
-                val week = startDateCalendar.get(Calendar.WEEK_OF_MONTH)
-                val formattedWeek = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                    val formatter = MessageFormat("{0,ordinal}", Locale.getDefault())
-                    formatter.format(arrayOf(week))
-                } else {
-                    week.toString()
+                button.setOnClickListener {
+                    setWeekdayActive(weekdayCode, !isActive)
+                }
+                binding.weeklyRepeatWrapper.addView(button)
+                if (weekdayCode != lastWeekday) {
+                    val space = Space(context)
+                    val spaceLayoutParams = LayoutParams(0, LayoutParams.WRAP_CONTENT)
+                    spaceLayoutParams.weight = 1f
+                    space.layoutParams = spaceLayoutParams
+                    binding.weeklyRepeatWrapper.addView(space)
                 }
-                val dayLongName = startDateCalendar.getDisplayName(Calendar.DAY_OF_WEEK, Calendar.LONG, Locale.getDefault())
-                " on the $formattedWeek week on $dayLongName"
             }
         }
 
-        val everyXString = if (everyX == 1) "" else "$everyX "
+        private fun configureMonthlyRepeatViews() {
+            if (daysOfMonth?.isEmpty() == false) {
+                styleButtonAsActive(binding.monthlyRepeatDays)
+            } else {
+                styleButtonAsInactive(binding.monthlyRepeatDays)
+            }
+            if (weeksOfMonth?.isEmpty() == false) {
+                styleButtonAsActive(binding.monthlyRepeatWeeks)
+            } else {
+                styleButtonAsInactive(binding.monthlyRepeatWeeks)
+            }
+        }
 
-        val summary = resources.getString(R.string.repeat_summary, frequency, everyXString, frequencyQualifier, weekdays)
-        binding.summaryTextview.text = summary
+        private fun styleButtonAsActive(button: TextView) {
+            button.setTextColor(context.getThemeColor(R.attr.tintedUiDetails))
+            button.backgroundTintList =
+                ColorStateList.valueOf(context.getThemeColor(R.attr.tintedUiMain))
+            button.contentDescription = toContentDescription(button.text, true)
+        }
+
+        private fun styleButtonAsInactive(button: TextView) {
+            button.setTextColor(context.getThemeColor(R.attr.textColorTintedSecondary))
+            button.backgroundTintList =
+                ColorStateList.valueOf(context.getThemeColor(R.attr.colorTintedBackgroundOffset))
+            button.contentDescription = toContentDescription(button.text, false)
+        }
+
+        private fun toContentDescription(
+            buttonText: CharSequence,
+            isActive: Boolean,
+        ): String {
+            val statusString =
+                if (isActive) {
+                    context.getString(R.string.selected)
+                } else {
+                    context.getString(R.string.not_selected)
+                }
+            return "$buttonText, $statusString"
+        }
+
+        private fun generateSummary() {
+            var frequencyQualifier = ""
+
+            frequencyQualifier =
+                when (frequency) {
+                    Frequency.DAILY -> if (everyX == 1) "day" else "days"
+                    Frequency.WEEKLY -> if (everyX == 1) "week" else "weeks"
+                    Frequency.MONTHLY -> if (everyX == 1) "month" else "months"
+                    Frequency.YEARLY -> if (everyX == 1) "year" else "years"
+                }
+
+            var weekdays =
+                if (frequency == Frequency.WEEKLY) {
+                    val weekdayStrings = ArrayList<String>()
+                    if (weeklyRepeat.m) {
+                        weekdayStrings.add("Monday")
+                    }
+                    if (weeklyRepeat.t) {
+                        weekdayStrings.add("Tuesday")
+                    }
+                    if (weeklyRepeat.w) {
+                        weekdayStrings.add("Wednesday")
+                    }
+                    if (weeklyRepeat.th) {
+                        weekdayStrings.add("Thursday")
+                    }
+                    if (weeklyRepeat.f) {
+                        weekdayStrings.add("Friday")
+                    }
+                    if (weeklyRepeat.s) {
+                        weekdayStrings.add("Saturday")
+                    }
+                    if (weeklyRepeat.su) {
+                        weekdayStrings.add("Sunday")
+                    }
+                    " on " + TextUtils.join(", ", weekdayStrings)
+                } else {
+                    ""
+                }
+
+            if (frequency == Frequency.MONTHLY) {
+                weekdays =
+                    if (daysOfMonth?.isNotEmpty() == true) {
+                        val date = startDateCalendar.get(Calendar.DATE)
+                        val formattedDate =
+                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                                val formatter = MessageFormat("{0,ordinal}", Locale.getDefault())
+                                formatter.format(arrayOf(date))
+                            } else {
+                                date.toString()
+                            }
+                        " on the $formattedDate"
+                    } else {
+                        val week = startDateCalendar.get(Calendar.WEEK_OF_MONTH)
+                        val formattedWeek =
+                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                                val formatter = MessageFormat("{0,ordinal}", Locale.getDefault())
+                                formatter.format(arrayOf(week))
+                            } else {
+                                week.toString()
+                            }
+                        val dayLongName =
+                            startDateCalendar.getDisplayName(
+                                Calendar.DAY_OF_WEEK,
+                                Calendar.LONG,
+                                Locale.getDefault(),
+                            )
+                        " on the $formattedWeek week on $dayLongName"
+                    }
+            }
+
+            val everyXString = if (everyX == 1) "" else "$everyX "
+
+            val summary =
+                resources.getString(
+                    R.string.repeat_summary,
+                    frequency,
+                    everyXString,
+                    frequencyQualifier,
+                    weekdays,
+                )
+            binding.summaryTextview.text = summary
+        }
     }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/yesterdailies/YesterdailyDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/yesterdailies/YesterdailyDialog.kt
index 90e603431..3bb007917 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/yesterdailies/YesterdailyDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/yesterdailies/YesterdailyDialog.kt
@@ -41,9 +41,8 @@ class YesterdailyDialog private constructor(
     context: Context,
     private val userRepository: UserRepository,
     private val taskRepository: TaskRepository,
-    private val tasks: List<Task>
+    private val tasks: List<Task>,
 ) : HabiticaAlertDialog(context) {
-
     private lateinit var yesterdailiesList: LinearLayout
 
     init {
@@ -110,11 +109,12 @@ class YesterdailyDialog private constructor(
                     val checklistContainer = taskView.findViewById<ViewGroup>(R.id.checklistView)
                     checklistContainer.removeAllViews()
                     for (item in task.checklist ?: emptyList<ChecklistItem>()) {
-                        val checklistView = inflater.inflate(
-                            R.layout.checklist_item_row,
-                            checklistContainer,
-                            false
-                        ) as ViewGroup
+                        val checklistView =
+                            inflater.inflate(
+                                R.layout.checklist_item_row,
+                                checklistContainer,
+                                false,
+                            ) as ViewGroup
                         configureChecklistView(checklistView, task, item)
                         checklistContainer.addView(checklistView)
                     }
@@ -124,11 +124,12 @@ class YesterdailyDialog private constructor(
             if ((task.checklist?.size ?: 0) > 0) {
                 val checklistContainer = taskView.findViewById<ViewGroup>(R.id.checklistView)
                 for (item in task.checklist ?: emptyList<ChecklistItem>()) {
-                    val checklistView = inflater.inflate(
-                        R.layout.checklist_item_row,
-                        checklistContainer,
-                        false
-                    ) as ViewGroup
+                    val checklistView =
+                        inflater.inflate(
+                            R.layout.checklist_item_row,
+                            checklistContainer,
+                            false,
+                        ) as ViewGroup
                     configureChecklistView(checklistView, task, item)
                     checklistContainer.addView(checklistView)
                 }
@@ -137,12 +138,21 @@ class YesterdailyDialog private constructor(
         }
     }
 
-    private fun configureChecklistView(checklistView: ViewGroup, task: Task, item: ChecklistItem) {
+    private fun configureChecklistView(
+        checklistView: ViewGroup,
+        task: Task,
+        item: ChecklistItem,
+    ) {
         val checkmark = checklistView.findViewById<ImageView>(R.id.checkmark)
         if (task.completed) {
             checkmark?.drawable?.setTint(ContextCompat.getColor(context, R.color.gray_400))
         } else {
-            checkmark?.drawable?.setTint(ContextCompat.getColor(context, task.extraExtraDarkTaskColor))
+            checkmark?.drawable?.setTint(
+                ContextCompat.getColor(
+                    context,
+                    task.extraExtraDarkTaskColor,
+                ),
+            )
         }
         checkmark?.visibility = if (item.completed) View.VISIBLE else View.GONE
         val checkboxHolder = checklistView.findViewById<View>(R.id.checkBoxHolder) as? ViewGroup
@@ -161,37 +171,41 @@ class YesterdailyDialog private constructor(
                 R.color.offset_background
             } else {
                 task.extraLightTaskColor
-            }
+            },
         )
         val textView = checklistView.findViewById(R.id.checkedTextView) as? TextView
         textView?.text = item.text
         val checkboxBackground = checklistView.findViewById<View>(R.id.checkBoxBackground)
-        checkboxBackground?.backgroundTintList = ContextCompat.getColorStateList(
-            context,
-            (
-                if (context.isUsingNightModeResources()) {
-                    if (task.completed) {
-                        R.color.checkbox_fill
+        checkboxBackground?.backgroundTintList =
+            ContextCompat.getColorStateList(
+                context,
+                (
+                    if (context.isUsingNightModeResources()) {
+                        if (task.completed) {
+                            R.color.checkbox_fill
+                        } else {
+                            task.lightTaskColor
+                        }
                     } else {
-                        task.lightTaskColor
+                        R.color.checkbox_fill
                     }
-                } else {
-                    R.color.checkbox_fill
-                }
-                )
-        )
+                ),
+            )
     }
 
     private fun scoreChecklistItem(
         task: Task,
-        item: ChecklistItem
+        item: ChecklistItem,
     ) {
         lifecycleScope.launch(ExceptionHandler.coroutine()) {
             taskRepository.scoreChecklistItem(task.id ?: "", item.id ?: "")
         }
     }
 
-    private fun configureTaskView(taskView: View, task: Task) {
+    private fun configureTaskView(
+        taskView: View,
+        task: Task,
+    ) {
         val completed = !task.isDisplayedActive
         val checkmark = taskView.findViewById<ImageView>(R.id.checkmark)
         checkmark?.drawable?.setTint(ContextCompat.getColor(context, R.color.gray_400))
@@ -215,7 +229,6 @@ class YesterdailyDialog private constructor(
     }
 
     companion object {
-
         private var displayedDialog: WeakReference<YesterdailyDialog>? = null
         internal var lastCronRun: Date? = null
 
@@ -223,7 +236,7 @@ class YesterdailyDialog private constructor(
             activity: Activity,
             userId: String?,
             userRepository: UserRepository?,
-            taskRepository: TaskRepository
+            taskRepository: TaskRepository,
         ) {
             if (userRepository != null && userId != null) {
                 MainScope().launchCatching {
@@ -237,9 +250,10 @@ class YesterdailyDialog private constructor(
                     }
                     val cal = Calendar.getInstance()
                     cal.add(Calendar.DATE, -1)
-                    val tasks = taskRepository.retrieveDailiesFromDate(cal.time)?.tasks?.values?.filter { task ->
-                        return@filter task.type == TaskType.DAILY && task.isDue == true && !task.completed && task.yesterDaily && !task.isGroupTask
-                    }
+                    val tasks =
+                        taskRepository.retrieveDailiesFromDate(cal.time)?.tasks?.values?.filter { task ->
+                            return@filter task.type == TaskType.DAILY && task.isDue == true && !task.completed && task.yesterDaily && !task.isGroupTask
+                        }
                     if (displayedDialog?.get()?.isShowing == true) {
                         return@launchCatching
                     }
@@ -247,11 +261,12 @@ class YesterdailyDialog private constructor(
                     if (abs((lastCronRun?.time ?: 0) - Date().time) < 60 * 60 * 1000L) {
                         return@launchCatching
                     }
-                    val dailies = taskRepository.getTasks(TaskType.DAILY, null, emptyArray()).map {
-                        val taskMap = mutableMapOf<String, Int>()
-                        it.forEachIndexed { index, task -> taskMap[task.id ?: ""] = index }
-                        taskMap
-                    }.firstOrNull()
+                    val dailies =
+                        taskRepository.getTasks(TaskType.DAILY, null, emptyArray()).map {
+                            val taskMap = mutableMapOf<String, Int>()
+                            it.forEachIndexed { index, task -> taskMap[task.id ?: ""] = index }
+                            taskMap
+                        }.firstOrNull()
                     val sortedTasks = tasks?.sortedBy { dailies?.get(it.id ?: "") }
 
                     val additionalData = HashMap<String, Any>()
@@ -260,18 +275,19 @@ class YesterdailyDialog private constructor(
                         "show cron",
                         EventCategory.BEHAVIOUR,
                         HitType.EVENT,
-                        additionalData
+                        additionalData,
                     )
 
                     if (sortedTasks?.isNotEmpty() == true) {
-                        displayedDialog = WeakReference(
-                            showDialog(
-                                activity,
-                                userRepository,
-                                taskRepository,
-                                sortedTasks
+                        displayedDialog =
+                            WeakReference(
+                                showDialog(
+                                    activity,
+                                    userRepository,
+                                    taskRepository,
+                                    sortedTasks,
+                                ),
                             )
-                        )
                     } else {
                         lastCronRun = Date()
                         userRepository.runCron()
@@ -284,7 +300,7 @@ class YesterdailyDialog private constructor(
             activity: Activity,
             userRepository: UserRepository,
             taskRepository: TaskRepository,
-            tasks: List<Task>
+            tasks: List<Task>,
         ): YesterdailyDialog {
             val dialog = YesterdailyDialog(activity, userRepository, taskRepository, tasks)
             dialog.setCancelable(false)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/AchievementListDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/AchievementListDeserializer.kt
index 1adf56b6a..7fa3be59c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/AchievementListDeserializer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/AchievementListDeserializer.kt
@@ -8,16 +8,16 @@ import com.habitrpg.android.habitica.models.Achievement
 import java.lang.reflect.Type
 
 class AchievementListDeserializer : JsonDeserializer<List<Achievement?>> {
-
     override fun deserialize(
         json: JsonElement?,
         typeOfT: Type?,
-        context: JsonDeserializationContext?
+        context: JsonDeserializationContext?,
     ): List<Achievement?> {
         val achievements = mutableListOf<Achievement>()
         for (categoryEntry in json?.asJsonObject?.entrySet() ?: emptySet()) {
             val categoryIdentifier = categoryEntry.key
-            for (entry in categoryEntry.value.asJsonObject.getAsJsonObject("achievements").entrySet()) {
+            for (entry in categoryEntry.value.asJsonObject.getAsJsonObject("achievements")
+                .entrySet()) {
                 val obj = entry.value.asJsonObject
                 val achievement = Achievement()
                 achievement.key = entry.key
@@ -27,7 +27,8 @@ class AchievementListDeserializer : JsonDeserializer<List<Achievement?>> {
                 achievement.text = obj.getAsString("text")
                 achievement.icon = obj.getAsString("icon")
                 achievement.index = if (obj.has("index")) obj["index"].asInt else 0
-                achievement.optionalCount = if (obj.has("optionalCount")) obj["optionalCount"].asInt else 0
+                achievement.optionalCount =
+                    if (obj.has("optionalCount")) obj["optionalCount"].asInt else 0
                 achievements.add(achievement)
             }
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/AssignedDetailsDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/AssignedDetailsDeserializer.kt
index 29b8a9bfd..1a3905cc7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/AssignedDetailsDeserializer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/AssignedDetailsDeserializer.kt
@@ -11,17 +11,28 @@ class AssignedDetailsDeserializer : JsonDeserializer<RealmList<GroupAssignedDeta
     override fun deserialize(
         json: JsonElement?,
         typeOfT: Type?,
-        context: JsonDeserializationContext?
+        context: JsonDeserializationContext?,
     ): RealmList<GroupAssignedDetails?> {
         val list = RealmList<GroupAssignedDetails?>()
         if (json == null) {
             return list
         } else if (json.isJsonArray) {
-            json.asJsonArray.forEach { list.add(context?.deserialize(it, GroupAssignedDetails::class.java)) }
+            json.asJsonArray.forEach {
+                list.add(
+                    context?.deserialize(
+                        it,
+                        GroupAssignedDetails::class.java,
+                    ),
+                )
+            }
         } else {
             val jsonObject = json.asJsonObject
             jsonObject.keySet().forEach {
-                val details = context?.deserialize<GroupAssignedDetails>(jsonObject[it], GroupAssignedDetails::class.java)
+                val details =
+                    context?.deserialize<GroupAssignedDetails>(
+                        jsonObject[it],
+                        GroupAssignedDetails::class.java,
+                    )
                 details?.assignedUserID = it
                 list.add(details)
             }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/BooleanAsIntAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/BooleanAsIntAdapter.kt
index a1594319a..b1c1dab15 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/BooleanAsIntAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/BooleanAsIntAdapter.kt
@@ -1,33 +1,36 @@
-package com.habitrpg.android.habitica.utils
-
-import com.google.gson.TypeAdapter
-import com.google.gson.stream.JsonReader
-import com.google.gson.stream.JsonToken
-import com.google.gson.stream.JsonWriter
-import java.io.IOException
-
-class BooleanAsIntAdapter : TypeAdapter<Boolean>() {
-
-    @Throws(IOException::class)
-    override fun write(out: JsonWriter, value: Boolean?) {
-        if (value == null) {
-            out.nullValue()
-        } else {
-            out.value(value)
-        }
-    }
-
-    @Throws(IOException::class)
-    override fun read(`in`: JsonReader): Boolean? {
-        return when (val peek = `in`.peek()) {
-            JsonToken.BOOLEAN -> `in`.nextBoolean()
-            JsonToken.NULL -> {
-                `in`.nextNull()
-                null
-            }
-            JsonToken.NUMBER -> `in`.nextInt() != 0
-            JsonToken.STRING -> java.lang.Boolean.parseBoolean(`in`.nextString())
-            else -> throw IllegalStateException("Expected BOOLEAN or NUMBER but was $peek")
-        }
-    }
-}
+package com.habitrpg.android.habitica.utils
+
+import com.google.gson.TypeAdapter
+import com.google.gson.stream.JsonReader
+import com.google.gson.stream.JsonToken
+import com.google.gson.stream.JsonWriter
+import java.io.IOException
+
+class BooleanAsIntAdapter : TypeAdapter<Boolean>() {
+    @Throws(IOException::class)
+    override fun write(
+        out: JsonWriter,
+        value: Boolean?,
+    ) {
+        if (value == null) {
+            out.nullValue()
+        } else {
+            out.value(value)
+        }
+    }
+
+    @Throws(IOException::class)
+    override fun read(`in`: JsonReader): Boolean? {
+        return when (val peek = `in`.peek()) {
+            JsonToken.BOOLEAN -> `in`.nextBoolean()
+            JsonToken.NULL -> {
+                `in`.nextNull()
+                null
+            }
+
+            JsonToken.NUMBER -> `in`.nextInt() != 0
+            JsonToken.STRING -> java.lang.Boolean.parseBoolean(`in`.nextString())
+            else -> throw IllegalStateException("Expected BOOLEAN or NUMBER but was $peek")
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChallengeDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChallengeDeserializer.kt
index 48cc9ff08..30200afb1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChallengeDeserializer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChallengeDeserializer.kt
@@ -15,7 +15,11 @@ import java.util.Date
 
 class ChallengeDeserializer : JsonDeserializer<Challenge>, JsonSerializer<Challenge> {
     @Throws(JsonParseException::class)
-    override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): Challenge {
+    override fun deserialize(
+        json: JsonElement,
+        typeOfT: Type,
+        context: JsonDeserializationContext,
+    ): Challenge {
         val jsonObject = json.asJsonObject
 
         val challenge = Challenge()
@@ -83,10 +87,14 @@ class ChallengeDeserializer : JsonDeserializer<Challenge>, JsonSerializer<Challe
         if (tasksOrderElement != null && !tasksOrderElement.isJsonNull) {
             val tasksOrderObj = tasksOrderElement.asJsonObject
 
-            challenge.todoList = getTaskArrayAsString(context, tasksOrderObj, Challenge.TASK_ORDER_TODOS)
-            challenge.dailyList = getTaskArrayAsString(context, tasksOrderObj, Challenge.TASK_ORDER_DAILYS)
-            challenge.habitList = getTaskArrayAsString(context, tasksOrderObj, Challenge.TASK_ORDER_HABITS)
-            challenge.rewardList = getTaskArrayAsString(context, tasksOrderObj, Challenge.TASK_ORDER_REWARDS)
+            challenge.todoList =
+                getTaskArrayAsString(context, tasksOrderObj, Challenge.TASK_ORDER_TODOS)
+            challenge.dailyList =
+                getTaskArrayAsString(context, tasksOrderObj, Challenge.TASK_ORDER_DAILYS)
+            challenge.habitList =
+                getTaskArrayAsString(context, tasksOrderObj, Challenge.TASK_ORDER_HABITS)
+            challenge.rewardList =
+                getTaskArrayAsString(context, tasksOrderObj, Challenge.TASK_ORDER_REWARDS)
         }
 
         return challenge
@@ -95,12 +103,13 @@ class ChallengeDeserializer : JsonDeserializer<Challenge>, JsonSerializer<Challe
     private fun getTaskArrayAsString(
         context: JsonDeserializationContext,
         tasksOrderObj: JsonObject,
-        taskType: String
+        taskType: String,
     ): String {
         if (tasksOrderObj.has(taskType)) {
             val jsonElement = tasksOrderObj.get(taskType)
 
-            val taskArray = context.deserialize<Array<String>>(jsonElement, Array<String>::class.java)
+            val taskArray =
+                context.deserialize<Array<String>>(jsonElement, Array<String>::class.java)
 
             return TextUtils.join(",", taskArray)
         }
@@ -108,7 +117,11 @@ class ChallengeDeserializer : JsonDeserializer<Challenge>, JsonSerializer<Challe
         return ""
     }
 
-    override fun serialize(src: Challenge, typeOfSrc: Type, context: JsonSerializationContext): JsonElement {
+    override fun serialize(
+        src: Challenge,
+        typeOfSrc: Type,
+        context: JsonSerializationContext,
+    ): JsonElement {
         val obj = JsonObject()
         obj.addProperty("id", src.id)
         obj.addProperty("name", src.name)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChallengeListDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChallengeListDeserializer.kt
index c4d0c36a6..a9b28de8a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChallengeListDeserializer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChallengeListDeserializer.kt
@@ -10,7 +10,11 @@ import java.lang.reflect.Type
 
 class ChallengeListDeserializer : JsonDeserializer<List<Challenge>> {
     @Throws(JsonParseException::class)
-    override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): List<Challenge> {
+    override fun deserialize(
+        json: JsonElement,
+        typeOfT: Type,
+        context: JsonDeserializationContext,
+    ): List<Challenge> {
         val challenges = RealmList<Challenge>()
 
         for (element in json.asJsonArray) {
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 9f52aba3c..7bd1914d2 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
@@ -1,81 +1,91 @@
-package com.habitrpg.android.habitica.utils
-
-import com.google.gson.JsonDeserializationContext
-import com.google.gson.JsonDeserializer
-import com.google.gson.JsonElement
-import com.google.gson.JsonParseException
-import com.habitrpg.android.habitica.models.social.ChatMessage
-import com.habitrpg.android.habitica.models.social.ChatMessageLike
-import com.habitrpg.android.habitica.models.social.UserStyles
-import com.habitrpg.android.habitica.models.user.Backer
-import com.habitrpg.android.habitica.models.user.ContributorInfo
-import io.realm.RealmList
-import java.lang.reflect.Type
-import java.util.Date
-
-class ChatMessageDeserializer : JsonDeserializer<ChatMessage> {
-    @Throws(JsonParseException::class)
-    override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): ChatMessage {
-        val message = ChatMessage()
-        val obj = json.asJsonObject
-        if (obj.has("text") && !obj.get("text").isJsonNull && obj.get("text").isJsonPrimitive) {
-            message.text = obj.get("text").asString
-        }
-        if (obj.has("timestamp")) {
-            message.timestamp = context.deserialize<Date>(obj.get("timestamp"), Date::class.java).time
-        }
-        if (obj.has("likes")) {
-            message.likes = RealmList()
-            for ((key, value) in obj.getAsJsonObject("likes").entrySet()) {
-                if (value.asBoolean) {
-                    message.likes?.add(ChatMessageLike(key))
-                }
-            }
-            message.likeCount = message.likes?.size ?: 0
-        }
-        if (obj.has("flagCount")) {
-            message.flagCount = obj.get("flagCount").asInt
-        }
-
-        if (obj.has("uuid")) {
-            message.uuid = obj.get("uuid").asString
-        }
-
-        if (obj.has("contributor")) {
-            if (!obj.get("contributor").isJsonNull) {
-                if (obj.get("contributor").isJsonObject) {
-                    message.contributor = context.deserialize<ContributorInfo>(obj.get("contributor"), ContributorInfo::class.java)
-                } else {
-                    val contributor = ContributorInfo()
-                    contributor.text = obj.get("contributor").asString
-                    message.contributor = contributor
-                }
-            }
-        }
-
-        if (obj.has("backer")) {
-            message.backer = context.deserialize<Backer>(obj.get("backer"), Backer::class.java)
-        }
-
-        if (obj.has("user")) {
-            message.user = obj.get("user").asString
-        }
-
-        if (obj.has("username") && obj.get("username").isJsonPrimitive) {
-            message.username = obj.get("username").asString
-        }
-
-        if (obj.has("sent")) {
-            message.sent = obj.get("sent").asBoolean
-        }
-
-        if (obj.has("userStyles")) {
-            message.userStyles = context.deserialize<UserStyles>(obj.get("userStyles"), UserStyles::class.java)
-        }
-        if (obj.has("id")) {
-            message.id = obj.get("id").asString
-        }
-
-        return message
-    }
-}
+package com.habitrpg.android.habitica.utils
+
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonParseException
+import com.habitrpg.android.habitica.models.social.ChatMessage
+import com.habitrpg.android.habitica.models.social.ChatMessageLike
+import com.habitrpg.android.habitica.models.social.UserStyles
+import com.habitrpg.android.habitica.models.user.Backer
+import com.habitrpg.android.habitica.models.user.ContributorInfo
+import io.realm.RealmList
+import java.lang.reflect.Type
+import java.util.Date
+
+class ChatMessageDeserializer : JsonDeserializer<ChatMessage> {
+    @Throws(JsonParseException::class)
+    override fun deserialize(
+        json: JsonElement,
+        typeOfT: Type,
+        context: JsonDeserializationContext,
+    ): ChatMessage {
+        val message = ChatMessage()
+        val obj = json.asJsonObject
+        if (obj.has("text") && !obj.get("text").isJsonNull && obj.get("text").isJsonPrimitive) {
+            message.text = obj.get("text").asString
+        }
+        if (obj.has("timestamp")) {
+            message.timestamp =
+                context.deserialize<Date>(obj.get("timestamp"), Date::class.java).time
+        }
+        if (obj.has("likes")) {
+            message.likes = RealmList()
+            for ((key, value) in obj.getAsJsonObject("likes").entrySet()) {
+                if (value.asBoolean) {
+                    message.likes?.add(ChatMessageLike(key))
+                }
+            }
+            message.likeCount = message.likes?.size ?: 0
+        }
+        if (obj.has("flagCount")) {
+            message.flagCount = obj.get("flagCount").asInt
+        }
+
+        if (obj.has("uuid")) {
+            message.uuid = obj.get("uuid").asString
+        }
+
+        if (obj.has("contributor")) {
+            if (!obj.get("contributor").isJsonNull) {
+                if (obj.get("contributor").isJsonObject) {
+                    message.contributor =
+                        context.deserialize<ContributorInfo>(
+                            obj.get("contributor"),
+                            ContributorInfo::class.java,
+                        )
+                } else {
+                    val contributor = ContributorInfo()
+                    contributor.text = obj.get("contributor").asString
+                    message.contributor = contributor
+                }
+            }
+        }
+
+        if (obj.has("backer")) {
+            message.backer = context.deserialize<Backer>(obj.get("backer"), Backer::class.java)
+        }
+
+        if (obj.has("user")) {
+            message.user = obj.get("user").asString
+        }
+
+        if (obj.has("username") && obj.get("username").isJsonPrimitive) {
+            message.username = obj.get("username").asString
+        }
+
+        if (obj.has("sent")) {
+            message.sent = obj.get("sent").asBoolean
+        }
+
+        if (obj.has("userStyles")) {
+            message.userStyles =
+                context.deserialize<UserStyles>(obj.get("userStyles"), UserStyles::class.java)
+        }
+        if (obj.has("id")) {
+            message.id = obj.get("id").asString
+        }
+
+        return message
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ContentDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ContentDeserializer.kt
index 073a0a0dd..4b971c74a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ContentDeserializer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ContentDeserializer.kt
@@ -1,126 +1,138 @@
-package com.habitrpg.android.habitica.utils
-
-import com.google.firebase.perf.FirebasePerformance
-import com.google.gson.JsonDeserializationContext
-import com.google.gson.JsonDeserializer
-import com.google.gson.JsonElement
-import com.google.gson.JsonParseException
-import com.google.gson.reflect.TypeToken
-import com.habitrpg.android.habitica.extensions.getAsString
-import com.habitrpg.android.habitica.models.ContentGear
-import com.habitrpg.android.habitica.models.ContentResult
-import com.habitrpg.android.habitica.models.FAQArticle
-import com.habitrpg.android.habitica.models.Skill
-import com.habitrpg.android.habitica.models.inventory.Customization
-import com.habitrpg.android.habitica.models.inventory.Egg
-import com.habitrpg.android.habitica.models.inventory.Equipment
-import com.habitrpg.android.habitica.models.inventory.Food
-import com.habitrpg.android.habitica.models.inventory.HatchingPotion
-import com.habitrpg.android.habitica.models.inventory.Mount
-import com.habitrpg.android.habitica.models.inventory.Pet
-import com.habitrpg.android.habitica.models.inventory.QuestContent
-import com.habitrpg.android.habitica.models.inventory.SpecialItem
-import io.realm.RealmList
-import java.lang.reflect.Type
-
-class ContentDeserializer : JsonDeserializer<ContentResult> {
-
-    @Throws(JsonParseException::class)
-    override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): ContentResult {
-        val deserializeTrace = FirebasePerformance.getInstance().newTrace("ContentDeserialize")
-        deserializeTrace.start()
-        val result = ContentResult()
-        val obj = json.asJsonObject
-
-        result.potion = context.deserialize(obj.get("potion"), Equipment::class.java)
-        result.armoire = context.deserialize(obj.get("armoire"), Equipment::class.java)
-        result.gear = context.deserialize(obj.get("gear"), ContentGear::class.java)
-
-        for (entry in obj.get("quests").asJsonObject.entrySet()) {
-            result.quests.add(context.deserialize(entry.value, QuestContent::class.java))
-            result.quests.forEach { it.key = it.key }
-        }
-        for (entry in obj.get("eggs").asJsonObject.entrySet()) {
-            result.eggs.add(context.deserialize(entry.value, Egg::class.java))
-        }
-        for (entry in obj.get("food").asJsonObject.entrySet()) {
-            result.food.add(context.deserialize(entry.value, Food::class.java))
-        }
-        for (entry in obj.get("hatchingPotions").asJsonObject.entrySet()) {
-            result.hatchingPotions.add(context.deserialize(entry.value, HatchingPotion::class.java))
-        }
-
-        val pets = obj.getAsJsonObject("petInfo")
-        for (key in pets.keySet()) {
-            val pet = Pet()
-            val petObj = pets.getAsJsonObject(key)
-            pet.animal = petObj.getAsString("egg")
-            pet.color = petObj.getAsString("potion")
-            pet.key = petObj.getAsString("key")
-            pet.text = petObj.getAsString("text")
-            pet.type = petObj.getAsString("type")
-            if (pet.type == "premium") {
-                pet.premium = true
-            }
-            result.pets.add(pet)
-        }
-
-        val mounts = obj.getAsJsonObject("mountInfo")
-        for (key in mounts.keySet()) {
-            val mount = Mount()
-            val mountObj = mounts.getAsJsonObject(key)
-            mount.animal = mountObj.getAsString("egg")
-            mount.color = mountObj.getAsString("potion")
-            mount.key = mountObj.getAsString("key")
-            mount.text = mountObj.getAsString("text")
-            mount.type = mountObj.getAsString("type")
-            if (mount.type == "premium") {
-                mount.premium = true
-            }
-            result.mounts.add(mount)
-        }
-        for ((classname, value) in obj.getAsJsonObject("spells").entrySet()) {
-            val classObject = value.asJsonObject
-
-            for ((_, value1) in classObject.entrySet()) {
-                val skillObject = value1.asJsonObject
-                val skill = Skill()
-                skill.key = skillObject.get("key").asString
-                skill.text = skillObject.get("text").asString
-                skill.notes = skillObject.get("notes").asString
-                skill.key = skillObject.get("key").asString
-                skill.target = skillObject.get("target").asString
-                skill.habitClass = classname
-                skill.mana = skillObject.get("mana").asInt
-
-                val lvlElement = skillObject.get("lvl")
-
-                if (lvlElement != null) {
-                    skill.lvl = lvlElement.asInt
-                }
-
-                result.spells.add(skill)
-            }
-        }
-
-        if (obj.has("special")) {
-            for (entry in obj.get("special").asJsonObject.entrySet()) {
-                result.special.add(context.deserialize(entry.value, SpecialItem::class.java))
-            }
-        }
-
-        result.appearances = context.deserialize(obj.get("appearances"), object : TypeToken<RealmList<Customization>>() {}.type)
-        result.backgrounds = context.deserialize(obj.get("backgrounds"), object : TypeToken<RealmList<Customization>>() {}.type)
-        val noBackground = Customization()
-        noBackground.customizationSet = "incentiveBackgrounds"
-        noBackground.customizationSetName = "Login Incentive"
-        noBackground.identifier = ""
-        noBackground.price = 0
-        noBackground.type = "background"
-        result.backgrounds.add(noBackground)
-
-        result.faq = context.deserialize(obj.get("faq"), object : TypeToken<RealmList<FAQArticle>>() {}.type)
-        deserializeTrace.stop()
-        return result
-    }
-}
+package com.habitrpg.android.habitica.utils
+
+import com.google.firebase.perf.FirebasePerformance
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonParseException
+import com.google.gson.reflect.TypeToken
+import com.habitrpg.android.habitica.extensions.getAsString
+import com.habitrpg.android.habitica.models.ContentGear
+import com.habitrpg.android.habitica.models.ContentResult
+import com.habitrpg.android.habitica.models.FAQArticle
+import com.habitrpg.android.habitica.models.Skill
+import com.habitrpg.android.habitica.models.inventory.Customization
+import com.habitrpg.android.habitica.models.inventory.Egg
+import com.habitrpg.android.habitica.models.inventory.Equipment
+import com.habitrpg.android.habitica.models.inventory.Food
+import com.habitrpg.android.habitica.models.inventory.HatchingPotion
+import com.habitrpg.android.habitica.models.inventory.Mount
+import com.habitrpg.android.habitica.models.inventory.Pet
+import com.habitrpg.android.habitica.models.inventory.QuestContent
+import com.habitrpg.android.habitica.models.inventory.SpecialItem
+import io.realm.RealmList
+import java.lang.reflect.Type
+
+class ContentDeserializer : JsonDeserializer<ContentResult> {
+    @Throws(JsonParseException::class)
+    override fun deserialize(
+        json: JsonElement,
+        typeOfT: Type,
+        context: JsonDeserializationContext,
+    ): ContentResult {
+        val deserializeTrace = FirebasePerformance.getInstance().newTrace("ContentDeserialize")
+        deserializeTrace.start()
+        val result = ContentResult()
+        val obj = json.asJsonObject
+
+        result.potion = context.deserialize(obj.get("potion"), Equipment::class.java)
+        result.armoire = context.deserialize(obj.get("armoire"), Equipment::class.java)
+        result.gear = context.deserialize(obj.get("gear"), ContentGear::class.java)
+
+        for (entry in obj.get("quests").asJsonObject.entrySet()) {
+            result.quests.add(context.deserialize(entry.value, QuestContent::class.java))
+            result.quests.forEach { it.key = it.key }
+        }
+        for (entry in obj.get("eggs").asJsonObject.entrySet()) {
+            result.eggs.add(context.deserialize(entry.value, Egg::class.java))
+        }
+        for (entry in obj.get("food").asJsonObject.entrySet()) {
+            result.food.add(context.deserialize(entry.value, Food::class.java))
+        }
+        for (entry in obj.get("hatchingPotions").asJsonObject.entrySet()) {
+            result.hatchingPotions.add(context.deserialize(entry.value, HatchingPotion::class.java))
+        }
+
+        val pets = obj.getAsJsonObject("petInfo")
+        for (key in pets.keySet()) {
+            val pet = Pet()
+            val petObj = pets.getAsJsonObject(key)
+            pet.animal = petObj.getAsString("egg")
+            pet.color = petObj.getAsString("potion")
+            pet.key = petObj.getAsString("key")
+            pet.text = petObj.getAsString("text")
+            pet.type = petObj.getAsString("type")
+            if (pet.type == "premium") {
+                pet.premium = true
+            }
+            result.pets.add(pet)
+        }
+
+        val mounts = obj.getAsJsonObject("mountInfo")
+        for (key in mounts.keySet()) {
+            val mount = Mount()
+            val mountObj = mounts.getAsJsonObject(key)
+            mount.animal = mountObj.getAsString("egg")
+            mount.color = mountObj.getAsString("potion")
+            mount.key = mountObj.getAsString("key")
+            mount.text = mountObj.getAsString("text")
+            mount.type = mountObj.getAsString("type")
+            if (mount.type == "premium") {
+                mount.premium = true
+            }
+            result.mounts.add(mount)
+        }
+        for ((classname, value) in obj.getAsJsonObject("spells").entrySet()) {
+            val classObject = value.asJsonObject
+
+            for ((_, value1) in classObject.entrySet()) {
+                val skillObject = value1.asJsonObject
+                val skill = Skill()
+                skill.key = skillObject.get("key").asString
+                skill.text = skillObject.get("text").asString
+                skill.notes = skillObject.get("notes").asString
+                skill.key = skillObject.get("key").asString
+                skill.target = skillObject.get("target").asString
+                skill.habitClass = classname
+                skill.mana = skillObject.get("mana").asInt
+
+                val lvlElement = skillObject.get("lvl")
+
+                if (lvlElement != null) {
+                    skill.lvl = lvlElement.asInt
+                }
+
+                result.spells.add(skill)
+            }
+        }
+
+        if (obj.has("special")) {
+            for (entry in obj.get("special").asJsonObject.entrySet()) {
+                result.special.add(context.deserialize(entry.value, SpecialItem::class.java))
+            }
+        }
+
+        result.appearances =
+            context.deserialize(
+                obj.get("appearances"),
+                object : TypeToken<RealmList<Customization>>() {}.type,
+            )
+        result.backgrounds =
+            context.deserialize(
+                obj.get("backgrounds"),
+                object : TypeToken<RealmList<Customization>>() {}.type,
+            )
+        val noBackground = Customization()
+        noBackground.customizationSet = "incentiveBackgrounds"
+        noBackground.customizationSetName = "Login Incentive"
+        noBackground.identifier = ""
+        noBackground.price = 0
+        noBackground.type = "background"
+        result.backgrounds.add(noBackground)
+
+        result.faq =
+            context.deserialize(obj.get("faq"), object : TypeToken<RealmList<FAQArticle>>() {}.type)
+        deserializeTrace.stop()
+        return result
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/CustomizationDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/CustomizationDeserializer.kt
index 8f6a9eeb2..ef45d9f07 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/CustomizationDeserializer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/CustomizationDeserializer.kt
@@ -1,221 +1,233 @@
-package com.habitrpg.android.habitica.utils
-
-import com.google.gson.JsonDeserializationContext
-import com.google.gson.JsonDeserializer
-import com.google.gson.JsonElement
-import com.google.gson.JsonObject
-import com.google.gson.JsonParseException
-import com.habitrpg.android.habitica.models.inventory.Customization
-import com.habitrpg.common.habitica.helpers.ExceptionHandler
-import io.realm.Realm
-import io.realm.RealmList
-import java.lang.reflect.Type
-import java.text.SimpleDateFormat
-import java.util.Calendar
-
-class CustomizationDeserializer : JsonDeserializer<List<Customization>> {
-    private val formatter = SimpleDateFormat("MMMM")
-    private val calendar = Calendar.getInstance()
-
-    @Throws(JsonParseException::class)
-    override fun deserialize(
-        json: JsonElement,
-        typeOfT: Type,
-        context: JsonDeserializationContext
-    ): List<Customization> {
-        val jsonObject = json.asJsonObject
-        val customizations = RealmList<Customization>()
-        val realm = Realm.getDefaultInstance()
-
-        val existingCustomizations =
-            realm.copyFromRealm(realm.where(Customization::class.java).findAll())
-        if (jsonObject.has("shirt")) {
-            for (customization in existingCustomizations) {
-                if (jsonObject.has(customization.type)) {
-                    var nestedObject = jsonObject.get(customization.type).asJsonObject
-                    if (customization.category != null) {
-                        if (nestedObject.has(customization.category)) {
-                            nestedObject = nestedObject.get(customization.category).asJsonObject
-                        } else {
-                            continue
-                        }
-                    }
-                    if (nestedObject.has(customization.identifier)) {
-                        customizations.add(
-                            this.parseCustomization(
-                                customization,
-                                customization.type,
-                                customization.category,
-                                customization.identifier,
-                                nestedObject.get(customization.identifier).asJsonObject
-                            )
-                        )
-                        nestedObject.remove(customization.identifier)
-                    }
-                }
-            }
-
-            for (type in listOf("shirt", "skin", "chair")) {
-                for ((key, value) in jsonObject.get(type).asJsonObject.entrySet()) {
-                    customizations.add(
-                        this.parseCustomization(
-                            null,
-                            type,
-                            null,
-                            key,
-                            value.asJsonObject
-                        )
-                    )
-                }
-            }
-
-            for ((key, value) in jsonObject.get("hair").asJsonObject.entrySet()) {
-                for ((key1, value1) in value.asJsonObject.entrySet()) {
-                    customizations.add(
-                        this.parseCustomization(
-                            null,
-                            "hair",
-                            key,
-                            key1,
-                            value1.asJsonObject
-                        )
-                    )
-                }
-            }
-        } else {
-            val keyList = jsonObject.keySet().toList()
-            for (customization in existingCustomizations) {
-                if (jsonObject.has(customization.customizationSet)) {
-                    val nestedObject = jsonObject.get(customization.customizationSet).asJsonObject
-                    if (nestedObject.has(customization.identifier)) {
-                        customizations.add(
-                            this.parseBackground(
-                                customization,
-                                customization.customizationSet ?: "",
-                                keyList.indexOf(customization.customizationSet),
-                                customization.identifier,
-                                nestedObject.get(customization.identifier).asJsonObject
-                            )
-                        )
-                        nestedObject.remove(customization.identifier)
-                    }
-                }
-            }
-
-            for ((key, value) in jsonObject.entrySet()) {
-                for ((key1, value1) in value.asJsonObject.entrySet()) {
-                    customizations.add(this.parseBackground(null, key, keyList.indexOf(key), key1, value1.asJsonObject))
-                }
-            }
-        }
-
-        realm.close()
-
-        return customizations
-    }
-
-    private fun parseCustomization(
-        existingCustomizaion: Customization?,
-        type: String?,
-        category: String?,
-        key: String?,
-        entry: JsonObject
-    ): Customization {
-        var customization = existingCustomizaion
-        if (customization == null) {
-            customization = Customization()
-            customization.identifier = key
-            customization.type = type
-            if (category != null) {
-                customization.category = category
-            }
-        }
-        if (entry.has("price")) {
-            customization.price = entry.get("price").asInt
-        }
-
-        if (entry.has("set")) {
-            val setInfo = entry.get("set").asJsonObject
-            customization.customizationSet = setInfo.get("key").asString
-            if (setInfo.has("setPrice")) {
-                customization.setPrice = setInfo.get("setPrice").asInt
-            }
-            if (setInfo.has("text")) {
-                customization.customizationSetName = setInfo.get("text").asString
-            }
-            val format = SimpleDateFormat("yyyy-MM-dd")
-            try {
-                if (setInfo.has("availableFrom")) {
-                    customization.availableFrom =
-                        format.parse(setInfo.get("availableFrom").asString)
-                }
-                if (setInfo.has("availableUntil")) {
-                    customization.availableUntil =
-                        format.parse(setInfo.get("availableUntil").asString)
-                }
-            } catch (e: Exception) {
-                ExceptionHandler.reportError(e)
-            }
-        }
-
-        return customization
-    }
-
-    private fun parseBackground(
-        existingCustomization: Customization?,
-        setName: String,
-        setCount: Int,
-        key: String?,
-        entry: JsonObject
-    ): Customization {
-        var customization = existingCustomization
-
-        if (customization == null) {
-            customization = Customization()
-            customization.customizationSet = setName
-            customization.type = "background"
-            customization.identifier = key
-        }
-        when (setName) {
-            "eventBackgrounds" -> {
-                customization.customizationSetName = "EVENT BACKGROUNDS"
-                customization.price = 0
-                customization.setPrice = 0
-                customization.isBuyable = false
-            }
-            "incentiveBackgrounds" -> {
-                customization.customizationSetName = "PLAIN BACKGROUND SET"
-                customization.price = 0
-                customization.setPrice = 0
-                customization.isBuyable = false
-            }
-            "timeTravelBackgrounds" -> {
-                customization.customizationSetName = "STEAMPUNK BACKGROUNDS"
-                customization.price = 1
-                customization.setPrice = 0
-                customization.isBuyable = false
-            }
-            else -> {
-                val readableSetName = "SET ${setCount + 1}: ${
-                getMonthName(
-                    setName.substring(11, 13).toInt() - 1
-                )
-                } ${setName.substring(13, 17)}"
-                customization.customizationSetName = readableSetName
-                customization.customizationSet = setName.substring(13, 17) + "." + setName.substring(11, 13)
-                customization.price = 7
-                customization.setPrice = 15
-            }
-        }
-
-        customization.text = entry.get("text").asString
-        customization.notes = entry.asJsonObject.get("notes").asString
-
-        return customization
-    }
-
-    private fun getMonthName(month: Int): String {
-        calendar.set(Calendar.MONTH, month)
-        return formatter.format(calendar.time).uppercase()
-    }
-}
+package com.habitrpg.android.habitica.utils
+
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonObject
+import com.google.gson.JsonParseException
+import com.habitrpg.android.habitica.models.inventory.Customization
+import com.habitrpg.common.habitica.helpers.ExceptionHandler
+import io.realm.Realm
+import io.realm.RealmList
+import java.lang.reflect.Type
+import java.text.SimpleDateFormat
+import java.util.Calendar
+
+class CustomizationDeserializer : JsonDeserializer<List<Customization>> {
+    private val formatter = SimpleDateFormat("MMMM")
+    private val calendar = Calendar.getInstance()
+
+    @Throws(JsonParseException::class)
+    override fun deserialize(
+        json: JsonElement,
+        typeOfT: Type,
+        context: JsonDeserializationContext,
+    ): List<Customization> {
+        val jsonObject = json.asJsonObject
+        val customizations = RealmList<Customization>()
+        val realm = Realm.getDefaultInstance()
+
+        val existingCustomizations =
+            realm.copyFromRealm(realm.where(Customization::class.java).findAll())
+        if (jsonObject.has("shirt")) {
+            for (customization in existingCustomizations) {
+                if (jsonObject.has(customization.type)) {
+                    var nestedObject = jsonObject.get(customization.type).asJsonObject
+                    if (customization.category != null) {
+                        if (nestedObject.has(customization.category)) {
+                            nestedObject = nestedObject.get(customization.category).asJsonObject
+                        } else {
+                            continue
+                        }
+                    }
+                    if (nestedObject.has(customization.identifier)) {
+                        customizations.add(
+                            this.parseCustomization(
+                                customization,
+                                customization.type,
+                                customization.category,
+                                customization.identifier,
+                                nestedObject.get(customization.identifier).asJsonObject,
+                            ),
+                        )
+                        nestedObject.remove(customization.identifier)
+                    }
+                }
+            }
+
+            for (type in listOf("shirt", "skin", "chair")) {
+                for ((key, value) in jsonObject.get(type).asJsonObject.entrySet()) {
+                    customizations.add(
+                        this.parseCustomization(
+                            null,
+                            type,
+                            null,
+                            key,
+                            value.asJsonObject,
+                        ),
+                    )
+                }
+            }
+
+            for ((key, value) in jsonObject.get("hair").asJsonObject.entrySet()) {
+                for ((key1, value1) in value.asJsonObject.entrySet()) {
+                    customizations.add(
+                        this.parseCustomization(
+                            null,
+                            "hair",
+                            key,
+                            key1,
+                            value1.asJsonObject,
+                        ),
+                    )
+                }
+            }
+        } else {
+            val keyList = jsonObject.keySet().toList()
+            for (customization in existingCustomizations) {
+                if (jsonObject.has(customization.customizationSet)) {
+                    val nestedObject = jsonObject.get(customization.customizationSet).asJsonObject
+                    if (nestedObject.has(customization.identifier)) {
+                        customizations.add(
+                            this.parseBackground(
+                                customization,
+                                customization.customizationSet ?: "",
+                                keyList.indexOf(customization.customizationSet),
+                                customization.identifier,
+                                nestedObject.get(customization.identifier).asJsonObject,
+                            ),
+                        )
+                        nestedObject.remove(customization.identifier)
+                    }
+                }
+            }
+
+            for ((key, value) in jsonObject.entrySet()) {
+                for ((key1, value1) in value.asJsonObject.entrySet()) {
+                    customizations.add(
+                        this.parseBackground(
+                            null,
+                            key,
+                            keyList.indexOf(key),
+                            key1,
+                            value1.asJsonObject,
+                        ),
+                    )
+                }
+            }
+        }
+
+        realm.close()
+
+        return customizations
+    }
+
+    private fun parseCustomization(
+        existingCustomizaion: Customization?,
+        type: String?,
+        category: String?,
+        key: String?,
+        entry: JsonObject,
+    ): Customization {
+        var customization = existingCustomizaion
+        if (customization == null) {
+            customization = Customization()
+            customization.identifier = key
+            customization.type = type
+            if (category != null) {
+                customization.category = category
+            }
+        }
+        if (entry.has("price")) {
+            customization.price = entry.get("price").asInt
+        }
+
+        if (entry.has("set")) {
+            val setInfo = entry.get("set").asJsonObject
+            customization.customizationSet = setInfo.get("key").asString
+            if (setInfo.has("setPrice")) {
+                customization.setPrice = setInfo.get("setPrice").asInt
+            }
+            if (setInfo.has("text")) {
+                customization.customizationSetName = setInfo.get("text").asString
+            }
+            val format = SimpleDateFormat("yyyy-MM-dd")
+            try {
+                if (setInfo.has("availableFrom")) {
+                    customization.availableFrom =
+                        format.parse(setInfo.get("availableFrom").asString)
+                }
+                if (setInfo.has("availableUntil")) {
+                    customization.availableUntil =
+                        format.parse(setInfo.get("availableUntil").asString)
+                }
+            } catch (e: Exception) {
+                ExceptionHandler.reportError(e)
+            }
+        }
+
+        return customization
+    }
+
+    private fun parseBackground(
+        existingCustomization: Customization?,
+        setName: String,
+        setCount: Int,
+        key: String?,
+        entry: JsonObject,
+    ): Customization {
+        var customization = existingCustomization
+
+        if (customization == null) {
+            customization = Customization()
+            customization.customizationSet = setName
+            customization.type = "background"
+            customization.identifier = key
+        }
+        when (setName) {
+            "eventBackgrounds" -> {
+                customization.customizationSetName = "EVENT BACKGROUNDS"
+                customization.price = 0
+                customization.setPrice = 0
+                customization.isBuyable = false
+            }
+
+            "incentiveBackgrounds" -> {
+                customization.customizationSetName = "PLAIN BACKGROUND SET"
+                customization.price = 0
+                customization.setPrice = 0
+                customization.isBuyable = false
+            }
+
+            "timeTravelBackgrounds" -> {
+                customization.customizationSetName = "STEAMPUNK BACKGROUNDS"
+                customization.price = 1
+                customization.setPrice = 0
+                customization.isBuyable = false
+            }
+
+            else -> {
+                val readableSetName = "SET ${setCount + 1}: ${
+                    getMonthName(
+                        setName.substring(11, 13).toInt() - 1,
+                    )
+                } ${setName.substring(13, 17)}"
+                customization.customizationSetName = readableSetName
+                customization.customizationSet =
+                    setName.substring(13, 17) + "." + setName.substring(11, 13)
+                customization.price = 7
+                customization.setPrice = 15
+            }
+        }
+
+        customization.text = entry.get("text").asString
+        customization.notes = entry.asJsonObject.get("notes").asString
+
+        return customization
+    }
+
+    private fun getMonthName(month: Int): String {
+        calendar.set(Calendar.MONTH, month)
+        return formatter.format(calendar.time).uppercase()
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/DateDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/DateDeserializer.kt
index ec2e04416..7688d4c3d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/DateDeserializer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/DateDeserializer.kt
@@ -1,84 +1,89 @@
-package com.habitrpg.android.habitica.utils
-
-import android.os.Build
-import com.google.gson.JsonDeserializationContext
-import com.google.gson.JsonDeserializer
-import com.google.gson.JsonElement
-import com.google.gson.JsonPrimitive
-import com.google.gson.JsonSerializationContext
-import com.google.gson.JsonSerializer
-import java.lang.reflect.Type
-import java.text.DateFormat
-import java.text.ParseException
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Locale
-import java.util.TimeZone
-
-class DateDeserializer : JsonDeserializer<Date>, JsonSerializer<Date> {
-
-    private var dateFormats = mutableListOf<DateFormat>()
-
-    init {
-        addFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
-        addFormat("yyyy-MM-dd'T'HH:mm:ss'Z'")
-        addFormat("E MMM dd yyyy HH:mm:ss zzzz")
-        addFormat("yyyy-MM-dd'T'HH:mm:sszzz")
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            addFormat("yyyy-MM-dd'T'HH:mmX")
-        } else {
-            addFormat("yyyy-MM-dd'T'HH:mm")
-        }
-        addFormat("yyyy-MM-dd")
-    }
-
-    private fun addFormat(s: String) {
-        val dateFormat = SimpleDateFormat(s, Locale.US)
-        dateFormat.timeZone = TimeZone.getTimeZone("UTC")
-        dateFormats.add(dateFormat)
-    }
-
-    @Synchronized
-    @Suppress("ReturnCount")
-    override fun deserialize(
-        jsonElement: JsonElement,
-        type: Type,
-        jsonDeserializationContext: JsonDeserializationContext
-    ): Date? {
-        var element = jsonElement
-        if (element.isJsonArray) {
-            if (element.asJsonArray.size() == 0) {
-                return null
-            }
-            element = element.asJsonArray.get(0)
-        }
-        if (element.asString.isEmpty()) {
-            return null
-        }
-        val jsonString = element.asString
-        var date: Date? = null
-        var index = 0
-        while (index < dateFormats.size && date == null) {
-            try {
-                date = dateFormats[index].parse(jsonString)
-            } catch (_: ParseException) {}
-            index += 1
-        }
-        if (date == null) {
-            date = try {
-                Date(element.asLong)
-            } catch (e3: NumberFormatException) {
-                null
-            }
-        }
-        return date
-    }
-
-    override fun serialize(src: Date?, typeOfSrc: Type, context: JsonSerializationContext): JsonElement {
-        return if (src == null) {
-            JsonPrimitive("")
-        } else {
-            JsonPrimitive(this.dateFormats[0].format(src))
-        }
-    }
-}
+package com.habitrpg.android.habitica.utils
+
+import android.os.Build
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonPrimitive
+import com.google.gson.JsonSerializationContext
+import com.google.gson.JsonSerializer
+import java.lang.reflect.Type
+import java.text.DateFormat
+import java.text.ParseException
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+import java.util.TimeZone
+
+class DateDeserializer : JsonDeserializer<Date>, JsonSerializer<Date> {
+    private var dateFormats = mutableListOf<DateFormat>()
+
+    init {
+        addFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
+        addFormat("yyyy-MM-dd'T'HH:mm:ss'Z'")
+        addFormat("E MMM dd yyyy HH:mm:ss zzzz")
+        addFormat("yyyy-MM-dd'T'HH:mm:sszzz")
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            addFormat("yyyy-MM-dd'T'HH:mmX")
+        } else {
+            addFormat("yyyy-MM-dd'T'HH:mm")
+        }
+        addFormat("yyyy-MM-dd")
+    }
+
+    private fun addFormat(s: String) {
+        val dateFormat = SimpleDateFormat(s, Locale.US)
+        dateFormat.timeZone = TimeZone.getTimeZone("UTC")
+        dateFormats.add(dateFormat)
+    }
+
+    @Synchronized
+    @Suppress("ReturnCount")
+    override fun deserialize(
+        jsonElement: JsonElement,
+        type: Type,
+        jsonDeserializationContext: JsonDeserializationContext,
+    ): Date? {
+        var element = jsonElement
+        if (element.isJsonArray) {
+            if (element.asJsonArray.size() == 0) {
+                return null
+            }
+            element = element.asJsonArray.get(0)
+        }
+        if (element.asString.isEmpty()) {
+            return null
+        }
+        val jsonString = element.asString
+        var date: Date? = null
+        var index = 0
+        while (index < dateFormats.size && date == null) {
+            try {
+                date = dateFormats[index].parse(jsonString)
+            } catch (_: ParseException) {
+            }
+            index += 1
+        }
+        if (date == null) {
+            date =
+                try {
+                    Date(element.asLong)
+                } catch (e3: NumberFormatException) {
+                    null
+                }
+        }
+        return date
+    }
+
+    override fun serialize(
+        src: Date?,
+        typeOfSrc: Type,
+        context: JsonSerializationContext,
+    ): JsonElement {
+        return if (src == null) {
+            JsonPrimitive("")
+        } else {
+            JsonPrimitive(this.dateFormats[0].format(src))
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/EquipmentListDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/EquipmentListDeserializer.java
index 366a3009a..35e08c390 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/EquipmentListDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/EquipmentListDeserializer.java
@@ -41,7 +41,7 @@ public class EquipmentListDeserializer implements JsonDeserializer<List<Equipmen
                         item.setCon(parsedItem.getCon());
                         item.setStr(parsedItem.getStr());
                         item.setPer(parsedItem.getPer());
-                        item.set_int(parsedItem.get_int());
+                        item.setIntelligence(parsedItem.getIntelligence());
                         item.setTwoHanded(parsedItem.getTwoHanded());
                         item.setMystery(parsedItem.getMystery());
                         item.setGearSet(parsedItem.getGearSet());
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FAQArticleListDeserilializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FAQArticleListDeserilializer.kt
index a944afbd4..5f078e9de 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FAQArticleListDeserilializer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FAQArticleListDeserilializer.kt
@@ -1,34 +1,37 @@
-package com.habitrpg.android.habitica.utils
-
-import com.google.gson.JsonDeserializationContext
-import com.google.gson.JsonDeserializer
-import com.google.gson.JsonElement
-import com.google.gson.JsonParseException
-import com.habitrpg.android.habitica.models.FAQArticle
-import io.realm.RealmList
-import java.lang.reflect.Type
-
-/**
- * Created by viirus on 22/01/16.
- */
-class FAQArticleListDeserilializer : JsonDeserializer<List<FAQArticle>> {
-
-    @Throws(JsonParseException::class)
-    override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): List<FAQArticle> {
-        val articles = RealmList<FAQArticle>()
-        for ((position, e) in json.asJsonObject.get("questions").asJsonArray.withIndex()) {
-            val obj = e.asJsonObject
-            val article = FAQArticle()
-            article.position = position
-            article.question = obj.get("question").asString
-            if (obj.has("android")) {
-                article.answer = obj.get("android").asString
-            } else {
-                article.answer = obj.get("web").asString
-            }
-            articles.add(article)
-        }
-
-        return articles
-    }
-}
+package com.habitrpg.android.habitica.utils
+
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonParseException
+import com.habitrpg.android.habitica.models.FAQArticle
+import io.realm.RealmList
+import java.lang.reflect.Type
+
+/**
+ * Created by viirus on 22/01/16.
+ */
+class FAQArticleListDeserilializer : JsonDeserializer<List<FAQArticle>> {
+    @Throws(JsonParseException::class)
+    override fun deserialize(
+        json: JsonElement,
+        typeOfT: Type,
+        context: JsonDeserializationContext,
+    ): List<FAQArticle> {
+        val articles = RealmList<FAQArticle>()
+        for ((position, e) in json.asJsonObject.get("questions").asJsonArray.withIndex()) {
+            val obj = e.asJsonObject
+            val article = FAQArticle()
+            article.position = position
+            article.question = obj.get("question").asString
+            if (obj.has("android")) {
+                article.answer = obj.get("android").asString
+            } else {
+                article.answer = obj.get("web").asString
+            }
+            articles.add(article)
+        }
+
+        return articles
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FeedResponseDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FeedResponseDeserializer.kt
index 81b639b99..5f4288cec 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FeedResponseDeserializer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FeedResponseDeserializer.kt
@@ -1,17 +1,21 @@
-package com.habitrpg.android.habitica.utils
-
-import com.google.gson.JsonDeserializationContext
-import com.google.gson.JsonDeserializer
-import com.google.gson.JsonElement
-import com.google.gson.JsonParseException
-import com.habitrpg.shared.habitica.models.responses.FeedResponse
-import java.lang.reflect.Type
-
-class FeedResponseDeserializer : JsonDeserializer<FeedResponse> {
-    @Throws(JsonParseException::class)
-    override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): FeedResponse {
-        val response = FeedResponse()
-        response.value = json.asInt
-        return response
-    }
-}
+package com.habitrpg.android.habitica.utils
+
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonParseException
+import com.habitrpg.shared.habitica.models.responses.FeedResponse
+import java.lang.reflect.Type
+
+class FeedResponseDeserializer : JsonDeserializer<FeedResponse> {
+    @Throws(JsonParseException::class)
+    override fun deserialize(
+        json: JsonElement,
+        typeOfT: Type,
+        context: JsonDeserializationContext,
+    ): FeedResponse {
+        val response = FeedResponse()
+        response.value = json.asInt
+        return response
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FindUsernameResultDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FindUsernameResultDeserializer.kt
index c4709f2e0..a1aade720 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FindUsernameResultDeserializer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FindUsernameResultDeserializer.kt
@@ -11,16 +11,25 @@ import java.lang.reflect.Type
 
 class FindUsernameResultDeserializer : JsonDeserializer<FindUsernameResult> {
     @Throws(JsonParseException::class)
-    override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): FindUsernameResult {
+    override fun deserialize(
+        json: JsonElement,
+        typeOfT: Type,
+        context: JsonDeserializationContext,
+    ): FindUsernameResult {
         val obj = json.asJsonObject
 
         val result = FindUsernameResult()
 
         if (obj.has("contributor")) {
-            result.contributor = context.deserialize<ContributorInfo>(obj.get("contributor"), ContributorInfo::class.java)
+            result.contributor =
+                context.deserialize<ContributorInfo>(
+                    obj.get("contributor"),
+                    ContributorInfo::class.java,
+                )
         }
         if (obj.has("auth")) {
-            result.authentication = context.deserialize<Authentication>(obj.get("auth"), Authentication::class.java)
+            result.authentication =
+                context.deserialize<Authentication>(obj.get("auth"), Authentication::class.java)
         }
 
         return result
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/GroupSerialization.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/GroupSerialization.kt
index f72d4d244..cf171bbf8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/GroupSerialization.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/GroupSerialization.kt
@@ -1,156 +1,168 @@
-package com.habitrpg.android.habitica.utils
-
-import com.google.gson.JsonDeserializationContext
-import com.google.gson.JsonDeserializer
-import com.google.gson.JsonElement
-import com.google.gson.JsonObject
-import com.google.gson.JsonParseException
-import com.google.gson.JsonSerializationContext
-import com.google.gson.JsonSerializer
-import com.google.gson.reflect.TypeToken
-import com.habitrpg.android.habitica.models.inventory.Quest
-import com.habitrpg.android.habitica.models.inventory.QuestRageStrike
-import com.habitrpg.android.habitica.models.members.Member
-import com.habitrpg.android.habitica.models.social.Group
-import com.habitrpg.android.habitica.models.social.GroupCategory
-import com.habitrpg.shared.habitica.models.tasks.TasksOrder
-import io.realm.Realm
-import io.realm.RealmList
-import java.lang.reflect.Type
-
-class GroupSerialization : JsonDeserializer<Group>, JsonSerializer<Group> {
-    @Throws(JsonParseException::class)
-    override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): Group {
-        val group = Group()
-        val obj = json.asJsonObject
-        group.id = obj.get("_id").asString
-        group.name = obj.get("name").asString
-        if (obj.has("description") && !obj.get("description").isJsonNull) {
-            group.description = obj.get("description").asString
-        }
-        if (obj.has("summary") && !obj.get("summary").isJsonNull) {
-            group.summary = obj.get("summary").asString
-        }
-        if (obj.has("leaderMessage") && !obj.get("leaderMessage").isJsonNull) {
-            group.leaderMessage = obj.get("leaderMessage").asString
-        }
-        if (obj.has("privacy")) {
-            group.privacy = obj.get("privacy").asString
-        }
-        if (obj.has("memberCount")) {
-            group.memberCount = obj.get("memberCount").asInt
-        }
-        if (obj.has("balance")) {
-            group.balance = obj.get("balance").asDouble
-        }
-        if (obj.has("logo") && !obj.get("logo").isJsonNull) {
-            group.logo = obj.get("logo").asString
-        }
-        if (obj.has("type")) {
-            group.type = obj.get("type").asString
-        }
-        if (obj.has("leader")) {
-            if (obj.get("leader").isJsonPrimitive) {
-                group.leaderID = obj.get("leader").asString
-            } else {
-                val leader = obj.get("leader").asJsonObject
-                group.leaderID = leader.get("_id").asString
-                if (leader.has("profile") && !leader.get("profile").isJsonNull) {
-                    if (leader.get("profile").asJsonObject.has("name")) {
-                        group.leaderName = leader.get("profile").asJsonObject.get("name").asString
-                    }
-                }
-            }
-        }
-        if (obj.has("managers")) {
-            group.managers = RealmList()
-            for (manager in obj.getAsJsonObject("managers").entrySet()) {
-                if (manager.value.asBoolean) {
-                    group.managers?.add(manager.key)
-                }
-            }
-        }
-        if (obj.has("quest")) {
-            group.quest = context.deserialize(obj.get("quest"), object : TypeToken<Quest>() {}.type)
-            group.quest?.id = group.id
-            val questObject = obj.getAsJsonObject("quest")
-            if (questObject.has("members")) {
-                val members = obj.getAsJsonObject("quest").getAsJsonObject("members")
-                val realm = Realm.getDefaultInstance()
-                val dbMembers = realm.copyFromRealm(realm.where(Member::class.java).equalTo("party.id", group.id).findAll())
-                realm.close()
-                dbMembers.forEach { member ->
-                    if (members.has(member.id)) {
-                        val value = members.get(member.id)
-                        if (value.isJsonNull) {
-                            member.participatesInQuest = null
-                        } else {
-                            member.participatesInQuest = value.asBoolean
-                        }
-                    } else {
-                        member.participatesInQuest = null
-                    }
-                    members.remove(member.id)
-                }
-                members.entrySet().forEach { (key, value) ->
-                    val member = Member()
-                    member.id = key
-                    if (!value.isJsonNull) {
-                        member.participatesInQuest = value.asBoolean
-                    }
-                    dbMembers.add(member)
-                }
-                val newMembers = RealmList<Member>()
-                newMembers.addAll(dbMembers)
-                group.quest?.participants = newMembers
-            }
-
-            if (questObject.has("extra") && questObject["extra"].asJsonObject.has("worldDmg")) {
-                val worldDamageObject = questObject.getAsJsonObject("extra").getAsJsonObject("worldDmg")
-                worldDamageObject.entrySet().forEach { (key, value) ->
-                    val rageStrike = QuestRageStrike(key, value.asBoolean)
-                    group.quest?.addRageStrike(rageStrike)
-                }
-            }
-        }
-
-        if (obj.has("leaderOnly")) {
-            val leaderOnly = obj.getAsJsonObject("leaderOnly")
-            if (leaderOnly.has("challenges")) {
-                group.leaderOnlyChallenges = leaderOnly.get("challenges").asBoolean
-            }
-            if (leaderOnly.has("getGems")) {
-                group.leaderOnlyGetGems = leaderOnly.get("getGems").asBoolean
-            }
-        }
-
-        if (obj.has("tasksOrder")) {
-            group.tasksOrder = context.deserialize(obj.get("tasksOrder"), TasksOrder::class.java)
-        }
-
-        if (obj.has("categories")) {
-            group.categories = RealmList()
-            obj.getAsJsonArray("categories").forEach {
-                group.categories?.add(context.deserialize(it, GroupCategory::class.java))
-            }
-        }
-
-        return group
-    }
-
-    override fun serialize(src: Group, typeOfSrc: Type, context: JsonSerializationContext): JsonElement {
-        val obj = JsonObject()
-        obj.addProperty("name", src.name)
-        obj.addProperty("description", src.description)
-        obj.addProperty("summary", src.summary)
-        obj.addProperty("logo", src.logo)
-        obj.addProperty("type", src.type)
-        obj.addProperty("type", src.type)
-        obj.addProperty("leader", src.leaderID)
-        val leaderOnly = JsonObject()
-        leaderOnly.addProperty("challenges", src.leaderOnlyChallenges)
-        leaderOnly.addProperty("getGems", src.leaderOnlyGetGems)
-        obj.add("leaderOnly", leaderOnly)
-        return obj
-    }
-}
+package com.habitrpg.android.habitica.utils
+
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonObject
+import com.google.gson.JsonParseException
+import com.google.gson.JsonSerializationContext
+import com.google.gson.JsonSerializer
+import com.google.gson.reflect.TypeToken
+import com.habitrpg.android.habitica.models.inventory.Quest
+import com.habitrpg.android.habitica.models.inventory.QuestRageStrike
+import com.habitrpg.android.habitica.models.members.Member
+import com.habitrpg.android.habitica.models.social.Group
+import com.habitrpg.android.habitica.models.social.GroupCategory
+import com.habitrpg.shared.habitica.models.tasks.TasksOrder
+import io.realm.Realm
+import io.realm.RealmList
+import java.lang.reflect.Type
+
+class GroupSerialization : JsonDeserializer<Group>, JsonSerializer<Group> {
+    @Throws(JsonParseException::class)
+    override fun deserialize(
+        json: JsonElement,
+        typeOfT: Type,
+        context: JsonDeserializationContext,
+    ): Group {
+        val group = Group()
+        val obj = json.asJsonObject
+        group.id = obj.get("_id").asString
+        group.name = obj.get("name").asString
+        if (obj.has("description") && !obj.get("description").isJsonNull) {
+            group.description = obj.get("description").asString
+        }
+        if (obj.has("summary") && !obj.get("summary").isJsonNull) {
+            group.summary = obj.get("summary").asString
+        }
+        if (obj.has("leaderMessage") && !obj.get("leaderMessage").isJsonNull) {
+            group.leaderMessage = obj.get("leaderMessage").asString
+        }
+        if (obj.has("privacy")) {
+            group.privacy = obj.get("privacy").asString
+        }
+        if (obj.has("memberCount")) {
+            group.memberCount = obj.get("memberCount").asInt
+        }
+        if (obj.has("balance")) {
+            group.balance = obj.get("balance").asDouble
+        }
+        if (obj.has("logo") && !obj.get("logo").isJsonNull) {
+            group.logo = obj.get("logo").asString
+        }
+        if (obj.has("type")) {
+            group.type = obj.get("type").asString
+        }
+        if (obj.has("leader")) {
+            if (obj.get("leader").isJsonPrimitive) {
+                group.leaderID = obj.get("leader").asString
+            } else {
+                val leader = obj.get("leader").asJsonObject
+                group.leaderID = leader.get("_id").asString
+                if (leader.has("profile") && !leader.get("profile").isJsonNull) {
+                    if (leader.get("profile").asJsonObject.has("name")) {
+                        group.leaderName = leader.get("profile").asJsonObject.get("name").asString
+                    }
+                }
+            }
+        }
+        if (obj.has("managers")) {
+            group.managers = RealmList()
+            for (manager in obj.getAsJsonObject("managers").entrySet()) {
+                if (manager.value.asBoolean) {
+                    group.managers?.add(manager.key)
+                }
+            }
+        }
+        if (obj.has("quest")) {
+            group.quest = context.deserialize(obj.get("quest"), object : TypeToken<Quest>() {}.type)
+            group.quest?.id = group.id
+            val questObject = obj.getAsJsonObject("quest")
+            if (questObject.has("members")) {
+                val members = obj.getAsJsonObject("quest").getAsJsonObject("members")
+                val realm = Realm.getDefaultInstance()
+                val dbMembers =
+                    realm.copyFromRealm(
+                        realm.where(Member::class.java).equalTo("party.id", group.id).findAll(),
+                    )
+                realm.close()
+                dbMembers.forEach { member ->
+                    if (members.has(member.id)) {
+                        val value = members.get(member.id)
+                        if (value.isJsonNull) {
+                            member.participatesInQuest = null
+                        } else {
+                            member.participatesInQuest = value.asBoolean
+                        }
+                    } else {
+                        member.participatesInQuest = null
+                    }
+                    members.remove(member.id)
+                }
+                members.entrySet().forEach { (key, value) ->
+                    val member = Member()
+                    member.id = key
+                    if (!value.isJsonNull) {
+                        member.participatesInQuest = value.asBoolean
+                    }
+                    dbMembers.add(member)
+                }
+                val newMembers = RealmList<Member>()
+                newMembers.addAll(dbMembers)
+                group.quest?.participants = newMembers
+            }
+
+            if (questObject.has("extra") && questObject["extra"].asJsonObject.has("worldDmg")) {
+                val worldDamageObject =
+                    questObject.getAsJsonObject("extra").getAsJsonObject("worldDmg")
+                worldDamageObject.entrySet().forEach { (key, value) ->
+                    val rageStrike = QuestRageStrike(key, value.asBoolean)
+                    group.quest?.addRageStrike(rageStrike)
+                }
+            }
+        }
+
+        if (obj.has("leaderOnly")) {
+            val leaderOnly = obj.getAsJsonObject("leaderOnly")
+            if (leaderOnly.has("challenges")) {
+                group.leaderOnlyChallenges = leaderOnly.get("challenges").asBoolean
+            }
+            if (leaderOnly.has("getGems")) {
+                group.leaderOnlyGetGems = leaderOnly.get("getGems").asBoolean
+            }
+        }
+
+        if (obj.has("tasksOrder")) {
+            group.tasksOrder = context.deserialize(obj.get("tasksOrder"), TasksOrder::class.java)
+        }
+
+        if (obj.has("categories")) {
+            group.categories = RealmList()
+            obj.getAsJsonArray("categories").forEach {
+                group.categories?.add(context.deserialize(it, GroupCategory::class.java))
+            }
+        }
+
+        return group
+    }
+
+    override fun serialize(
+        src: Group,
+        typeOfSrc: Type,
+        context: JsonSerializationContext,
+    ): JsonElement {
+        val obj = JsonObject()
+        obj.addProperty("name", src.name)
+        obj.addProperty("description", src.description)
+        obj.addProperty("summary", src.summary)
+        obj.addProperty("logo", src.logo)
+        obj.addProperty("type", src.type)
+        obj.addProperty("type", src.type)
+        obj.addProperty("leader", src.leaderID)
+        val leaderOnly = JsonObject()
+        leaderOnly.addProperty("challenges", src.leaderOnlyChallenges)
+        leaderOnly.addProperty("getGems", src.leaderOnlyGetGems)
+        obj.add("leaderOnly", leaderOnly)
+        return obj
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MemberSerialization.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MemberSerialization.kt
index 129def0bf..d88a70c4f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MemberSerialization.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MemberSerialization.kt
@@ -22,7 +22,11 @@ import java.lang.reflect.Type
 
 class MemberSerialization : JsonDeserializer<Member> {
     @Throws(JsonParseException::class)
-    override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): Member {
+    override fun deserialize(
+        json: JsonElement,
+        typeOfT: Type,
+        context: JsonDeserializationContext,
+    ): Member {
         val obj = json.asJsonObject
         val id = obj.get("_id").asString
 
@@ -46,7 +50,11 @@ class MemberSerialization : JsonDeserializer<Member> {
             member.inbox = context.deserialize<Inbox>(obj.get("inbox"), Inbox::class.java)
         }
         if (obj.has("preferences")) {
-            member.preferences = context.deserialize<MemberPreferences>(obj.get("preferences"), MemberPreferences::class.java)
+            member.preferences =
+                context.deserialize<MemberPreferences>(
+                    obj.get("preferences"),
+                    MemberPreferences::class.java,
+                )
         }
         if (obj.has("profile")) {
             member.profile = context.deserialize<Profile>(obj.get("profile"), Profile::class.java)
@@ -87,13 +95,18 @@ class MemberSerialization : JsonDeserializer<Member> {
             }
         }
         if (obj.has("contributor")) {
-            member.contributor = context.deserialize<ContributorInfo>(obj.get("contributor"), ContributorInfo::class.java)
+            member.contributor =
+                context.deserialize<ContributorInfo>(
+                    obj.get("contributor"),
+                    ContributorInfo::class.java,
+                )
         }
         if (obj.has("backer")) {
             member.backer = context.deserialize<Backer>(obj.get("backer"), Backer::class.java)
         }
         if (obj.has("auth")) {
-            member.authentication = context.deserialize<Authentication>(obj.get("auth"), Authentication::class.java)
+            member.authentication =
+                context.deserialize<Authentication>(obj.get("auth"), Authentication::class.java)
         }
         if (obj.has("loginIncentives")) {
             member.loginIncentives = obj.get("loginIncentives").asInt
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/NotificationDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/NotificationDeserializer.kt
index 6e7313740..908e6894c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/NotificationDeserializer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/NotificationDeserializer.kt
@@ -9,7 +9,11 @@ import java.lang.reflect.Type
 
 class NotificationDeserializer : JsonDeserializer<Notification> {
     @Throws(JsonParseException::class)
-    override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): Notification {
+    override fun deserialize(
+        json: JsonElement,
+        typeOfT: Type,
+        context: JsonDeserializationContext,
+    ): Notification {
         val notification = Notification()
         val obj = json.asJsonObject
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/OwnedItemListDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/OwnedItemListDeserializer.kt
index 1855fdd2b..4f583aa9f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/OwnedItemListDeserializer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/OwnedItemListDeserializer.kt
@@ -11,7 +11,7 @@ class OwnedItemListDeserializer : JsonDeserializer<List<OwnedItem>> {
     override fun deserialize(
         json: JsonElement?,
         typeOfT: Type?,
-        context: JsonDeserializationContext?
+        context: JsonDeserializationContext?,
     ): List<OwnedItem> {
         val ownedItems = RealmList<OwnedItem>()
         val entrySet = json?.asJsonObject?.entrySet()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/OwnedMountListDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/OwnedMountListDeserializer.kt
index dbf15d270..0453ef3d3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/OwnedMountListDeserializer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/OwnedMountListDeserializer.kt
@@ -11,7 +11,7 @@ class OwnedMountListDeserializer : JsonDeserializer<List<OwnedMount>> {
     override fun deserialize(
         json: JsonElement?,
         typeOfT: Type?,
-        context: JsonDeserializationContext?
+        context: JsonDeserializationContext?,
     ): List<OwnedMount> {
         val ownedItems = RealmList<OwnedMount>()
         val entrySet = json?.asJsonObject?.entrySet()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/OwnedPetListDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/OwnedPetListDeserializer.kt
index 90f7b77d5..842ae5ec9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/OwnedPetListDeserializer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/OwnedPetListDeserializer.kt
@@ -11,7 +11,7 @@ class OwnedPetListDeserializer : JsonDeserializer<List<OwnedPet>> {
     override fun deserialize(
         json: JsonElement?,
         typeOfT: Type?,
-        context: JsonDeserializationContext?
+        context: JsonDeserializationContext?,
     ): List<OwnedPet> {
         val ownedItems = RealmList<OwnedPet>()
         val entrySet = json?.asJsonObject?.entrySet()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestCollectDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestCollectDeserializer.kt
index 20b6ff9b1..5398bc549 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestCollectDeserializer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestCollectDeserializer.kt
@@ -10,7 +10,11 @@ import java.lang.reflect.Type
 
 class QuestCollectDeserializer : JsonDeserializer<RealmList<QuestCollect>> {
     @Throws(JsonParseException::class)
-    override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): RealmList<QuestCollect> {
+    override fun deserialize(
+        json: JsonElement,
+        typeOfT: Type,
+        context: JsonDeserializationContext,
+    ): RealmList<QuestCollect> {
         val items = RealmList<QuestCollect>()
 
         for ((key, value) in json.asJsonObject.entrySet()) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestDeserializer.kt
index eecff35b8..e88d830a7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestDeserializer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestDeserializer.kt
@@ -13,7 +13,11 @@ import java.lang.reflect.Type
 
 class QuestDeserializer : JsonDeserializer<Quest> {
     @Throws(JsonParseException::class)
-    override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): Quest {
+    override fun deserialize(
+        json: JsonElement,
+        typeOfT: Type,
+        context: JsonDeserializationContext,
+    ): Quest {
         val obj = json.asJsonObject
         val quest = Quest()
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestDropItemsListSerialization.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestDropItemsListSerialization.kt
index 199092ed6..d1359fed2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestDropItemsListSerialization.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestDropItemsListSerialization.kt
@@ -10,7 +10,11 @@ import java.lang.reflect.Type
 
 class QuestDropItemsListSerialization : JsonDeserializer<RealmList<QuestDropItem>> {
     @Throws(JsonParseException::class)
-    override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): RealmList<QuestDropItem> {
+    override fun deserialize(
+        json: JsonElement,
+        typeOfT: Type,
+        context: JsonDeserializationContext,
+    ): RealmList<QuestDropItem> {
         val items = RealmList<QuestDropItem>()
         val keys = ArrayList<String>()
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/SkillDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/SkillDeserializer.kt
index 923e83ed9..08003c244 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/SkillDeserializer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/SkillDeserializer.kt
@@ -1,44 +1,43 @@
-package com.habitrpg.android.habitica.utils
-
-import com.google.gson.JsonDeserializationContext
-import com.google.gson.JsonDeserializer
-import com.google.gson.JsonElement
-import com.google.gson.JsonParseException
-import com.habitrpg.android.habitica.models.Skill
-import java.lang.reflect.Type
-
-class SkillDeserializer : JsonDeserializer<List<Skill>> {
-
-    @Throws(JsonParseException::class)
-    override fun deserialize(
-        json: JsonElement,
-        type: Type,
-        context: JsonDeserializationContext
-    ): List<Skill> {
-        val jsonObject = json.asJsonObject
-        val skills = ArrayList<Skill>()
-        for ((classname, value) in jsonObject.entrySet()) {
-            for ((_, value1) in value.asJsonObject.entrySet()) {
-                val skillObject = value1.asJsonObject
-                val skill = Skill()
-                skill.key = skillObject.get("key").asString
-                skill.text = skillObject.get("text").asString
-                skill.notes = skillObject.get("notes").asString
-                skill.key = skillObject.get("key").asString
-                skill.target = skillObject.get("target").asString
-                skill.habitClass = classname
-                skill.mana = skillObject.get("mana").asInt
-
-                val lvlElement = skillObject.get("lvl")
-
-                if (lvlElement != null) {
-                    skill.lvl = lvlElement.asInt
-                }
-
-                skills.add(skill)
-            }
-        }
-
-        return skills
-    }
-}
+package com.habitrpg.android.habitica.utils
+
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonParseException
+import com.habitrpg.android.habitica.models.Skill
+import java.lang.reflect.Type
+
+class SkillDeserializer : JsonDeserializer<List<Skill>> {
+    @Throws(JsonParseException::class)
+    override fun deserialize(
+        json: JsonElement,
+        type: Type,
+        context: JsonDeserializationContext,
+    ): List<Skill> {
+        val jsonObject = json.asJsonObject
+        val skills = ArrayList<Skill>()
+        for ((classname, value) in jsonObject.entrySet()) {
+            for ((_, value1) in value.asJsonObject.entrySet()) {
+                val skillObject = value1.asJsonObject
+                val skill = Skill()
+                skill.key = skillObject.get("key").asString
+                skill.text = skillObject.get("text").asString
+                skill.notes = skillObject.get("notes").asString
+                skill.key = skillObject.get("key").asString
+                skill.target = skillObject.get("target").asString
+                skill.habitClass = classname
+                skill.mana = skillObject.get("mana").asInt
+
+                val lvlElement = skillObject.get("lvl")
+
+                if (lvlElement != null) {
+                    skill.lvl = lvlElement.asInt
+                }
+
+                skills.add(skill)
+            }
+        }
+
+        return skills
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/SocialAuthenticationDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/SocialAuthenticationDeserializer.kt
index 5a935a0b3..5213d8260 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/SocialAuthenticationDeserializer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/SocialAuthenticationDeserializer.kt
@@ -10,7 +10,11 @@ import java.lang.reflect.Type
 
 class SocialAuthenticationDeserializer : JsonDeserializer<SocialAuthentication> {
     @Throws(JsonParseException::class)
-    override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): SocialAuthentication {
+    override fun deserialize(
+        json: JsonElement,
+        typeOfT: Type,
+        context: JsonDeserializationContext,
+    ): SocialAuthentication {
         val authentication = SocialAuthentication()
         val obj = json.asJsonObject
         if (obj.has("emails") && obj.get("emails").isJsonArray) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskListDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskListDeserializer.kt
index add0be87b..618e5b29e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskListDeserializer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskListDeserializer.kt
@@ -1,87 +1,94 @@
-package com.habitrpg.android.habitica.utils
-
-import com.google.firebase.perf.FirebasePerformance
-import com.google.gson.JsonArray
-import com.google.gson.JsonDeserializationContext
-import com.google.gson.JsonDeserializer
-import com.google.gson.JsonElement
-import com.google.gson.JsonObject
-import com.habitrpg.android.habitica.models.Tag
-import com.habitrpg.android.habitica.models.tasks.Task
-import com.habitrpg.android.habitica.models.tasks.TaskList
-import io.realm.Realm
-import io.realm.RealmList
-import java.lang.reflect.Type
-
-class TaskListDeserializer : JsonDeserializer<TaskList> {
-    override fun deserialize(json: JsonElement, typeOfT: Type, ctx: JsonDeserializationContext): TaskList {
-        val tasks = TaskList()
-        val taskMap = HashMap<String, Task>()
-        val deserializeTrace = FirebasePerformance.getInstance().newTrace("TaskListDeserialize")
-        deserializeTrace.start()
-        var databaseTags: List<Tag>
-        try {
-            val realm = Realm.getDefaultInstance()
-            databaseTags = realm.copyFromRealm(realm.where(Tag::class.java).findAll())
-            realm.close()
-        } catch (e: RuntimeException) {
-            // Tests don't have a database
-            databaseTags = ArrayList()
-        }
-
-        for (e in json.asJsonArray) {
-            try {
-                val obj = e as? JsonObject
-                if (obj != null) {
-                    val task = ctx.deserialize<Task>(obj, Task::class.java)
-                    task.tags = handleTags(databaseTags, obj.getAsJsonArray("tags"), ctx)
-                    task.id?.let { taskMap[it] = task }
-                }
-            } catch (ignored: ClassCastException) {
-            } catch (ignored: java.lang.UnsupportedOperationException) {
-            }
-        }
-
-        tasks.tasks = taskMap
-        deserializeTrace.stop()
-        return tasks
-    }
-
-    private fun handleTags(
-        databaseTags: List<Tag>,
-        json: JsonArray?,
-        context: JsonDeserializationContext
-    ): RealmList<Tag> {
-        val tags = RealmList<Tag>()
-        for (tagElement in json ?: listOf<JsonElement>()) {
-            if (tagElement.isJsonObject) {
-                tags.add(context.deserialize(tagElement, Tag::class.java))
-            } else {
-                try {
-                    val tagId = tagElement.asString
-                    for (tag in databaseTags) {
-                        if (tag.id == tagId) {
-                            if (!alreadyContainsTag(tags, tagId)) {
-                                tags.add(tag)
-                            }
-
-                            break
-                        }
-                    }
-                } catch (ignored: UnsupportedOperationException) {
-                }
-            }
-        }
-        return tags
-    }
-
-    private fun alreadyContainsTag(list: List<Tag>, idToCheck: String): Boolean {
-        for (t in list) {
-            if (t.id == idToCheck) {
-                return true
-            }
-        }
-
-        return false
-    }
-}
+package com.habitrpg.android.habitica.utils
+
+import com.google.firebase.perf.FirebasePerformance
+import com.google.gson.JsonArray
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonObject
+import com.habitrpg.android.habitica.models.Tag
+import com.habitrpg.android.habitica.models.tasks.Task
+import com.habitrpg.android.habitica.models.tasks.TaskList
+import io.realm.Realm
+import io.realm.RealmList
+import java.lang.reflect.Type
+
+class TaskListDeserializer : JsonDeserializer<TaskList> {
+    override fun deserialize(
+        json: JsonElement,
+        typeOfT: Type,
+        ctx: JsonDeserializationContext,
+    ): TaskList {
+        val tasks = TaskList()
+        val taskMap = HashMap<String, Task>()
+        val deserializeTrace = FirebasePerformance.getInstance().newTrace("TaskListDeserialize")
+        deserializeTrace.start()
+        var databaseTags: List<Tag>
+        try {
+            val realm = Realm.getDefaultInstance()
+            databaseTags = realm.copyFromRealm(realm.where(Tag::class.java).findAll())
+            realm.close()
+        } catch (e: RuntimeException) {
+            // Tests don't have a database
+            databaseTags = ArrayList()
+        }
+
+        for (e in json.asJsonArray) {
+            try {
+                val obj = e as? JsonObject
+                if (obj != null) {
+                    val task = ctx.deserialize<Task>(obj, Task::class.java)
+                    task.tags = handleTags(databaseTags, obj.getAsJsonArray("tags"), ctx)
+                    task.id?.let { taskMap[it] = task }
+                }
+            } catch (ignored: ClassCastException) {
+            } catch (ignored: java.lang.UnsupportedOperationException) {
+            }
+        }
+
+        tasks.tasks = taskMap
+        deserializeTrace.stop()
+        return tasks
+    }
+
+    private fun handleTags(
+        databaseTags: List<Tag>,
+        json: JsonArray?,
+        context: JsonDeserializationContext,
+    ): RealmList<Tag> {
+        val tags = RealmList<Tag>()
+        for (tagElement in json ?: listOf<JsonElement>()) {
+            if (tagElement.isJsonObject) {
+                tags.add(context.deserialize(tagElement, Tag::class.java))
+            } else {
+                try {
+                    val tagId = tagElement.asString
+                    for (tag in databaseTags) {
+                        if (tag.id == tagId) {
+                            if (!alreadyContainsTag(tags, tagId)) {
+                                tags.add(tag)
+                            }
+
+                            break
+                        }
+                    }
+                } catch (ignored: UnsupportedOperationException) {
+                }
+            }
+        }
+        return tags
+    }
+
+    private fun alreadyContainsTag(
+        list: List<Tag>,
+        idToCheck: String,
+    ): Boolean {
+        for (t in list) {
+            if (t.id == idToCheck) {
+                return true
+            }
+        }
+
+        return false
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskSerializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskSerializer.kt
index b69f579c4..d6c7e4c51 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskSerializer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskSerializer.kt
@@ -1,235 +1,256 @@
-package com.habitrpg.android.habitica.utils
-
-import com.google.gson.JsonArray
-import com.google.gson.JsonDeserializationContext
-import com.google.gson.JsonDeserializer
-import com.google.gson.JsonElement
-import com.google.gson.JsonObject
-import com.google.gson.JsonPrimitive
-import com.google.gson.JsonSerializationContext
-import com.google.gson.JsonSerializer
-import com.habitrpg.android.habitica.extensions.getAsString
-import com.habitrpg.android.habitica.models.tasks.ChecklistItem
-import com.habitrpg.android.habitica.models.tasks.Days
-import com.habitrpg.android.habitica.models.tasks.RemindersItem
-import com.habitrpg.android.habitica.models.tasks.Task
-import com.habitrpg.android.habitica.models.tasks.TaskGroupPlan
-import com.habitrpg.shared.habitica.models.tasks.Attribute
-import com.habitrpg.shared.habitica.models.tasks.Frequency
-import com.habitrpg.shared.habitica.models.tasks.TaskType
-import io.realm.RealmList
-import java.lang.reflect.Type
-import java.util.Date
-
-private val JsonPrimitive.asBooleanOrFalse: Boolean
-    get() = if (isBoolean) {
-        asBoolean
-    } else {
-        false
-    }
-
-class TaskSerializer : JsonSerializer<Task>, JsonDeserializer<Task> {
-
-    private fun getIntListFromJsonArray(jsonArray: JsonArray): List<Int> {
-        val intList = ArrayList<Int>()
-
-        for (i in 0 until jsonArray.size()) {
-            intList.add(jsonArray.get(i).asInt)
-        }
-
-        return intList
-    }
-
-    private fun getMonthlyDays(e: JsonObject, task: Task) {
-        val weeksOfMonth = e.getAsJsonArray("weeksOfMonth")
-        if (weeksOfMonth != null && weeksOfMonth.size() > 0) {
-            task.setWeeksOfMonth(getIntListFromJsonArray(weeksOfMonth))
-        }
-
-        val daysOfMonth = e.getAsJsonArray("daysOfMonth")
-        if (daysOfMonth != null && daysOfMonth.size() > 0) {
-            task.setDaysOfMonth(getIntListFromJsonArray(daysOfMonth))
-        }
-    }
-
-    override fun deserialize(
-        json: JsonElement?,
-        typeOfT: Type?,
-        context: JsonDeserializationContext
-    ): Task {
-        val task = Task()
-        val obj = json as? JsonObject ?: return task
-        task.text = obj.getAsString("text")
-        task.notes = obj.getAsString("notes")
-        task.ownerID = obj.getAsString("userId")
-        task.value = obj.get("value")?.asDouble ?: 0.0
-        task.type = TaskType.from(obj.getAsString("type")) ?: TaskType.HABIT
-        task.frequency = Frequency.from(obj.getAsString("frequency"))
-        task.attribute = Attribute.from(obj.getAsString("attribute"))
-        task.everyX = obj.get("everyX")?.asInt
-        task.priority = obj.get("priority")?.asFloat ?: 1.0f
-        task.completed = obj.get("completed")?.asBoolean ?: false
-        task.up = obj.get("up")?.asBoolean ?: false
-        task.down = obj.get("down")?.asBoolean ?: false
-        task.streak = obj.safeGet("streak")?.asInt
-        if (obj.getAsJsonObject("challenge").has("id")) {
-            task.challengeID = obj.getAsJsonObject("challenge").get("id").asString
-
-            if (obj.getAsJsonObject("challenge").has("broken")) {
-                task.challengeBroken = obj.getAsJsonObject("challenge").get("broken").asString
-            }
-        }
-        try {
-            task.counterUp = obj.get("counterUp")?.asInt
-            task.counterDown = obj.get("counterDown")?.asInt
-        } catch (ignored: java.lang.UnsupportedOperationException) {}
-        task.dateCreated = context.deserialize(obj.get("createdAt"), Date::class.java)
-        task.dueDate = context.deserialize(obj.get("date"), Date::class.java)
-        task.updatedAt = context.deserialize(obj.get("updatedAt"), Date::class.java)
-        task.startDate = context.deserialize(obj.get("startDate"), Date::class.java)
-        task.isDue = obj.get("isDue")?.asBoolean
-        if (obj.has("nextDue")) {
-            task.nextDue = RealmList()
-            for (due in obj.getAsJsonArray("nextDue")) {
-                task.nextDue?.add(context.deserialize(due, Date::class.java))
-            }
-        }
-        if (obj.has("checklist")) {
-            task.checklist = RealmList()
-            for (checklistElement in obj.getAsJsonArray("checklist")) {
-                val checklistObject = checklistElement.asJsonObject
-                task.checklist?.add(
-                    ChecklistItem(
-                        checklistObject.getAsString("id"),
-                        checklistObject.getAsString("text"),
-                        checklistObject.get("completed").asBoolean
-                    )
-                )
-            }
-        }
-        if (obj.has("reminders")) {
-            task.reminders = RealmList()
-            for (reminderElement in obj.getAsJsonArray("reminders")) {
-                val remindersObject = reminderElement.asJsonObject
-                val reminder = RemindersItem()
-                reminder.id = remindersObject.getAsString("id")
-                reminder.startDate = remindersObject.getAsString("startDate")
-                reminder.time = remindersObject.getAsString("time")
-                task.reminders?.add(reminder)
-            }
-        }
-        if (obj.has("repeat")) {
-            task.repeat = context.deserialize(obj.get("repeat"), Days::class.java)
-        }
-
-        if (obj.has("group")) {
-            val groupObject = obj.getAsJsonObject("group")
-            val group: TaskGroupPlan = context.deserialize(groupObject, TaskGroupPlan::class.java)
-            if (group.groupID?.isNotBlank() == true && groupObject.has("approval")) {
-                val approvalObject = groupObject.getAsJsonObject("approval")
-                if (approvalObject.has("requested")) group.approvalRequested = approvalObject.getAsJsonPrimitive("requested").asBooleanOrFalse
-                if (approvalObject.has("approved")) group.approvalApproved = approvalObject.getAsJsonPrimitive("approved").asBooleanOrFalse
-                if (approvalObject.has("required")) group.approvalRequired = approvalObject.getAsJsonPrimitive("required").asBooleanOrFalse
-            }
-            task.group = group
-        }
-        // Work around since Realm does not support Arrays of ints
-        getMonthlyDays(obj, task)
-
-        // Workaround, since gson doesn't call setter methods
-        task.id = obj.getAsString("_id")
-        return task
-    }
-    override fun serialize(task: Task, typeOfSrc: Type, context: JsonSerializationContext): JsonElement {
-        val obj = JsonObject()
-        obj.addProperty("_id", task.id)
-        obj.addProperty("text", task.text)
-        obj.addProperty("notes", task.notes)
-        obj.addProperty("value", task.value)
-        obj.addProperty("priority", task.priority)
-        obj.addProperty("attribute", task.attribute?.value)
-        obj.addProperty("type", task.type?.value)
-        val tagsList = JsonArray()
-        task.tags?.forEach { tag ->
-            tagsList.add(tag.id)
-        }
-        obj.add("tags", tagsList)
-        when (task.type) {
-            TaskType.HABIT -> {
-                obj.addProperty("up", task.up)
-                obj.addProperty("down", task.down)
-                obj.addProperty("frequency", task.frequency?.value)
-                obj.addProperty("counterUp", task.counterUp)
-                obj.addProperty("counterDown", task.counterDown)
-            }
-            TaskType.DAILY -> {
-                obj.addProperty("frequency", task.frequency?.value)
-                obj.addProperty("everyX", task.everyX)
-                obj.add("repeat", context.serialize(task.repeat))
-                obj.add("startDate", context.serialize(task.startDate))
-                obj.addProperty("streak", task.streak)
-                if (task.checklist != null) {
-                    obj.add("checklist", serializeChecklist(task.checklist))
-                }
-                if (task.reminders != null) {
-                    obj.add("reminders", serializeReminders(task.reminders))
-                }
-                obj.add("reminders", context.serialize(task.reminders))
-                obj.add("daysOfMonth", context.serialize(task.getDaysOfMonth()))
-                obj.add("weeksOfMonth", context.serialize(task.getWeeksOfMonth()))
-                obj.addProperty("completed", task.completed)
-            }
-            TaskType.TODO -> {
-                if (task.dueDate == null) {
-                    obj.addProperty("date", "")
-                } else {
-                    obj.add("date", context.serialize(task.dueDate))
-                }
-                if (task.checklist != null) {
-                    obj.add("checklist", serializeChecklist(task.checklist))
-                }
-                if (task.reminders != null) {
-                    obj.add("reminders", serializeReminders(task.reminders))
-                }
-                obj.addProperty("completed", task.completed)
-            }
-            else -> {
-            }
-        }
-
-        return obj
-    }
-
-    private fun serializeChecklist(checklist: List<ChecklistItem>?): JsonArray {
-        val jsonArray = JsonArray()
-        checklist?.forEach { item ->
-            val jsonObject = JsonObject()
-            jsonObject.addProperty("text", item.text)
-            jsonObject.addProperty("id", item.id)
-            jsonObject.addProperty("completed", item.completed)
-            jsonArray.add(jsonObject)
-        }
-        return jsonArray
-    }
-
-    private fun serializeReminders(reminders: List<RemindersItem>?): JsonArray {
-        val jsonArray = JsonArray()
-        reminders?.forEach { item ->
-            val jsonObject = JsonObject()
-            jsonObject.addProperty("id", item.id)
-            if (item.startDate != null) {
-                jsonObject.addProperty("startDate", item.startDate)
-            }
-            jsonObject.addProperty("time", item.time)
-            jsonArray.add(jsonObject)
-        }
-        return jsonArray
-    }
-}
-
-private fun JsonObject.safeGet(key: String): JsonElement? {
-    if (has("streak") && !get(key).isJsonNull) {
-        return get(key)
-    }
-    return null
-}
+package com.habitrpg.android.habitica.utils
+
+import com.google.gson.JsonArray
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonObject
+import com.google.gson.JsonPrimitive
+import com.google.gson.JsonSerializationContext
+import com.google.gson.JsonSerializer
+import com.habitrpg.android.habitica.extensions.getAsString
+import com.habitrpg.android.habitica.models.tasks.ChecklistItem
+import com.habitrpg.android.habitica.models.tasks.Days
+import com.habitrpg.android.habitica.models.tasks.RemindersItem
+import com.habitrpg.android.habitica.models.tasks.Task
+import com.habitrpg.android.habitica.models.tasks.TaskGroupPlan
+import com.habitrpg.shared.habitica.models.tasks.Attribute
+import com.habitrpg.shared.habitica.models.tasks.Frequency
+import com.habitrpg.shared.habitica.models.tasks.TaskType
+import io.realm.RealmList
+import java.lang.reflect.Type
+import java.util.Date
+
+private val JsonPrimitive.asBooleanOrFalse: Boolean
+    get() =
+        if (isBoolean) {
+            asBoolean
+        } else {
+            false
+        }
+
+class TaskSerializer : JsonSerializer<Task>, JsonDeserializer<Task> {
+    private fun getIntListFromJsonArray(jsonArray: JsonArray): List<Int> {
+        val intList = ArrayList<Int>()
+
+        for (i in 0 until jsonArray.size()) {
+            intList.add(jsonArray.get(i).asInt)
+        }
+
+        return intList
+    }
+
+    private fun getMonthlyDays(
+        e: JsonObject,
+        task: Task,
+    ) {
+        val weeksOfMonth = e.getAsJsonArray("weeksOfMonth")
+        if (weeksOfMonth != null && weeksOfMonth.size() > 0) {
+            task.setWeeksOfMonth(getIntListFromJsonArray(weeksOfMonth))
+        }
+
+        val daysOfMonth = e.getAsJsonArray("daysOfMonth")
+        if (daysOfMonth != null && daysOfMonth.size() > 0) {
+            task.setDaysOfMonth(getIntListFromJsonArray(daysOfMonth))
+        }
+    }
+
+    override fun deserialize(
+        json: JsonElement?,
+        typeOfT: Type?,
+        context: JsonDeserializationContext,
+    ): Task {
+        val task = Task()
+        val obj = json as? JsonObject ?: return task
+        task.text = obj.getAsString("text")
+        task.notes = obj.getAsString("notes")
+        task.ownerID = obj.getAsString("userId")
+        task.value = obj.get("value")?.asDouble ?: 0.0
+        task.type = TaskType.from(obj.getAsString("type")) ?: TaskType.HABIT
+        task.frequency = Frequency.from(obj.getAsString("frequency"))
+        task.attribute = Attribute.from(obj.getAsString("attribute"))
+        task.everyX = obj.get("everyX")?.asInt
+        task.priority = obj.get("priority")?.asFloat ?: 1.0f
+        task.completed = obj.get("completed")?.asBoolean ?: false
+        task.up = obj.get("up")?.asBoolean ?: false
+        task.down = obj.get("down")?.asBoolean ?: false
+        task.streak = obj.safeGet("streak")?.asInt
+        if (obj.getAsJsonObject("challenge").has("id")) {
+            task.challengeID = obj.getAsJsonObject("challenge").get("id").asString
+
+            if (obj.getAsJsonObject("challenge").has("broken")) {
+                task.challengeBroken = obj.getAsJsonObject("challenge").get("broken").asString
+            }
+        }
+        try {
+            task.counterUp = obj.get("counterUp")?.asInt
+            task.counterDown = obj.get("counterDown")?.asInt
+        } catch (ignored: java.lang.UnsupportedOperationException) {
+        }
+        task.dateCreated = context.deserialize(obj.get("createdAt"), Date::class.java)
+        task.dueDate = context.deserialize(obj.get("date"), Date::class.java)
+        task.updatedAt = context.deserialize(obj.get("updatedAt"), Date::class.java)
+        task.startDate = context.deserialize(obj.get("startDate"), Date::class.java)
+        task.isDue = obj.get("isDue")?.asBoolean
+        if (obj.has("nextDue")) {
+            task.nextDue = RealmList()
+            for (due in obj.getAsJsonArray("nextDue")) {
+                task.nextDue?.add(context.deserialize(due, Date::class.java))
+            }
+        }
+        if (obj.has("checklist")) {
+            task.checklist = RealmList()
+            for (checklistElement in obj.getAsJsonArray("checklist")) {
+                val checklistObject = checklistElement.asJsonObject
+                task.checklist?.add(
+                    ChecklistItem(
+                        checklistObject.getAsString("id"),
+                        checklistObject.getAsString("text"),
+                        checklistObject.get("completed").asBoolean,
+                    ),
+                )
+            }
+        }
+        if (obj.has("reminders")) {
+            task.reminders = RealmList()
+            for (reminderElement in obj.getAsJsonArray("reminders")) {
+                val remindersObject = reminderElement.asJsonObject
+                val reminder = RemindersItem()
+                reminder.id = remindersObject.getAsString("id")
+                reminder.startDate = remindersObject.getAsString("startDate")
+                reminder.time = remindersObject.getAsString("time")
+                task.reminders?.add(reminder)
+            }
+        }
+        if (obj.has("repeat")) {
+            task.repeat = context.deserialize(obj.get("repeat"), Days::class.java)
+        }
+
+        if (obj.has("group")) {
+            val groupObject = obj.getAsJsonObject("group")
+            val group: TaskGroupPlan = context.deserialize(groupObject, TaskGroupPlan::class.java)
+            if (group.groupID?.isNotBlank() == true && groupObject.has("approval")) {
+                val approvalObject = groupObject.getAsJsonObject("approval")
+                if (approvalObject.has("requested")) {
+                    group.approvalRequested =
+                        approvalObject.getAsJsonPrimitive("requested").asBooleanOrFalse
+                }
+                if (approvalObject.has("approved")) {
+                    group.approvalApproved =
+                        approvalObject.getAsJsonPrimitive("approved").asBooleanOrFalse
+                }
+                if (approvalObject.has("required")) {
+                    group.approvalRequired =
+                        approvalObject.getAsJsonPrimitive("required").asBooleanOrFalse
+                }
+            }
+            task.group = group
+        }
+        // Work around since Realm does not support Arrays of ints
+        getMonthlyDays(obj, task)
+
+        // Workaround, since gson doesn't call setter methods
+        task.id = obj.getAsString("_id")
+        return task
+    }
+
+    override fun serialize(
+        task: Task,
+        typeOfSrc: Type,
+        context: JsonSerializationContext,
+    ): JsonElement {
+        val obj = JsonObject()
+        obj.addProperty("_id", task.id)
+        obj.addProperty("text", task.text)
+        obj.addProperty("notes", task.notes)
+        obj.addProperty("value", task.value)
+        obj.addProperty("priority", task.priority)
+        obj.addProperty("attribute", task.attribute?.value)
+        obj.addProperty("type", task.type?.value)
+        val tagsList = JsonArray()
+        task.tags?.forEach { tag ->
+            tagsList.add(tag.id)
+        }
+        obj.add("tags", tagsList)
+        when (task.type) {
+            TaskType.HABIT -> {
+                obj.addProperty("up", task.up)
+                obj.addProperty("down", task.down)
+                obj.addProperty("frequency", task.frequency?.value)
+                obj.addProperty("counterUp", task.counterUp)
+                obj.addProperty("counterDown", task.counterDown)
+            }
+
+            TaskType.DAILY -> {
+                obj.addProperty("frequency", task.frequency?.value)
+                obj.addProperty("everyX", task.everyX)
+                obj.add("repeat", context.serialize(task.repeat))
+                obj.add("startDate", context.serialize(task.startDate))
+                obj.addProperty("streak", task.streak)
+                if (task.checklist != null) {
+                    obj.add("checklist", serializeChecklist(task.checklist))
+                }
+                if (task.reminders != null) {
+                    obj.add("reminders", serializeReminders(task.reminders))
+                }
+                obj.add("reminders", context.serialize(task.reminders))
+                obj.add("daysOfMonth", context.serialize(task.getDaysOfMonth()))
+                obj.add("weeksOfMonth", context.serialize(task.getWeeksOfMonth()))
+                obj.addProperty("completed", task.completed)
+            }
+
+            TaskType.TODO -> {
+                if (task.dueDate == null) {
+                    obj.addProperty("date", "")
+                } else {
+                    obj.add("date", context.serialize(task.dueDate))
+                }
+                if (task.checklist != null) {
+                    obj.add("checklist", serializeChecklist(task.checklist))
+                }
+                if (task.reminders != null) {
+                    obj.add("reminders", serializeReminders(task.reminders))
+                }
+                obj.addProperty("completed", task.completed)
+            }
+
+            else -> {
+            }
+        }
+
+        return obj
+    }
+
+    private fun serializeChecklist(checklist: List<ChecklistItem>?): JsonArray {
+        val jsonArray = JsonArray()
+        checklist?.forEach { item ->
+            val jsonObject = JsonObject()
+            jsonObject.addProperty("text", item.text)
+            jsonObject.addProperty("id", item.id)
+            jsonObject.addProperty("completed", item.completed)
+            jsonArray.add(jsonObject)
+        }
+        return jsonArray
+    }
+
+    private fun serializeReminders(reminders: List<RemindersItem>?): JsonArray {
+        val jsonArray = JsonArray()
+        reminders?.forEach { item ->
+            val jsonObject = JsonObject()
+            jsonObject.addProperty("id", item.id)
+            if (item.startDate != null) {
+                jsonObject.addProperty("startDate", item.startDate)
+            }
+            jsonObject.addProperty("time", item.time)
+            jsonArray.add(jsonObject)
+        }
+        return jsonArray
+    }
+}
+
+private fun JsonObject.safeGet(key: String): JsonElement? {
+    if (has("streak") && !get(key).isJsonNull) {
+        return get(key)
+    }
+    return null
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskTagDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskTagDeserializer.kt
index e3ddefceb..5e5bd606b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskTagDeserializer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskTagDeserializer.kt
@@ -1,60 +1,67 @@
-package com.habitrpg.android.habitica.utils
-
-import com.google.gson.JsonDeserializationContext
-import com.google.gson.JsonDeserializer
-import com.google.gson.JsonElement
-import com.google.gson.JsonParseException
-import com.habitrpg.android.habitica.models.Tag
-import io.realm.Realm
-import io.realm.RealmList
-import java.lang.reflect.Type
-
-class TaskTagDeserializer : JsonDeserializer<List<Tag>> {
-    @Throws(JsonParseException::class)
-    override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): List<Tag> {
-        val tags = RealmList<Tag>()
-        var databaseTags: List<Tag>
-        try {
-            val realm = Realm.getDefaultInstance()
-            databaseTags = realm.copyFromRealm(realm.where(Tag::class.java).findAll())
-            realm.close()
-        } catch (e: RuntimeException) {
-            // Tests don't have a database
-            databaseTags = ArrayList()
-        }
-
-        if (json.isJsonArray) {
-            for (tagElement in json.asJsonArray) {
-                if (tagElement.isJsonObject) {
-                    tags.add(context.deserialize<Tag>(tagElement, Tag::class.java))
-                } else {
-                    try {
-                        val tagId = tagElement.asString
-                        for (tag in databaseTags) {
-                            if (tag.id == tagId) {
-                                if (!alreadyContainsTag(tags, tagId)) {
-                                    tags.add(tag)
-                                }
-
-                                break
-                            }
-                        }
-                    } catch (ignored: UnsupportedOperationException) {
-                    }
-                }
-            }
-        }
-
-        return tags
-    }
-
-    private fun alreadyContainsTag(list: List<Tag>, idToCheck: String): Boolean {
-        for (t in list) {
-            if (t.id == idToCheck) {
-                return true
-            }
-        }
-
-        return false
-    }
-}
+package com.habitrpg.android.habitica.utils
+
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonParseException
+import com.habitrpg.android.habitica.models.Tag
+import io.realm.Realm
+import io.realm.RealmList
+import java.lang.reflect.Type
+
+class TaskTagDeserializer : JsonDeserializer<List<Tag>> {
+    @Throws(JsonParseException::class)
+    override fun deserialize(
+        json: JsonElement,
+        typeOfT: Type,
+        context: JsonDeserializationContext,
+    ): List<Tag> {
+        val tags = RealmList<Tag>()
+        var databaseTags: List<Tag>
+        try {
+            val realm = Realm.getDefaultInstance()
+            databaseTags = realm.copyFromRealm(realm.where(Tag::class.java).findAll())
+            realm.close()
+        } catch (e: RuntimeException) {
+            // Tests don't have a database
+            databaseTags = ArrayList()
+        }
+
+        if (json.isJsonArray) {
+            for (tagElement in json.asJsonArray) {
+                if (tagElement.isJsonObject) {
+                    tags.add(context.deserialize<Tag>(tagElement, Tag::class.java))
+                } else {
+                    try {
+                        val tagId = tagElement.asString
+                        for (tag in databaseTags) {
+                            if (tag.id == tagId) {
+                                if (!alreadyContainsTag(tags, tagId)) {
+                                    tags.add(tag)
+                                }
+
+                                break
+                            }
+                        }
+                    } catch (ignored: UnsupportedOperationException) {
+                    }
+                }
+            }
+        }
+
+        return tags
+    }
+
+    private fun alreadyContainsTag(
+        list: List<Tag>,
+        idToCheck: String,
+    ): Boolean {
+        for (t in list) {
+            if (t.id == idToCheck) {
+                return true
+            }
+        }
+
+        return false
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TutorialStepListDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TutorialStepListDeserializer.kt
index b7f838f00..c9b0a778e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TutorialStepListDeserializer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TutorialStepListDeserializer.kt
@@ -1,33 +1,40 @@
-package com.habitrpg.android.habitica.utils
-
-import com.google.gson.JsonDeserializationContext
-import com.google.gson.JsonDeserializer
-import com.google.gson.JsonElement
-import com.google.gson.JsonParseException
-import com.habitrpg.android.habitica.models.TutorialStep
-import io.realm.RealmList
-import java.lang.reflect.Type
-
-class TutorialStepListDeserializer : JsonDeserializer<List<TutorialStep>> {
-    @Throws(JsonParseException::class)
-    override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): List<TutorialStep> {
-        val steps = RealmList<TutorialStep>()
-        for (group in listOf("common", "android")) {
-            if (json.asJsonObject.has(group)) {
-                for (entry in json.asJsonObject.get(group).asJsonObject.entrySet()) {
-                    steps.add(parseStep(group, entry))
-                }
-            }
-        }
-
-        return steps
-    }
-
-    private fun parseStep(group: String, entry: MutableMap.MutableEntry<String, JsonElement>): TutorialStep {
-        val article = TutorialStep()
-        article.tutorialGroup = group
-        article.identifier = entry.key
-        article.wasCompleted = entry.value.asBoolean
-        return article
-    }
-}
+package com.habitrpg.android.habitica.utils
+
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonParseException
+import com.habitrpg.android.habitica.models.TutorialStep
+import io.realm.RealmList
+import java.lang.reflect.Type
+
+class TutorialStepListDeserializer : JsonDeserializer<List<TutorialStep>> {
+    @Throws(JsonParseException::class)
+    override fun deserialize(
+        json: JsonElement,
+        typeOfT: Type,
+        context: JsonDeserializationContext,
+    ): List<TutorialStep> {
+        val steps = RealmList<TutorialStep>()
+        for (group in listOf("common", "android")) {
+            if (json.asJsonObject.has(group)) {
+                for (entry in json.asJsonObject.get(group).asJsonObject.entrySet()) {
+                    steps.add(parseStep(group, entry))
+                }
+            }
+        }
+
+        return steps
+    }
+
+    private fun parseStep(
+        group: String,
+        entry: MutableMap.MutableEntry<String, JsonElement>,
+    ): TutorialStep {
+        val article = TutorialStep()
+        article.tutorialGroup = group
+        article.identifier = entry.key
+        article.wasCompleted = entry.value.asBoolean
+        return article
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/UserDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/UserDeserializer.kt
index 43590673a..3050345cd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/UserDeserializer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/UserDeserializer.kt
@@ -37,7 +37,11 @@ import java.util.Date
 
 class UserDeserializer : JsonDeserializer<User> {
     @Throws(JsonParseException::class)
-    override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): User {
+    override fun deserialize(
+        json: JsonElement,
+        typeOfT: Type,
+        context: JsonDeserializationContext,
+    ): User {
         val deserializeTrace = FirebasePerformance.getInstance().newTrace("UserDeserialize")
         deserializeTrace.start()
         val user = User()
@@ -82,7 +86,9 @@ class UserDeserializer : JsonDeserializer<User> {
                 }
                 if (partyObj.getAsJsonObject("quest").has("completed")) {
                     if (!partyObj.getAsJsonObject("quest").get("completed").isJsonNull) {
-                        user.party?.quest?.completed = obj.getAsJsonObject("party").getAsJsonObject("quest").get("completed").asString
+                        user.party?.quest?.completed =
+                            obj.getAsJsonObject("party").getAsJsonObject("quest")
+                                .get("completed").asString
                     }
                 }
             }
@@ -91,7 +97,9 @@ class UserDeserializer : JsonDeserializer<User> {
             user.purchased = context.deserialize(obj.get("purchased"), Purchases::class.java)
             if (obj.getAsJsonObject("purchased").has("plan")) {
                 if (obj.getAsJsonObject("purchased").getAsJsonObject("plan").has("mysteryItems")) {
-                    user.purchased?.plan?.mysteryItemCount = obj.getAsJsonObject("purchased").getAsJsonObject("plan").getAsJsonArray("mysteryItems").size()
+                    user.purchased?.plan?.mysteryItemCount =
+                        obj.getAsJsonObject("purchased").getAsJsonObject("plan")
+                            .getAsJsonArray("mysteryItems").size()
                 }
             }
         }
@@ -112,7 +120,8 @@ class UserDeserializer : JsonDeserializer<User> {
             user.flags = context.deserialize(obj.get("flags"), Flags::class.java)
         }
         if (obj.has("contributor")) {
-            user.contributor = context.deserialize(obj.get("contributor"), ContributorInfo::class.java)
+            user.contributor =
+                context.deserialize(obj.get("contributor"), ContributorInfo::class.java)
         }
         if (obj.has("backer")) {
             user.backer = context.deserialize<Backer>(obj.get("backer"), Backer::class.java)
@@ -121,11 +130,12 @@ class UserDeserializer : JsonDeserializer<User> {
             user.invitations = context.deserialize(obj.get("invitations"), Invitations::class.java)
         }
         if (obj.has("tags")) {
-            user.tags = context.deserialize(
-                obj.get("tags"),
-                object : TypeToken<RealmList<Tag>>() {
-                }.type
-            )
+            user.tags =
+                context.deserialize(
+                    obj.get("tags"),
+                    object : TypeToken<RealmList<Tag>>() {
+                    }.type,
+                )
             for (tag in user.tags) {
                 tag.userId = user.id
             }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/WorldStateSerialization.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/WorldStateSerialization.kt
index 6362213fe..5e6610fe0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/WorldStateSerialization.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/WorldStateSerialization.kt
@@ -12,11 +12,10 @@ import io.realm.RealmList
 import java.lang.reflect.Type
 
 class WorldStateSerialization : JsonDeserializer<WorldState> {
-
     override fun deserialize(
         json: JsonElement?,
         typeOfT: Type?,
-        context: JsonDeserializationContext?
+        context: JsonDeserializationContext?,
     ): WorldState {
         val state = WorldState()
         val obj = json?.asJsonObject ?: return state
@@ -63,7 +62,8 @@ class WorldStateSerialization : JsonDeserializer<WorldState> {
                 if (obj.has("currentEventList")) {
                     val events = RealmList<WorldStateEvent>()
                     for (element in obj.getAsJsonArray("currentEventList")) {
-                        context?.deserialize<WorldStateEvent>(element, WorldStateEvent::class.java)?.let { events.add(it) }
+                        context?.deserialize<WorldStateEvent>(element, WorldStateEvent::class.java)
+                            ?.let { events.add(it) }
                     }
                     state.events = events
                 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AddTaskWidgetProvider.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AddTaskWidgetProvider.kt
index 081dc9d31..04f6bb246 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AddTaskWidgetProvider.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AddTaskWidgetProvider.kt
@@ -1,77 +1,85 @@
-package com.habitrpg.android.habitica.widget
-
-import android.appwidget.AppWidgetManager
-import android.content.ComponentName
-import android.content.Context
-import android.widget.RemoteViews
-import androidx.preference.PreferenceManager
-import com.habitrpg.android.habitica.R
-import com.habitrpg.shared.habitica.models.tasks.TaskType
-import dagger.hilt.android.AndroidEntryPoint
-
-@AndroidEntryPoint
-class AddTaskWidgetProvider : BaseWidgetProvider() {
-
-    override fun layoutResourceId(): Int {
-        return R.layout.widget_add_task
-    }
-
-    override fun onUpdate(
-        context: Context,
-        appWidgetManager: AppWidgetManager,
-        appWidgetIds: IntArray
-    ) {
-        super.onUpdate(context, appWidgetManager, appWidgetIds)
-        // Get all ids
-        val thisWidget = ComponentName(
-            context,
-            AddTaskWidgetProvider::class.java
-        )
-        val allWidgetIds = appWidgetManager.getAppWidgetIds(thisWidget)
-
-        for (widgetId in allWidgetIds) {
-            val options = appWidgetManager.getAppWidgetOptions(widgetId)
-            appWidgetManager.partiallyUpdateAppWidget(
-                widgetId,
-                sizeRemoteViews(context, options, widgetId)
-            )
-        }
-    }
-
-    override fun configureRemoteViews(
-        remoteViews: RemoteViews,
-        widgetId: Int,
-        columns: Int,
-        rows: Int
-    ): RemoteViews {
-        val selectedTaskType = getSelectedTaskType(widgetId)
-        var addText: String? = ""
-        var backgroundResource = R.drawable.widget_add_habit_background
-        when (selectedTaskType) {
-            TaskType.HABIT -> {
-                addText = context?.resources?.getString(R.string.add_habit)
-                backgroundResource = R.drawable.widget_add_habit_background
-            }
-            TaskType.DAILY -> {
-                addText = context?.resources?.getString(R.string.add_daily)
-                backgroundResource = R.drawable.widget_add_daily_background
-            }
-            TaskType.TODO -> {
-                addText = context?.resources?.getString(R.string.add_todo)
-                backgroundResource = R.drawable.widget_add_todo_background
-            }
-            TaskType.REWARD -> {
-                addText = context?.resources?.getString(R.string.add_reward)
-                backgroundResource = R.drawable.widget_add_reward_background
-            }
-        }
-        remoteViews.setTextViewText(R.id.add_task_text, addText)
-        remoteViews.setInt(R.id.add_task_icon, "setBackgroundResource", backgroundResource)
-        return remoteViews
-    }
-
-    private fun getSelectedTaskType(widgetId: Int): TaskType {
-        val preferences = context?.let { PreferenceManager.getDefaultSharedPreferences(it) }
-        return TaskType.from(preferences?.getString("add_task_widget_$widgetId", TaskType.HABIT.value)) ?: TaskType.HABIT
-    }
-}
+package com.habitrpg.android.habitica.widget
+
+import android.appwidget.AppWidgetManager
+import android.content.ComponentName
+import android.content.Context
+import android.widget.RemoteViews
+import androidx.preference.PreferenceManager
+import com.habitrpg.android.habitica.R
+import com.habitrpg.shared.habitica.models.tasks.TaskType
+import dagger.hilt.android.AndroidEntryPoint
+
+@AndroidEntryPoint
+class AddTaskWidgetProvider : BaseWidgetProvider() {
+    override fun layoutResourceId(): Int {
+        return R.layout.widget_add_task
+    }
+
+    override fun onUpdate(
+        context: Context,
+        appWidgetManager: AppWidgetManager,
+        appWidgetIds: IntArray,
+    ) {
+        super.onUpdate(context, appWidgetManager, appWidgetIds)
+        // Get all ids
+        val thisWidget =
+            ComponentName(
+                context,
+                AddTaskWidgetProvider::class.java,
+            )
+        val allWidgetIds = appWidgetManager.getAppWidgetIds(thisWidget)
+
+        for (widgetId in allWidgetIds) {
+            val options = appWidgetManager.getAppWidgetOptions(widgetId)
+            appWidgetManager.partiallyUpdateAppWidget(
+                widgetId,
+                sizeRemoteViews(context, options, widgetId),
+            )
+        }
+    }
+
+    override fun configureRemoteViews(
+        remoteViews: RemoteViews,
+        widgetId: Int,
+        columns: Int,
+        rows: Int,
+    ): RemoteViews {
+        val selectedTaskType = getSelectedTaskType(widgetId)
+        var addText: String? = ""
+        var backgroundResource = R.drawable.widget_add_habit_background
+        when (selectedTaskType) {
+            TaskType.HABIT -> {
+                addText = context?.resources?.getString(R.string.add_habit)
+                backgroundResource = R.drawable.widget_add_habit_background
+            }
+
+            TaskType.DAILY -> {
+                addText = context?.resources?.getString(R.string.add_daily)
+                backgroundResource = R.drawable.widget_add_daily_background
+            }
+
+            TaskType.TODO -> {
+                addText = context?.resources?.getString(R.string.add_todo)
+                backgroundResource = R.drawable.widget_add_todo_background
+            }
+
+            TaskType.REWARD -> {
+                addText = context?.resources?.getString(R.string.add_reward)
+                backgroundResource = R.drawable.widget_add_reward_background
+            }
+        }
+        remoteViews.setTextViewText(R.id.add_task_text, addText)
+        remoteViews.setInt(R.id.add_task_icon, "setBackgroundResource", backgroundResource)
+        return remoteViews
+    }
+
+    private fun getSelectedTaskType(widgetId: Int): TaskType {
+        val preferences = context?.let { PreferenceManager.getDefaultSharedPreferences(it) }
+        return TaskType.from(
+            preferences?.getString(
+                "add_task_widget_$widgetId",
+                TaskType.HABIT.value,
+            ),
+        ) ?: TaskType.HABIT
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.kt
index d4b032a97..6baefdaa9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.kt
@@ -1,213 +1,213 @@
-package com.habitrpg.android.habitica.widget
-
-import android.app.PendingIntent
-import android.appwidget.AppWidgetManager
-import android.content.ComponentName
-import android.content.Context
-import android.content.Intent
-import android.view.View
-import android.view.ViewGroup
-import android.widget.RemoteViews
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.extensions.withImmutableFlag
-import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.android.habitica.ui.activities.MainActivity
-import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import com.habitrpg.common.habitica.extensions.dpToPx
-import com.habitrpg.common.habitica.helpers.HealthFormatter
-import com.habitrpg.common.habitica.helpers.NumberAbbreviator
-import com.habitrpg.common.habitica.helpers.launchCatching
-import com.habitrpg.common.habitica.views.AvatarView
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.MainScope
-import kotlinx.coroutines.flow.firstOrNull
-import kotlinx.coroutines.launch
-
-@AndroidEntryPoint
-class AvatarStatsWidgetProvider : BaseWidgetProvider() {
-
-    private lateinit var avatarView: AvatarView
-    private var user: User? = null
-    private var appWidgetManager: AppWidgetManager? = null
-
-    private var showManaBar = mutableMapOf<Int, Boolean>()
-    private var showAvatar = mutableMapOf<Int, Boolean>()
-
-    override fun layoutResourceId(): Int {
-        return R.layout.widget_avatar_stats
-    }
-
-    override fun onEnabled(context: Context) {
-        super.onEnabled(context)
-        avatarView = AvatarView(
-            context.applicationContext,
-            showBackground = true,
-            showMount = true,
-            showPet = true
-        )
-
-        MainScope().launchCatching {
-            userRepository.getUser().collect {
-                user = it
-                updateData()
-            }
-        }
-    }
-
-    override fun onUpdate(
-        context: Context,
-        appWidgetManager: AppWidgetManager,
-        appWidgetIds: IntArray
-    ) {
-        super.onUpdate(context, appWidgetManager, appWidgetIds)
-        if (!this::avatarView.isInitialized) {
-            avatarView = AvatarView(
-                context.applicationContext,
-                showBackground = true,
-                showMount = true,
-                showPet = true
-            )
-        }
-        this.appWidgetManager = appWidgetManager
-        this.context = context
-
-        if (user == null) {
-            MainScope().launch {
-                val user = userRepository.getUser().firstOrNull() ?: return@launch
-                this@AvatarStatsWidgetProvider.user = user
-                updateData(appWidgetIds)
-            }
-        } else {
-            updateData()
-        }
-    }
-
-    override fun configureRemoteViews(
-        remoteViews: RemoteViews,
-        widgetId: Int,
-        columns: Int,
-        rows: Int
-    ): RemoteViews {
-        showAvatar[widgetId] = columns > 3
-        if (showAvatar[widgetId] == true) {
-            remoteViews.setViewVisibility(R.id.avatar_view, View.VISIBLE)
-        } else {
-            remoteViews.setViewVisibility(R.id.avatar_view, View.GONE)
-        }
-
-        showManaBar[widgetId] = rows > 1
-        if (rows > 1) {
-            remoteViews.setViewVisibility(R.id.detail_info_view, View.VISIBLE)
-        } else {
-            remoteViews.setViewVisibility(R.id.detail_info_view, View.GONE)
-        }
-
-        return remoteViews
-    }
-
-    private fun updateData(widgetIds: IntArray? = null) {
-        val context = context
-        val appWidgetManager = appWidgetManager
-        val user = user
-        val stats = user?.stats
-        if (user == null || stats == null || context == null || appWidgetManager == null) {
-            return
-        }
-        val thisWidget = ComponentName(context, AvatarStatsWidgetProvider::class.java)
-        val allWidgetIds = widgetIds ?: appWidgetManager.getAppWidgetIds(thisWidget)
-        val currentHealth = HealthFormatter.format(stats.hp ?: 0.0)
-        val currentHealthString = HealthFormatter.formatToString(stats.hp ?: 0.0)
-        val healthValueString = currentHealthString + "/" + stats.maxHealth
-        val expValueString = "" + stats.exp?.toInt() + "/" + stats.toNextLevel
-        val mpValueString = "" + stats.mp?.toInt() + "/" + stats.maxMP
-
-        for (widgetId in allWidgetIds) {
-            val options = appWidgetManager.getAppWidgetOptions(widgetId)
-            val remoteViews = sizeRemoteViews(context, options, widgetId)
-
-            remoteViews.setTextViewText(R.id.TV_hp_value, healthValueString)
-            remoteViews.setTextViewText(R.id.exp_TV_value, expValueString)
-            remoteViews.setTextViewText(R.id.mp_TV_value, mpValueString)
-
-            remoteViews.setImageViewBitmap(
-                R.id.ic_hp_header,
-                HabiticaIconsHelper.imageOfHeartLightBg()
-            )
-            remoteViews.setImageViewBitmap(
-                R.id.ic_exp_header,
-                HabiticaIconsHelper.imageOfExperience()
-            )
-            remoteViews.setImageViewBitmap(R.id.ic_mp_header, HabiticaIconsHelper.imageOfMagic())
-
-            remoteViews.setProgressBar(
-                R.id.hp_bar,
-                stats.maxHealth ?: 0,
-                currentHealth.toInt(),
-                false
-            )
-            remoteViews.setProgressBar(
-                R.id.exp_bar,
-                stats.toNextLevel ?: 0,
-                stats.exp?.toInt() ?: 0,
-                false
-            )
-            remoteViews.setProgressBar(R.id.mp_bar, stats.maxMP ?: 0, stats.mp?.toInt() ?: 0, false)
-            remoteViews.setViewVisibility(
-                R.id.mp_wrapper,
-                if (showManaBar[widgetId] != true || stats.habitClass == null || (
-                    stats.lvl
-                        ?: 0
-                    ) < 10 || user.preferences?.disableClasses == true
-                ) {
-                    View.GONE
-                } else {
-                    View.VISIBLE
-                }
-            )
-
-            remoteViews.setTextViewText(
-                R.id.gold_tv,
-                NumberAbbreviator.abbreviate(context, stats.gp ?: 0.0)
-            )
-            remoteViews.setTextViewText(R.id.gems_tv, (user.balance * 4).toInt().toString())
-            val hourGlassCount = user.hourglassCount
-            if (hourGlassCount == 0) {
-                remoteViews.setViewVisibility(R.id.hourglass_icon, View.GONE)
-                remoteViews.setViewVisibility(R.id.hourglasses_tv, View.GONE)
-            } else {
-                remoteViews.setImageViewBitmap(
-                    R.id.hourglass_icon,
-                    HabiticaIconsHelper.imageOfHourglass()
-                )
-                remoteViews.setViewVisibility(R.id.hourglass_icon, View.VISIBLE)
-                remoteViews.setTextViewText(R.id.hourglasses_tv, hourGlassCount.toString())
-                remoteViews.setViewVisibility(R.id.hourglasses_tv, View.VISIBLE)
-            }
-            remoteViews.setImageViewBitmap(R.id.gem_icon, HabiticaIconsHelper.imageOfGem())
-            remoteViews.setImageViewBitmap(R.id.gold_icon, HabiticaIconsHelper.imageOfGold())
-            remoteViews.setTextViewText(
-                R.id.lvl_tv,
-                context.getString(R.string.user_level, user.stats?.lvl ?: 0)
-            )
-
-            if (showAvatar[widgetId] == true) {
-                avatarView.setAvatar(user)
-                avatarView.onAvatarImageReady { bitmap ->
-                    remoteViews.setImageViewBitmap(R.id.avatar_view, bitmap)
-                    appWidgetManager.partiallyUpdateAppWidget(widgetId, remoteViews)
-                }
-            }
-
-            val openAppIntent = Intent(context.applicationContext, MainActivity::class.java)
-            val openApp = PendingIntent.getActivity(
-                context,
-                0,
-                openAppIntent,
-                withImmutableFlag(PendingIntent.FLAG_UPDATE_CURRENT)
-            )
-            remoteViews.setOnClickPendingIntent(android.R.id.background, openApp)
-
-            appWidgetManager.updateAppWidget(widgetId, remoteViews)
-        }
-    }
-}
+package com.habitrpg.android.habitica.widget
+
+import android.app.PendingIntent
+import android.appwidget.AppWidgetManager
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.view.View
+import android.widget.RemoteViews
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.extensions.withImmutableFlag
+import com.habitrpg.android.habitica.models.user.User
+import com.habitrpg.android.habitica.ui.activities.MainActivity
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
+import com.habitrpg.common.habitica.helpers.HealthFormatter
+import com.habitrpg.common.habitica.helpers.NumberAbbreviator
+import com.habitrpg.common.habitica.helpers.launchCatching
+import com.habitrpg.common.habitica.views.AvatarView
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.launch
+
+@AndroidEntryPoint
+class AvatarStatsWidgetProvider : BaseWidgetProvider() {
+    private lateinit var avatarView: AvatarView
+    private var user: User? = null
+    private var appWidgetManager: AppWidgetManager? = null
+
+    private var showManaBar = mutableMapOf<Int, Boolean>()
+    private var showAvatar = mutableMapOf<Int, Boolean>()
+
+    override fun layoutResourceId(): Int {
+        return R.layout.widget_avatar_stats
+    }
+
+    override fun onEnabled(context: Context) {
+        super.onEnabled(context)
+        avatarView =
+            AvatarView(
+                context.applicationContext,
+                showBackground = true,
+                showMount = true,
+                showPet = true,
+            )
+
+        MainScope().launchCatching {
+            userRepository.getUser().collect {
+                user = it
+                updateData()
+            }
+        }
+    }
+
+    override fun onUpdate(
+        context: Context,
+        appWidgetManager: AppWidgetManager,
+        appWidgetIds: IntArray,
+    ) {
+        super.onUpdate(context, appWidgetManager, appWidgetIds)
+        if (!this::avatarView.isInitialized) {
+            avatarView =
+                AvatarView(
+                    context.applicationContext,
+                    showBackground = true,
+                    showMount = true,
+                    showPet = true,
+                )
+        }
+        this.appWidgetManager = appWidgetManager
+        this.context = context
+
+        if (user == null) {
+            MainScope().launch {
+                val user = userRepository.getUser().firstOrNull() ?: return@launch
+                this@AvatarStatsWidgetProvider.user = user
+                updateData(appWidgetIds)
+            }
+        } else {
+            updateData()
+        }
+    }
+
+    override fun configureRemoteViews(
+        remoteViews: RemoteViews,
+        widgetId: Int,
+        columns: Int,
+        rows: Int,
+    ): RemoteViews {
+        showAvatar[widgetId] = columns > 3
+        if (showAvatar[widgetId] == true) {
+            remoteViews.setViewVisibility(R.id.avatar_view, View.VISIBLE)
+        } else {
+            remoteViews.setViewVisibility(R.id.avatar_view, View.GONE)
+        }
+
+        showManaBar[widgetId] = rows > 1
+        if (rows > 1) {
+            remoteViews.setViewVisibility(R.id.detail_info_view, View.VISIBLE)
+        } else {
+            remoteViews.setViewVisibility(R.id.detail_info_view, View.GONE)
+        }
+
+        return remoteViews
+    }
+
+    private fun updateData(widgetIds: IntArray? = null) {
+        val context = context
+        val appWidgetManager = appWidgetManager
+        val user = user
+        val stats = user?.stats
+        if (user == null || stats == null || context == null || appWidgetManager == null) {
+            return
+        }
+        val thisWidget = ComponentName(context, AvatarStatsWidgetProvider::class.java)
+        val allWidgetIds = widgetIds ?: appWidgetManager.getAppWidgetIds(thisWidget)
+        val currentHealth = HealthFormatter.format(stats.hp ?: 0.0)
+        val currentHealthString = HealthFormatter.formatToString(stats.hp ?: 0.0)
+        val healthValueString = currentHealthString + "/" + stats.maxHealth
+        val expValueString = "" + stats.exp?.toInt() + "/" + stats.toNextLevel
+        val mpValueString = "" + stats.mp?.toInt() + "/" + stats.maxMP
+
+        for (widgetId in allWidgetIds) {
+            val options = appWidgetManager.getAppWidgetOptions(widgetId)
+            val remoteViews = sizeRemoteViews(context, options, widgetId)
+
+            remoteViews.setTextViewText(R.id.TV_hp_value, healthValueString)
+            remoteViews.setTextViewText(R.id.exp_TV_value, expValueString)
+            remoteViews.setTextViewText(R.id.mp_TV_value, mpValueString)
+
+            remoteViews.setImageViewBitmap(
+                R.id.ic_hp_header,
+                HabiticaIconsHelper.imageOfHeartLightBg(),
+            )
+            remoteViews.setImageViewBitmap(
+                R.id.ic_exp_header,
+                HabiticaIconsHelper.imageOfExperience(),
+            )
+            remoteViews.setImageViewBitmap(R.id.ic_mp_header, HabiticaIconsHelper.imageOfMagic())
+
+            remoteViews.setProgressBar(
+                R.id.hp_bar,
+                stats.maxHealth ?: 0,
+                currentHealth.toInt(),
+                false,
+            )
+            remoteViews.setProgressBar(
+                R.id.exp_bar,
+                stats.toNextLevel ?: 0,
+                stats.exp?.toInt() ?: 0,
+                false,
+            )
+            remoteViews.setProgressBar(R.id.mp_bar, stats.maxMP ?: 0, stats.mp?.toInt() ?: 0, false)
+            remoteViews.setViewVisibility(
+                R.id.mp_wrapper,
+                if (showManaBar[widgetId] != true || stats.habitClass == null || (
+                        stats.lvl
+                            ?: 0
+                    ) < 10 || user.preferences?.disableClasses == true
+                ) {
+                    View.GONE
+                } else {
+                    View.VISIBLE
+                },
+            )
+
+            remoteViews.setTextViewText(
+                R.id.gold_tv,
+                NumberAbbreviator.abbreviate(context, stats.gp ?: 0.0),
+            )
+            remoteViews.setTextViewText(R.id.gems_tv, (user.balance * 4).toInt().toString())
+            val hourGlassCount = user.hourglassCount
+            if (hourGlassCount == 0) {
+                remoteViews.setViewVisibility(R.id.hourglass_icon, View.GONE)
+                remoteViews.setViewVisibility(R.id.hourglasses_tv, View.GONE)
+            } else {
+                remoteViews.setImageViewBitmap(
+                    R.id.hourglass_icon,
+                    HabiticaIconsHelper.imageOfHourglass(),
+                )
+                remoteViews.setViewVisibility(R.id.hourglass_icon, View.VISIBLE)
+                remoteViews.setTextViewText(R.id.hourglasses_tv, hourGlassCount.toString())
+                remoteViews.setViewVisibility(R.id.hourglasses_tv, View.VISIBLE)
+            }
+            remoteViews.setImageViewBitmap(R.id.gem_icon, HabiticaIconsHelper.imageOfGem())
+            remoteViews.setImageViewBitmap(R.id.gold_icon, HabiticaIconsHelper.imageOfGold())
+            remoteViews.setTextViewText(
+                R.id.lvl_tv,
+                context.getString(R.string.user_level, user.stats?.lvl ?: 0),
+            )
+
+            if (showAvatar[widgetId] == true) {
+                avatarView.setAvatar(user)
+                avatarView.onAvatarImageReady { bitmap ->
+                    remoteViews.setImageViewBitmap(R.id.avatar_view, bitmap)
+                    appWidgetManager.partiallyUpdateAppWidget(widgetId, remoteViews)
+                }
+            }
+
+            val openAppIntent = Intent(context.applicationContext, MainActivity::class.java)
+            val openApp =
+                PendingIntent.getActivity(
+                    context,
+                    0,
+                    openAppIntent,
+                    withImmutableFlag(PendingIntent.FLAG_UPDATE_CURRENT),
+                )
+            remoteViews.setOnClickPendingIntent(android.R.id.background, openApp)
+
+            appWidgetManager.updateAppWidget(widgetId, remoteViews)
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/BaseWidgetProvider.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/BaseWidgetProvider.kt
index e534b9ec7..9323f995d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/BaseWidgetProvider.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/BaseWidgetProvider.kt
@@ -1,105 +1,131 @@
-package com.habitrpg.android.habitica.widget
-
-import android.appwidget.AppWidgetManager
-import android.appwidget.AppWidgetProvider
-import android.content.Context
-import android.os.Bundle
-import android.widget.RemoteViews
-import android.widget.Toast
-import com.habitrpg.android.habitica.data.UserRepository
-import com.habitrpg.android.habitica.helpers.Analytics
-import com.habitrpg.android.habitica.helpers.EventCategory
-import com.habitrpg.android.habitica.helpers.HitType
-import com.habitrpg.android.habitica.interactors.NotifyUserUseCase
-import com.habitrpg.shared.habitica.models.responses.TaskScoringResult
-import javax.inject.Inject
-
-abstract class BaseWidgetProvider : AppWidgetProvider() {
-
-    @Inject
-    lateinit var userRepository: UserRepository
-
-    protected var context: Context? = null
-
-    /**
-     * Returns number of cells needed for given size of the widget.<br></br>
-     * see http://stackoverflow.com/questions/14270138/dynamically-adjusting-widgets-content-and-layout-to-the-size-the-user-defined-t
-     *
-     * @param size Widget size in dp.
-     * @return Size in number of cells.
-     */
-    private fun getCellsForSize(size: Int): Int {
-        var n = 2
-        while (70 * n - 30 < size) {
-            ++n
-        }
-        return n - 1
-    }
-
-    override fun onAppWidgetOptionsChanged(
-        context: Context,
-        appWidgetManager: AppWidgetManager,
-        appWidgetId: Int,
-        newOptions: Bundle
-    ) {
-        this.context = context
-        val options = appWidgetManager.getAppWidgetOptions(appWidgetId)
-
-        appWidgetManager.partiallyUpdateAppWidget(
-            appWidgetId,
-            sizeRemoteViews(context, options, appWidgetId)
-        )
-
-        super.onAppWidgetOptionsChanged(
-            context,
-            appWidgetManager,
-            appWidgetId,
-            newOptions
-        )
-    }
-
-    fun sizeRemoteViews(context: Context?, options: Bundle, widgetId: Int): RemoteViews {
-        this.context = context
-        val minWidth = options.getInt(AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH)
-        val minHeight = options
-            .getInt(AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT)
-
-        // First find out rows and columns based on width provided.
-        val rows = getCellsForSize(minHeight)
-        val columns = getCellsForSize(minWidth)
-        val remoteViews = RemoteViews(context?.packageName, layoutResourceId())
-
-        return configureRemoteViews(remoteViews, widgetId, columns, rows)
-    }
-
-    protected fun showToastForTaskDirection(context: Context, data: TaskScoringResult?) {
-        if (data != null) {
-            val pair = NotifyUserUseCase.getNotificationAndAddStatsToUserAsText(data.experienceDelta, data.healthDelta, data.goldDelta, data.manaDelta)
-            val toast = Toast.makeText(context, pair.first, Toast.LENGTH_LONG)
-            toast.show()
-        }
-    }
-
-    abstract fun layoutResourceId(): Int
-
-    abstract fun configureRemoteViews(
-        remoteViews: RemoteViews,
-        widgetId: Int,
-        columns: Int,
-        rows: Int
-    ): RemoteViews
-
-    override fun onEnabled(context: Context) {
-        super.onEnabled(context)
-        val additionalData = HashMap<String, Any>()
-        additionalData["identifier"] = this.javaClass.simpleName
-        Analytics.sendEvent("widgets", EventCategory.BEHAVIOUR, HitType.CREATE_WIDGET, additionalData)
-    }
-
-    override fun onDeleted(context: Context, appWidgetIds: IntArray) {
-        val additionalData = HashMap<String, Any>()
-        additionalData["identifier"] = this.javaClass.simpleName
-        Analytics.sendEvent("widgets", EventCategory.BEHAVIOUR, HitType.REMOVE_WIDGET, additionalData)
-        super.onDeleted(context, appWidgetIds)
-    }
-}
+package com.habitrpg.android.habitica.widget
+
+import android.appwidget.AppWidgetManager
+import android.appwidget.AppWidgetProvider
+import android.content.Context
+import android.os.Bundle
+import android.widget.RemoteViews
+import android.widget.Toast
+import com.habitrpg.android.habitica.data.UserRepository
+import com.habitrpg.android.habitica.helpers.Analytics
+import com.habitrpg.android.habitica.helpers.EventCategory
+import com.habitrpg.android.habitica.helpers.HitType
+import com.habitrpg.android.habitica.interactors.NotifyUserUseCase
+import com.habitrpg.shared.habitica.models.responses.TaskScoringResult
+import javax.inject.Inject
+
+abstract class BaseWidgetProvider : AppWidgetProvider() {
+    @Inject
+    lateinit var userRepository: UserRepository
+
+    protected var context: Context? = null
+
+    /**
+     * Returns number of cells needed for given size of the widget.<br></br>
+     * see http://stackoverflow.com/questions/14270138/dynamically-adjusting-widgets-content-and-layout-to-the-size-the-user-defined-t
+     *
+     * @param size Widget size in dp.
+     * @return Size in number of cells.
+     */
+    private fun getCellsForSize(size: Int): Int {
+        var n = 2
+        while (70 * n - 30 < size) {
+            ++n
+        }
+        return n - 1
+    }
+
+    override fun onAppWidgetOptionsChanged(
+        context: Context,
+        appWidgetManager: AppWidgetManager,
+        appWidgetId: Int,
+        newOptions: Bundle,
+    ) {
+        this.context = context
+        val options = appWidgetManager.getAppWidgetOptions(appWidgetId)
+
+        appWidgetManager.partiallyUpdateAppWidget(
+            appWidgetId,
+            sizeRemoteViews(context, options, appWidgetId),
+        )
+
+        super.onAppWidgetOptionsChanged(
+            context,
+            appWidgetManager,
+            appWidgetId,
+            newOptions,
+        )
+    }
+
+    fun sizeRemoteViews(
+        context: Context?,
+        options: Bundle,
+        widgetId: Int,
+    ): RemoteViews {
+        this.context = context
+        val minWidth = options.getInt(AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH)
+        val minHeight =
+            options
+                .getInt(AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT)
+
+        // First find out rows and columns based on width provided.
+        val rows = getCellsForSize(minHeight)
+        val columns = getCellsForSize(minWidth)
+        val remoteViews = RemoteViews(context?.packageName, layoutResourceId())
+
+        return configureRemoteViews(remoteViews, widgetId, columns, rows)
+    }
+
+    protected fun showToastForTaskDirection(
+        context: Context,
+        data: TaskScoringResult?,
+    ) {
+        if (data != null) {
+            val pair =
+                NotifyUserUseCase.getNotificationAndAddStatsToUserAsText(
+                    data.experienceDelta,
+                    data.healthDelta,
+                    data.goldDelta,
+                    data.manaDelta,
+                )
+            val toast = Toast.makeText(context, pair.first, Toast.LENGTH_LONG)
+            toast.show()
+        }
+    }
+
+    abstract fun layoutResourceId(): Int
+
+    abstract fun configureRemoteViews(
+        remoteViews: RemoteViews,
+        widgetId: Int,
+        columns: Int,
+        rows: Int,
+    ): RemoteViews
+
+    override fun onEnabled(context: Context) {
+        super.onEnabled(context)
+        val additionalData = HashMap<String, Any>()
+        additionalData["identifier"] = this.javaClass.simpleName
+        Analytics.sendEvent(
+            "widgets",
+            EventCategory.BEHAVIOUR,
+            HitType.CREATE_WIDGET,
+            additionalData,
+        )
+    }
+
+    override fun onDeleted(
+        context: Context,
+        appWidgetIds: IntArray,
+    ) {
+        val additionalData = HashMap<String, Any>()
+        additionalData["identifier"] = this.javaClass.simpleName
+        Analytics.sendEvent(
+            "widgets",
+            EventCategory.BEHAVIOUR,
+            HitType.REMOVE_WIDGET,
+            additionalData,
+        )
+        super.onDeleted(context, appWidgetIds)
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/DailiesListFactory.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/DailiesListFactory.kt
index 5d481c3ff..4cd8d31ea 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/DailiesListFactory.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/DailiesListFactory.kt
@@ -1,18 +1,23 @@
-package com.habitrpg.android.habitica.widget
-
-import android.content.Context
-import android.content.Intent
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.data.TaskRepository
-import com.habitrpg.android.habitica.data.UserRepository
-import com.habitrpg.shared.habitica.models.tasks.TaskType
-
-class DailiesListFactory(context: Context, intent: Intent, taskRepository: TaskRepository, userRepository: UserRepository) : TaskListFactory(
-    context,
-    intent,
-    TaskType.DAILY,
-    R.layout.widget_dailies_list_row,
-    R.id.dailies_text,
-    taskRepository,
-    userRepository
-)
+package com.habitrpg.android.habitica.widget
+
+import android.content.Context
+import android.content.Intent
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.data.TaskRepository
+import com.habitrpg.android.habitica.data.UserRepository
+import com.habitrpg.shared.habitica.models.tasks.TaskType
+
+class DailiesListFactory(
+    context: Context,
+    intent: Intent,
+    taskRepository: TaskRepository,
+    userRepository: UserRepository,
+) : TaskListFactory(
+        context,
+        intent,
+        TaskType.DAILY,
+        R.layout.widget_dailies_list_row,
+        R.id.dailies_text,
+        taskRepository,
+        userRepository,
+    )
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/DailiesWidgetService.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/DailiesWidgetService.kt
index 303d47a7f..3411cdc97 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/DailiesWidgetService.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/DailiesWidgetService.kt
@@ -9,7 +9,6 @@ import javax.inject.Inject
 
 @AndroidEntryPoint
 class DailiesWidgetService : RemoteViewsService() {
-
     @Inject
     lateinit var taskRepository: TaskRepository
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetProvider.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetProvider.kt
index 2b3c23e6d..7438284d2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetProvider.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetProvider.kt
@@ -1,96 +1,107 @@
-package com.habitrpg.android.habitica.widget
-
-import android.appwidget.AppWidgetManager
-import android.content.ComponentName
-import android.content.Context
-import android.content.Intent
-import android.widget.RemoteViews
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.data.TaskRepository
-import com.habitrpg.common.habitica.helpers.ExceptionHandler
-import com.habitrpg.shared.habitica.models.responses.TaskDirection
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.MainScope
-import kotlinx.coroutines.flow.firstOrNull
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class HabitButtonWidgetProvider : BaseWidgetProvider() {
-    @Inject
-    lateinit var taskRepository: TaskRepository
-
-    override fun layoutResourceId(): Int {
-        return R.layout.widget_habit_button
-    }
-
-    override fun onUpdate(
-        context: Context,
-        appWidgetManager: AppWidgetManager,
-        appWidgetIds: IntArray
-    ) {
-        super.onUpdate(context, appWidgetManager, appWidgetIds)
-        val thisWidget = ComponentName(
-            context,
-            HabitButtonWidgetProvider::class.java
-        )
-        val allWidgetIds = appWidgetManager.getAppWidgetIds(thisWidget)
-
-        for (widgetId in allWidgetIds) {
-            val options = appWidgetManager.getAppWidgetOptions(widgetId)
-            appWidgetManager.partiallyUpdateAppWidget(
-                widgetId,
-                sizeRemoteViews(context, options, widgetId)
-            )
-        }
-
-        // Build the intent to call the service
-        val intent = Intent(context.applicationContext, HabitButtonWidgetService::class.java)
-        intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, allWidgetIds)
-
-        try {
-            context.startService(intent)
-        } catch (ignore: IllegalStateException) {
-        }
-    }
-
-    override fun onReceive(context: Context, intent: Intent) {
-        if (intent.action == HABIT_ACTION) {
-            val mgr = AppWidgetManager.getInstance(context)
-            val appWidgetId = intent.getIntExtra(
-                AppWidgetManager.EXTRA_APPWIDGET_ID,
-                AppWidgetManager.INVALID_APPWIDGET_ID
-            )
-            val taskId = intent.getStringExtra(TASK_ID)
-            val direction = intent.getStringExtra(TASK_DIRECTION)
-
-            val ids = intArrayOf(appWidgetId)
-
-            if (taskId != null) {
-                MainScope().launch(ExceptionHandler.coroutine()) {
-                    val user = userRepository.getUser().firstOrNull()
-                    val response = taskRepository.taskChecked(user, taskId, TaskDirection.UP.text == direction, false, null)
-                    showToastForTaskDirection(context, response)
-                    this@HabitButtonWidgetProvider.onUpdate(context, mgr, ids)
-                }
-            }
-        }
-        super.onReceive(context, intent)
-    }
-
-    override fun configureRemoteViews(
-        remoteViews: RemoteViews,
-        widgetId: Int,
-        columns: Int,
-        rows: Int
-    ): RemoteViews {
-        return remoteViews
-    }
-
-    companion object {
-
-        const val HABIT_ACTION = "com.habitrpg.android.habitica.HABIT_ACTION"
-        const val TASK_ID = "com.habitrpg.android.habitica.TASK_ID_ITEM"
-        const val TASK_DIRECTION = "com.habitrpg.android.habitica.TASK_DIRECTION"
-    }
-}
+package com.habitrpg.android.habitica.widget
+
+import android.appwidget.AppWidgetManager
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.widget.RemoteViews
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.data.TaskRepository
+import com.habitrpg.common.habitica.helpers.ExceptionHandler
+import com.habitrpg.shared.habitica.models.responses.TaskDirection
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class HabitButtonWidgetProvider : BaseWidgetProvider() {
+    @Inject
+    lateinit var taskRepository: TaskRepository
+
+    override fun layoutResourceId(): Int {
+        return R.layout.widget_habit_button
+    }
+
+    override fun onUpdate(
+        context: Context,
+        appWidgetManager: AppWidgetManager,
+        appWidgetIds: IntArray,
+    ) {
+        super.onUpdate(context, appWidgetManager, appWidgetIds)
+        val thisWidget =
+            ComponentName(
+                context,
+                HabitButtonWidgetProvider::class.java,
+            )
+        val allWidgetIds = appWidgetManager.getAppWidgetIds(thisWidget)
+
+        for (widgetId in allWidgetIds) {
+            val options = appWidgetManager.getAppWidgetOptions(widgetId)
+            appWidgetManager.partiallyUpdateAppWidget(
+                widgetId,
+                sizeRemoteViews(context, options, widgetId),
+            )
+        }
+
+        // Build the intent to call the service
+        val intent = Intent(context.applicationContext, HabitButtonWidgetService::class.java)
+        intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, allWidgetIds)
+
+        try {
+            context.startService(intent)
+        } catch (ignore: IllegalStateException) {
+        }
+    }
+
+    override fun onReceive(
+        context: Context,
+        intent: Intent,
+    ) {
+        if (intent.action == HABIT_ACTION) {
+            val mgr = AppWidgetManager.getInstance(context)
+            val appWidgetId =
+                intent.getIntExtra(
+                    AppWidgetManager.EXTRA_APPWIDGET_ID,
+                    AppWidgetManager.INVALID_APPWIDGET_ID,
+                )
+            val taskId = intent.getStringExtra(TASK_ID)
+            val direction = intent.getStringExtra(TASK_DIRECTION)
+
+            val ids = intArrayOf(appWidgetId)
+
+            if (taskId != null) {
+                MainScope().launch(ExceptionHandler.coroutine()) {
+                    val user = userRepository.getUser().firstOrNull()
+                    val response =
+                        taskRepository.taskChecked(
+                            user,
+                            taskId,
+                            TaskDirection.UP.text == direction,
+                            false,
+                            null,
+                        )
+                    showToastForTaskDirection(context, response)
+                    this@HabitButtonWidgetProvider.onUpdate(context, mgr, ids)
+                }
+            }
+        }
+        super.onReceive(context, intent)
+    }
+
+    override fun configureRemoteViews(
+        remoteViews: RemoteViews,
+        widgetId: Int,
+        columns: Int,
+        rows: Int,
+    ): RemoteViews {
+        return remoteViews
+    }
+
+    companion object {
+        const val HABIT_ACTION = "com.habitrpg.android.habitica.HABIT_ACTION"
+        const val TASK_ID = "com.habitrpg.android.habitica.TASK_ID_ITEM"
+        const val TASK_DIRECTION = "com.habitrpg.android.habitica.TASK_DIRECTION"
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.kt
index 21d25685b..978855dc2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.kt
@@ -1,125 +1,150 @@
-package com.habitrpg.android.habitica.widget
-
-import android.app.PendingIntent
-import android.app.Service
-import android.appwidget.AppWidgetManager
-import android.content.ComponentName
-import android.content.Context
-import android.content.Intent
-import android.content.SharedPreferences
-import android.os.IBinder
-import android.text.SpannableStringBuilder
-import android.view.View
-import android.widget.RemoteViews
-import androidx.core.content.ContextCompat
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.data.TaskRepository
-import com.habitrpg.android.habitica.extensions.withImmutableFlag
-import com.habitrpg.android.habitica.models.tasks.Task
-import com.habitrpg.common.habitica.helpers.ExceptionHandler
-import com.habitrpg.common.habitica.helpers.MarkdownParser
-import com.habitrpg.shared.habitica.models.responses.TaskDirection
-import dagger.hilt.android.AndroidEntryPoint
-import dagger.hilt.android.qualifiers.ApplicationContext
-import kotlinx.coroutines.MainScope
-import kotlinx.coroutines.flow.firstOrNull
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-import kotlin.math.min
-
-@AndroidEntryPoint
-class HabitButtonWidgetService : Service() {
-    @Inject
-    lateinit var sharedPreferences: SharedPreferences
-
-    @Inject
-    @ApplicationContext
-    lateinit var context: Context
-
-    @Inject
-    lateinit var taskRepository: TaskRepository
-    private var appWidgetManager: AppWidgetManager? = null
-
-    private var taskMapping = mutableMapOf<String, Int>()
-    private var allWidgetIds: IntArray? = null
-
-    override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
-        this.appWidgetManager = AppWidgetManager.getInstance(this)
-        val thisWidget = ComponentName(this, HabitButtonWidgetProvider::class.java)
-        allWidgetIds = appWidgetManager?.getAppWidgetIds(thisWidget)
-        makeTaskMapping()
-
-        MainScope().launch(ExceptionHandler.coroutine()) {
-            for (taskid in taskMapping.keys) {
-                val task = taskRepository.getUnmanagedTask(taskid).firstOrNull()
-                updateData(task)
-            }
-        }
-
-        stopSelf()
-
-        return START_STICKY
-    }
-
-    private fun updateData(task: Task?) {
-        val remoteViews = RemoteViews(this.packageName, R.layout.widget_habit_button)
-        if (task != null && task.isValid) {
-            val parsedText = MarkdownParser.parseMarkdown(task.text)
-
-            val builder = SpannableStringBuilder(parsedText)
-            remoteViews.setTextViewText(R.id.habit_title, builder.substring(0, min(builder.length, 70)))
-
-            if (task.up != true) {
-                remoteViews.setViewVisibility(R.id.btnPlusWrapper, View.GONE)
-                remoteViews.setOnClickPendingIntent(R.id.btnPlusWrapper, null)
-            } else {
-                remoteViews.setViewVisibility(R.id.btnPlusWrapper, View.VISIBLE)
-                remoteViews.setInt(R.id.btnPlus, "setBackgroundColor", ContextCompat.getColor(context, task.lightTaskColor))
-                remoteViews.setOnClickPendingIntent(R.id.btnPlusWrapper, getPendingIntent(task.id, TaskDirection.UP.text, taskMapping[task.id]!!))
-            }
-            if (task.down != true) {
-                remoteViews.setViewVisibility(R.id.btnMinusWrapper, View.GONE)
-                remoteViews.setOnClickPendingIntent(R.id.btnMinusWrapper, null)
-            } else {
-                remoteViews.setViewVisibility(R.id.btnMinusWrapper, View.VISIBLE)
-                remoteViews.setInt(R.id.btnMinus, "setBackgroundColor", ContextCompat.getColor(context, task.mediumTaskColor))
-                remoteViews.setOnClickPendingIntent(R.id.btnMinusWrapper, getPendingIntent(task.id, TaskDirection.DOWN.text, taskMapping[task.id]!!))
-            }
-            if (taskMapping[task.id] != null) {
-                appWidgetManager?.updateAppWidget(taskMapping[task.id]!!, remoteViews)
-            }
-        }
-    }
-
-    override fun onBind(intent: Intent): IBinder? {
-        return null
-    }
-
-    private fun makeTaskMapping() {
-        this.taskMapping = HashMap()
-        for (widgetId in allWidgetIds!!) {
-            val taskId = getTaskId(widgetId)
-            if (taskId != "") {
-                this.taskMapping[taskId] = widgetId
-            }
-        }
-    }
-
-    private fun getTaskId(widgetId: Int): String {
-        return sharedPreferences.getString("habit_button_widget_$widgetId", "") ?: ""
-    }
-
-    private fun getPendingIntent(taskId: String?, direction: String, widgetId: Int): PendingIntent {
-        val taskIntent = Intent(context, HabitButtonWidgetProvider::class.java)
-        taskIntent.action = HabitButtonWidgetProvider.HABIT_ACTION
-        taskIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, widgetId)
-        taskIntent.putExtra(HabitButtonWidgetProvider.TASK_ID, taskId)
-        taskIntent.putExtra(HabitButtonWidgetProvider.TASK_DIRECTION, direction)
-        return PendingIntent.getBroadcast(
-            context,
-            widgetId + direction.hashCode(),
-            taskIntent,
-            withImmutableFlag(PendingIntent.FLAG_UPDATE_CURRENT)
-        )
-    }
-}
+package com.habitrpg.android.habitica.widget
+
+import android.app.PendingIntent
+import android.app.Service
+import android.appwidget.AppWidgetManager
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.content.SharedPreferences
+import android.os.IBinder
+import android.text.SpannableStringBuilder
+import android.view.View
+import android.widget.RemoteViews
+import androidx.core.content.ContextCompat
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.data.TaskRepository
+import com.habitrpg.android.habitica.extensions.withImmutableFlag
+import com.habitrpg.android.habitica.models.tasks.Task
+import com.habitrpg.common.habitica.helpers.ExceptionHandler
+import com.habitrpg.common.habitica.helpers.MarkdownParser
+import com.habitrpg.shared.habitica.models.responses.TaskDirection
+import dagger.hilt.android.AndroidEntryPoint
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+import kotlin.math.min
+
+@AndroidEntryPoint
+class HabitButtonWidgetService : Service() {
+    @Inject
+    lateinit var sharedPreferences: SharedPreferences
+
+    @Inject
+    @ApplicationContext
+    lateinit var context: Context
+
+    @Inject
+    lateinit var taskRepository: TaskRepository
+    private var appWidgetManager: AppWidgetManager? = null
+
+    private var taskMapping = mutableMapOf<String, Int>()
+    private var allWidgetIds: IntArray? = null
+
+    override fun onStartCommand(
+        intent: Intent,
+        flags: Int,
+        startId: Int,
+    ): Int {
+        this.appWidgetManager = AppWidgetManager.getInstance(this)
+        val thisWidget = ComponentName(this, HabitButtonWidgetProvider::class.java)
+        allWidgetIds = appWidgetManager?.getAppWidgetIds(thisWidget)
+        makeTaskMapping()
+
+        MainScope().launch(ExceptionHandler.coroutine()) {
+            for (taskid in taskMapping.keys) {
+                val task = taskRepository.getUnmanagedTask(taskid).firstOrNull()
+                updateData(task)
+            }
+        }
+
+        stopSelf()
+
+        return START_STICKY
+    }
+
+    private fun updateData(task: Task?) {
+        val remoteViews = RemoteViews(this.packageName, R.layout.widget_habit_button)
+        if (task != null && task.isValid) {
+            val parsedText = MarkdownParser.parseMarkdown(task.text)
+
+            val builder = SpannableStringBuilder(parsedText)
+            remoteViews.setTextViewText(
+                R.id.habit_title,
+                builder.substring(0, min(builder.length, 70)),
+            )
+
+            if (task.up != true) {
+                remoteViews.setViewVisibility(R.id.btnPlusWrapper, View.GONE)
+                remoteViews.setOnClickPendingIntent(R.id.btnPlusWrapper, null)
+            } else {
+                remoteViews.setViewVisibility(R.id.btnPlusWrapper, View.VISIBLE)
+                remoteViews.setInt(
+                    R.id.btnPlus,
+                    "setBackgroundColor",
+                    ContextCompat.getColor(context, task.lightTaskColor),
+                )
+                remoteViews.setOnClickPendingIntent(
+                    R.id.btnPlusWrapper,
+                    getPendingIntent(task.id, TaskDirection.UP.text, taskMapping[task.id]!!),
+                )
+            }
+            if (task.down != true) {
+                remoteViews.setViewVisibility(R.id.btnMinusWrapper, View.GONE)
+                remoteViews.setOnClickPendingIntent(R.id.btnMinusWrapper, null)
+            } else {
+                remoteViews.setViewVisibility(R.id.btnMinusWrapper, View.VISIBLE)
+                remoteViews.setInt(
+                    R.id.btnMinus,
+                    "setBackgroundColor",
+                    ContextCompat.getColor(context, task.mediumTaskColor),
+                )
+                remoteViews.setOnClickPendingIntent(
+                    R.id.btnMinusWrapper,
+                    getPendingIntent(task.id, TaskDirection.DOWN.text, taskMapping[task.id]!!),
+                )
+            }
+            if (taskMapping[task.id] != null) {
+                appWidgetManager?.updateAppWidget(taskMapping[task.id]!!, remoteViews)
+            }
+        }
+    }
+
+    override fun onBind(intent: Intent): IBinder? {
+        return null
+    }
+
+    private fun makeTaskMapping() {
+        this.taskMapping = HashMap()
+        for (widgetId in allWidgetIds!!) {
+            val taskId = getTaskId(widgetId)
+            if (taskId != "") {
+                this.taskMapping[taskId] = widgetId
+            }
+        }
+    }
+
+    private fun getTaskId(widgetId: Int): String {
+        return sharedPreferences.getString("habit_button_widget_$widgetId", "") ?: ""
+    }
+
+    private fun getPendingIntent(
+        taskId: String?,
+        direction: String,
+        widgetId: Int,
+    ): PendingIntent {
+        val taskIntent = Intent(context, HabitButtonWidgetProvider::class.java)
+        taskIntent.action = HabitButtonWidgetProvider.HABIT_ACTION
+        taskIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, widgetId)
+        taskIntent.putExtra(HabitButtonWidgetProvider.TASK_ID, taskId)
+        taskIntent.putExtra(HabitButtonWidgetProvider.TASK_DIRECTION, direction)
+        return PendingIntent.getBroadcast(
+            context,
+            widgetId + direction.hashCode(),
+            taskIntent,
+            withImmutableFlag(PendingIntent.FLAG_UPDATE_CURRENT),
+        )
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListFactory.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListFactory.kt
index 14587e332..883f751b2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListFactory.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListFactory.kt
@@ -1,106 +1,117 @@
-package com.habitrpg.android.habitica.widget
-
-import android.appwidget.AppWidgetManager
-import android.content.Context
-import android.content.Intent
-import android.text.SpannableStringBuilder
-import android.widget.RemoteViews
-import android.widget.RemoteViewsService
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.data.TaskRepository
-import com.habitrpg.android.habitica.data.UserRepository
-import com.habitrpg.android.habitica.models.tasks.Task
-import com.habitrpg.common.habitica.helpers.ExceptionHandler
-import com.habitrpg.common.habitica.helpers.MarkdownParser
-import com.habitrpg.shared.habitica.models.tasks.TaskType
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.SupervisorJob
-import kotlinx.coroutines.flow.firstOrNull
-import kotlinx.coroutines.launch
-
-abstract class TaskListFactory internal constructor(
-    val context: Context,
-    intent: Intent,
-    private val taskType: TaskType,
-    private val listItemResId: Int,
-    private val listItemTextResId: Int,
-    val taskRepository: TaskRepository,
-    val userRepository: UserRepository
-) : RemoteViewsService.RemoteViewsFactory {
-    private val job = SupervisorJob()
-
-    private val widgetId: Int = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, 0)
-    private var taskList: List<Task> = ArrayList()
-    private var reloadData: Boolean = false
-
-    init {
-        this.reloadData = false
-    }
-
-    private fun loadData() {
-        CoroutineScope(Dispatchers.Main + job).launch(ExceptionHandler.coroutine()) {
-            val mirroredTasks = userRepository.getUser().firstOrNull()?.preferences?.tasks?.mirrorGroupTasks?.toTypedArray()
-            val tasks = taskRepository.getTasks(taskType, null, mirroredTasks ?: emptyArray()).firstOrNull()?.filter { task ->
-                task.type == TaskType.TODO && !task.completed || task.isDisplayedActive
-            } ?: return@launch
-            taskList = taskRepository.getTaskCopies(tasks)
-            reloadData = false
-            AppWidgetManager.getInstance(context).notifyAppWidgetViewDataChanged(widgetId, R.id.list_view)
-        }
-    }
-
-    override fun onCreate() {
-        this.loadData()
-    }
-    override fun onDestroy() { /* no-op */ }
-
-    override fun onDataSetChanged() {
-        if (this.reloadData) {
-            this.loadData()
-        }
-        this.reloadData = true
-    }
-
-    override fun getCount(): Int {
-        return taskList.size
-    }
-
-    override fun getViewAt(position: Int): RemoteViews {
-        val remoteView = RemoteViews(context.packageName, listItemResId)
-        if (taskList.size > position) {
-            val task = taskList[position]
-
-            val parsedText = MarkdownParser.parseMarkdown(task.text)
-
-            val builder = SpannableStringBuilder(parsedText)
-
-            remoteView.setTextViewText(listItemTextResId, builder)
-            remoteView.setInt(R.id.checkbox_background, "setBackgroundResource", task.lightTaskColor)
-            val fillInIntent = Intent()
-            fillInIntent.putExtra(TaskListWidgetProvider.TASK_ID_ITEM, task.id)
-            remoteView.setOnClickFillInIntent(R.id.checkbox_background, fillInIntent)
-        }
-        return remoteView
-    }
-
-    override fun getLoadingView(): RemoteViews {
-        return RemoteViews(context.packageName, listItemResId)
-    }
-
-    override fun getViewTypeCount(): Int {
-        return 1
-    }
-
-    override fun getItemId(position: Int): Long {
-        if (taskList.size > position) {
-            val task = taskList[position]
-            return task.id.hashCode().toLong()
-        }
-        return position.toLong()
-    }
-
-    override fun hasStableIds(): Boolean {
-        return true
-    }
-}
+package com.habitrpg.android.habitica.widget
+
+import android.appwidget.AppWidgetManager
+import android.content.Context
+import android.content.Intent
+import android.text.SpannableStringBuilder
+import android.widget.RemoteViews
+import android.widget.RemoteViewsService
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.data.TaskRepository
+import com.habitrpg.android.habitica.data.UserRepository
+import com.habitrpg.android.habitica.models.tasks.Task
+import com.habitrpg.common.habitica.helpers.ExceptionHandler
+import com.habitrpg.common.habitica.helpers.MarkdownParser
+import com.habitrpg.shared.habitica.models.tasks.TaskType
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.launch
+
+abstract class TaskListFactory internal constructor(
+    val context: Context,
+    intent: Intent,
+    private val taskType: TaskType,
+    private val listItemResId: Int,
+    private val listItemTextResId: Int,
+    val taskRepository: TaskRepository,
+    val userRepository: UserRepository,
+) : RemoteViewsService.RemoteViewsFactory {
+    private val job = SupervisorJob()
+
+    private val widgetId: Int = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, 0)
+    private var taskList: List<Task> = ArrayList()
+    private var reloadData: Boolean = false
+
+    init {
+        this.reloadData = false
+    }
+
+    private fun loadData() {
+        CoroutineScope(Dispatchers.Main + job).launch(ExceptionHandler.coroutine()) {
+            val mirroredTasks =
+                userRepository.getUser()
+                    .firstOrNull()?.preferences?.tasks?.mirrorGroupTasks?.toTypedArray()
+            val tasks =
+                taskRepository.getTasks(taskType, null, mirroredTasks ?: emptyArray()).firstOrNull()
+                    ?.filter { task ->
+                        task.type == TaskType.TODO && !task.completed || task.isDisplayedActive
+                    } ?: return@launch
+            taskList = taskRepository.getTaskCopies(tasks)
+            reloadData = false
+            AppWidgetManager.getInstance(context)
+                .notifyAppWidgetViewDataChanged(widgetId, R.id.list_view)
+        }
+    }
+
+    override fun onCreate() {
+        this.loadData()
+    }
+
+    override fun onDestroy() { // no-op
+    }
+
+    override fun onDataSetChanged() {
+        if (this.reloadData) {
+            this.loadData()
+        }
+        this.reloadData = true
+    }
+
+    override fun getCount(): Int {
+        return taskList.size
+    }
+
+    override fun getViewAt(position: Int): RemoteViews {
+        val remoteView = RemoteViews(context.packageName, listItemResId)
+        if (taskList.size > position) {
+            val task = taskList[position]
+
+            val parsedText = MarkdownParser.parseMarkdown(task.text)
+
+            val builder = SpannableStringBuilder(parsedText)
+
+            remoteView.setTextViewText(listItemTextResId, builder)
+            remoteView.setInt(
+                R.id.checkbox_background,
+                "setBackgroundResource",
+                task.lightTaskColor,
+            )
+            val fillInIntent = Intent()
+            fillInIntent.putExtra(TaskListWidgetProvider.TASK_ID_ITEM, task.id)
+            remoteView.setOnClickFillInIntent(R.id.checkbox_background, fillInIntent)
+        }
+        return remoteView
+    }
+
+    override fun getLoadingView(): RemoteViews {
+        return RemoteViews(context.packageName, listItemResId)
+    }
+
+    override fun getViewTypeCount(): Int {
+        return 1
+    }
+
+    override fun getItemId(position: Int): Long {
+        if (taskList.size > position) {
+            val task = taskList[position]
+            return task.id.hashCode().toLong()
+        }
+        return position.toLong()
+    }
+
+    override fun hasStableIds(): Boolean {
+        return true
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListWidgetProvider.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListWidgetProvider.kt
index d5560f9ad..969b4bc5a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListWidgetProvider.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListWidgetProvider.kt
@@ -1,122 +1,141 @@
-package com.habitrpg.android.habitica.widget
-
-import android.app.PendingIntent
-import android.appwidget.AppWidgetManager
-import android.content.ComponentName
-import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import android.widget.RemoteViews
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.data.TaskRepository
-import com.habitrpg.android.habitica.extensions.withImmutableFlag
-import com.habitrpg.android.habitica.extensions.withMutableFlag
-import com.habitrpg.android.habitica.ui.activities.MainActivity
-import com.habitrpg.common.habitica.helpers.ExceptionHandler
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.MainScope
-import kotlinx.coroutines.flow.firstOrNull
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-
-@AndroidEntryPoint
-abstract class TaskListWidgetProvider : BaseWidgetProvider() {
-
-    @Inject
-    lateinit var taskRepository: TaskRepository
-
-    protected abstract val serviceClass: Class<*>
-
-    protected abstract val providerClass: Class<*>
-
-    protected abstract val titleResId: Int
-
-    override fun onReceive(context: Context, intent: Intent) {
-        if (intent.action == DAILY_ACTION) {
-            val appWidgetId = intent.getIntExtra(
-                AppWidgetManager.EXTRA_APPWIDGET_ID,
-                AppWidgetManager.INVALID_APPWIDGET_ID
-            )
-            val taskId = intent.getStringExtra(TASK_ID_ITEM)
-
-            if (taskId != null) {
-                MainScope().launch(ExceptionHandler.coroutine()) {
-                    val user = userRepository.getUser().firstOrNull()
-                    val response = taskRepository.taskChecked(user, taskId, up = true, force = false, notifyFunc = null)
-                    showToastForTaskDirection(context, response)
-                    AppWidgetManager.getInstance(context).notifyAppWidgetViewDataChanged(appWidgetId, R.id.list_view)
-                }
-            }
-        }
-        super.onReceive(context, intent)
-    }
-
-    override fun onUpdate(
-        context: Context,
-        appWidgetManager: AppWidgetManager,
-        appWidgetIds: IntArray
-    ) {
-        super.onUpdate(context, appWidgetManager, appWidgetIds)
-        val thisWidget = ComponentName(context, providerClass)
-        val allWidgetIds = appWidgetManager.getAppWidgetIds(thisWidget)
-
-        for (widgetId in allWidgetIds) {
-            val options = appWidgetManager.getAppWidgetOptions(widgetId)
-            appWidgetManager.partiallyUpdateAppWidget(
-                widgetId,
-                sizeRemoteViews(context, options, widgetId)
-            )
-        }
-
-        for (appWidgetId in appWidgetIds) {
-            val intent = Intent(context, serviceClass)
-            intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId)
-            intent.data = Uri.parse(intent.toUri(Intent.URI_INTENT_SCHEME))
-            val rv = RemoteViews(context.packageName, R.layout.widget_task_list)
-            rv.setRemoteAdapter(R.id.list_view, intent)
-            rv.setEmptyView(R.id.list_view, R.id.emptyView)
-            rv.setTextViewText(R.id.widget_title, context.getString(titleResId))
-
-            // if the user click on the title: open App
-            val openAppIntent = Intent(context.applicationContext, MainActivity::class.java)
-            val openApp = PendingIntent.getActivity(context, 0, openAppIntent, withImmutableFlag(PendingIntent.FLAG_UPDATE_CURRENT))
-            rv.setOnClickPendingIntent(R.id.widget_title, openApp)
-
-            val taskIntent = Intent(context, providerClass)
-            taskIntent.action = DAILY_ACTION
-            taskIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId)
-            intent.data = Uri.parse(intent.toUri(Intent.URI_INTENT_SCHEME))
-            val toastPendingIntent = PendingIntent.getBroadcast(
-                context,
-                0,
-                taskIntent,
-                withMutableFlag(PendingIntent.FLAG_UPDATE_CURRENT)
-            )
-            rv.setPendingIntentTemplate(R.id.list_view, toastPendingIntent)
-
-            appWidgetManager.updateAppWidget(appWidgetId, rv)
-
-            AppWidgetManager.getInstance(context).notifyAppWidgetViewDataChanged(appWidgetId, R.id.list_view)
-        }
-
-        super.onUpdate(context, appWidgetManager, appWidgetIds)
-    }
-
-    override fun layoutResourceId(): Int {
-        return R.layout.widget_task_list
-    }
-
-    override fun configureRemoteViews(
-        remoteViews: RemoteViews,
-        widgetId: Int,
-        columns: Int,
-        rows: Int
-    ): RemoteViews {
-        return remoteViews
-    }
-
-    companion object {
-        const val DAILY_ACTION = "com.habitrpg.android.habitica.DAILY_ACTION"
-        const val TASK_ID_ITEM = "com.habitrpg.android.habitica.TASK_ID_ITEM"
-    }
-}
+package com.habitrpg.android.habitica.widget
+
+import android.app.PendingIntent
+import android.appwidget.AppWidgetManager
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.widget.RemoteViews
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.data.TaskRepository
+import com.habitrpg.android.habitica.extensions.withImmutableFlag
+import com.habitrpg.android.habitica.extensions.withMutableFlag
+import com.habitrpg.android.habitica.ui.activities.MainActivity
+import com.habitrpg.common.habitica.helpers.ExceptionHandler
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@AndroidEntryPoint
+abstract class TaskListWidgetProvider : BaseWidgetProvider() {
+    @Inject
+    lateinit var taskRepository: TaskRepository
+
+    protected abstract val serviceClass: Class<*>
+
+    protected abstract val providerClass: Class<*>
+
+    protected abstract val titleResId: Int
+
+    override fun onReceive(
+        context: Context,
+        intent: Intent,
+    ) {
+        if (intent.action == DAILY_ACTION) {
+            val appWidgetId =
+                intent.getIntExtra(
+                    AppWidgetManager.EXTRA_APPWIDGET_ID,
+                    AppWidgetManager.INVALID_APPWIDGET_ID,
+                )
+            val taskId = intent.getStringExtra(TASK_ID_ITEM)
+
+            if (taskId != null) {
+                MainScope().launch(ExceptionHandler.coroutine()) {
+                    val user = userRepository.getUser().firstOrNull()
+                    val response =
+                        taskRepository.taskChecked(
+                            user,
+                            taskId,
+                            up = true,
+                            force = false,
+                            notifyFunc = null,
+                        )
+                    showToastForTaskDirection(context, response)
+                    AppWidgetManager.getInstance(context)
+                        .notifyAppWidgetViewDataChanged(appWidgetId, R.id.list_view)
+                }
+            }
+        }
+        super.onReceive(context, intent)
+    }
+
+    override fun onUpdate(
+        context: Context,
+        appWidgetManager: AppWidgetManager,
+        appWidgetIds: IntArray,
+    ) {
+        super.onUpdate(context, appWidgetManager, appWidgetIds)
+        val thisWidget = ComponentName(context, providerClass)
+        val allWidgetIds = appWidgetManager.getAppWidgetIds(thisWidget)
+
+        for (widgetId in allWidgetIds) {
+            val options = appWidgetManager.getAppWidgetOptions(widgetId)
+            appWidgetManager.partiallyUpdateAppWidget(
+                widgetId,
+                sizeRemoteViews(context, options, widgetId),
+            )
+        }
+
+        for (appWidgetId in appWidgetIds) {
+            val intent = Intent(context, serviceClass)
+            intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId)
+            intent.data = Uri.parse(intent.toUri(Intent.URI_INTENT_SCHEME))
+            val rv = RemoteViews(context.packageName, R.layout.widget_task_list)
+            rv.setRemoteAdapter(R.id.list_view, intent)
+            rv.setEmptyView(R.id.list_view, R.id.emptyView)
+            rv.setTextViewText(R.id.widget_title, context.getString(titleResId))
+
+            // if the user click on the title: open App
+            val openAppIntent = Intent(context.applicationContext, MainActivity::class.java)
+            val openApp =
+                PendingIntent.getActivity(
+                    context,
+                    0,
+                    openAppIntent,
+                    withImmutableFlag(PendingIntent.FLAG_UPDATE_CURRENT),
+                )
+            rv.setOnClickPendingIntent(R.id.widget_title, openApp)
+
+            val taskIntent = Intent(context, providerClass)
+            taskIntent.action = DAILY_ACTION
+            taskIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId)
+            intent.data = Uri.parse(intent.toUri(Intent.URI_INTENT_SCHEME))
+            val toastPendingIntent =
+                PendingIntent.getBroadcast(
+                    context,
+                    0,
+                    taskIntent,
+                    withMutableFlag(PendingIntent.FLAG_UPDATE_CURRENT),
+                )
+            rv.setPendingIntentTemplate(R.id.list_view, toastPendingIntent)
+
+            appWidgetManager.updateAppWidget(appWidgetId, rv)
+
+            AppWidgetManager.getInstance(context)
+                .notifyAppWidgetViewDataChanged(appWidgetId, R.id.list_view)
+        }
+
+        super.onUpdate(context, appWidgetManager, appWidgetIds)
+    }
+
+    override fun layoutResourceId(): Int {
+        return R.layout.widget_task_list
+    }
+
+    override fun configureRemoteViews(
+        remoteViews: RemoteViews,
+        widgetId: Int,
+        columns: Int,
+        rows: Int,
+    ): RemoteViews {
+        return remoteViews
+    }
+
+    companion object {
+        const val DAILY_ACTION = "com.habitrpg.android.habitica.DAILY_ACTION"
+        const val TASK_ID_ITEM = "com.habitrpg.android.habitica.TASK_ID_ITEM"
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TodoListFactory.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TodoListFactory.kt
index a00eefa7a..1f7375f5c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TodoListFactory.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TodoListFactory.kt
@@ -1,15 +1,23 @@
-package com.habitrpg.android.habitica.widget
-
-import android.content.Context
-import android.content.Intent
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.data.TaskRepository
-import com.habitrpg.android.habitica.data.UserRepository
-import com.habitrpg.shared.habitica.models.tasks.TaskType
-
-class TodoListFactory(
-    context: Context,
-    intent: Intent,
-    taskRepository: TaskRepository,
-    userRepository: UserRepository
-) : TaskListFactory(context, intent, TaskType.TODO, R.layout.widget_todo_list_row, R.id.todo_text, taskRepository, userRepository)
+package com.habitrpg.android.habitica.widget
+
+import android.content.Context
+import android.content.Intent
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.data.TaskRepository
+import com.habitrpg.android.habitica.data.UserRepository
+import com.habitrpg.shared.habitica.models.tasks.TaskType
+
+class TodoListFactory(
+    context: Context,
+    intent: Intent,
+    taskRepository: TaskRepository,
+    userRepository: UserRepository,
+) : TaskListFactory(
+        context,
+        intent,
+        TaskType.TODO,
+        R.layout.widget_todo_list_row,
+        R.id.todo_text,
+        taskRepository,
+        userRepository,
+    )
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TodosWidgetService.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TodosWidgetService.kt
index 8dcfc892f..514510cf9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TodosWidgetService.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TodosWidgetService.kt
@@ -9,7 +9,6 @@ import javax.inject.Inject
 
 @AndroidEntryPoint
 class TodosWidgetService : RemoteViewsService() {
-
     @Inject
     lateinit var taskRepository: TaskRepository
 
diff --git a/Habitica/src/release/java/com/habitrpg/android/habitica/ReleaseDeveloperModule.kt b/Habitica/src/release/java/com/habitrpg/android/habitica/ReleaseDeveloperModule.kt
index 5de847b34..53a658d7a 100644
--- a/Habitica/src/release/java/com/habitrpg/android/habitica/ReleaseDeveloperModule.kt
+++ b/Habitica/src/release/java/com/habitrpg/android/habitica/ReleaseDeveloperModule.kt
@@ -1,7 +1,5 @@
 package com.habitrpg.android.habitica
 
-import android.content.Context
 import com.habitrpg.android.habitica.modules.DeveloperModule
 
-class ReleaseDeveloperModule : DeveloperModule() {
-}
+class ReleaseDeveloperModule : DeveloperModule()
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImplTest.kt b/Habitica/src/test/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImplTest.kt
index cf3c43035..abda1e5a7 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImplTest.kt
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImplTest.kt
@@ -39,13 +39,14 @@ class TaskRepositoryImplTest : WordSpec({
             slot.captured(mockk(relaxed = true))
         }
         val authenticationHandler = mockk<AuthenticationHandler>()
-        repository = TaskRepositoryImpl(
-            localRepository,
-            apiClient,
-            authenticationHandler,
-            mockk(relaxed = true),
-            mockk(relaxed = true)
-        )
+        repository =
+            TaskRepositoryImpl(
+                localRepository,
+                apiClient,
+                authenticationHandler,
+                mockk(relaxed = true),
+                mockk(relaxed = true),
+            )
         val liveObjectSlot = slot<BaseObject>()
         every { localRepository.getLiveObject(capture(liveObjectSlot)) } answers {
             liveObjectSlot.captured
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/MarkdownProcessingTest.kt b/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/MarkdownProcessingTest.kt
index bf484bed0..ffc350a93 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/MarkdownProcessingTest.kt
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/MarkdownProcessingTest.kt
@@ -41,7 +41,6 @@ class MarkdownProcessingTest : WordSpec({
             output shouldBe "![img](https://habitica-assets.s3.amazonaws.com/mobileApp/images/gold.png\"Habitica Gold\")"
         }
     }
-
 }) {
     companion object {
         fun processMarkdown(input: String): String {
@@ -82,5 +81,3 @@ class MarkdownProcessingTest : WordSpec({
         }
     }
 }
-
-
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/UserStatComputerTest.kt b/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/UserStatComputerTest.kt
index 2c5143607..c88547559 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/UserStatComputerTest.kt
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/UserStatComputerTest.kt
@@ -25,7 +25,7 @@ class UserStatComputerTest : StringSpec({
     equipment.key = key
     equipment.text = text
     equipment.str = str
-    equipment._int = intStat
+    equipment.intelligence = intStat
     equipment.per = per
     equipment.con = con
     equipmentList.add(equipment)
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/viewmodels/inventory/equipment/EquipmentOverviewViewModelTest.kt b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/viewmodels/inventory/equipment/EquipmentOverviewViewModelTest.kt
index f4be49098..ba1817e94 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/viewmodels/inventory/equipment/EquipmentOverviewViewModelTest.kt
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/viewmodels/inventory/equipment/EquipmentOverviewViewModelTest.kt
@@ -18,34 +18,38 @@ class EquipmentOverviewViewModelTest : WordSpec({
     val viewModel = EquipmentOverviewViewModel(userRepository, mainUserViewmodel, inventoryRepository)
     "usesAutoEquip" should {
         "return true if user has it set" {
-            every { mainUserViewmodel.user.value } returns User().apply {
-                preferences = Preferences()
-                preferences?.autoEquip = true
-            }
+            every { mainUserViewmodel.user.value } returns
+                User().apply {
+                    preferences = Preferences()
+                    preferences?.autoEquip = true
+                }
             viewModel.usesAutoEquip shouldBe true
         }
         "return false if user does not use autoequip" {
-            every { mainUserViewmodel.user.value } returns User().apply {
-                preferences = Preferences()
-                preferences?.autoEquip = false
-            }
+            every { mainUserViewmodel.user.value } returns
+                User().apply {
+                    preferences = Preferences()
+                    preferences?.autoEquip = false
+                }
             viewModel.usesAutoEquip shouldBe false
         }
     }
 
     "usesCostume" should {
         "return true if user has it set" {
-            every { mainUserViewmodel.user.value } returns User().apply {
-                preferences = Preferences()
-                preferences?.costume = true
-            }
+            every { mainUserViewmodel.user.value } returns
+                User().apply {
+                    preferences = Preferences()
+                    preferences?.costume = true
+                }
             viewModel.usesCostume shouldBe true
         }
         "return false if user does not use costume" {
-            every { mainUserViewmodel.user.value } returns User().apply {
-                preferences = Preferences()
-                preferences?.costume = false
-            }
+            every { mainUserViewmodel.user.value } returns
+                User().apply {
+                    preferences = Preferences()
+                    preferences?.costume = false
+                }
             viewModel.usesCostume shouldBe false
         }
     }
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/utils/DateDeserializerTest.kt b/Habitica/src/test/java/com/habitrpg/android/habitica/utils/DateDeserializerTest.kt
index 1c2461938..799942e4a 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/utils/DateDeserializerTest.kt
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/utils/DateDeserializerTest.kt
@@ -1,56 +1,59 @@
-package com.habitrpg.android.habitica.utils
-
-import com.google.gson.JsonElement
-import com.google.gson.JsonPrimitive
-import io.kotest.matchers.shouldBe
-import java.util.Date
-
-class DateDeserializerTest : SerializerSpec({
-    val deserializer = DateDeserializer()
-    val referenceTimestamp = 1443445200000
-
-    "deserialize" should {
-        "validate normal date" {
-            val date = deserializer.deserialize(
-                JsonPrimitive("2015-09-28T13:00:00.000Z"),
-                Date::class.java,
-                deserializationContext
-            )
-            date shouldBe Date(referenceTimestamp)
-        }
-
-        "validate timestamp" {
-            val date = deserializer.deserialize(
-                JsonPrimitive(referenceTimestamp),
-                Date::class.java,
-                deserializationContext
-            )
-            date shouldBe Date(referenceTimestamp)
-        }
-
-        "validate empty" {
-            val date =
-                deserializer.deserialize(JsonPrimitive(""), Date::class.java, deserializationContext)
-            date shouldBe null
-        }
-    }
-
-    "serialize" should {
-        "serialize normal date" {
-            val dateElement: JsonElement = deserializer.serialize(
-                Date(
-                    referenceTimestamp
-                ),
-                Date::class.java,
-                serializationContext
-            )
-            dateElement.asString shouldBe "2015-09-28T13:00:00.000Z"
-        }
-
-        "serialize empty" {
-            val dateElement: JsonElement =
-                deserializer.serialize(null, Date::class.java, serializationContext)
-            dateElement.asString shouldBe ""
-        }
-    }
-})
+package com.habitrpg.android.habitica.utils
+
+import com.google.gson.JsonElement
+import com.google.gson.JsonPrimitive
+import io.kotest.matchers.shouldBe
+import java.util.Date
+
+class DateDeserializerTest : SerializerSpec({
+    val deserializer = DateDeserializer()
+    val referenceTimestamp = 1443445200000
+
+    "deserialize" should {
+        "validate normal date" {
+            val date =
+                deserializer.deserialize(
+                    JsonPrimitive("2015-09-28T13:00:00.000Z"),
+                    Date::class.java,
+                    deserializationContext,
+                )
+            date shouldBe Date(referenceTimestamp)
+        }
+
+        "validate timestamp" {
+            val date =
+                deserializer.deserialize(
+                    JsonPrimitive(referenceTimestamp),
+                    Date::class.java,
+                    deserializationContext,
+                )
+            date shouldBe Date(referenceTimestamp)
+        }
+
+        "validate empty" {
+            val date =
+                deserializer.deserialize(JsonPrimitive(""), Date::class.java, deserializationContext)
+            date shouldBe null
+        }
+    }
+
+    "serialize" should {
+        "serialize normal date" {
+            val dateElement: JsonElement =
+                deserializer.serialize(
+                    Date(
+                        referenceTimestamp,
+                    ),
+                    Date::class.java,
+                    serializationContext,
+                )
+            dateElement.asString shouldBe "2015-09-28T13:00:00.000Z"
+        }
+
+        "serialize empty" {
+            val dateElement: JsonElement =
+                deserializer.serialize(null, Date::class.java, serializationContext)
+            dateElement.asString shouldBe ""
+        }
+    }
+})
diff --git a/build.gradle b/build.gradle
index ae2dd6d79..7625297a8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,7 @@ buildscript {
         firebase_bom = '31.3.0'
         kotest_version = '5.6.2'
         kotlin_version = '1.9.10'
-        ktlint_version = '0.50.0'
+        ktlint_version = '1.2.1'
         lifecycle_version = '2.7.0'
         markwon_version = '4.6.2'
         mockk_version = '1.13.4'
@@ -105,6 +105,14 @@ detekt {
     baseline = file("${rootProject.projectDir}/detekt_baseline.xml")
 }
 
+ktlint {
+    filter {
+        exclude { entry ->
+            entry.file.toString().contains("generated")
+        }
+    }
+}
+
 tasks.named("detekt").configure {
     reports {
         xml.required.set(false)
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
index 65e7ae6f2..cce98b322 100644
--- a/common/build.gradle.kts
+++ b/common/build.gradle.kts
@@ -1,3 +1,5 @@
+@file:Suppress("PropertyName")
+
 import java.io.FileInputStream
 import java.util.Properties
 
diff --git a/common/src/main/java/com/habitrpg/common/habitica/api/HostConfig.kt b/common/src/main/java/com/habitrpg/common/habitica/api/HostConfig.kt
index 6ad142aa9..5121d158f 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/api/HostConfig.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/api/HostConfig.kt
@@ -41,7 +41,10 @@ class HostConfig {
         this.apiKey = loadAPIKey(sharedPreferences, keyHelper)
     }
 
-    private fun loadAPIKey(sharedPreferences: SharedPreferences, keyHelper: KeyHelper?): String {
+    private fun loadAPIKey(
+        sharedPreferences: SharedPreferences,
+        keyHelper: KeyHelper?,
+    ): String {
         return if (sharedPreferences.contains(userID)) {
             val encryptedKey = sharedPreferences.getString(userID, null)
             if (encryptedKey?.isNotBlank() == true) {
diff --git a/common/src/main/java/com/habitrpg/common/habitica/extensions/ApplicationExtensions.kt b/common/src/main/java/com/habitrpg/common/habitica/extensions/ApplicationExtensions.kt
index 86b4db55c..22c53a109 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/extensions/ApplicationExtensions.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/extensions/ApplicationExtensions.kt
@@ -10,16 +10,17 @@ import coil.util.DebugLogger
 import com.habitrpg.common.habitica.BuildConfig
 
 fun Application.setupCoil() {
-    var builder = ImageLoader.Builder(this)
-        .allowHardware(false)
-        .crossfade(false)
-        .components {
-            if (Build.VERSION.SDK_INT >= 28) {
-                add(ImageDecoderDecoder.Factory())
-            } else {
-                add(GifDecoder.Factory())
+    var builder =
+        ImageLoader.Builder(this)
+            .allowHardware(false)
+            .crossfade(false)
+            .components {
+                if (Build.VERSION.SDK_INT >= 28) {
+                    add(ImageDecoderDecoder.Factory())
+                } else {
+                    add(GifDecoder.Factory())
+                }
             }
-        }
     if (BuildConfig.DEBUG) {
         builder = builder.logger(DebugLogger())
     }
diff --git a/common/src/main/java/com/habitrpg/common/habitica/extensions/BaseExtensions.kt b/common/src/main/java/com/habitrpg/common/habitica/extensions/BaseExtensions.kt
index 057623a0d..0d0e95f45 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/extensions/BaseExtensions.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/extensions/BaseExtensions.kt
@@ -10,7 +10,11 @@ import kotlin.time.toDuration
  * Created by phillip on 01.02.18.
  */
 
-fun runDelayed(interval: Long, timeUnit: DurationUnit, function: () -> Unit) {
+fun runDelayed(
+    interval: Long,
+    timeUnit: DurationUnit,
+    function: () -> Unit,
+) {
     MainScope().launchCatching {
         delay(interval.toDuration(timeUnit))
         function()
diff --git a/common/src/main/java/com/habitrpg/common/habitica/extensions/BaseViewModelExtensions.kt b/common/src/main/java/com/habitrpg/common/habitica/extensions/BaseViewModelExtensions.kt
index e6b304ee1..1c353e9fb 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/extensions/BaseViewModelExtensions.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/extensions/BaseViewModelExtensions.kt
@@ -4,7 +4,10 @@ import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Observer
 
-fun <T> LiveData<T>.observeOnce(lifecycleOwner: LifecycleOwner, observer: Observer<T>) {
+fun <T> LiveData<T>.observeOnce(
+    lifecycleOwner: LifecycleOwner,
+    observer: Observer<T>,
+) {
     observe(
         lifecycleOwner,
         object : Observer<T> {
@@ -12,6 +15,6 @@ fun <T> LiveData<T>.observeOnce(lifecycleOwner: LifecycleOwner, observer: Observ
                 observer.onChanged(value)
                 removeObserver(this)
             }
-        }
+        },
     )
 }
diff --git a/common/src/main/java/com/habitrpg/common/habitica/extensions/ContextExtensions.kt b/common/src/main/java/com/habitrpg/common/habitica/extensions/ContextExtensions.kt
index 8a9240a91..cefac65e6 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/extensions/ContextExtensions.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/extensions/ContextExtensions.kt
@@ -27,6 +27,7 @@ fun Context.isUsingNightModeResources(): Boolean {
         else -> false
     }
 }
+
 fun Context.forceLocale(locale: Locale): Context {
     Locale.setDefault(locale)
     val config = Configuration(resources.configuration)
diff --git a/common/src/main/java/com/habitrpg/common/habitica/extensions/DataBindingUtils.kt b/common/src/main/java/com/habitrpg/common/habitica/extensions/DataBindingUtils.kt
index a707da8cd..038f19157 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/extensions/DataBindingUtils.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/extensions/DataBindingUtils.kt
@@ -17,7 +17,10 @@ import com.habitrpg.common.habitica.helpers.AppConfigManager
 import com.habitrpg.common.habitica.views.PixelArtView
 import java.util.Date
 
-fun PixelArtView.loadImage(imageName: String?, imageFormat: String? = null) {
+fun PixelArtView.loadImage(
+    imageName: String?,
+    imageFormat: String? = null,
+) {
     val shouldLoadImage = DataBindingUtils.existsAsImage(imageName)
     if (shouldLoadImage && imageName != null) {
         val fullname = DataBindingUtils.getFullFilename(imageName, imageFormat)
@@ -27,25 +30,29 @@ fun PixelArtView.loadImage(imageName: String?, imageFormat: String? = null) {
         tag = fullname
         setImageDrawable(null)
         bitmap = null
-        DataBindingUtils.loadImage(context, imageName, imageFormat,
-            imageResult ={
+        DataBindingUtils.loadImage(
+            context,
+            imageName,
+            imageFormat,
+            imageResult = {
                 if (tag == fullname) {
-                    bitmap = if (fullname.endsWith("gif")) {
-                        setImageDrawable(it)
-                        if (it is Animatable) {
-                            it.start()
+                    bitmap =
+                        if (fullname.endsWith("gif")) {
+                            setImageDrawable(it)
+                            if (it is Animatable) {
+                                it.start()
+                            }
+                            null
+                        } else {
+                            it.toBitmap()
                         }
-                        null
-                    } else {
-                        it.toBitmap()
-                    }
                 }
             },
             imageError = {
                 tag = null
                 setImageDrawable(null)
                 bitmap = null
-            }
+            },
         )
     } else {
         tag = null
@@ -55,7 +62,11 @@ fun PixelArtView.loadImage(imageName: String?, imageFormat: String? = null) {
 }
 
 object DataBindingUtils {
-    fun loadImage(context: Context, imageName: String, imageResult: (Drawable) -> Unit) {
+    fun loadImage(
+        context: Context,
+        imageName: String,
+        imageResult: (Drawable) -> Unit,
+    ) {
         loadImage(context, imageName, null, imageResult)
     }
 
@@ -64,40 +75,48 @@ object DataBindingUtils {
         imageName: String,
         imageFormat: String?,
         imageResult: (Drawable) -> Unit,
-        imageError:()->Unit = { }
+        imageError: () -> Unit = { },
     ) {
-        val request = ImageRequest.Builder(context)
-            .data(BASE_IMAGE_URL + getFullFilename(imageName, imageFormat))
-            .target(
-                onStart = { _ ->
-
-                },
-                onSuccess = {
-                    imageResult(it)
-                },
-                onError = {
-                    imageError()
-                }
-            )
-            .build()
+        val request =
+            ImageRequest.Builder(context)
+                .data(BASE_IMAGE_URL + getFullFilename(imageName, imageFormat))
+                .target(
+                    onStart = { _ ->
+                    },
+                    onSuccess = {
+                        imageResult(it)
+                    },
+                    onError = {
+                        imageError()
+                    },
+                )
+                .build()
         context.imageLoader.enqueue(request)
     }
 
-    fun getFullFilename(imageName: String, imageFormat: String? = null): String {
-        val name = when {
-            spriteSubstitutions.containsKey(imageName) -> spriteSubstitutions[imageName]
-            FILENAME_MAP.containsKey(imageName) -> FILENAME_MAP[imageName]
-            imageName.startsWith("handleless") -> "chair_$imageName"
-            else -> imageName
-        }
-        return name + if (imageFormat == null && FILEFORMAT_MAP.containsKey(imageName)) {
-            "." + FILEFORMAT_MAP[imageName]
-        } else {
-            ".${imageFormat ?: "png"}"
-        }
+    fun getFullFilename(
+        imageName: String,
+        imageFormat: String? = null,
+    ): String {
+        val name =
+            when {
+                spriteSubstitutions.containsKey(imageName) -> spriteSubstitutions[imageName]
+                FILENAME_MAP.containsKey(imageName) -> FILENAME_MAP[imageName]
+                imageName.startsWith("handleless") -> "chair_$imageName"
+                else -> imageName
+            }
+        return name +
+            if (imageFormat == null && FILEFORMAT_MAP.containsKey(imageName)) {
+                "." + FILEFORMAT_MAP[imageName]
+            } else {
+                ".${imageFormat ?: "png"}"
+            }
     }
 
-    fun setRoundedBackground(view: View, color: Int) {
+    fun setRoundedBackground(
+        view: View,
+        color: Int,
+    ) {
         val drawable = ResourcesCompat.getDrawable(view.resources, R.drawable.layout_rounded_bg, null)
         drawable?.setTintWith(color, PorterDuff.Mode.MULTIPLY)
         view.background = drawable
@@ -119,7 +138,10 @@ object DataBindingUtils {
             initializeWeight = layoutParams.weight
         }
 
-        override fun applyTransformation(interpolatedTime: Float, t: Transformation) {
+        override fun applyTransformation(
+            interpolatedTime: Float,
+            t: Transformation,
+        ) {
             layoutParams.weight = initializeWeight + (targetWeight - initializeWeight) * interpolatedTime
 
             view.requestLayout()
diff --git a/common/src/main/java/com/habitrpg/common/habitica/extensions/DrawableExtendsions.kt b/common/src/main/java/com/habitrpg/common/habitica/extensions/DrawableExtendsions.kt
index fad856808..47118c0d0 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/extensions/DrawableExtendsions.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/extensions/DrawableExtendsions.kt
@@ -9,13 +9,16 @@ import androidx.core.graphics.drawable.DrawableCompat
 fun Drawable.setTintWith(
     context: Context,
     colorResource: Int,
-    tintMode: PorterDuff.Mode = PorterDuff.Mode.MULTIPLY
+    tintMode: PorterDuff.Mode = PorterDuff.Mode.MULTIPLY,
 ) {
     DrawableCompat.setTintMode(this, tintMode)
     DrawableCompat.setTint(this, ContextCompat.getColor(context, colorResource))
 }
 
-fun Drawable.setTintWith(color: Int, tintMode: PorterDuff.Mode = PorterDuff.Mode.MULTIPLY) {
+fun Drawable.setTintWith(
+    color: Int,
+    tintMode: PorterDuff.Mode = PorterDuff.Mode.MULTIPLY,
+) {
     DrawableCompat.setTint(this, color)
     DrawableCompat.setTintMode(this, tintMode)
 }
diff --git a/common/src/main/java/com/habitrpg/common/habitica/extensions/HabitResetOption.kt b/common/src/main/java/com/habitrpg/common/habitica/extensions/HabitResetOption.kt
index 1ae48fd5b..ed4bd6c47 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/extensions/HabitResetOption.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/extensions/HabitResetOption.kt
@@ -4,8 +4,9 @@ import com.habitrpg.common.habitica.R
 import com.habitrpg.shared.habitica.models.tasks.HabitResetOption
 
 val HabitResetOption.nameRes: Int
-    get() = when (this) {
-        HabitResetOption.DAILY -> R.string.daily
-        HabitResetOption.WEEKLY -> R.string.weekly
-        HabitResetOption.MONTHLY -> R.string.monthly
-    }
+    get() =
+        when (this) {
+            HabitResetOption.DAILY -> R.string.daily
+            HabitResetOption.WEEKLY -> R.string.weekly
+            HabitResetOption.MONTHLY -> R.string.monthly
+        }
diff --git a/common/src/main/java/com/habitrpg/common/habitica/extensions/TaskDifficultyExtensions.kt b/common/src/main/java/com/habitrpg/common/habitica/extensions/TaskDifficultyExtensions.kt
index 10a03e294..94ea66748 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/extensions/TaskDifficultyExtensions.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/extensions/TaskDifficultyExtensions.kt
@@ -4,17 +4,19 @@ import com.habitrpg.common.habitica.R
 import com.habitrpg.shared.habitica.models.tasks.TaskDifficulty
 
 val TaskDifficulty.nameRes: Int
-    get() = when (this) {
-        TaskDifficulty.TRIVIAL -> R.string.trivial
-        TaskDifficulty.EASY -> R.string.easy
-        TaskDifficulty.MEDIUM -> R.string.medium
-        TaskDifficulty.HARD -> R.string.hard
-    }
+    get() =
+        when (this) {
+            TaskDifficulty.TRIVIAL -> R.string.trivial
+            TaskDifficulty.EASY -> R.string.easy
+            TaskDifficulty.MEDIUM -> R.string.medium
+            TaskDifficulty.HARD -> R.string.hard
+        }
 
 val TaskDifficulty.nameSentenceRes: Int
-    get() = when (this) {
-        TaskDifficulty.TRIVIAL -> R.string.trivial_sentence
-        TaskDifficulty.EASY -> R.string.easy_sentence
-        TaskDifficulty.MEDIUM -> R.string.medium_sentence
-        TaskDifficulty.HARD -> R.string.hard_sentence
-    }
+    get() =
+        when (this) {
+            TaskDifficulty.TRIVIAL -> R.string.trivial_sentence
+            TaskDifficulty.EASY -> R.string.easy_sentence
+            TaskDifficulty.MEDIUM -> R.string.medium_sentence
+            TaskDifficulty.HARD -> R.string.hard_sentence
+        }
diff --git a/common/src/main/java/com/habitrpg/common/habitica/extensions/TextViewExtensions.kt b/common/src/main/java/com/habitrpg/common/habitica/extensions/TextViewExtensions.kt
index d29890514..4f83a151d 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/extensions/TextViewExtensions.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/extensions/TextViewExtensions.kt
@@ -9,7 +9,7 @@ import android.text.style.URLSpan
 import android.view.View
 import android.widget.TextView
 
-class HabiticaClickableSpan(val onClickAction: () -> Unit): ClickableSpan() {
+class HabiticaClickableSpan(val onClickAction: () -> Unit) : ClickableSpan() {
     override fun onClick(widget: View) {
         onClickAction()
     }
@@ -22,22 +22,23 @@ class HabiticaClickableSpan(val onClickAction: () -> Unit): ClickableSpan() {
 
 fun TextView.handleUrlClicks(onClicked: ((String) -> Unit)? = null) {
     // create span builder and replaces current text with it
-    text = SpannableStringBuilder.valueOf(text).apply {
-        // search for all URL spans and replace all spans with our own clickable spans
-        getSpans(0, length, URLSpan::class.java).forEach {
-            // add new clickable span at the same position
-            setSpan(
-                HabiticaClickableSpan {
-                    onClicked?.invoke(it.url)
-                },
-                getSpanStart(it),
-                getSpanEnd(it),
-                Spanned.SPAN_INCLUSIVE_EXCLUSIVE
-            )
-            // remove old URLSpan
-            removeSpan(it)
+    text =
+        SpannableStringBuilder.valueOf(text).apply {
+            // search for all URL spans and replace all spans with our own clickable spans
+            getSpans(0, length, URLSpan::class.java).forEach {
+                // add new clickable span at the same position
+                setSpan(
+                    HabiticaClickableSpan {
+                        onClicked?.invoke(it.url)
+                    },
+                    getSpanStart(it),
+                    getSpanEnd(it),
+                    Spanned.SPAN_INCLUSIVE_EXCLUSIVE,
+                )
+                // remove old URLSpan
+                removeSpan(it)
+            }
         }
-    }
     // make sure movement method is set
     movementMethod = LinkMovementMethod.getInstance()
 }
diff --git a/common/src/main/java/com/habitrpg/common/habitica/extensions/ViewExt.kt b/common/src/main/java/com/habitrpg/common/habitica/extensions/ViewExt.kt
index 954a567ce..be8070ea9 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/extensions/ViewExt.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/extensions/ViewExt.kt
@@ -7,28 +7,39 @@ import android.graphics.drawable.ColorDrawable
 import android.view.View
 import android.view.ViewTreeObserver
 
-fun View.setScaledPadding(context: Context?, left: Int, top: Int, right: Int, bottom: Int) {
+fun View.setScaledPadding(
+    context: Context?,
+    left: Int,
+    top: Int,
+    right: Int,
+    bottom: Int,
+) {
     this.setPadding(left.dpToPx(context), top.dpToPx(context), right.dpToPx(context), bottom.dpToPx(context))
 }
 
-inline fun View.waitForLayout(crossinline f: View.() -> Unit) = with(viewTreeObserver) {
-    addOnGlobalLayoutListener(object : ViewTreeObserver.OnGlobalLayoutListener {
-        override fun onGlobalLayout() {
-            viewTreeObserver.removeOnGlobalLayoutListener(this)
-            f()
-        }
-    })
-}
+inline fun View.waitForLayout(crossinline f: View.() -> Unit) =
+    with(viewTreeObserver) {
+        addOnGlobalLayoutListener(
+            object : ViewTreeObserver.OnGlobalLayoutListener {
+                override fun onGlobalLayout() {
+                    viewTreeObserver.removeOnGlobalLayoutListener(this)
+                    f()
+                }
+            },
+        )
+    }
 
 inline fun View.afterMeasured(crossinline f: View.() -> Unit) {
-    viewTreeObserver.addOnGlobalLayoutListener(object : ViewTreeObserver.OnGlobalLayoutListener {
-        override fun onGlobalLayout() {
-            if (measuredWidth > 0 && measuredHeight > 0) {
-                viewTreeObserver.removeOnGlobalLayoutListener(this)
-                f()
+    viewTreeObserver.addOnGlobalLayoutListener(
+        object : ViewTreeObserver.OnGlobalLayoutListener {
+            override fun onGlobalLayout() {
+                if (measuredWidth > 0 && measuredHeight > 0) {
+                    viewTreeObserver.removeOnGlobalLayoutListener(this)
+                    f()
+                }
             }
-        }
-    })
+        },
+    )
 }
 
 fun View.fadeInAnimation(duration: Long = 500) {
diff --git a/common/src/main/java/com/habitrpg/common/habitica/extensions/ViewGroupExtensions.kt b/common/src/main/java/com/habitrpg/common/habitica/extensions/ViewGroupExtensions.kt
index 172d9a974..7b9857df3 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/extensions/ViewGroupExtensions.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/extensions/ViewGroupExtensions.kt
@@ -6,5 +6,8 @@ import android.view.View
 import android.view.ViewGroup
 import com.habitrpg.common.habitica.extensions.layoutInflater
 
-fun ViewGroup.inflate(layoutId: Int, attachToRoot: Boolean = false): View =
+fun ViewGroup.inflate(
+    layoutId: Int,
+    attachToRoot: Boolean = false,
+): View =
     context.layoutInflater.inflate(layoutId, this, attachToRoot)
diff --git a/common/src/main/java/com/habitrpg/common/habitica/helpers/Animations.kt b/common/src/main/java/com/habitrpg/common/habitica/helpers/Animations.kt
index 010d9b28e..b4f4d5bf5 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/helpers/Animations.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/helpers/Animations.kt
@@ -18,7 +18,10 @@ import kotlin.math.hypot
 import kotlin.random.Random
 
 object Animations {
-    private fun randomFloat(min: Float, max: Float): Float {
+    private fun randomFloat(
+        min: Float,
+        max: Float,
+    ): Float {
         return min + Random.nextFloat() * (max - min)
     }
 
@@ -50,7 +53,10 @@ object Animations {
         return anim
     }
 
-    fun circularReveal(view: View, duration: Long = 300) {
+    fun circularReveal(
+        view: View,
+        duration: Long = 300,
+    ) {
         if (!view.isAttachedToWindow) return
         val cx = view.width / 2
         val cy = view.height / 2
@@ -62,7 +68,10 @@ object Animations {
         anim.start()
     }
 
-    fun circularHide(view: View, duration: Long = 300) {
+    fun circularHide(
+        view: View,
+        duration: Long = 300,
+    ) {
         val cx = view.width / 2
         val cy = view.height / 2
         val initialRadius = hypot(cx.toDouble(), cy.toDouble()).toFloat()
diff --git a/common/src/main/java/com/habitrpg/common/habitica/helpers/AppConfigManager.kt b/common/src/main/java/com/habitrpg/common/habitica/helpers/AppConfigManager.kt
index e099430f3..5d00659cd 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/helpers/AppConfigManager.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/helpers/AppConfigManager.kt
@@ -1,7 +1,6 @@
 package com.habitrpg.common.habitica.helpers
 
 open class AppConfigManager {
-
     open fun spriteSubstitutions(): Map<String, Map<String, String>> {
         // TODO actual implementation
         return emptyMap()
diff --git a/common/src/main/java/com/habitrpg/common/habitica/helpers/AppTestingLevel.kt b/common/src/main/java/com/habitrpg/common/habitica/helpers/AppTestingLevel.kt
index 720fefa12..6956dca5c 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/helpers/AppTestingLevel.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/helpers/AppTestingLevel.kt
@@ -5,5 +5,5 @@ enum class AppTestingLevel {
     PARTNERS,
     ALPHA,
     BETA,
-    PRODUCTION
+    PRODUCTION,
 }
diff --git a/common/src/main/java/com/habitrpg/common/habitica/helpers/ExceptionHandler.kt b/common/src/main/java/com/habitrpg/common/habitica/helpers/ExceptionHandler.kt
index f5132cb01..3e7a4b24b 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/helpers/ExceptionHandler.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/helpers/ExceptionHandler.kt
@@ -1,14 +1,11 @@
 package com.habitrpg.common.habitica.helpers
 
 import android.util.Log
-import coil.network.HttpException
 import com.habitrpg.common.habitica.BuildConfig
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import java.io.IOException
 import kotlin.coroutines.CoroutineContext
 import kotlin.coroutines.EmptyCoroutineContext
 
@@ -44,11 +41,15 @@ class ExceptionHandler {
     }
 }
 
-fun CoroutineScope.launchCatching(errorHandler: ((Throwable) -> Unit)? = null, context: CoroutineContext = EmptyCoroutineContext, function: suspend CoroutineScope.() -> Unit) {
+fun CoroutineScope.launchCatching(
+    errorHandler: ((Throwable) -> Unit)? = null,
+    context: CoroutineContext = EmptyCoroutineContext,
+    function: suspend CoroutineScope.() -> Unit,
+) {
     launch(
         ExceptionHandler.coroutine {
             errorHandler?.invoke(it)
         } + context,
-        block = function
+        block = function,
     )
 }
diff --git a/common/src/main/java/com/habitrpg/common/habitica/helpers/HealthFormatter.kt b/common/src/main/java/com/habitrpg/common/habitica/helpers/HealthFormatter.kt
index 93df2a100..1211f1eed 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/helpers/HealthFormatter.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/helpers/HealthFormatter.kt
@@ -17,19 +17,26 @@ object HealthFormatter {
             floor(input)
         }
 
-    fun formatToString(input: Int, locale: Locale = getDefaultLocale()) = formatToString(input.toDouble(), locale)
+    fun formatToString(
+        input: Int,
+        locale: Locale = getDefaultLocale(),
+    ) = formatToString(input.toDouble(), locale)
 
     @JvmStatic
     @JvmOverloads
-    fun formatToString(input: Double, locale: Locale = getDefaultLocale()): String {
+    fun formatToString(
+        input: Double,
+        locale: Locale = getDefaultLocale(),
+    ): String {
         val doubleValue = format(input)
         val numberFormat = NumberFormat.getInstance(locale).apply { maximumFractionDigits = 1 }
         return numberFormat.format(doubleValue)
     }
 
-    private fun getDefaultLocale() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-        Locale.getDefault(Locale.Category.FORMAT)
-    } else {
-        Locale.getDefault()
-    }
+    private fun getDefaultLocale() =
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            Locale.getDefault(Locale.Category.FORMAT)
+        } else {
+            Locale.getDefault()
+        }
 }
diff --git a/common/src/main/java/com/habitrpg/common/habitica/helpers/KeyHelper.kt b/common/src/main/java/com/habitrpg/common/habitica/helpers/KeyHelper.kt
index a7e8a3390..60f96a04c 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/helpers/KeyHelper.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/helpers/KeyHelper.kt
@@ -39,221 +39,227 @@ import javax.security.auth.x500.X500Principal
 import javax.security.cert.CertificateException
 
 // https://stackoverflow.com/a/42716982
-class KeyHelper @Throws(NoSuchPaddingException::class, NoSuchProviderException::class, NoSuchAlgorithmException::class, InvalidAlgorithmParameterException::class, KeyStoreException::class, CertificateException::class, IOException::class)
-constructor(ctx: Context, var sharedPreferences: SharedPreferences, var keyStore: KeyStore?) {
-
-    private val aesKeyFromKS: Key?
-        @Throws(NoSuchProviderException::class, NoSuchAlgorithmException::class, InvalidAlgorithmParameterException::class, KeyStoreException::class, CertificateException::class, IOException::class, UnrecoverableKeyException::class)
-        get() {
-            return keyStore?.getKey(KEY_ALIAS, null) as? SecretKey
-        }
-
-    init {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            this.generateEncryptKey(ctx)
-        }
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
-            try {
-                this.generateAESKey()
-            } catch (e: Exception) {
-                HLogger.logException("KeyHelper", "Error initializing", e)
+class KeyHelper
+    @Throws(NoSuchPaddingException::class, NoSuchProviderException::class, NoSuchAlgorithmException::class, InvalidAlgorithmParameterException::class, KeyStoreException::class, CertificateException::class, IOException::class)
+    constructor(ctx: Context, var sharedPreferences: SharedPreferences, var keyStore: KeyStore?) {
+        private val aesKeyFromKS: Key?
+            @Throws(NoSuchProviderException::class, NoSuchAlgorithmException::class, InvalidAlgorithmParameterException::class, KeyStoreException::class, CertificateException::class, IOException::class, UnrecoverableKeyException::class)
+            get() {
+                return keyStore?.getKey(KEY_ALIAS, null) as? SecretKey
             }
-        }
-    }
 
-    @Throws(NoSuchProviderException::class, NoSuchAlgorithmException::class, InvalidAlgorithmParameterException::class, KeyStoreException::class, CertificateException::class, IOException::class)
-    private fun generateEncryptKey(ctx: Context) {
-        keyStore?.load(null)
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            if (keyStore?.containsAlias(KEY_ALIAS) == false) {
-                val keyGenerator = KeyGenerator.getInstance(KeyProperties.KEY_ALGORITHM_AES, AndroidKeyStore)
-                keyGenerator.init(
-                    KeyGenParameterSpec.Builder(
-                        KEY_ALIAS,
-                        KeyProperties.PURPOSE_ENCRYPT or KeyProperties.PURPOSE_DECRYPT
-                    )
-                        .setBlockModes(KeyProperties.BLOCK_MODE_GCM)
-                        .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_NONE)
-                        .setRandomizedEncryptionRequired(false)
-                        .build()
-                )
-                keyGenerator.generateKey()
+        init {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                this.generateEncryptKey(ctx)
             }
-        } else {
-            if (keyStore?.containsAlias(KEY_ALIAS) == false) {
-                // Generate a key pair for encryption
-                val start = Calendar.getInstance()
-                val end = Calendar.getInstance()
-                end.add(Calendar.YEAR, 30)
-                val spec = KeyPairGeneratorSpec.Builder(ctx)
-                    .setAlias(KEY_ALIAS)
-                    .setSubject(X500Principal("CN=$KEY_ALIAS"))
-                    .setSerialNumber(BigInteger.TEN)
-                    .setStartDate(start.time)
-                    .setEndDate(end.time)
-                    .build()
-                val kpg = KeyPairGenerator.getInstance("RSA", AndroidKeyStore)
-                kpg.initialize(spec)
-                kpg.generateKeyPair()
-            }
-        }
-    }
-
-    @Throws(Exception::class)
-    private fun rsaEncrypt(secret: ByteArray): ByteArray {
-        val privateKeyEntry = keyStore?.getEntry(KEY_ALIAS, null) as? KeyStore.PrivateKeyEntry
-        // Encrypt the text
-        val inputCipher = Cipher.getInstance(RSA_MODE, "AndroidOpenSSL")
-        inputCipher.init(Cipher.ENCRYPT_MODE, privateKeyEntry?.certificate?.publicKey)
-
-        val outputStream = ByteArrayOutputStream()
-        val cipherOutputStream = CipherOutputStream(outputStream, inputCipher)
-        cipherOutputStream.write(secret)
-        cipherOutputStream.close()
-
-        return outputStream.toByteArray()
-    }
-
-    @Throws(Exception::class)
-    private fun rsaDecrypt(encrypted: ByteArray): ByteArray {
-        val privateKeyEntry = keyStore?.getEntry(KEY_ALIAS, null) as? KeyStore.PrivateKeyEntry
-        val output = Cipher.getInstance(RSA_MODE, "AndroidOpenSSL")
-        output.init(Cipher.DECRYPT_MODE, privateKeyEntry?.privateKey)
-        val cipherInputStream = CipherInputStream(
-            ByteArrayInputStream(encrypted),
-            output
-        )
-        return cipherInputStream.readBytes()
-    }
-
-    @Throws(Exception::class)
-    private fun generateAESKey() {
-        var enryptedKeyB64 = sharedPreferences.getString(ENCRYPTED_KEY, null)
-        if (enryptedKeyB64 == null) {
-            val key = ByteArray(16)
-            val secureRandom = SecureRandom()
-            secureRandom.nextBytes(key)
-            val encryptedKey = rsaEncrypt(key)
-            enryptedKeyB64 = Base64.encodeToString(encryptedKey, Base64.DEFAULT)
-            sharedPreferences.edit {
-                putString(ENCRYPTED_KEY, enryptedKeyB64)
-            }
-        }
-    }
-
-    @Throws(Exception::class)
-    private fun getSecretKey(): Key {
-        val enryptedKeyB64 = sharedPreferences.getString(ENCRYPTED_KEY, null)
-
-        val encryptedKey = Base64.decode(enryptedKeyB64, Base64.DEFAULT)
-        val key = rsaDecrypt(encryptedKey)
-        return SecretKeySpec(key, "AES")
-    }
-
-    @Throws(NoSuchAlgorithmException::class, NoSuchPaddingException::class, NoSuchProviderException::class, BadPaddingException::class, IllegalBlockSizeException::class, UnsupportedEncodingException::class)
-    fun encrypt(input: String): String {
-        val c: Cipher
-        val publicIV = getRandomIV()
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            c = Cipher.getInstance(AES_MODE_M)
-            try {
-                c.init(Cipher.ENCRYPT_MODE, aesKeyFromKS, GCMParameterSpec(128, Base64.decode(publicIV, Base64.DEFAULT)))
-            } catch (e: Exception) {
-                HLogger.logException("KeyHelper", "Error encrypting", e)
-            }
-        } else {
-            c = Cipher.getInstance(AES_MODE_M)
-            try {
-                c.init(Cipher.ENCRYPT_MODE, getSecretKey(), GCMParameterSpec(128, Base64.decode(publicIV, Base64.DEFAULT)))
-            } catch (e: Exception) {
-                HLogger.logException("KeyHelper", "Error encrypting", e)
-            }
-        }
-        val encodedBytes = c.doFinal(input.toByteArray(charset("UTF-8")))
-        return Base64.encodeToString(encodedBytes, Base64.DEFAULT)
-    }
-
-    @Throws(NoSuchAlgorithmException::class, NoSuchPaddingException::class, NoSuchProviderException::class, BadPaddingException::class, IllegalBlockSizeException::class, UnsupportedEncodingException::class)
-    fun decrypt(encrypted: String): String? {
-        val c: Cipher
-        val publicIV = getRandomIV()
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            c = Cipher.getInstance(AES_MODE_M)
-            try {
-                c.init(Cipher.DECRYPT_MODE, aesKeyFromKS, GCMParameterSpec(128, Base64.decode(publicIV, Base64.DEFAULT)))
-            } catch (e: Exception) {
-                HLogger.logException("KeyHelper", "Error decrypting", e)
-            }
-        } else {
-            c = Cipher.getInstance(AES_MODE_M)
-            try {
-                c.init(Cipher.DECRYPT_MODE, getSecretKey(), GCMParameterSpec(128, Base64.decode(publicIV, Base64.DEFAULT)))
-            } catch (e: Exception) {
-                HLogger.logException("KeyHelper", "Error decrypting", e)
-            }
-        }
-
-        return try {
-            val decodedValue = Base64.decode(encrypted.toByteArray(charset("UTF-8")), Base64.DEFAULT)
-            val decryptedVal = c.doFinal(decodedValue)
-            String(decryptedVal)
-        } catch (error: IllegalArgumentException) {
-            null
-        } catch (e: GeneralSecurityException) {
-            null
-        } catch (e: IllegalStateException) {
-            null
-        }
-    }
-
-    private fun getRandomIV(): String {
-        var publicIV = sharedPreferences.getString(PUBLIC_IV, null)
-
-        if (publicIV == null) {
-            val random = SecureRandom()
-            val generated = random.generateSeed(12)
-            publicIV = Base64.encodeToString(generated, Base64.DEFAULT)
-            sharedPreferences.edit {
-                putString(PUBLIC_IV, publicIV)
-            }
-        }
-        return publicIV ?: ""
-    }
-
-    companion object {
-        private const val RSA_MODE = "RSA/ECB/PKCS1Padding"
-        private const val AES_MODE_M = "AES/GCM/NoPadding"
-
-        private const val KEY_ALIAS = "KEY"
-        private const val AndroidKeyStore = "AndroidKeyStore"
-        const val ENCRYPTED_KEY = "ENCRYPTED_KEY"
-        const val PUBLIC_IV = "PUBLIC_IV"
-        private var keyHelper: KeyHelper? = null
-
-        fun getInstance(ctx: Context, sharedPreferences: SharedPreferences, keyStore: KeyStore): KeyHelper? {
-            if (keyHelper == null) {
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
                 try {
-                    keyHelper = KeyHelper(ctx, sharedPreferences, keyStore)
-                } catch (e: NoSuchPaddingException) {
-                    HLogger.logException("KeyHelper", "Error initializing", e)
-                } catch (e: NoSuchProviderException) {
-                    HLogger.logException("KeyHelper", "Error initializing", e)
-                } catch (e: NoSuchAlgorithmException) {
-                    HLogger.logException("KeyHelper", "Error initializing", e)
-                } catch (e: InvalidAlgorithmParameterException) {
-                    HLogger.logException("KeyHelper", "Error initializing", e)
-                } catch (e: KeyStoreException) {
-                    HLogger.logException("KeyHelper", "Error initializing", e)
-                } catch (e: CertificateException) {
-                    HLogger.logException("KeyHelper", "Error initializing", e)
-                } catch (e: IOException) {
+                    this.generateAESKey()
+                } catch (e: Exception) {
                     HLogger.logException("KeyHelper", "Error initializing", e)
                 }
             }
-            return keyHelper
+        }
+
+        @Throws(NoSuchProviderException::class, NoSuchAlgorithmException::class, InvalidAlgorithmParameterException::class, KeyStoreException::class, CertificateException::class, IOException::class)
+        private fun generateEncryptKey(ctx: Context) {
+            keyStore?.load(null)
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                if (keyStore?.containsAlias(KEY_ALIAS) == false) {
+                    val keyGenerator = KeyGenerator.getInstance(KeyProperties.KEY_ALGORITHM_AES, AndroidKeyStore)
+                    keyGenerator.init(
+                        KeyGenParameterSpec.Builder(
+                            KEY_ALIAS,
+                            KeyProperties.PURPOSE_ENCRYPT or KeyProperties.PURPOSE_DECRYPT,
+                        )
+                            .setBlockModes(KeyProperties.BLOCK_MODE_GCM)
+                            .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_NONE)
+                            .setRandomizedEncryptionRequired(false)
+                            .build(),
+                    )
+                    keyGenerator.generateKey()
+                }
+            } else {
+                if (keyStore?.containsAlias(KEY_ALIAS) == false) {
+                    // Generate a key pair for encryption
+                    val start = Calendar.getInstance()
+                    val end = Calendar.getInstance()
+                    end.add(Calendar.YEAR, 30)
+                    val spec =
+                        KeyPairGeneratorSpec.Builder(ctx)
+                            .setAlias(KEY_ALIAS)
+                            .setSubject(X500Principal("CN=$KEY_ALIAS"))
+                            .setSerialNumber(BigInteger.TEN)
+                            .setStartDate(start.time)
+                            .setEndDate(end.time)
+                            .build()
+                    val kpg = KeyPairGenerator.getInstance("RSA", AndroidKeyStore)
+                    kpg.initialize(spec)
+                    kpg.generateKeyPair()
+                }
+            }
+        }
+
+        @Throws(Exception::class)
+        private fun rsaEncrypt(secret: ByteArray): ByteArray {
+            val privateKeyEntry = keyStore?.getEntry(KEY_ALIAS, null) as? KeyStore.PrivateKeyEntry
+            // Encrypt the text
+            val inputCipher = Cipher.getInstance(RSA_MODE, "AndroidOpenSSL")
+            inputCipher.init(Cipher.ENCRYPT_MODE, privateKeyEntry?.certificate?.publicKey)
+
+            val outputStream = ByteArrayOutputStream()
+            val cipherOutputStream = CipherOutputStream(outputStream, inputCipher)
+            cipherOutputStream.write(secret)
+            cipherOutputStream.close()
+
+            return outputStream.toByteArray()
+        }
+
+        @Throws(Exception::class)
+        private fun rsaDecrypt(encrypted: ByteArray): ByteArray {
+            val privateKeyEntry = keyStore?.getEntry(KEY_ALIAS, null) as? KeyStore.PrivateKeyEntry
+            val output = Cipher.getInstance(RSA_MODE, "AndroidOpenSSL")
+            output.init(Cipher.DECRYPT_MODE, privateKeyEntry?.privateKey)
+            val cipherInputStream =
+                CipherInputStream(
+                    ByteArrayInputStream(encrypted),
+                    output,
+                )
+            return cipherInputStream.readBytes()
+        }
+
+        @Throws(Exception::class)
+        private fun generateAESKey() {
+            var enryptedKeyB64 = sharedPreferences.getString(ENCRYPTED_KEY, null)
+            if (enryptedKeyB64 == null) {
+                val key = ByteArray(16)
+                val secureRandom = SecureRandom()
+                secureRandom.nextBytes(key)
+                val encryptedKey = rsaEncrypt(key)
+                enryptedKeyB64 = Base64.encodeToString(encryptedKey, Base64.DEFAULT)
+                sharedPreferences.edit {
+                    putString(ENCRYPTED_KEY, enryptedKeyB64)
+                }
+            }
+        }
+
+        @Throws(Exception::class)
+        private fun getSecretKey(): Key {
+            val enryptedKeyB64 = sharedPreferences.getString(ENCRYPTED_KEY, null)
+
+            val encryptedKey = Base64.decode(enryptedKeyB64, Base64.DEFAULT)
+            val key = rsaDecrypt(encryptedKey)
+            return SecretKeySpec(key, "AES")
+        }
+
+        @Throws(NoSuchAlgorithmException::class, NoSuchPaddingException::class, NoSuchProviderException::class, BadPaddingException::class, IllegalBlockSizeException::class, UnsupportedEncodingException::class)
+        fun encrypt(input: String): String {
+            val c: Cipher
+            val publicIV = getRandomIV()
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                c = Cipher.getInstance(AES_MODE_M)
+                try {
+                    c.init(Cipher.ENCRYPT_MODE, aesKeyFromKS, GCMParameterSpec(128, Base64.decode(publicIV, Base64.DEFAULT)))
+                } catch (e: Exception) {
+                    HLogger.logException("KeyHelper", "Error encrypting", e)
+                }
+            } else {
+                c = Cipher.getInstance(AES_MODE_M)
+                try {
+                    c.init(Cipher.ENCRYPT_MODE, getSecretKey(), GCMParameterSpec(128, Base64.decode(publicIV, Base64.DEFAULT)))
+                } catch (e: Exception) {
+                    HLogger.logException("KeyHelper", "Error encrypting", e)
+                }
+            }
+            val encodedBytes = c.doFinal(input.toByteArray(charset("UTF-8")))
+            return Base64.encodeToString(encodedBytes, Base64.DEFAULT)
+        }
+
+        @Throws(NoSuchAlgorithmException::class, NoSuchPaddingException::class, NoSuchProviderException::class, BadPaddingException::class, IllegalBlockSizeException::class, UnsupportedEncodingException::class)
+        fun decrypt(encrypted: String): String? {
+            val c: Cipher
+            val publicIV = getRandomIV()
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                c = Cipher.getInstance(AES_MODE_M)
+                try {
+                    c.init(Cipher.DECRYPT_MODE, aesKeyFromKS, GCMParameterSpec(128, Base64.decode(publicIV, Base64.DEFAULT)))
+                } catch (e: Exception) {
+                    HLogger.logException("KeyHelper", "Error decrypting", e)
+                }
+            } else {
+                c = Cipher.getInstance(AES_MODE_M)
+                try {
+                    c.init(Cipher.DECRYPT_MODE, getSecretKey(), GCMParameterSpec(128, Base64.decode(publicIV, Base64.DEFAULT)))
+                } catch (e: Exception) {
+                    HLogger.logException("KeyHelper", "Error decrypting", e)
+                }
+            }
+
+            return try {
+                val decodedValue = Base64.decode(encrypted.toByteArray(charset("UTF-8")), Base64.DEFAULT)
+                val decryptedVal = c.doFinal(decodedValue)
+                String(decryptedVal)
+            } catch (error: IllegalArgumentException) {
+                null
+            } catch (e: GeneralSecurityException) {
+                null
+            } catch (e: IllegalStateException) {
+                null
+            }
+        }
+
+        private fun getRandomIV(): String {
+            var publicIV = sharedPreferences.getString(PUBLIC_IV, null)
+
+            if (publicIV == null) {
+                val random = SecureRandom()
+                val generated = random.generateSeed(12)
+                publicIV = Base64.encodeToString(generated, Base64.DEFAULT)
+                sharedPreferences.edit {
+                    putString(PUBLIC_IV, publicIV)
+                }
+            }
+            return publicIV ?: ""
+        }
+
+        companion object {
+            private const val RSA_MODE = "RSA/ECB/PKCS1Padding"
+            private const val AES_MODE_M = "AES/GCM/NoPadding"
+
+            private const val KEY_ALIAS = "KEY"
+            private const val ANDROID_KEY_STORE = "AndroidKeyStore"
+            const val ENCRYPTED_KEY = "ENCRYPTED_KEY"
+            const val PUBLIC_IV = "PUBLIC_IV"
+            private var keyHelper: KeyHelper? = null
+
+            fun getInstance(
+                ctx: Context,
+                sharedPreferences: SharedPreferences,
+                keyStore: KeyStore,
+            ): KeyHelper? {
+                if (keyHelper == null) {
+                    try {
+                        keyHelper = KeyHelper(ctx, sharedPreferences, keyStore)
+                    } catch (e: NoSuchPaddingException) {
+                        HLogger.logException("KeyHelper", "Error initializing", e)
+                    } catch (e: NoSuchProviderException) {
+                        HLogger.logException("KeyHelper", "Error initializing", e)
+                    } catch (e: NoSuchAlgorithmException) {
+                        HLogger.logException("KeyHelper", "Error initializing", e)
+                    } catch (e: InvalidAlgorithmParameterException) {
+                        HLogger.logException("KeyHelper", "Error initializing", e)
+                    } catch (e: KeyStoreException) {
+                        HLogger.logException("KeyHelper", "Error initializing", e)
+                    } catch (e: CertificateException) {
+                        HLogger.logException("KeyHelper", "Error initializing", e)
+                    } catch (e: IOException) {
+                        HLogger.logException("KeyHelper", "Error initializing", e)
+                    }
+                }
+                return keyHelper
+            }
         }
     }
-}
diff --git a/common/src/main/java/com/habitrpg/common/habitica/helpers/LanguageHelper.kt b/common/src/main/java/com/habitrpg/common/habitica/helpers/LanguageHelper.kt
index b84a0409c..f9d64cb5a 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/helpers/LanguageHelper.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/helpers/LanguageHelper.kt
@@ -3,7 +3,6 @@ package com.habitrpg.common.habitica.helpers
 import java.util.Locale
 
 class LanguageHelper(languageSharedPref: String?) {
-
     var locale: Locale
         private set
     var languageCode: String? = null
@@ -28,12 +27,13 @@ class LanguageHelper(languageSharedPref: String?) {
                 languageCode = "pt"
             }
             else -> {
-                locale = if (pref.contains("_")) {
-                    val languageCodeParts = pref.split("_".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
-                    Locale(languageCodeParts[0], languageCodeParts[1])
-                } else {
-                    Locale(pref)
-                }
+                locale =
+                    if (pref.contains("_")) {
+                        val languageCodeParts = pref.split("_".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
+                        Locale(languageCodeParts[0], languageCodeParts[1])
+                    } else {
+                        Locale(pref)
+                    }
                 languageCode = languageSharedPref
             }
         }
diff --git a/common/src/main/java/com/habitrpg/common/habitica/helpers/MainNavigationController.kt b/common/src/main/java/com/habitrpg/common/habitica/helpers/MainNavigationController.kt
index a9dfc1e85..f8e93b3d3 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/helpers/MainNavigationController.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/helpers/MainNavigationController.kt
@@ -18,7 +18,9 @@ object MainNavigationController {
     private var controllerReference: WeakReference<NavController>? = null
 
     private val navController: NavController?
-        get() { return controllerReference?.get() }
+        get() {
+            return controllerReference?.get()
+        }
 
     val isReady: Boolean
         get() = controllerReference?.get() != null
@@ -27,11 +29,17 @@ object MainNavigationController {
         controllerReference = WeakReference(navController)
     }
 
-    fun updateLabel(destinationID: Int, label: String) {
+    fun updateLabel(
+        destinationID: Int,
+        label: String,
+    ) {
         navController?.findDestination(destinationID)?.label = label
     }
 
-    fun navigate(transactionId: Int, args: Bundle? = null) {
+    fun navigate(
+        transactionId: Int,
+        args: Bundle? = null,
+    ) {
         if (abs((lastNavigation?.time ?: 0) - Date().time) > 500) {
             lastNavigation = Date()
             try {
@@ -49,7 +57,8 @@ object MainNavigationController {
             lastNavigation = Date()
             try {
                 navController?.navigate(directions)
-            } catch (_: IllegalArgumentException) {}
+            } catch (_: IllegalArgumentException) {
+            }
         }
     }
 
diff --git a/common/src/main/java/com/habitrpg/common/habitica/helpers/MarkdownParser.kt b/common/src/main/java/com/habitrpg/common/habitica/helpers/MarkdownParser.kt
index eacc6b5e4..e9fd8a5b7 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/helpers/MarkdownParser.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/helpers/MarkdownParser.kt
@@ -34,18 +34,19 @@ object MarkdownParser {
     internal var markwon: Markwon? = null
 
     fun setup(context: Context) {
-        markwon = Markwon.builder(context)
-            .usePlugin(StrikethroughPlugin.create())
-            .usePlugin(
-                ImagesPlugin.create {
-                    it.addSchemeHandler(OkHttpNetworkSchemeHandler.create())
-                        .addSchemeHandler(FileSchemeHandler.createWithAssets(context.assets))
-                }
-            )
-            .usePlugin(createImageSizeResolverScaleDpiPlugin(context))
-            .usePlugin(MovementMethodPlugin.create(LinkMovementMethod.getInstance()))
-            .usePlugin(LinkifyPlugin.create(Linkify.WEB_URLS))
-            .build()
+        markwon =
+            Markwon.builder(context)
+                .usePlugin(StrikethroughPlugin.create())
+                .usePlugin(
+                    ImagesPlugin.create {
+                        it.addSchemeHandler(OkHttpNetworkSchemeHandler.create())
+                            .addSchemeHandler(FileSchemeHandler.createWithAssets(context.assets))
+                    },
+                )
+                .usePlugin(createImageSizeResolverScaleDpiPlugin(context))
+                .usePlugin(MovementMethodPlugin.create(LinkMovementMethod.getInstance()))
+                .usePlugin(LinkifyPlugin.create(Linkify.WEB_URLS))
+                .build()
     }
 
     /**
@@ -54,28 +55,30 @@ object MarkdownParser {
     private fun createImageSizeResolverScaleDpiPlugin(context: Context): MarkwonPlugin {
         return object : AbstractMarkwonPlugin() {
             override fun configureConfiguration(builder: MarkwonConfiguration.Builder) {
-                builder.imageSizeResolver(object : ImageSizeResolverDef() {
-                    override fun resolveImageSize(
-                        imageSize: ImageSize?,
-                        imageBounds: Rect,
-                        canvasWidth: Int,
-                        textSize: Float
-                    ): Rect {
-                        val dpi = context.resources.displayMetrics.density
-                        var width = imageBounds.width()
-                        if (dpi > 1) {
-                            width = (dpi * width.toFloat()).toInt()
-                        }
-                        if (width > canvasWidth) {
-                            width = canvasWidth
-                        }
+                builder.imageSizeResolver(
+                    object : ImageSizeResolverDef() {
+                        override fun resolveImageSize(
+                            imageSize: ImageSize?,
+                            imageBounds: Rect,
+                            canvasWidth: Int,
+                            textSize: Float,
+                        ): Rect {
+                            val dpi = context.resources.displayMetrics.density
+                            var width = imageBounds.width()
+                            if (dpi > 1) {
+                                width = (dpi * width.toFloat()).toInt()
+                            }
+                            if (width > canvasWidth) {
+                                width = canvasWidth
+                            }
 
-                        val ratio = imageBounds.width().toFloat() / imageBounds.height()
-                        val height = (width / ratio + .5f).toInt()
+                            val ratio = imageBounds.width().toFloat() / imageBounds.height()
+                            val height = (width / ratio + .5f).toInt()
 
-                        return Rect(0, 0, width, height)
-                    }
-                })
+                            return Rect(0, 0, width, height)
+                        }
+                    },
+                )
             }
         }
     }
@@ -160,7 +163,10 @@ object MarkdownParser {
         return sb.toString()
     }
 
-    fun parseMarkdownAsync(input: String?, onSuccess: (Spanned) -> Unit) {
+    fun parseMarkdownAsync(
+        input: String?,
+        onSuccess: (Spanned) -> Unit,
+    ) {
         CoroutineScope(Dispatchers.IO).launch {
             val result = parseMarkdown(input)
             withContext(Dispatchers.Main) {
@@ -193,6 +199,7 @@ object MarkdownParser {
     private val markdownRegex = ".*[*#_\\[`~].*".toRegex()
     private val imageMarkdownRegex = """!\[.*?]\(.*?".*?"\)""".toRegex()
     private val markdownLinkRegex = "\\[([^\\]]+)\\]\\(([^\\)]+)\\)".toRegex()
+
     fun containsMarkdown(text: String): Boolean {
         return text.matches(markdownRegex) ||
             text.contains(imageMarkdownRegex) ||
@@ -218,15 +225,19 @@ fun TextView.setParsedMarkdown(input: Spanned?) {
     }
 }
 
-private fun handleUrlClicks(context: Context, url: String) {
-    val webpage = if (url.startsWith("/")) {
-        Uri.parse("${context.getString(R.string.base_url)}$url")
-    } else {
-        if (Uri.parse(url).scheme == null) {
-            Uri.parse("http://$url")
+private fun handleUrlClicks(
+    context: Context,
+    url: String,
+) {
+    val webpage =
+        if (url.startsWith("/")) {
+            Uri.parse("${context.getString(R.string.base_url)}$url")
         } else {
-            Uri.parse(url)
+            if (Uri.parse(url).scheme == null) {
+                Uri.parse("http://$url")
+            } else {
+                Uri.parse(url)
+            }
         }
-    }
     MainNavigationController.navigate(webpage)
 }
diff --git a/common/src/main/java/com/habitrpg/common/habitica/helpers/NumberAbbreviator.kt b/common/src/main/java/com/habitrpg/common/habitica/helpers/NumberAbbreviator.kt
index 74fd1e085..f0787ebfb 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/helpers/NumberAbbreviator.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/helpers/NumberAbbreviator.kt
@@ -5,12 +5,21 @@ import kotlin.math.abs
 import kotlin.math.min
 
 object NumberAbbreviator {
-
-    fun abbreviate(context: Context?, number: Float, numberOfDecimals: Int = 2, minForAbbrevation: Int = 0): String {
+    fun abbreviate(
+        context: Context?,
+        number: Float,
+        numberOfDecimals: Int = 2,
+        minForAbbrevation: Int = 0,
+    ): String {
         return abbreviate(context, number.toDouble(), numberOfDecimals, minForAbbrevation)
     }
 
-    fun abbreviate(context: Context?, number: Double, numberOfDecimals: Int = 2, minForAbbrevation: Int = 0): String {
+    fun abbreviate(
+        context: Context?,
+        number: Double,
+        numberOfDecimals: Int = 2,
+        minForAbbrevation: Int = 0,
+    ): String {
         val decimalCount = if (number != 0.0 && number > -1 && number < 1 && numberOfDecimals == 0) 2 else numberOfDecimals
         val absNumber = abs(number)
         var usedNumber = absNumber
@@ -35,13 +44,14 @@ object NumberAbbreviator {
         return result + abbreviationForCounter(counter)
     }
 
-    private fun abbreviationForCounter(counter: Int): String = when (counter) {
-        0 -> ""
-        1 -> "k"
-        2 -> "m"
-        3 -> "b"
-        4 -> "t"
-        5 -> "q"
-        else -> ""
-    }
+    private fun abbreviationForCounter(counter: Int): String =
+        when (counter) {
+            0 -> ""
+            1 -> "k"
+            2 -> "m"
+            3 -> "b"
+            4 -> "t"
+            5 -> "q"
+            else -> ""
+        }
 }
diff --git a/common/src/main/java/com/habitrpg/common/habitica/helpers/RecyclerViewEmptySupport.kt b/common/src/main/java/com/habitrpg/common/habitica/helpers/RecyclerViewEmptySupport.kt
index ff8e6b477..d1a0dc1bf 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/helpers/RecyclerViewEmptySupport.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/helpers/RecyclerViewEmptySupport.kt
@@ -21,14 +21,14 @@ data class EmptyItem(
     var text: String? = null,
     var iconResource: Int? = null,
     var tintedIcon: Boolean = true,
-    var onButtonTap: (() -> Unit)? = null
+    var onButtonTap: (() -> Unit)? = null,
 )
 
 enum class RecyclerViewState {
     LOADING,
     EMPTY,
     DISPLAYING_DATA,
-    FAILED
+    FAILED,
 }
 
 class FailedViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
@@ -47,7 +47,6 @@ class FailedViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
 class HolderViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView)
 
 class EmptyViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-
     private val binding = EmptyItemBinding.bind(itemView)
 
     fun bind(emptyItem: EmptyItem?) {
@@ -55,9 +54,9 @@ class EmptyViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
             binding.emptyIconView.setColorFilter(
                 ContextCompat.getColor(
                     itemView.context,
-                    R.color.text_dimmed
+                    R.color.text_dimmed,
                 ),
-                android.graphics.PorterDuff.Mode.MULTIPLY
+                android.graphics.PorterDuff.Mode.MULTIPLY,
             )
         }
         emptyItem?.iconResource?.let { binding.emptyIconView.setImageResource(it) }
@@ -84,7 +83,10 @@ class RecyclerViewStateAdapter(val showLoadingAsEmpty: Boolean = false) : Recycl
             notifyItemChanged(0)
         }
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int,
+    ): RecyclerView.ViewHolder {
         return when (viewType) {
             0 -> {
                 val view = parent.inflate(R.layout.loading_item)
@@ -101,15 +103,19 @@ class RecyclerViewStateAdapter(val showLoadingAsEmpty: Boolean = false) : Recycl
                 object : RecyclerView.ViewHolder(view) {}
             }
             1 -> FailedViewHolder(parent.inflate(R.layout.failed_item))
-            else -> if (emptyViewBuilder != null) {
-                HolderViewHolder(emptyViewBuilder?.invoke() ?: View(parent.context))
-            } else {
-                EmptyViewHolder(parent.inflate(R.layout.empty_item))
-            }
+            else ->
+                if (emptyViewBuilder != null) {
+                    HolderViewHolder(emptyViewBuilder?.invoke() ?: View(parent.context))
+                } else {
+                    EmptyViewHolder(parent.inflate(R.layout.empty_item))
+                }
         }
     }
 
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+    override fun onBindViewHolder(
+        holder: RecyclerView.ViewHolder,
+        position: Int,
+    ) {
         if (holder is EmptyViewHolder) {
             holder.bind(emptyItem)
         } else if (holder is FailedViewHolder) {
diff --git a/common/src/main/java/com/habitrpg/common/habitica/models/Notification.kt b/common/src/main/java/com/habitrpg/common/habitica/models/Notification.kt
index fc7d71ec5..bce925a82 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/models/Notification.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/models/Notification.kt
@@ -70,7 +70,7 @@ class Notification {
         // Custom notification types (created by this app)
         GUILD_INVITATION("GUILD_INVITATION"),
         PARTY_INVITATION("PARTY_INVITATION"),
-        QUEST_INVITATION("QUEST_INVITATION")
+        QUEST_INVITATION("QUEST_INVITATION"),
     }
 
     var id: String = ""
diff --git a/common/src/main/java/com/habitrpg/common/habitica/models/PlayerTier.kt b/common/src/main/java/com/habitrpg/common/habitica/models/PlayerTier.kt
index ec1ef11b3..5952c7c51 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/models/PlayerTier.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/models/PlayerTier.kt
@@ -5,7 +5,6 @@ import androidx.core.content.ContextCompat
 import com.habitrpg.common.habitica.R
 
 class PlayerTier(val title: String, val id: Int) {
-
     companion object {
         fun getTiers(): List<PlayerTier> {
             return arrayListOf(
@@ -16,11 +15,14 @@ class PlayerTier(val title: String, val id: Int) {
                 PlayerTier("Tier 5 (Champion)", 5),
                 PlayerTier("Tier 6 (Champion)", 6),
                 PlayerTier("Tier 7 (Legendary)", 7),
-                PlayerTier("Staff (Heroic)", 9)
+                PlayerTier("Staff (Heroic)", 9),
             )
         }
 
-        fun getColorForTier(context: Context, value: Int): Int {
+        fun getColorForTier(
+            context: Context,
+            value: Int,
+        ): Int {
             return when (value) {
                 1 -> ContextCompat.getColor(context, R.color.contributor_1)
                 2 -> ContextCompat.getColor(context, R.color.contributor_2)
diff --git a/common/src/main/java/com/habitrpg/common/habitica/models/auth/UserAuth.kt b/common/src/main/java/com/habitrpg/common/habitica/models/auth/UserAuth.kt
index 634dc65e3..a8e5c7bee 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/models/auth/UserAuth.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/models/auth/UserAuth.kt
@@ -4,5 +4,5 @@ class UserAuth(
     var username: String? = null,
     var password: String? = null,
     var confirmPassword: String? = null,
-    var email: String? = null
+    var email: String? = null,
 )
diff --git a/common/src/main/java/com/habitrpg/common/habitica/models/auth/UserAuthSocialTokens.kt b/common/src/main/java/com/habitrpg/common/habitica/models/auth/UserAuthSocialTokens.kt
index 528dc68d2..6bb2e7e58 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/models/auth/UserAuthSocialTokens.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/models/auth/UserAuthSocialTokens.kt
@@ -1,5 +1,6 @@
 package com.habitrpg.common.habitica.models.auth
 
+@Suppress("PropertyName")
 class UserAuthSocialTokens {
     var client_id: String? = null
     var access_token: String? = null
diff --git a/common/src/main/java/com/habitrpg/common/habitica/models/notifications/AchievementData.kt b/common/src/main/java/com/habitrpg/common/habitica/models/notifications/AchievementData.kt
index b4263fc76..97e7ad103 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/models/notifications/AchievementData.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/models/notifications/AchievementData.kt
@@ -1,7 +1,6 @@
 package com.habitrpg.common.habitica.models.notifications
 
 open class AchievementData : NotificationData {
-
     val isLastOnboardingAchievement: Boolean = false
     var achievement: String? = null
     var message: String? = null
diff --git a/common/src/main/java/com/habitrpg/common/habitica/models/notifications/FirstDropData.kt b/common/src/main/java/com/habitrpg/common/habitica/models/notifications/FirstDropData.kt
index 5b1ad6071..e4d11d643 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/models/notifications/FirstDropData.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/models/notifications/FirstDropData.kt
@@ -1,7 +1,6 @@
 package com.habitrpg.common.habitica.models.notifications
 
 open class FirstDropData : NotificationData {
-
     var egg: String? = null
     var hatchingPotion: String? = null
 }
diff --git a/common/src/main/java/com/habitrpg/common/habitica/models/notifications/GuildInvitationData.kt b/common/src/main/java/com/habitrpg/common/habitica/models/notifications/GuildInvitationData.kt
index 1ba55299c..6b07ee1d0 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/models/notifications/GuildInvitationData.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/models/notifications/GuildInvitationData.kt
@@ -1,7 +1,6 @@
 package com.habitrpg.common.habitica.models.notifications
 
 open class GuildInvitationData : NotificationData {
-
     var invitation: GuildInvite? = null
 }
 
diff --git a/common/src/main/java/com/habitrpg/common/habitica/models/notifications/LoginIncentiveData.kt b/common/src/main/java/com/habitrpg/common/habitica/models/notifications/LoginIncentiveData.kt
index 3ef9708c5..7a99eca34 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/models/notifications/LoginIncentiveData.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/models/notifications/LoginIncentiveData.kt
@@ -1,7 +1,6 @@
 package com.habitrpg.common.habitica.models.notifications
 
 open class LoginIncentiveData : NotificationData {
-
     var message: String? = null
     var nextRewardAt: Int? = null
     var rewardText: String? = null
diff --git a/common/src/main/java/com/habitrpg/common/habitica/theme/HabiticaTheme.kt b/common/src/main/java/com/habitrpg/common/habitica/theme/HabiticaTheme.kt
index df2ef2192..de5a3d0ca 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/theme/HabiticaTheme.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/theme/HabiticaTheme.kt
@@ -17,101 +17,117 @@ import com.google.accompanist.themeadapter.material.createMdcTheme
 
 @Composable
 fun HabiticaTheme(
-    content: @Composable () -> Unit
+    content: @Composable () -> Unit,
 ) {
     val context = LocalContext.current
     val layoutDirection = LocalLayoutDirection.current
-    val (colors, _, _) = createMdcTheme(
-        context = context,
-        layoutDirection = layoutDirection,
-        setTextColors = true
-    )
+    val (colors, _, _) =
+        createMdcTheme(
+            context = context,
+            layoutDirection = layoutDirection,
+            setTextColors = true,
+        )
     MaterialTheme(
         colors = colors ?: MaterialTheme.colors,
-        typography = Typography(
-            defaultFontFamily = FontFamily.Default,
-            h1 = TextStyle(
-                fontWeight = FontWeight.Medium,
-                fontSize = 20.sp,
-                letterSpacing = (0.05).sp
+        typography =
+            Typography(
+                defaultFontFamily = FontFamily.Default,
+                h1 =
+                    TextStyle(
+                        fontWeight = FontWeight.Medium,
+                        fontSize = 20.sp,
+                        letterSpacing = (0.05).sp,
+                    ),
+                h2 =
+                    TextStyle(
+                        fontWeight = FontWeight.Normal,
+                        fontSize = 28.sp,
+                        letterSpacing = (0.05).sp,
+                    ),
+                subtitle1 =
+                    TextStyle(
+                        fontWeight = FontWeight.Medium,
+                        fontSize = 16.sp,
+                    ),
+                subtitle2 =
+                    TextStyle(
+                        fontWeight = FontWeight.Normal,
+                        fontSize = 16.sp,
+                        letterSpacing = 0.1.sp,
+                    ),
+                body1 =
+                    TextStyle(
+                        fontWeight = FontWeight.Medium,
+                        fontSize = 14.sp,
+                        letterSpacing = 0.35.sp,
+                        lineHeight = 16.sp,
+                    ),
+                body2 =
+                    TextStyle(
+                        fontWeight = FontWeight.Normal,
+                        fontSize = 14.sp,
+                        letterSpacing = 0.2.sp,
+                        lineHeight = 16.sp,
+                    ),
+                button =
+                    TextStyle(
+                        fontWeight = FontWeight.Medium,
+                        fontSize = 14.sp,
+                        letterSpacing = 1.25.sp,
+                    ),
+                caption =
+                    TextStyle(
+                        fontWeight = FontWeight.Bold,
+                        fontSize = 12.sp,
+                    ),
+                overline =
+                    TextStyle(
+                        fontWeight = FontWeight.Medium,
+                        fontSize = 10.sp,
+                        letterSpacing = 1.5.sp,
+                    ),
             ),
-            h2 = TextStyle(
-                fontWeight = FontWeight.Normal,
-                fontSize = 28.sp,
-                letterSpacing = (0.05).sp
+        shapes =
+            Shapes(
+                RoundedCornerShape(4.dp),
+                RoundedCornerShape(8.dp),
+                RoundedCornerShape(12.dp),
             ),
-            subtitle1 = TextStyle(
-                fontWeight = FontWeight.Medium,
-                fontSize = 16.sp
-            ),
-            subtitle2 = TextStyle(
-                fontWeight = FontWeight.Normal,
-                fontSize = 16.sp,
-                letterSpacing = 0.1.sp
-            ),
-            body1 = TextStyle(
-                fontWeight = FontWeight.Medium,
-                fontSize = 14.sp,
-                letterSpacing = 0.35.sp,
-                lineHeight = 16.sp
-            ),
-            body2 = TextStyle(
-                fontWeight = FontWeight.Normal,
-                fontSize = 14.sp,
-                letterSpacing = 0.2.sp,
-                lineHeight = 16.sp
-            ),
-            button = TextStyle(
-                fontWeight = FontWeight.Medium,
-                fontSize = 14.sp,
-                letterSpacing = 1.25.sp
-            ),
-            caption = TextStyle(
-                fontWeight = FontWeight.Bold,
-                fontSize = 12.sp
-            ),
-            overline = TextStyle(
-                fontWeight = FontWeight.Medium,
-                fontSize = 10.sp,
-                letterSpacing = 1.5.sp
-            )
-        ),
-        shapes = Shapes(
-            RoundedCornerShape(4.dp),
-            RoundedCornerShape(8.dp),
-            RoundedCornerShape(12.dp)
-        ),
-        content = content
+        content = content,
     )
 }
 
 val Typography.caption1
     get() = caption
 val Typography.caption2
-    get() = TextStyle(
-        fontWeight = FontWeight.Medium,
-        fontSize = 12.sp,
-        letterSpacing = 0.4.sp
-    )
+    get() =
+        TextStyle(
+            fontWeight = FontWeight.Medium,
+            fontSize = 12.sp,
+            letterSpacing = 0.4.sp,
+        )
 val Typography.caption3
-    get() = TextStyle(
-        fontWeight = FontWeight.Medium,
-        fontSize = 12.sp,
-        letterSpacing = 0.3.sp,
-        lineHeight = 14.sp
-    )
+    get() =
+        TextStyle(
+            fontWeight = FontWeight.Medium,
+            fontSize = 12.sp,
+            letterSpacing = 0.3.sp,
+            lineHeight = 14.sp,
+        )
 val Typography.caption4
-    get() = TextStyle(
-        fontWeight = FontWeight.Normal,
-        fontSize = 12.sp,
-        letterSpacing = 0.35.sp
-    )
+    get() =
+        TextStyle(
+            fontWeight = FontWeight.Normal,
+            fontSize = 12.sp,
+            letterSpacing = 0.35.sp,
+        )
 val Typography.subtitle3
-    get() = TextStyle(
-        fontWeight = FontWeight.Normal,
-        fontSize = 16.sp,
-        letterSpacing = 0.15.sp
-    )
+    get() =
+        TextStyle(
+            fontWeight = FontWeight.Normal,
+            fontSize = 16.sp,
+            letterSpacing = 0.15.sp,
+        )
 
 object HabiticaTheme {
     val typography: Typography
@@ -140,7 +156,7 @@ class HabiticaColors(
     val errorBackground: Color,
     val errorColor: Color,
     val successBackground: Color,
-    val successColor: Color
+    val successColor: Color,
 )
 
 class HabiticaTypography
diff --git a/common/src/main/java/com/habitrpg/common/habitica/views/AvatarView.kt b/common/src/main/java/com/habitrpg/common/habitica/views/AvatarView.kt
index a792a3afa..7ccb892e1 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/views/AvatarView.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/views/AvatarView.kt
@@ -30,7 +30,6 @@ import java.util.EnumMap
 import java.util.concurrent.atomic.AtomicInteger
 
 class AvatarView : FrameLayout {
-
     private var showBackground = true
     private var showMount = true
     private var showPet = true
@@ -69,7 +68,14 @@ class AvatarView : FrameLayout {
     private var lastSubstitutionCheck: Date? = null
 
     private val originalRect: Rect
-        get() = if (showMount || showPet) FULL_HERO_RECT else if (showBackground) COMPACT_HERO_RECT else HERO_ONLY_RECT
+        get() =
+            if (showMount || showPet) {
+                FULL_HERO_RECT
+            } else if (showBackground) {
+                COMPACT_HERO_RECT
+            } else {
+                HERO_ONLY_RECT
+            }
 
     private val avatarImage: Bitmap?
         get() {
@@ -80,11 +86,12 @@ class AvatarView : FrameLayout {
             val viewHeight = if (height > 0) height else (layoutParams?.height ?: 147)
             val canvasRect = Rect(0, 0, if (viewWidth > 0) viewWidth else 140.dpToPx(context), if (viewHeight > 0) viewHeight else 147.dpToPx(context))
             if (canvasRect.isEmpty) return null
-            avatarBitmap = Bitmap.createBitmap(
-                canvasRect.width(),
-                canvasRect.height(),
-                Bitmap.Config.ARGB_8888
-            )
+            avatarBitmap =
+                Bitmap.createBitmap(
+                    canvasRect.width(),
+                    canvasRect.height(),
+                    Bitmap.Config.ARGB_8888,
+                )
             avatarBitmap?.let { avatarCanvas = Canvas(it) }
             imageViewHolder.forEach {
                 val bitmap = (it.drawable as? BitmapDrawable)?.bitmap ?: return@forEach
@@ -92,7 +99,7 @@ class AvatarView : FrameLayout {
                     bitmap,
                     Rect(0, 0, bitmap.width, bitmap.height),
                     Rect(it.marginStart, it.marginTop, bitmap.width + it.marginStart, bitmap.height + it.marginTop),
-                    null
+                    null,
                 )
             }
 
@@ -117,14 +124,18 @@ class AvatarView : FrameLayout {
         this.showPet = showPet
     }
 
-    private fun init(attrs: AttributeSet?, defStyle: Int) {
+    private fun init(
+        attrs: AttributeSet?,
+        defStyle: Int,
+    ) {
         // Load attributes
-        val a = context.obtainStyledAttributes(
-            attrs,
-            R.styleable.AvatarView,
-            defStyle,
-            0
-        )
+        val a =
+            context.obtainStyledAttributes(
+                attrs,
+                R.styleable.AvatarView,
+                defStyle,
+                0,
+            )
 
         try {
             showBackground = a.getBoolean(R.styleable.AvatarView_showBackground, true)
@@ -148,15 +159,16 @@ class AvatarView : FrameLayout {
         for ((layerKey, layerName) in layerMap) {
             val layerNumber = i++
 
-            val imageView = if (imageViewHolder.size <= layerNumber) {
-                val newImageView = ImageView(context)
-                newImageView.scaleType = ImageView.ScaleType.MATRIX
-                addView(newImageView)
-                imageViewHolder.add(newImageView)
-                newImageView
-            } else {
-                imageViewHolder[layerNumber]
-            }
+            val imageView =
+                if (imageViewHolder.size <= layerNumber) {
+                    val newImageView = ImageView(context)
+                    newImageView.scaleType = ImageView.ScaleType.MATRIX
+                    addView(newImageView)
+                    imageViewHolder.add(newImageView)
+                    newImageView
+                } else {
+                    imageViewHolder[layerNumber]
+                }
 
             if (imageView.tag == layerName) {
                 continue
@@ -166,36 +178,39 @@ class AvatarView : FrameLayout {
             imageView.setImageResource(0)
 
             imageView.load(
-                DataBindingUtils.BASE_IMAGE_URL + DataBindingUtils.getFullFilename(
-                    layerName
-                )
+                DataBindingUtils.BASE_IMAGE_URL +
+                    DataBindingUtils.getFullFilename(
+                        layerName,
+                    ),
             ) {
                 allowHardware(false)
-                target(object : coil.target.Target {
-                    override fun onError(error: Drawable?) {
-                        super.onError(error)
-                        imageView.setImageDrawable(error)
-                        onLayerComplete()
-                    }
-
-                    override fun onSuccess(result: Drawable) {
-                        result.isFilterBitmap = false
-                        super.onSuccess(result)
-                        imageView.setImageDrawable(result)
-                        if (result is Animatable) {
-                            result.start()
+                target(
+                    object : coil.target.Target {
+                        override fun onError(error: Drawable?) {
+                            super.onError(error)
+                            imageView.setImageDrawable(error)
+                            onLayerComplete()
                         }
-                        val bounds = getLayerBounds(layerKey, layerName, result)
-                        imageView.imageMatrix = avatarMatrix
-                        val layoutParams = imageView.layoutParams as? LayoutParams
-                        layoutParams?.topMargin = bounds.top
-                        layoutParams?.marginStart = bounds.left
-                        layoutParams?.width = bounds.right
-                        layoutParams?.height = bounds.bottom
-                        imageView.layoutParams = layoutParams
-                        onLayerComplete()
-                    }
-                })
+
+                        override fun onSuccess(result: Drawable) {
+                            result.isFilterBitmap = false
+                            super.onSuccess(result)
+                            imageView.setImageDrawable(result)
+                            if (result is Animatable) {
+                                result.start()
+                            }
+                            val bounds = getLayerBounds(layerKey, layerName, result)
+                            imageView.imageMatrix = avatarMatrix
+                            val layoutParams = imageView.layoutParams as? LayoutParams
+                            layoutParams?.topMargin = bounds.top
+                            layoutParams?.marginStart = bounds.left
+                            layoutParams?.width = bounds.right
+                            layoutParams?.height = bounds.bottom
+                            imageView.layoutParams = layoutParams
+                            onLayerComplete()
+                        }
+                    },
+                )
             }
         }
         while (i < (imageViewHolder.size)) {
@@ -206,7 +221,10 @@ class AvatarView : FrameLayout {
         }
     }
 
-    private fun getLayerMap(avatar: Avatar, resetHasAttributes: Boolean): Map<LayerType, String> {
+    private fun getLayerMap(
+        avatar: Avatar,
+        resetHasAttributes: Boolean,
+    ): Map<LayerType, String> {
         val layerMap = getAvatarLayerMap(avatar, spriteSubstitutions)
 
         if (resetHasAttributes) {
@@ -247,7 +265,10 @@ class AvatarView : FrameLayout {
         return layerMap
     }
 
-    private fun substituteOrReturn(substitutions: Map<String, String>?, name: String): String {
+    private fun substituteOrReturn(
+        substitutions: Map<String, String>?,
+        name: String,
+    ): String {
         for (key in substitutions?.keys ?: arrayListOf()) {
             if (name.contains(key)) {
                 return substitutions?.get(key) ?: name
@@ -257,7 +278,10 @@ class AvatarView : FrameLayout {
     }
 
     @Suppress("ReturnCount")
-    private fun getAvatarLayerMap(avatar: Avatar, substitutions: Map<String, Map<String, String>>): EnumMap<LayerType, String> {
+    private fun getAvatarLayerMap(
+        avatar: Avatar,
+        substitutions: Map<String, Map<String, String>>,
+    ): EnumMap<LayerType, String> {
         val layerMap = EnumMap<LayerType, String>(LayerType::class.java)
 
         if (!avatar.isValid()) {
@@ -265,11 +289,12 @@ class AvatarView : FrameLayout {
         }
 
         val prefs = avatar.preferences ?: return layerMap
-        val outfit = if (prefs.costume) {
-            avatar.costume
-        } else {
-            avatar.equipped
-        }
+        val outfit =
+            if (prefs.costume) {
+                avatar.costume
+            } else {
+                avatar.equipped
+            }
 
         var hasVisualBuffs = false
 
@@ -363,53 +388,63 @@ class AvatarView : FrameLayout {
         return layerMap
     }
 
-    private fun getLayerBounds(layerType: LayerType, layerName: String, drawable: Drawable): Rect {
+    private fun getLayerBounds(
+        layerType: LayerType,
+        layerName: String,
+        drawable: Drawable,
+    ): Rect {
         var offset: PointF? = null
         val bounds = Rect(0, 0, drawable.intrinsicWidth, drawable.intrinsicHeight)
         val boundsF = RectF(bounds)
 
         // lookup layer specific offset
         when (layerName) {
-            "weapon_special_critical" -> offset = if (showMount || showPet) {
-                // full hero box
-                when {
-                    hasMount -> PointF(13.0f, 12.0f)
-                    hasPet -> PointF(13.0f, 24.5f + 12.0f)
-                    else -> PointF(13.0f, 28.0f + 12.0f)
-                }
-            } else if (showBackground) {
-                // compact hero box
-                PointF(-12.0f, 18.0f + 12.0f)
-            } else {
-                // hero only box
-                PointF(-12.0f, 12.0f)
-            }
+            "weapon_special_critical" ->
+                offset =
+                    if (showMount || showPet) {
+                        // full hero box
+                        when {
+                            hasMount -> PointF(13.0f, 12.0f)
+                            hasPet -> PointF(13.0f, 24.5f + 12.0f)
+                            else -> PointF(13.0f, 28.0f + 12.0f)
+                        }
+                    } else if (showBackground) {
+                        // compact hero box
+                        PointF(-12.0f, 18.0f + 12.0f)
+                    } else {
+                        // hero only box
+                        PointF(-12.0f, 12.0f)
+                    }
         }
 
         // otherwise lookup default layer type based offset
         if (offset == null) {
             when (layerType) {
-                LayerType.BACKGROUND -> if (!(showMount || showPet)) {
-                    offset = PointF(-25.0f, 0.0f) // compact hero box
-                }
+                LayerType.BACKGROUND ->
+                    if (!(showMount || showPet)) {
+                        offset = PointF(-25.0f, 0.0f) // compact hero box
+                    }
                 LayerType.MOUNT_BODY, LayerType.MOUNT_HEAD ->
                     offset =
                         PointF(24.0f, 18.0f) // full hero box
-                LayerType.CHAIR, LayerType.BACK, LayerType.SKIN, LayerType.SHIRT, LayerType.ARMOR, LayerType.BODY, LayerType.HEAD_0, LayerType.HAIR_BASE, LayerType.HAIR_BANGS, LayerType.HAIR_MUSTACHE, LayerType.HAIR_BEARD, LayerType.EYEWEAR, LayerType.VISUAL_BUFF, LayerType.HEAD, LayerType.HEAD_ACCESSORY, LayerType.HAIR_FLOWER, LayerType.SHIELD, LayerType.WEAPON, LayerType.ZZZ -> if (showMount || showPet) {
-                    // full hero box
-                    offset = when {
-                        hasMount -> if (layerMap[LayerType.MOUNT_HEAD]?.contains("Kangaroo") == true) {
-                            PointF(24.0f, 18f)
-                        } else {
-                            PointF(24.0f, 0f)
-                        }
-                        hasPet -> PointF(24.0f, 24f)
-                        else -> PointF(24.0f, 28.0f)
+                LayerType.CHAIR, LayerType.BACK, LayerType.SKIN, LayerType.SHIRT, LayerType.ARMOR, LayerType.BODY, LayerType.HEAD_0, LayerType.HAIR_BASE, LayerType.HAIR_BANGS, LayerType.HAIR_MUSTACHE, LayerType.HAIR_BEARD, LayerType.EYEWEAR, LayerType.VISUAL_BUFF, LayerType.HEAD, LayerType.HEAD_ACCESSORY, LayerType.HAIR_FLOWER, LayerType.SHIELD, LayerType.WEAPON, LayerType.ZZZ ->
+                    if (showMount || showPet) {
+                        // full hero box
+                        offset =
+                            when {
+                                hasMount ->
+                                    if (layerMap[LayerType.MOUNT_HEAD]?.contains("Kangaroo") == true) {
+                                        PointF(24.0f, 18f)
+                                    } else {
+                                        PointF(24.0f, 0f)
+                                    }
+                                hasPet -> PointF(24.0f, 24f)
+                                else -> PointF(24.0f, 28.0f)
+                            }
+                    } else if (showBackground) {
+                        // compact hero box
+                        offset = PointF(0.0f, 18.0f)
                     }
-                } else if (showBackground) {
-                    // compact hero box
-                    offset = PointF(0.0f, 18.0f)
-                }
                 LayerType.PET ->
                     offset =
                         PointF(0f, (FULL_HERO_RECT.height() - bounds.height()).toFloat())
@@ -453,7 +488,10 @@ class AvatarView : FrameLayout {
         }
     }
 
-    fun setAvatar(avatar: Avatar, preview: Map<LayerType, String>? = null) {
+    fun setAvatar(
+        avatar: Avatar,
+        preview: Map<LayerType, String>? = null,
+    ) {
         val oldUser = this.avatar
         this.avatar = avatar
         preview?.let { this.preview = preview }
@@ -525,7 +563,7 @@ class AvatarView : FrameLayout {
         WEAPON,
         MOUNT_HEAD,
         ZZZ,
-        PET
+        PET,
     }
 
     companion object {
diff --git a/common/src/main/java/com/habitrpg/common/habitica/views/ComposableAvatarView.kt b/common/src/main/java/com/habitrpg/common/habitica/views/ComposableAvatarView.kt
index 3b36640fb..c55de7688 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/views/ComposableAvatarView.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/views/ComposableAvatarView.kt
@@ -10,7 +10,7 @@ import com.habitrpg.shared.habitica.models.Avatar
 fun ComposableAvatarView(
     avatar: Avatar?,
     configManager: AppConfigManager,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     AndroidView(
         modifier = modifier, // Occupy the max size in the Compose UI tree
@@ -23,6 +23,6 @@ fun ComposableAvatarView(
             if (avatar != null) {
                 view.setAvatar(avatar)
             }
-        }
+        },
     )
 }
diff --git a/common/src/main/java/com/habitrpg/common/habitica/views/HabiticaCircularProgressView.kt b/common/src/main/java/com/habitrpg/common/habitica/views/HabiticaCircularProgressView.kt
index b8d78fd96..ee1fc27a6 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/views/HabiticaCircularProgressView.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/views/HabiticaCircularProgressView.kt
@@ -37,47 +37,52 @@ fun HabiticaCircularProgressView(
     animate: Boolean = true,
     indicatorSize: Dp = 100.dp,
     animationDuration: Int = 4000,
-    strokeWidth: Dp = 8.dp
+    strokeWidth: Dp = 8.dp,
 ) {
     val rotateAnimation: State<Float>
     if (animate) {
         val infiniteTransition = rememberInfiniteTransition()
 
-        rotateAnimation = infiniteTransition.animateFloat(
-            initialValue = 0f,
-            targetValue = 1080f,
-            animationSpec = infiniteRepeatable(
-                animation = tween(
-                    durationMillis = animationDuration,
-                    easing = CubicBezierEasing(0.3f, 0.0f, 0.2f, 1.0f)
-                )
+        rotateAnimation =
+            infiniteTransition.animateFloat(
+                initialValue = 0f,
+                targetValue = 1080f,
+                animationSpec =
+                    infiniteRepeatable(
+                        animation =
+                            tween(
+                                durationMillis = animationDuration,
+                                easing = CubicBezierEasing(0.3f, 0.0f, 0.2f, 1.0f),
+                            ),
+                    ),
             )
-        )
     } else {
         rotateAnimation = remember { mutableFloatStateOf(0f) }
     }
     val backgroundColor = MaterialTheme.colorScheme.surface
-    val brush = Brush.sweepGradient(
-        listOf(
-            colorResource(R.color.background_brand),
-            colorResource(R.color.background_red),
-            colorResource(R.color.background_orange),
-            colorResource(R.color.background_yellow),
-            colorResource(R.color.background_green),
-            colorResource(R.color.background_blue),
-            colorResource(R.color.background_brand)
+    val brush =
+        Brush.sweepGradient(
+            listOf(
+                colorResource(R.color.background_brand),
+                colorResource(R.color.background_red),
+                colorResource(R.color.background_orange),
+                colorResource(R.color.background_yellow),
+                colorResource(R.color.background_green),
+                colorResource(R.color.background_blue),
+                colorResource(R.color.background_brand),
+            ),
         )
-    )
     Canvas(
-        modifier = modifier
-            .rotate(-90f)
-            .size(size = indicatorSize - (strokeWidth * 2))
-            .padding(strokeWidth / 2)
+        modifier =
+            modifier
+                .rotate(-90f)
+                .size(size = indicatorSize - (strokeWidth * 2))
+                .padding(strokeWidth / 2),
     ) {
         rotate(rotateAnimation.value) {
             drawCircle(
                 brush = brush,
-                style = Stroke(width = strokeWidth.toPx(), cap = StrokeCap.Round)
+                style = Stroke(width = strokeWidth.toPx(), cap = StrokeCap.Round),
             )
         }
         if (partialDisplay < 1f) {
@@ -86,7 +91,7 @@ fun HabiticaCircularProgressView(
                 startAngle = (360f * partialDisplay),
                 sweepAngle = 360f - (360f * partialDisplay),
                 useCenter = true,
-                style = Stroke(width = strokeWidth.toPx() * 1.4f, cap = StrokeCap.Square, join = StrokeJoin.Miter, miter = 2f)
+                style = Stroke(width = strokeWidth.toPx() * 1.4f, cap = StrokeCap.Square, join = StrokeJoin.Miter, miter = 2f),
             )
         }
     }
@@ -98,7 +103,7 @@ private fun Preview() {
     Column(
         horizontalAlignment = Alignment.CenterHorizontally,
         verticalArrangement = Arrangement.spacedBy(8.dp),
-        modifier = Modifier.background(MaterialTheme.colorScheme.surface)
+        modifier = Modifier.background(MaterialTheme.colorScheme.surface),
     ) {
         HabiticaCircularProgressView()
         HabiticaCircularProgressView(indicatorSize = 40.dp, strokeWidth = 5.dp)
diff --git a/common/src/main/java/com/habitrpg/common/habitica/views/HabiticaProgressBar.kt b/common/src/main/java/com/habitrpg/common/habitica/views/HabiticaProgressBar.kt
index 81a9aba26..bc583b9f6 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/views/HabiticaProgressBar.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/views/HabiticaProgressBar.kt
@@ -11,106 +11,117 @@ import com.habitrpg.common.habitica.extensions.DataBindingUtils
 import com.habitrpg.common.habitica.extensions.layoutInflater
 import kotlin.math.min
 
-class HabiticaProgressBar @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null
-) : FrameLayout(context, attrs) {
-    val binding = ProgressBarBinding.inflate(context.layoutInflater, this)
+class HabiticaProgressBar
+    @JvmOverloads
+    constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+    ) : FrameLayout(context, attrs) {
+        val binding = ProgressBarBinding.inflate(context.layoutInflater, this)
 
-    var barForegroundColor: Int = 0
-        set(value) {
-            field = value
-            DataBindingUtils.setRoundedBackground(binding.bar, value)
-        }
-
-    var barPendingColor: Int = 0
-        set(value) {
-            field = value
-            DataBindingUtils.setRoundedBackground(binding.pendingBar, value)
-        }
-
-    var barBackgroundColor: Int = 0
-        set(value) {
-            field = value
-            if (value != 0) {
-                DataBindingUtils.setRoundedBackground(this, value)
-            }
-        }
-
-    var currentValue: Double = 0.0
-        set(value) {
-            if (field != value) {
+        var barForegroundColor: Int = 0
+            set(value) {
                 field = value
-                updateBar()
+                DataBindingUtils.setRoundedBackground(binding.bar, value)
             }
-        }
-    var maxValue: Double = 0.0
-        set(value) {
-            if (field != value) {
+
+        var barPendingColor: Int = 0
+            set(value) {
                 field = value
-                updateBar()
+                DataBindingUtils.setRoundedBackground(binding.pendingBar, value)
             }
-        }
 
-    var pendingValue: Double = 0.0
-        set(value) {
-            if (field != value) {
+        var barBackgroundColor: Int = 0
+            set(value) {
                 field = value
-                updateBar()
+                if (value != 0) {
+                    DataBindingUtils.setRoundedBackground(this, value)
+                }
+            }
+
+        var currentValue: Double = 0.0
+            set(value) {
+                if (field != value) {
+                    field = value
+                    updateBar()
+                }
+            }
+        var maxValue: Double = 0.0
+            set(value) {
+                if (field != value) {
+                    field = value
+                    updateBar()
+                }
+            }
+
+        var pendingValue: Double = 0.0
+            set(value) {
+                if (field != value) {
+                    field = value
+                    updateBar()
+                }
+            }
+
+        private fun updateBar() {
+            val remainingValue = currentValue - pendingValue
+            val remainingPercent =
+                if (remainingValue < 0) {
+                    0.0
+                } else {
+                    min(1.0, remainingValue / maxValue)
+                }
+            val pendingPercent = min(1.0, currentValue / maxValue)
+            this.setBarWeight(remainingPercent)
+            this.setPendingBarWeight(pendingPercent)
+        }
+
+        init {
+            View.inflate(context, R.layout.progress_bar, this)
+
+            val attributes =
+                context.theme?.obtainStyledAttributes(
+                    attrs,
+                    R.styleable.HabiticaProgressBar,
+                    0,
+                    0,
+                )
+
+            barForegroundColor = attributes?.getColor(R.styleable.HabiticaProgressBar_barForegroundColor, 0) ?: 0
+            barPendingColor = attributes?.getColor(R.styleable.HabiticaProgressBar_barPendingColor, 0) ?: 0
+            barBackgroundColor = attributes?.getColor(R.styleable.HabiticaProgressBar_barBackgroundColor, 0) ?: 0
+        }
+
+        private fun setBarWeight(percent: Double) {
+            setLayoutWeight(binding.bar, percent)
+            setLayoutWeight(binding.emptyBarSpace, 1.0f - percent)
+        }
+
+        private fun setPendingBarWeight(percent: Double) {
+            setLayoutWeight(binding.pendingBar, percent)
+            setLayoutWeight(binding.pendingEmptyBarSpace, 1.0f - percent)
+        }
+
+        fun set(
+            value: Double,
+            valueMax: Double,
+        ) {
+            currentValue = value
+            maxValue = valueMax
+            updateBar()
+        }
+
+        private fun setLayoutWeight(
+            view: View,
+            weight: Double,
+        ) {
+            view.clearAnimation()
+            val layout = view.layoutParams as? LinearLayout.LayoutParams
+            if (weight == 0.0 || weight == 1.0) {
+                layout?.weight = weight.toFloat()
+                view.layoutParams = layout
+            } else if (layout?.weight?.toDouble() != weight) {
+                layout?.weight = weight.toFloat()
+                view.layoutParams = layout
             }
         }
-
-    private fun updateBar() {
-        val remainingValue = currentValue - pendingValue
-        val remainingPercent = if (remainingValue < 0) {
-            0.0
-        } else {
-            min(1.0, remainingValue / maxValue)
-        }
-        val pendingPercent = min(1.0, currentValue / maxValue)
-        this.setBarWeight(remainingPercent)
-        this.setPendingBarWeight(pendingPercent)
     }
-
-    init {
-        View.inflate(context, R.layout.progress_bar, this)
-
-        val attributes = context.theme?.obtainStyledAttributes(
-            attrs,
-            R.styleable.HabiticaProgressBar,
-            0,
-            0
-        )
-
-        barForegroundColor = attributes?.getColor(R.styleable.HabiticaProgressBar_barForegroundColor, 0) ?: 0
-        barPendingColor = attributes?.getColor(R.styleable.HabiticaProgressBar_barPendingColor, 0) ?: 0
-        barBackgroundColor = attributes?.getColor(R.styleable.HabiticaProgressBar_barBackgroundColor, 0) ?: 0
-    }
-
-    private fun setBarWeight(percent: Double) {
-        setLayoutWeight(binding.bar, percent)
-        setLayoutWeight(binding.emptyBarSpace, 1.0f - percent)
-    }
-    private fun setPendingBarWeight(percent: Double) {
-        setLayoutWeight(binding.pendingBar, percent)
-        setLayoutWeight(binding.pendingEmptyBarSpace, 1.0f - percent)
-    }
-
-    fun set(value: Double, valueMax: Double) {
-        currentValue = value
-        maxValue = valueMax
-        updateBar()
-    }
-
-    private fun setLayoutWeight(view: View, weight: Double) {
-        view.clearAnimation()
-        val layout = view.layoutParams as? LinearLayout.LayoutParams
-        if (weight == 0.0 || weight == 1.0) {
-            layout?.weight = weight.toFloat()
-            view.layoutParams = layout
-        } else if (layout?.weight?.toDouble() != weight) {
-            layout?.weight = weight.toFloat()
-            view.layoutParams = layout
-        }
-    }
-}
diff --git a/common/src/main/java/com/habitrpg/common/habitica/views/PixelArtView.kt b/common/src/main/java/com/habitrpg/common/habitica/views/PixelArtView.kt
index 5d65c7c2b..34ac78c36 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/views/PixelArtView.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/views/PixelArtView.kt
@@ -8,64 +8,71 @@ import android.graphics.Rect
 import android.util.AttributeSet
 import java.lang.Integer.min
 
-class PixelArtView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
-) : androidx.appcompat.widget.AppCompatImageView(context, attrs, defStyleAttr) {
+class PixelArtView
+    @JvmOverloads
+    constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0,
+    ) : androidx.appcompat.widget.AppCompatImageView(context, attrs, defStyleAttr) {
+        private var targetRect = Rect(0, 0, 0, 0)
 
-    private var targetRect = Rect(0, 0, 0, 0)
-
-    var bitmap: Bitmap? = null
-        set(value) {
-            field = value
-            updateTargetRect()
-            invalidate()
-        }
-
-    private val paint: Paint by lazy {
-        val paint = Paint()
-        paint.isAntiAlias = true
-        paint.isFilterBitmap = false
-        paint
-    }
-
-    override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
-        super.onSizeChanged(w, h, oldw, oldh)
-        updateTargetRect()
-    }
-
-    private fun updateTargetRect() {
-        var targetWidth = bitmap?.width ?: 0
-        var targetHeight = bitmap?.height ?: 0
-        val smallestSide = min(width, height)
-        val divisor = if (targetWidth % 3 == 0 && targetHeight % 3 == 0) 3 else 2
-
-        val factor = min(
-            if (smallestSide > 0 && targetWidth > 0 && smallestSide != targetWidth) {
-                smallestSide / (targetWidth / divisor)
-            } else {
-                1
-            },
-            if (smallestSide > 0 && targetHeight > 0 && smallestSide != targetHeight) {
-                smallestSide / (targetHeight / divisor)
-            } else {
-                1
+        var bitmap: Bitmap? = null
+            set(value) {
+                field = value
+                updateTargetRect()
+                invalidate()
             }
-        )
-        targetWidth = (targetWidth / divisor) * factor
-        targetHeight = (targetHeight / divisor) * factor
-        val left = (width - targetWidth) / 2
-        val top = (height - targetHeight) / 2
-        targetRect = Rect(left, top, left + targetWidth, top + targetHeight)
-    }
 
-    override fun onDraw(canvas: Canvas) {
-        if (bitmap == null) {
-            super.onDraw(canvas)
-            return
+        private val paint: Paint by lazy {
+            val paint = Paint()
+            paint.isAntiAlias = true
+            paint.isFilterBitmap = false
+            paint
+        }
+
+        override fun onSizeChanged(
+            w: Int,
+            h: Int,
+            oldw: Int,
+            oldh: Int,
+        ) {
+            super.onSizeChanged(w, h, oldw, oldh)
+            updateTargetRect()
+        }
+
+        private fun updateTargetRect() {
+            var targetWidth = bitmap?.width ?: 0
+            var targetHeight = bitmap?.height ?: 0
+            val smallestSide = min(width, height)
+            val divisor = if (targetWidth % 3 == 0 && targetHeight % 3 == 0) 3 else 2
+
+            val factor =
+                min(
+                    if (smallestSide > 0 && targetWidth > 0 && smallestSide != targetWidth) {
+                        smallestSide / (targetWidth / divisor)
+                    } else {
+                        1
+                    },
+                    if (smallestSide > 0 && targetHeight > 0 && smallestSide != targetHeight) {
+                        smallestSide / (targetHeight / divisor)
+                    } else {
+                        1
+                    },
+                )
+            targetWidth = (targetWidth / divisor) * factor
+            targetHeight = (targetHeight / divisor) * factor
+            val left = (width - targetWidth) / 2
+            val top = (height - targetHeight) / 2
+            targetRect = Rect(left, top, left + targetWidth, top + targetHeight)
+        }
+
+        override fun onDraw(canvas: Canvas) {
+            if (bitmap == null) {
+                super.onDraw(canvas)
+                return
+            }
+            val bitmap = bitmap ?: return
+            canvas.drawBitmap(bitmap, null, targetRect, paint)
         }
-        val bitmap = bitmap ?: return
-        canvas.drawBitmap(bitmap, null, targetRect, paint)
     }
-}
diff --git a/common/src/main/java/com/habitrpg/common/habitica/views/ValueBar.kt b/common/src/main/java/com/habitrpg/common/habitica/views/ValueBar.kt
index fda887a2f..f700679a6 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/views/ValueBar.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/views/ValueBar.kt
@@ -15,7 +15,6 @@ import java.math.RoundingMode
 import java.text.NumberFormat
 
 class ValueBar(context: Context, attrs: AttributeSet?) : FrameLayout(context, attrs) {
-
     var descriptionIconVisibility: Int
         get() = binding.descriptionIconView.visibility
         set(value) {
@@ -89,12 +88,13 @@ class ValueBar(context: Context, attrs: AttributeSet?) : FrameLayout(context, at
 
     init {
 
-        val attributes = context.theme?.obtainStyledAttributes(
-            attrs,
-            R.styleable.ValueBar,
-            0,
-            0
-        )
+        val attributes =
+            context.theme?.obtainStyledAttributes(
+                attrs,
+                R.styleable.ValueBar,
+                0,
+                0,
+            )
 
         binding.progressBar.barForegroundColor = attributes?.getColor(R.styleable.ValueBar_barForegroundColor, 0) ?: 0
         binding.progressBar.barPendingColor = attributes?.getColor(R.styleable.ValueBar_barPendingColor, 0) ?: 0
@@ -163,17 +163,21 @@ class ValueBar(context: Context, attrs: AttributeSet?) : FrameLayout(context, at
     var animationDuration = 500L
     var animationDelay = 0L
 
-    fun set(value: Double, valueMax: Double) {
+    fun set(
+        value: Double,
+        valueMax: Double,
+    ) {
         if (binding.progressBar.currentValue != value || maxValue != valueMax) {
             if (animationDuration == 0L || binding.valueTextView.text.isEmpty()) {
                 currentValue = value
             } else {
-                val animator = if (0 < value && value < 1) {
-                    // Show floating points in animation only if the value is between 0 to 1
-                    ValueAnimator.ofFloat(currentValue.toFloat(), value.toFloat())
-                } else {
-                    ValueAnimator.ofInt(currentValue.toInt(), value.toInt())
-                }
+                val animator =
+                    if (0 < value && value < 1) {
+                        // Show floating points in animation only if the value is between 0 to 1
+                        ValueAnimator.ofFloat(currentValue.toFloat(), value.toFloat())
+                    } else {
+                        ValueAnimator.ofInt(currentValue.toInt(), value.toInt())
+                    }
                 animator.duration = animationDuration
                 animator.startDelay = animationDelay
                 animator.addUpdateListener {
diff --git a/common/src/test/java/com/habitrpg/common/habitica/helpers/NumberAbbreviatorTest.kt b/common/src/test/java/com/habitrpg/common/habitica/helpers/NumberAbbreviatorTest.kt
index 687b84dae..e339f6f51 100644
--- a/common/src/test/java/com/habitrpg/common/habitica/helpers/NumberAbbreviatorTest.kt
+++ b/common/src/test/java/com/habitrpg/common/habitica/helpers/NumberAbbreviatorTest.kt
@@ -3,7 +3,6 @@ package com.habitrpg.common.habitica.helpers
 import android.content.Context
 import io.kotest.core.spec.style.StringSpec
 import io.kotest.datatest.withData
-import io.kotest.matchers.longs.shouldBeLessThan
 import io.kotest.matchers.shouldBe
 import io.mockk.clearMocks
 import io.mockk.every
@@ -41,36 +40,10 @@ class NumberAbbreviatorTest : StringSpec({
         Triple(40.2412, "40", 0),
         Triple(0.5, "0.5", 0),
         Triple(0.328, "0.32", 0),
-        Triple(-0.99, "-0.99", 0)
+        Triple(-0.99, "-0.99", 0),
     ) { (input, output, decimals) ->
         NumberAbbreviator.abbreviate(mockContext, input, decimals) shouldBe output
     }
 
-    "completes quickly" {
-        val iterations = 10000
-        val startTime = System.nanoTime()
-        repeat(iterations) {
-            NumberAbbreviator.abbreviate(mockContext, 201.5, 2) shouldBe "201.5"
-        }
-        val endTime = System.nanoTime()
-
-        val averageDuration = (endTime - startTime) / iterations
-        print("Average duration: $averageDuration")
-        averageDuration shouldBeLessThan 1500
-    }
-
-    "completes large numbers quickly" {
-        val iterations = 10000
-        val startTime = System.nanoTime()
-        repeat(iterations) {
-            NumberAbbreviator.abbreviate(mockContext, 1.9943212354213233E30, 2) shouldBe "1.99"
-        }
-        val endTime = System.nanoTime()
-
-        val averageDuration = (endTime - startTime) / iterations
-        print("Average duration: $averageDuration")
-        averageDuration shouldBeLessThan 2000
-    }
-
     afterSpec { clearMocks(mockContext) }
 })
diff --git a/detekt_baseline.xml b/detekt_baseline.xml
index 92259f95a..4db32f83b 100644
--- a/detekt_baseline.xml
+++ b/detekt_baseline.xml
@@ -13,19 +13,20 @@
     <ID>ComplexCondition:LoginActivity.kt$LoginActivity$username.isEmpty() || password.isEmpty() || email.isEmpty() || confirmPassword.isEmpty()</ID>
     <ID>ComplexCondition:LoginBackgroundView.kt$LoginBackgroundView$viewWidth &lt;= 0 || viewHeight &lt;= 0 || didLayoutStars || starViews?.size == 0</ID>
     <ID>ComplexCondition:NavigationDrawerFragment.kt$NavigationDrawerFragment$adapter.selectedItem != null &amp;&amp; adapter.selectedItem == transitionId &amp;&amp; bundle == null &amp;&amp; preventReselection</ID>
+    <ID>ComplexCondition:PartyInviteFragment.kt$viewModel.invites.size &gt; index &amp;&amp; viewModel.invites[index].isBlank() &amp;&amp; viewModel.invites.size - 1 != index &amp;&amp; viewModel.invites.size &gt; 1</ID>
     <ID>ComplexCondition:PurchaseDialog.kt$PurchaseDialog$(shopItem.currency != "gold" || shopItem.canAfford(user, purchaseQuantity)) &amp;&amp; !shopItem.locked &amp;&amp; purchaseQuantity &gt;= 1</ID>
     <ID>ComplexCondition:PurchaseDialog.kt$PurchaseDialog$shopIdentifier != null &amp;&amp; shopIdentifier == Shop.TIME_TRAVELERS_SHOP || "mystery_set" == shopItem.purchaseType || shopItem.currency == "hourglasses"</ID>
     <ID>ComplexCondition:PurchaseDialog.kt$PurchaseDialog$shopItem.habitClass != null &amp;&amp; shopItem.habitClass != "special" &amp;&amp; shopItem.habitClass != "armoire" &amp;&amp; user?.stats?.habitClass != shopItem.habitClass</ID>
     <ID>ComplexCondition:PurchaseDialog.kt$PurchaseDialog$shopItem.purchaseType == "customization" || shopItem.purchaseType == "background" || shopItem.purchaseType == "backgrounds" || shopItem.purchaseType == "customizationSet"</ID>
-    <ID>ComplexCondition:QuestProgressView.kt$QuestProgressView$quest == null || progress == null || !quest.isValid || !progress.isValid</ID>
     <ID>ComplexCondition:RealmTaskLocalRepository.kt$RealmTaskLocalRepository$firstTask != null &amp;&amp; secondTask != null &amp;&amp; firstTask.isValid &amp;&amp; secondTask.isValid</ID>
     <ID>ComplexCondition:RewardsRecyclerViewAdapter.kt$RewardsRecyclerViewAdapter$(customRewards != null &amp;&amp; position &lt; customRewardCount) || (customRewardCount == 0 &amp;&amp; inAppRewardCount == 0)</ID>
     <ID>ComplexCondition:SafeDefaultItemAnimator.kt$SafeDefaultItemAnimator$!removalsPending &amp;&amp; !movesPending &amp;&amp; !additionsPending &amp;&amp; !changesPending</ID>
+    <ID>ComplexCondition:SubscriptionBottomSheetFragment.kt$SubscriptionBottomSheetFragment$user?.purchased?.plan?.paymentMethod == "Google" &amp;&amp; user?.purchased?.plan?.isActive == true &amp;&amp; user?.purchased?.plan?.dateTerminated == null &amp;&amp; (newestSubscription?.isAutoRenewing != true)</ID>
     <ID>ComplexCondition:SubscriptionFragment.kt$SubscriptionFragment$user?.purchased?.plan?.paymentMethod == "Google" &amp;&amp; user?.purchased?.plan?.isActive == true &amp;&amp; user?.purchased?.plan?.dateTerminated == null &amp;&amp; (newestSubscription?.isAutoRenewing != true)</ID>
     <ID>ComplexCondition:Task.kt$Task$counterUp != null &amp;&amp; (counterUp ?: 0) &gt; 0 &amp;&amp; counterDown != null &amp;&amp; (counterDown ?: 0) &gt; 0</ID>
-    <ID>ComplexCondition:TaskAlarmManager.kt$TaskAlarmManager$remindersItem == null || (reminderItemTask.type == TaskType.DAILY &amp;&amp; zonedTime?.isBefore(now) == true &amp;&amp; reminderItemTask.nextDue?.firstOrNull() != null) || (reminderItemTask.type == TaskType.TODO &amp;&amp; zonedTime?.isBefore(now) == true)</ID>
     <ID>ComplexMethod:AccountPreferenceFragment.kt$AccountPreferenceFragment$override fun onPreferenceTreeClick(preference: Preference): Boolean</ID>
-    <ID>ComplexMethod:AppHeaderView.kt$@Composable fun AppHeaderView( user: Avatar?, teamPlan: TeamPlan? = null, teamPlanMembers: List&lt;Member&gt;? = null, onMemberRowClicked: () -&gt; Unit )</ID>
+    <ID>ComplexMethod:ApiClientImpl.kt$ApiClientImpl$fun accept(throwable: Throwable)</ID>
+    <ID>ComplexMethod:AppHeaderView.kt$@Composable fun AppHeaderView( user : Avatar?, modifier : Modifier = Modifier, isMyProfile : Boolean = false, teamPlan : TeamPlan? = null, teamPlanMembers : List&lt;Member&gt;? = null, onAvatarClicked: (() -&gt; Unit)? = null, onMemberRowClicked : () -&gt; Unit, onClassSelectionClicked: () -&gt; Unit, configManager: AppConfigManager )</ID>
     <ID>ComplexMethod:AvatarStatsWidgetProvider.kt$AvatarStatsWidgetProvider$private fun updateData(widgetIds: IntArray? = null)</ID>
     <ID>ComplexMethod:BaseActivity.kt$BaseActivity$internal open fun loadTheme(sharedPreferences: SharedPreferences, forced: Boolean = false)</ID>
     <ID>ComplexMethod:BaseTaskViewHolder.kt$BaseTaskViewHolder$open fun bind( data: Task, position: Int, displayMode: String, ownerID: String? )</ID>
@@ -36,7 +37,9 @@
     <ID>ComplexMethod:CustomizationSetupAdapter.kt$CustomizationSetupAdapter$private fun isCustomizationActive(customization: SetupCustomization): Boolean</ID>
     <ID>ComplexMethod:EquipmentOverviewView.kt$@Composable fun AvatarCustomizationOverviewView( preferences: Preferences?, outfit: Outfit?, onCustomizationTap: (String, String?) -&gt; Unit, onAvatarEquipmentTap: (String, String?) -&gt; Unit, modifier: Modifier = Modifier )</ID>
     <ID>ComplexMethod:GroupSerialization.kt$GroupSerialization$@Throws(JsonParseException::class) override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): Group</ID>
+    <ID>ComplexMethod:ItemDialogFragment.kt$ItemDialogFragment$override fun onViewCreated(view: View, savedInstanceState: Bundle?)</ID>
     <ID>ComplexMethod:ItemRecyclerAdapter.kt$ItemRecyclerAdapter.ItemViewHolder$override fun onClick(v: View)</ID>
+    <ID>ComplexMethod:LoadingButton.kt$@OptIn(ExperimentalAnimationApi::class) @Composable fun LoadingButton( state: LoadingButtonState, onClick: () -&gt; Unit, modifier: Modifier = Modifier, type: LoadingButtonType = LoadingButtonType.NORMAL, elevation: ButtonElevation? = ButtonDefaults.elevation(0.dp), shape: Shape = MaterialTheme.shapes.medium, border: BorderStroke? = null, colors: ButtonColors? = null, contentPadding: PaddingValues = ButtonDefaults.ContentPadding, successContent: (@Composable RowScope.() -&gt; Unit)? = null, failedContent: (@Composable RowScope.() -&gt; Unit)? = null, content: @Composable RowScope.() -&gt; Unit )</ID>
     <ID>ComplexMethod:LocalNotificationActionReceiver.kt$LocalNotificationActionReceiver$private fun handleLocalNotificationAction(action: String?)</ID>
     <ID>ComplexMethod:MemberSerialization.kt$MemberSerialization$@Throws(JsonParseException::class) override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): Member</ID>
     <ID>ComplexMethod:NavigationDrawerFragment.kt$NavigationDrawerFragment$private fun updateUser(user: User)</ID>
@@ -49,10 +52,12 @@
     <ID>ComplexMethod:SafeDefaultItemAnimator.kt$SafeDefaultItemAnimator$override fun runPendingAnimations()</ID>
     <ID>ComplexMethod:ScoreTaskLocallyInteractor.kt$ScoreTaskLocallyInteractor.Companion$fun score(user: User, task: Task, direction: TaskDirection): TaskDirectionData?</ID>
     <ID>ComplexMethod:SetupCustomizationRepositoryImpl.kt$SetupCustomizationRepositoryImpl$override fun getCustomizations(type: String, subtype: String?, user: User): List&lt;SetupCustomization&gt;</ID>
+    <ID>ComplexMethod:ShopRecyclerAdapter.kt$ShopRecyclerAdapter$@Suppress("ReturnCount") override fun onBindViewHolder( holder: ViewHolder, position: Int )</ID>
     <ID>ComplexMethod:ShowNotificationInteractor.kt$ShowNotificationInteractor$fun handleNotification(notification: Notification): Boolean</ID>
     <ID>ComplexMethod:StableViewModel.kt$StableViewModel$private fun mapAnimals(unsortedAnimals: List&lt;Animal&gt;, ownedAnimals: Map&lt;String, OwnedObject&gt;): ArrayList&lt;Any&gt;</ID>
     <ID>ComplexMethod:StatsFragment.kt$StatsFragment$private fun updateStats(user: User)</ID>
     <ID>ComplexMethod:SubscriptionDetailsView.kt$SubscriptionDetailsView$fun setPlan(plan: SubscriptionPlan)</ID>
+    <ID>ComplexMethod:Task.kt$Task$ fun getNextReminderOccurrences(remindersItem: RemindersItem?, occurrences: Int): List&lt;ZonedDateTime&gt;?</ID>
     <ID>ComplexMethod:Task.kt$Task$fun isBeingEdited(task: Task): Boolean</ID>
     <ID>ComplexMethod:TaskDescriptionBuilder.kt$TaskDescriptionBuilder$private fun describeRepeatDays(task: Task): Any</ID>
     <ID>ComplexMethod:TaskFormActivity.kt$TaskFormActivity$override fun onCreate(savedInstanceState: Bundle?)</ID>
@@ -67,10 +72,6 @@
     <ID>ConstructorParameterNaming:Days.kt$Days$`in`: Parcel</ID>
     <ID>ConstructorParameterNaming:Task.kt$Task$`in`: Parcel</ID>
     <ID>DuplicateCaseInWhenExpression:ShowNotificationInteractor.kt$ShowNotificationInteractor$when (notification.type) { Notification.Type.LOGIN_INCENTIVE.type -&gt; showCheckinDialog(notification) Notification.Type.ACHIEVEMENT_PARTY_UP.type -&gt; showAchievementDialog(notification) Notification.Type.ACHIEVEMENT_PARTY_ON.type -&gt; showAchievementDialog(notification) Notification.Type.ACHIEVEMENT_BEAST_MASTER.type -&gt; showAchievementDialog(notification) Notification.Type.ACHIEVEMENT_MOUNT_MASTER.type -&gt; showAchievementDialog(notification) Notification.Type.ACHIEVEMENT_TRIAD_BINGO.type -&gt; showAchievementDialog(notification) Notification.Type.ACHIEVEMENT_GUILD_JOINED.type -&gt; showAchievementDialog(notification) Notification.Type.ACHIEVEMENT_CHALLENGE_JOINED.type -&gt; showAchievementDialog(notification) Notification.Type.ACHIEVEMENT_INVITED_FRIEND.type -&gt; showAchievementDialog(notification) Notification.Type.WON_CHALLENGE.type -&gt; showWonChallengeDialog(notification) Notification.Type.ACHIEVEMENT_ALL_YOUR_BASE.type -&gt; showAchievementDialog(notification) Notification.Type.ACHIEVEMENT_BACK_TO_BASICS.type -&gt; showAchievementDialog(notification) Notification.Type.ACHIEVEMENT_JUST_ADD_WATER.type -&gt; showAchievementDialog(notification) Notification.Type.ACHIEVEMENT_LOST_MASTERCLASSER.type -&gt; showAchievementDialog(notification) Notification.Type.ACHIEVEMENT_MIND_OVER_MATTER.type -&gt; showAchievementDialog(notification) Notification.Type.ACHIEVEMENT_DUST_DEVIL.type -&gt; showAchievementDialog(notification) Notification.Type.ACHIEVEMENT_ARID_AUTHORITY.type -&gt; showAchievementDialog(notification) Notification.Type.ACHIEVEMENT_MONSTER_MAGUS.type -&gt; showAchievementDialog(notification) Notification.Type.ACHIEVEMENT_UNDEAD_UNDERTAKER.type -&gt; showAchievementDialog(notification) Notification.Type.ACHIEVEMENT_PRIMED_FOR_PAINTING.type -&gt; showAchievementDialog(notification) Notification.Type.ACHIEVEMENT_PEARLY_PRO.type -&gt; showAchievementDialog(notification) Notification.Type.ACHIEVEMENT_TICKLED_PINK.type -&gt; showAchievementDialog(notification) Notification.Type.ACHIEVEMENT_ROSY_OUTLOOK.type -&gt; showAchievementDialog(notification) Notification.Type.ACHIEVEMENT_BUG_BONANZA.type -&gt; showAchievementDialog(notification) Notification.Type.ACHIEVEMENT_BARE_NECESSITIES.type -&gt; showAchievementDialog(notification) Notification.Type.ACHIEVEMENT_FRESHWATER_FRIENDS.type -&gt; showAchievementDialog(notification) Notification.Type.ACHIEVEMENT_GOOD_AS_GOLD.type -&gt; showAchievementDialog(notification) Notification.Type.ACHIEVEMENT_ALL_THAT_GLITTERS.type -&gt; showAchievementDialog(notification) Notification.Type.ACHIEVEMENT_GOOD_AS_GOLD.type -&gt; showAchievementDialog(notification) Notification.Type.ACHIEVEMENT_BONE_COLLECTOR.type -&gt; showAchievementDialog(notification) Notification.Type.ACHIEVEMENT_SKELETON_CREW.type -&gt; showAchievementDialog(notification) Notification.Type.ACHIEVEMENT_SEEING_RED.type -&gt; showAchievementDialog(notification) Notification.Type.ACHIEVEMENT_RED_LETTER_DAY.type -&gt; showAchievementDialog(notification) Notification.Type.ACHIEVEMENT_GENERIC.type -&gt; showAchievementDialog(notification) Notification.Type.ACHIEVEMENT_ONBOARDING_COMPLETE.type -&gt; showAchievementDialog(notification) Notification.Type.FIRST_DROP.type -&gt; showFirstDropDialog(notification) else -&gt; return false }</ID>
-    <ID>EmptyCatchBlock:SoundFile.kt$SoundFile${ }</ID>
-    <ID>EmptyCatchBlock:WorldStateSerialization.kt$WorldStateSerialization${ }</ID>
-    <ID>EmptyDefaultConstructor:AuthenticationViewModel.kt$AuthenticationViewModel$()</ID>
-    <ID>EmptyDefaultConstructor:CustomizationRecyclerViewAdapter.kt$CustomizationRecyclerViewAdapter$()</ID>
     <ID>EmptyFunctionBlock:AccountPreferenceFragment.kt$AccountPreferenceFragment${ }</ID>
     <ID>EmptyFunctionBlock:FallExtraGemsHabiticaPromotion.kt$FallExtraGemsHabiticaPromotion${ }</ID>
     <ID>EmptyFunctionBlock:GiftOneGetOneHabiticaPromotion.kt$GiftOneGetOneHabiticaPromotion${ }</ID>
@@ -82,64 +83,80 @@
     <ID>EmptyFunctionBlock:SpookyExtraGemsHabiticaPromotion.kt$SpookyExtraGemsHabiticaPromotion${ }</ID>
     <ID>EmptyFunctionBlock:Survey2021Promotion.kt$Survey2021Promotion${ }</ID>
     <ID>ForbiddenComment:ShopItem.kt$ShopItem.Companion$// TODO: Needs a way to be translated.</ID>
-    <ID>ForbiddenComment:ShopRecyclerAdapter.kt$ShopRecyclerAdapter$// TODO: Enable this again when we have a nicer design</ID>
-    <ID>ForbiddenComment:SubscriptionDetailsView.kt$SubscriptionDetailsView$// TODO: Unhide once we figured out discrepancies.</ID>
     <ID>FunctionParameterNaming:BaseLocalRepository.kt$BaseLocalRepository$`object`: T</ID>
     <ID>FunctionParameterNaming:DragLinearLayout.kt$DragLinearLayout.Companion$`val`: Float</ID>
     <ID>FunctionParameterNaming:FullProfileActivity.kt$FullProfileActivity$`val`: Float</ID>
+    <ID>LargeClass:ApiClientImpl.kt$ApiClientImpl : ApiClient</ID>
+    <ID>LargeClass:FullProfileActivity.kt$FullProfileActivity : BaseActivity</ID>
     <ID>LargeClass:NavigationDrawerFragment.kt$NavigationDrawerFragment : DialogFragment</ID>
     <ID>LargeClass:TaskFormActivity.kt$TaskFormActivity : BaseActivity</ID>
-    <ID>LongMethod:AppHeaderView.kt$@Composable fun AppHeaderView( user: Avatar?, teamPlan: TeamPlan? = null, teamPlanMembers: List&lt;Member&gt;? = null, onMemberRowClicked: () -&gt; Unit )</ID>
-    <ID>LongMethod:AvatarOverviewFragment.kt$@Composable fun AvatarOverviewView( userViewModel: MainUserViewModel, showCustomization: Boolean = true, showEquipment: Boolean = true, battleGearTwoHanded: Boolean = false, costumeTwoHanded: Boolean = false, onCustomizationTap: (String, String?) -&gt; Unit, onAvatarEquipmentTap: (String, String?) -&gt; Unit, onEquipmentTap: (String, String?, Boolean) -&gt; Unit )</ID>
+    <ID>LongMethod:AppHeaderView.kt$@Composable fun AppHeaderView( user : Avatar?, modifier : Modifier = Modifier, isMyProfile : Boolean = false, teamPlan : TeamPlan? = null, teamPlanMembers : List&lt;Member&gt;? = null, onAvatarClicked: (() -&gt; Unit)? = null, onMemberRowClicked : () -&gt; Unit, onClassSelectionClicked: () -&gt; Unit, configManager: AppConfigManager )</ID>
+    <ID>LongMethod:ArmoireActivity.kt$ArmoireActivity$override fun onCreate(savedInstanceState: Bundle?)</ID>
+    <ID>LongMethod:AvatarOverviewFragment.kt$@Composable fun AvatarOverviewView( userViewModel: MainUserViewModel, showCustomization: Boolean = true, showEquipment: Boolean = true, battleGearTwoHanded: Boolean = false, costumeTwoHanded: Boolean = false, onCustomizationTap: (String, String?) -&gt; Unit, onAvatarEquipmentTap: (String, String?) -&gt; Unit, onEquipmentTap: (String, String?, Boolean) -&gt; Unit, )</ID>
     <ID>LongMethod:AvatarStatsWidgetProvider.kt$AvatarStatsWidgetProvider$private fun updateData(widgetIds: IntArray? = null)</ID>
     <ID>LongMethod:BaseTaskViewHolder.kt$BaseTaskViewHolder$open fun bind( data: Task, position: Int, displayMode: String, ownerID: String? )</ID>
     <ID>LongMethod:BirthdayActivity.kt$@Composable fun BirthdayActivityView( scaffoldState: ScaffoldState, isPurchasing: Boolean, hasGryphatrice: Boolean, hasEquipped: Boolean, price: String, startDate: Date, endDate: Date, onPurchaseClick: () -&gt; Unit, onGemPurchaseClick: () -&gt; Unit, onEquipClick: () -&gt; Unit )</ID>
+    <ID>LongMethod:BirthdayMenuView.kt$@Composable fun BirthdayBanner(endDate: Date, modifier: Modifier = Modifier)</ID>
     <ID>LongMethod:ChatRecyclerViewHolder.kt$ChatRecyclerMessageViewHolder$fun bind(msg: ChatMessage, uuid: String, user: User?, isExpanded: Boolean)</ID>
     <ID>LongMethod:ContentDeserializer.kt$ContentDeserializer$@Throws(JsonParseException::class) override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): ContentResult</ID>
     <ID>LongMethod:CustomizationDeserializer.kt$CustomizationDeserializer$@Throws(JsonParseException::class) override fun deserialize( json: JsonElement, typeOfT: Type, context: JsonDeserializationContext ): List&lt;Customization&gt;</ID>
+    <ID>LongMethod:DeathActivity.kt$DeathActivity$override fun onCreate(savedInstanceState: Bundle?)</ID>
     <ID>LongMethod:EquipmentOverviewView.kt$@Composable fun AvatarCustomizationOverviewView( preferences: Preferences?, outfit: Outfit?, onCustomizationTap: (String, String?) -&gt; Unit, onAvatarEquipmentTap: (String, String?) -&gt; Unit, modifier: Modifier = Modifier )</ID>
-    <ID>LongMethod:GroupPlanMemberList.kt$@Composable fun MemberItem( member: Member, role: String, onMemberClicked: (String) -&gt; Unit, modifier: Modifier = Modifier )</ID>
+    <ID>LongMethod:FullProfileActivity.kt$FullProfileActivity$override fun onOptionsItemSelected(item: MenuItem): Boolean</ID>
+    <ID>LongMethod:GroupPlanMemberList.kt$@Composable fun MemberItem( member: Member, role: String, onMemberClicked: (String) -&gt; Unit, configManager: AppConfigManager, modifier: Modifier = Modifier )</ID>
     <ID>LongMethod:GroupSerialization.kt$GroupSerialization$@Throws(JsonParseException::class) override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): Group</ID>
     <ID>LongMethod:HabitViewHolder.kt$HabitViewHolder$override fun bind( data: Task, position: Int, displayMode: String, ownerID: String? )</ID>
     <ID>LongMethod:ItemRecyclerAdapter.kt$ItemRecyclerAdapter.ItemViewHolder$override fun onClick(v: View)</ID>
+    <ID>LongMethod:LabeledBar.kt$@Composable fun LabeledBar( modifier: Modifier = Modifier, icon: Bitmap? = null, label: String? = null, color: Color = colorResource(R.color.brand), barColor: Color = HabiticaTheme.colors.windowBackground, value: Double, maxValue: Double, displayCompact: Boolean = false, barHeight: Dp = 8.dp, disabled: Boolean = false, abbreviateValue: Boolean = true, abbreviateMax: Boolean = true, animated: Boolean = true )</ID>
+    <ID>LongMethod:LoadingButton.kt$@OptIn(ExperimentalAnimationApi::class) @Composable fun LoadingButton( state: LoadingButtonState, onClick: () -&gt; Unit, modifier: Modifier = Modifier, type: LoadingButtonType = LoadingButtonType.NORMAL, elevation: ButtonElevation? = ButtonDefaults.elevation(0.dp), shape: Shape = MaterialTheme.shapes.medium, border: BorderStroke? = null, colors: ButtonColors? = null, contentPadding: PaddingValues = ButtonDefaults.ContentPadding, successContent: (@Composable RowScope.() -&gt; Unit)? = null, failedContent: (@Composable RowScope.() -&gt; Unit)? = null, content: @Composable RowScope.() -&gt; Unit )</ID>
     <ID>LongMethod:LocalNotificationActionReceiver.kt$LocalNotificationActionReceiver$private fun handleLocalNotificationAction(action: String?)</ID>
+    <ID>LongMethod:MainActivity.kt$MainActivity$public override fun onCreate(savedInstanceState: Bundle?)</ID>
+    <ID>LongMethod:MountBottomSheet.kt$@Composable fun MountBottomSheet( mount: Mount, isCurrentMount: Boolean, onEquip: ((String) -&gt; Unit)?, onDismiss: () -&gt; Unit, modifier: Modifier = Modifier )</ID>
+    <ID>LongMethod:NavigationDrawerFragment.kt$NavigationDrawerFragment$override fun onViewCreated(view: View, savedInstanceState: Bundle?)</ID>
     <ID>LongMethod:NavigationDrawerFragment.kt$NavigationDrawerFragment$private fun initializeMenuItems()</ID>
     <ID>LongMethod:NavigationDrawerFragment.kt$NavigationDrawerFragment$private fun updateUser(user: User)</ID>
-    <ID>LongMethod:NoPartyFragmentFragment.kt$NoPartyFragmentFragment$override fun onViewCreated(view: View, savedInstanceState: Bundle?)</ID>
+    <ID>LongMethod:PartyInviteFragment.kt$@OptIn(ExperimentalFoundationApi::class) @Composable fun PartyInviteView( viewModel: PartyInviteViewModel, dismiss: () -&gt; Unit )</ID>
+    <ID>LongMethod:PartySeekingFragment.kt$@OptIn(ExperimentalMaterialApi::class, ExperimentalFoundationApi::class) @Composable fun PartySeekingView( viewModel: PartySeekingViewModel, modifier: Modifier = Modifier )</ID>
+    <ID>LongMethod:PartySeekingListItem.kt$@Composable fun PartySeekingListItem( user: Member, modifier: Modifier = Modifier, inviteState: LoadingButtonState = LoadingButtonState.LOADING, isInvited: Boolean = false, showHeader: Boolean = false, showExtendedInfo: Boolean = true, configManager: AppConfigManager, onInvite: (Member) -&gt; Unit, )</ID>
+    <ID>LongMethod:PauseResumeDamageView.kt$@Composable fun PauseResumeDamageView( isPaused: Boolean, onClick: () -&gt; Unit, modifier: Modifier = Modifier )</ID>
+    <ID>LongMethod:PetBottomSheet.kt$@Composable fun PetBottomSheet( pet: Pet, trained: Int, isCurrentPet: Boolean, canRaiseToMount: Boolean, ownsSaddles: Boolean, onEquip: ((String) -&gt; Unit)?, onFeed: (suspend (Pet, Food?) -&gt; FeedResponse?)?, onDismiss: () -&gt; Unit, modifier: Modifier = Modifier )</ID>
     <ID>LongMethod:PetSuggestHatchDialog.kt$PetSuggestHatchDialog$fun configure( pet: Animal, egg: Egg?, potion: HatchingPotion?, eggCount: Int, potionCount: Int, hasUnlockedEgg: Boolean, hasUnlockedPotion: Boolean, hasMount: Boolean )</ID>
     <ID>LongMethod:PreferencesFragment.kt$PreferencesFragment$override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String?)</ID>
     <ID>LongMethod:PreferencesFragment.kt$PreferencesFragment$override fun setUser(user: User?)</ID>
+    <ID>LongMethod:PurchaseDialog.kt$PurchaseDialog$private fun buyItem(quantity: Int)</ID>
     <ID>LongMethod:SafeDefaultItemAnimator.kt$SafeDefaultItemAnimator$override fun endAnimations()</ID>
     <ID>LongMethod:SafeDefaultItemAnimator.kt$SafeDefaultItemAnimator$override fun runPendingAnimations()</ID>
     <ID>LongMethod:SegmentedControl.kt$ @Composable fun SegmentedControl( items: List&lt;String&gt;, defaultSelectedItemIndex: Int = 0, useFixedWidth: Boolean = false, itemWidth: Dp = 120.dp, cornerRadius: Int = 10, onItemSelection: (selectedItemIndex: Int) -&gt; Unit )</ID>
+    <ID>LongMethod:ShopFragment.kt$ShopFragment$override fun onViewCreated(view: View, savedInstanceState: Bundle?)</ID>
     <ID>LongMethod:SubscriptionDetailsView.kt$SubscriptionDetailsView$fun setPlan(plan: SubscriptionPlan)</ID>
     <ID>LongMethod:TaskFormActivity.kt$TaskFormActivity$override fun onCreate(savedInstanceState: Bundle?)</ID>
     <ID>LongMethod:TaskSummaryActivity.kt$@Composable fun TaskSummaryView(viewModel: TaskSummaryViewModel)</ID>
     <ID>LongMethod:UserDeserializer.kt$UserDeserializer$@Throws(JsonParseException::class) override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): User</ID>
     <ID>LongMethod:UserStatComputer.kt$UserStatComputer$fun computeClassBonus(equipmentList: List&lt;Equipment&gt;?, user: Avatar): List&lt;StatsRow&gt;</ID>
-    <ID>LongParameterList:AssignedView.kt$( assigned: List&lt;Assignable&gt;, completedAt: Map&lt;String, Date&gt;, backgroundColor: Color, color: Color, onEditClick: () -&gt; Unit, onUndoClick: (String) -&gt; Unit, modifier: Modifier = Modifier, showEditButton: Boolean = false )</ID>
+    <ID>LongParameterList:AssignedView.kt$( assigned: List&lt;Assignable&gt;, completedAt: Map&lt;String, Date&gt;, backgroundColor: Color, color: Color, onEditClick: () -&gt; Unit, onUndoClick: (String) -&gt; Unit, configManager: AppConfigManager, modifier: Modifier = Modifier, showEditButton: Boolean = false )</ID>
     <ID>LongParameterList:BirthdayActivity.kt$( scaffoldState: ScaffoldState, isPurchasing: Boolean, hasGryphatrice: Boolean, hasEquipped: Boolean, price: String, startDate: Date, endDate: Date, onPurchaseClick: () -&gt; Unit, onGemPurchaseClick: () -&gt; Unit, onEquipClick: () -&gt; Unit )</ID>
     <ID>LongParameterList:FullProfileActivity.kt$FullProfileActivity$( label: String, strVal: Float, intVal: Float, conVal: Float, perVal: Float, roundDown: Boolean, isSummary: Boolean )</ID>
-    <ID>LongParameterList:HabiticaSnackbar.kt$HabiticaSnackbar.Companion$( container: ViewGroup, leftImage: Drawable?, title: CharSequence?, content: CharSequence?, specialView: View?, rightIcon: Drawable?, rightTextColor: Int?, rightText: String?, displayType: SnackbarDisplayType, isCelebratory: Boolean = false )</ID>
-    <ID>LongParameterList:HabiticaSnackbar.kt$HabiticaSnackbar.Companion$( container: ViewGroup, title: CharSequence?, content: CharSequence?, rightIcon: Drawable, rightTextColor: Int?, rightText: String, displayType: SnackbarDisplayType, isCelebratory: Boolean = false )</ID>
-    <ID>LongParameterList:HabiticaTheme.kt$HabiticaColors$( val windowBackground: Color, val contentBackground: Color, val contentBackgroundOffset: Color, val textPrimary: Color, val textSecondary: Color, val textTertiary: Color, val textQuad: Color, val textDimmed: Color, val tintedUiMain: Color, val tintedUiSub: Color, val tintedUiDetails: Color, val pixelArtBackground: Color )</ID>
+    <ID>LongParameterList:HabiticaSnackbar.kt$HabiticaSnackbar.Companion$( container: ViewGroup, leftImage: Drawable?, title: CharSequence?, content: CharSequence?, specialView: View?, rightIcon: Drawable?, rightTextColor: Int?, rightText: String?, displayType: SnackbarDisplayType, isCelebratory: Boolean = false, isSubscriberBenefit: Boolean = false, duration: Int = Snackbar.LENGTH_LONG )</ID>
+    <ID>LongParameterList:HabiticaSnackbar.kt$HabiticaSnackbar.Companion$( container: ViewGroup, title: CharSequence?, content: CharSequence?, rightIcon: Drawable, rightTextColor: Int?, rightText: String, displayType: SnackbarDisplayType, isCelebratory: Boolean = false, isSubscriberBenefit: Boolean = false, duration: Int = Snackbar.LENGTH_LONG )</ID>
+    <ID>LongParameterList:MainActivityViewModel.kt$MainActivityViewModel$( userRepository: UserRepository, userViewModel: MainUserViewModel, val hostConfig: HostConfig, val pushNotificationManager: PushNotificationManager, val sharedPreferences: SharedPreferences, val contentRepository: ContentRepository, val taskRepository: TaskRepository, val inventoryRepository: InventoryRepository, val taskAlarmManager: TaskAlarmManager, val maintenanceService: MaintenanceApiService )</ID>
     <ID>LongParameterList:NotifyUserUseCase.kt$NotifyUserUseCase.Companion$( context: Context, xp: Double?, hp: Double?, gold: Double?, mp: Double?, questDamage: Double?, user: User? )</ID>
     <ID>LongParameterList:NotifyUserUseCase.kt$NotifyUserUseCase.RequestValues$( val context: BaseActivity, val snackbarTargetView: ViewGroup, val user: User?, val xp: Double?, val hp: Double?, val gold: Double?, val mp: Double?, val questDamage: Double?, val hasLeveledUp: Boolean?, val level: Int? )</ID>
-    <ID>LongParameterList:PetDetailRecyclerAdapter.kt$PetDetailRecyclerAdapter.CanHatchViewHolder$( item: Pet, eggCount: Int, potionCount: Int, hasUnlockedEgg: Boolean, hasUnlockedPotion: Boolean, hasMount: Boolean, )</ID>
+    <ID>LongParameterList:PetBottomSheet.kt$( pet: Pet, trained: Int, isCurrentPet: Boolean, canRaiseToMount: Boolean, ownsSaddles: Boolean, onEquip: ((String) -&gt; Unit)?, onFeed: (suspend (Pet, Food?) -&gt; FeedResponse?)?, onDismiss: () -&gt; Unit, modifier: Modifier = Modifier )</ID>
+    <ID>LongParameterList:PetDetailRecyclerAdapter.kt$PetDetailRecyclerAdapter.CanHatchViewHolder$( item: Pet, eggCount: Int, potionCount: Int, hasUnlockedEgg: Boolean, hasUnlockedPotion: Boolean, hasMount: Boolean )</ID>
     <ID>LongParameterList:PetSuggestHatchDialog.kt$PetSuggestHatchDialog$( pet: Animal, egg: Egg?, potion: HatchingPotion?, eggCount: Int, potionCount: Int, hasUnlockedEgg: Boolean, hasUnlockedPotion: Boolean, hasMount: Boolean )</ID>
     <ID>LongParameterList:PetViewHolder.kt$PetViewHolder$( item: Pet, trained: Int, eggCount: Int, potionCount: Int, canRaiseToMount: Boolean, ownsSaddles: Boolean, hasUnlockedEgg: Boolean, hasUnlockedPotion: Boolean, hasMount: Boolean, currentPet: String? )</ID>
     <ID>LongParameterList:ScoreTaskLocallyInteractor.kt$ScoreTaskLocallyInteractor.Companion$( result: TaskDirectionData, delta: Double, stats: Stats, computedStats: Stats, task: Task, direction: TaskDirection )</ID>
     <ID>LongParameterList:SocialRepository.kt$SocialRepository$( name: String?, description: String?, leader: String?, type: String?, privacy: String?, leaderCreateChallenge: Boolean? )</ID>
     <ID>LongParameterList:StatsView.kt$( statText: String, statColor: Color, levelValue: Int, equipmentValue: Int, buffValue: Int, allocatedValue: Int, canAllocate: Boolean, allocateAction: () -&gt; Unit )</ID>
-    <ID>LongParameterList:UserRepositoryModule.kt$UserRepositoryModule$( localRepository: UserLocalRepository, apiClient: ApiClient, @Named(AppModule.NAMED_USER_ID) userId: String, taskRepository: TaskRepository, appConfigManager: AppConfigManager, analyticsManager: AnalyticsManager )</ID>
+    <ID>LongParameterList:TaskListFactory.kt$TaskListFactory$( val context: Context, intent: Intent, private val taskType: TaskType, private val listItemResId: Int, private val listItemTextResId: Int, val taskRepository: TaskRepository, val userRepository: UserRepository )</ID>
     <ID>LoopWithTooManyJumpStatements:CustomizationRecyclerViewAdapter.kt$CustomizationRecyclerViewAdapter$for (customization in newCustomizationList) { val isOwned = ownedCustomizations.contains(customization.id) val isUsable = customization.isUsable(isOwned) if (customization.availableFrom != null || customization.availableUntil != null) { if (( ( customization.availableFrom?.compareTo(today) ?: 0 ) &gt; 0 || ( customization.availableUntil?.compareTo(today) ?: 0 ) &lt; 0 ) &amp;&amp; !isUsable ) { continue } } if (customization.identifier?.contains("birthday_bash") == true &amp;&amp; !isOwned) { continue } if (customization.customizationSet != null &amp;&amp; customization.customizationSet != lastSet.identifier) { if (lastSet.hasPurchasable &amp;&amp; lastSet.price &gt; 0) { customizationList.add(lastSet) } val set = CustomizationSet() set.identifier = customization.customizationSet set.text = customization.customizationSetName set.price = customization.setPrice ?: 0 set.hasPurchasable = true lastSet = set customizationList.add(set) } customizationList.add(customization) lastSet.customizations.add(customization) if (isUsable &amp;&amp; lastSet.hasPurchasable) { lastSet.ownedCustomizations.add(customization) if (!lastSet.isSetDeal()) { lastSet.hasPurchasable = false } } }</ID>
-    <ID>MatchingDeclarationName:Date-Extensions.kt$DateUtils</ID>
+    <ID>MatchingDeclarationName:DateExtensions.kt$DateUtils</ID>
     <ID>MatchingDeclarationName:TaskFormSelector.kt$LabeledValue&lt;V&gt;</ID>
+    <ID>MemberNameEqualsClassName:ReviewManager.kt$ReviewManager$private val reviewManager = ReviewManagerFactory.create(context)</ID>
     <ID>NestedBlockDepth:BaseTaskViewHolder.kt$BaseTaskViewHolder$override fun onTouch(view: View?, motionEvent: MotionEvent?): Boolean</ID>
     <ID>NestedBlockDepth:ChallengeDeserializer.kt$ChallengeDeserializer$@Throws(JsonParseException::class) override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): Challenge</ID>
     <ID>NestedBlockDepth:ChecklistedViewHolder.kt$ChecklistedViewHolder$private fun updateChecklistDisplay()</ID>
     <ID>NestedBlockDepth:CustomizationDeserializer.kt$CustomizationDeserializer$@Throws(JsonParseException::class) override fun deserialize( json: JsonElement, typeOfT: Type, context: JsonDeserializationContext ): List&lt;Customization&gt;</ID>
-    <ID>NestedBlockDepth:CustomizationRecyclerViewAdapter.kt$CustomizationRecyclerViewAdapter.CustomizationViewHolder$override fun onClick(v: View)</ID>
     <ID>NestedBlockDepth:GroupSerialization.kt$GroupSerialization$@Throws(JsonParseException::class) override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): Group</ID>
     <ID>NestedBlockDepth:ItemRecyclerAdapter.kt$ItemRecyclerAdapter.ItemViewHolder$override fun onClick(v: View)</ID>
     <ID>NestedBlockDepth:MemberSerialization.kt$MemberSerialization$@Throws(JsonParseException::class) override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): Member</ID>
@@ -148,11 +165,13 @@
     <ID>NestedBlockDepth:PreferencesFragment.kt$PreferencesFragment$override fun onPreferenceTreeClick(preference: Preference): Boolean</ID>
     <ID>NestedBlockDepth:PurchaseDialog.kt$PurchaseDialog$private fun onBuyButtonClicked()</ID>
     <ID>NestedBlockDepth:PurchaseDialog.kt$PurchaseDialog$private suspend fun remainingPurchaseQuantity(onResult: (Int) -&gt; Unit)</ID>
-    <ID>NestedBlockDepth:PurchaseHandler.kt$PurchaseHandler$private fun processPurchases(result: BillingResult, purchases: List&lt;Purchase&gt;)</ID>
     <ID>NestedBlockDepth:QuestDetailFragment.kt$QuestDetailFragment$private fun setQuestParticipants(participants: List&lt;Member&gt;?)</ID>
     <ID>NestedBlockDepth:QuestDropItemsListSerialization.kt$QuestDropItemsListSerialization$@Throws(JsonParseException::class) override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): RealmList&lt;QuestDropItem&gt;</ID>
     <ID>NestedBlockDepth:SafeDefaultItemAnimator.kt$SafeDefaultItemAnimator$override fun endAnimation(item: RecyclerView.ViewHolder)</ID>
-    <ID>NestedBlockDepth:ShopRecyclerAdapter.kt$ShopRecyclerAdapter$@Suppress("ReturnCount") override fun onBindViewHolder( holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int )</ID>
+    <ID>NestedBlockDepth:ShopRecyclerAdapter.kt$ShopRecyclerAdapter$@Suppress("ReturnCount") override fun onBindViewHolder( holder: ViewHolder, position: Int )</ID>
+    <ID>NestedBlockDepth:StableRecyclerAdapter.kt$StableRecyclerAdapter$override fun getItemViewType(position: Int): Int</ID>
+    <ID>NestedBlockDepth:StableRecyclerAdapter.kt$StableRecyclerAdapter$override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int)</ID>
+    <ID>NestedBlockDepth:Task.kt$Task$ fun getNextReminderOccurrences(remindersItem: RemindersItem?, occurrences: Int): List&lt;ZonedDateTime&gt;?</ID>
     <ID>NestedBlockDepth:Task.kt$Task$fun getDaysOfMonth(): List&lt;Int&gt;?</ID>
     <ID>NestedBlockDepth:Task.kt$Task$fun getWeeksOfMonth(): List&lt;Int&gt;?</ID>
     <ID>NestedBlockDepth:TaskFormActivity.kt$TaskFormActivity$private fun saveTask()</ID>
@@ -163,18 +182,21 @@
     <ID>NestedBlockDepth:UserDeserializer.kt$UserDeserializer$@Throws(JsonParseException::class) override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): User</ID>
     <ID>NestedBlockDepth:WorldStateSerialization.kt$WorldStateSerialization$override fun deserialize( json: JsonElement?, typeOfT: Type?, context: JsonDeserializationContext? ): WorldState</ID>
     <ID>ReturnCount:BaseTaskViewHolder.kt$BaseTaskViewHolder$override fun onTouch(view: View?, motionEvent: MotionEvent?): Boolean</ID>
-    <ID>ReturnCount:Customization.kt$Customization$fun getImageName(userSize: String?, hairColor: String?): String</ID>
+    <ID>ReturnCount:Customization.kt$Customization$fun getImageName(userSize: String?, hairColor: String?): String?</ID>
     <ID>ReturnCount:DragLinearLayout.kt$DragLinearLayout$override fun onInterceptTouchEvent(event: MotionEvent): Boolean</ID>
     <ID>ReturnCount:DragLinearLayout.kt$DragLinearLayout$override fun onTouchEvent(event: MotionEvent): Boolean</ID>
     <ID>ReturnCount:RealmBaseLocalRepository.kt$RealmBaseLocalRepository$override fun &lt;T : BaseObject&gt; getLiveObject(obj: T): T?</ID>
+    <ID>ReturnCount:ReviewManager.kt$ReviewManager$private fun canRequestReview(currentCheckins: Int): Boolean</ID>
+    <ID>ReturnCount:Task.kt$Task$ fun getNextReminderOccurrences(remindersItem: RemindersItem?, occurrences: Int): List&lt;ZonedDateTime&gt;?</ID>
     <ID>ReturnCount:Task.kt$Task$fun isBeingEdited(task: Task): Boolean</ID>
+    <ID>SpreadOperator:Analytics.kt$Analytics$(*data.toList().toTypedArray())</ID>
     <ID>ThrowingExceptionsWithoutMessageOrCause:EllipsisTextView.kt$EllipsisTextView$NullPointerException()</ID>
     <ID>TooGenericExceptionCaught:ApiClientImpl.kt$ApiClientImpl$throwable: Throwable</ID>
     <ID>TooGenericExceptionCaught:AuthenticationViewModel.kt$AuthenticationViewModel$e: Exception</ID>
     <ID>TooGenericExceptionCaught:CustomizationDeserializer.kt$CustomizationDeserializer$e: Exception</ID>
     <ID>TooGenericExceptionCaught:LoginActivity.kt$LoginActivity$e: Exception</ID>
     <ID>TooGenericExceptionCaught:MainActivityViewModel.kt$MainActivityViewModel$e: Exception</ID>
-    <ID>TooGenericExceptionCaught:MainNavigationController.kt$MainNavigationController$error: Exception</ID>
+    <ID>TooGenericExceptionCaught:PartySeekingFragment.kt$PartySeekingPagingSource$e: Exception</ID>
     <ID>TooGenericExceptionCaught:PurchaseHandler.kt$PurchaseHandler$throwable: Throwable</ID>
     <ID>TooGenericExceptionCaught:SectionViewHolder.kt$SectionViewHolder$e: Exception</ID>
     <ID>TooGenericExceptionCaught:SetupCustomizationRepositoryImpl.kt$SetupCustomizationRepositoryImpl$e: Exception</ID>
@@ -182,7 +204,7 @@
     <ID>TooGenericExceptionCaught:TaskAlarmManager.kt$TaskAlarmManager.Companion$ex: Exception</ID>
     <ID>TooGenericExceptionCaught:TaskListDeserializer.kt$TaskListDeserializer$e: RuntimeException</ID>
     <ID>TooGenericExceptionCaught:TaskTagDeserializer.kt$TaskTagDeserializer$e: RuntimeException</ID>
-    <ID>TooGenericExceptionCaught:WorldStateSerialization.kt$WorldStateSerialization$e: Exception</ID>
+    <ID>TooGenericExceptionThrown:PurchaseHandler.kt$PurchaseHandler$throw Exception("Failed to consume purchase after multiple attempts")</ID>
     <ID>TooManyFunctions:ApiClient.kt$ApiClient</ID>
     <ID>TooManyFunctions:ApiClientImpl.kt$ApiClientImpl : ApiClient</ID>
     <ID>TooManyFunctions:ApiService.kt$ApiService</ID>
@@ -193,26 +215,28 @@
     <ID>TooManyFunctions:UserRepository.kt$UserRepository : BaseRepository</ID>
     <ID>TooManyFunctions:UserRepositoryImpl.kt$UserRepositoryImpl : BaseRepositoryImplUserRepository</ID>
     <ID>UnnecessaryAbstractClass:HabiticaLocalNotification.kt$HabiticaLocalNotification</ID>
-    <ID>UnusedPrivateMember:ApiClientImpl.kt$ApiClientImpl$private fun hideConnectionProblemDialog()</ID>
+    <ID>UnusedPrivateMember:AdHandler.kt$AdHandler$onComplete: ((Boolean) -&gt; Unit)? = null</ID>
+    <ID>UnusedPrivateMember:AdHandler.kt$AdHandler.Companion$onComplete: () -&gt; Unit</ID>
+    <ID>UnusedPrivateMember:AdHandler.kt$AdHandler.Companion$val deviceId: String = androidId.md5()?.uppercase() ?: ""</ID>
     <ID>UnusedPrivateMember:BaseTasksRecyclerViewAdapter.kt$BaseTasksRecyclerViewAdapter$private fun updateTask(task: Task)</ID>
     <ID>UnusedPrivateMember:BaseTasksRecyclerViewAdapter.kt$BaseTasksRecyclerViewAdapter$private val userID: String?</ID>
     <ID>UnusedPrivateMember:BirthdayMenuView.kt$value: Int</ID>
+    <ID>UnusedPrivateMember:ClassSelectionActivity.kt$ClassSelectionActivity$selectedClass: String</ID>
     <ID>UnusedPrivateMember:DragLinearLayout.kt$DragLinearLayout.Companion$`val`: Float</ID>
     <ID>UnusedPrivateMember:FullProfileActivity.kt$FullProfileActivity$`val`: Float</ID>
     <ID>UnusedPrivateMember:GroupFormActivity.kt$GroupFormActivity$private var autocompleteAdapter: AutocompleteAdapter? = null</ID>
+    <ID>UnusedPrivateMember:GuildDetailFragment.kt$GuildDetailFragment$private val sendInvitesResult = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { if (it.resultCode == Activity.RESULT_OK) { val inviteData = HashMap&lt;String, Any&gt;() inviteData["inviter"] = viewModel.user.value?.profile?.name ?: "" val emails = it.data?.getStringArrayExtra(GroupInviteActivity.EMAILS_KEY) if (!emails.isNullOrEmpty()) { val invites = ArrayList&lt;HashMap&lt;String, String&gt;&gt;() emails.forEach { email -&gt; val invite = HashMap&lt;String, String&gt;() invite["name"] = "" invite["email"] = email invites.add(invite) } inviteData["emails"] = invites } val userIDs = it.data?.getStringArrayExtra(GroupInviteActivity.USER_IDS_KEY) if (!userIDs.isNullOrEmpty()) { val invites = ArrayList&lt;String&gt;() userIDs.forEach { invites.add(it) } inviteData["usernames"] = invites } viewModel.inviteToGroup(inviteData) } }</ID>
     <ID>UnusedPrivateMember:GuildFragment.kt$GuildFragment$group: Group?</ID>
+    <ID>UnusedPrivateMember:MountBottomSheet.kt$@Composable private fun getBackgroundPainter(): ImageBitmap</ID>
     <ID>UnusedPrivateMember:NotificationOpenHandler.kt$NotificationOpenHandler.Companion$private fun openQuestDetailSCreen()</ID>
     <ID>UnusedPrivateMember:PurchaseHandler.kt$PurchaseHandler$purchase: Purchase</ID>
     <ID>UnusedPrivateMember:ScoreTaskLocallyInteractor.kt$ScoreTaskLocallyInteractor.Companion$direction: TaskDirection</ID>
     <ID>UnusedPrivateMember:ScoreTaskLocallyInteractor.kt$ScoreTaskLocallyInteractor.Companion$task: Task</ID>
     <ID>UnusedPrivateMember:ScoreTaskLocallyInteractor.kt$ScoreTaskLocallyInteractor.Companion$user: User</ID>
     <ID>UnusedPrivateMember:StableFragment.kt$StableFragment$private val viewModel: StableViewModel by viewModels()</ID>
-    <ID>UnusedPrivateMember:SubscriptionFragment.kt$SubscriptionFragment.Companion$iSG1G1: Boolean</ID>
-    <ID>UnusedPrivateMember:TaskAlarmManager.kt$TaskAlarmManager$private fun removeAlarmsForTask(task: Task)</ID>
-    <ID>UnusedPrivateMember:UserRepositoryImpl.kt$UserRepositoryImpl$private val analyticsManager: AnalyticsManager</ID>
-    <ID>UnusedPrivateMember:UserRepositoryModule.kt$UserRepositoryModule$context: Context?</ID>
+    <ID>UnusedPrivateMember:TaskAlarmManager.kt$TaskAlarmManager$private var authenticationHandler: AuthenticationHandler</ID>
     <ID>UtilityClassWithPublicConstructor:AprilFoolsHandler.kt$AprilFoolsHandler</ID>
-    <ID>UtilityClassWithPublicConstructor:Date-Extensions.kt$DateUtils</ID>
+    <ID>UtilityClassWithPublicConstructor:DateExtensions.kt$DateUtils</ID>
     <ID>UtilityClassWithPublicConstructor:HapticFeedbackManager.kt$HapticFeedbackManager</ID>
     <ID>UtilityClassWithPublicConstructor:KeyboardUtil.kt$KeyboardUtil</ID>
     <ID>UtilityClassWithPublicConstructor:NotificationOpenHandler.kt$NotificationOpenHandler</ID>
diff --git a/shared/src/androidMain/kotlin/com/habitrpg/shared/habitica/PlatformLogger.kt b/shared/src/androidMain/kotlin/com/habitrpg/shared/habitica/PlatformLogger.kt
index 6371a57d8..9d0ae833c 100644
--- a/shared/src/androidMain/kotlin/com/habitrpg/shared/habitica/PlatformLogger.kt
+++ b/shared/src/androidMain/kotlin/com/habitrpg/shared/habitica/PlatformLogger.kt
@@ -6,23 +6,39 @@ actual class PlatformLogger actual constructor() {
     actual val enabled: Boolean
         get() = true
 
-    actual fun logDebug(tag: String, message: String) {
+    actual fun logDebug(
+        tag: String,
+        message: String,
+    ) {
         Log.d(tag, message)
     }
 
-    actual fun logInfo(tag: String, message: String) {
+    actual fun logInfo(
+        tag: String,
+        message: String,
+    ) {
         Log.i(tag, message)
     }
 
-    actual fun logWarning(tag: String, message: String) {
+    actual fun logWarning(
+        tag: String,
+        message: String,
+    ) {
         Log.w(tag, message)
     }
 
-    actual fun logError(tag: String, message: String) {
+    actual fun logError(
+        tag: String,
+        message: String,
+    ) {
         Log.e(tag, message)
     }
 
-    actual fun logError(tag: String, message: String, exception: Throwable) {
+    actual fun logError(
+        tag: String,
+        message: String,
+        exception: Throwable,
+    ) {
         Log.e(tag, message, exception)
     }
 }
diff --git a/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/Logger.kt b/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/Logger.kt
index da6de266c..1174c09f8 100644
--- a/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/Logger.kt
+++ b/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/Logger.kt
@@ -3,26 +3,52 @@ package com.habitrpg.shared.habitica
 expect class PlatformLogger() {
     val enabled: Boolean
 
-    fun logDebug(tag: String, message: String)
-    fun logInfo(tag: String, message: String)
-    fun logWarning(tag: String, message: String)
-    fun logError(tag: String, message: String)
-    fun logError(tag: String, message: String, exception: Throwable)
+    fun logDebug(
+        tag: String,
+        message: String,
+    )
+
+    fun logInfo(
+        tag: String,
+        message: String,
+    )
+
+    fun logWarning(
+        tag: String,
+        message: String,
+    )
+
+    fun logError(
+        tag: String,
+        message: String,
+    )
+
+    fun logError(
+        tag: String,
+        message: String,
+        exception: Throwable,
+    )
 }
 
 enum class LogLevel {
-    ERROR, INFO, WARNING, DEBUG
+    ERROR,
+    INFO,
+    WARNING,
+    DEBUG,
 }
 
 class HLogger {
-
     companion object {
         private val platformLogger = PlatformLogger()
 
         val enabled
             get() = platformLogger.enabled
 
-        fun log(level: LogLevel, tag: String, message: String) {
+        fun log(
+            level: LogLevel,
+            tag: String,
+            message: String,
+        ) {
             if (!enabled) return
             when (level) {
                 LogLevel.ERROR -> platformLogger.logError(tag, message)
@@ -32,7 +58,11 @@ class HLogger {
             }
         }
 
-        fun logException(tag: String, message: String, exception: Throwable? = null) {
+        fun logException(
+            tag: String,
+            message: String,
+            exception: Throwable? = null,
+        ) {
             if (!enabled) return
             exception?.let {
                 platformLogger.logError(tag, message, exception)
diff --git a/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/Avatar.kt b/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/Avatar.kt
index aceac0278..755084e65 100644
--- a/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/Avatar.kt
+++ b/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/Avatar.kt
@@ -9,6 +9,7 @@ interface Avatar {
     val flags: AvatarFlags?
     val items: AvatarItems?
     val hourglassCount: Int
+
     fun isValid(): Boolean
 
     val username: String?
@@ -17,9 +18,12 @@ interface Avatar {
         get() = if (username != null) "@$username" else null
 
     val gemCount: Int
-        get() = if (this.isValid()) {
-            (this.balance * 4).toInt()
-        } else { 0 }
+        get() =
+            if (this.isValid()) {
+                (this.balance * 4).toInt()
+            } else {
+                0
+            }
 
     val costume: AvatarOutfit?
         get() = items?.gear?.costume
diff --git a/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/AvatarBuffs.kt b/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/AvatarBuffs.kt
index be240a291..62436f657 100644
--- a/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/AvatarBuffs.kt
+++ b/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/AvatarBuffs.kt
@@ -4,7 +4,7 @@ interface AvatarBuffs {
     var con: Float?
     var str: Float?
     var per: Float?
-    var _int: Float?
+    var intelligence: Float?
 
     var seafoam: Boolean?
     var spookySparkles: Boolean?
diff --git a/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/AvatarGear.kt b/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/AvatarGear.kt
index 1d3923fbd..7ab045717 100644
--- a/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/AvatarGear.kt
+++ b/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/AvatarGear.kt
@@ -1,7 +1,6 @@
 package com.habitrpg.shared.habitica.models
 
 interface AvatarGear {
-
     val equipped: AvatarOutfit?
     val costume: AvatarOutfit?
 }
diff --git a/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/AvatarItems.kt b/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/AvatarItems.kt
index d4cf6cf42..03b04b40f 100644
--- a/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/AvatarItems.kt
+++ b/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/AvatarItems.kt
@@ -1,7 +1,6 @@
 package com.habitrpg.shared.habitica.models
 
 interface AvatarItems {
-
     val currentPet: String?
     val currentMount: String?
     val gear: AvatarGear?
diff --git a/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/AvatarStats.kt b/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/AvatarStats.kt
index 8a96c8cde..da409f3a9 100644
--- a/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/AvatarStats.kt
+++ b/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/AvatarStats.kt
@@ -17,7 +17,7 @@ interface AvatarStats {
         get() {
             return (buffs?.str ?: 0f) > 0 ||
                 (buffs?.con ?: 0f) > 0 ||
-                (buffs?._int ?: 0f) > 0 ||
+                (buffs?.intelligence ?: 0f) > 0 ||
                 (buffs?.per ?: 0f) > 0
         }
 }
diff --git a/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/responses/TaskDirection.kt b/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/responses/TaskDirection.kt
index bf79df4e2..cfb32c44e 100644
--- a/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/responses/TaskDirection.kt
+++ b/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/responses/TaskDirection.kt
@@ -1,6 +1,6 @@
-package com.habitrpg.shared.habitica.models.responses
-
-enum class TaskDirection(val text: String) {
-    UP("up"),
-    DOWN("down");
-}
+package com.habitrpg.shared.habitica.models.responses
+
+enum class TaskDirection(val text: String) {
+    UP("up"),
+    DOWN("down"),
+}
diff --git a/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/responses/TaskDirectionData.kt b/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/responses/TaskDirectionData.kt
index b8ef5ee96..c7cdc18da 100644
--- a/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/responses/TaskDirectionData.kt
+++ b/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/responses/TaskDirectionData.kt
@@ -1,5 +1,6 @@
 package com.habitrpg.shared.habitica.models.responses
 
+@Suppress("PropertyName")
 class TaskDirectionData {
     var delta: Float = 0.toFloat()
     var _tmp: TaskDirectionDataTemp? = null
diff --git a/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/responses/TaskDirectionDataTemp.kt b/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/responses/TaskDirectionDataTemp.kt
index 8e539df05..5a118e24b 100644
--- a/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/responses/TaskDirectionDataTemp.kt
+++ b/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/responses/TaskDirectionDataTemp.kt
@@ -1,24 +1,23 @@
-package com.habitrpg.shared.habitica.models.responses
-
-import com.habitrpg.shared.habitica.HParcelable
-import com.habitrpg.shared.habitica.HParcelize
-
-class TaskDirectionDataTemp {
-
-    var drop: TaskDirectionDataDrop? = null
-    var quest: TaskDirectionDataQuest? = null
-    var crit: Float? = null
-}
-
-class TaskDirectionDataQuest {
-    var progressDelta: Double = 0.0
-    var collection: Int = 0
-}
-
-@HParcelize
-data class TaskDirectionDataDrop(
-    var value: Int,
-    var key: String?,
-    var type: String?,
-    var dialog: String?
-) : HParcelable
+package com.habitrpg.shared.habitica.models.responses
+
+import com.habitrpg.shared.habitica.HParcelable
+import com.habitrpg.shared.habitica.HParcelize
+
+class TaskDirectionDataTemp {
+    var drop: TaskDirectionDataDrop? = null
+    var quest: TaskDirectionDataQuest? = null
+    var crit: Float? = null
+}
+
+class TaskDirectionDataQuest {
+    var progressDelta: Double = 0.0
+    var collection: Int = 0
+}
+
+@HParcelize
+data class TaskDirectionDataDrop(
+    var value: Int,
+    var key: String?,
+    var type: String?,
+    var dialog: String?,
+) : HParcelable
diff --git a/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/responses/TaskScoringResult.kt b/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/responses/TaskScoringResult.kt
index ee9aa8f9b..746af57a8 100644
--- a/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/responses/TaskScoringResult.kt
+++ b/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/responses/TaskScoringResult.kt
@@ -15,9 +15,8 @@ data class TaskScoringResult(
     var hasLeveledUp: Boolean = false,
     var level: Int = 0,
     var questDamage: Double? = null,
-    var questItemsFound: Int? = null
+    var questItemsFound: Int? = null,
 ) : HParcelable {
-
     constructor(data: TaskDirectionData, stats: AvatarStats?) : this(
         data.hp <= 0.0,
         data._tmp?.drop,
@@ -32,6 +31,6 @@ data class TaskScoringResult(
         data.lvl > (stats?.lvl ?: 0),
         data.lvl,
         data._tmp?.quest?.progressDelta,
-        data._tmp?.quest?.collection
+        data._tmp?.quest?.collection,
     )
 }
diff --git a/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/responses/VerifyUsernameResponse.kt b/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/responses/VerifyUsernameResponse.kt
index 1872e5d1d..1ee4d7b20 100644
--- a/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/responses/VerifyUsernameResponse.kt
+++ b/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/responses/VerifyUsernameResponse.kt
@@ -1,7 +1,6 @@
 package com.habitrpg.shared.habitica.models.responses
 
 class VerifyUsernameResponse {
-
     var isUsable: Boolean = false
     var issues = emptyList<String>()
 }
diff --git a/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/tasks/Attribute.kt b/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/tasks/Attribute.kt
index 6acb2c5a1..bf85df733 100644
--- a/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/tasks/Attribute.kt
+++ b/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/tasks/Attribute.kt
@@ -4,7 +4,8 @@ enum class Attribute(val value: String) {
     STRENGTH("str"),
     INTELLIGENCE("int"),
     CONSTITUTION("con"),
-    PERCEPTION("per");
+    PERCEPTION("per"),
+    ;
 
     companion object {
         fun from(type: String?): Attribute? = values().find { it.value == type }
diff --git a/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/tasks/Frequency.kt b/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/tasks/Frequency.kt
index 322e780bf..2be8fe6df 100644
--- a/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/tasks/Frequency.kt
+++ b/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/tasks/Frequency.kt
@@ -4,7 +4,8 @@ enum class Frequency(val value: String) {
     WEEKLY("weekly"),
     DAILY("daily"),
     MONTHLY("monthly"),
-    YEARLY("yearly");
+    YEARLY("yearly"),
+    ;
 
     companion object {
         fun from(type: String?): Frequency? = values().find { it.value == type }
diff --git a/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/tasks/HabitResetOption.kt b/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/tasks/HabitResetOption.kt
index cf29f920f..876d08321 100644
--- a/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/tasks/HabitResetOption.kt
+++ b/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/tasks/HabitResetOption.kt
@@ -3,7 +3,8 @@ package com.habitrpg.shared.habitica.models.tasks
 enum class HabitResetOption(val value: Frequency) {
     DAILY(Frequency.DAILY),
     WEEKLY(Frequency.WEEKLY),
-    MONTHLY(Frequency.MONTHLY);
+    MONTHLY(Frequency.MONTHLY),
+    ;
 
     companion object {
         fun from(type: Frequency?): HabitResetOption? = values().find { it.value == type }
diff --git a/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/tasks/TaskDifficulty.kt b/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/tasks/TaskDifficulty.kt
index 9f10fc91b..1d52d3990 100644
--- a/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/tasks/TaskDifficulty.kt
+++ b/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/tasks/TaskDifficulty.kt
@@ -4,7 +4,8 @@ enum class TaskDifficulty(val value: Float) {
     TRIVIAL(0.1f),
     EASY(1f),
     MEDIUM(1.5f),
-    HARD(2f);
+    HARD(2f),
+    ;
 
     companion object {
         fun valueOf(float: Float): TaskDifficulty {
diff --git a/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/tasks/TaskType.kt b/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/tasks/TaskType.kt
index 9f2304a1e..5337596ce 100644
--- a/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/tasks/TaskType.kt
+++ b/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/tasks/TaskType.kt
@@ -4,7 +4,8 @@ enum class TaskType(val value: String) {
     HABIT("habit"),
     DAILY("daily"),
     TODO("todo"),
-    REWARD("reward");
+    REWARD("reward"),
+    ;
 
     override fun toString(): String = value
 
diff --git a/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/tasks/TasksOrder.kt b/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/tasks/TasksOrder.kt
index 63ba6aa56..682ffc6c1 100644
--- a/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/tasks/TasksOrder.kt
+++ b/shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/tasks/TasksOrder.kt
@@ -1,7 +1,10 @@
 package com.habitrpg.shared.habitica.models.tasks
 
 class TasksOrder {
-    fun positionOf(key: String, type: TaskType): Int {
+    fun positionOf(
+        key: String,
+        type: TaskType,
+    ): Int {
         return when (type) {
             TaskType.HABIT -> habits.indexOf(key)
             TaskType.DAILY -> dailys.indexOf(key)
diff --git a/shared/src/iosMain/kotlin/com/habitrpg/shared/habitica/PlatformLogger.kt b/shared/src/iosMain/kotlin/com/habitrpg/shared/habitica/PlatformLogger.kt
index ea5515487..d4cfccba4 100644
--- a/shared/src/iosMain/kotlin/com/habitrpg/shared/habitica/PlatformLogger.kt
+++ b/shared/src/iosMain/kotlin/com/habitrpg/shared/habitica/PlatformLogger.kt
@@ -4,23 +4,39 @@ actual class PlatformLogger {
     actual val enabled: Boolean
         get() = true
 
-    actual fun logDebug(tag: String, message: String) {
+    actual fun logDebug(
+        tag: String,
+        message: String,
+    ) {
         println("[🟢] $tag: $message")
     }
 
-    actual fun logInfo(tag: String, message: String) {
+    actual fun logInfo(
+        tag: String,
+        message: String,
+    ) {
         println("[🟡] $tag: $message")
     }
 
-    actual fun logWarning(tag: String, message: String) {
+    actual fun logWarning(
+        tag: String,
+        message: String,
+    ) {
         println("[🟠] $tag: $message")
     }
 
-    actual fun logError(tag: String, message: String) {
+    actual fun logError(
+        tag: String,
+        message: String,
+    ) {
         println("[🔴] $tag: $message")
     }
 
-    actual fun logError(tag: String, message: String, exception: Throwable) {
+    actual fun logError(
+        tag: String,
+        message: String,
+        exception: Throwable,
+    ) {
         println("[🔴] $tag: $message\n${exception.getStackTrace().joinToString("\n")}")
     }
 }
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/MainApplication.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/MainApplication.kt
index 5ff8c9f32..f897cc28d 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/MainApplication.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/MainApplication.kt
@@ -29,7 +29,6 @@ import kotlin.time.toDuration
 
 @HiltAndroidApp
 class MainApplication : Application() {
-
     @Inject lateinit var userRepository: UserRepository
 
     @Inject lateinit var taskRepository: TaskRepository
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/data/ApiClient.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/data/ApiClient.kt
index afee39fc4..92fcc62a3 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/data/ApiClient.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/data/ApiClient.kt
@@ -6,7 +6,6 @@ import android.net.NetworkCapabilities
 import com.habitrpg.common.habitica.BuildConfig
 import com.habitrpg.common.habitica.api.HostConfig
 import com.habitrpg.common.habitica.api.Server
-import com.habitrpg.common.habitica.models.auth.UserAuth
 import com.habitrpg.common.habitica.models.auth.UserAuthSocial
 import com.habitrpg.shared.habitica.models.responses.ErrorResponse
 import com.habitrpg.wearos.habitica.managers.AppStateManager
@@ -29,199 +28,223 @@ import java.util.GregorianCalendar
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
-class ApiClient @Inject constructor(
-    private val converter: Converter.Factory,
-    private val hostConfig: HostConfig,
-    private val appStateManager: AppStateManager,
-    private val context: Context
-) {
-    val userID: String
-        get() = hostConfig.userID
-    private lateinit var retrofitAdapter: Retrofit
+class ApiClient
+    @Inject
+    constructor(
+        private val converter: Converter.Factory,
+        private val hostConfig: HostConfig,
+        private val appStateManager: AppStateManager,
+        private val context: Context,
+    ) {
+        val userID: String
+            get() = hostConfig.userID
+        private lateinit var retrofitAdapter: Retrofit
 
-    // I think we don't need the ApiClientImpl anymore we could just use ApiService
-    private lateinit var apiService: ApiService
+        // I think we don't need the ApiClientImpl anymore we could just use ApiService
+        private lateinit var apiService: ApiService
 
-    init {
-        buildRetrofit()
-    }
-
-    private fun hasNetwork(context: Context): Boolean {
-        val connectivityManager =
-            context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-        val networkCapabilities = connectivityManager.activeNetwork ?: return false
-        val actNw =
-            connectivityManager.getNetworkCapabilities(networkCapabilities) ?: return false
-        return when {
-            actNw.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> true
-            actNw.hasTransport(NetworkCapabilities.TRANSPORT_BLUETOOTH) -> true
-            actNw.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> true
-            actNw.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET) -> true
-            actNw.hasTransport(NetworkCapabilities.TRANSPORT_VPN) -> true
-            actNw.hasTransport(NetworkCapabilities.TRANSPORT_USB) -> true
-            else -> false
-        }
-    }
-
-    private fun buildRetrofit() {
-        val logging = HttpLoggingInterceptor()
-        if (BuildConfig.DEBUG) {
-            logging.level = HttpLoggingInterceptor.Level.BODY
+        init {
+            buildRetrofit()
         }
 
-        val userAgent = System.getProperty("http.agent")
+        private fun hasNetwork(context: Context): Boolean {
+            val connectivityManager =
+                context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+            val networkCapabilities = connectivityManager.activeNetwork ?: return false
+            val actNw =
+                connectivityManager.getNetworkCapabilities(networkCapabilities) ?: return false
+            return when {
+                actNw.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> true
+                actNw.hasTransport(NetworkCapabilities.TRANSPORT_BLUETOOTH) -> true
+                actNw.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> true
+                actNw.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET) -> true
+                actNw.hasTransport(NetworkCapabilities.TRANSPORT_VPN) -> true
+                actNw.hasTransport(NetworkCapabilities.TRANSPORT_USB) -> true
+                else -> false
+            }
+        }
 
-        val calendar = GregorianCalendar()
-        val timeZone = calendar.timeZone
-        val timezoneOffset = -TimeUnit.MINUTES.convert(
-            timeZone.getOffset(calendar.timeInMillis).toLong(),
-            TimeUnit.MILLISECONDS
-        )
+        private fun buildRetrofit() {
+            val logging = HttpLoggingInterceptor()
+            if (BuildConfig.DEBUG) {
+                logging.level = HttpLoggingInterceptor.Level.BODY
+            }
 
-        val cacheSize = (5 * 1024 * 1024).toLong()
-        val cache = Cache(File(context.cacheDir, "http_cache"), cacheSize)
+            val userAgent = System.getProperty("http.agent")
 
-        val client = OkHttpClient.Builder()
-            .cache(cache)
-            .addInterceptor(logging)
-            .addInterceptor { chain ->
-                val request = chain.request()
-                if (request.header("Cache-Control")?.isNotBlank() == true) {
-                    return@addInterceptor chain.proceed(request)
-                }
-                var cacheControl = CacheControl.Builder()
-                cacheControl = if (request.method == "GET") {
-                    if (hasNetwork(context)) {
-                        cacheControl.maxAge(1, TimeUnit.MINUTES)
-                    } else {
-                        appStateManager.isAppConnected.value = false
-                        cacheControl.maxAge(1, TimeUnit.DAYS)
-                    }
-                } else {
-                    if (!hasNetwork(context)) {
-                        appStateManager.isAppConnected.value = false
-                    }
-                    cacheControl.noCache()
-                        .noStore()
-                }
-                val response = chain.proceed(
-                    request.newBuilder().header(
-                        "Cache-Control",
-                        cacheControl.build().toString()
-                    ).build()
+            val calendar = GregorianCalendar()
+            val timeZone = calendar.timeZone
+            val timezoneOffset =
+                -TimeUnit.MINUTES.convert(
+                    timeZone.getOffset(calendar.timeInMillis).toLong(),
+                    TimeUnit.MILLISECONDS,
                 )
-                val responseBuilder = response.newBuilder()
-                responseBuilder.header("was-cached", (response.networkResponse == null).toString())
-                if (request.method == "GET") {
-                    val userID = response.request.header("x-api-user") ?: request.header("x-api-user")
-                    if (response.code == 504 || (userID != null && userID != hostConfig.userID)) {
-                        // Cache miss. Network might be down, but retry call without cache to be sure.
-                        response.close()
-                        chain.proceed(
-                            request.newBuilder()
-                                .header("Cache-Control", "no-cache")
-                                .build()
-                        )
-                    } else {
-                        responseBuilder
-                            .header("Cache-Control", request.header("Cache-Control") ?: "")
-                            .build()
+
+            val cacheSize = (5 * 1024 * 1024).toLong()
+            val cache = Cache(File(context.cacheDir, "http_cache"), cacheSize)
+
+            val client =
+                OkHttpClient.Builder()
+                    .cache(cache)
+                    .addInterceptor(logging)
+                    .addInterceptor { chain ->
+                        val request = chain.request()
+                        if (request.header("Cache-Control")?.isNotBlank() == true) {
+                            return@addInterceptor chain.proceed(request)
+                        }
+                        var cacheControl = CacheControl.Builder()
+                        cacheControl =
+                            if (request.method == "GET") {
+                                if (hasNetwork(context)) {
+                                    cacheControl.maxAge(1, TimeUnit.MINUTES)
+                                } else {
+                                    appStateManager.isAppConnected.value = false
+                                    cacheControl.maxAge(1, TimeUnit.DAYS)
+                                }
+                            } else {
+                                if (!hasNetwork(context)) {
+                                    appStateManager.isAppConnected.value = false
+                                }
+                                cacheControl.noCache()
+                                    .noStore()
+                            }
+                        val response =
+                            chain.proceed(
+                                request.newBuilder().header(
+                                    "Cache-Control",
+                                    cacheControl.build().toString(),
+                                ).build(),
+                            )
+                        val responseBuilder = response.newBuilder()
+                        responseBuilder.header("was-cached", (response.networkResponse == null).toString())
+                        if (request.method == "GET") {
+                            val userID = response.request.header("x-api-user") ?: request.header("x-api-user")
+                            if (response.code == 504 || (userID != null && userID != hostConfig.userID)) {
+                                // Cache miss. Network might be down, but retry call without cache to be sure.
+                                response.close()
+                                chain.proceed(
+                                    request.newBuilder()
+                                        .header("Cache-Control", "no-cache")
+                                        .build(),
+                                )
+                            } else {
+                                responseBuilder
+                                    .header("Cache-Control", request.header("Cache-Control") ?: "")
+                                    .build()
+                            }
+                        } else {
+                            responseBuilder.build()
+                        }
                     }
-                } else {
-                    responseBuilder.build()
-                }
-            }
-            .addNetworkInterceptor { chain ->
-                val original = chain.request()
-                var builder: Request.Builder = original.newBuilder()
-                if (this.hostConfig.hasAuthentication()) {
-                    builder = builder
-                        .header("x-api-key", this.hostConfig.apiKey)
-                        .header("x-api-user", this.hostConfig.userID)
-                }
-                builder = builder.header("x-client", "habitica-android")
-                    .header("x-user-timezoneOffset", timezoneOffset.toString())
-                if (userAgent != null) {
-                    builder = builder.header("user-agent", userAgent)
-                }
-                if (BuildConfig.STAGING_KEY.isNotEmpty()) {
-                    builder = builder.header("Authorization", "Basic " + BuildConfig.STAGING_KEY)
-                }
-                val request = builder.method(original.method, original.body)
-                    .removeHeader("Pragma")
+                    .addNetworkInterceptor { chain ->
+                        val original = chain.request()
+                        var builder: Request.Builder = original.newBuilder()
+                        if (this.hostConfig.hasAuthentication()) {
+                            builder =
+                                builder
+                                    .header("x-api-key", this.hostConfig.apiKey)
+                                    .header("x-api-user", this.hostConfig.userID)
+                        }
+                        builder =
+                            builder.header("x-client", "habitica-android")
+                                .header("x-user-timezoneOffset", timezoneOffset.toString())
+                        if (userAgent != null) {
+                            builder = builder.header("user-agent", userAgent)
+                        }
+                        if (BuildConfig.STAGING_KEY.isNotEmpty()) {
+                            builder = builder.header("Authorization", "Basic " + BuildConfig.STAGING_KEY)
+                        }
+                        val request =
+                            builder.method(original.method, original.body)
+                                .removeHeader("Pragma")
+                                .build()
+                        chain.proceed(request)
+                    }
+                    .readTimeout(2400, TimeUnit.SECONDS)
                     .build()
-                chain.proceed(request)
-            }
-            .readTimeout(2400, TimeUnit.SECONDS)
-            .build()
 
-        val server = Server(this.hostConfig.address)
+            val server = Server(this.hostConfig.address)
 
-        retrofitAdapter = Retrofit.Builder()
-            .client(client)
-            .baseUrl(server.toString())
-            .addConverterFactory(converter)
-            .build()
+            retrofitAdapter =
+                Retrofit.Builder()
+                    .client(client)
+                    .baseUrl(server.toString())
+                    .addConverterFactory(converter)
+                    .build()
 
-        this.apiService = retrofitAdapter.create(ApiService::class.java)
-    }
+            this.apiService = retrofitAdapter.create(ApiService::class.java)
+        }
 
-    fun updateAuthenticationCredentials(userID: String?, apiToken: String?) {
-        this.hostConfig.userID = userID ?: ""
-        this.hostConfig.apiKey = apiToken ?: ""
-    }
+        fun updateAuthenticationCredentials(
+            userID: String?,
+            apiToken: String?,
+        ) {
+            this.hostConfig.userID = userID ?: ""
+            this.hostConfig.apiKey = apiToken ?: ""
+        }
 
-    private val adapter: JsonAdapter<ErrorResponse>? = Moshi.Builder()
-        .addLast(KotlinJsonAdapterFactory()).build().adapter(ErrorResponse::class.java).lenient()
+        private val adapter: JsonAdapter<ErrorResponse>? =
+            Moshi.Builder()
+                .addLast(KotlinJsonAdapterFactory()).build().adapter(ErrorResponse::class.java).lenient()
 
-    private suspend fun <T : Any> process(call: suspend () -> Response<WearableHabitResponse<T>>): NetworkResult<T> {
-        val response: Response<WearableHabitResponse<T>> = call.invoke()
+        private suspend fun <T : Any> process(call: suspend () -> Response<WearableHabitResponse<T>>): NetworkResult<T> {
+            val response: Response<WearableHabitResponse<T>> = call.invoke()
 
-        val wasCached = response.headers()["was-cached"] == "true"
+            val wasCached = response.headers()["was-cached"] == "true"
 
-        return if (!response.isSuccessful) {
-            appStateManager.isAppConnected.value = false
-            if (response.code() == 504) {
-                NetworkResult.Error(Exception(), !wasCached)
-            } else {
-                response.errorBody()?.string()?.let {
-                    val errorResponse = adapter?.fromJson(it)
-                    throw(java.lang.Exception(errorResponse?.message))
+            return if (!response.isSuccessful) {
+                appStateManager.isAppConnected.value = false
+                if (response.code() == 504) {
+                    NetworkResult.Error(Exception(), !wasCached)
+                } else {
+                    response.errorBody()?.string()?.let {
+                        val errorResponse = adapter?.fromJson(it)
+                        throw(java.lang.Exception(errorResponse?.message))
+                    }
+                    throw(java.lang.Exception(response.message()))
                 }
-                throw(java.lang.Exception(response.message()))
-            }
-        } else {
-            val body = response.body()
-            if (body?.data != null) {
-                appStateManager.isAppConnected.value = true
-                NetworkResult.Success(body.data!!, !wasCached)
             } else {
-                NetworkResult.Error(Exception("response.body() can't be null"), !wasCached)
+                val body = response.body()
+                if (body?.data != null) {
+                    appStateManager.isAppConnected.value = true
+                    NetworkResult.Success(body.data!!, !wasCached)
+                } else {
+                    NetworkResult.Error(Exception("response.body() can't be null"), !wasCached)
+                }
             }
         }
+
+        suspend fun getUser(forced: Boolean = false) =
+            if (forced) {
+                process { apiService.getUserForced() }
+            } else {
+                process { apiService.getUser() }
+            }
+
+        suspend fun updateUser(data: Map<String, Any>) = process { apiService.updateUser(data) }
+
+        suspend fun sleep() = process { apiService.sleep() }
+
+        suspend fun revive() = process { apiService.revive() }
+
+        suspend fun loginSocial(auth: UserAuthSocial) = process { apiService.connectSocial(auth) }
+
+        suspend fun runCron() = process { apiService.runCron() }
+
+        suspend fun getTasks(forced: Boolean = false) =
+            if (forced) {
+                process { apiService.getTasksForced() }
+            } else {
+                process { apiService.getTasks() }
+            }
+
+        suspend fun scoreTask(
+            id: String,
+            direction: String,
+        ) =
+            process { apiService.scoreTask(id, direction) }
+
+        suspend fun createTask(task: Task) = process { apiService.createTask(task) }
+
+        fun hasAuthentication() = hostConfig.hasAuthentication()
     }
-
-    suspend fun getUser(forced: Boolean = false) = if (forced) {
-        process { apiService.getUserForced() }
-    } else {
-        process { apiService.getUser() }
-    }
-    suspend fun updateUser(data: Map<String, Any>) = process { apiService.updateUser(data) }
-    suspend fun sleep() = process { apiService.sleep() }
-    suspend fun revive() = process { apiService.revive() }
-
-    suspend fun loginSocial(auth: UserAuthSocial) = process { apiService.connectSocial(auth) }
-
-    suspend fun runCron() = process { apiService.runCron() }
-
-    suspend fun getTasks(forced: Boolean = false) = if (forced) {
-        process { apiService.getTasksForced() }
-    } else {
-        process { apiService.getTasks() }
-    }
-    suspend fun scoreTask(id: String, direction: String) =
-        process { apiService.scoreTask(id, direction) }
-
-    suspend fun createTask(task: Task) = process { apiService.createTask(task) }
-    fun hasAuthentication() = hostConfig.hasAuthentication()
-}
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/data/ApiService.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/data/ApiService.kt
index 6c5b5d09c..9998f8c77 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/data/ApiService.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/data/ApiService.kt
@@ -30,10 +30,14 @@ interface ApiService {
     suspend fun getUserForced(): Response<WearableHabitResponse<User>>
 
     @PUT("user/")
-    suspend fun updateUser(@Body updateDictionary: Map<String, Any>): Response<WearableHabitResponse<User>>
+    suspend fun updateUser(
+        @Body updateDictionary: Map<String, Any>,
+    ): Response<WearableHabitResponse<User>>
 
     @PUT("user/")
-    suspend fun registrationLanguage(@Header("Accept-Language") registrationLanguage: String): Response<WearableHabitResponse<User>>
+    suspend fun registrationLanguage(
+        @Header("Accept-Language") registrationLanguage: String,
+    ): Response<WearableHabitResponse<User>>
 
     @GET("tasks/user")
     suspend fun getTasks(): Response<WearableHabitResponse<TaskList>>
@@ -43,52 +47,89 @@ interface ApiService {
     suspend fun getTasksForced(): Response<WearableHabitResponse<TaskList>>
 
     @GET("tasks/user")
-    suspend fun getTasks(@Query("type") type: String): Response<WearableHabitResponse<TaskList>>
+    suspend fun getTasks(
+        @Query("type") type: String,
+    ): Response<WearableHabitResponse<TaskList>>
 
     @GET("tasks/user")
-    suspend fun getTasks(@Query("type") type: String, @Query("dueDate") dueDate: String): Response<WearableHabitResponse<TaskList>>
+    suspend fun getTasks(
+        @Query("type") type: String,
+        @Query("dueDate") dueDate: String,
+    ): Response<WearableHabitResponse<TaskList>>
 
     @GET("tasks/{id}")
-    suspend fun getTask(@Path("id") id: String): Response<WearableHabitResponse<Task>>
+    suspend fun getTask(
+        @Path("id") id: String,
+    ): Response<WearableHabitResponse<Task>>
 
     @POST("tasks/{id}/score/{direction}")
-    suspend fun scoreTask(@Path("id") id: String, @Path("direction") direction: String): Response<WearableHabitResponse<TaskDirectionData>>
+    suspend fun scoreTask(
+        @Path("id") id: String,
+        @Path("direction") direction: String,
+    ): Response<WearableHabitResponse<TaskDirectionData>>
 
     @POST("tasks/bulk-score")
-    suspend fun bulkScoreTasks(@Body data: List<Map<String, String>>): Response<WearableHabitResponse<BulkTaskScoringData>>
+    suspend fun bulkScoreTasks(
+        @Body data: List<Map<String, String>>,
+    ): Response<WearableHabitResponse<BulkTaskScoringData>>
 
     @POST("tasks/{id}/move/to/{position}")
-    suspend fun postTaskNewPosition(@Path("id") id: String, @Path("position") position: Int): Response<WearableHabitResponse<List<String>>>
+    suspend fun postTaskNewPosition(
+        @Path("id") id: String,
+        @Path("position") position: Int,
+    ): Response<WearableHabitResponse<List<String>>>
 
     @POST("tasks/{taskId}/checklist/{itemId}/score")
-    suspend fun scoreChecklistItem(@Path("taskId") taskId: String, @Path("itemId") itemId: String): Response<WearableHabitResponse<Task>>
+    suspend fun scoreChecklistItem(
+        @Path("taskId") taskId: String,
+        @Path("itemId") itemId: String,
+    ): Response<WearableHabitResponse<Task>>
 
     @POST("tasks/user")
-    suspend fun createTask(@Body item: Task): Response<WearableHabitResponse<Task>>
+    suspend fun createTask(
+        @Body item: Task,
+    ): Response<WearableHabitResponse<Task>>
 
     @POST("tasks/user")
-    suspend fun createTasks(@Body tasks: List<Task>): Response<WearableHabitResponse<List<Task>>>
+    suspend fun createTasks(
+        @Body tasks: List<Task>,
+    ): Response<WearableHabitResponse<List<Task>>>
 
     @PUT("tasks/{id}")
-    suspend fun updateTask(@Path("id") id: String, @Body item: Task): Response<WearableHabitResponse<Task>>
+    suspend fun updateTask(
+        @Path("id") id: String,
+        @Body item: Task,
+    ): Response<WearableHabitResponse<Task>>
 
     @DELETE("tasks/{id}")
-    suspend fun deleteTask(@Path("id") id: String): Response<WearableHabitResponse<Void>>
+    suspend fun deleteTask(
+        @Path("id") id: String,
+    ): Response<WearableHabitResponse<Void>>
 
     @POST("user/auth/local/register")
-    suspend fun registerUser(@Body auth: UserAuth): Response<WearableHabitResponse<UserAuthResponse>>
+    suspend fun registerUser(
+        @Body auth: UserAuth,
+    ): Response<WearableHabitResponse<UserAuthResponse>>
 
     @POST("user/auth/local/login")
-    suspend fun connectLocal(@Body auth: UserAuth): Response<WearableHabitResponse<UserAuthResponse>>
+    suspend fun connectLocal(
+        @Body auth: UserAuth,
+    ): Response<WearableHabitResponse<UserAuthResponse>>
 
     @POST("user/auth/social")
-    suspend fun connectSocial(@Body auth: UserAuthSocial): Response<WearableHabitResponse<UserAuthResponse>>
+    suspend fun connectSocial(
+        @Body auth: UserAuthSocial,
+    ): Response<WearableHabitResponse<UserAuthResponse>>
 
     @DELETE("user/auth/social/{network}")
-    suspend fun disconnectSocial(@Path("network") network: String): Response<WearableHabitResponse<Void>>
+    suspend fun disconnectSocial(
+        @Path("network") network: String,
+    ): Response<WearableHabitResponse<Void>>
 
     @POST("user/auth/apple")
-    suspend fun loginApple(@Body auth: Map<String, Any>): Response<WearableHabitResponse<UserAuthResponse>>
+    suspend fun loginApple(
+        @Body auth: Map<String, Any>,
+    ): Response<WearableHabitResponse<UserAuthResponse>>
 
     @POST("user/sleep")
     suspend fun sleep(): Response<WearableHabitResponse<Boolean>>
@@ -98,10 +139,14 @@ interface ApiService {
 
     // Push notifications
     @POST("user/push-devices")
-    suspend fun addPushDevice(@Body pushDeviceData: Map<String, String>): Response<WearableHabitResponse<List<Void>>>
+    suspend fun addPushDevice(
+        @Body pushDeviceData: Map<String, String>,
+    ): Response<WearableHabitResponse<List<Void>>>
 
     @DELETE("user/push-devices/{regId}")
-    suspend fun removePushDevice(@Path("regId") regId: String): Response<WearableHabitResponse<List<Void>>>
+    suspend fun removePushDevice(
+        @Path("regId") regId: String,
+    ): Response<WearableHabitResponse<List<Void>>>
 
     @POST("cron")
     suspend fun runCron(): Response<WearableHabitResponse<EmptyResponse>>
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/TaskLocalRepository.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/TaskLocalRepository.kt
index 3c304af96..adc1a5bb4 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/TaskLocalRepository.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/TaskLocalRepository.kt
@@ -15,108 +15,121 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class TaskLocalRepository @Inject constructor() {
-    private val tasks = mapOf(
-        TaskType.HABIT to MutableStateFlow<List<Task>?>(null),
-        TaskType.DAILY to MutableStateFlow<List<Task>?>(null),
-        TaskType.TODO to MutableStateFlow<List<Task>?>(null),
-        TaskType.REWARD to MutableStateFlow<List<Task>?>(null)
-    )
+class TaskLocalRepository
+    @Inject
+    constructor() {
+        private val tasks =
+            mapOf(
+                TaskType.HABIT to MutableStateFlow<List<Task>?>(null),
+                TaskType.DAILY to MutableStateFlow<List<Task>?>(null),
+                TaskType.TODO to MutableStateFlow<List<Task>?>(null),
+                TaskType.REWARD to MutableStateFlow<List<Task>?>(null),
+            )
 
-    private val taskCountHelperValue = MutableStateFlow<Long>(0)
+        private val taskCountHelperValue = MutableStateFlow<Long>(0)
 
-    fun getTasks(type: TaskType): Flow<List<Task>> {
-        return tasks[type]!!.filterNotNull()
-    }
-
-    fun saveTasks(tasks: TaskList, order: TasksOrder?) {
-        val taskMap = mapOf(
-            TaskType.HABIT to sortTasks(tasks.tasks, order?.habits ?: emptyList(), TaskType.HABIT),
-            TaskType.DAILY to sortTasks(tasks.tasks, order?.dailys ?: emptyList(), TaskType.DAILY),
-            TaskType.TODO to sortTasks(tasks.tasks, order?.todos ?: emptyList(), TaskType.TODO),
-            TaskType.REWARD to sortTasks(tasks.tasks, order?.rewards ?: emptyList(), TaskType.REWARD)
-        )
-        for (type in taskMap) {
-            this.tasks[type.key]?.value = null
-            this.tasks[type.key]?.value = type.value
+        fun getTasks(type: TaskType): Flow<List<Task>> {
+            return tasks[type]!!.filterNotNull()
         }
-        taskCountHelperValue.value = Date().time
-    }
 
-    private fun sortTasks(taskMap: MutableMap<String, Task>, taskOrder: List<String>, type: TaskType): List<Task> {
-        val taskList = ArrayList<Task>()
-        var position = 0
-        for (taskId in taskOrder) {
-            val task = taskMap[taskId]
-            if (task != null) {
+        fun saveTasks(
+            tasks: TaskList,
+            order: TasksOrder?,
+        ) {
+            val taskMap =
+                mapOf(
+                    TaskType.HABIT to sortTasks(tasks.tasks, order?.habits ?: emptyList(), TaskType.HABIT),
+                    TaskType.DAILY to sortTasks(tasks.tasks, order?.dailys ?: emptyList(), TaskType.DAILY),
+                    TaskType.TODO to sortTasks(tasks.tasks, order?.todos ?: emptyList(), TaskType.TODO),
+                    TaskType.REWARD to sortTasks(tasks.tasks, order?.rewards ?: emptyList(), TaskType.REWARD),
+                )
+            for (type in taskMap) {
+                this.tasks[type.key]?.value = null
+                this.tasks[type.key]?.value = type.value
+            }
+            taskCountHelperValue.value = Date().time
+        }
+
+        private fun sortTasks(
+            taskMap: MutableMap<String, Task>,
+            taskOrder: List<String>,
+            type: TaskType,
+        ): List<Task> {
+            val taskList = ArrayList<Task>()
+            var position = 0
+            for (taskId in taskOrder) {
+                val task = taskMap[taskId]
+                if (task != null) {
+                    task.position = position
+                    taskList.add(task)
+                    position++
+                    taskMap.remove(taskId)
+                }
+            }
+            for (task in taskMap.values) {
+                if (task.type != type) continue
                 task.position = position
                 taskList.add(task)
                 position++
-                taskMap.remove(taskId)
             }
+            return taskList
         }
-        for (task in taskMap.values) {
-            if (task.type != type) continue
-            task.position = position
-            taskList.add(task)
-            position++
-        }
-        return taskList
-    }
 
-    fun updateTask(task: Task) {
-        val oldList = tasks[task.type]?.value?.toMutableList()
-        val index = oldList?.indexOfFirst { task.id == it.id }
-        if (index != null && index >= 0) {
-            oldList[index] = task
-        } else {
-            oldList?.add(0, task)
-        }
-        oldList?.let {
-            tasks[task.type]?.value = null
-            tasks[task.type]?.value = it
-        }
-        taskCountHelperValue.value = Date().time
-    }
-
-    fun getTask(taskID: String): Flow<Task?> {
-        for (type in tasks.values) {
-            val task = type.value?.firstOrNull { it.id == taskID }
-            if (task != null) {
-                return flowOf(task)
+        fun updateTask(task: Task) {
+            val oldList = tasks[task.type]?.value?.toMutableList()
+            val index = oldList?.indexOfFirst { task.id == it.id }
+            if (index != null && index >= 0) {
+                oldList[index] = task
+            } else {
+                oldList?.add(0, task)
             }
+            oldList?.let {
+                tasks[task.type]?.value = null
+                tasks[task.type]?.value = it
+            }
+            taskCountHelperValue.value = Date().time
         }
-        return emptyFlow()
-    }
 
-    fun getTaskCounts() = taskCountHelperValue.map {
-        mapOf(
-            TaskType.HABIT.value to (tasks[TaskType.HABIT]?.value?.size ?: 0),
-            TaskType.DAILY.value to (tasks[TaskType.DAILY]?.value?.size ?: 0),
-            TaskType.TODO.value to (tasks[TaskType.TODO]?.value?.size ?: 0),
-            TaskType.REWARD.value to (tasks[TaskType.REWARD]?.value?.size ?: 0)
-        )
-    }
-
-    fun getActiveTaskCounts() = taskCountHelperValue.map {
-        mapOf(
-            TaskType.HABIT.value to (tasks[TaskType.HABIT]?.value?.size ?: 0),
-            TaskType.DAILY.value to (
-                tasks[TaskType.DAILY]?.value?.filter { it.isDue == true && !it.completed }?.size
-                    ?: 0
-                ),
-            TaskType.TODO.value to (
-                tasks[TaskType.TODO]?.value?.filter { !it.completed }?.size
-                    ?: 0
-                ),
-            TaskType.REWARD.value to (tasks[TaskType.REWARD]?.value?.size ?: 0)
-        )
-    }
-
-    fun clearData() {
-        tasks.values.forEach {
-            it.value = emptyList()
+        fun getTask(taskID: String): Flow<Task?> {
+            for (type in tasks.values) {
+                val task = type.value?.firstOrNull { it.id == taskID }
+                if (task != null) {
+                    return flowOf(task)
+                }
+            }
+            return emptyFlow()
+        }
+
+        fun getTaskCounts() =
+            taskCountHelperValue.map {
+                mapOf(
+                    TaskType.HABIT.value to (tasks[TaskType.HABIT]?.value?.size ?: 0),
+                    TaskType.DAILY.value to (tasks[TaskType.DAILY]?.value?.size ?: 0),
+                    TaskType.TODO.value to (tasks[TaskType.TODO]?.value?.size ?: 0),
+                    TaskType.REWARD.value to (tasks[TaskType.REWARD]?.value?.size ?: 0),
+                )
+            }
+
+        fun getActiveTaskCounts() =
+            taskCountHelperValue.map {
+                mapOf(
+                    TaskType.HABIT.value to (tasks[TaskType.HABIT]?.value?.size ?: 0),
+                    TaskType.DAILY.value to (
+                        tasks[TaskType.DAILY]?.value?.filter { it.isDue == true && !it.completed }?.size
+                            ?: 0
+                    ),
+                    TaskType.TODO.value to (
+                        tasks[TaskType.TODO]?.value?.filter { !it.completed }?.size
+                            ?: 0
+                    ),
+                    TaskType.REWARD.value to (tasks[TaskType.REWARD]?.value?.size ?: 0),
+                )
+            }
+
+        fun clearData() {
+            tasks.values.forEach {
+                it.value = emptyList()
+            }
+            taskCountHelperValue.value = 0
         }
-        taskCountHelperValue.value = 0
     }
-}
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/TaskRepository.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/TaskRepository.kt
index 8f2022036..b9b21cfe7 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/TaskRepository.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/TaskRepository.kt
@@ -12,71 +12,81 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.emptyFlow
 import javax.inject.Inject
 
-class TaskRepository @Inject constructor(
-    private val apiClient: ApiClient,
-    private val localRepository: TaskLocalRepository,
-    private val userLocalRepository: UserLocalRepository
-) {
-
-    suspend fun retrieveTasks(order: TasksOrder?, ensureFresh: Boolean = false): TaskList? {
-        val response = apiClient.getTasks()
-        var tasks = response.responseData
-        tasks?.let { localRepository.saveTasks(it, order) }
-        if (ensureFresh && !response.isResponseFresh) {
-            tasks = apiClient.getTasks(true).responseData
-            tasks?.let { localRepository.saveTasks(tasks, order) }
-        }
-        return tasks
-    }
-
-    fun getTasks(taskType: TaskType) = localRepository.getTasks(taskType)
-
-    suspend fun scoreTask(user: User?, task: Task, direction: TaskDirection): TaskScoringResult? {
-        val id = task.id ?: return null
-        val result = apiClient.scoreTask(id, direction.text).responseData
-        if (result != null) {
-            task.completed = direction == TaskDirection.UP
-            task.value = (task.value ?: 0.0) + result.delta
-            if (task.type == TaskType.HABIT) {
-                if (direction == TaskDirection.UP) {
-                    task.counterUp = task.counterUp?.plus(1) ?: 1
-                } else {
-                    task.counterDown = task.counterDown?.plus(1) ?: 1
-                }
-            } else if (task.type == TaskType.DAILY) {
-                if (direction == TaskDirection.UP) {
-                    task.streak = task.streak?.plus(1) ?: 1
-                } else {
-                    task.streak = task.streak?.minus(1) ?: 0
-                }
+class TaskRepository
+    @Inject
+    constructor(
+        private val apiClient: ApiClient,
+        private val localRepository: TaskLocalRepository,
+        private val userLocalRepository: UserLocalRepository,
+    ) {
+        suspend fun retrieveTasks(
+            order: TasksOrder?,
+            ensureFresh: Boolean = false,
+        ): TaskList? {
+            val response = apiClient.getTasks()
+            var tasks = response.responseData
+            tasks?.let { localRepository.saveTasks(it, order) }
+            if (ensureFresh && !response.isResponseFresh) {
+                tasks = apiClient.getTasks(true).responseData
+                tasks?.let { localRepository.saveTasks(tasks, order) }
             }
-            localRepository.updateTask(task)
+            return tasks
         }
-        val scoringResult = result?.let { TaskScoringResult(it, user?.stats) }
-        if (user != null) {
-            user.stats?.hp = result?.hp
-            user.stats?.exp = result?.exp
-            user.stats?.mp = result?.mp
-            user.stats?.gp = result?.gp
-            user.stats?.lvl = result?.lvl
-            userLocalRepository.saveUser(user)
+
+        fun getTasks(taskType: TaskType) = localRepository.getTasks(taskType)
+
+        suspend fun scoreTask(
+            user: User?,
+            task: Task,
+            direction: TaskDirection,
+        ): TaskScoringResult? {
+            val id = task.id ?: return null
+            val result = apiClient.scoreTask(id, direction.text).responseData
+            if (result != null) {
+                task.completed = direction == TaskDirection.UP
+                task.value = (task.value ?: 0.0) + result.delta
+                if (task.type == TaskType.HABIT) {
+                    if (direction == TaskDirection.UP) {
+                        task.counterUp = task.counterUp?.plus(1) ?: 1
+                    } else {
+                        task.counterDown = task.counterDown?.plus(1) ?: 1
+                    }
+                } else if (task.type == TaskType.DAILY) {
+                    if (direction == TaskDirection.UP) {
+                        task.streak = task.streak?.plus(1) ?: 1
+                    } else {
+                        task.streak = task.streak?.minus(1) ?: 0
+                    }
+                }
+                localRepository.updateTask(task)
+            }
+            val scoringResult = result?.let { TaskScoringResult(it, user?.stats) }
+            if (user != null) {
+                user.stats?.hp = result?.hp
+                user.stats?.exp = result?.exp
+                user.stats?.mp = result?.mp
+                user.stats?.gp = result?.gp
+                user.stats?.lvl = result?.lvl
+                userLocalRepository.saveUser(user)
+            }
+            return scoringResult
         }
-        return scoringResult
-    }
 
-    fun getTask(taskID: String?): Flow<Task?> {
-        if (taskID == null) return emptyFlow()
-        return localRepository.getTask(taskID)
-    }
-
-    suspend fun createTask(task: Task) {
-        val newTask = apiClient.createTask(task).responseData
-        if (newTask != null) {
-            localRepository.updateTask(newTask)
+        fun getTask(taskID: String?): Flow<Task?> {
+            if (taskID == null) return emptyFlow()
+            return localRepository.getTask(taskID)
         }
-    }
 
-    fun getTaskCounts() = localRepository.getTaskCounts()
-    fun getActiveTaskCounts() = localRepository.getActiveTaskCounts()
-    fun clearData() = localRepository.clearData()
-}
+        suspend fun createTask(task: Task) {
+            val newTask = apiClient.createTask(task).responseData
+            if (newTask != null) {
+                localRepository.updateTask(newTask)
+            }
+        }
+
+        fun getTaskCounts() = localRepository.getTaskCounts()
+
+        fun getActiveTaskCounts() = localRepository.getActiveTaskCounts()
+
+        fun clearData() = localRepository.clearData()
+    }
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/UserLocalRepository.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/UserLocalRepository.kt
index 4506a9d80..918e2252c 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/UserLocalRepository.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/UserLocalRepository.kt
@@ -6,15 +6,18 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class UserLocalRepository @Inject constructor() {
-    private val user = MutableStateFlow<User?>(null)
-    fun getUser() = user
+class UserLocalRepository
+    @Inject
+    constructor() {
+        private val user = MutableStateFlow<User?>(null)
 
-    fun saveUser(user: User) {
-        this.user.value = user
-    }
+        fun getUser() = user
 
-    fun clearData() {
-        user.value = null
+        fun saveUser(user: User) {
+            this.user.value = user
+        }
+
+        fun clearData() {
+            user.value = null
+        }
     }
-}
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/UserRepository.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/UserRepository.kt
index 3bb2366a0..584d4fcae 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/UserRepository.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/UserRepository.kt
@@ -5,42 +5,46 @@ import com.habitrpg.wearos.habitica.models.NetworkResult
 import com.habitrpg.wearos.habitica.models.user.User
 import javax.inject.Inject
 
-class UserRepository @Inject constructor(
-    private val apiClient: ApiClient,
-    private val localRepository: UserLocalRepository
-) {
-    val userID: String
-        get() = apiClient.userID
-    val hasAuthentication: Boolean
-        get() = apiClient.hasAuthentication()
+class UserRepository
+    @Inject
+    constructor(
+        private val apiClient: ApiClient,
+        private val localRepository: UserLocalRepository,
+    ) {
+        val userID: String
+            get() = apiClient.userID
+        val hasAuthentication: Boolean
+            get() = apiClient.hasAuthentication()
 
-    fun getUser() = localRepository.getUser()
+        fun getUser() = localRepository.getUser()
 
-    suspend fun retrieveUser(ensureFresh: Boolean = false): User? {
-        var response = apiClient.getUser()
-        var user = (response as? NetworkResult.Success)?.data
-        user?.let { localRepository.saveUser(it) }
-        if (ensureFresh && !response.isResponseFresh) {
-            response = apiClient.getUser(true)
-            user = (response as? NetworkResult.Success)?.data
+        suspend fun retrieveUser(ensureFresh: Boolean = false): User? {
+            var response = apiClient.getUser()
+            var user = (response as? NetworkResult.Success)?.data
             user?.let { localRepository.saveUser(it) }
+            if (ensureFresh && !response.isResponseFresh) {
+                response = apiClient.getUser(true)
+                user = (response as? NetworkResult.Success)?.data
+                user?.let { localRepository.saveUser(it) }
+            }
+            return user
         }
-        return user
-    }
 
-    suspend fun updateUser(data: Map<String, Any>): User? {
-        val user = apiClient.updateUser(data).responseData
-        user?.let { localRepository.saveUser(it) }
-        return user
-    }
+        suspend fun updateUser(data: Map<String, Any>): User? {
+            val user = apiClient.updateUser(data).responseData
+            user?.let { localRepository.saveUser(it) }
+            return user
+        }
 
-    suspend fun sleep() = apiClient.sleep().responseData
-    suspend fun revive() = apiClient.revive().responseData
-    suspend fun runCron() {
-        apiClient.runCron()
-    }
+        suspend fun sleep() = apiClient.sleep().responseData
 
-    fun clearData() {
-        localRepository.clearData()
+        suspend fun revive() = apiClient.revive().responseData
+
+        suspend fun runCron() {
+            apiClient.runCron()
+        }
+
+        fun clearData() {
+            localRepository.clearData()
+        }
     }
-}
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/extensions/ViewExt.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/extensions/ViewExt.kt
index 34d4d9e64..1985e2134 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/extensions/ViewExt.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/extensions/ViewExt.kt
@@ -3,11 +3,14 @@ package com.habitrpg.wearos.habitica.extensions
 import android.view.View
 import android.view.ViewTreeObserver
 
-inline fun View.waitForLayout(crossinline f: View.() -> Unit) = with(viewTreeObserver) {
-    addOnGlobalLayoutListener(object : ViewTreeObserver.OnGlobalLayoutListener {
-        override fun onGlobalLayout() {
-            viewTreeObserver.removeOnGlobalLayoutListener(this)
-            f()
-        }
-    })
-}
+inline fun View.waitForLayout(crossinline f: View.() -> Unit) =
+    with(viewTreeObserver) {
+        addOnGlobalLayoutListener(
+            object : ViewTreeObserver.OnGlobalLayoutListener {
+                override fun onGlobalLayout() {
+                    viewTreeObserver.removeOnGlobalLayoutListener(this)
+                    f()
+                }
+            },
+        )
+    }
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/managers/AppStateManager.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/managers/AppStateManager.kt
index 5509df343..902199a42 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/managers/AppStateManager.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/managers/AppStateManager.kt
@@ -6,17 +6,19 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class AppStateManager @Inject constructor() {
-    private val _isLoading = MutableStateFlow(false)
-    val isLoading: StateFlow<Boolean> = _isLoading
+class AppStateManager
+    @Inject
+    constructor() {
+        private val _isLoading = MutableStateFlow(false)
+        val isLoading: StateFlow<Boolean> = _isLoading
 
-    val isAppConnected = MutableStateFlow(true)
+        val isAppConnected = MutableStateFlow(true)
 
-    fun startLoading() {
-        _isLoading.value = true
+        fun startLoading() {
+            _isLoading.value = true
+        }
+
+        fun endLoading() {
+            _isLoading.value = false
+        }
     }
-
-    fun endLoading() {
-        _isLoading.value = false
-    }
-}
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/models/NetworkResult.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/models/NetworkResult.kt
index ee45ad0ee..ec6f82507 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/models/NetworkResult.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/models/NetworkResult.kt
@@ -2,10 +2,11 @@ package com.habitrpg.wearos.habitica.models
 
 sealed class NetworkResult<out T : Any> {
     val isResponseFresh: Boolean
-        get() = when (this) {
-            is Success -> this.isFresh
-            is Error -> this.isFresh
-        }
+        get() =
+            when (this) {
+                is Success -> this.isFresh
+                is Error -> this.isFresh
+            }
     val responseData: T?
         get() {
             return if (this is Success) {
@@ -21,5 +22,6 @@ sealed class NetworkResult<out T : Any> {
         get() = this is Error
 
     data class Success<out T : Any>(val data: T, internal val isFresh: Boolean) : NetworkResult<T>()
+
     data class Error(val exception: Exception, internal val isFresh: Boolean) : NetworkResult<Nothing>()
 }
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/models/tasks/ChecklistItem.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/models/tasks/ChecklistItem.kt
index c0912c7f4..4b624bac1 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/models/tasks/ChecklistItem.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/models/tasks/ChecklistItem.kt
@@ -1,52 +1,54 @@
-package com.habitrpg.wearos.habitica.models.tasks
-
-import android.os.Parcel
-import android.os.Parcelable
-import com.squareup.moshi.JsonClass
-import java.util.UUID
-
-@JsonClass(generateAdapter = true)
-open class ChecklistItem(
-    var id: String? = UUID.randomUUID().toString(),
-    var text: String? = null,
-    var completed: Boolean = false
-) : Parcelable {
-
-    var position: Int = 0
-
-    override fun describeContents(): Int {
-        return 0
-    }
-
-    override fun writeToParcel(dest: Parcel, flags: Int) {
-        dest.writeString(id)
-        dest.writeString(text)
-        dest.writeByte(if (completed) 1.toByte() else 0.toByte())
-        dest.writeInt(position)
-    }
-
-    companion object CREATOR : Parcelable.Creator<ChecklistItem> {
-        override fun createFromParcel(source: Parcel): ChecklistItem = ChecklistItem(source)
-
-        override fun newArray(size: Int): Array<ChecklistItem?> = arrayOfNulls(size)
-    }
-
-    constructor(source: Parcel) : this() {
-        id = source.readString()
-        text = source.readString()
-        completed = source.readByte() == 1.toByte()
-        position = source.readInt()
-    }
-
-    override fun equals(other: Any?): Boolean {
-        return if (other is ChecklistItem) {
-            this.id == other.id
-        } else {
-            super.equals(other)
-        }
-    }
-
-    override fun hashCode(): Int {
-        return id?.hashCode() ?: 0
-    }
-}
+package com.habitrpg.wearos.habitica.models.tasks
+
+import android.os.Parcel
+import android.os.Parcelable
+import com.squareup.moshi.JsonClass
+import java.util.UUID
+
+@JsonClass(generateAdapter = true)
+open class ChecklistItem(
+    var id: String? = UUID.randomUUID().toString(),
+    var text: String? = null,
+    var completed: Boolean = false,
+) : Parcelable {
+    var position: Int = 0
+
+    override fun describeContents(): Int {
+        return 0
+    }
+
+    override fun writeToParcel(
+        dest: Parcel,
+        flags: Int,
+    ) {
+        dest.writeString(id)
+        dest.writeString(text)
+        dest.writeByte(if (completed) 1.toByte() else 0.toByte())
+        dest.writeInt(position)
+    }
+
+    companion object CREATOR : Parcelable.Creator<ChecklistItem> {
+        override fun createFromParcel(source: Parcel): ChecklistItem = ChecklistItem(source)
+
+        override fun newArray(size: Int): Array<ChecklistItem?> = arrayOfNulls(size)
+    }
+
+    constructor(source: Parcel) : this() {
+        id = source.readString()
+        text = source.readString()
+        completed = source.readByte() == 1.toByte()
+        position = source.readInt()
+    }
+
+    override fun equals(other: Any?): Boolean {
+        return if (other is ChecklistItem) {
+            this.id == other.id
+        } else {
+            super.equals(other)
+        }
+    }
+
+    override fun hashCode(): Int {
+        return id?.hashCode() ?: 0
+    }
+}
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/models/tasks/Days.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/models/tasks/Days.kt
index 092affcb2..486d62011 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/models/tasks/Days.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/models/tasks/Days.kt
@@ -14,7 +14,10 @@ open class Days() : Parcelable {
     var s: Boolean = true
     var su: Boolean = true
 
-    override fun writeToParcel(dest: Parcel, flags: Int) {
+    override fun writeToParcel(
+        dest: Parcel,
+        flags: Int,
+    ) {
         dest.writeByte(if (m) 1.toByte() else 0.toByte())
         dest.writeByte(if (t) 1.toByte() else 0.toByte())
         dest.writeByte(if (w) 1.toByte() else 0.toByte())
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/models/tasks/RemindersItem.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/models/tasks/RemindersItem.kt
index 658a8342c..ceccf5105 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/models/tasks/RemindersItem.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/models/tasks/RemindersItem.kt
@@ -1,49 +1,52 @@
-package com.habitrpg.wearos.habitica.models.tasks
-
-import android.os.Parcel
-import android.os.Parcelable
-import com.squareup.moshi.JsonClass
-
-@JsonClass(generateAdapter = true)
-open class RemindersItem() : Parcelable {
-    var id: String? = null
-    var startDate: String? = null
-    var time: String? = null
-
-    // Use to store task type before a task is created
-    var type: String? = null
-
-    override fun describeContents(): Int {
-        return 0
-    }
-
-    override fun writeToParcel(dest: Parcel, flags: Int) {
-        dest.writeString(id)
-        dest.writeString(startDate)
-        dest.writeString(time)
-    }
-
-    companion object CREATOR : Parcelable.Creator<RemindersItem> {
-        override fun createFromParcel(source: Parcel): RemindersItem = RemindersItem(source)
-
-        override fun newArray(size: Int): Array<RemindersItem?> = arrayOfNulls(size)
-    }
-
-    constructor(source: Parcel) : this() {
-        id = source.readString()
-        startDate = source.readString()
-        time = source.readString()
-    }
-
-    override fun equals(other: Any?): Boolean {
-        return if (other is RemindersItem) {
-            this.id == other.id
-        } else {
-            super.equals(other)
-        }
-    }
-
-    override fun hashCode(): Int {
-        return id?.hashCode() ?: 0
-    }
-}
+package com.habitrpg.wearos.habitica.models.tasks
+
+import android.os.Parcel
+import android.os.Parcelable
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+open class RemindersItem() : Parcelable {
+    var id: String? = null
+    var startDate: String? = null
+    var time: String? = null
+
+    // Use to store task type before a task is created
+    var type: String? = null
+
+    override fun describeContents(): Int {
+        return 0
+    }
+
+    override fun writeToParcel(
+        dest: Parcel,
+        flags: Int,
+    ) {
+        dest.writeString(id)
+        dest.writeString(startDate)
+        dest.writeString(time)
+    }
+
+    companion object CREATOR : Parcelable.Creator<RemindersItem> {
+        override fun createFromParcel(source: Parcel): RemindersItem = RemindersItem(source)
+
+        override fun newArray(size: Int): Array<RemindersItem?> = arrayOfNulls(size)
+    }
+
+    constructor(source: Parcel) : this() {
+        id = source.readString()
+        startDate = source.readString()
+        time = source.readString()
+    }
+
+    override fun equals(other: Any?): Boolean {
+        return if (other is RemindersItem) {
+            this.id == other.id
+        } else {
+            super.equals(other)
+        }
+    }
+
+    override fun hashCode(): Int {
+        return id?.hashCode() ?: 0
+    }
+}
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/models/tasks/Task.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/models/tasks/Task.kt
index 159a602d7..8ae2b614c 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/models/tasks/Task.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/models/tasks/Task.kt
@@ -1,330 +1,337 @@
-package com.habitrpg.wearos.habitica.models.tasks
-
-import android.os.Parcel
-import android.os.Parcelable
-import android.text.Spanned
-import com.habitrpg.android.habitica.R
-import com.habitrpg.shared.habitica.models.tasks.Attribute
-import com.habitrpg.shared.habitica.models.tasks.BaseTask
-import com.habitrpg.shared.habitica.models.tasks.Frequency
-import com.habitrpg.shared.habitica.models.tasks.TaskType
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
-import org.json.JSONArray
-import org.json.JSONException
-import java.util.Date
-
-@JsonClass(generateAdapter = true)
-open class Task() : Parcelable, BaseTask {
-
-    @Json(name = "_id")
-    var id: String? = null
-    var userId: String = ""
-    var priority: Float = 0.0f
-    var text: String = ""
-    var notes: String? = null
-    override var type: TaskType?
-        get() = TaskType.from(typeValue)
-        set(value) { typeValue = value?.value }
-    internal var typeValue: String? = null
-    var challengeID: String? = null
-    var challengeBroken: String? = null
-    var attribute: Attribute?
-        get() = Attribute.from(attributeValue)
-        set(value) { attributeValue = value?.value }
-    var attributeValue: String? = Attribute.STRENGTH.value
-    var value: Double? = 0.0
-    var dateCreated: Date? = null
-    var position: Int = 0
-
-    // Habits
-    var up: Boolean? = false
-    var down: Boolean? = false
-    override var counterUp: Int? = 0
-    override var counterDown: Int? = 0
-
-    // todos/dailies
-    override var completed: Boolean = false
-    var checklist: List<ChecklistItem>? = listOf()
-    var reminders: List<RemindersItem>? = listOf()
-
-    // dailies
-    var frequency: Frequency? = null
-    var everyX: Int? = 0
-    override var streak: Int? = 0
-    var startDate: Date? = null
-    var repeat: Days? = null
-
-    // todos
-    @Json(name = "date")
-    var dueDate: Date? = null
-
-    @Json(ignore = true)
-    var parsedText: Spanned? = null
-
-    @Json(ignore = true)
-    var parsedNotes: Spanned? = null
-
-    override var isDue: Boolean? = null
-
-    var nextDue: List<Date>? = null
-
-    // Needed for offline creating/updating
-    var isSaving: Boolean = false
-    var hasErrored: Boolean = false
-    var isCreating: Boolean = false
-    var yesterDaily: Boolean = true
-
-    internal var daysOfMonthString: String? = null
-    internal var weeksOfMonthString: String? = null
-
-    @Json(ignore = true)
-    private var daysOfMonth: List<Int>? = null
-
-    @Json(ignore = true)
-    private var weeksOfMonth: List<Int>? = null
-
-    val completedChecklistCount: Int
-        get() = checklist?.count { it.completed } ?: 0
-
-    val extraLightTaskColor: Int
-        get() {
-            val value = value ?: 0.0
-            return when {
-                value < -20 -> return R.color.watch_maroon_200
-                value < -10 -> return R.color.watch_red_200
-                value < -1 -> return R.color.watch_orange_200
-                value < 1 -> return R.color.watch_yellow_200
-                value < 5 -> return R.color.watch_green_200
-                value < 10 -> return R.color.watch_teal_200
-                else -> R.color.watch_blue_200
-            }
-        }
-
-    val lightTaskColor: Int
-        get() {
-            val value = value ?: 0.0
-            return when {
-                value < -20 -> return R.color.watch_maroon_100
-                value < -10 -> return R.color.watch_red_100
-                value < -1 -> return R.color.watch_orange_100
-                value < 1 -> return R.color.watch_yellow_100
-                value < 5 -> return R.color.watch_green_100
-                value < 10 -> return R.color.watch_teal_100
-                else -> R.color.watch_blue_100
-            }
-        }
-
-    val mediumTaskColor: Int
-        get() {
-            val value = value ?: 0.0
-            return when {
-                value < -20 -> return R.color.watch_maroon_10
-                value < -10 -> return R.color.watch_red_10
-                value < -1 -> return R.color.watch_orange_10
-                value < 1 -> return R.color.watch_yellow_10
-                value < 5 -> return R.color.watch_green_10
-                value < 10 -> return R.color.watch_teal_10
-                else -> R.color.watch_blue_10
-            }
-        }
-
-    override fun equals(other: Any?): Boolean {
-        if (other == null) {
-            return false
-        }
-        return if (Task::class.java.isAssignableFrom(other.javaClass)) {
-            val otherTask = other as? Task
-            this.id == otherTask?.id
-        } else {
-            super.equals(other)
-        }
-    }
-
-    fun isBeingEdited(task: Task): Boolean {
-        when {
-            text != task.text -> return true
-            notes != task.notes -> return true
-            reminders != task.reminders -> return true
-            checklist != task.checklist -> return true
-            priority != task.priority -> return true
-            attribute != task.attribute && attribute != null -> return true
-        }
-        when (type) {
-            TaskType.HABIT -> {
-                return when {
-                    up != task.up -> true
-                    down != task.down -> true
-                    frequency != task.frequency -> true
-                    counterUp != task.counterUp -> true
-                    counterDown != task.counterDown -> true
-                    else -> false
-                }
-            }
-            TaskType.DAILY -> {
-                return when {
-                    startDate != task.startDate -> true
-                    everyX != task.everyX -> true
-                    frequency != task.frequency -> true
-                    repeat != task.repeat -> true
-                    streak != task.streak -> true
-                    else -> false
-                }
-            }
-            TaskType.TODO -> {
-                return dueDate != task.dueDate
-            }
-            TaskType.REWARD -> {
-                return value != task.value
-            }
-            else -> {
-                return false
-            }
-        }
-    }
-
-    override fun hashCode(): Int {
-        return id?.hashCode() ?: 0
-    }
-
-    override fun describeContents(): Int = 0
-
-    override fun writeToParcel(dest: Parcel, flags: Int) {
-        dest.writeString(this.userId)
-        dest.writeValue(this.priority)
-        dest.writeString(this.text)
-        dest.writeString(this.notes)
-        dest.writeString(this.attribute?.value)
-        dest.writeString(this.type?.value)
-        this.value?.let { dest.writeDouble(it) }
-        dest.writeLong(this.dateCreated?.time ?: -1)
-        dest.writeInt(this.position)
-        dest.writeValue(this.up)
-        dest.writeValue(this.down)
-        dest.writeByte(if (this.completed) 1.toByte() else 0.toByte())
-        dest.writeList(this.checklist as? List<*>)
-        dest.writeList(this.reminders as? List<*>)
-        dest.writeString(this.frequency?.value)
-        dest.writeValue(this.everyX)
-        dest.writeString(this.daysOfMonthString)
-        dest.writeString(this.weeksOfMonthString)
-        dest.writeValue(this.streak)
-        dest.writeLong(this.startDate?.time ?: -1)
-        dest.writeParcelable(this.repeat, flags)
-        dest.writeLong(this.dueDate?.time ?: -1)
-        dest.writeString(this.id)
-        dest.writeInt(this.counterUp ?: 0)
-        dest.writeInt(this.counterDown ?: 0)
-    }
-
-    protected constructor(`in`: Parcel) : this() {
-        this.userId = `in`.readString() ?: ""
-        this.priority = `in`.readValue(Float::class.java.classLoader) as? Float ?: 0f
-        this.text = `in`.readString() ?: ""
-        this.notes = `in`.readString()
-        this.attribute = Attribute.from(`in`.readString() ?: "")
-        this.type = TaskType.from(`in`.readString() ?: "")
-        this.value = `in`.readDouble()
-        val tmpDateCreated = `in`.readLong()
-        this.dateCreated = if (tmpDateCreated == -1L) null else Date(tmpDateCreated)
-        this.position = `in`.readInt()
-        this.up = `in`.readValue(Boolean::class.java.classLoader) as? Boolean ?: false
-        this.down = `in`.readValue(Boolean::class.java.classLoader) as? Boolean ?: false
-        this.completed = `in`.readByte().toInt() != 0
-        this.checklist = listOf()
-        `in`.readList(this.checklist as List<ChecklistItem>, ChecklistItem::class.java.classLoader)
-        this.reminders = listOf()
-        `in`.readList(this.reminders as List<RemindersItem>, RemindersItem::class.java.classLoader)
-        this.frequency = Frequency.from(`in`.readString() ?: "")
-        this.everyX = `in`.readValue(Int::class.java.classLoader) as? Int ?: 1
-        this.daysOfMonthString = `in`.readString()
-        this.weeksOfMonthString = `in`.readString()
-        this.streak = `in`.readValue(Int::class.java.classLoader) as? Int ?: 0
-        val tmpStartDate = `in`.readLong()
-        this.startDate = if (tmpStartDate == -1L) null else Date(tmpStartDate)
-        this.repeat = `in`.readParcelable(Days::class.java.classLoader)
-        val tmpDuedate = `in`.readLong()
-        this.dueDate = if (tmpDuedate == -1L) null else Date(tmpDuedate)
-        this.id = `in`.readString()
-        this.counterUp = `in`.readInt()
-        this.counterDown = `in`.readInt()
-    }
-
-    fun setWeeksOfMonth(weeksOfMonth: List<Int>?) {
-        this.weeksOfMonth = weeksOfMonth
-        if ((weeksOfMonth?.size ?: 0) > 0) {
-            this.weeksOfMonthString = this.weeksOfMonth?.toString()
-        } else {
-            weeksOfMonthString = "[]"
-        }
-    }
-
-    fun getWeeksOfMonth(): List<Int>? {
-        if (weeksOfMonth == null) {
-            val weeksOfMonth = mutableListOf<Int>()
-            if (weeksOfMonthString != null) {
-                try {
-                    val obj = JSONArray(weeksOfMonthString)
-                    var i = 0
-                    while (i < obj.length()) {
-                        weeksOfMonth.add(obj.getInt(i))
-                        i += 1
-                    }
-                } catch (_: JSONException) {
-                }
-            }
-            this.weeksOfMonth = weeksOfMonth.toList()
-        }
-        return weeksOfMonth
-    }
-
-    fun setDaysOfMonth(daysOfMonth: List<Int>?) {
-        this.daysOfMonth = daysOfMonth
-        if ((daysOfMonth?.size ?: 0) > 0) {
-            this.daysOfMonthString = this.daysOfMonth?.toString()
-        } else {
-            daysOfMonthString = "[]"
-        }
-    }
-
-    fun getDaysOfMonth(): List<Int>? {
-        if (daysOfMonth == null) {
-            val daysOfMonth = mutableListOf<Int>()
-            if (daysOfMonthString != null) {
-                try {
-                    val obj = JSONArray(daysOfMonthString)
-                    var i = 0
-                    while (i < obj.length()) {
-                        daysOfMonth.add(obj.getInt(i))
-                        i += 1
-                    }
-                } catch (_: JSONException) {
-                }
-            }
-            this.daysOfMonth = daysOfMonth
-        }
-
-        return daysOfMonth
-    }
-
-    companion object CREATOR : Parcelable.Creator<Task> {
-        override fun createFromParcel(source: Parcel): Task = Task(source)
-
-        override fun newArray(size: Int): Array<Task?> = arrayOfNulls(size)
-
-        const val FILTER_ALL = "all"
-        const val FILTER_WEAK = "weak"
-        const val FILTER_STRONG = "strong"
-        const val FILTER_ACTIVE = "active"
-        const val FILTER_GRAY = "gray"
-        const val FILTER_DATED = "dated"
-        const val FILTER_COMPLETED = "completed"
-
-        @JvmField
-        val CREATOR: Parcelable.Creator<Task> = object : Parcelable.Creator<Task> {
-            override fun createFromParcel(source: Parcel): Task = Task(source)
-
-            override fun newArray(size: Int): Array<Task?> = arrayOfNulls(size)
-        }
-    }
-}
+package com.habitrpg.wearos.habitica.models.tasks
+
+import android.os.Parcel
+import android.os.Parcelable
+import android.text.Spanned
+import com.habitrpg.android.habitica.R
+import com.habitrpg.shared.habitica.models.tasks.Attribute
+import com.habitrpg.shared.habitica.models.tasks.BaseTask
+import com.habitrpg.shared.habitica.models.tasks.Frequency
+import com.habitrpg.shared.habitica.models.tasks.TaskType
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+import org.json.JSONArray
+import org.json.JSONException
+import java.util.Date
+
+@JsonClass(generateAdapter = true)
+open class Task() : Parcelable, BaseTask {
+    @Json(name = "_id")
+    var id: String? = null
+    var userId: String = ""
+    var priority: Float = 0.0f
+    var text: String = ""
+    var notes: String? = null
+    override var type: TaskType?
+        get() = TaskType.from(typeValue)
+        set(value) {
+            typeValue = value?.value
+        }
+    internal var typeValue: String? = null
+    var challengeID: String? = null
+    var challengeBroken: String? = null
+    var attribute: Attribute?
+        get() = Attribute.from(attributeValue)
+        set(value) {
+            attributeValue = value?.value
+        }
+    var attributeValue: String? = Attribute.STRENGTH.value
+    var value: Double? = 0.0
+    var dateCreated: Date? = null
+    var position: Int = 0
+
+    // Habits
+    var up: Boolean? = false
+    var down: Boolean? = false
+    override var counterUp: Int? = 0
+    override var counterDown: Int? = 0
+
+    // todos/dailies
+    override var completed: Boolean = false
+    var checklist: List<ChecklistItem>? = listOf()
+    var reminders: List<RemindersItem>? = listOf()
+
+    // dailies
+    var frequency: Frequency? = null
+    var everyX: Int? = 0
+    override var streak: Int? = 0
+    var startDate: Date? = null
+    var repeat: Days? = null
+
+    // todos
+    @Json(name = "date")
+    var dueDate: Date? = null
+
+    @Json(ignore = true)
+    var parsedText: Spanned? = null
+
+    @Json(ignore = true)
+    var parsedNotes: Spanned? = null
+
+    override var isDue: Boolean? = null
+
+    var nextDue: List<Date>? = null
+
+    // Needed for offline creating/updating
+    var isSaving: Boolean = false
+    var hasErrored: Boolean = false
+    var isCreating: Boolean = false
+    var yesterDaily: Boolean = true
+
+    internal var daysOfMonthString: String? = null
+    internal var weeksOfMonthString: String? = null
+
+    @Json(ignore = true)
+    private var daysOfMonth: List<Int>? = null
+
+    @Json(ignore = true)
+    private var weeksOfMonth: List<Int>? = null
+
+    val completedChecklistCount: Int
+        get() = checklist?.count { it.completed } ?: 0
+
+    val extraLightTaskColor: Int
+        get() {
+            val value = value ?: 0.0
+            return when {
+                value < -20 -> return R.color.watch_maroon_200
+                value < -10 -> return R.color.watch_red_200
+                value < -1 -> return R.color.watch_orange_200
+                value < 1 -> return R.color.watch_yellow_200
+                value < 5 -> return R.color.watch_green_200
+                value < 10 -> return R.color.watch_teal_200
+                else -> R.color.watch_blue_200
+            }
+        }
+
+    val lightTaskColor: Int
+        get() {
+            val value = value ?: 0.0
+            return when {
+                value < -20 -> return R.color.watch_maroon_100
+                value < -10 -> return R.color.watch_red_100
+                value < -1 -> return R.color.watch_orange_100
+                value < 1 -> return R.color.watch_yellow_100
+                value < 5 -> return R.color.watch_green_100
+                value < 10 -> return R.color.watch_teal_100
+                else -> R.color.watch_blue_100
+            }
+        }
+
+    val mediumTaskColor: Int
+        get() {
+            val value = value ?: 0.0
+            return when {
+                value < -20 -> return R.color.watch_maroon_10
+                value < -10 -> return R.color.watch_red_10
+                value < -1 -> return R.color.watch_orange_10
+                value < 1 -> return R.color.watch_yellow_10
+                value < 5 -> return R.color.watch_green_10
+                value < 10 -> return R.color.watch_teal_10
+                else -> R.color.watch_blue_10
+            }
+        }
+
+    override fun equals(other: Any?): Boolean {
+        if (other == null) {
+            return false
+        }
+        return if (Task::class.java.isAssignableFrom(other.javaClass)) {
+            val otherTask = other as? Task
+            this.id == otherTask?.id
+        } else {
+            super.equals(other)
+        }
+    }
+
+    fun isBeingEdited(task: Task): Boolean {
+        when {
+            text != task.text -> return true
+            notes != task.notes -> return true
+            reminders != task.reminders -> return true
+            checklist != task.checklist -> return true
+            priority != task.priority -> return true
+            attribute != task.attribute && attribute != null -> return true
+        }
+        when (type) {
+            TaskType.HABIT -> {
+                return when {
+                    up != task.up -> true
+                    down != task.down -> true
+                    frequency != task.frequency -> true
+                    counterUp != task.counterUp -> true
+                    counterDown != task.counterDown -> true
+                    else -> false
+                }
+            }
+            TaskType.DAILY -> {
+                return when {
+                    startDate != task.startDate -> true
+                    everyX != task.everyX -> true
+                    frequency != task.frequency -> true
+                    repeat != task.repeat -> true
+                    streak != task.streak -> true
+                    else -> false
+                }
+            }
+            TaskType.TODO -> {
+                return dueDate != task.dueDate
+            }
+            TaskType.REWARD -> {
+                return value != task.value
+            }
+            else -> {
+                return false
+            }
+        }
+    }
+
+    override fun hashCode(): Int {
+        return id?.hashCode() ?: 0
+    }
+
+    override fun describeContents(): Int = 0
+
+    override fun writeToParcel(
+        dest: Parcel,
+        flags: Int,
+    ) {
+        dest.writeString(this.userId)
+        dest.writeValue(this.priority)
+        dest.writeString(this.text)
+        dest.writeString(this.notes)
+        dest.writeString(this.attribute?.value)
+        dest.writeString(this.type?.value)
+        this.value?.let { dest.writeDouble(it) }
+        dest.writeLong(this.dateCreated?.time ?: -1)
+        dest.writeInt(this.position)
+        dest.writeValue(this.up)
+        dest.writeValue(this.down)
+        dest.writeByte(if (this.completed) 1.toByte() else 0.toByte())
+        dest.writeList(this.checklist as? List<*>)
+        dest.writeList(this.reminders as? List<*>)
+        dest.writeString(this.frequency?.value)
+        dest.writeValue(this.everyX)
+        dest.writeString(this.daysOfMonthString)
+        dest.writeString(this.weeksOfMonthString)
+        dest.writeValue(this.streak)
+        dest.writeLong(this.startDate?.time ?: -1)
+        dest.writeParcelable(this.repeat, flags)
+        dest.writeLong(this.dueDate?.time ?: -1)
+        dest.writeString(this.id)
+        dest.writeInt(this.counterUp ?: 0)
+        dest.writeInt(this.counterDown ?: 0)
+    }
+
+    protected constructor(`in`: Parcel) : this() {
+        this.userId = `in`.readString() ?: ""
+        this.priority = `in`.readValue(Float::class.java.classLoader) as? Float ?: 0f
+        this.text = `in`.readString() ?: ""
+        this.notes = `in`.readString()
+        this.attribute = Attribute.from(`in`.readString() ?: "")
+        this.type = TaskType.from(`in`.readString() ?: "")
+        this.value = `in`.readDouble()
+        val tmpDateCreated = `in`.readLong()
+        this.dateCreated = if (tmpDateCreated == -1L) null else Date(tmpDateCreated)
+        this.position = `in`.readInt()
+        this.up = `in`.readValue(Boolean::class.java.classLoader) as? Boolean ?: false
+        this.down = `in`.readValue(Boolean::class.java.classLoader) as? Boolean ?: false
+        this.completed = `in`.readByte().toInt() != 0
+        this.checklist = listOf()
+        `in`.readList(this.checklist as List<ChecklistItem>, ChecklistItem::class.java.classLoader)
+        this.reminders = listOf()
+        `in`.readList(this.reminders as List<RemindersItem>, RemindersItem::class.java.classLoader)
+        this.frequency = Frequency.from(`in`.readString() ?: "")
+        this.everyX = `in`.readValue(Int::class.java.classLoader) as? Int ?: 1
+        this.daysOfMonthString = `in`.readString()
+        this.weeksOfMonthString = `in`.readString()
+        this.streak = `in`.readValue(Int::class.java.classLoader) as? Int ?: 0
+        val tmpStartDate = `in`.readLong()
+        this.startDate = if (tmpStartDate == -1L) null else Date(tmpStartDate)
+        this.repeat = `in`.readParcelable(Days::class.java.classLoader)
+        val tmpDuedate = `in`.readLong()
+        this.dueDate = if (tmpDuedate == -1L) null else Date(tmpDuedate)
+        this.id = `in`.readString()
+        this.counterUp = `in`.readInt()
+        this.counterDown = `in`.readInt()
+    }
+
+    fun setWeeksOfMonth(weeksOfMonth: List<Int>?) {
+        this.weeksOfMonth = weeksOfMonth
+        if ((weeksOfMonth?.size ?: 0) > 0) {
+            this.weeksOfMonthString = this.weeksOfMonth?.toString()
+        } else {
+            weeksOfMonthString = "[]"
+        }
+    }
+
+    fun getWeeksOfMonth(): List<Int>? {
+        if (weeksOfMonth == null) {
+            val weeksOfMonth = mutableListOf<Int>()
+            if (weeksOfMonthString != null) {
+                try {
+                    val obj = JSONArray(weeksOfMonthString)
+                    var i = 0
+                    while (i < obj.length()) {
+                        weeksOfMonth.add(obj.getInt(i))
+                        i += 1
+                    }
+                } catch (_: JSONException) {
+                }
+            }
+            this.weeksOfMonth = weeksOfMonth.toList()
+        }
+        return weeksOfMonth
+    }
+
+    fun setDaysOfMonth(daysOfMonth: List<Int>?) {
+        this.daysOfMonth = daysOfMonth
+        if ((daysOfMonth?.size ?: 0) > 0) {
+            this.daysOfMonthString = this.daysOfMonth?.toString()
+        } else {
+            daysOfMonthString = "[]"
+        }
+    }
+
+    fun getDaysOfMonth(): List<Int>? {
+        if (daysOfMonth == null) {
+            val daysOfMonth = mutableListOf<Int>()
+            if (daysOfMonthString != null) {
+                try {
+                    val obj = JSONArray(daysOfMonthString)
+                    var i = 0
+                    while (i < obj.length()) {
+                        daysOfMonth.add(obj.getInt(i))
+                        i += 1
+                    }
+                } catch (_: JSONException) {
+                }
+            }
+            this.daysOfMonth = daysOfMonth
+        }
+
+        return daysOfMonth
+    }
+
+    companion object CREATOR : Parcelable.Creator<Task> {
+        override fun createFromParcel(source: Parcel): Task = Task(source)
+
+        override fun newArray(size: Int): Array<Task?> = arrayOfNulls(size)
+
+        const val FILTER_ALL = "all"
+        const val FILTER_WEAK = "weak"
+        const val FILTER_STRONG = "strong"
+        const val FILTER_ACTIVE = "active"
+        const val FILTER_GRAY = "gray"
+        const val FILTER_DATED = "dated"
+        const val FILTER_COMPLETED = "completed"
+
+        @JvmField
+        val CREATOR: Parcelable.Creator<Task> =
+            object : Parcelable.Creator<Task> {
+                override fun createFromParcel(source: Parcel): Task = Task(source)
+
+                override fun newArray(size: Int): Array<Task?> = arrayOfNulls(size)
+            }
+    }
+}
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/models/user/Buffs.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/models/user/Buffs.kt
index 60379811d..1cdeaeba0 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/models/user/Buffs.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/models/user/Buffs.kt
@@ -8,7 +8,7 @@ class Buffs : AvatarBuffs {
     override var con: Float? = null
     override var str: Float? = null
     override var per: Float? = null
-    override var _int: Float? = null
+    override var intelligence: Float? = null
     override var seafoam: Boolean? = null
     override var spookySparkles: Boolean? = null
     override var shinySeed: Boolean? = null
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/models/user/MenuItem.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/models/user/MenuItem.kt
index f09a35979..fb022f43c 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/models/user/MenuItem.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/models/user/MenuItem.kt
@@ -11,5 +11,5 @@ data class MenuItem(
     val isProminent: Boolean = false,
     val isHidden: Boolean = false,
     var detailText: String? = null,
-    val onClick: () -> Unit
+    val onClick: () -> Unit,
 )
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/modules/AppModule.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/modules/AppModule.kt
index e60030a5b..5a0b64d5e 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/modules/AppModule.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/modules/AppModule.kt
@@ -39,7 +39,7 @@ class AppModule {
     fun providesHostConfig(
         sharedPreferences: SharedPreferences,
         keyHelper: KeyHelper?,
-        @ApplicationContext context: Context
+        @ApplicationContext context: Context,
     ): HostConfig {
         return HostConfig(sharedPreferences, keyHelper, context)
     }
@@ -47,7 +47,7 @@ class AppModule {
     @Provides
     fun providesConverterFactory(moshi: Moshi): Converter.Factory {
         return MoshiConverterFactory.create(
-            moshi
+            moshi,
         ).asLenient()
     }
 
@@ -69,19 +69,21 @@ class AppModule {
         hostConfig: HostConfig,
         @ApplicationContext context: Context,
         converter: Converter.Factory,
-        appStateManager: AppStateManager
+        appStateManager: AppStateManager,
     ): ApiClient {
         return ApiClient(
             converter,
             hostConfig,
             appStateManager,
-            context
+            context,
         )
     }
 
     @Provides
     @Singleton
-    fun provideSharedPreferences(@ApplicationContext context: Context): SharedPreferences {
+    fun provideSharedPreferences(
+        @ApplicationContext context: Context,
+    ): SharedPreferences {
         return PreferenceManager.getDefaultSharedPreferences(context)
     }
 
@@ -107,7 +109,7 @@ class AppModule {
     fun provideKeyHelper(
         @ApplicationContext context: Context,
         sharedPreferences: SharedPreferences,
-        keyStore: KeyStore?
+        keyStore: KeyStore?,
     ): KeyHelper? {
         return if (keyStore == null) {
             null
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/AvatarActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/AvatarActivity.kt
index d46a0924d..f45ac3735 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/AvatarActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/AvatarActivity.kt
@@ -38,15 +38,16 @@ class AvatarActivity : BaseActivity<ActivityAvatarBinding, AvatarViewModel>() {
 
     private fun scaleAvatar() {
         val params = binding.root.layoutParams as FrameLayout.LayoutParams
-        val maxSize = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            max(
-                windowManager.currentWindowMetrics.bounds.bottom,
-                windowManager.currentWindowMetrics.bounds.right
-            )
-        } else {
-            @Suppress("DEPRECATION")
-            max(windowManager.defaultDisplay.width, windowManager.defaultDisplay.height)
-        }
+        val maxSize =
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                max(
+                    windowManager.currentWindowMetrics.bounds.bottom,
+                    windowManager.currentWindowMetrics.bounds.right,
+                )
+            } else {
+                @Suppress("DEPRECATION")
+                max(windowManager.defaultDisplay.width, windowManager.defaultDisplay.height)
+            }
         var factor = (maxSize / 46f) / 3f
         var viewSize = 138 * factor.roundToInt()
         if (maxSize - viewSize > 20.dpToPx(this)) {
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/BaseActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/BaseActivity.kt
index 0a6764ea5..790ada0c7 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/BaseActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/BaseActivity.kt
@@ -29,9 +29,11 @@ abstract class BaseActivity<B : ViewBinding, VM : BaseViewModel> : ComponentActi
 
     val messageClient: MessageClient by lazy { Wearable.getMessageClient(this) }
     private val capabilityClient: CapabilityClient by lazy { Wearable.getCapabilityClient(this) }
+
     companion object {
         var currentActivityClassName: String? = null
     }
+
     private lateinit var wrapperBinding: ActivityWrapperBinding
     protected lateinit var binding: B
     abstract val viewModel: VM
@@ -45,10 +47,11 @@ abstract class BaseActivity<B : ViewBinding, VM : BaseViewModel> : ComponentActi
         setContentView(wrapperBinding.root)
 
         viewModel.errorValues.observe(this) {
-            val intent = Intent(this, ConfirmationActivity::class.java).apply {
-                putExtra("text", it.title)
-                putExtra("icon", it.icon)
-            }
+            val intent =
+                Intent(this, ConfirmationActivity::class.java).apply {
+                    putExtra("text", it.title)
+                    putExtra("icon", it.icon)
+                }
             startActivity(intent)
         }
 
@@ -96,13 +99,16 @@ abstract class BaseActivity<B : ViewBinding, VM : BaseViewModel> : ComponentActi
         }
     }
 
-    internal fun openRemoteActivity(url: String, keepActive: Boolean = false) {
+    internal fun openRemoteActivity(
+        url: String,
+        keepActive: Boolean = false,
+    ) {
         sendMessage("open_activity", url, null) {}
         startActivity(
             Intent(this, ContinuePhoneActivity::class.java)
                 .apply {
                     putExtra("keep_active", keepActive)
-                }
+                },
         )
     }
 
@@ -110,18 +116,19 @@ abstract class BaseActivity<B : ViewBinding, VM : BaseViewModel> : ComponentActi
         permission: String,
         url: String,
         data: ByteArray?,
-        function: ((Boolean) -> Unit)
+        function: ((Boolean) -> Unit),
     ) {
         lifecycleScope.launchCatching({
             Log.e("BaseActivity", "Error sending message", it)
             function(false)
         }, Dispatchers.IO) {
-            val info = Tasks.await(
-                capabilityClient.getCapability(
-                    permission,
-                    CapabilityClient.FILTER_ALL
+            val info =
+                Tasks.await(
+                    capabilityClient.getCapability(
+                        permission,
+                        CapabilityClient.FILTER_ALL,
+                    ),
                 )
-            )
             val nodeID = info.nodes.firstOrNull()
             if (nodeID != null) {
                 function(true)
@@ -130,8 +137,8 @@ abstract class BaseActivity<B : ViewBinding, VM : BaseViewModel> : ComponentActi
                         messageClient.sendMessage(
                             nodeID.id,
                             url,
-                            data
-                        )
+                            data,
+                        ),
                     )
                 } catch (_: ApiException) {
                     // It's not connected
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/FaintActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/FaintActivity.kt
index feea13166..7ba57aaf8 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/FaintActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/FaintActivity.kt
@@ -24,7 +24,7 @@ class FaintActivity : BaseActivity<ActivityFaintBinding, FaintViewModel>() {
                 CoroutineExceptionHandler { _, _ ->
                     stopAnimatingProgress()
                     binding.continueButton.isEnabled = true
-                }
+                },
             ) {
                 viewModel.revive()
                 finish()
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/LevelupActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/LevelupActivity.kt
index d7bb7251a..fa642ad9e 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/LevelupActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/LevelupActivity.kt
@@ -30,7 +30,7 @@ class LevelupActivity : BaseActivity<ActivityLevelupBinding, LevelupViewModel>()
                 CoroutineExceptionHandler { _, _ ->
                     stopAnimatingProgress()
                     binding.continueButton.isEnabled = true
-                }
+                },
             ) {
                 finish()
             }
@@ -50,16 +50,19 @@ class LevelupActivity : BaseActivity<ActivityLevelupBinding, LevelupViewModel>()
                 createParticles(container, R.drawable.confetti_yellow)
                 createParticles(container, R.drawable.confetti_purple)
             },
-            500
+            500,
         )
     }
 
-    private fun createParticles(container: FrameLayout, resource: Int) {
+    private fun createParticles(
+        container: FrameLayout,
+        resource: Int,
+    ) {
         ParticleSystem(
             container,
             20,
             ContextCompat.getDrawable(this, resource),
-            6000
+            6000,
         )
             .setRotationSpeed(144f)
             .setScaleRange(1.0f, 1.6f)
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/LoginActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/LoginActivity.kt
index 8ca3f6687..f48247e0e 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/LoginActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/LoginActivity.kt
@@ -16,8 +16,9 @@ import dagger.hilt.android.AndroidEntryPoint
 class LoginActivity : BaseActivity<ActivityLoginBinding, LoginViewModel>() {
     enum class State {
         INITIAL,
-        OTHER
+        OTHER,
     }
+
     override val viewModel: LoginViewModel by viewModels()
     private var currentState: State = State.INITIAL
         set(value) {
@@ -71,19 +72,21 @@ class LoginActivity : BaseActivity<ActivityLoginBinding, LoginViewModel>() {
         viewModel.handleGoogleLogin(this, pickAccountResult)
     }
 
-    private val pickAccountResult = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-        val task = GoogleSignIn.getSignedInAccountFromIntent(it.data)
-        viewModel.handleGoogleLoginResult(this, task, recoverFromPlayServicesErrorResult)
-    }
-
-    private val recoverFromPlayServicesErrorResult = registerForActivityResult(
-        ActivityResultContracts.StartActivityForResult()
-    ) {
-        if (it.resultCode != Activity.RESULT_CANCELED) {
+    private val pickAccountResult =
+        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
             val task = GoogleSignIn.getSignedInAccountFromIntent(it.data)
-            viewModel.handleGoogleLoginResult(this, task, null)
+            viewModel.handleGoogleLoginResult(this, task, recoverFromPlayServicesErrorResult)
+        }
+
+    private val recoverFromPlayServicesErrorResult =
+        registerForActivityResult(
+            ActivityResultContracts.StartActivityForResult(),
+        ) {
+            if (it.resultCode != Activity.RESULT_CANCELED) {
+                val task = GoogleSignIn.getSignedInAccountFromIntent(it.data)
+                viewModel.handleGoogleLoginResult(this, task, null)
+            }
         }
-    }
 
     private fun startMainActivity() {
         val intent = Intent(this@LoginActivity, MainActivity::class.java)
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/MainActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/MainActivity.kt
index 5653194e5..68f750338 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/MainActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/MainActivity.kt
@@ -23,11 +23,12 @@ import kotlinx.coroutines.launch
 @AndroidEntryPoint
 class MainActivity : BaseActivity<ActivityMainBinding, MainViewModel>() {
     override val viewModel: MainViewModel by viewModels()
-    private val adapter = HubAdapter().apply {
-        onRefresh = {
-            viewModel.retrieveFullUserData()
+    private val adapter =
+        HubAdapter().apply {
+            onRefresh = {
+                viewModel.retrieveFullUserData()
+            }
         }
-    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         binding = ActivityMainBinding.inflate(layoutInflater)
@@ -46,72 +47,73 @@ class MainActivity : BaseActivity<ActivityMainBinding, MainViewModel>() {
 
     override fun onStart() {
         super.onStart()
-        adapter.data = listOf(
-            MenuItem(
-                "createTask",
-                getString(R.string.new_task),
-                AppCompatResources.getDrawable(this, R.drawable.icon_plus),
-                ContextCompat.getColor(this, R.color.watch_purple_100),
-                ContextCompat.getColor(this, R.color.black),
-                true
-            ) {
-                openTaskFormActivity()
-            },
-            MenuItem(
-                TaskType.DAILY.value,
-                getString(R.string.dailies),
-                AppCompatResources.getDrawable(this, R.drawable.icon_dailies),
-                ContextCompat.getColor(this, R.color.watch_purple_200),
-                ContextCompat.getColor(this, R.color.watch_purple_700)
-            ) {
-                openTasklist(TaskType.DAILY)
-            },
-            MenuItem(
-                TaskType.TODO.value,
-                getString(R.string.todos),
-                AppCompatResources.getDrawable(this, R.drawable.icon_todos),
-                ContextCompat.getColor(this, R.color.watch_purple_200),
-                ContextCompat.getColor(this, R.color.watch_purple_700)
-            ) {
-                openTasklist(TaskType.TODO)
-            },
-            MenuItem(
-                TaskType.HABIT.value,
-                getString(R.string.habits),
-                AppCompatResources.getDrawable(this, R.drawable.icon_habits),
-                ContextCompat.getColor(this, R.color.watch_purple_200),
-                ContextCompat.getColor(this, R.color.watch_purple_700)
-            ) {
-                openTasklist(TaskType.HABIT)
-            },
-            MenuItem(
-                "stats",
-                getString(R.string.stats),
-                AppCompatResources.getDrawable(this, R.drawable.icon_stats),
-                ContextCompat.getColor(this, R.color.watch_purple_200),
-                ContextCompat.getColor(this, R.color.watch_purple_700)
-            ) {
-                openStatsActivity()
-            },
-            MenuItem(
-                "avatar",
-                getString(R.string.avatar),
-                AppCompatResources.getDrawable(this, R.drawable.icon_avatar),
-                ContextCompat.getColor(this, R.color.watch_purple_200),
-                ContextCompat.getColor(this, R.color.watch_purple_700)
-            ) {
-                openAvatarActivity()
-            },
-            MenuItem(
-                "settings",
-                getString(R.string.settings),
-                AppCompatResources.getDrawable(this, R.drawable.icon_settings),
-                ContextCompat.getColor(this, R.color.watch_purple_200),
-                ContextCompat.getColor(this, R.color.watch_purple_700)
-            ) {
-                openSettingsActivity()
-            }
-        )
+        adapter.data =
+            listOf(
+                MenuItem(
+                    "createTask",
+                    getString(R.string.new_task),
+                    AppCompatResources.getDrawable(this, R.drawable.icon_plus),
+                    ContextCompat.getColor(this, R.color.watch_purple_100),
+                    ContextCompat.getColor(this, R.color.black),
+                    true,
+                ) {
+                    openTaskFormActivity()
+                },
+                MenuItem(
+                    TaskType.DAILY.value,
+                    getString(R.string.dailies),
+                    AppCompatResources.getDrawable(this, R.drawable.icon_dailies),
+                    ContextCompat.getColor(this, R.color.watch_purple_200),
+                    ContextCompat.getColor(this, R.color.watch_purple_700),
+                ) {
+                    openTasklist(TaskType.DAILY)
+                },
+                MenuItem(
+                    TaskType.TODO.value,
+                    getString(R.string.todos),
+                    AppCompatResources.getDrawable(this, R.drawable.icon_todos),
+                    ContextCompat.getColor(this, R.color.watch_purple_200),
+                    ContextCompat.getColor(this, R.color.watch_purple_700),
+                ) {
+                    openTasklist(TaskType.TODO)
+                },
+                MenuItem(
+                    TaskType.HABIT.value,
+                    getString(R.string.habits),
+                    AppCompatResources.getDrawable(this, R.drawable.icon_habits),
+                    ContextCompat.getColor(this, R.color.watch_purple_200),
+                    ContextCompat.getColor(this, R.color.watch_purple_700),
+                ) {
+                    openTasklist(TaskType.HABIT)
+                },
+                MenuItem(
+                    "stats",
+                    getString(R.string.stats),
+                    AppCompatResources.getDrawable(this, R.drawable.icon_stats),
+                    ContextCompat.getColor(this, R.color.watch_purple_200),
+                    ContextCompat.getColor(this, R.color.watch_purple_700),
+                ) {
+                    openStatsActivity()
+                },
+                MenuItem(
+                    "avatar",
+                    getString(R.string.avatar),
+                    AppCompatResources.getDrawable(this, R.drawable.icon_avatar),
+                    ContextCompat.getColor(this, R.color.watch_purple_200),
+                    ContextCompat.getColor(this, R.color.watch_purple_700),
+                ) {
+                    openAvatarActivity()
+                },
+                MenuItem(
+                    "settings",
+                    getString(R.string.settings),
+                    AppCompatResources.getDrawable(this, R.drawable.icon_settings),
+                    ContextCompat.getColor(this, R.color.watch_purple_200),
+                    ContextCompat.getColor(this, R.color.watch_purple_700),
+                ) {
+                    openSettingsActivity()
+                },
+            )
         lifecycleScope.launch {
             viewModel.user
                 .filterNotNull()
@@ -142,14 +144,15 @@ class MainActivity : BaseActivity<ActivityMainBinding, MainViewModel>() {
         viewModel.periodicUserRefresh()
     }
 
-    private val openTaskForm = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
-        if (result.resultCode == Activity.RESULT_OK) {
-            val taskType = result.data?.getStringExtra("task_type")?.let { TaskType.from(it) }
-            if (taskType != null) {
-                openTasklist(taskType)
+    private val openTaskForm =
+        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+            if (result.resultCode == Activity.RESULT_OK) {
+                val taskType = result.data?.getStringExtra("task_type")?.let { TaskType.from(it) }
+                if (taskType != null) {
+                    openTasklist(taskType)
+                }
             }
         }
-    }
 
     private fun openTaskFormActivity() {
         openTaskForm.launch(Intent(this, TaskFormActivity::class.java))
@@ -168,9 +171,10 @@ class MainActivity : BaseActivity<ActivityMainBinding, MainViewModel>() {
     }
 
     private fun openTasklist(type: TaskType) {
-        val intent = Intent(this, TaskListActivity::class.java).apply {
-            putExtra("task_type", type.value)
-        }
+        val intent =
+            Intent(this, TaskListActivity::class.java).apply {
+                putExtra("task_type", type.value)
+            }
         startActivity(intent)
     }
 }
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/RYAActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/RYAActivity.kt
index b67443d2f..274ebb864 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/RYAActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/RYAActivity.kt
@@ -40,7 +40,7 @@ class RYAActivity : BaseActivity<ActivityRyaBinding, RYAViewModel>() {
                         viewModel.tasks.removeObserver(this)
                     }
                 }
-            }
+            },
         )
 
         binding.ryaButton.setOnClickListener {
@@ -67,7 +67,7 @@ class RYAActivity : BaseActivity<ActivityRyaBinding, RYAViewModel>() {
                 Intent(this, RYAActivity::class.java)
                     .apply {
                         addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK)
-                    }
+                    },
             )
         }
         super.onDestroy()
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/SettingsActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/SettingsActivity.kt
index 3c57c87fa..5d4144592 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/SettingsActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/SettingsActivity.kt
@@ -45,8 +45,9 @@ class SettingsActivity : BaseActivity<ActivitySettingsBinding, SettingsViewModel
     private fun logout() {
         viewModel.logout()
         try {
-            val gso = GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
-                .build()
+            val gso =
+                GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
+                    .build()
             val client = GoogleSignIn.getClient(this, gso)
             client.signOut()
         } catch (_: Exception) {
@@ -63,7 +64,7 @@ class SettingsActivity : BaseActivity<ActivitySettingsBinding, SettingsViewModel
                 "sync",
                 getString(R.string.sync_data),
                 SettingsItem.Types.BUTTON,
-                null
+                null,
             ) {
                 viewModel.resyncData()
             },
@@ -71,7 +72,7 @@ class SettingsActivity : BaseActivity<ActivitySettingsBinding, SettingsViewModel
                 "logout",
                 getString(R.string.logout),
                 SettingsItem.Types.BUTTON,
-                null
+                null,
             ) {
                 showLogoutConfirmation()
             },
@@ -79,16 +80,16 @@ class SettingsActivity : BaseActivity<ActivitySettingsBinding, SettingsViewModel
                 "spacer",
                 getString(R.string.settings),
                 SettingsItem.Types.SPACER,
-                null
+                null,
             ) {
             },
             SettingsItem(
                 "footer",
                 getString(R.string.version_info, versionName, versionCode),
                 SettingsItem.Types.FOOTER,
-                null
+                null,
             ) {
-            }
+            },
         )
     }
 
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskDetailActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskDetailActivity.kt
index 9eb2b5128..41f6c41db 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskDetailActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskDetailActivity.kt
@@ -15,7 +15,6 @@ import java.text.DateFormat
 
 @AndroidEntryPoint
 class TaskDetailActivity : BaseActivity<ActivityTaskDetailBinding, TaskDetailViewModel>() {
-
     override val viewModel: TaskDetailViewModel by viewModels()
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -32,24 +31,25 @@ class TaskDetailActivity : BaseActivity<ActivityTaskDetailBinding, TaskDetailVie
     private fun openEditFormOnPhone() {
         sendMessage("edit_task", "/tasks/edit", viewModel.taskID?.toByteArray()) {}
         startActivity(
-            Intent(this, ContinuePhoneActivity::class.java)
+            Intent(this, ContinuePhoneActivity::class.java),
         )
     }
 
     private fun subscribeUI() {
         viewModel.task.observe(this) { task ->
-            binding.taskTypeView.text = when (task?.type) {
-                TaskType.HABIT -> getString(R.string.habit)
-                TaskType.DAILY -> getString(R.string.daily)
-                TaskType.TODO -> getString(R.string.todo)
-                TaskType.REWARD -> getString(R.string.reward)
-                null -> ""
-            }
+            binding.taskTypeView.text =
+                when (task?.type) {
+                    TaskType.HABIT -> getString(R.string.habit)
+                    TaskType.DAILY -> getString(R.string.daily)
+                    TaskType.TODO -> getString(R.string.todo)
+                    TaskType.REWARD -> getString(R.string.reward)
+                    null -> ""
+                }
             binding.taskTypeView.setTextColor(
                 ContextCompat.getColor(
                     this,
-                    task?.extraLightTaskColor ?: R.color.watch_white
-                )
+                    task?.extraLightTaskColor ?: R.color.watch_white,
+                ),
             )
             binding.taskTextView.text = task?.text
             if (task?.notes?.isNotBlank() == true) {
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskFormActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskFormActivity.kt
index 5ea8d488b..452c80485 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskFormActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskFormActivity.kt
@@ -26,15 +26,16 @@ class TaskFormActivity : BaseActivity<ActivityTaskFormBinding, TaskFormViewModel
             updateTaskTypeButton(binding.todoButton, TaskType.TODO)
             updateTaskTypeButton(binding.dailyButton, TaskType.DAILY)
             updateTaskTypeButton(binding.habitButton, TaskType.HABIT)
-            val typeName = getString(
-                when (value) {
-                    TaskType.HABIT -> R.string.habit
-                    TaskType.DAILY -> R.string.daily
-                    TaskType.TODO -> R.string.todo
-                    TaskType.REWARD -> R.string.reward
-                    else -> R.string.task
-                }
-            )
+            val typeName =
+                getString(
+                    when (value) {
+                        TaskType.HABIT -> R.string.habit
+                        TaskType.DAILY -> R.string.daily
+                        TaskType.TODO -> R.string.todo
+                        TaskType.REWARD -> R.string.reward
+                        else -> R.string.task
+                    },
+                )
             binding.confirmationTitle.text = getString(R.string.new_task_x, typeName)
             binding.saveButton.setChipText(getString(R.string.save_task_x, typeName))
         }
@@ -67,7 +68,7 @@ class TaskFormActivity : BaseActivity<ActivityTaskFormBinding, TaskFormViewModel
                     binding.saveButton.isEnabled = true
                     binding.editTaskWrapper.isVisible = true
                     binding.taskConfirmationWrapper.isVisible = false
-                }
+                },
             ) {
                 viewModel.saveTask(binding.editText.text, taskType)
                 val data = Intent()
@@ -78,7 +79,7 @@ class TaskFormActivity : BaseActivity<ActivityTaskFormBinding, TaskFormViewModel
                 parent.startActivity(
                     Intent(parent, TaskListActivity::class.java).apply {
                         putExtra("task_type", taskType?.value)
-                    }
+                    },
                 )
             }
         }
@@ -94,25 +95,30 @@ class TaskFormActivity : BaseActivity<ActivityTaskFormBinding, TaskFormViewModel
         }
     }
 
-    private val inputResult = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-        val input = it.data?.getStringExtra("input")
-        if (input?.isNotBlank() == true) {
-            binding.editTaskWrapper.isVisible = false
-            binding.taskConfirmationWrapper.isVisible = true
-            binding.confirmationText.text = input
-            binding.editText.setText(input)
+    private val inputResult =
+        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+            val input = it.data?.getStringExtra("input")
+            if (input?.isNotBlank() == true) {
+                binding.editTaskWrapper.isVisible = false
+                binding.taskConfirmationWrapper.isVisible = true
+                binding.confirmationText.text = input
+                binding.editText.setText(input)
+            }
         }
-    }
 
     private fun requestInput() {
-        val intent = Intent(this, InputActivity::class.java).apply {
-            putExtra("title", getString(R.string.task_title_hint))
-            putExtra("input", binding.editText.text.toString())
-        }
+        val intent =
+            Intent(this, InputActivity::class.java).apply {
+                putExtra("title", getString(R.string.task_title_hint))
+                putExtra("input", binding.editText.text.toString())
+            }
         inputResult.launch(intent)
     }
 
-    private fun updateTaskTypeButton(button: TextView, thisType: TaskType) {
+    private fun updateTaskTypeButton(
+        button: TextView,
+        thisType: TaskType,
+    ) {
         if (taskType == thisType) {
             button.backgroundTintList =
                 ColorStateList.valueOf(ContextCompat.getColor(this, R.color.watch_purple_10))
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskListActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskListActivity.kt
index 70788585f..5de4f2fa0 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskListActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskListActivity.kt
@@ -42,25 +42,26 @@ class TaskListActivity : BaseActivity<ActivityTasklistBinding, TaskListViewModel
             layoutManager =
                 WearableLinearLayoutManager(
                     this@TaskListActivity,
-                    HabiticaScrollingLayoutCallback()
+                    HabiticaScrollingLayoutCallback(),
                 )
             adapter = this@TaskListActivity.adapter
             emptyViewBuilder = {
                 val emptyBinding = EmptyTaskListBinding.inflate(layoutInflater)
                 emptyBinding.disconnected.root.isVisible = !appStateManager.isAppConnected.value
                 emptyBinding.header.textView.text = getTitle(viewModel.taskCount.value)
-                emptyBinding.descriptionView.text = getString(
-                    R.string.no_tasks,
+                emptyBinding.descriptionView.text =
                     getString(
-                        when (viewModel.taskType) {
-                            TaskType.HABIT -> R.string.habit
-                            TaskType.DAILY -> R.string.daily
-                            TaskType.TODO -> R.string.todo
-                            TaskType.REWARD -> R.string.reward
-                            else -> R.string.task
-                        }
+                        R.string.no_tasks,
+                        getString(
+                            when (viewModel.taskType) {
+                                TaskType.HABIT -> R.string.habit
+                                TaskType.DAILY -> R.string.daily
+                                TaskType.TODO -> R.string.todo
+                                TaskType.REWARD -> R.string.reward
+                                else -> R.string.task
+                            },
+                        ),
                     )
-                )
                 emptyBinding.root
             }
             onRefresh = {
@@ -96,7 +97,7 @@ class TaskListActivity : BaseActivity<ActivityTasklistBinding, TaskListViewModel
         startActivity(
             Intent(this, TaskDetailActivity::class.java).apply {
                 putExtra("task_id", task.id)
-            }
+            },
         )
     }
 
@@ -104,9 +105,10 @@ class TaskListActivity : BaseActivity<ActivityTasklistBinding, TaskListViewModel
     private val habitDirectionIntentLauncher =
         registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
             if (result.resultCode == Activity.RESULT_OK) {
-                val direction = result.data?.getStringExtra("direction")
-                    ?.let { TaskDirection.valueOf(it) }
-                    ?: TaskDirection.UP
+                val direction =
+                    result.data?.getStringExtra("direction")
+                        ?.let { TaskDirection.valueOf(it) }
+                        ?: TaskDirection.UP
 
                 taskToScore?.let { task ->
                     viewModel.scoreTask(task, direction) {
@@ -126,10 +128,10 @@ class TaskListActivity : BaseActivity<ActivityTasklistBinding, TaskListViewModel
                 habitDirectionIntentLauncher.launch(
                     Intent(
                         this,
-                        HabitDirectionActivity::class.java
+                        HabitDirectionActivity::class.java,
                     ).apply {
                         putExtra("task_id", task.id)
-                    }
+                    },
                 )
                 return
             } else if (task.up != true && task.down != true) {
@@ -155,7 +157,7 @@ class TaskListActivity : BaseActivity<ActivityTasklistBinding, TaskListViewModel
         startActivity(
             Intent(this, TaskFormActivity::class.java).apply {
                 putExtra("task_type", viewModel.taskType?.value)
-            }
+            },
         )
         overridePendingTransition(R.anim.scale_up, 0)
     }
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskResultActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskResultActivity.kt
index ad9ea4715..22d9a11e2 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskResultActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskResultActivity.kt
@@ -56,7 +56,7 @@ class TaskResultActivity : BaseActivity<ActivityTaskResultBinding, TaskResultVie
                 Intent(this, LevelupActivity::class.java)
                     .apply {
                         addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK)
-                    }
+                    },
             )
             overridePendingTransition(R.anim.scale_in, R.anim.move_away)
         } else if (viewModel.hasDied) {
@@ -64,7 +64,7 @@ class TaskResultActivity : BaseActivity<ActivityTaskResultBinding, TaskResultVie
                 Intent(this, FaintActivity::class.java)
                     .apply {
                         addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK)
-                    }
+                    },
             )
             overridePendingTransition(R.anim.scale_in, R.anim.move_away)
         }
@@ -83,7 +83,7 @@ class TaskResultActivity : BaseActivity<ActivityTaskResultBinding, TaskResultVie
             val chip = TaskRewardChip(this)
             chip.set(
                 viewModel.result?.healthDelta,
-                R.drawable.heart
+                R.drawable.heart,
             )
             chips.add(chip)
         }
@@ -91,7 +91,7 @@ class TaskResultActivity : BaseActivity<ActivityTaskResultBinding, TaskResultVie
             val chip = TaskRewardChip(this)
             chip.set(
                 viewModel.result?.experienceDelta,
-                R.drawable.experience
+                R.drawable.experience,
             )
             chips.add(chip)
         }
@@ -99,7 +99,7 @@ class TaskResultActivity : BaseActivity<ActivityTaskResultBinding, TaskResultVie
             val chip = TaskRewardChip(this)
             chip.set(
                 viewModel.result?.goldDelta,
-                R.drawable.gold
+                R.drawable.gold,
             )
             chips.add(chip)
         }
@@ -107,7 +107,7 @@ class TaskResultActivity : BaseActivity<ActivityTaskResultBinding, TaskResultVie
             val chip = TaskRewardChip(this)
             chip.set(
                 viewModel.result?.manaDelta,
-                R.drawable.magic
+                R.drawable.magic,
             )
             chips.add(chip)
         }
@@ -124,12 +124,13 @@ class TaskResultActivity : BaseActivity<ActivityTaskResultBinding, TaskResultVie
         var currentColumn = 0
         val hasDrop = viewModel.hasDrop
         val margin = 6.dpToPx(this)
-        val chipSize = when {
-            hasDrop -> TaskRewardChip.Size.SMALL
-            chips.size <= 2 -> TaskRewardChip.Size.LARGE
-            chips.size == 5 -> TaskRewardChip.Size.SMALL
-            else -> TaskRewardChip.Size.MEDIUM
-        }
+        val chipSize =
+            when {
+                hasDrop -> TaskRewardChip.Size.SMALL
+                chips.size <= 2 -> TaskRewardChip.Size.LARGE
+                chips.size == 5 -> TaskRewardChip.Size.SMALL
+                else -> TaskRewardChip.Size.MEDIUM
+            }
         if ((chips.size > 4 && hasDrop) || (chips.size > 5)) {
             chips = chips.subList(0, if (hasDrop) 4 else 5)
         }
@@ -197,20 +198,24 @@ class TaskResultActivity : BaseActivity<ActivityTaskResultBinding, TaskResultVie
                         "Egg" -> getString(R.string.an_egg)
                         "HatchingPotion" -> getString(R.string.a_potion)
                         else -> getString(R.string.some_x, type)
-                    }
+                    },
                 )
                 dropBinding.imageView.loadImage("Pet_" + type + "_" + key)
             }
-            dropBinding.textView.text = when (elements.size) {
-                1 -> elements[0]
-                2 -> getString(R.string.x_and_y, elements[0], elements[1])
-                else -> elements.joinToString(", ")
-            }.localizedCapitalize()
+            dropBinding.textView.text =
+                when (elements.size) {
+                    1 -> elements[0]
+                    2 -> getString(R.string.x_and_y, elements[0], elements[1])
+                    else -> elements.joinToString(", ")
+                }.localizedCapitalize()
         }
     }
 
     companion object {
-        fun show(context: Activity, result: TaskScoringResult) {
+        fun show(
+            context: Activity,
+            result: TaskScoringResult,
+        ) {
             val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
             if (sharedPreferences.getBoolean("hide_task_results", false)) return
             val intent = Intent(context, TaskResultActivity::class.java)
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/BaseAdapter.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/BaseAdapter.kt
index 73a473178..cf2dfc5cf 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/BaseAdapter.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/BaseAdapter.kt
@@ -27,9 +27,13 @@ abstract class BaseAdapter<D : Any> : RecyclerView.Adapter<RecyclerView.ViewHold
             field = value
             notifyDataSetChanged()
         }
+
     fun hasData(): Boolean = data.isNotEmpty()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int,
+    ): RecyclerView.ViewHolder {
         return when (viewType) {
             TYPE_HEADER -> HeaderViewHolder(RowHeaderBinding.inflate(parent.context.layoutInflater, parent, false).root)
             else -> SpacerViewHolder(RowSpacerBinding.inflate(parent.context.layoutInflater, parent, false).root)
@@ -37,9 +41,13 @@ abstract class BaseAdapter<D : Any> : RecyclerView.Adapter<RecyclerView.ViewHold
     }
 
     override fun getItemCount() = data.size + 1
+
     protected fun getItemAt(position: Int) = data[position - 1]
 
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+    override fun onBindViewHolder(
+        holder: RecyclerView.ViewHolder,
+        position: Int,
+    ) {
         if (holder is HeaderViewHolder) {
             holder.bind(title)
             holder.setIsDisconnected(isDisconnected)
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/DailyListAdapter.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/DailyListAdapter.kt
index 49bda93a8..b3665b55d 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/DailyListAdapter.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/DailyListAdapter.kt
@@ -7,7 +7,10 @@ import com.habitrpg.common.habitica.extensions.layoutInflater
 import com.habitrpg.wearos.habitica.ui.viewHolders.tasks.DailyViewHolder
 
 class DailyListAdapter : TaskListAdapter() {
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int,
+    ): RecyclerView.ViewHolder {
         return if (viewType == 1) {
             return DailyViewHolder(RowDailyBinding.inflate(parent.context.layoutInflater, parent, false).root)
         } else {
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/HabitListAdapter.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/HabitListAdapter.kt
index fb0d67aae..9ea89cb36 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/HabitListAdapter.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/HabitListAdapter.kt
@@ -7,7 +7,10 @@ import com.habitrpg.common.habitica.extensions.layoutInflater
 import com.habitrpg.wearos.habitica.ui.viewHolders.tasks.HabitViewHolder
 
 class HabitListAdapter : TaskListAdapter() {
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int,
+    ): RecyclerView.ViewHolder {
         return if (viewType == 1) {
             return HabitViewHolder(RowHabitBinding.inflate(parent.context.layoutInflater, parent, false).root)
         } else {
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/HubAdapter.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/HubAdapter.kt
index 058e64aa4..02a988173 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/HubAdapter.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/HubAdapter.kt
@@ -8,7 +8,10 @@ import com.habitrpg.wearos.habitica.models.user.MenuItem
 import com.habitrpg.wearos.habitica.ui.viewHolders.HubViewHolder
 
 class HubAdapter : BaseAdapter<MenuItem>() {
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int,
+    ): RecyclerView.ViewHolder {
         val inflater = parent.context.layoutInflater
         return if (viewType == 1) {
             HubViewHolder(RowHubBinding.inflate(inflater, parent, false).root)
@@ -17,7 +20,10 @@ class HubAdapter : BaseAdapter<MenuItem>() {
         }
     }
 
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+    override fun onBindViewHolder(
+        holder: RecyclerView.ViewHolder,
+        position: Int,
+    ) {
         if (holder is HubViewHolder) {
             holder.bind(getItemAt(position))
         } else {
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/RewardListAdapter.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/RewardListAdapter.kt
index 8b9e357cd..42582afcf 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/RewardListAdapter.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/RewardListAdapter.kt
@@ -7,7 +7,10 @@ import com.habitrpg.common.habitica.extensions.layoutInflater
 import com.habitrpg.wearos.habitica.ui.viewHolders.tasks.RewardViewHolder
 
 class RewardListAdapter : TaskListAdapter() {
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int,
+    ): RecyclerView.ViewHolder {
         return if (viewType == 1) {
             return RewardViewHolder(RowRewardBinding.inflate(parent.context.layoutInflater, parent, false).root)
         } else {
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/SettingsAdapter.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/SettingsAdapter.kt
index 3abd0d0b9..f798f217c 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/SettingsAdapter.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/SettingsAdapter.kt
@@ -17,7 +17,10 @@ import com.habitrpg.wearos.habitica.ui.viewHolders.FooterViewHolder
 import com.habitrpg.wearos.habitica.ui.viewHolders.SpacerViewHolder
 
 class SettingsAdapter : BaseAdapter<SettingsItem>() {
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int,
+    ): RecyclerView.ViewHolder {
         return when (viewType) {
             1 -> FooterViewHolder(RowFooterBinding.inflate(parent.context.layoutInflater, parent, false).root)
             2 -> SpacerViewHolder(RowSpacerBinding.inflate(parent.context.layoutInflater, parent, false).root)
@@ -26,7 +29,10 @@ class SettingsAdapter : BaseAdapter<SettingsItem>() {
         }
     }
 
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+    override fun onBindViewHolder(
+        holder: RecyclerView.ViewHolder,
+        position: Int,
+    ) {
         when (holder) {
             is SettingsViewHolder -> {
                 holder.bind(getItemAt(position))
@@ -98,7 +104,7 @@ data class SettingsItem(
     val title: String,
     val type: Types,
     var value: Any?,
-    val onTap: () -> Unit
+    val onTap: () -> Unit,
 ) {
     enum class Types {
         BUTTON,
@@ -106,6 +112,6 @@ data class SettingsItem(
         SPACER,
         TOGGLE,
         HEADER,
-        FOOTER
+        FOOTER,
     }
 }
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/TaskListAdapter.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/TaskListAdapter.kt
index fda1fcfc9..ab0680383 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/TaskListAdapter.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/TaskListAdapter.kt
@@ -12,7 +12,10 @@ open class TaskListAdapter : BaseAdapter<Any>() {
     var onTaskScore: ((Task) -> Unit)? = null
     var onTaskTapped: ((Task) -> Unit)? = null
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int,
+    ): RecyclerView.ViewHolder {
         return if (viewType == TYPE_HEADER) {
             val inflater = parent.context.layoutInflater
             HeaderTaskViewHolder(RowTaskHeaderBinding.inflate(inflater, parent, false).root)
@@ -21,7 +24,10 @@ open class TaskListAdapter : BaseAdapter<Any>() {
         }
     }
 
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+    override fun onBindViewHolder(
+        holder: RecyclerView.ViewHolder,
+        position: Int,
+    ) {
         if (holder is TaskViewHolder) {
             val item = getItemAt(position) as Task
             holder.bind(item)
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/ToDoListAdapter.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/ToDoListAdapter.kt
index fc104fc65..439723980 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/ToDoListAdapter.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/ToDoListAdapter.kt
@@ -7,7 +7,10 @@ import com.habitrpg.common.habitica.extensions.layoutInflater
 import com.habitrpg.wearos.habitica.ui.viewHolders.tasks.ToDoViewHolder
 
 class ToDoListAdapter : TaskListAdapter() {
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int,
+    ): RecyclerView.ViewHolder {
         return if (viewType == 1) {
             return ToDoViewHolder(RowTodoBinding.inflate(parent.context.layoutInflater, parent, false).root)
         } else {
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/HeaderTaskViewHolder.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/HeaderTaskViewHolder.kt
index 92341a80a..b49401e4d 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/HeaderTaskViewHolder.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/HeaderTaskViewHolder.kt
@@ -6,7 +6,11 @@ import androidx.recyclerview.widget.RecyclerView
 import com.habitrpg.android.habitica.databinding.RowTaskHeaderBinding
 
 class HeaderTaskViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-    fun bind(title: String, showDone: Boolean, isDisconnected: Boolean) {
+    fun bind(
+        title: String,
+        showDone: Boolean,
+        isDisconnected: Boolean,
+    ) {
         binding.header.textView.text = title
         binding.doneView.isVisible = showDone
         binding.disconnected.root.isVisible = isDisconnected
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/tasks/CheckedTaskViewHolder.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/tasks/CheckedTaskViewHolder.kt
index 16b0403f0..8329e208d 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/tasks/CheckedTaskViewHolder.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/tasks/CheckedTaskViewHolder.kt
@@ -21,23 +21,25 @@ abstract class CheckedTaskViewHolder(itemView: View) : TaskViewHolder(itemView)
             checkbox.setImageResource(R.drawable.checkmark)
             checkboxWrapper.backgroundTintList =
                 ColorStateList.valueOf(ContextCompat.getColor(itemView.context, R.color.transparent))
-            checkbox.backgroundTintList = ColorStateList.valueOf(
-                ContextCompat.getColor(
-                    itemView.context,
-                    R.color.gray_300
+            checkbox.backgroundTintList =
+                ColorStateList.valueOf(
+                    ContextCompat.getColor(
+                        itemView.context,
+                        R.color.gray_300,
+                    ),
                 )
-            )
         } else {
             checkbox.setImageDrawable(null)
 
             checkboxWrapper.backgroundTintList =
                 ColorStateList.valueOf(ContextCompat.getColor(itemView.context, data.lightTaskColor))
-            checkbox.backgroundTintList = ColorStateList.valueOf(
-                ContextCompat.getColor(
-                    itemView.context,
-                    data.extraLightTaskColor
+            checkbox.backgroundTintList =
+                ColorStateList.valueOf(
+                    ContextCompat.getColor(
+                        itemView.context,
+                        data.extraLightTaskColor,
+                    ),
                 )
-            )
         }
     }
 }
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/tasks/TaskViewHolder.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/tasks/TaskViewHolder.kt
index 9fa09bece..cea5bdf81 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/tasks/TaskViewHolder.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/tasks/TaskViewHolder.kt
@@ -8,6 +8,7 @@ import com.habitrpg.wearos.habitica.ui.views.TaskTextView
 abstract class TaskViewHolder(itemView: View) : BindableViewHolder<Task>(itemView) {
     var onTaskScore: (() -> Unit)? = null
     abstract val titleView: TaskTextView
+
     override fun bind(data: Task) {
         titleView.text = data.text
     }
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/AvatarViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/AvatarViewModel.kt
index fe3d3cd11..446a6d6e0 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/AvatarViewModel.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/AvatarViewModel.kt
@@ -8,16 +8,18 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 
 @HiltViewModel
-class AvatarViewModel @Inject constructor(
-    userRepository: UserRepository,
-    taskRepository: TaskRepository,
-    exceptionBuilder: ExceptionHandlerBuilder,
-    appStateManager: AppStateManager
-) : BaseViewModel(
-    userRepository,
-    taskRepository,
-    exceptionBuilder,
-    appStateManager
-) {
-    var user = userRepository.getUser()
-}
+class AvatarViewModel
+    @Inject
+    constructor(
+        userRepository: UserRepository,
+        taskRepository: TaskRepository,
+        exceptionBuilder: ExceptionHandlerBuilder,
+        appStateManager: AppStateManager,
+    ) : BaseViewModel(
+            userRepository,
+            taskRepository,
+            exceptionBuilder,
+            appStateManager,
+        ) {
+        var user = userRepository.getUser()
+    }
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/BaseViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/BaseViewModel.kt
index 5ff5fac62..3c78fae2a 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/BaseViewModel.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/BaseViewModel.kt
@@ -15,7 +15,7 @@ open class BaseViewModel(
     val userRepository: UserRepository,
     val taskRepository: TaskRepository,
     val exceptionBuilder: ExceptionHandlerBuilder,
-    val appStateManager: AppStateManager
+    val appStateManager: AppStateManager,
 ) : ViewModel(), ErrorPresenter {
     override val errorValues = MutableLiveData<DisplayedError>()
 
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/ConfirmactionActivityViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/ConfirmactionActivityViewModel.kt
index 96a76209c..a0bacca5b 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/ConfirmactionActivityViewModel.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/ConfirmactionActivityViewModel.kt
@@ -10,13 +10,15 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 
 @HiltViewModel
-class ConfirmactionActivityViewModel @Inject constructor(
-    savedStateHandle: SavedStateHandle,
-    userRepository: UserRepository,
-    taskRepository: TaskRepository,
-    exceptionBuilder: ExceptionHandlerBuilder,
-    appStateManager: AppStateManager
-) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager) {
-    val icon: Int = savedStateHandle["icon"] ?: R.drawable.error
-    val text: String? = savedStateHandle["text"]
-}
+class ConfirmactionActivityViewModel
+    @Inject
+    constructor(
+        savedStateHandle: SavedStateHandle,
+        userRepository: UserRepository,
+        taskRepository: TaskRepository,
+        exceptionBuilder: ExceptionHandlerBuilder,
+        appStateManager: AppStateManager,
+    ) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager) {
+        val icon: Int = savedStateHandle["icon"] ?: R.drawable.error
+        val text: String? = savedStateHandle["text"]
+    }
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/ContinuePhoneViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/ContinuePhoneViewModel.kt
index 0e762a790..3d77caeb3 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/ContinuePhoneViewModel.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/ContinuePhoneViewModel.kt
@@ -11,19 +11,21 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 
 @HiltViewModel
-class ContinuePhoneViewModel @Inject constructor(
-    savedStateHandle: SavedStateHandle,
-    userRepository: UserRepository,
-    taskRepository: TaskRepository,
-    exceptionBuilder: ExceptionHandlerBuilder,
-    appStateManager: AppStateManager
-) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager), MessageClient.OnMessageReceivedListener {
-    val keepActive = savedStateHandle.get<Boolean>("keep_active") ?: false
-    var onActionCompleted: (() -> Unit)? = null
+class ContinuePhoneViewModel
+    @Inject
+    constructor(
+        savedStateHandle: SavedStateHandle,
+        userRepository: UserRepository,
+        taskRepository: TaskRepository,
+        exceptionBuilder: ExceptionHandlerBuilder,
+        appStateManager: AppStateManager,
+    ) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager), MessageClient.OnMessageReceivedListener {
+        val keepActive = savedStateHandle.get<Boolean>("keep_active") ?: false
+        var onActionCompleted: (() -> Unit)? = null
 
-    override fun onMessageReceived(event: MessageEvent) {
-        when (event.path) {
-            "/action_completed" -> onActionCompleted?.invoke()
+        override fun onMessageReceived(event: MessageEvent) {
+            when (event.path) {
+                "/action_completed" -> onActionCompleted?.invoke()
+            }
         }
     }
-}
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/FaintViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/FaintViewModel.kt
index 14f2226bd..e44093ced 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/FaintViewModel.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/FaintViewModel.kt
@@ -8,14 +8,16 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 
 @HiltViewModel
-class FaintViewModel @Inject constructor(
-    userRepository: UserRepository,
-    taskRepository: TaskRepository,
-    exceptionBuilder: ExceptionHandlerBuilder,
-    appStateManager: AppStateManager
-) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager) {
-    suspend fun revive() {
-        userRepository.revive()
-        userRepository.retrieveUser(true)
+class FaintViewModel
+    @Inject
+    constructor(
+        userRepository: UserRepository,
+        taskRepository: TaskRepository,
+        exceptionBuilder: ExceptionHandlerBuilder,
+        appStateManager: AppStateManager,
+    ) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager) {
+        suspend fun revive() {
+            userRepository.revive()
+            userRepository.retrieveUser(true)
+        }
     }
-}
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/HabitDirectionViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/HabitDirectionViewModel.kt
index f00587a72..007a62e6a 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/HabitDirectionViewModel.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/HabitDirectionViewModel.kt
@@ -10,15 +10,17 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 
 @HiltViewModel
-class HabitDirectionViewModel @Inject constructor(
-    savedStateHandle: SavedStateHandle,
-    userRepository: UserRepository,
-    taskRepository: TaskRepository,
-    exceptionBuilder: ExceptionHandlerBuilder,
-    appStateManager: AppStateManager
-) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager) {
-    val taskID = savedStateHandle.get<String>("task_id")
-    val task = taskRepository.getTask(taskID).asLiveData()
+class HabitDirectionViewModel
+    @Inject
+    constructor(
+        savedStateHandle: SavedStateHandle,
+        userRepository: UserRepository,
+        taskRepository: TaskRepository,
+        exceptionBuilder: ExceptionHandlerBuilder,
+        appStateManager: AppStateManager,
+    ) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager) {
+        val taskID = savedStateHandle.get<String>("task_id")
+        val task = taskRepository.getTask(taskID).asLiveData()
 
-    val user = userRepository.getUser().asLiveData()
-}
+        val user = userRepository.getUser().asLiveData()
+    }
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/InputViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/InputViewModel.kt
index d3a2d4e84..e0bcff69a 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/InputViewModel.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/InputViewModel.kt
@@ -9,13 +9,15 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 
 @HiltViewModel
-class InputViewModel @Inject constructor(
-    savedStateHandle: SavedStateHandle,
-    userRepository: UserRepository,
-    taskRepository: TaskRepository,
-    exceptionBuilder: ExceptionHandlerBuilder,
-    appStateManager: AppStateManager
-) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager) {
-    val title = savedStateHandle.get<String>("title") ?: ""
-    val existingInput = savedStateHandle.get<String>("input")
-}
+class InputViewModel
+    @Inject
+    constructor(
+        savedStateHandle: SavedStateHandle,
+        userRepository: UserRepository,
+        taskRepository: TaskRepository,
+        exceptionBuilder: ExceptionHandlerBuilder,
+        appStateManager: AppStateManager,
+    ) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager) {
+        val title = savedStateHandle.get<String>("title") ?: ""
+        val existingInput = savedStateHandle.get<String>("input")
+    }
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/LevelupViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/LevelupViewModel.kt
index c0e1a0bd6..278996400 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/LevelupViewModel.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/LevelupViewModel.kt
@@ -10,13 +10,16 @@ import kotlinx.coroutines.flow.map
 import javax.inject.Inject
 
 @HiltViewModel
-class LevelupViewModel @Inject constructor(
-    userRepository: UserRepository,
-    taskRepository: TaskRepository,
-    exceptionBuilder: ExceptionHandlerBuilder,
-    appStateManager: AppStateManager
-) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager) {
-    val level = userRepository.getUser()
-        .map { it?.stats?.lvl }
-        .asLiveData()
-}
+class LevelupViewModel
+    @Inject
+    constructor(
+        userRepository: UserRepository,
+        taskRepository: TaskRepository,
+        exceptionBuilder: ExceptionHandlerBuilder,
+        appStateManager: AppStateManager,
+    ) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager) {
+        val level =
+            userRepository.getUser()
+                .map { it?.stats?.lvl }
+                .asLiveData()
+    }
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/LoginViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/LoginViewModel.kt
index 5243cc801..6394696fa 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/LoginViewModel.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/LoginViewModel.kt
@@ -37,123 +37,131 @@ import java.io.IOException
 import javax.inject.Inject
 
 @HiltViewModel
-class LoginViewModel @Inject constructor(
-    userRepository: UserRepository,
-    taskRepository: TaskRepository,
-    exceptionBuilder: ExceptionHandlerBuilder,
-    private val keyHelper: KeyHelper?,
-    val sharedPreferences: SharedPreferences,
-    val apiClient: ApiClient,
-    appStateManager: AppStateManager
-) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager) {
-    lateinit var onLoginCompleted: () -> Unit
+class LoginViewModel
+    @Inject
+    constructor(
+        userRepository: UserRepository,
+        taskRepository: TaskRepository,
+        exceptionBuilder: ExceptionHandlerBuilder,
+        private val keyHelper: KeyHelper?,
+        val sharedPreferences: SharedPreferences,
+        val apiClient: ApiClient,
+        appStateManager: AppStateManager,
+    ) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager) {
+        lateinit var onLoginCompleted: () -> Unit
 
-    fun handleGoogleLogin(
-        activity: Activity,
-        pickAccountResult: ActivityResultLauncher<Intent>
-    ) {
-        val gso = GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
-            .requestEmail()
-            .build()
-        val client = GoogleSignIn.getClient(activity, gso)
-        pickAccountResult.launch(client.signInIntent)
-    }
+        fun handleGoogleLogin(
+            activity: Activity,
+            pickAccountResult: ActivityResultLauncher<Intent>,
+        ) {
+            val gso =
+                GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
+                    .requestEmail()
+                    .build()
+            val client = GoogleSignIn.getClient(activity, gso)
+            pickAccountResult.launch(client.signInIntent)
+        }
 
-    fun handleGoogleLoginResult(
-        activity: Activity,
-        task: Task<GoogleSignInAccount>,
-        recoverFromPlayServicesErrorResult: ActivityResultLauncher<Intent>?
-    ) {
-        viewModelScope.launch(exceptionBuilder.userFacing(this)) {
-            val account = async {
-                try {
-                    return@async task.getResult(
-                        ApiException::class.java
-                    )
-                } catch (e: IOException) {
-                    return@async null
-                } catch (e: GoogleAuthException) {
-                    if (recoverFromPlayServicesErrorResult != null) {
-                        handleGoogleAuthException(e, activity, recoverFromPlayServicesErrorResult)
+        fun handleGoogleLoginResult(
+            activity: Activity,
+            task: Task<GoogleSignInAccount>,
+            recoverFromPlayServicesErrorResult: ActivityResultLauncher<Intent>?,
+        ) {
+            viewModelScope.launch(exceptionBuilder.userFacing(this)) {
+                val account =
+                    async {
+                        try {
+                            return@async task.getResult(
+                                ApiException::class.java,
+                            )
+                        } catch (e: IOException) {
+                            return@async null
+                        } catch (e: GoogleAuthException) {
+                            if (recoverFromPlayServicesErrorResult != null) {
+                                handleGoogleAuthException(e, activity, recoverFromPlayServicesErrorResult)
+                            }
+                            return@async null
+                        } catch (e: UserRecoverableException) {
+                            return@async null
+                        }
+                    }.await()
+                val scopesString = Scopes.PROFILE + " " + Scopes.EMAIL
+                val scopes = "oauth2:$scopesString"
+                val token =
+                    withContext(Dispatchers.IO) {
+                        account?.account?.let { GoogleAuthUtil.getToken(activity, it, scopes) }
                     }
-                    return@async null
-                } catch (e: UserRecoverableException) {
-                    return@async null
+                val auth = UserAuthSocial()
+                auth.network = "google"
+                auth.authResponse = UserAuthSocialTokens()
+                auth.authResponse?.client_id = account?.email
+                auth.authResponse?.access_token = token
+                val response = apiClient.loginSocial(auth)
+                handleAuthResponse(response.responseData)
+            }
+        }
+
+        private fun handleGoogleAuthException(
+            e: Exception,
+            activity: Activity,
+            recoverFromPlayServicesErrorResult: ActivityResultLauncher<Intent>,
+        ) {
+            if (e is GooglePlayServicesAvailabilityException) {
+                GoogleApiAvailability.getInstance()
+                GooglePlayServicesUtil.showErrorDialogFragment(
+                    e.connectionStatusCode,
+                    activity,
+                    null,
+                    REQUEST_CODE_RECOVER_FROM_PLAY_SERVICES_ERROR,
+                ) {
                 }
-            }.await()
-            val scopesString = Scopes.PROFILE + " " + Scopes.EMAIL
-            val scopes = "oauth2:$scopesString"
-            val token = withContext(Dispatchers.IO) {
-                account?.account?.let { GoogleAuthUtil.getToken(activity, it, scopes) }
+                return
+            } else if (e is UserRecoverableAuthException) {
+                // Unable to authenticate, such as when the user has not yet granted
+                // the app access to the account, but the user can fix this.
+                // Forward the user to an activity in Google Play services.
+                val intent = e.intent
+                recoverFromPlayServicesErrorResult.launch(intent)
+                return
             }
-            val auth = UserAuthSocial()
-            auth.network = "google"
-            auth.authResponse = UserAuthSocialTokens()
-            auth.authResponse?.client_id = account?.email
-            auth.authResponse?.access_token = token
-            val response = apiClient.loginSocial(auth)
-            handleAuthResponse(response.responseData)
         }
-    }
 
-    private fun handleGoogleAuthException(
-        e: Exception,
-        activity: Activity,
-        recoverFromPlayServicesErrorResult: ActivityResultLauncher<Intent>
-    ) {
-        if (e is GooglePlayServicesAvailabilityException) {
-            GoogleApiAvailability.getInstance()
-            GooglePlayServicesUtil.showErrorDialogFragment(
-                e.connectionStatusCode,
-                activity,
-                null,
-                REQUEST_CODE_RECOVER_FROM_PLAY_SERVICES_ERROR
-            ) {
+        private suspend fun handleAuthResponse(userAuthResponse: UserAuthResponse?) {
+            if (userAuthResponse == null) return
+            try {
+                saveTokens(userAuthResponse.apiToken, userAuthResponse.id)
+            } catch (e: Exception) {
+                return
             }
-            return
-        } else if (e is UserRecoverableAuthException) {
-            // Unable to authenticate, such as when the user has not yet granted
-            // the app access to the account, but the user can fix this.
-            // Forward the user to an activity in Google Play services.
-            val intent = e.intent
-            recoverFromPlayServicesErrorResult.launch(intent)
-            return
+            val user = userRepository.retrieveUser(true)
+            taskRepository.retrieveTasks(user?.tasksOrder, true)
+            onLoginCompleted()
         }
-    }
 
-    private suspend fun handleAuthResponse(userAuthResponse: UserAuthResponse?) {
-        if (userAuthResponse == null) return
-        try {
-            saveTokens(userAuthResponse.apiToken, userAuthResponse.id)
-        } catch (e: Exception) {
-            return
-        }
-        val user = userRepository.retrieveUser(true)
-        taskRepository.retrieveTasks(user?.tasksOrder, true)
-        onLoginCompleted()
-    }
-
-    @Throws(Exception::class)
-    private fun saveTokens(api: String, user: String) {
-        this.apiClient.updateAuthenticationCredentials(user, api)
-        sharedPreferences.edit {
-            putString("UserID", user)
-            val encryptedKey =
-                try {
-                    keyHelper?.encrypt(api)
-                } catch (e: Exception) {
-                    null
+        @Throws(Exception::class)
+        private fun saveTokens(
+            api: String,
+            user: String,
+        ) {
+            this.apiClient.updateAuthenticationCredentials(user, api)
+            sharedPreferences.edit {
+                putString("UserID", user)
+                val encryptedKey =
+                    try {
+                        keyHelper?.encrypt(api)
+                    } catch (e: Exception) {
+                        null
+                    }
+                if ((encryptedKey?.length ?: 0) > 5) {
+                    putString(user, encryptedKey)
+                } else {
+                    // Something might have gone wrong with encryption, so fall back to this.
+                    putString("APIToken", api)
                 }
-            if ((encryptedKey?.length ?: 0) > 5) {
-                putString(user, encryptedKey)
-            } else {
-                // Something might have gone wrong with encryption, so fall back to this.
-                putString("APIToken", api)
             }
         }
-    }
 
-    companion object {
-        private const val REQUEST_CODE_RECOVER_FROM_PLAY_SERVICES_ERROR = 1001
+        companion object {
+            private const val REQUEST_CODE_RECOVER_FROM_PLAY_SERVICES_ERROR = 1001
+        }
     }
-}
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/MainViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/MainViewModel.kt
index 274a8c96e..5933dd46d 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/MainViewModel.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/MainViewModel.kt
@@ -12,21 +12,24 @@ import kotlin.time.DurationUnit
 import kotlin.time.toDuration
 
 @HiltViewModel
-class MainViewModel @Inject constructor(
-    userRepository: UserRepository,
-    taskRepository: TaskRepository,
-    exceptionBuilder: ExceptionHandlerBuilder,
-    appStateManager: AppStateManager
-) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager) {
-    private var lastUserFetch = 0L
-    fun periodicUserRefresh() {
-        val now = Date().time
-        if ((now - lastUserFetch) > 5.toDuration(DurationUnit.MINUTES).inWholeMilliseconds) {
-            retrieveFullUserData()
-            lastUserFetch = now
-        }
-    }
+class MainViewModel
+    @Inject
+    constructor(
+        userRepository: UserRepository,
+        taskRepository: TaskRepository,
+        exceptionBuilder: ExceptionHandlerBuilder,
+        appStateManager: AppStateManager,
+    ) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager) {
+        private var lastUserFetch = 0L
 
-    val taskCounts = taskRepository.getActiveTaskCounts().asLiveData()
-    val user = userRepository.getUser()
-}
+        fun periodicUserRefresh() {
+            val now = Date().time
+            if ((now - lastUserFetch) > 5.toDuration(DurationUnit.MINUTES).inWholeMilliseconds) {
+                retrieveFullUserData()
+                lastUserFetch = now
+            }
+        }
+
+        val taskCounts = taskRepository.getActiveTaskCounts().asLiveData()
+        val user = userRepository.getUser()
+    }
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/RYAViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/RYAViewModel.kt
index 9ed296df2..e5d9a81ba 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/RYAViewModel.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/RYAViewModel.kt
@@ -18,55 +18,58 @@ import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltViewModel
-class RYAViewModel @Inject constructor(
-    userRepository: UserRepository,
-    taskRepository: TaskRepository,
-    val sharedPreferences: SharedPreferences,
-    exceptionBuilder: ExceptionHandlerBuilder,
-    appStateManager: AppStateManager
-) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager) {
-    var hasRunCron: Boolean = false
-    val tasks = MutableLiveData<List<Task>>()
+class RYAViewModel
+    @Inject
+    constructor(
+        userRepository: UserRepository,
+        taskRepository: TaskRepository,
+        val sharedPreferences: SharedPreferences,
+        exceptionBuilder: ExceptionHandlerBuilder,
+        appStateManager: AppStateManager,
+    ) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager) {
+        var hasRunCron: Boolean = false
+        val tasks = MutableLiveData<List<Task>>()
 
-    private val tasksToComplete = mutableListOf<Task>()
+        private val tasksToComplete = mutableListOf<Task>()
 
-    init {
-        viewModelScope.launch(exceptionBuilder.silent()) {
-            val taskList: List<Task> = taskRepository.getTasks(TaskType.DAILY)
-                .map { it.filter { task -> task.isDue == true && !task.completed } }
-                .first()
-            tasks.value = taskList
-        }
-    }
-
-    fun tappedTask(task: Task) {
-        task.completed = !task.completed
-        tasks.value = tasks.value
-        if (task.completed) {
-            if (!tasksToComplete.contains(task)) {
-                tasksToComplete.add(task)
+        init {
+            viewModelScope.launch(exceptionBuilder.silent()) {
+                val taskList: List<Task> =
+                    taskRepository.getTasks(TaskType.DAILY)
+                        .map { it.filter { task -> task.isDue == true && !task.completed } }
+                        .first()
+                tasks.value = taskList
             }
-        } else {
-            if (tasksToComplete.contains(task)) {
-                tasksToComplete.remove(task)
+        }
+
+        fun tappedTask(task: Task) {
+            task.completed = !task.completed
+            tasks.value = tasks.value
+            if (task.completed) {
+                if (!tasksToComplete.contains(task)) {
+                    tasksToComplete.add(task)
+                }
+            } else {
+                if (tasksToComplete.contains(task)) {
+                    tasksToComplete.remove(task)
+                }
+            }
+        }
+
+        fun runCron(function: (Boolean) -> Unit) {
+            // Clear shared pref values for saved to-do tasks
+            sharedPreferences.edit { putString("to_do_tasks", null) }
+            viewModelScope.launch(exceptionBuilder.userFacing(this)) {
+                appStateManager.startLoading()
+                for (task in tasksToComplete) {
+                    taskRepository.scoreTask(null, task, TaskDirection.UP)
+                }
+                userRepository.runCron()
+                hasRunCron = true
+                val user = userRepository.retrieveUser(true)
+                taskRepository.retrieveTasks(user?.tasksOrder, true)
+                function(true)
+                appStateManager.endLoading()
             }
         }
     }
-
-    fun runCron(function: (Boolean) -> Unit) {
-        // Clear shared pref values for saved to-do tasks
-        sharedPreferences.edit { putString("to_do_tasks", null) }
-        viewModelScope.launch(exceptionBuilder.userFacing(this)) {
-            appStateManager.startLoading()
-            for (task in tasksToComplete) {
-                taskRepository.scoreTask(null, task, TaskDirection.UP)
-            }
-            userRepository.runCron()
-            hasRunCron = true
-            val user = userRepository.retrieveUser(true)
-            taskRepository.retrieveTasks(user?.tasksOrder, true)
-            function(true)
-            appStateManager.endLoading()
-        }
-    }
-}
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/SettingsViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/SettingsViewModel.kt
index 8c0fe1ac7..3925aaecf 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/SettingsViewModel.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/SettingsViewModel.kt
@@ -13,40 +13,41 @@ import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltViewModel
-class SettingsViewModel @Inject constructor(
-    userRepository: UserRepository,
-    taskRepository: TaskRepository,
-    exceptionBuilder: ExceptionHandlerBuilder,
-    private val apiClient: ApiClient,
-    private val sharedPreferences: SharedPreferences,
-    appStateManager: AppStateManager
-) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager) {
-
-    fun logout() {
-        sharedPreferences.edit {
-            clear()
+class SettingsViewModel
+    @Inject
+    constructor(
+        userRepository: UserRepository,
+        taskRepository: TaskRepository,
+        exceptionBuilder: ExceptionHandlerBuilder,
+        private val apiClient: ApiClient,
+        private val sharedPreferences: SharedPreferences,
+        appStateManager: AppStateManager,
+    ) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager) {
+        fun logout() {
+            sharedPreferences.edit {
+                clear()
+            }
+            apiClient.updateAuthenticationCredentials(null, null)
+            userRepository.clearData()
+            taskRepository.clearData()
         }
-        apiClient.updateAuthenticationCredentials(null, null)
-        userRepository.clearData()
-        taskRepository.clearData()
-    }
 
-    fun resyncData() {
-        viewModelScope.launch(exceptionBuilder.userFacing(this)) {
-            appStateManager.startLoading()
-            val user = userRepository.retrieveUser(true)
-            taskRepository.retrieveTasks(user?.tasksOrder, true)
-            appStateManager.endLoading()
+        fun resyncData() {
+            viewModelScope.launch(exceptionBuilder.userFacing(this)) {
+                appStateManager.startLoading()
+                val user = userRepository.retrieveUser(true)
+                taskRepository.retrieveTasks(user?.tasksOrder, true)
+                appStateManager.endLoading()
+            }
+        }
+
+        fun setHideTaskResults(hide: Boolean) {
+            sharedPreferences.edit {
+                putBoolean("hide_task_results", hide)
+            }
+        }
+
+        fun isTaskResultHidden(): Boolean {
+            return sharedPreferences.getBoolean("hide_task_results", false)
         }
     }
-
-    fun setHideTaskResults(hide: Boolean) {
-        sharedPreferences.edit {
-            putBoolean("hide_task_results", hide)
-        }
-    }
-
-    fun isTaskResultHidden(): Boolean {
-        return sharedPreferences.getBoolean("hide_task_results", false)
-    }
-}
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/SplashViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/SplashViewModel.kt
index 056fd9852..1c10a7e4d 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/SplashViewModel.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/SplashViewModel.kt
@@ -16,65 +16,70 @@ import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltViewModel
-class SplashViewModel @Inject constructor(
-    userRepository: UserRepository,
-    taskRepository: TaskRepository,
-    exceptionBuilder: ExceptionHandlerBuilder,
-    val apiClient: ApiClient,
-    val sharedPreferences: SharedPreferences,
-    val keyHelper: KeyHelper?,
-    appStateManager: AppStateManager
-) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager), MessageClient.OnMessageReceivedListener {
-    lateinit var onLoginCompleted: (Boolean) -> Unit
-    val hasAuthentication: Boolean
-        get() {
-            return apiClient.hasAuthentication()
-        }
-
-    override fun onMessageReceived(event: MessageEvent) {
-        when (event.path) {
-            "/auth" -> authDataReceived(event)
-        }
-    }
-
-    private fun authDataReceived(event: MessageEvent) {
-        viewModelScope.launch(
-            exceptionBuilder.silent {
-                onLoginCompleted(false)
+class SplashViewModel
+    @Inject
+    constructor(
+        userRepository: UserRepository,
+        taskRepository: TaskRepository,
+        exceptionBuilder: ExceptionHandlerBuilder,
+        val apiClient: ApiClient,
+        val sharedPreferences: SharedPreferences,
+        val keyHelper: KeyHelper?,
+        appStateManager: AppStateManager,
+    ) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager), MessageClient.OnMessageReceivedListener {
+        lateinit var onLoginCompleted: (Boolean) -> Unit
+        val hasAuthentication: Boolean
+            get() {
+                return apiClient.hasAuthentication()
             }
-        ) {
-            val (userID, apiKey) = String(event.data).split(":")
-            try {
-                if (userID.isBlank() || apiKey.isBlank()) {
+
+        override fun onMessageReceived(event: MessageEvent) {
+            when (event.path) {
+                "/auth" -> authDataReceived(event)
+            }
+        }
+
+        private fun authDataReceived(event: MessageEvent) {
+            viewModelScope.launch(
+                exceptionBuilder.silent {
+                    onLoginCompleted(false)
+                },
+            ) {
+                val (userID, apiKey) = String(event.data).split(":")
+                try {
+                    if (userID.isBlank() || apiKey.isBlank()) {
+                        return@launch
+                    }
+                    saveTokens(apiKey, userID)
+                } catch (e: Exception) {
+                    onLoginCompleted(false)
                     return@launch
                 }
-                saveTokens(apiKey, userID)
-            } catch (e: Exception) {
-                onLoginCompleted(false)
-                return@launch
+                userRepository.retrieveUser()
+                onLoginCompleted(true)
             }
-            userRepository.retrieveUser()
-            onLoginCompleted(true)
         }
-    }
 
-    @Throws(Exception::class)
-    private fun saveTokens(api: String, user: String) {
-        this.apiClient.updateAuthenticationCredentials(user, api)
-        sharedPreferences.edit {
-            putString("UserID", user)
-            val encryptedKey =
-                try {
-                    keyHelper?.encrypt(api)
-                } catch (e: Exception) {
-                    null
+        @Throws(Exception::class)
+        private fun saveTokens(
+            api: String,
+            user: String,
+        ) {
+            this.apiClient.updateAuthenticationCredentials(user, api)
+            sharedPreferences.edit {
+                putString("UserID", user)
+                val encryptedKey =
+                    try {
+                        keyHelper?.encrypt(api)
+                    } catch (e: Exception) {
+                        null
+                    }
+                if ((encryptedKey?.length ?: 0) > 5) {
+                    putString(user, encryptedKey)
+                } else {
+                    // Something might have gone wrong with encryption, so fall back to this.
+                    putString("APIToken", api)
                 }
-            if ((encryptedKey?.length ?: 0) > 5) {
-                putString(user, encryptedKey)
-            } else {
-                // Something might have gone wrong with encryption, so fall back to this.
-                putString("APIToken", api)
             }
         }
     }
-}
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/StatsViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/StatsViewModel.kt
index d6bcae3ac..0c9074687 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/StatsViewModel.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/StatsViewModel.kt
@@ -15,25 +15,28 @@ import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltViewModel
-class StatsViewModel @Inject constructor(
-    userRepository: UserRepository,
-    taskRepository: TaskRepository,
-    exceptionBuilder: ExceptionHandlerBuilder,
-    appStateManager: AppStateManager
-) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager) {
-    fun retrieveUser() {
-        viewModelScope.launch(exceptionBuilder.silent()) {
-            userRepository.retrieveUser(true)
+class StatsViewModel
+    @Inject
+    constructor(
+        userRepository: UserRepository,
+        taskRepository: TaskRepository,
+        exceptionBuilder: ExceptionHandlerBuilder,
+        appStateManager: AppStateManager,
+    ) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager) {
+        fun retrieveUser() {
+            viewModelScope.launch(exceptionBuilder.silent()) {
+                userRepository.retrieveUser(true)
+            }
         }
-    }
 
-    var user: LiveData<User> = userRepository.getUser()
-        .filterNotNull()
-        .distinctUntilChanged { old, new ->
-            val oldStats = old.stats ?: return@distinctUntilChanged false
-            val newStats = new.stats ?: return@distinctUntilChanged false
-            return@distinctUntilChanged (oldStats.hp ?: 0.0) + (oldStats.exp ?: 0.0) + (oldStats.exp ?: 0.0) ==
-                (newStats.hp ?: 0.0) + (newStats.exp ?: 0.0) + (newStats.exp ?: 0.0)
-        }
-        .asLiveData()
-}
+        var user: LiveData<User> =
+            userRepository.getUser()
+                .filterNotNull()
+                .distinctUntilChanged { old, new ->
+                    val oldStats = old.stats ?: return@distinctUntilChanged false
+                    val newStats = new.stats ?: return@distinctUntilChanged false
+                    return@distinctUntilChanged (oldStats.hp ?: 0.0) + (oldStats.exp ?: 0.0) + (oldStats.exp ?: 0.0) ==
+                        (newStats.hp ?: 0.0) + (newStats.exp ?: 0.0) + (newStats.exp ?: 0.0)
+                }
+                .asLiveData()
+    }
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/TaskDetailViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/TaskDetailViewModel.kt
index 9dcede223..97c2f4938 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/TaskDetailViewModel.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/TaskDetailViewModel.kt
@@ -10,13 +10,15 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 
 @HiltViewModel
-class TaskDetailViewModel @Inject constructor(
-    savedStateHandle: SavedStateHandle,
-    taskRepository: TaskRepository,
-    userRepository: UserRepository,
-    exceptionBuilder: ExceptionHandlerBuilder,
-    appStateManager: AppStateManager
-) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager) {
-    val taskID = savedStateHandle.get<String>("task_id")
-    val task = taskRepository.getTask(taskID).asLiveData()
-}
+class TaskDetailViewModel
+    @Inject
+    constructor(
+        savedStateHandle: SavedStateHandle,
+        taskRepository: TaskRepository,
+        userRepository: UserRepository,
+        exceptionBuilder: ExceptionHandlerBuilder,
+        appStateManager: AppStateManager,
+    ) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager) {
+        val taskID = savedStateHandle.get<String>("task_id")
+        val task = taskRepository.getTask(taskID).asLiveData()
+    }
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/TaskFormViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/TaskFormViewModel.kt
index ac035a42d..95fa33840 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/TaskFormViewModel.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/TaskFormViewModel.kt
@@ -11,23 +11,28 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 
 @HiltViewModel
-class TaskFormViewModel @Inject constructor(
-    userRepository: UserRepository,
-    taskRepository: TaskRepository,
-    exceptionBuilder: ExceptionHandlerBuilder,
-    appStateManager: AppStateManager
-) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager) {
-    suspend fun saveTask(text: CharSequence?, taskType: TaskType?) {
-        if (text?.isNotBlank() != true || taskType == null) {
-            return
+class TaskFormViewModel
+    @Inject
+    constructor(
+        userRepository: UserRepository,
+        taskRepository: TaskRepository,
+        exceptionBuilder: ExceptionHandlerBuilder,
+        appStateManager: AppStateManager,
+    ) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager) {
+        suspend fun saveTask(
+            text: CharSequence?,
+            taskType: TaskType?,
+        ) {
+            if (text?.isNotBlank() != true || taskType == null) {
+                return
+            }
+            val task = Task()
+            task.text = text.toString()
+            task.type = taskType
+            task.priority = 1.0f
+            task.up = true
+            task.everyX = 1
+            task.frequency = Frequency.DAILY
+            taskRepository.createTask(task)
         }
-        val task = Task()
-        task.text = text.toString()
-        task.type = taskType
-        task.priority = 1.0f
-        task.up = true
-        task.everyX = 1
-        task.frequency = Frequency.DAILY
-        taskRepository.createTask(task)
     }
-}
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/TaskListViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/TaskListViewModel.kt
index b13e8a5de..ac0545373 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/TaskListViewModel.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/TaskListViewModel.kt
@@ -26,107 +26,117 @@ import java.lang.reflect.Type
 import javax.inject.Inject
 
 @HiltViewModel
-class TaskListViewModel @Inject constructor(
-    savedStateHandle: SavedStateHandle,
-    taskRepository: TaskRepository,
-    userRepository: UserRepository,
-    val sharedPreferences: SharedPreferences,
-    moshi: Moshi,
-    exceptionBuilder: ExceptionHandlerBuilder,
-    appStateManager: AppStateManager
-) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager) {
-    var type: Type = Types.newParameterizedType(
-        MutableList::class.java,
-        Task::class.java
-    )
-    private val moshiAdapter: JsonAdapter<MutableList<Task>> = moshi.adapter(type)
-    val taskType = TaskType.from(savedStateHandle.get<String>("task_type"))
-    val taskCount = MutableLiveData(0)
-    val completedToDos: MutableList<Task> by lazy {
-        val tasksString = sharedPreferences.getString("to_do_tasks", null) ?: return@lazy mutableListOf()
-        return@lazy moshiAdapter.fromJson(tasksString) ?: mutableListOf()
-    }
-    val tasks = taskRepository.getTasks(taskType ?: TaskType.HABIT)
-        .map {
-            when (taskType) {
-                TaskType.DAILY -> mapDaily(it)
-                TaskType.TODO -> mapTodos(it)
-                else -> map(it)
-            }
+class TaskListViewModel
+    @Inject
+    constructor(
+        savedStateHandle: SavedStateHandle,
+        taskRepository: TaskRepository,
+        userRepository: UserRepository,
+        val sharedPreferences: SharedPreferences,
+        moshi: Moshi,
+        exceptionBuilder: ExceptionHandlerBuilder,
+        appStateManager: AppStateManager,
+    ) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager) {
+        var type: Type =
+            Types.newParameterizedType(
+                MutableList::class.java,
+                Task::class.java,
+            )
+        private val moshiAdapter: JsonAdapter<MutableList<Task>> = moshi.adapter(type)
+        val taskType = TaskType.from(savedStateHandle.get<String>("task_type"))
+        val taskCount = MutableLiveData(0)
+        val completedToDos: MutableList<Task> by lazy {
+            val tasksString = sharedPreferences.getString("to_do_tasks", null) ?: return@lazy mutableListOf()
+            return@lazy moshiAdapter.fromJson(tasksString) ?: mutableListOf()
         }
-    val user = userRepository.getUser()
-        .asLiveData()
-
-    fun scoreTask(task: Task, direction: TaskDirection, onResult: (TaskScoringResult?) -> Unit) {
-        if (taskType == TaskType.TODO) {
-            if (direction == TaskDirection.UP && !completedToDos.contains(task)) {
-                completedToDos.add(task)
-            } else if (direction == TaskDirection.DOWN) {
-                completedToDos.remove(task)
-            }
-        }
-        viewModelScope.launch(
-            exceptionBuilder.userFacing(this) {
-                if (taskType == TaskType.TODO) {
-                    if (direction == TaskDirection.UP) {
-                        completedToDos.remove(task)
-                    } else {
-                        completedToDos.add(task)
+        val tasks =
+            taskRepository.getTasks(taskType ?: TaskType.HABIT)
+                .map {
+                    when (taskType) {
+                        TaskType.DAILY -> mapDaily(it)
+                        TaskType.TODO -> mapTodos(it)
+                        else -> map(it)
                     }
                 }
-            }
+        val user =
+            userRepository.getUser()
+                .asLiveData()
+
+        fun scoreTask(
+            task: Task,
+            direction: TaskDirection,
+            onResult: (TaskScoringResult?) -> Unit,
         ) {
-            val result = taskRepository.scoreTask(
-                userRepository.getUser().first(),
-                task,
-                direction
-            )
-            if (result?.hasLeveledUp == true) {
-                launch(Dispatchers.Main) {
-                    userRepository.retrieveUser()
+            if (taskType == TaskType.TODO) {
+                if (direction == TaskDirection.UP && !completedToDos.contains(task)) {
+                    completedToDos.add(task)
+                } else if (direction == TaskDirection.DOWN) {
+                    completedToDos.remove(task)
                 }
             }
-            onResult(result)
+            viewModelScope.launch(
+                exceptionBuilder.userFacing(this) {
+                    if (taskType == TaskType.TODO) {
+                        if (direction == TaskDirection.UP) {
+                            completedToDos.remove(task)
+                        } else {
+                            completedToDos.add(task)
+                        }
+                    }
+                },
+            ) {
+                val result =
+                    taskRepository.scoreTask(
+                        userRepository.getUser().first(),
+                        task,
+                        direction,
+                    )
+                if (result?.hasLeveledUp == true) {
+                    launch(Dispatchers.Main) {
+                        userRepository.retrieveUser()
+                    }
+                }
+                onResult(result)
+            }
         }
-    }
 
-    private fun map(tasks: List<Task>): List<Task> {
-        taskCount.value = tasks.size
-        return tasks
-    }
+        private fun map(tasks: List<Task>): List<Task> {
+            taskCount.value = tasks.size
+            return tasks
+        }
 
-    private fun mapDaily(tasks: List<Task>): MutableList<Any> {
-        val taskList: MutableList<Any> = tasks.filter { it.isDue == true || it.type == TaskType.TODO }.sortedBy { it.completed }.toMutableList()
-        val firstCompletedIndex = taskList.indexOfFirst { it is Task && it.completed }
-        if (firstCompletedIndex >= 0) {
-            // since this is the index of the first completed task, this is also the number of incomplete tasks
-            taskCount.value = firstCompletedIndex
-            taskList.add(firstCompletedIndex, "Done today")
-        } else {
+        private fun mapDaily(tasks: List<Task>): MutableList<Any> {
+            val taskList: MutableList<Any> = tasks.filter { it.isDue == true || it.type == TaskType.TODO }.sortedBy { it.completed }.toMutableList()
+            val firstCompletedIndex = taskList.indexOfFirst { it is Task && it.completed }
+            if (firstCompletedIndex >= 0) {
+                // since this is the index of the first completed task, this is also the number of incomplete tasks
+                taskCount.value = firstCompletedIndex
+                taskList.add(firstCompletedIndex, "Done today")
+            } else {
+                taskCount.value = taskList.size
+            }
+            return taskList
+        }
+
+        override fun onCleared() {
+            saveCurrentToDos()
+            super.onCleared()
+        }
+
+        private fun mapTodos(tasks: List<Task>): List<Any> {
+            val taskList: MutableList<Any> = tasks.filter { !it.completed }.toMutableList()
             taskCount.value = taskList.size
-        }
-        return taskList
-    }
+            if (completedToDos.isNotEmpty()) {
+                taskList.add("Done today")
+                taskList.addAll(completedToDos)
+            }
 
-    override fun onCleared() {
-        saveCurrentToDos()
-        super.onCleared()
-    }
-
-    private fun mapTodos(tasks: List<Task>): List<Any> {
-        val taskList: MutableList<Any> = tasks.filter { !it.completed }.toMutableList()
-        taskCount.value = taskList.size
-        if (completedToDos.isNotEmpty()) {
-            taskList.add("Done today")
-            taskList.addAll(completedToDos)
+            return taskList
         }
 
-        return taskList
-    }
-
-    private fun saveCurrentToDos() {
-        sharedPreferences.edit {
-            putString("to_do_tasks", moshiAdapter.toJson(completedToDos))
+        private fun saveCurrentToDos() {
+            sharedPreferences.edit {
+                putString("to_do_tasks", moshiAdapter.toJson(completedToDos))
+            }
         }
     }
-}
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/TaskResultViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/TaskResultViewModel.kt
index c437100a9..4580240f2 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/TaskResultViewModel.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/TaskResultViewModel.kt
@@ -11,21 +11,23 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 
 @HiltViewModel
-class TaskResultViewModel @Inject constructor(
-    savedStateHandle: SavedStateHandle,
-    taskRepository: TaskRepository,
-    userRepository: UserRepository,
-    exceptionBuilder: ExceptionHandlerBuilder,
-    appStateManager: AppStateManager
-) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager) {
-    val user = userRepository.getUser().asLiveData()
-    val hasLeveledUp: Boolean
-        get() = result?.hasLeveledUp == true
-    val hasDied: Boolean
-        get() = result?.hasDied == true
-    val hasDrop: Boolean
-        get() {
-            return result?.drop?.key?.isNotBlank() == true // || (result?.questItemsFound ?: 0) > 0
-        }
-    val result = savedStateHandle.get<TaskScoringResult>("result")
-}
+class TaskResultViewModel
+    @Inject
+    constructor(
+        savedStateHandle: SavedStateHandle,
+        taskRepository: TaskRepository,
+        userRepository: UserRepository,
+        exceptionBuilder: ExceptionHandlerBuilder,
+        appStateManager: AppStateManager,
+    ) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager) {
+        val user = userRepository.getUser().asLiveData()
+        val hasLeveledUp: Boolean
+            get() = result?.hasLeveledUp == true
+        val hasDied: Boolean
+            get() = result?.hasDied == true
+        val hasDrop: Boolean
+            get() {
+                return result?.drop?.key?.isNotBlank() == true // || (result?.questItemsFound ?: 0) > 0
+            }
+        val result = savedStateHandle.get<TaskScoringResult>("result")
+    }
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/AddTaskButton.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/AddTaskButton.kt
index 9b7114056..6459db2f4 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/AddTaskButton.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/AddTaskButton.kt
@@ -15,57 +15,68 @@ import com.habitrpg.android.habitica.databinding.ButtonAddTaskBinding
 import com.habitrpg.common.habitica.extensions.dpToPx
 import com.habitrpg.common.habitica.extensions.layoutInflater
 
-class AddTaskButton @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null
-) : FrameLayout(context, attrs) {
-    val binding = ButtonAddTaskBinding.inflate(context.layoutInflater, this)
+class AddTaskButton
+    @JvmOverloads
+    constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+    ) : FrameLayout(context, attrs) {
+        val binding = ButtonAddTaskBinding.inflate(context.layoutInflater, this)
 
-    private var gradient = LinearGradient(
-        0f,
-        0f,
-        0f,
-        80.dpToPx(context).toFloat(),
-        ContextCompat.getColor(context, R.color.watch_purple_100),
-        ContextCompat.getColor(context, R.color.watch_blue_100),
-        Shader.TileMode.CLAMP
-    )
+        private var gradient =
+            LinearGradient(
+                0f,
+                0f,
+                0f,
+                80.dpToPx(context).toFloat(),
+                ContextCompat.getColor(context, R.color.watch_purple_100),
+                ContextCompat.getColor(context, R.color.watch_blue_100),
+                Shader.TileMode.CLAMP,
+            )
 
-    private val fillPaint = Paint().apply {
-        style = Paint.Style.FILL_AND_STROKE
-        shader = gradient
-        isAntiAlias = true
-    }
-    private val strokePaint = Paint().apply {
-        style = Paint.Style.STROKE
-        color = ContextCompat.getColor(context, R.color.watch_purple_200)
-        strokeWidth = 3f.dpToPx(context)
-        isAntiAlias = true
-    }
-    private val path = Path()
-    private val rect = RectF(0f, 1.5f.dpToPx(context), 0f, 0f)
+        private val fillPaint =
+            Paint().apply {
+                style = Paint.Style.FILL_AND_STROKE
+                shader = gradient
+                isAntiAlias = true
+            }
+        private val strokePaint =
+            Paint().apply {
+                style = Paint.Style.STROKE
+                color = ContextCompat.getColor(context, R.color.watch_purple_200)
+                strokeWidth = 3f.dpToPx(context)
+                isAntiAlias = true
+            }
+        private val path = Path()
+        private val rect = RectF(0f, 1.5f.dpToPx(context), 0f, 0f)
 
-    init {
-        setWillNotDraw(false)
-        clipToOutline = false
-        clipChildren = false
-    }
+        init {
+            setWillNotDraw(false)
+            clipToOutline = false
+            clipChildren = false
+        }
 
-    override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
-        super.onLayout(changed, left, top, right, bottom)
-        val totalWidth = right - left
-        val width = totalWidth / 1.2375f
-        rect.left = (totalWidth - width) / 2
-        rect.right = rect.left + width
-        rect.bottom = width / 1.8f
-        invalidate()
-    }
+        override fun onLayout(
+            changed: Boolean,
+            left: Int,
+            top: Int,
+            right: Int,
+            bottom: Int,
+        ) {
+            super.onLayout(changed, left, top, right, bottom)
+            val totalWidth = right - left
+            val width = totalWidth / 1.2375f
+            rect.left = (totalWidth - width) / 2
+            rect.right = rect.left + width
+            rect.bottom = width / 1.8f
+            invalidate()
+        }
 
-    override fun onDraw(canvas: Canvas) {
-        super.onDraw(canvas)
-        path.reset()
-        path.addArc(rect, 180f, 360f)
-        canvas.drawPath(path, fillPaint)
-        canvas.drawPath(path, strokePaint)
+        override fun onDraw(canvas: Canvas) {
+            super.onDraw(canvas)
+            path.reset()
+            path.addArc(rect, 180f, 360f)
+            canvas.drawPath(path, fillPaint)
+            canvas.drawPath(path, strokePaint)
+        }
     }
-}
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/CircularProgressView.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/CircularProgressView.kt
index df3df1872..5747395f7 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/CircularProgressView.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/CircularProgressView.kt
@@ -15,19 +15,20 @@ import com.habitrpg.common.habitica.extensions.dpToPx
 
 class CircularProgressView(
     context: Context?,
-    attrs: AttributeSet?
+    attrs: AttributeSet?,
 ) : View(context, attrs) {
     private val ovalSpace = RectF()
     private var ovalSize = (resources.displayMetrics.heightPixels / 2)
     private var currentPercentage = 55f
     private var percentageDivider = 180f
     private val arcFullRotationDegree = 360
-    private val attributes = context?.theme?.obtainStyledAttributes(
-        attrs,
-        R.styleable.CircularProgressView,
-        0,
-        0
-    )
+    private val attributes =
+        context?.theme?.obtainStyledAttributes(
+            attrs,
+            R.styleable.CircularProgressView,
+            0,
+            0,
+        )
     private val offset = attributes?.getDimension(R.styleable.CircularProgressView_offset, 0f)?.toInt()
     private val backgroundArcColor = attributes?.getColor(R.styleable.CircularProgressView_backgroundArcColor, 0) ?: Color.GRAY
     private var fillArcColor = attributes?.getColor(R.styleable.CircularProgressView_arcFillColor, 0) ?: Color.GRAY
@@ -36,20 +37,22 @@ class CircularProgressView(
             fillArcPaint.color = fillArcColor
         }
 
-    private val parentArcPaint = Paint().apply {
-        style = Paint.Style.STROKE
-        isAntiAlias = true
-        color = backgroundArcColor
-        strokeWidth = 4f.dpToPx(context)
-    }
+    private val parentArcPaint =
+        Paint().apply {
+            style = Paint.Style.STROKE
+            isAntiAlias = true
+            color = backgroundArcColor
+            strokeWidth = 4f.dpToPx(context)
+        }
 
-    private var fillArcPaint = Paint().apply {
-        style = Paint.Style.STROKE
-        isAntiAlias = true
-        color = fillArcColor
-        strokeWidth = 4f.dpToPx(context)
-        strokeCap = Paint.Cap.ROUND
-    }
+    private var fillArcPaint =
+        Paint().apply {
+            style = Paint.Style.STROKE
+            isAntiAlias = true
+            color = fillArcColor
+            strokeWidth = 4f.dpToPx(context)
+            strokeCap = Paint.Cap.ROUND
+        }
 
     override fun onDraw(canvas: Canvas) {
         setSpace()
@@ -59,7 +62,13 @@ class CircularProgressView(
         }
     }
 
-    override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
+    override fun onLayout(
+        changed: Boolean,
+        left: Int,
+        top: Int,
+        right: Int,
+        bottom: Int,
+    ) {
         super.onLayout(changed, left, top, right, bottom)
         offset?.let { ovalSize = (height / 2) - it }
         invalidate()
@@ -73,7 +82,7 @@ class CircularProgressView(
             horizontalCenter - ovalSize,
             verticalCenter - ovalSize,
             horizontalCenter + ovalSize,
-            verticalCenter + ovalSize
+            verticalCenter + ovalSize,
         )
     }
 
@@ -86,30 +95,38 @@ class CircularProgressView(
         canvas.drawArc(ovalSpace, 270f, percentageToFill, false, fillArcPaint)
     }
 
-    fun setPercentageValues(currentValue: Float, maxValue: Float) {
+    fun setPercentageValues(
+        currentValue: Float,
+        maxValue: Float,
+    ) {
         currentPercentage = currentValue
         percentageDivider = maxValue
     }
 
-    fun animateProgress(startValue: Float = 0f, animationDuration: Long = 1000) {
+    fun animateProgress(
+        startValue: Float = 0f,
+        animationDuration: Long = 1000,
+    ) {
         val currentPercent = currentPercentage
-        val valuesHolder = PropertyValuesHolder.ofFloat(
-            PERCENTAGE_VALUE_HOLDER,
-            startValue,
-            currentPercent
-        )
+        val valuesHolder =
+            PropertyValuesHolder.ofFloat(
+                PERCENTAGE_VALUE_HOLDER,
+                startValue,
+                currentPercent,
+            )
 
-        val animator = ValueAnimator().apply {
-            setValues(valuesHolder)
-            duration = animationDuration
-            interpolator = AccelerateDecelerateInterpolator()
+        val animator =
+            ValueAnimator().apply {
+                setValues(valuesHolder)
+                duration = animationDuration
+                interpolator = AccelerateDecelerateInterpolator()
 
-            addUpdateListener {
-                val percentage = it.getAnimatedValue(PERCENTAGE_VALUE_HOLDER) as Float
-                currentPercentage = percentage
-                invalidate()
+                addUpdateListener {
+                    val percentage = it.getAnimatedValue(PERCENTAGE_VALUE_HOLDER) as Float
+                    currentPercentage = percentage
+                    invalidate()
+                }
             }
-        }
         animator.start()
     }
 
@@ -117,5 +134,10 @@ class CircularProgressView(
         const val PERCENTAGE_VALUE_HOLDER = "percentage"
     }
 
-    private fun getCurrentAngleToFill() = if (currentPercentage > 0) { (arcFullRotationDegree.toFloat() * (currentPercentage / percentageDivider)) } else { 1f }
+    private fun getCurrentAngleToFill() =
+        if (currentPercentage > 0) {
+            (arcFullRotationDegree.toFloat() * (currentPercentage / percentageDivider))
+        } else {
+            1f
+        }
 }
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/ConnectedActionChipView.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/ConnectedActionChipView.kt
index eeb69003f..1d4a8d01c 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/ConnectedActionChipView.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/ConnectedActionChipView.kt
@@ -18,7 +18,7 @@ class ConnectedActionChipView(context: Context, attrs: AttributeSet? = null) :
 
     private fun checkIfPhoneAvailable() {
         MainScope().launch(Dispatchers.IO) {
-            capabilityClient.addListener( {
+            capabilityClient.addListener({
                 launch(Dispatchers.Main) {
                     isEnabled = it.nodes.firstOrNull { it.isNearby } != null
                     alpha = if (isEnabled) 1.0f else 0.7f
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/HabitDirectionPickerButton.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/HabitDirectionPickerButton.kt
index 387ecf469..e1657799a 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/HabitDirectionPickerButton.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/HabitDirectionPickerButton.kt
@@ -12,81 +12,90 @@ import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
 import com.habitrpg.common.habitica.extensions.dpToPx
 
-class HabitDirectionPickerButton @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null
-) : FrameLayout(context, attrs) {
-    private var drawFromTop: Boolean
-    private var drawable: BitmapDrawable?
+class HabitDirectionPickerButton
+    @JvmOverloads
+    constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+    ) : FrameLayout(context, attrs) {
+        private var drawFromTop: Boolean
+        private var drawable: BitmapDrawable?
 
-    private val paint = Paint()
-    private val path = Path()
-    private val rect = RectF(0f, 0f, 0f, 0f)
-    private val bitmapRect = RectF(0f, 0f, 0f, 0f)
+        private val paint = Paint()
+        private val path = Path()
+        private val rect = RectF(0f, 0f, 0f, 0f)
+        private val bitmapRect = RectF(0f, 0f, 0f, 0f)
 
-    var mainTaskColor: Int = ContextCompat.getColor(context, R.color.watch_gray_200)
-    var darkerTaskColor: Int = ContextCompat.getColor(context, R.color.watch_gray_10)
-    var iconColor: Int = ContextCompat.getColor(context, R.color.watch_white)
+        var mainTaskColor: Int = ContextCompat.getColor(context, R.color.watch_gray_200)
+        var darkerTaskColor: Int = ContextCompat.getColor(context, R.color.watch_gray_10)
+        var iconColor: Int = ContextCompat.getColor(context, R.color.watch_white)
 
-    private val radius = 15.dpToPx(context)
+        private val radius = 15.dpToPx(context)
 
-    init {
-        paint.style = Paint.Style.FILL
-        paint.isAntiAlias = true
-        setWillNotDraw(false)
+        init {
+            paint.style = Paint.Style.FILL
+            paint.isAntiAlias = true
+            setWillNotDraw(false)
 
-        val attributes = context.theme.obtainStyledAttributes(
-            attrs,
-            R.styleable.HabitDirectionPickerButton,
-            0,
-            0
-        )
-        drawable = attributes.getDrawable(R.styleable.HabitDirectionPickerButton_drawable) as? BitmapDrawable
-        drawFromTop = attributes.getBoolean(R.styleable.HabitDirectionPickerButton_drawFromTop, false)
-    }
-
-    override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
-        super.onLayout(changed, left, top, right, bottom)
-        rect.left = right.toFloat() * 0.125f
-        rect.right = right.toFloat() * 0.875f
-        if (drawFromTop) {
-            rect.top = -bottom.toFloat()
-            rect.bottom = bottom.toFloat()
-        } else {
-            rect.bottom = bottom.toFloat() / 2f
+            val attributes =
+                context.theme.obtainStyledAttributes(
+                    attrs,
+                    R.styleable.HabitDirectionPickerButton,
+                    0,
+                    0,
+                )
+            drawable = attributes.getDrawable(R.styleable.HabitDirectionPickerButton_drawable) as? BitmapDrawable
+            drawFromTop = attributes.getBoolean(R.styleable.HabitDirectionPickerButton_drawFromTop, false)
         }
 
-        val middleX = width / 2f
-        val middleY = height / 2f
-        val bitmapWidthHalf = (drawable?.bitmap?.width?.toFloat() ?: 0f) / 2f
-        val bitmapHeightHalf = (drawable?.bitmap?.height?.toFloat() ?: 0f) / 2f
-        bitmapRect.left = middleX - bitmapWidthHalf
-        bitmapRect.top = middleY - bitmapHeightHalf
-        bitmapRect.right = middleX + bitmapWidthHalf
-        bitmapRect.bottom = middleY + bitmapHeightHalf
+        override fun onLayout(
+            changed: Boolean,
+            left: Int,
+            top: Int,
+            right: Int,
+            bottom: Int,
+        ) {
+            super.onLayout(changed, left, top, right, bottom)
+            rect.left = right.toFloat() * 0.125f
+            rect.right = right.toFloat() * 0.875f
+            if (drawFromTop) {
+                rect.top = -bottom.toFloat()
+                rect.bottom = bottom.toFloat()
+            } else {
+                rect.bottom = bottom.toFloat() / 2f
+            }
 
-        invalidate()
-    }
+            val middleX = width / 2f
+            val middleY = height / 2f
+            val bitmapWidthHalf = (drawable?.bitmap?.width?.toFloat() ?: 0f) / 2f
+            val bitmapHeightHalf = (drawable?.bitmap?.height?.toFloat() ?: 0f) / 2f
+            bitmapRect.left = middleX - bitmapWidthHalf
+            bitmapRect.top = middleY - bitmapHeightHalf
+            bitmapRect.right = middleX + bitmapWidthHalf
+            bitmapRect.bottom = middleY + bitmapHeightHalf
 
-    override fun onDraw(canvas: Canvas) {
-        super.onDraw(canvas)
-
-        path.reset()
-        if (drawFromTop) {
-            path.addArc(rect, 0f, 180f)
-        } else {
-            path.addArc(rect, 180f, 360f)
+            invalidate()
         }
-        paint.color = mainTaskColor
-        canvas.drawPath(path, paint)
 
-        val middleX = width / 2f
-        val middleY = height / 2f
-        paint.color = darkerTaskColor
-        canvas.drawArc(middleX - radius, middleY - radius, middleX + radius, middleY + radius, 0f, 360f, true, paint)
-        drawable?.let {
-            paint.color = iconColor
-            canvas.drawBitmap(it.bitmap, null, bitmapRect, paint)
+        override fun onDraw(canvas: Canvas) {
+            super.onDraw(canvas)
+
+            path.reset()
+            if (drawFromTop) {
+                path.addArc(rect, 0f, 180f)
+            } else {
+                path.addArc(rect, 180f, 360f)
+            }
+            paint.color = mainTaskColor
+            canvas.drawPath(path, paint)
+
+            val middleX = width / 2f
+            val middleY = height / 2f
+            paint.color = darkerTaskColor
+            canvas.drawArc(middleX - radius, middleY - radius, middleX + radius, middleY + radius, 0f, 360f, true, paint)
+            drawable?.let {
+                paint.color = iconColor
+                canvas.drawBitmap(it.bitmap, null, bitmapRect, paint)
+            }
         }
     }
-}
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/HabiticaRecyclerView.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/HabiticaRecyclerView.kt
index d6a801285..1295ba466 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/HabiticaRecyclerView.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/HabiticaRecyclerView.kt
@@ -4,99 +4,110 @@ import android.content.Context
 import android.util.AttributeSet
 import android.view.View
 import androidx.wear.widget.WearableRecyclerView
-import com.habitrpg.common.habitica.helpers.EmptyItem
 import com.habitrpg.common.habitica.helpers.RecyclerViewState
 import com.habitrpg.common.habitica.helpers.RecyclerViewStateAdapter
 import com.habitrpg.wearos.habitica.ui.adapters.BaseAdapter
 
-class HabiticaRecyclerView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null
-) : WearableRecyclerView(context, attrs) {
-
-    init {
-        isVerticalScrollBarEnabled = true
-        focusable = View.FOCUSABLE
-        isFocusableInTouchMode = true
-    }
-
-    override fun onAttachedToWindow() {
-        super.onAttachedToWindow()
-        post {
-            setPadding(0, (height * 0.1).toInt(), 0, (height * 0.25).toInt())
-            scrollToPosition(0)
-            requestFocus()
+class HabiticaRecyclerView
+    @JvmOverloads
+    constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+    ) : WearableRecyclerView(context, attrs) {
+        init {
+            isVerticalScrollBarEnabled = true
+            focusable = View.FOCUSABLE
+            isFocusableInTouchMode = true
         }
-    }
 
-    var onRefresh: (() -> Unit)?
-        get() = emptyAdapter.onRefresh
-        set(value) { emptyAdapter.onRefresh = value }
+        override fun onAttachedToWindow() {
+            super.onAttachedToWindow()
+            post {
+                setPadding(0, (height * 0.1).toInt(), 0, (height * 0.25).toInt())
+                scrollToPosition(0)
+                requestFocus()
+            }
+        }
 
-    var state: RecyclerViewState = RecyclerViewState.LOADING
-        set(value) {
-            field = value
-            when (field) {
-                RecyclerViewState.DISPLAYING_DATA -> updateAdapter(actualAdapter)
-                else -> {
-                    updateAdapter(emptyAdapter)
-                    emptyAdapter.state = value
+        var onRefresh: (() -> Unit)?
+            get() = emptyAdapter.onRefresh
+            set(value) {
+                emptyAdapter.onRefresh = value
+            }
+
+        var state: RecyclerViewState = RecyclerViewState.LOADING
+            set(value) {
+                field = value
+                when (field) {
+                    RecyclerViewState.DISPLAYING_DATA -> updateAdapter(actualAdapter)
+                    else -> {
+                        updateAdapter(emptyAdapter)
+                        emptyAdapter.state = value
+                    }
                 }
             }
-        }
 
-    private fun updateAdapter(newAdapter: Adapter<*>?) {
-        if (adapter != newAdapter) {
-            super.setAdapter(newAdapter)
-        }
-    }
-
-    var emptyViewBuilder: (() -> View)?
-        get() = emptyAdapter.emptyViewBuilder
-        set(value) {
-            emptyAdapter.emptyViewBuilder = value
-        }
-
-    private var actualAdapter: Adapter<*>? = null
-    private val emptyAdapter = RecyclerViewStateAdapter(true)
-
-    private val observer = object : AdapterDataObserver() {
-        override fun onChanged() {
-            updateState()
-        }
-
-        override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
-            updateState()
-        }
-
-        override fun onItemRangeRemoved(positionStart: Int, itemCount: Int) {
-            updateState()
-        }
-    }
-
-    internal fun updateState(isInitial: Boolean = false) {
-        state = if (actualAdapter != null && !isInitial) {
-            val emptyViewVisible = if (actualAdapter is BaseAdapter<*>) {
-                (actualAdapter as? BaseAdapter<*>)?.hasData() != true
-            } else {
-                actualAdapter?.itemCount == 0
+        private fun updateAdapter(newAdapter: Adapter<*>?) {
+            if (adapter != newAdapter) {
+                super.setAdapter(newAdapter)
             }
-            if (emptyViewVisible) {
-                RecyclerViewState.EMPTY
-            } else {
-                RecyclerViewState.DISPLAYING_DATA
+        }
+
+        var emptyViewBuilder: (() -> View)?
+            get() = emptyAdapter.emptyViewBuilder
+            set(value) {
+                emptyAdapter.emptyViewBuilder = value
             }
-        } else {
-            RecyclerViewState.LOADING
+
+        private var actualAdapter: Adapter<*>? = null
+        private val emptyAdapter = RecyclerViewStateAdapter(true)
+
+        private val observer =
+            object : AdapterDataObserver() {
+                override fun onChanged() {
+                    updateState()
+                }
+
+                override fun onItemRangeInserted(
+                    positionStart: Int,
+                    itemCount: Int,
+                ) {
+                    updateState()
+                }
+
+                override fun onItemRangeRemoved(
+                    positionStart: Int,
+                    itemCount: Int,
+                ) {
+                    updateState()
+                }
+            }
+
+        internal fun updateState(isInitial: Boolean = false) {
+            state =
+                if (actualAdapter != null && !isInitial) {
+                    val emptyViewVisible =
+                        if (actualAdapter is BaseAdapter<*>) {
+                            (actualAdapter as? BaseAdapter<*>)?.hasData() != true
+                        } else {
+                            actualAdapter?.itemCount == 0
+                        }
+                    if (emptyViewVisible) {
+                        RecyclerViewState.EMPTY
+                    } else {
+                        RecyclerViewState.DISPLAYING_DATA
+                    }
+                } else {
+                    RecyclerViewState.LOADING
+                }
+        }
+
+        override fun setAdapter(adapter: Adapter<*>?) {
+            val oldAdapter = actualAdapter
+            oldAdapter?.unregisterAdapterDataObserver(observer)
+            super.setAdapter(adapter)
+            adapter?.registerAdapterDataObserver(observer)
+            actualAdapter = adapter
+            updateState(true)
         }
     }
-
-    override fun setAdapter(adapter: Adapter<*>?) {
-        val oldAdapter = actualAdapter
-        oldAdapter?.unregisterAdapterDataObserver(observer)
-        super.setAdapter(adapter)
-        adapter?.registerAdapterDataObserver(observer)
-        actualAdapter = adapter
-        updateState(true)
-    }
-}
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/HabiticaScrollView.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/HabiticaScrollView.kt
index a767a1b90..2a84ab1f9 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/HabiticaScrollView.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/HabiticaScrollView.kt
@@ -8,38 +8,46 @@ import androidx.core.view.children
 import androidx.core.widget.NestedScrollView
 import com.habitrpg.common.habitica.extensions.dpToPx
 
-class HabiticaScrollView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null
-) : NestedScrollView(context, attrs) {
+class HabiticaScrollView
+    @JvmOverloads
+    constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+    ) : NestedScrollView(context, attrs) {
+        init {
+            isVerticalScrollBarEnabled = true
+            focusable = View.FOCUSABLE
+            isFocusableInTouchMode = true
+        }
 
-    init {
-        isVerticalScrollBarEnabled = true
-        focusable = View.FOCUSABLE
-        isFocusableInTouchMode = true
-    }
+        override fun onAttachedToWindow() {
+            super.onAttachedToWindow()
+            requestFocus()
+        }
 
-    override fun onAttachedToWindow() {
-        super.onAttachedToWindow()
-        requestFocus()
-    }
-
-    override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) {
-        super.onLayout(changed, l, t, r, b)
-        if (changed) {
-            val verticalPadding = if (context.resources.configuration.isScreenRound) {
-                (0.146467f * Resources.getSystem().displayMetrics.widthPixels).toInt()
-            } else {
-                0
+        override fun onLayout(
+            changed: Boolean,
+            l: Int,
+            t: Int,
+            r: Int,
+            b: Int,
+        ) {
+            super.onLayout(changed, l, t, r, b)
+            if (changed) {
+                val verticalPadding =
+                    if (context.resources.configuration.isScreenRound) {
+                        (0.146467f * Resources.getSystem().displayMetrics.widthPixels).toInt()
+                    } else {
+                        0
+                    }
+                val horizontalPadding = 10.dpToPx(context)
+                children.firstOrNull()
+                    ?.setPadding(
+                        horizontalPadding,
+                        verticalPadding,
+                        horizontalPadding,
+                        verticalPadding * 2,
+                    )
             }
-            val horizontalPadding = 10.dpToPx(context)
-            children.firstOrNull()
-                ?.setPadding(
-                    horizontalPadding,
-                    verticalPadding,
-                    horizontalPadding,
-                    verticalPadding * 2
-                )
         }
     }
-}
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/IndeterminateProgressView.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/IndeterminateProgressView.kt
index 444278237..94c97de98 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/IndeterminateProgressView.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/IndeterminateProgressView.kt
@@ -16,83 +16,87 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.common.habitica.extensions.dpToPx
 import kotlin.math.min
 
-class IndeterminateProgressView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
-) : View(context, attrs, defStyleAttr) {
+class IndeterminateProgressView
+    @JvmOverloads
+    constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0,
+    ) : View(context, attrs, defStyleAttr) {
+        private val progressBarWidth = 6f.dpToPx(context)
+        private val revealDuration = 200L
 
-    private val progressBarWidth = 6f.dpToPx(context)
-    private val revealDuration = 200L
+        private val rainbow =
+            listOf(
+                ContextCompat.getColor(context, R.color.black),
+                ContextCompat.getColor(context, R.color.watch_red_100),
+                ContextCompat.getColor(context, R.color.watch_orange_100),
+                ContextCompat.getColor(context, R.color.watch_yellow_100),
+                ContextCompat.getColor(context, R.color.watch_green_100),
+                ContextCompat.getColor(context, R.color.watch_blue_100),
+                ContextCompat.getColor(context, R.color.watch_purple_100),
+                ContextCompat.getColor(context, R.color.black),
+            ).toIntArray()
+        val gradient = SweepGradient(225f, 225f, rainbow, null)
+        private val paint = Paint()
+        private val isCircular: Boolean
+        private val cornerRadius = 12f.dpToPx(context)
 
-    private val rainbow = listOf(
-        ContextCompat.getColor(context, R.color.black),
-        ContextCompat.getColor(context, R.color.watch_red_100),
-        ContextCompat.getColor(context, R.color.watch_orange_100),
-        ContextCompat.getColor(context, R.color.watch_yellow_100),
-        ContextCompat.getColor(context, R.color.watch_green_100),
-        ContextCompat.getColor(context, R.color.watch_blue_100),
-        ContextCompat.getColor(context, R.color.watch_purple_100),
-        ContextCompat.getColor(context, R.color.black)
-    ).toIntArray()
-    val gradient = SweepGradient(225f, 225f, rainbow, null)
-    private val paint = Paint()
-    private val isCircular: Boolean
-    private val cornerRadius = 12f.dpToPx(context)
+        private val currentAngle = 0f
 
-    private val currentAngle = 0f
+        init {
+            paint.style = Paint.Style.STROKE
+            paint.shader = gradient
+            paint.strokeWidth = 0f
+            paint.isAntiAlias = true
+            setWillNotDraw(false)
+            isCircular = context.resources.configuration.isScreenRound
+        }
 
-    init {
-        paint.style = Paint.Style.STROKE
-        paint.shader = gradient
-        paint.strokeWidth = 0f
-        paint.isAntiAlias = true
-        setWillNotDraw(false)
-        isCircular = context.resources.configuration.isScreenRound
-    }
+        private var animator: ValueAnimator? = null
 
-    private var animator: ValueAnimator? = null
-    fun startAnimation() {
-        animator = ValueAnimator.ofFloat(0f, 359f).apply {
-            duration = 2000
-            repeatCount = Animation.INFINITE
-            repeatMode = ValueAnimator.RESTART
-            interpolator = LinearInterpolator()
-            addUpdateListener {
-                val matrix = Matrix()
-                matrix.postRotate(it.animatedValue as Float, 225f, 225f)
-                gradient.setLocalMatrix(matrix)
-                invalidate()
-                requestLayout()
+        fun startAnimation() {
+            animator =
+                ValueAnimator.ofFloat(0f, 359f).apply {
+                    duration = 2000
+                    repeatCount = Animation.INFINITE
+                    repeatMode = ValueAnimator.RESTART
+                    interpolator = LinearInterpolator()
+                    addUpdateListener {
+                        val matrix = Matrix()
+                        matrix.postRotate(it.animatedValue as Float, 225f, 225f)
+                        gradient.setLocalMatrix(matrix)
+                        invalidate()
+                        requestLayout()
+                    }
+                    start()
+                }
+            ValueAnimator.ofFloat(0f, progressBarWidth).apply {
+                duration = revealDuration
+                addUpdateListener { paint.strokeWidth = it.animatedValue as Float }
+                start()
             }
-            start()
         }
-        ValueAnimator.ofFloat(0f, progressBarWidth).apply {
-            duration = revealDuration
-            addUpdateListener { paint.strokeWidth = it.animatedValue as Float }
-            start()
-        }
-    }
 
-    fun stopAnimation(onAnimationEnd: () -> Unit) {
-        val hideDuration = min(revealDuration, animator?.currentPlayTime ?: revealDuration)
-        ValueAnimator.ofFloat(paint.strokeWidth, 0f).apply {
-            duration = hideDuration
-            addUpdateListener { paint.strokeWidth = it.animatedValue as Float }
-            start()
-        }.doOnEnd {
-            animator = null
-            onAnimationEnd()
+        fun stopAnimation(onAnimationEnd: () -> Unit) {
+            val hideDuration = min(revealDuration, animator?.currentPlayTime ?: revealDuration)
+            ValueAnimator.ofFloat(paint.strokeWidth, 0f).apply {
+                duration = hideDuration
+                addUpdateListener { paint.strokeWidth = it.animatedValue as Float }
+                start()
+            }.doOnEnd {
+                animator = null
+                onAnimationEnd()
+            }
         }
-    }
 
-    override fun onDraw(canvas: Canvas) {
-        super.onDraw(canvas)
-        val halfBar = paint.strokeWidth / 2f
-        if (isCircular) {
-            canvas.drawArc(halfBar, halfBar, width.toFloat() - halfBar, height.toFloat() - halfBar, currentAngle, 360f, false, paint)
-        } else {
-            canvas.drawRoundRect(halfBar, halfBar, width.toFloat() - halfBar, height.toFloat() - halfBar, cornerRadius, cornerRadius, paint)
+        override fun onDraw(canvas: Canvas) {
+            super.onDraw(canvas)
+            val halfBar = paint.strokeWidth / 2f
+            if (isCircular) {
+                canvas.drawArc(halfBar, halfBar, width.toFloat() - halfBar, height.toFloat() - halfBar, currentAngle, 360f, false, paint)
+            } else {
+                canvas.drawRoundRect(halfBar, halfBar, width.toFloat() - halfBar, height.toFloat() - halfBar, cornerRadius, cornerRadius, paint)
+            }
         }
     }
-}
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/StatValueView.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/StatValueView.kt
index ea2ccb654..21628026f 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/StatValueView.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/StatValueView.kt
@@ -9,41 +9,48 @@ import com.habitrpg.android.habitica.databinding.StatValueLayoutBinding
 import com.habitrpg.common.habitica.extensions.layoutInflater
 import com.habitrpg.common.habitica.helpers.NumberAbbreviator
 
-class StatValueView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyle: Int = 0
-) :
+class StatValueView
+    @JvmOverloads
+    constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyle: Int = 0,
+    ) :
     ConstraintLayout(
-        context,
-        attrs,
-        defStyle
-    ) {
+            context,
+            attrs,
+            defStyle,
+        ) {
+        var binding = StatValueLayoutBinding.inflate(context.layoutInflater, this)
 
-    var binding = StatValueLayoutBinding.inflate(context.layoutInflater, this)
+        fun setStatValues(
+            maxValue: Int,
+            currentValue: Int,
+        ) {
+            binding.currentValue.text = currentValue.toString()
+            binding.maxValue.text = "/$maxValue"
+            invalidate()
 
-    fun setStatValues(maxValue: Int, currentValue: Int) {
-        binding.currentValue.text = currentValue.toString()
-        binding.maxValue.text = "/$maxValue"
-        invalidate()
-
-        startUpdateCountAnimation(currentValue)
-    }
-
-    fun setStatValueResources(resId: Int, bitmapColor: Int) {
-        binding.bitmap.setImageResource(resId)
-        binding.currentValue.setTextColor(
-            context?.resources?.getColor(bitmapColor, null) ?: Color.WHITE
-        )
-    }
-
-    private fun startUpdateCountAnimation(statValue: Int) {
-        val animator = ValueAnimator.ofInt(0, statValue)
-        animator.duration = 1000
-        animator.addUpdateListener { animation ->
-            binding.currentValue.text =
-                (NumberAbbreviator.abbreviate(context, animation.animatedValue.toString().toDouble(), 0))
+            startUpdateCountAnimation(currentValue)
+        }
+
+        fun setStatValueResources(
+            resId: Int,
+            bitmapColor: Int,
+        ) {
+            binding.bitmap.setImageResource(resId)
+            binding.currentValue.setTextColor(
+                context?.resources?.getColor(bitmapColor, null) ?: Color.WHITE,
+            )
+        }
+
+        private fun startUpdateCountAnimation(statValue: Int) {
+            val animator = ValueAnimator.ofInt(0, statValue)
+            animator.duration = 1000
+            animator.addUpdateListener { animation ->
+                binding.currentValue.text =
+                    (NumberAbbreviator.abbreviate(context, animation.animatedValue.toString().toDouble(), 0))
+            }
+            animator.start()
         }
-        animator.start()
     }
-}
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/TaskRewardChip.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/TaskRewardChip.kt
index 456a5f422..389d20b29 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/TaskRewardChip.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/TaskRewardChip.kt
@@ -9,66 +9,73 @@ import android.widget.LinearLayout
 import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.TaskRewardChipBinding
-import com.habitrpg.common.habitica.extensions.setScaledPadding
 import com.habitrpg.common.habitica.extensions.layoutInflater
+import com.habitrpg.common.habitica.extensions.setScaledPadding
 import com.habitrpg.shared.habitica.extensions.round
 import java.math.RoundingMode
 import java.text.NumberFormat
 
-class TaskRewardChip @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null
-) : LinearLayout(context, attrs) {
-    enum class Size {
-        SMALL,
-        MEDIUM,
-        LARGE
-    }
+class TaskRewardChip
+    @JvmOverloads
+    constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+    ) : LinearLayout(context, attrs) {
+        enum class Size {
+            SMALL,
+            MEDIUM,
+            LARGE,
+        }
 
-    val binding = TaskRewardChipBinding.inflate(context.layoutInflater, this)
+        val binding = TaskRewardChipBinding.inflate(context.layoutInflater, this)
 
-    var size: Size = Size.MEDIUM
-        set(value) {
-            field = value
-            binding.textView.setTextSize(
-                TypedValue.COMPLEX_UNIT_SP,
+        var size: Size = Size.MEDIUM
+            set(value) {
+                field = value
+                binding.textView.setTextSize(
+                    TypedValue.COMPLEX_UNIT_SP,
+                    when (field) {
+                        Size.SMALL -> 14f
+                        Size.MEDIUM -> 16f
+                        Size.LARGE -> 20f
+                    },
+                )
                 when (field) {
-                    Size.SMALL -> 14f
-                    Size.MEDIUM -> 16f
-                    Size.LARGE -> 20f
+                    Size.SMALL -> setScaledPadding(context, 10, 9, 10, 9)
+                    Size.MEDIUM -> setScaledPadding(context, 17, 9, 17, 9)
+                    Size.LARGE -> setScaledPadding(context, 21, 12, 21, 12)
                 }
-            )
-            when (field) {
-                Size.SMALL -> setScaledPadding(context, 10, 9, 10, 9)
-                Size.MEDIUM -> setScaledPadding(context, 17, 9, 17, 9)
-                Size.LARGE -> setScaledPadding(context, 21, 12, 21, 12)
             }
+
+        init {
+            background = ContextCompat.getDrawable(context, R.drawable.row_background)
+            gravity = Gravity.CENTER
         }
 
-    init {
-        background = ContextCompat.getDrawable(context, R.drawable.row_background)
-        gravity = Gravity.CENTER
-    }
+        fun set(
+            value: Double?,
+            iconRes: Int,
+        ) {
+            binding.iconView.setImageResource(iconRes)
+            var text = formatter.format(value?.round(if (value < 1 && value > -1) 1 else 0))
+            if (text.firstOrNull() == '0') {
+                text = text.substring(1)
+            }
+            binding.textView.text = text
+            backgroundTintList =
+                if ((value ?: 0.0) > 0.0) {
+                    ColorStateList.valueOf(ContextCompat.getColor(context, R.color.watch_green_100))
+                } else {
+                    ColorStateList.valueOf(ContextCompat.getColor(context, R.color.watch_red_100))
+                }
+        }
 
-    fun set(value: Double?, iconRes: Int) {
-        binding.iconView.setImageResource(iconRes)
-        var text = formatter.format(value?.round(if (value < 1 && value > -1) 1 else 0))
-        if (text.firstOrNull() == '0') {
-            text = text.substring(1)
-        }
-        binding.textView.text = text
-        backgroundTintList = if ((value ?: 0.0) > 0.0) {
-            ColorStateList.valueOf(ContextCompat.getColor(context, R.color.watch_green_100))
-        } else {
-            ColorStateList.valueOf(ContextCompat.getColor(context, R.color.watch_red_100))
+        companion object {
+            private val formatter =
+                NumberFormat.getInstance().apply {
+                    maximumFractionDigits = 1
+                    roundingMode = RoundingMode.UP
+                    isGroupingUsed = true
+                }
         }
     }
-
-    companion object {
-        private val formatter = NumberFormat.getInstance().apply {
-            maximumFractionDigits = 1
-            roundingMode = RoundingMode.UP
-            isGroupingUsed = true
-        }
-    }
-}
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/TaskTextView.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/TaskTextView.kt
index b55789484..d222c7c89 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/TaskTextView.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/TaskTextView.kt
@@ -13,62 +13,69 @@ import com.habitrpg.android.habitica.R
 /**
  * A custom [AppCompatTextView] that allows custom ellipsis and ellipsisColor.
  */
-open class EllipsizedTextView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0) : AppCompatTextView(context, attrs, defStyleAttr) {
-    var ellipsis = getDefaultEllipsis().toString()
-        set(value) {
-            field = value
+open class EllipsizedTextView
+    @JvmOverloads
+    constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0) : AppCompatTextView(context, attrs, defStyleAttr) {
+        var ellipsis = getDefaultEllipsis().toString()
+            set(value) {
+                field = value
+                ellipsisSpannable = SpannableString(ellipsis)
+            }
+        var ellipsisColor = getDefaultEllipsisColor()
+
+        private var ellipsisSpannable: SpannableString
+        private val spannableStringBuilder = SpannableStringBuilder()
+
+        init {
+            if (attrs != null) {
+                val typedArray = context.theme.obtainStyledAttributes(attrs, R.styleable.EllipsizedTextView, 0, 0)
+                typedArray.let {
+                    ellipsis = typedArray.getString(R.styleable.EllipsizedTextView_ellipsis) ?: getDefaultEllipsis().toString()
+                    ellipsisColor = typedArray.getColor(R.styleable.EllipsizedTextView_ellipsisColor, getDefaultEllipsisColor())
+                    typedArray.recycle()
+                }
+            }
+
             ellipsisSpannable = SpannableString(ellipsis)
+            ellipsisSpannable.setSpan(ForegroundColorSpan(ellipsisColor), 0, ellipsis.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
         }
-    var ellipsisColor = getDefaultEllipsisColor()
 
-    private var ellipsisSpannable: SpannableString
-    private val spannableStringBuilder = SpannableStringBuilder()
+        override fun onMeasure(
+            widthMeasureSpec: Int,
+            heightMeasureSpec: Int,
+        ) {
+            super.onMeasure(widthMeasureSpec, heightMeasureSpec)
+            val availableScreenWidth = measuredWidth - compoundPaddingLeft.toFloat() - compoundPaddingRight.toFloat()
+            var availableTextWidth = availableScreenWidth * maxLines
+            var ellipsizedText = TextUtils.ellipsize(text, paint, availableTextWidth, ellipsize)
 
-    init {
-        if (attrs != null) {
-            val typedArray = context.theme.obtainStyledAttributes(attrs, R.styleable.EllipsizedTextView, 0, 0)
-            typedArray.let {
-                ellipsis = typedArray.getString(R.styleable.EllipsizedTextView_ellipsis) ?: getDefaultEllipsis().toString()
-                ellipsisColor = typedArray.getColor(R.styleable.EllipsizedTextView_ellipsisColor, getDefaultEllipsisColor())
-                typedArray.recycle()
+            if (ellipsizedText.toString() != text.toString()) {
+                // If the ellipsizedText is different than the original text, this means that it didn't fit and got indeed ellipsized.
+                // Calculate the new availableTextWidth by taking into consideration the size of the custom ellipsis, too.
+                availableTextWidth = (availableScreenWidth - paint.measureText(ellipsis)) * maxLines
+                ellipsizedText = TextUtils.ellipsize(text, paint, availableTextWidth, ellipsize)
+                val defaultEllipsisStart = ellipsizedText.indexOf(getDefaultEllipsis())
+                val defaultEllipsisEnd = defaultEllipsisStart + 1
+
+                spannableStringBuilder.clear()
+
+                // Update the text with the ellipsized version and replace the default ellipsis with the custom one.
+                text = spannableStringBuilder.append(ellipsizedText).replace(defaultEllipsisStart, defaultEllipsisEnd, ellipsisSpannable)
             }
         }
 
-        ellipsisSpannable = SpannableString(ellipsis)
-        ellipsisSpannable.setSpan(ForegroundColorSpan(ellipsisColor), 0, ellipsis.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
-    }
+        private fun getDefaultEllipsis(): Char {
+            return Typography.ellipsis
+        }
 
-    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec)
-        val availableScreenWidth = measuredWidth - compoundPaddingLeft.toFloat() - compoundPaddingRight.toFloat()
-        var availableTextWidth = availableScreenWidth * maxLines
-        var ellipsizedText = TextUtils.ellipsize(text, paint, availableTextWidth, ellipsize)
-
-        if (ellipsizedText.toString() != text.toString()) {
-            // If the ellipsizedText is different than the original text, this means that it didn't fit and got indeed ellipsized.
-            // Calculate the new availableTextWidth by taking into consideration the size of the custom ellipsis, too.
-            availableTextWidth = (availableScreenWidth - paint.measureText(ellipsis)) * maxLines
-            ellipsizedText = TextUtils.ellipsize(text, paint, availableTextWidth, ellipsize)
-            val defaultEllipsisStart = ellipsizedText.indexOf(getDefaultEllipsis())
-            val defaultEllipsisEnd = defaultEllipsisStart + 1
-
-            spannableStringBuilder.clear()
-
-            // Update the text with the ellipsized version and replace the default ellipsis with the custom one.
-            text = spannableStringBuilder.append(ellipsizedText).replace(defaultEllipsisStart, defaultEllipsisEnd, ellipsisSpannable)
+        private fun getDefaultEllipsisColor(): Int {
+            return textColors.defaultColor
         }
     }
 
-    private fun getDefaultEllipsis(): Char {
-        return Typography.ellipsis
-    }
-
-    private fun getDefaultEllipsisColor(): Int {
-        return textColors.defaultColor
-    }
-}
-
-class TaskTextView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null
-) : EllipsizedTextView(context, attrs)
+class TaskTextView
+    @JvmOverloads
+    constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+    ) : EllipsizedTextView(context, attrs)
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/TextActionChipView.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/TextActionChipView.kt
index c0405167f..2610a9d12 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/TextActionChipView.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/TextActionChipView.kt
@@ -10,38 +10,41 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.TextActionChipBinding
 import com.habitrpg.common.habitica.extensions.layoutInflater
 
-open class TextActionChipView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) :
+open class TextActionChipView
+    @JvmOverloads
+    constructor(context: Context, attrs: AttributeSet? = null) :
     RelativeLayout(context, attrs) {
-    private val attributes = context.theme?.obtainStyledAttributes(
-        attrs,
-        R.styleable.TextActionChip,
-        0,
-        0
-    )
+        private val attributes =
+            context.theme?.obtainStyledAttributes(
+                attrs,
+                R.styleable.TextActionChip,
+                0,
+                0,
+            )
 
-    val binding = TextActionChipBinding.inflate(context.layoutInflater, this)
+        val binding = TextActionChipBinding.inflate(context.layoutInflater, this)
 
-    init {
-        binding.chipTextview.text = attributes?.getText(R.styleable.TextActionChip_chipText)
-        val icon = attributes?.getDrawable(R.styleable.TextActionChip_chipImage)
-        if (icon != null) {
-            binding.chipImageview.setImageDrawable(icon)
-            binding.chipTextview.gravity = Gravity.START
-            binding.chipImageview.isVisible = true
-        } else {
-            binding.chipImageview.setImageDrawable(null)
-            binding.chipTextview.gravity = Gravity.START
-            binding.chipImageview.isVisible = false
+        init {
+            binding.chipTextview.text = attributes?.getText(R.styleable.TextActionChip_chipText)
+            val icon = attributes?.getDrawable(R.styleable.TextActionChip_chipImage)
+            if (icon != null) {
+                binding.chipImageview.setImageDrawable(icon)
+                binding.chipTextview.gravity = Gravity.START
+                binding.chipImageview.isVisible = true
+            } else {
+                binding.chipImageview.setImageDrawable(null)
+                binding.chipTextview.gravity = Gravity.START
+                binding.chipImageview.isVisible = false
+            }
+            attributes?.getColor(R.styleable.TextActionChip_chipColor, context.getColor(R.color.surface))?.let {
+                binding.wearChipButton.backgroundTintList = ColorStateList.valueOf(it)
+            }
+            attributes?.getColor(R.styleable.TextActionChip_chipTextColor, context.getColor(R.color.watch_white))?.let {
+                binding.chipTextview.setTextColor(it)
+            }
         }
-        attributes?.getColor(R.styleable.TextActionChip_chipColor, context.getColor(R.color.surface))?.let {
-            binding.wearChipButton.backgroundTintList = ColorStateList.valueOf(it)
-        }
-        attributes?.getColor(R.styleable.TextActionChip_chipTextColor, context.getColor(R.color.watch_white))?.let {
-            binding.chipTextview.setTextColor(it)
+
+        fun setChipText(text: String) {
+            binding.chipTextview.text = text
         }
     }
-
-    fun setChipText(text: String) {
-        binding.chipTextview.text = text
-    }
-}
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/TextViewWrapper.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/TextViewWrapper.kt
index 2d7bc1e72..ed845b3f5 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/TextViewWrapper.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/TextViewWrapper.kt
@@ -32,7 +32,7 @@ interface TextViewWrapper {
  * A [TextViewWrapper] wrapping a [CurvedTextView].
  */
 class CurvedTextViewWrapper(
-    override val view: CurvedTextView
+    override val view: CurvedTextView,
 ) : TextViewWrapper {
     override var text: CharSequence?
         get() = view.text
@@ -51,7 +51,7 @@ class CurvedTextViewWrapper(
  * A [TextViewWrapper] wrapping a [TextView].
  */
 class NormalTextViewWrapper(
-    override val view: TextView
+    override val view: TextView,
 ) : TextViewWrapper {
     override var text: CharSequence?
         get() = view.text
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/TimeText.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/TimeText.kt
index 6f81925b5..82b79bf40 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/TimeText.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/TimeText.kt
@@ -45,228 +45,238 @@ import java.util.Calendar
  */
 private const val MAX_SWEEP_ANGLE = 90f
 
-class TimeText @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    @AttrRes defStyleAttr: Int = 0,
-    @StyleRes defStyleRes: Int = 0
-) : FrameLayout(context, attrs, defStyleAttr, defStyleRes) {
+class TimeText
+    @JvmOverloads
+    constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        @AttrRes defStyleAttr: Int = 0,
+        @StyleRes defStyleRes: Int = 0,
+    ) : FrameLayout(context, attrs, defStyleAttr, defStyleRes) {
+        /**
+         * The underlying [Calendar] instance for producing the time.
+         *
+         * This will be updated in [onTimeZoneChange] in response to any timezone updates.
+         */
+        private var time = Calendar.getInstance()
 
-    /**
-     * The underlying [Calendar] instance for producing the time.
-     *
-     * This will be updated in [onTimeZoneChange] in response to any timezone updates.
-     */
-    private var time = Calendar.getInstance()
+        /**
+         * True if we should format the time in the 24 hour manner.
+         *
+         * This will be updated in [onTimeFormatChange] in response to any format updates.
+         */
+        private var use24HourFormat = DateFormat.is24HourFormat(context)
 
-    /**
-     * True if we should format the time in the 24 hour manner.
-     *
-     * This will be updated in [onTimeFormatChange] in response to any format updates.
-     */
-    private var use24HourFormat = DateFormat.is24HourFormat(context)
+        /**
+         * An [IntentFilter] for any time related broadcast.
+         */
+        private val timeBroadcastReceiverFilter =
+            IntentFilter().apply {
+                addAction(Intent.ACTION_TIME_TICK)
+                addAction(Intent.ACTION_TIME_CHANGED)
+                addAction(Intent.ACTION_TIMEZONE_CHANGED)
+            }
 
-    /**
-     * An [IntentFilter] for any time related broadcast.
-     */
-    private val timeBroadcastReceiverFilter = IntentFilter().apply {
-        addAction(Intent.ACTION_TIME_TICK)
-        addAction(Intent.ACTION_TIME_CHANGED)
-        addAction(Intent.ACTION_TIMEZONE_CHANGED)
-    }
+        private val timeBroadcastReceiver =
+            object : BroadcastReceiver() {
+                override fun onReceive(
+                    context: Context,
+                    intent: Intent,
+                ) {
+                    when (intent.action) {
+                        Intent.ACTION_TIMEZONE_CHANGED -> onTimeZoneChange()
+                        Intent.ACTION_TIME_TICK, Intent.ACTION_TIME_CHANGED -> onTimeChange()
+                    }
+                }
+            }
 
-    private val timeBroadcastReceiver = object : BroadcastReceiver() {
-        override fun onReceive(context: Context, intent: Intent) {
-            when (intent.action) {
-                Intent.ACTION_TIMEZONE_CHANGED -> onTimeZoneChange()
-                Intent.ACTION_TIME_TICK, Intent.ACTION_TIME_CHANGED -> onTimeChange()
+        /**
+         * The wrapped view binding for the inflated views.
+         */
+        private val timeTextViewBinding: TimeTextViewBinding
+
+        /**
+         * A non-clock portion of the time text to display.
+         */
+        var title: CharSequence? = null
+            set(value) {
+                field = value
+
+                timeTextViewBinding.timeTextTitle.text = title
+
+                // Only show the title and divider if the title is non-empty
+                val hideTitle = title.isNullOrEmpty()
+                timeTextViewBinding.timeTextTitle.view.isGone = hideTitle
+                timeTextViewBinding.timeTextDivider.view.isGone = hideTitle
+            }
+
+        /**
+         * The color of the non-clock portion of the time text.
+         */
+        var titleTextColor: Int = Color.WHITE
+            set(value) {
+                field = value
+
+                timeTextViewBinding.timeTextTitle.textColor = titleTextColor
+            }
+
+        /**
+         * The backing [Clock] used to drive the time.
+         *
+         * Overridable for testing.
+         */
+        @VisibleForTesting
+        var clock: Clock = Clock(System::currentTimeMillis)
+            set(value) {
+                field = value
+                onTimeChange()
+            }
+
+        /**
+         * The [ContentObserver] listening for a time format change.
+         *
+         * This is constructed lazily, since [getHandler] needs the view to be attached.
+         */
+        private val timeContentObserver by lazy(LazyThreadSafetyMode.NONE) {
+            object : ContentObserver(handler) {
+                override fun onChange(selfChange: Boolean) {
+                    super.onChange(selfChange)
+                    onTimeFormatChange()
+                }
             }
         }
-    }
 
-    /**
-     * The wrapped view binding for the inflated views.
-     */
-    private val timeTextViewBinding: TimeTextViewBinding
+        init {
+            val layoutInflater = LayoutInflater.from(context)
 
-    /**
-     * A non-clock portion of the time text to display.
-     */
-    var title: CharSequence? = null
-        set(value) {
-            field = value
+            // Create the view structure based on whether the screen is round.
+            // This will inflate one of two distinct layouts, which we abstract away in a TimeTextViewBinding
+            timeTextViewBinding =
+                if (resources.configuration.isScreenRound) {
+                    TimeTextCurvedViewBinding(CurvedTimeTextBinding.inflate(layoutInflater, this, true))
+                } else {
+                    TimeTextStraightViewBinding(StraightTimeTextBinding.inflate(layoutInflater, this, true))
+                }
 
-            timeTextViewBinding.timeTextTitle.text = title
+            // Set the divider text
+            timeTextViewBinding.timeTextDivider.text = "·"
 
-            // Only show the title and divider if the title is non-empty
-            val hideTitle = title.isNullOrEmpty()
-            timeTextViewBinding.timeTextTitle.view.isGone = hideTitle
-            timeTextViewBinding.timeTextDivider.view.isGone = hideTitle
+            // Update based on the styled attributes.
+            // Note that this runs the side-effects of setting those attributes.
+            context.obtainStyledAttributes(attrs, R.styleable.TimeText, defStyleAttr, defStyleRes)
+                .use { typedArray ->
+                    titleTextColor =
+                        typedArray.getColor(R.styleable.TimeText_android_titleTextColor, titleTextColor)
+                    title = typedArray.getString(R.styleable.TimeText_titleText)
+                }
         }
 
-    /**
-     * The color of the non-clock portion of the time text.
-     */
-    var titleTextColor: Int = Color.WHITE
-        set(value) {
-            field = value
+        /**
+         * Restrict the total sweep angle on round screens to [MAX_SWEEP_ANGLE].
+         *
+         * We accomplish this with two measure passes:
+         *
+         * After the first, we measure to get the angle that the clock and divider occupy (together, these shouldn't ever
+         * be more than [MAX_SWEEP_ANGLE].
+         *
+         * Then, we update the title's max sweep angle to the remaining angle, and measure again to apply the limit.
+         */
+        override fun onMeasure(
+            widthMeasureSpec: Int,
+            heightMeasureSpec: Int,
+        ) {
+            when (timeTextViewBinding) {
+                is TimeTextCurvedViewBinding -> {
+                    // Reset the title sweep to ensure we get a true initial measurement
+                    timeTextViewBinding.timeTextTitle.view.setSweepRangeDegrees(0f, MAX_SWEEP_ANGLE)
+                    super.onMeasure(widthMeasureSpec, heightMeasureSpec)
 
-            timeTextViewBinding.timeTextTitle.textColor = titleTextColor
+                    val clockSweepAngle =
+                        timeTextViewBinding.timeTextClock.view.sweepAngleDegrees.coerceAtLeast(0f)
+
+                    // Avoid getting the divider sweep angle if it is gone, since it won't be accurate
+                    val dividerSweepAngle =
+                        if (timeTextViewBinding.timeTextDivider.view.isGone) {
+                            0f
+                        } else {
+                            timeTextViewBinding.timeTextDivider.view.sweepAngleDegrees.coerceAtLeast(0f)
+                        }
+
+                    val maxTitleSweepAngle = MAX_SWEEP_ANGLE - clockSweepAngle - dividerSweepAngle
+
+                    // Update the title max sweep angle to effectively get a total max sweep of MAX_SWEEP_ANGLE
+                    timeTextViewBinding.timeTextTitle.view.setSweepRangeDegrees(0f, maxTitleSweepAngle)
+
+                    // Measure again, with the updated max sweep
+                    super.onMeasure(widthMeasureSpec, heightMeasureSpec)
+                }
+                is TimeTextStraightViewBinding -> {
+                    // Need to do nothing special the for the straight view, just call through to super
+                    super.onMeasure(widthMeasureSpec, heightMeasureSpec)
+                }
+            }
         }
 
-    /**
-     * The backing [Clock] used to drive the time.
-     *
-     * Overridable for testing.
-     */
-    @VisibleForTesting
-    var clock: Clock = Clock(System::currentTimeMillis)
-        set(value) {
-            field = value
+        override fun onAttachedToWindow() {
+            super.onAttachedToWindow()
+
+            onTimeZoneChange()
+            onTimeFormatChange()
+            onTimeChange()
+
+            context.contentResolver.registerContentObserver(
+                Settings.System.getUriFor(Settings.System.TIME_12_24),
+                true,
+                timeContentObserver,
+            )
+            context.registerReceiver(timeBroadcastReceiver, timeBroadcastReceiverFilter)
+        }
+
+        override fun onDetachedFromWindow() {
+            super.onDetachedFromWindow()
+
+            context.contentResolver.unregisterContentObserver(timeContentObserver)
+            context.unregisterReceiver(timeBroadcastReceiver)
+        }
+
+        private fun onTimeChange() {
+            val pattern =
+                DateFormat.getBestDateTimePattern(
+                    ConfigurationCompat.getLocales(resources.configuration)[0],
+                    if (use24HourFormat) "Hm" else "hm",
+                )
+            // Remove the am/pm indicator (if any). This is locale safe.
+            val patternWithoutAmPm = pattern.replace("a", "").trim()
+
+            time.timeInMillis = clock.getCurrentTimeMillis()
+            timeTextViewBinding.timeTextClock.text = DateFormat.format(patternWithoutAmPm, time)
+        }
+
+        private fun onTimeZoneChange() {
+            time = Calendar.getInstance()
             onTimeChange()
         }
 
-    /**
-     * The [ContentObserver] listening for a time format change.
-     *
-     * This is constructed lazily, since [getHandler] needs the view to be attached.
-     */
-    private val timeContentObserver by lazy(LazyThreadSafetyMode.NONE) {
-        object : ContentObserver(handler) {
-            override fun onChange(selfChange: Boolean) {
-                super.onChange(selfChange)
-                onTimeFormatChange()
-            }
+        private fun onTimeFormatChange() {
+            use24HourFormat = DateFormat.is24HourFormat(context)
+            onTimeChange()
         }
-    }
-
-    init {
-        val layoutInflater = LayoutInflater.from(context)
-
-        // Create the view structure based on whether the screen is round.
-        // This will inflate one of two distinct layouts, which we abstract away in a TimeTextViewBinding
-        timeTextViewBinding = if (resources.configuration.isScreenRound) {
-            TimeTextCurvedViewBinding(CurvedTimeTextBinding.inflate(layoutInflater, this, true))
-        } else {
-            TimeTextStraightViewBinding(StraightTimeTextBinding.inflate(layoutInflater, this, true))
-        }
-
-        // Set the divider text
-        timeTextViewBinding.timeTextDivider.text = "·"
-
-        // Update based on the styled attributes.
-        // Note that this runs the side-effects of setting those attributes.
-        context.obtainStyledAttributes(attrs, R.styleable.TimeText, defStyleAttr, defStyleRes)
-            .use { typedArray ->
-                titleTextColor =
-                    typedArray.getColor(R.styleable.TimeText_android_titleTextColor, titleTextColor)
-                title = typedArray.getString(R.styleable.TimeText_titleText)
-            }
-    }
-
-    /**
-     * Restrict the total sweep angle on round screens to [MAX_SWEEP_ANGLE].
-     *
-     * We accomplish this with two measure passes:
-     *
-     * After the first, we measure to get the angle that the clock and divider occupy (together, these shouldn't ever
-     * be more than [MAX_SWEEP_ANGLE].
-     *
-     * Then, we update the title's max sweep angle to the remaining angle, and measure again to apply the limit.
-     */
-    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-        when (timeTextViewBinding) {
-            is TimeTextCurvedViewBinding -> {
-                // Reset the title sweep to ensure we get a true initial measurement
-                timeTextViewBinding.timeTextTitle.view.setSweepRangeDegrees(0f, MAX_SWEEP_ANGLE)
-                super.onMeasure(widthMeasureSpec, heightMeasureSpec)
-
-                val clockSweepAngle =
-                    timeTextViewBinding.timeTextClock.view.sweepAngleDegrees.coerceAtLeast(0f)
-
-                // Avoid getting the divider sweep angle if it is gone, since it won't be accurate
-                val dividerSweepAngle = if (timeTextViewBinding.timeTextDivider.view.isGone) {
-                    0f
-                } else {
-                    timeTextViewBinding.timeTextDivider.view.sweepAngleDegrees.coerceAtLeast(0f)
-                }
-
-                val maxTitleSweepAngle = MAX_SWEEP_ANGLE - clockSweepAngle - dividerSweepAngle
-
-                // Update the title max sweep angle to effectively get a total max sweep of MAX_SWEEP_ANGLE
-                timeTextViewBinding.timeTextTitle.view.setSweepRangeDegrees(0f, maxTitleSweepAngle)
-
-                // Measure again, with the updated max sweep
-                super.onMeasure(widthMeasureSpec, heightMeasureSpec)
-            }
-            is TimeTextStraightViewBinding -> {
-                // Need to do nothing special the for the straight view, just call through to super
-                super.onMeasure(widthMeasureSpec, heightMeasureSpec)
-            }
-        }
-    }
-
-    override fun onAttachedToWindow() {
-        super.onAttachedToWindow()
-
-        onTimeZoneChange()
-        onTimeFormatChange()
-        onTimeChange()
-
-        context.contentResolver.registerContentObserver(
-            Settings.System.getUriFor(Settings.System.TIME_12_24),
-            true,
-            timeContentObserver
-        )
-        context.registerReceiver(timeBroadcastReceiver, timeBroadcastReceiverFilter)
-    }
-
-    override fun onDetachedFromWindow() {
-        super.onDetachedFromWindow()
-
-        context.contentResolver.unregisterContentObserver(timeContentObserver)
-        context.unregisterReceiver(timeBroadcastReceiver)
-    }
-
-    private fun onTimeChange() {
-        val pattern = DateFormat.getBestDateTimePattern(
-            ConfigurationCompat.getLocales(resources.configuration)[0],
-            if (use24HourFormat) "Hm" else "hm"
-        )
-        // Remove the am/pm indicator (if any). This is locale safe.
-        val patternWithoutAmPm = pattern.replace("a", "").trim()
-
-        time.timeInMillis = clock.getCurrentTimeMillis()
-        timeTextViewBinding.timeTextClock.text = DateFormat.format(patternWithoutAmPm, time)
-    }
-
-    private fun onTimeZoneChange() {
-        time = Calendar.getInstance()
-        onTimeChange()
-    }
-
-    private fun onTimeFormatChange() {
-        use24HourFormat = DateFormat.is24HourFormat(context)
-        onTimeChange()
-    }
-
-    /**
-     * A provider of the current time.
-     */
-    fun interface Clock {
 
         /**
-         * Returns the current time in milliseconds since the epoch.
+         * A provider of the current time.
          */
-        fun getCurrentTimeMillis(): Long
+        fun interface Clock {
+            /**
+             * Returns the current time in milliseconds since the epoch.
+             */
+            fun getCurrentTimeMillis(): Long
+        }
     }
-}
 
 /**
  * An abstraction around the view binding, since we inflate two different layouts depending on the shape of the screen.
  */
 private sealed class TimeTextViewBinding {
-
     abstract val timeTextTitle: TextViewWrapper
 
     abstract val timeTextDivider: TextViewWrapper
@@ -277,7 +287,7 @@ private sealed class TimeTextViewBinding {
      * The [TimeTextViewBinding] wrapping the [CurvedTimeTextBinding].
      */
     class TimeTextCurvedViewBinding(
-        timeTextBinding: CurvedTimeTextBinding
+        timeTextBinding: CurvedTimeTextBinding,
     ) : TimeTextViewBinding() {
         override val timeTextTitle: CurvedTextViewWrapper =
             CurvedTextViewWrapper(timeTextBinding.timeTextTitle)
@@ -291,7 +301,7 @@ private sealed class TimeTextViewBinding {
      * The [TimeTextViewBinding] wrapping the [StraightTimeTextBinding].
      */
     class TimeTextStraightViewBinding(
-        timeTextBinding: StraightTimeTextBinding
+        timeTextBinding: StraightTimeTextBinding,
     ) : TimeTextViewBinding() {
         override val timeTextTitle: NormalTextViewWrapper =
             NormalTextViewWrapper(timeTextBinding.timeTextTitle)
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/util/DateJSONAdapter.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/util/DateJSONAdapter.kt
index 1986c1996..e9328ec11 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/util/DateJSONAdapter.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/util/DateJSONAdapter.kt
@@ -12,46 +12,47 @@ import java.util.Date
 import java.util.Locale
 import java.util.TimeZone
 
-var customDateAdapter: Any = object : Any() {
-
-    @ToJson
-    @Synchronized
-    fun dateToJson(d: Date?): String? {
-        return d?.let { dateFormats[0].format(it) }
-    }
-
-    @FromJson
-    @Synchronized
-    @Throws(ParseException::class)
-    fun dateFromJson(s: String?): Date? {
-        var date: Date? = null
-        var index = 0
-        while (index < dateFormats.size && date == null) {
-            try {
-                date = s?.let { dateFormats[index].parse(it) }
-            } catch (_: ParseException) {}
-            index += 1
+var customDateAdapter: Any =
+    object : Any() {
+        @ToJson
+        @Synchronized
+        fun dateToJson(d: Date?): String? {
+            return d?.let { dateFormats[0].format(it) }
         }
-        return date
-    }
 
-    private var dateFormats = mutableListOf<DateFormat>()
+        @FromJson
+        @Synchronized
+        @Throws(ParseException::class)
+        fun dateFromJson(s: String?): Date? {
+            var date: Date? = null
+            var index = 0
+            while (index < dateFormats.size && date == null) {
+                try {
+                    date = s?.let { dateFormats[index].parse(it) }
+                } catch (_: ParseException) {
+                }
+                index += 1
+            }
+            return date
+        }
 
-    init {
-        addFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
-        addFormat("yyyy-MM-dd'T'HH:mm:ss'Z'")
-        addFormat("E MMM dd yyyy HH:mm:ss zzzz")
-        addFormat("yyyy-MM-dd'T'HH:mm:sszzz")
-        addFormat("yyyy-MM-dd'T'HH:mmX")
-        addFormat("yyyy-MM-dd")
-    }
+        private var dateFormats = mutableListOf<DateFormat>()
 
-    private fun addFormat(s: String) {
-        val dateFormat = SimpleDateFormat(s, Locale.US)
-        dateFormat.timeZone = TimeZone.getTimeZone("UTC")
-        dateFormats.add(dateFormat)
+        init {
+            addFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
+            addFormat("yyyy-MM-dd'T'HH:mm:ss'Z'")
+            addFormat("E MMM dd yyyy HH:mm:ss zzzz")
+            addFormat("yyyy-MM-dd'T'HH:mm:sszzz")
+            addFormat("yyyy-MM-dd'T'HH:mmX")
+            addFormat("yyyy-MM-dd")
+        }
+
+        private fun addFormat(s: String) {
+            val dateFormat = SimpleDateFormat(s, Locale.US)
+            dateFormat.timeZone = TimeZone.getTimeZone("UTC")
+            dateFormats.add(dateFormat)
+        }
     }
-}
 
 class FrequencyAdapter {
     @ToJson
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/util/ExceptionHandlerBuilder.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/util/ExceptionHandlerBuilder.kt
index 0ee10bc50..c6f6c659f 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/util/ExceptionHandlerBuilder.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/util/ExceptionHandlerBuilder.kt
@@ -10,28 +10,34 @@ import java.io.IOException
 import javax.inject.Inject
 
 @ViewModelScoped
-class ExceptionHandlerBuilder @Inject constructor(val appStateManager: AppStateManager) {
-    fun silent(handler: ((Throwable) -> Unit)? = null): CoroutineExceptionHandler {
-        return CoroutineExceptionHandler { context, throwable ->
-            Log.e(context.toString(), "Error: ${throwable.cause}", throwable)
-            handler?.invoke(throwable)
-        }
-    }
-
-    fun userFacing(errorPresenter: ErrorPresenter, handler: ((Throwable) -> Unit)? = null): CoroutineExceptionHandler {
-        return CoroutineExceptionHandler { _, throwable ->
-            Log.e("Coroutine Error", "Error: ${throwable.cause}", throwable)
-            if (throwable is IOException) {
-                errorPresenter.errorValues.value = DisplayedError(R.drawable.disconnected, "Disconnected")
-            } else if (throwable.message == "12501: ") {
-                errorPresenter.errorValues.value = DisplayedError(R.drawable.error, "There was an error when signing in with Google.")
-            } else {
-                errorPresenter.errorValues.value = throwable.message?.let {
-                    DisplayedError(R.drawable.error, it)
-                }
+class ExceptionHandlerBuilder
+    @Inject
+    constructor(val appStateManager: AppStateManager) {
+        fun silent(handler: ((Throwable) -> Unit)? = null): CoroutineExceptionHandler {
+            return CoroutineExceptionHandler { context, throwable ->
+                Log.e(context.toString(), "Error: ${throwable.cause}", throwable)
+                handler?.invoke(throwable)
+            }
+        }
+
+        fun userFacing(
+            errorPresenter: ErrorPresenter,
+            handler: ((Throwable) -> Unit)? = null,
+        ): CoroutineExceptionHandler {
+            return CoroutineExceptionHandler { _, throwable ->
+                Log.e("Coroutine Error", "Error: ${throwable.cause}", throwable)
+                if (throwable is IOException) {
+                    errorPresenter.errorValues.value = DisplayedError(R.drawable.disconnected, "Disconnected")
+                } else if (throwable.message == "12501: ") {
+                    errorPresenter.errorValues.value = DisplayedError(R.drawable.error, "There was an error when signing in with Google.")
+                } else {
+                    errorPresenter.errorValues.value =
+                        throwable.message?.let {
+                            DisplayedError(R.drawable.error, it)
+                        }
+                }
+                handler?.invoke(throwable)
+                appStateManager.endLoading()
             }
-            handler?.invoke(throwable)
-            appStateManager.endLoading()
         }
     }
-}
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/util/HabiticaScrollingLayoutCallback.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/util/HabiticaScrollingLayoutCallback.kt
index fc20fac0d..869f47c92 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/util/HabiticaScrollingLayoutCallback.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/util/HabiticaScrollingLayoutCallback.kt
@@ -8,10 +8,12 @@ import kotlin.math.abs
 private const val MAX_ICON_PROGRESS = 0.8f
 
 class HabiticaScrollingLayoutCallback : WearableLinearLayoutManager.LayoutCallback() {
-
     private var progressToCenter: Float = 0f
 
-    override fun onLayoutFinished(child: View, parent: RecyclerView) {
+    override fun onLayoutFinished(
+        child: View,
+        parent: RecyclerView,
+    ) {
         child.apply {
             // Figure out % progress from top to bottom
             val centerOffset = height.toFloat() / 2.0f / parent.height.toFloat()
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/util/ScrollAwayBehavior.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/util/ScrollAwayBehavior.kt
index 7af5fe6c0..60f0a59e1 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/util/ScrollAwayBehavior.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/util/ScrollAwayBehavior.kt
@@ -10,14 +10,13 @@ import kotlin.math.min
 
 class ScrollAwayBehavior<V : View>(context: Context, attrs: AttributeSet) :
     CoordinatorLayout.Behavior<V>(context, attrs) {
-
     override fun onStartNestedScroll(
         coordinatorLayout: CoordinatorLayout,
         child: V,
         directTargetChild: View,
         target: View,
         axes: Int,
-        type: Int
+        type: Int,
     ): Boolean {
         return axes == ViewCompat.SCROLL_AXIS_VERTICAL
     }
@@ -29,7 +28,7 @@ class ScrollAwayBehavior<V : View>(context: Context, attrs: AttributeSet) :
         dx: Int,
         dy: Int,
         consumed: IntArray,
-        type: Int
+        type: Int,
     ) {
         super.onNestedPreScroll(coordinatorLayout, child, target, dx, dy, consumed, type)
         child.translationY =
@@ -40,7 +39,7 @@ class ScrollAwayBehavior<V : View>(context: Context, attrs: AttributeSet) :
         coordinatorLayout: CoordinatorLayout,
         child: V,
         target: View,
-        type: Int
+        type: Int,
     ) {
         super.onStopNestedScroll(coordinatorLayout, child, target, type)
         if (child.translationY != 0f && child.translationY != child.height.toFloat()) {
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/util/TopScrollAwayBehavior.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/util/TopScrollAwayBehavior.kt
index a24facab5..1417c6e97 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/util/TopScrollAwayBehavior.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/util/TopScrollAwayBehavior.kt
@@ -10,14 +10,13 @@ import kotlin.math.min
 
 class TopScrollAwayBehavior<V : View>(context: Context, attrs: AttributeSet) :
     CoordinatorLayout.Behavior<V>(context, attrs) {
-
     override fun onStartNestedScroll(
         coordinatorLayout: CoordinatorLayout,
         child: V,
         directTargetChild: View,
         target: View,
         axes: Int,
-        type: Int
+        type: Int,
     ): Boolean {
         return axes == ViewCompat.SCROLL_AXIS_VERTICAL
     }
@@ -29,7 +28,7 @@ class TopScrollAwayBehavior<V : View>(context: Context, attrs: AttributeSet) :
         dx: Int,
         dy: Int,
         consumed: IntArray,
-        type: Int
+        type: Int,
     ) {
         super.onNestedPreScroll(coordinatorLayout, child, target, dx, dy, consumed, type)
         child.translationY = min(0f, -min(child.height.toFloat(), -child.translationY + dy))
@@ -39,7 +38,7 @@ class TopScrollAwayBehavior<V : View>(context: Context, attrs: AttributeSet) :
         coordinatorLayout: CoordinatorLayout,
         child: V,
         target: View,
-        type: Int
+        type: Int,
     ) {
         super.onStopNestedScroll(coordinatorLayout, child, target, type)
         if (child.translationY != 0f && abs(child.translationY) != child.height.toFloat()) {
diff --git a/wearos/src/test/java/com/habitrpg/wearos/habitica/ProjectConfig.kt b/wearos/src/test/java/com/habitrpg/wearos/habitica/ProjectConfig.kt
index a17933615..d52d0c836 100644
--- a/wearos/src/test/java/com/habitrpg/wearos/habitica/ProjectConfig.kt
+++ b/wearos/src/test/java/com/habitrpg/wearos/habitica/ProjectConfig.kt
@@ -19,19 +19,21 @@ object ProjectConfig : AbstractProjectConfig() {
     }
 
     private fun setupLiveData() {
-        ArchTaskExecutor.getInstance().setDelegate(object : TaskExecutor() {
-            override fun executeOnDiskIO(runnable: Runnable) {
-                runnable.run()
-            }
+        ArchTaskExecutor.getInstance().setDelegate(
+            object : TaskExecutor() {
+                override fun executeOnDiskIO(runnable: Runnable) {
+                    runnable.run()
+                }
 
-            override fun postToMainThread(runnable: Runnable) {
-                runnable.run()
-            }
+                override fun postToMainThread(runnable: Runnable) {
+                    runnable.run()
+                }
 
-            override fun isMainThread(): Boolean {
-                return true
-            }
-        })
+                override fun isMainThread(): Boolean {
+                    return true
+                }
+            },
+        )
     }
 
     private fun resetLiveData() {
diff --git a/wearos/src/test/java/com/habitrpg/wearos/habitica/data/repositories/TaskLocalRepositoryTest.kt b/wearos/src/test/java/com/habitrpg/wearos/habitica/data/repositories/TaskLocalRepositoryTest.kt
index 82693c560..d69eeb4de 100644
--- a/wearos/src/test/java/com/habitrpg/wearos/habitica/data/repositories/TaskLocalRepositoryTest.kt
+++ b/wearos/src/test/java/com/habitrpg/wearos/habitica/data/repositories/TaskLocalRepositoryTest.kt
@@ -11,40 +11,47 @@ class TaskLocalRepositoryTest : WordSpec({
     val repository = TaskLocalRepository()
     beforeEach {
         val list = TaskList()
-        list.tasks["1"] = Task().apply {
-            id = "1"
-            type = TaskType.HABIT
-        }
-        list.tasks["2"] = Task().apply {
-            id = "2"
-            type = TaskType.DAILY
-            isDue = true
-        }
-        list.tasks["3"] = Task().apply {
-            id = "3"
-            type = TaskType.DAILY
-            completed = true
-            isDue = true
-        }
-        list.tasks["4"] = Task().apply {
-            id = "4"
-            type = TaskType.DAILY
-            completed = false
-            isDue = true
-        }
-        list.tasks["5"] = Task().apply {
-            id = "5"
-            type = TaskType.TODO
-        }
-        list.tasks["6"] = Task().apply {
-            id = "6"
-            type = TaskType.TODO
-            completed = true
-        }
-        list.tasks["7"] = Task().apply {
-            id = "7"
-            type = TaskType.REWARD
-        }
+        list.tasks["1"] =
+            Task().apply {
+                id = "1"
+                type = TaskType.HABIT
+            }
+        list.tasks["2"] =
+            Task().apply {
+                id = "2"
+                type = TaskType.DAILY
+                isDue = true
+            }
+        list.tasks["3"] =
+            Task().apply {
+                id = "3"
+                type = TaskType.DAILY
+                completed = true
+                isDue = true
+            }
+        list.tasks["4"] =
+            Task().apply {
+                id = "4"
+                type = TaskType.DAILY
+                completed = false
+                isDue = true
+            }
+        list.tasks["5"] =
+            Task().apply {
+                id = "5"
+                type = TaskType.TODO
+            }
+        list.tasks["6"] =
+            Task().apply {
+                id = "6"
+                type = TaskType.TODO
+                completed = true
+            }
+        list.tasks["7"] =
+            Task().apply {
+                id = "7"
+                type = TaskType.REWARD
+            }
         repository.saveTasks(list, null)
     }
     "getTask" should {
@@ -58,11 +65,12 @@ class TaskLocalRepositoryTest : WordSpec({
 
     "updateTask" should {
         "update an existing task" {
-            val task = Task().apply {
-                id = "3"
-                type = TaskType.DAILY
-                completed = false
-            }
+            val task =
+                Task().apply {
+                    id = "3"
+                    type = TaskType.DAILY
+                    completed = false
+                }
             repository.updateTask(task)
             repository.getTask("3").test {
                 awaitItem()?.completed shouldBe false
@@ -71,10 +79,11 @@ class TaskLocalRepositoryTest : WordSpec({
         }
 
         "add new item if task does not exist" {
-            val task = Task().apply {
-                id = "33"
-                type = TaskType.DAILY
-            }
+            val task =
+                Task().apply {
+                    id = "33"
+                    type = TaskType.DAILY
+                }
             repository.updateTask(task)
             repository.getTaskCounts().test {
                 awaitItem()[TaskType.DAILY.value] shouldBe 4