From 5e429d7572eec43af5f9b4d3d972994f44ca24ba Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 14 Feb 2024 18:39:32 +0100
Subject: [PATCH] fix sprite substitution

---
 .../res/layout/fragment_report_message.xml    | 306 +++++++++---------
 Habitica/res/menu/menu_challenge_details.xml  |   2 +
 Habitica/res/values/strings.xml               |   3 +
 .../android/habitica/api/ApiService.kt        |   3 +
 .../android/habitica/data/ApiClient.kt        |   1 +
 .../habitica/data/ChallengeRepository.kt      |   1 +
 .../data/implementation/ApiClientImpl.kt      |   6 +
 .../implementation/ChallengeRepositoryImpl.kt |   7 +
 .../ui/activities/FullProfileActivity.kt      |   6 +-
 .../habitica/ui/activities/MainActivity.kt    |   7 +-
 .../ui/activities/TaskFormActivity.kt         |   6 +
 .../ui/activities/TaskSummaryActivity.kt      |   5 +-
 .../ui/fragments/NavigationDrawerFragment.kt  |   1 +
 .../ui/fragments/ReportBottomSheetFragment.kt |  68 +++-
 .../challenges/ChallengeDetailFragment.kt     |  15 +
 .../social/party/PartyDetailFragment.kt       |   5 +
 .../social/party/PartySeekingFragment.kt      |   5 +-
 .../habitica/ui/views/AppHeaderView.kt        |   9 +-
 .../habitica/ui/views/GroupPlanMemberList.kt  |  11 +-
 .../android/habitica/ui/views/UserRow.kt      |   5 +-
 .../ui/views/social/PartySeekingListItem.kt   |   7 +-
 .../habitica/ui/views/tasks/AssignSheet.kt    |   6 +-
 .../habitica/ui/views/tasks/AssignedView.kt   |   4 +
 .../common/habitica/views/AvatarView.kt       |   6 +-
 .../habitica/views/ComposableAvatarView.kt    |   6 +-
 .../res/drawable-hdpi/ic_gryphon_white.png    | Bin 0 -> 678 bytes
 .../res/drawable-hdpi/ic_gryphon_white.webp   | Bin 518 -> 0 bytes
 .../res/drawable-mdpi/ic_gryphon_white.png    | Bin 0 -> 451 bytes
 .../res/drawable-mdpi/ic_gryphon_white.webp   | Bin 366 -> 0 bytes
 .../res/drawable-xhdpi/ic_gryphon_white.png   | Bin 0 -> 887 bytes
 .../res/drawable-xhdpi/ic_gryphon_white.webp  | Bin 674 -> 0 bytes
 .../res/drawable-xxhdpi/ic_gryphon_white.png  | Bin 0 -> 1307 bytes
 .../res/drawable-xxhdpi/ic_gryphon_white.webp | Bin 970 -> 0 bytes
 .../res/drawable-xxxhdpi/ic_gryphon_white.png | Bin 0 -> 1806 bytes
 34 files changed, 322 insertions(+), 179 deletions(-)
 create mode 100644 common/src/main/res/drawable-hdpi/ic_gryphon_white.png
 delete mode 100644 common/src/main/res/drawable-hdpi/ic_gryphon_white.webp
 create mode 100644 common/src/main/res/drawable-mdpi/ic_gryphon_white.png
 delete mode 100644 common/src/main/res/drawable-mdpi/ic_gryphon_white.webp
 create mode 100644 common/src/main/res/drawable-xhdpi/ic_gryphon_white.png
 delete mode 100644 common/src/main/res/drawable-xhdpi/ic_gryphon_white.webp
 create mode 100644 common/src/main/res/drawable-xxhdpi/ic_gryphon_white.png
 delete mode 100644 common/src/main/res/drawable-xxhdpi/ic_gryphon_white.webp
 create mode 100644 common/src/main/res/drawable-xxxhdpi/ic_gryphon_white.png

diff --git a/Habitica/res/layout/fragment_report_message.xml b/Habitica/res/layout/fragment_report_message.xml
index 4644159b3..5d65ce580 100644
--- a/Habitica/res/layout/fragment_report_message.xml
+++ b/Habitica/res/layout/fragment_report_message.xml
@@ -1,176 +1,170 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    app:cardBackgroundColor="@color/material_card_background_color">
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="@drawable/bottom_sheet_background"
+    app:behavior_hideable="true">
+    <ImageView
+        android:layout_width="22dp"
+        android:layout_height="3dp"
+        android:layout_gravity="center_horizontal"
+        android:layout_margin="@dimen/spacing_large"
+        android:importantForAccessibility="no"
+        android:src="@color/offset_background" />
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/app_bar"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        app:elevation="0dp">
 
-    <LinearLayout
-        android:id="@+id/bottom_sheet"
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/material_card_background_color"
+            android:backgroundTint="@color/material_card_background_color"
+            android:minHeight="?attr/actionBarSize"
+            android:theme="@style/Toolbar"
+            app:layout_scrollFlags="scroll|enterAlways"
+            app:popupTheme="@style/ThemeOverlay.AppCompat.Dark"
+            app:theme="@style/ReportMessageToolbar"
+            app:title=""
+            android:paddingStart="24dp"
+            android:paddingEnd="8dp"
+            app:titleTextColor="@color/text_primary">
+
+            <TextView
+                android:id="@+id/toolbar_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="36dp"
+                android:fontFamily="sans-serif-medium"
+                android:text="@string/report_violation"
+                android:textColor="@color/text_primary"
+                android:textSize="20sp" />
+
+            <Button
+                android:id="@+id/report_button"
+                style="@style/Widget.AppCompat.Button.Borderless"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end"
+                android:layout_marginEnd="8dp"
+                android:enabled="false"
+                android:text="@string/report"
+                android:textAllCaps="false"
+                android:textColor="@color/text_dimmed"
+                android:textSize="18sp" />
+        </androidx.appcompat.widget.Toolbar>
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical"
-        app:behavior_hideable="true">
+        android:layout_marginBottom="0dp">
 
-        <ImageView
-            android:layout_width="22dp"
-            android:layout_height="3dp"
-            android:layout_gravity="center_horizontal"
-            android:layout_margin="@dimen/spacing_large"
-            android:src="@color/offset_background"
-            android:importantForAccessibility="no" />
-
-
-        <com.google.android.material.appbar.AppBarLayout
-            android:id="@+id/app_bar"
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            app:elevation="0dp">
-
-            <androidx.appcompat.widget.Toolbar
-                android:id="@+id/toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@color/material_card_background_color"
-                android:backgroundTint="@color/material_card_background_color"
-                android:minHeight="?attr/actionBarSize"
-                android:theme="@style/Toolbar"
-                app:layout_scrollFlags="scroll|enterAlways"
-                app:popupTheme="@style/ThemeOverlay.AppCompat.Dark"
-                app:theme="@style/ReportMessageToolbar"
-                app:title=""
-                app:titleTextColor="@color/text_primary">
-
-                <TextView
-                    android:id="@+id/toolbar_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="36dp"
-                    android:fontFamily="sans-serif-medium"
-                    android:text="@string/report_violation"
-                    android:textColor="@color/text_primary"
-                    android:textSize="20sp" />
-
-                <Button
-                    android:id="@+id/report_button"
-                    style="@style/Widget.AppCompat.Button.Borderless"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="end"
-                    android:layout_marginEnd="8dp"
-                    android:text="@string/report"
-                    android:textAllCaps="false"
-                    android:textColor="@color/red_100"
-                    android:textSize="18sp" />
-            </androidx.appcompat.widget.Toolbar>
-
-        </com.google.android.material.appbar.AppBarLayout>
-
-        <androidx.core.widget.NestedScrollView
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginBottom="0dp">
+            android:layout_marginBottom="0dp"
+            android:focusableInTouchMode="true"
+            android:orientation="vertical"
+            android:paddingStart="24dp"
+            android:paddingTop="16dp"
+            android:paddingEnd="24dp"
+            android:paddingBottom="25dp">
 
-            <LinearLayout
+            <com.google.android.material.card.MaterialCardView
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginBottom="0dp"
-                android:focusableInTouchMode="true"
-                android:orientation="vertical"
-                android:paddingStart="24dp"
-                android:paddingTop="16dp"
-                android:paddingEnd="24dp"
-                android:paddingBottom="25dp">
-
-                <com.google.android.material.card.MaterialCardView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    app:cardBackgroundColor="@color/material_card_background_color"
-                    app:cardCornerRadius="8dp"
-                    app:strokeColor="@color/gray200_gray400"
-                    app:strokeWidth="1dp">
-
-                    <TextView
-                        android:id="@+id/message_text_view"
-                        style="@style/Body2"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:gravity="center_vertical"
-                        android:lineSpacingExtra="4sp"
-                        android:paddingStart="13dp"
-                        android:paddingTop="11dp"
-                        android:paddingEnd="13dp"
-                        android:paddingBottom="11dp"
-                        android:textColor="@color/text_primary"
-                        tools:text="This is the message that is reported" />
-
-                </com.google.android.material.card.MaterialCardView>
+                android:layout_height="wrap_content"
+                app:cardBackgroundColor="@color/material_card_background_color"
+                app:cardCornerRadius="8dp"
+                app:strokeColor="@color/gray200_gray400"
+                app:strokeWidth="1dp">
 
                 <TextView
-                    android:id="@+id/report_reason_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/spacing_large"
-                    android:layout_marginBottom="@dimen/spacing_small"
-                    android:fontFamily="sans-serif-medium"
+                    android:id="@+id/message_text_view"
+                    style="@style/Body2"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:gravity="center_vertical"
+                    android:lineSpacingExtra="4sp"
+                    android:paddingStart="13dp"
+                    android:paddingTop="11dp"
+                    android:paddingEnd="13dp"
+                    android:paddingBottom="11dp"
                     android:textColor="@color/text_primary"
-                    android:textSize="16sp" />
+                    tools:text="This is the message that is reported" />
+
+            </com.google.android.material.card.MaterialCardView>
+
+            <TextView
+                android:id="@+id/report_reason_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/spacing_large"
+                android:layout_marginBottom="@dimen/spacing_small"
+                android:fontFamily="sans-serif-medium"
+                android:textColor="@color/text_primary"
+                android:textSize="16sp" />
 
 
-                <com.google.android.material.card.MaterialCardView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/spacing_small"
-                    android:layout_marginBottom="@dimen/spacing_small"
-                    app:cardBackgroundColor="@color/gray600_gray10"
-                    app:cardCornerRadius="8dp"
-                    app:strokeWidth="0dp">
-
-                    <androidx.appcompat.widget.AppCompatEditText
-                        android:id="@+id/additional_info_edittext"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="@color/transparent"
-                        android:fontFamily="sans-serif"
-                        android:gravity="center_vertical"
-                        android:hint="@string/report_hint"
-                        android:overScrollMode="always"
-                        android:padding="16dp"
-                        android:paddingTop="12dp"
-                        android:textColor="@color/text_primary"
-                        android:textColorHint="@color/gray200_gray400" />
-
-                </com.google.android.material.card.MaterialCardView>
-
-
-                <TextView
-                    android:id="@+id/additional_explanation_textview"
-                    style="@style/Caption3"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="@dimen/spacing_medium"
-                    android:fontFamily="sans-serif-medium"
-                    android:gravity="start"
-                    android:textColor="@color/text_ternary"
-                    android:textColorLink="?colorAccent"
-                    android:textSize="14sp"
-                    android:textStyle="bold"
-                    android:visibility="gone"
-                    tools:text="@string/report_user_description" />
-
-                <TextView
-                    android:id="@+id/report_explanation_textview"
-                    style="@style/Caption3"
+            <com.google.android.material.card.MaterialCardView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/spacing_small"
+                android:layout_marginBottom="@dimen/spacing_small"
+                app:cardBackgroundColor="@color/gray600_gray10"
+                app:cardCornerRadius="8dp"
+                app:strokeWidth="0dp">
+
+                <androidx.appcompat.widget.AppCompatEditText
+                    android:id="@+id/additional_info_edittext"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:background="@color/transparent"
                     android:fontFamily="sans-serif"
-                    android:gravity="start"
-                    android:textColor="@color/text_ternary"
-                    android:textColorLink="@color/purple400_purple500"
-                    android:textSize="14sp"
-                    tools:text="@string/report_message_explanation" />
-            </LinearLayout>
-        </androidx.core.widget.NestedScrollView>
-    </LinearLayout>
-</com.google.android.material.card.MaterialCardView>
+                    android:gravity="center_vertical"
+                    android:hint="@string/report_hint"
+                    android:overScrollMode="always"
+                    android:padding="16dp"
+                    android:paddingTop="12dp"
+                    android:textColor="@color/text_primary"
+                    android:textColorHint="@color/gray200_gray400" />
+
+            </com.google.android.material.card.MaterialCardView>
+
+
+            <TextView
+                android:id="@+id/additional_explanation_textview"
+                style="@style/Caption3"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/spacing_medium"
+                android:fontFamily="sans-serif-medium"
+                android:gravity="start"
+                android:textColor="@color/text_ternary"
+                android:textColorLink="?colorAccent"
+                android:textSize="14sp"
+                android:textStyle="bold"
+                android:visibility="gone"
+                tools:text="@string/report_user_description" />
+
+            <TextView
+                android:id="@+id/report_explanation_textview"
+                style="@style/Caption3"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif"
+                android:gravity="start"
+                android:textColor="@color/text_ternary"
+                android:textColorLink="@color/purple400_purple500"
+                android:textSize="14sp"
+                tools:text="@string/report_message_explanation" />
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
+</LinearLayout>
diff --git a/Habitica/res/menu/menu_challenge_details.xml b/Habitica/res/menu/menu_challenge_details.xml
index 33ad438bb..6ca33ca5b 100644
--- a/Habitica/res/menu/menu_challenge_details.xml
+++ b/Habitica/res/menu/menu_challenge_details.xml
@@ -14,4 +14,6 @@
     <item
         android:id="@+id/action_share"
         android:title="@string/share"/>
+    <item android:id="@+id/action_report"
+        android:title="@string/report_challenge" />
 </menu>
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 55992cfb5..3d4cefc20 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -811,11 +811,13 @@
     <string name="report_message_title">Report %s for violation:</string>
     <string name="report_message_explanation">You should only report a post that violates the [Community Guidelines](https://habitica.com/static/community-guidelines) and/or [Terms of Service](https://habitica.com/static/terms). Submitting a false report is a violation of Habitica\'s Community Guidelines.</string>
     <string name="report_user_explanation">You should only report a player that violates the [Community Guidelines](https://habitica.com/static/community-guidelines) and/or [Terms of Service](https://habitica.com/static/terms). Submitting a false report is a violation of Habitica\'s Community Guidelines.</string>
+    <string name="report_challenge_explanation">You should only report a challenge that violates the [Community Guidelines](https://habitica.com/static/community-guidelines) and/or [Terms of Service](https://habitica.com/static/terms). Submitting a false report is a violation of Habitica\'s Community Guidelines.</string>
     <string name="report_player_title">Report %s?</string>
     <string name="report_player">Report Player</string>
     <string name="report_hint">Reason for report</string>
     <string name="report_reason_title_message">Why are you reporting this message?</string>
     <string name="report_reason_title_player">Why are you reporting this player?</string>
+    <string name="report_reason_title_challenge">Why are you reporting this challenge?</string>
     <string name="report_formatted_name">%1$s\n@%2$s</string>
     <string name="report_user_description">This will also block @%s</string>
     <string name="report_message_hint">Reason for report</string>
@@ -1476,6 +1478,7 @@
     <string name="error_loading_member">Unable to find player</string>
     <string name="error_loading_member_body">There was an error when loading this player\'s data. Please make sure you typed their @username correctly.</string>
     <string name="preference_email_content_release">Content releases + Events</string>
+    <string name="report_challenge">Report Challenge</string>
 
 
     <plurals name="you_x_others">
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt
index 76bdd40cb..d757e7bba 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt
@@ -484,4 +484,7 @@ interface ApiService {
 
     @GET("looking-for-party")
     suspend fun retrievePartySeekingUsers(@Query("page") page: Int): HabitResponse<List<Member>>
+
+    @POST("challenges/{challengeId}/flag")
+    suspend fun reportChallenge(@Query("challengeId") challengeid: String, @Body updateData: Map<String, String>): HabitResponse<Void>
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.kt
index 723a1a310..dd456b7bc 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.kt
@@ -284,4 +284,5 @@ interface ApiClient {
     suspend fun retrievePartySeekingUsers(page: Int): List<Member>?
     suspend fun getGroupInvites(groupId: String, includeAllPublicFields: Boolean?): List<Member>?
     suspend fun syncUserStats(): User?
+    suspend fun reportChallenge(challengeid: String, updateData: Map<String, String>): Void?
 }
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 626216fb5..08e938bf4 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
@@ -44,4 +44,5 @@ interface ChallengeRepository : BaseRepository {
     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?
 }
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 9d5b8b701..e7bf61107 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
@@ -391,6 +391,12 @@ 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>
+    ): Void? {
+        return process { apiService.reportChallenge(challengeid, updateData) }
+    }
 
     override suspend fun getContent(language: String?): ContentResult? {
         return process { apiService.getContent(language ?: this.languageCode) }
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 0a900c4fb..3b74376c5 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
@@ -23,6 +23,13 @@ class ChallengeRepositoryImpl(
         return localRepository.isChallengeMember(currentUserID, challengeID)
     }
 
+    override suspend fun reportChallenge(
+        challengeid: String,
+        updateData: Map<String, String>
+    ): Void? {
+        return apiClient.reportChallenge(challengeid, updateData)
+    }
+
     override fun getChallengepMembership(id: String): Flow<ChallengeMembership> {
         return localRepository.getChallengeMembership(currentUserID, id)
     }
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 d8fca45ea..4218517eb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt
@@ -28,6 +28,7 @@ import com.habitrpg.android.habitica.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
@@ -83,6 +84,9 @@ class FullProfileActivity : BaseActivity() {
     @Inject
     lateinit var reviewManager: ReviewManager
 
+    @Inject
+    lateinit var configManager: AppConfigManager
+
     private var userID = ""
     private var username: String? = null
     private var userDisplayName: String? = null
@@ -109,7 +113,7 @@ class FullProfileActivity : BaseActivity() {
 
         binding.avatarWithBars.setContent {
             HabiticaTheme {
-                AppHeaderView(member.value, isMyProfile = false, onMemberRowClicked = {}, onClassSelectionClicked = {})
+                AppHeaderView(member.value, isMyProfile = false, onMemberRowClicked = {}, onClassSelectionClicked = {}, configManager = configManager)
             }
         }
 
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 ef32d7246..bfddc3412 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
@@ -311,7 +311,7 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
                                 verticalArrangement = Arrangement.spacedBy(4.dp),
                                 modifier = Modifier.padding(22.dp)
                             ) {
-                                ComposableAvatarView(avatar = user)
+                                ComposableAvatarView(avatar = user, configManager = appConfigManager)
                                 Column(
                                     horizontalAlignment = Alignment.CenterHorizontally,
                                     verticalArrangement = Arrangement.spacedBy(15.dp),
@@ -370,7 +370,7 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
                                 null
                             )
                             val members by viewModel.userViewModel.currentTeamPlanMembers.observeAsState()
-                            GroupPlanMemberList(members, group) {
+                            GroupPlanMemberList(members, group, appConfigManager) {
                                 onClose()
                                 FullProfileActivity.open(it)
                             }
@@ -383,7 +383,8 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
                         val intent = Intent(this@MainActivity, ClassSelectionActivity::class.java)
                         intent.putExtras(bundle)
                         classSelectionResult.launch(intent)
-                    }
+                    },
+                    configManager = appConfigManager
                 )
             }
         }
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 fb0daf80c..ebc8d39b6 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
@@ -41,6 +41,7 @@ import com.habitrpg.android.habitica.data.TaskRepository
 import com.habitrpg.android.habitica.databinding.ActivityTaskFormBinding
 import com.habitrpg.android.habitica.extensions.OnChangeTextWatcher
 import com.habitrpg.android.habitica.extensions.addCancelButton
+import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.helpers.TaskAlarmManager
 import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManager
 import com.habitrpg.android.habitica.models.Tag
@@ -115,6 +116,9 @@ class TaskFormActivity : BaseActivity() {
     @Inject
     lateinit var socialRepository: SocialRepository
 
+    @Inject
+    lateinit var configManager: AppConfigManager
+
     private var challenge: Challenge? = null
 
     private val notificationPermissionLauncher = registerForActivityResult(
@@ -325,6 +329,7 @@ class TaskFormActivity : BaseActivity() {
                                 task?.let { it1 -> taskRepository.markTaskNeedsWork(it1, it) }
                             }
                         },
+                        configManager = configManager,
                         showEditButton = true
                     )
                 }
@@ -962,6 +967,7 @@ class TaskFormActivity : BaseActivity() {
             AssignSheet(
                 groupMembers,
                 assignedIDs,
+                configManager,
                 {
                     if (assignedIDs.contains(it)) {
                         assignedIDs.remove(it)
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 da31f90bc..ca9a2b2ed 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
@@ -47,6 +47,7 @@ import com.habitrpg.android.habitica.R
 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
@@ -76,7 +77,8 @@ class TaskSummaryViewModel @Inject constructor(
     userRepository: UserRepository,
     userViewModel: MainUserViewModel,
     val taskRepository: TaskRepository,
-    val socialRepository: SocialRepository
+    val socialRepository: SocialRepository,
+    val configManager: AppConfigManager
 ) : BaseViewModel(userRepository, userViewModel) {
     val taskID: String = savedStateHandle[TaskFormActivity.TASK_ID_KEY] ?: ""
 
@@ -295,6 +297,7 @@ fun TaskSummaryView(viewModel: TaskSummaryViewModel) {
                                 .heightIn(min = 24.dp)
                                 .fillMaxWidth(),
                             color = darkestColor,
+                            configManager = viewModel.configManager,
                             extraContent = if (item.completed) {
                                 (
                                     {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt
index 86150a870..69852cb18 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt
@@ -133,6 +133,7 @@ class NavigationDrawerFragment : DialogFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         binding = DrawerMainBinding.bind(view)
+        binding?.avatarView?.configManager = configManager
 
         binding?.recyclerView?.adapter = adapter
         binding?.recyclerView?.layoutManager =
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 a7f5dde18..6de55440a 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
@@ -10,13 +10,17 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
+import androidx.core.content.ContextCompat
+import androidx.core.widget.addTextChangedListener
 import androidx.lifecycle.lifecycleScope
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 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
@@ -31,6 +35,8 @@ class ReportBottomSheetFragment : BottomSheetDialogFragment() {
 
     @Inject
     lateinit var socialRepository: SocialRepository
+    @Inject
+    lateinit var challengeRepository: ChallengeRepository
 
     private var reportType: String? = null
     private var messageID: String? = null
@@ -38,6 +44,7 @@ class ReportBottomSheetFragment : BottomSheetDialogFragment() {
     private var profileName: String? = null
     private var displayName: String? = null
     private var reportingUserId: String? = null
+    private var reportingChallengeId: String? = null
     private var groupID: String? = null
     private var isReporting: Boolean = false
     private var source: String? = null
@@ -71,15 +78,19 @@ class ReportBottomSheetFragment : BottomSheetDialogFragment() {
         profileName = arguments?.getString(PROFILE_NAME)
         displayName = arguments?.getString(DISPLAY_NAME)
         reportingUserId = arguments?.getString(REPORTING_USER_ID)
+        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)
+            if (reportType == REPORT_TYPE_MESSAGE) {
                 reportMessage()
-            else if (reportType == REPORT_TYPE_USER)
+            } else if (reportType == REPORT_TYPE_USER) {
                 reportUser()
+            } else if (reportType == REPORT_TYPE_CHALLENGE) {
+                reportChallenge()
+            }
         }
 
         if (reportType == REPORT_TYPE_USER) {
@@ -93,7 +104,8 @@ class ReportBottomSheetFragment : BottomSheetDialogFragment() {
                 )
             )
             binding.reportExplanationTextview.setMarkdown(getString(R.string.report_user_explanation))
-            val formattedString = getString(R.string.report_formatted_name, displayName, profileName)
+            val formattedString =
+                getString(R.string.report_formatted_name, displayName, profileName)
             val spannable = SpannableStringBuilder(formattedString)
             spannable.setSpan(
                 TypefaceSpan("sans-serif-medium"),
@@ -109,6 +121,14 @@ class ReportBottomSheetFragment : BottomSheetDialogFragment() {
             )
             binding.messageTextView.text = spannable
             binding.reportReasonTitle.text = getString(R.string.report_reason_title_player)
+        } else if (reportType == REPORT_TYPE_CHALLENGE) {
+            binding.toolbarTitle.text = getString(R.string.report_challenge)
+            binding.additionalExplanationTextview.visibility = View.VISIBLE
+            binding.additionalExplanationTextview.visibility = View.GONE
+            binding.additionalInfoEdittext.hint = getString(R.string.report_hint)
+            binding.reportExplanationTextview.setMarkdown(getString(R.string.report_challenge_explanation))
+            binding.messageTextView.text = displayName
+            binding.reportReasonTitle.text = getString(R.string.report_reason_title_challenge)
         } else if (reportType == REPORT_TYPE_MESSAGE) {
             binding.toolbarTitle.text = getString(R.string.report_message)
             binding.additionalExplanationTextview.visibility = View.GONE
@@ -117,6 +137,17 @@ class ReportBottomSheetFragment : BottomSheetDialogFragment() {
             binding.messageTextView.text = messageText
             binding.reportReasonTitle.text = getString(R.string.report_reason_title_message)
         }
+
+        binding.additionalInfoEdittext.addTextChangedListener { editable ->
+            binding.reportButton.isEnabled = !editable.isNullOrBlank()
+            binding.reportButton.setTextColor(
+                if (editable.isNullOrBlank()) {
+                    ContextCompat.getColor(requireContext(), R.color.text_dimmed)
+                } else {
+                    ContextCompat.getColor(requireContext(), R.color.text_red)
+                }
+            )
+        }
     }
 
     private fun reportMessage() {
@@ -162,12 +193,35 @@ class ReportBottomSheetFragment : BottomSheetDialogFragment() {
         }
     }
 
+    private fun reportChallenge() {
+        if (isReporting) {
+            return
+        }
+        val challengeId = reportingChallengeId
+        if (challengeId.isNullOrBlank()) {
+            return
+        }
+        isReporting = true
+        lifecycleScope.launchCatching {
+            val reportReasonInfo = binding.additionalInfoEdittext.text.toString()
+            val updateData = mapOf(
+                "comment" to reportReasonInfo,
+                "source" to (source ?: "")
+            )
+            challengeRepository.reportChallenge(challengeId, updateData)
+            Toast.makeText(context, "$displayName Reported", Toast.LENGTH_SHORT).show()
+            dismiss()
+        }
+    }
+
     companion object {
         const val TAG = "ReportBottomSheetFragment"
         const val REPORT_TYPE_MESSAGE = "report_type_message"
         const val REPORT_TYPE_USER = "report_type_user"
+        const val REPORT_TYPE_CHALLENGE = "report_type_challenge"
 
         private const val REPORTING_USER_ID = "reporting_user_id"
+        private const val REPORTING_CHALLENGE_ID = "reporting_challenge_id"
         private const val REPORT_TYPE = "report_type"
         private const val PROFILE_NAME = "profile_name"
         private const val DISPLAY_NAME = "display_name"
@@ -181,10 +235,11 @@ class ReportBottomSheetFragment : BottomSheetDialogFragment() {
             reportType: String,
             profileName: String = "",
             displayName: String = "",
-            userIdBeingReported: String,
+            challengeBeingReported: String = "",
+            userIdBeingReported: String = "",
             messageId: String = "",
-            messageText: String,
-            groupId: String,
+            messageText: String = "",
+            groupId: String = "",
             sourceView: String
         ): ReportBottomSheetFragment {
             val args = Bundle()
@@ -192,6 +247,7 @@ class ReportBottomSheetFragment : BottomSheetDialogFragment() {
             args.putString(PROFILE_NAME, profileName)
             args.putString(DISPLAY_NAME, displayName)
             args.putString(REPORTING_USER_ID, userIdBeingReported)
+            args.putString(REPORTING_CHALLENGE_ID, challengeBeingReported)
             args.putString(MESSAGE_ID, messageId)
             args.putString(MESSAGE_TEXT, messageText)
             args.putString(GROUP_ID, groupId)
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 fe4dc2c36..36dfed016 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
@@ -26,6 +26,7 @@ import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.ui.activities.ChallengeFormActivity
 import com.habitrpg.android.habitica.ui.activities.FullProfileActivity
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
+import com.habitrpg.android.habitica.ui.fragments.ReportBottomSheetFragment
 import com.habitrpg.android.habitica.ui.viewHolders.tasks.DailyViewHolder
 import com.habitrpg.android.habitica.ui.viewHolders.tasks.HabitViewHolder
 import com.habitrpg.android.habitica.ui.viewHolders.tasks.RewardViewHolder
@@ -193,6 +194,9 @@ class ChallengeDetailFragment : BaseMainFragment<FragmentChallengeDetailBinding>
             R.id.action_end_challenge -> {
                 showEndChallengeDialog()
             }
+            R.id.action_report -> {
+                showReportChallengeBottomSheet()
+            }
         }
 
         return super.onOptionsItemSelected(item)
@@ -217,6 +221,17 @@ class ChallengeDetailFragment : BaseMainFragment<FragmentChallengeDetailBinding>
         dialog.show()
     }
 
+    private fun showReportChallengeBottomSheet() {
+        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) }
+    }
+
     private fun refresh() {
         challengeID?.let { id ->
             lifecycleScope.launchCatching({
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 87be64b6e..3db3ef11d 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
@@ -21,6 +21,7 @@ import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.data.UserRepository
 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
@@ -83,6 +84,9 @@ class PartyDetailFragment : BaseFragment<FragmentPartyDetailBinding>() {
     @Inject
     lateinit var inventoryRepository: InventoryRepository
 
+    @Inject
+    lateinit var appConfigManager: AppConfigManager
+
     override fun onDestroyView() {
         inventoryRepository.close()
         super.onDestroyView()
@@ -136,6 +140,7 @@ class PartyDetailFragment : BaseFragment<FragmentPartyDetailBinding>() {
                             isInvited = true,
                             showHeader = true,
                             showExtendedInfo = false,
+                            configManager = appConfigManager,
                             onInvite = {
                                 viewModel.rescindInvite(invitedMember)
                             }
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 8e6d3f592..3db12aedb 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
@@ -55,6 +55,7 @@ import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.databinding.FragmentComposeBinding
 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.models.invitations.InviteResponse
@@ -83,7 +84,8 @@ import kotlin.time.toDuration
 class PartySeekingViewModel @Inject constructor(
     userRepository: UserRepository,
     userViewModel: MainUserViewModel,
-    val socialRepository: SocialRepository
+    val socialRepository: SocialRepository,
+    val configManager: AppConfigManager
 ) : BaseViewModel(userRepository, userViewModel) {
     val isRefreshing = mutableStateOf(false)
     val seekingUsers: Flow<PagingData<Member>>
@@ -259,6 +261,7 @@ fun PartySeekingView(
                     user = item,
                     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)
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 6686e940a..3df91b2b8 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
@@ -50,6 +50,7 @@ import androidx.compose.ui.unit.dp
 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
@@ -111,13 +112,15 @@ fun AppHeaderView(
     teamPlanMembers : List<Member>? = null,
     onAvatarClicked: (() -> Unit)? = null,
     onMemberRowClicked : () -> Unit,
-    onClassSelectionClicked: () -> Unit
+    onClassSelectionClicked: () -> Unit,
+    configManager: AppConfigManager
 ) {
     val isPlayerOptedOutOfClass = user?.preferences?.disableClasses ?: false
     Column(modifier) {
         Row {
             ComposableAvatarView(
                 user,
+                configManager,
                 Modifier
                     .size(110.dp, 100.dp)
                     .padding(end = 16.dp)
@@ -278,6 +281,7 @@ fun AppHeaderView(
                                 ) {
                                     ComposableAvatarView(
                                         avatar = member,
+                                        configManager,
                                         Modifier
                                             .size(64.dp)
                                             .requiredSize(64.dp)
@@ -404,7 +408,8 @@ private fun Preview(@PreviewParameter(UserProvider::class) data: Pair<User, Team
                 .background(HabiticaTheme.colors.contentBackground)
                 .padding(8.dp),
             onMemberRowClicked = { },
-            onClassSelectionClicked = { }
+            onClassSelectionClicked = { },
+            configManager = AppConfigManager(null)
         )
     }
 }
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 85d8cb83b..8082c09db 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
@@ -27,6 +27,7 @@ import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.models.auth.LocalAuthentication
 import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.models.social.Group
@@ -42,7 +43,8 @@ import kotlin.random.Random
 fun GroupPlanMemberList(
     members: List<Member>?,
     group: Group?,
-    onMemberClicked: (String) -> Unit
+    configManager: AppConfigManager,
+    onMemberClicked: (String) -> Unit,
 ) {
     LazyColumn {
         item {
@@ -73,6 +75,7 @@ fun GroupPlanMemberList(
                     member,
                     role,
                     onMemberClicked,
+                    configManager,
                     modifier = Modifier.padding(horizontal = 8.dp, vertical = 4.dp)
                 )
             }
@@ -85,6 +88,7 @@ fun MemberItem(
     member: Member,
     role: String,
     onMemberClicked: (String) -> Unit,
+    configManager: AppConfigManager,
     modifier: Modifier = Modifier
 ) {
     Box(
@@ -93,7 +97,7 @@ fun MemberItem(
             .clip(HabiticaTheme.shapes.large)
             .background(HabiticaTheme.colors.windowBackground)
             .clickable {
-                member.id?.let { onMemberClicked(it) }
+                onMemberClicked(member.id)
             }
     ) {
         Row(
@@ -102,6 +106,7 @@ fun MemberItem(
         ) {
             ComposableAvatarView(
                 avatar = member,
+                configManager = configManager,
                 modifier = Modifier
                     .padding(6.dp)
                     .size(94.dp, 98.dp)
@@ -221,5 +226,5 @@ private class MemberProvider : PreviewParameterProvider<Member> {
 @Composable
 @Preview
 private fun Preview(@PreviewParameter(MemberProvider::class) member: Member) {
-    MemberItem(member = member, role = "Manager", onMemberClicked = {})
+    MemberItem(member = member, role = "Manager", onMemberClicked = {}, AppConfigManager(null))
 }
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 98ece1432..2bf876c12 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
@@ -19,6 +19,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.common.habitica.views.ComposableAvatarView
 import com.habitrpg.shared.habitica.models.Avatar
 
@@ -30,7 +31,8 @@ fun UserRow(
     mainContentModifier: Modifier = Modifier,
     extraContent: @Composable (() -> Unit)? = null,
     endContent: @Composable (() -> Unit)? = null,
-    color: Color? = null
+    color: Color? = null,
+    configManager: AppConfigManager
 ) {
     Row(verticalAlignment = Alignment.CenterVertically, modifier = modifier.fillMaxWidth()) {
         Box(
@@ -43,6 +45,7 @@ fun UserRow(
             if (avatar != null) {
                 ComposableAvatarView(
                     avatar = avatar,
+                    configManager,
                     Modifier
                         .size(96.dp)
                         .requiredSize(96.dp)
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 a1cc051a5..7d1778fc9 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
@@ -25,6 +25,7 @@ import androidx.compose.ui.unit.dp
 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
@@ -53,7 +54,8 @@ fun PartySeekingListItem(
     isInvited: Boolean = false,
     showHeader: Boolean = false,
     showExtendedInfo: Boolean = true,
-    onInvite: (Member) -> Unit
+    configManager: AppConfigManager,
+    onInvite: (Member) -> Unit,
 ) {
     Column(
         modifier
@@ -72,6 +74,7 @@ fun PartySeekingListItem(
         ) {
             ComposableAvatarView(
                 user,
+                configManager,
                 Modifier
                     .size(94.dp, 98.dp)
                     .padding(top = 4.dp)
@@ -206,5 +209,5 @@ private class MemberProvider : PreviewParameterProvider<Member> {
 @Preview
 @Composable
 private fun Preview(@PreviewParameter(MemberProvider::class) data: Member) {
-    PartySeekingListItem(user = data, onInvite = {})
+    PartySeekingListItem(user = data, onInvite = {}, configManager = AppConfigManager(null))
 }
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 ea7b13e53..2e827f6f5 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
@@ -38,6 +38,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.ui.views.UserRow
 
@@ -45,6 +46,7 @@ import com.habitrpg.android.habitica.ui.views.UserRow
 fun AssignSheet(
     members: List<Member>,
     assignedMembers: List<String>,
+    configManager: AppConfigManager,
     onAssignClick: (String) -> Unit,
     onCloseClick: () -> Unit,
     modifier: Modifier = Modifier
@@ -71,7 +73,7 @@ fun AssignSheet(
         }
         for (member in members) {
             val isAssigned = assignedMembers.contains(member.id)
-            AssignSheetRow(member = member, isAssigned = isAssigned, onAssignClick = onAssignClick)
+            AssignSheetRow(member = member, isAssigned = isAssigned, configManager, onAssignClick = onAssignClick)
         }
     }
 }
@@ -80,6 +82,7 @@ fun AssignSheet(
 fun AssignSheetRow(
     member: Member,
     isAssigned: Boolean,
+    configManager: AppConfigManager,
     onAssignClick: (String) -> Unit,
     modifier: Modifier = Modifier
 ) {
@@ -96,6 +99,7 @@ fun AssignSheetRow(
         endContent = {
             IsAssignedIndicator(isAssigned = isAssigned)
         },
+        configManager = configManager,
         modifier = modifier
             .clickable {
                 onAssignClick(member.id)
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 0aa27fb8d..252c3cca2 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
@@ -26,11 +26,13 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 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 java.util.Date
 
 @Composable
@@ -41,6 +43,7 @@ fun AssignedView(
     color: Color,
     onEditClick: () -> Unit,
     onUndoClick: (String) -> Unit,
+    configManager: AppConfigManager,
     modifier: Modifier = Modifier,
     showEditButton: Boolean = false
 ) {
@@ -67,6 +70,7 @@ fun AssignedView(
                 extraContent = {
                     completedAt[assignable.id]?.let { CompletedAt(completedAt = it) }
                 },
+                configManager = configManager,
                 endContent = {
                     completedAt[assignable.id]?.let {
                         if (showEditButton) {
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 fda8480cf..dcb0bd7a7 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
@@ -12,6 +12,7 @@ import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
 import android.text.TextUtils
 import android.util.AttributeSet
+import android.util.Log
 import android.widget.FrameLayout
 import android.widget.ImageView
 import androidx.core.view.marginStart
@@ -48,6 +49,8 @@ class AvatarView : FrameLayout {
     private var avatarCanvas: Canvas? = null
     private var currentLayers: Map<LayerType, String>? = null
 
+    var configManager: AppConfigManager? = null
+
     private val layerMap: Map<LayerType, String>
         get() {
             val avatar = this.avatar ?: return emptyMap()
@@ -57,7 +60,8 @@ class AvatarView : FrameLayout {
     private var spriteSubstitutions: Map<String, Map<String, String>> = HashMap()
         get() {
             if (Date().time - (lastSubstitutionCheck?.time ?: 0) > 180000) {
-                field = AppConfigManager().spriteSubstitutions()
+                field = (configManager ?: AppConfigManager()).spriteSubstitutions()
+                Log.i("AvatarView", field.toString())
                 lastSubstitutionCheck = Date()
             }
             return field
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 4460df251..3b36640fb 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
@@ -3,17 +3,21 @@ package com.habitrpg.common.habitica.views
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.viewinterop.AndroidView
+import com.habitrpg.common.habitica.helpers.AppConfigManager
 import com.habitrpg.shared.habitica.models.Avatar
 
 @Composable
 fun ComposableAvatarView(
     avatar: Avatar?,
+    configManager: AppConfigManager,
     modifier: Modifier = Modifier
 ) {
     AndroidView(
         modifier = modifier, // Occupy the max size in the Compose UI tree
         factory = { context ->
-            AvatarView(context)
+            val view = AvatarView(context)
+            view.configManager = configManager
+            return@AndroidView view
         },
         update = { view ->
             if (avatar != null) {
diff --git a/common/src/main/res/drawable-hdpi/ic_gryphon_white.png b/common/src/main/res/drawable-hdpi/ic_gryphon_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4725cc99c443842c3cfdfbd4e71e6c3bee06d2e
GIT binary patch
literal 678
zcmV;X0$KfuP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00009a7bBm000o2
z000o20Vd5lGynhq0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0y{}WK~#7F?N-rI
z!!Qh0IsOS7m<fOl!US{!vH{tk-5}i{VS<(kQYL6ONSUDBKuEQFb$zjHCmbJK-<>XX
zEy<E4SpvA?zW@;nqK-(xAL3Tn%ZL<FOGdp+CX*c`g5+}gyc#_RqA#PDsY%kw%J7U0
zQ5GSij9f*uM;RTYfDLezc2f9gZ;t7Bf)tRz!co8mmVyIqoE=9!9j4|d>Jao@JuBm+
z&jdLimKYI!$*3~mY2D|kAXC6tU|fF8A`Plz4xAcK>wr-m%E&GLF4lP8VMhe`I5#+V
zTJ+~uhH?(syvldb=~d=KazhFtKzxmJ&<5kHtqUo)J(~-Bg`pC|VGQBoExLt7pf1@8
z^z%O!E6^>)dzgJgr^l=8;d{dIH`5!gP;+H^bT_CeZt3%Yx~fim+(f4k4|ZOO4Ho;W
zgOjvCtE4@$GfYPb0i{y8wt`HH!?1Goxgp~OTbtj?kmvw?+7O?BJNJ(pdqMF$5b-ef
zLdy>bqaI;QFK!ZemAycnQ#lO7)_gzR4XMi3aB0jN88M~XJH<VR;ou0ct_Fqz^}DpN
z)(sBBMmi@dWTfOB^jouqIP5^*!adP5T;}69i~;JggwZ(vFFZHUVgJCkH2dLsNHC@{
zO6EO#g~y=Eqigyb2C=t$&tB~@DEIK^X1|4@!1D_{$Mc+22*#iZO=V;=OIP9Ww2}ip
zgA|VI>ZPU2H<w@Bm^craPRw1MhbRT<Gmu@C4e07~;h%@DxMBc)0Em>^ljsD}t^fc4
M07*qoM6N<$g3fX&bpQYW

literal 0
HcmV?d00001

diff --git a/common/src/main/res/drawable-hdpi/ic_gryphon_white.webp b/common/src/main/res/drawable-hdpi/ic_gryphon_white.webp
deleted file mode 100644
index d98990a20713b35b57e1b6acd2d29abe468ea9d8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 518
zcmV+h0{Q(?Nk&Hg0RRA3MM6+kP&iET0RR9mBftm{x1^wL8z%fo@1*50|MRaPZ37nV
zPm$ZU4RRVC^fv%Afma|PDDQz3q@i8{e+LD>$hj}&J(0>_2LsxLrRqS?4*=5inB%~~
zkPKsvwt<`Q+%rNHc&_pSAwjln)2>!*+qP}nww-+2Mr^DO-+lIZc`b<O{{+BYJ=~&l
z%pJ<v?*_T#$m7M4T=KDqZz>H+s?F1Qo{)T#tVvjXpje>53`t&11Utf7JJ)Y$T+zf_
z(s?$M0{Fe4c3XokfqdA?gir5x!>j2E6_zFPe!>HIA>8`H(xdlMA}4_F0{c8nfz62k
z5Z=Ca@cf)4Yw%m*POu@4b&mA@hWg?Ej+@bQ1D|?J!M%Bf!9W^a+bjXq%mJ|CnkSm6
z7Jr2Na><R4f{X+bKDpvNN;NkM_zj*~-TOktD*y;=-1zgLVzDWv>Z`%&JFHqZ0nbQ|
z3uRBwseY?T$;!(ARs^7pwtE`q<S>wYYc*uy`LYt2rR{Z$#l(RJ@Wtk?9{S<Wp@7GY
z%?Ieae?|cCq3wHJ=0z$1c$seI3(8+xEiOR3mi}b`@Y&}_-R6LFC_H4tnRNeE*YVNc
z;qg~^4f(^d&hOoij{Ka4U5Xc7UGszREIDFt-DIH&0sY@-o7qG0PyxUvBqBN{R_PlQ
ID@N%a73TE_r2qf`

diff --git a/common/src/main/res/drawable-mdpi/ic_gryphon_white.png b/common/src/main/res/drawable-mdpi/ic_gryphon_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..580e97d7fae2764b84c311da8d1b5c54ce01c113
GIT binary patch
literal 451
zcmV;!0X+VRP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0a!^yK~#7F?Nse?
zgD?y=cO8HcJOU%o4cH)T5H=v4pxJ<SgLDE$pq&6Vpc|-C5RI!!w)3~wclQp?mh|*t
z+qpjn0C++6ci5N2Tzhgj!-hU$<B=V5gd1l5b}4~6aOxuoSeRT!6{E<k75fdhQsRWH
zas(>mDx68^7}&I8e~kqs<604!l`O}g3W?qlAPf=lvuGO)_y{^Ckf#c^!JarsCH6|*
zZy+C?mFb>cCB*N+2%_Cm;A$lHJXbh?J{PcjErFE-mWt2>X_T5k!{vp?(+B(7(Y4^6
z1^9VdLV+3b@jb%_MdKB@AZuicq*l?tcWFE!KZ~MxPg?FR<NsF4a^-4gE%Q|H13NYm
z0Uy}!4`BM)hV7)t0P>OzhR-hnZ3ep$IbFX<`Nq)grrUbKelPAeAG)OE^nvRaS}2@e
t1vwuAF$-@PsN+^X2kQ&2Ke~V9;0tTaV_3_Wkv;$b002ovPDHLkV1nwAxPJfu

literal 0
HcmV?d00001

diff --git a/common/src/main/res/drawable-mdpi/ic_gryphon_white.webp b/common/src/main/res/drawable-mdpi/ic_gryphon_white.webp
deleted file mode 100644
index 24145a0aab402136ba6abc67f726ef3b3d20b9d3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 366
zcmV-!0g?VvNk&Fy0RRA3MM6+kP&iCk0RR9m7r+G&zk{G{+n7J;tJy)!|NJX#+Xlt!
zm=(5d+aT#)>>HprfCU5qUw!))VE7o_6a<wh$won-6CCHK0kE@x@fqL%WFo}&4FCp1
zpuo)+6VLhSbA!J~oFXLb{|6x2wr#rEF=~gkZMU&%+m6}p{~zz%H_|_d=>G)ZABXMr
z+P-nrX^9W*DuchfX}}`6$o!OGo_!<9xP&{B*OMm1Y7`$8z6wcxE*Mu{HNg=DMsw7L
z5GDE73o+RR*yaLzBv%t8SzQ$l`diRb%m0$(uZF)~4T1q+pZcRx<pho^eP<H$$1rYw
z==gIA<F~8<fNSPf;<A8^`{w{)PnD<)O90LcNKxmis__)fzdEuGh4b8l3F;h!Y`X9P
z3(`-K^eJX`0ZePk^ROP#uh?1xFrrxp&`=&!v_37n`wlfb(~IaVM8<{$v;{6-zB4(o
M<13v`zf1K607Mq7=>Px#

diff --git a/common/src/main/res/drawable-xhdpi/ic_gryphon_white.png b/common/src/main/res/drawable-xhdpi/ic_gryphon_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b847d1d7ec651cf4e381d66672845f013c0c9c0
GIT binary patch
literal 887
zcmV--1Bm>IP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0}M$-K~#7F?U~VW
z+b|43;a>ieZop1ZcY>-D#2Zu_)SV#C1a>EoJ3*2O<PG8t=uY5nfC49~rWuL^Me44-
z)4RjTkw_3EAP`~zW@cuBAfh5UlWgICgbc6o!UIeI>0OdkyjV~gquk~zWI{UbNLD1R
z@vhCQk#dXX86;^ECJdGFX5-Npqk<gFO1X$u#;kNMJIEnmM1zsI#V%Yl=Fvb7#)u)e
zYmz$BpTlQ|ohMtAg%G!CNH!!($c2=wBLixZZz#wl)Mk%yqI$+mqD2`^$N+(!SC|4!
zkLSiW5xVyj>Br%72UCDuJZqGr-ASM<gwl3?>^2W=q>8j<PwY^RcKUCG{Th_M3r@#c
z*oVEbN0~>~R=-#X*=Uqxp)nJ1`m<NKo~h9vA{^H%(<YVk&?FX?0lY%}i*rwMG{0XK
zi^VgfO-9j0Ls<@F#~1hJP5*-)?kod7)1|iB1t(xUrmS1{P#&)bZlDZo@Cv5m_t1lP
z5Qk%SV?+(Kc?=Cw01llG;?_94Q*Hu%`izuXDodz_#+7(L1ieEilA7c_{mH^B#w+(7
z@<|KNfCn10(kelh!hFt<0?LZETA=3v%Y~HkjZrEKxrQscJi$Qf8wu+=xi^O<@Y8Bs
z!F7%gf?XBart}dqt~$l*W0hzK(fut>gLk}QS;!c#=(2`sIQnkpOu%=vQbAez6#RqI
z^AW~?mnyRtt|<G=QaNo?%H$Z&MrSY)M6(dhoJ)j*V<>Md>;dI8S5S_F89%u4W7FuZ
zxw`d_G*g`5lIaxq7h_z=gurfBZH<dHzWvtKg3#c4>CU6u{md-6hx|R{Jr5ag+Qi-g
z9T}sw+A4`%qAY}$ot0OPUH^%TH&4@F5mk?o=P!_mG>ul!#VE)8+Pv64ZX<ePpQg#*
z6w(Q({>PB<#!D3plWN?`(p@2D95v$gNdm|D8ZUbSml_Sqs!nai`PMUzd)CySRrQR2
zu~B{)mBP{)qm8tG^M3;IK0u+v6WBvn>wJVVxal<Z5+lsa%*^~#`~h-;opZ+`A{GDu
N002ovPDHLkV1hosmEiyY

literal 0
HcmV?d00001

diff --git a/common/src/main/res/drawable-xhdpi/ic_gryphon_white.webp b/common/src/main/res/drawable-xhdpi/ic_gryphon_white.webp
deleted file mode 100644
index ffb6eddd649d9d451512dc609fb112e9360b39ac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 674
zcmV;T0$u%5Nk&GR0ssJ4MM6+kP&iDE0ssInFTe{Br=_568z%fo@3kF;`JaCUZQHPT
z>6^l~ZJX|0<_)+SKr;wrAISQ&kof=%Qif?R!}c5)JPddsnS{CbK)OB%ut?S*unhsC
zKE)l+AtRji3lJ;<AV!k&=^hTG-L`G)&5mu`wp}+)>c+N{y0LBBcH8q0pXZ|b9?|~^
zz<<%i=}+^&4Ee*n>BR5Paw0kn{G-f>=rZb0!Z8uur_0b!D9v>;3VfAkFVarRRwEI;
z7e~b0HWi3gq4iiU^XF^Cn<k*Sq(U?hsrG*DfCTFVkjx;ON;3ptGf$$8A{zZHqLX3^
zz_9F$=WeJcP6RgF97Jas0QBR2GJg3&rt>lnQN0FW@QZP4C<Ug?KY6GCa3yw+C7+Lv
zwE}P{8ogjq9NanRFp7)lt(uNDprxOsb`|EqLqFoB<lL`L%v}-l=Q$T$J8;Cr_$4PP
zTz=8-tmOa#=uUyA-*T!e!+iU9PzWEbuBHMAxcnVi0z|I?AYen@!8@T(Pf`GwR^Lmy
z*U%Cox`fiPVn+)3LK*<?%<ArKp-L`YI|l(}u+SzKpsV;*s-b3@KYc;s#(Y{eH8nL~
ze!W!j+9jz1>Lq&$t6h@1519{12S6>!ZI;ro2*B({lD~|IpN|0~lH58-3_foGfKoXh
zwIzg}cj_oQ<fK8|`=U<|%CCQj+4i&{WNdYOzm`<=(-Z0+c=jJ?0ycw0lrFZ=3uYt7
zgf)~#b3~b9hb^os*0C+r!-;amhUYaHZ&-O?&rqINDwS!eXn$ip;`mJMVw&x=Qj!#%
zQn*6wz4Gd=**d^F`<!m_a~np2xS;WDh2#cm9}shq4}ja#qPEV#(TT~a3El{Uk?}G0
IAq|m#G=L&RP5=M^

diff --git a/common/src/main/res/drawable-xxhdpi/ic_gryphon_white.png b/common/src/main/res/drawable-xxhdpi/ic_gryphon_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..2648df11c06fa4fb9f73c0177ffc46301c377c28
GIT binary patch
literal 1307
zcmV+$1?2jPP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00009a7bBm001F4
z001F40Y#QEU;qFB0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1h7d&K~#7F?VIma
z8!-&PmA-y&Izi0@WrJQPD4n3`1e6I#CxA`>oq#ey(g}bG?lyo<pi0<zTn?ZA$o3tt
z_3u4D9v7eN$hIuW4nU<+sZ=We6^M9-nlq?82lu&vf0);h&We=OEf$OKFcZ|iqCbuK
z_kqeS^`{%uS<<rym;!37#pis138D5Hp1oA=(ay$vzUkFzshmP-sF6!chqx1mP!OY(
zGlx<_`35E721Xjrq9l^Bq@q|Bl@+>YiUgLmgi@H!yGR-#v@hY@9EJ4d6$mf}aO<eT
z%OGW~mmA$DR7fR}f(+N5&(~%qD2V3-%2Rd_P}_-6yKow-DAWddgL!F<%qx@)TpZNM
zI<j-8l8&Lac{`&m;f6{BQ-gXIwHVI@3U@n<r^S*xRzQavl*1#tifk{I4a^P3Ej1f$
zh@#N%Uf8&SmjK$mYl)(c9BnKyp0ZA144IU~oI2W&c+`2)GN`9;(<=%h!Sv;}qZyIk
zqKxz)6)mF!0#GZu#WY&9EDcPPyTKIy$0iXHKpkjqP|n&SGc{=C_hqr7O&VkX^^9U=
zo#TFfCgjVgo*b#8Xd`~f*`z>0%oq0AtQNIBJi`1@zIP@q1|2@9Kks{w6qR38?t0HS
zy}E^rlpY8NoPs?Nr()4QrCZ1d>iBF<R<8c}lJ?n>+|-dP`g3Sx?&R|Sb31X)_H&$S
zctIVQ24(PG8j^%r^oY|MzXf*&a%ws%U#a{AZDU7SxIRR^#oBBRf8qY}`|LAxMixib
z3g+jU`kOwZF+6&1BIM<Y*HQ>hfk<c2kdHB2zmdy!siE=?o|f&>JfDKM$tSItc?Jcx
z$tjH+EYCWmKPjggeX?!UW>h;U&xepoxt3T5`@7T+vvWm*`i%b)rXg*ap)AE2Jbedk
zl{n_{;oZq5aTI-^&iIwRP+&*-D$K4R)EBT;Fb~RC!KolVgQqX>8TO4ZZ^Ors0n|B}
z70kyQUj^?BA|>s);;0RGvVx49HO$K&Uxi%TyoC7=^a9+8QVM$K`Vh5asbGG*u1F~b
zaeCC{JWhI_(a^zu<bIhuGx`XIUszZ>WQ4q*o5r-wVGIY%(<kb1KLLL~Qb%%poXR~2
z$-2a7%C6xlPxN>Z(^74!XuXdp>|sjSplo^UjNE~ctO_zSM)e+*P}Y_TJFf?(e5As+
z{5!`xuFs}{lyi*xC#Dx8^`sZBSoX@%J}>F>k#`%I3)B(+X3(K_#QvmY2!euHw5N0%
zm;<!m;@}&kOUFBsT`c$)MQFc$t6&Z+%2^5D^PwODd_JS2-tQwe(ncAo_vnPS`OC1k
zqm1Tu_|v8U#JkpzlwGVJF7Snha|lO8)cp<d40lhl?=^WePcx5GB`V^T4$?Wa^rQGs
z5r(@(<EhWa^9<v;+1U`(cZ4{cIrOx3HIVV>BH+_KqYLxA^~rLcYIr))!1J8W7PMQ>
zi71}tJW8Ck+Z__-Wc08S_1);uWyR*<07`)QZnR3+jPyz3Ml@sJG06s*;FNDkbTB<R
zgWl2nlz52^F{8j`ch+7y-@;4dE7<$OUiT*mgH6G8go{$CR4SE9rBbN?`~{>;vxZ^<
ROjG~>002ovPDHLkV1n4uasL1S

literal 0
HcmV?d00001

diff --git a/common/src/main/res/drawable-xxhdpi/ic_gryphon_white.webp b/common/src/main/res/drawable-xxhdpi/ic_gryphon_white.webp
deleted file mode 100644
index 4159a87205ddc7304593a1254405154631430e8d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 970
zcmV;*12z0oNk&G(0{{S5MM6+kP&iDr0{{RoN5Byfho+!y8!7xrZ+F+{Ak6>#6G+<P
zZ@VJ5Z5#NM(U$!NYzFuUcqF$vfy+4n1fjRrc!vS$O{x$o{23s%sLEM@2MPkwfI_nG
z0Xa_r6-`tG;sZ1<0NIjco3_=*KIhuDZQHhO+qP}nwsowv`=8cabB?jDUL*QH0r=02
zs`{r$;i^AG8aemRkV10uA0eJ3r~C<!Lz2_~1h;%#5%v46F>r6vZ`aSnn-x?_k3aS3
z>iDV|wTJAycdDIG$zl_~c91K-I-k~FCmEa$U}Qy-O!CZZx;~GV=@&%4?B*6#Yx*Y&
zHkOHdXF*<UVKd<V-KUw99VLVDR^*jFu>sXHDL!2&;gucvVNOK@T6`B9FNDr6WZ{mw
zK2$s`)k+HMok$+23V;1&FI*n?tWdf%#N#guFmF;6{81b2iYr1l?TP@oC)S5qc9~I1
zNZcmDol(Anb{wGv^n4}2nZBzI-kdls#PvH_=oIM&;JO2Ozox*=n>W{307z;%eD=~M
zi>?OoS8d>|6SF$HkvwOUnhaxwbryVI8&};}&`RkfKU_b1{Mu*Q7rvn6my#~Oe*HRZ
zvy>rT=>i~O(V|7IO;w6Rl%3(0MskV?YeU4rIwe1bXrB%`M#A$^=KY;JcWU`CH9V{&
z;%{KU((ts_!l3MM+$(4**0yBH5<XNr6NX%*LyY7P1JLER9!nz>K=W-swFZX;h-)+Z
z*z0123j#^|_U(HrVT>u?=8+Vuy7?E00cG!qjaBjHMO!5eKJqq~@*7mh?KYj?P<N+H
zqY?g*8;dwFXp~3g<ubt|c`Kl6gxaHZQs~7PN`9ky9i3D%(Xg26&!F3l&*4w_p*Kz^
z_AaLxdQtsNqRuM5PBpAnD{2qb8O&)2;|;CMHc*{SuRF}2w6;Ta0lh&m$9P&>ROT`=
z1c531jfRpF5S;oO)yU&&Sf+@4*)(zXr4StA(|DVxh})-;aRAWtg<-2)xd{8iI>%{$
zDVWPV_HC2v$>J2duP&>j5L_dd<PN!E{095i4kx2wJDucSxgPYA?QYoRSAunF7I|E*
zT!e${4%zL2;~w&=9M1D=HJi96c5_^2k{=c77xKrbq=5RDXn#K)K;>4=VoiHUHU<z^
zx1<F6=98Jn=8qXUb@LNCXWo2}Me=eKkUr`>NoF10eJP6{D@dT;73#ME9@74>2+(ZZ
sYpr=GN7on`0A-u>pS*D0uKh<&ojH5%^eN}wNZxn$#1Y%=(PICL0MKXMX#fBK

diff --git a/common/src/main/res/drawable-xxxhdpi/ic_gryphon_white.png b/common/src/main/res/drawable-xxxhdpi/ic_gryphon_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..9badec52367969f383a71fa49add8872b932a18b
GIT binary patch
literal 1806
zcmV+p2l4ocP)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h00009a7bBm001mY
z001mY0i`{bsQ>@~0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH2BS$tK~#7F?VbO1
z+cpr#zwYb*^#(yEh&w@<3F=HxWr8>pSe_ut1X3n&I)T&);!Z$%g18f0aRC`AGDrZ#
zfdupLc@Iy|B1D2X;Ba^NVW3bb6bgkxp-?CkMnFVLr&_14I(^XT5{2o|6~3h(`GSHM
zzd#0c_V*R{1QeY73K<?P-`!{-JYHN}Y>+vv%B)}-Ql~y2IO*~?mi(OWNnd+H4(I~i
zP(Kwigv-^AS2Yc@Z}V}wZ^yass#d2J=0+Fddf)}Pz*oqC)>ydpsPs^7F(<kJmyQCm
z5EN#Bh2K{Cp3+ib1Q!s3jO8=b(i@%LXubJ>1hfKX{jJ*cN~dcab$V(J`rTe*E_4NK
zJX#6&glh;xMnC63u&|}fQ0B8o9xfmcWYRiQArBM+5fgy!eh2;GYnH9aIByCv{Ea*a
zHZ~-C0P`^*?@FgV37BzO_&fda3G>rnPRMNy^|6)c4f-D3vuc`$nnsKPVph;eCG7Oa
zUl_+ur#qYX8CZr2Mjf112$xAgh69Y+`y5+VamYA3Un!0)2|I5z>@0?`M()sXXd;9?
z3Ay@YLJzUjSPCTTdDdjSS%s14->xX0ErgM_f=+o0f3wtu(rK+zO|s_e>?9LFJ2<_8
zJS)s62=Sm|${x@;XYY}Q6^tOJj6`x^Z+X+LWbE^l+`B4<<gB23ED<u6QLK47#MbeA
zMRJJsx(iD|-@&fyKE{TU$>{7o(gn}n_f3Je&z3YJH~Lxf>UBWsKG9C!XQT=la1Xoe
zd8T9!=%^{uVGJ3Be}fRZ<*fAwPhM~fY9I$!{>{KOX_QVpFDz#W3`l#AM3C`PcO=s*
ztka()<A@Exf`|{s@tu0|PBP`zzQk3Vluj>TTJL#qZ3rH#UU$nz+IxOM`iYw#o;!*G
z2`B3T0c8s@XKOO1=c;X;QxO!du=N10=*p6prE2qRn<+!G{D#P%*R2yO0~rfqKOpr<
zyhD<6rc&eG3%snLwuS#QkVPy;LPpq}E>FJWnKrgG#G{dksC+X@tqqNa%yJd3;M0o7
zLh;rJNrQ2LOu2|E8*&oB4$G$t)il08kP^V3h@`a|a#&h2mbdyHe%GHbVZ3}Vqy%si
zV+owz2gg>lG`^La4VDl`ETsxsArLNj+lub6JQPNd(-`obHdx19nS*r)EQ1Oo@Lrfj
zW<5+$)K6EW<nnig;})XMTIym%V;6!+!fNMbXdEaTKfp!n3^ulFWLD$N9joHTz^3#r
z<VRVmpb?CZKFSij_aSKy&@J<sRU;atIudOL3-Je1L2@e_HV}f$M9!Y_A}B64hYEUy
zNXP`|*w5$-ozF=Xl6f(Ma0gj}cA23<GB0WnCKHn8g;6;N?NmtS5CJrpk+$;J$e*Cq
zBi<^A_hIQuI9M(zByN>toUk>1LW0JCp1I#fR}h<;71A;Lf`C+HKL(IlDygs>{tL;x
zghBWQ%OWV8K8FC5Z$>iv!@Ton!XYH{ECL|^lSOifa`y3r=P{^VXsAU>0HMJ!XIPt#
zr&#4k12bR2se5-;J;BS>r99y~3=5%K>)F9EoXXK!#MT-m;M2*vQ?7IcvtJ;WsO)p-
zdC+X*$S<|mI0Y4im~sp_Kgh!sx>d*&$&mV#0ysC%T%Pj_<ca92jVYs{=N0bKmnj2o
z4UVy`kbMWtBLtaJ0OyvE=!<y30%tY2I}fRlnM7fSkJX}b+()zrB!~K!wyzw&yC*q#
zgNE`ftLwST@yvB$-;sT9uyb0H%$_j`Y6{%HK*I+R22Z?C4w)&#zLvD}yob~rw899e
ze_K<9oM|iHR(S3S-rbjEb~Uas66!x+s6x)r^P}vEJazEdeXb~un&QqE;)Y~Xp9;A`
z_EyUk5o}V@_yYhtqPH`Vy(f!?NTeMxTl8|&zFC2|O2`qKef(?rPSih<7QlJyco@5d
zmEv^mQ>rtnAsix+7Jy{yh&g{jDk^CUhvXZjwG3Llr<V-e<J+n?ibo+5>bK^UB`^Ct
z_cZ63c4W8xL%h&ik~`F?CKJ-;&D|eP?z<<?3Znk9)O4)uttDUW`wY>ObIIuKz9l5A
zlUX%1XWw_5EEJ~0dGH7sYbWNvLGb}s(}yi6{rPZGRF3zEbp*ZCulRgGyT5A*o9rsb
zb%i*%@>i}*NhV}YHresM-(2TOUDnJ2@hDdY@zc|7wB7ym&?T|s&mwRhLP#cLK6cj&
wuaMhhce;9^P$(1%g+ifFC=?2XLSZ)k2U#Ym<dL+txBvhE07*qoM6N<$f?&o<o&W#<

literal 0
HcmV?d00001