From c5473c58bcad3f93c56008778987f137e2abcd1c Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Tue, 17 May 2022 15:16:19 +0200
Subject: [PATCH] Move AvatarView to common module

# Conflicts:
#	Habitica/res/layout/dialog_pet_suggest_hatch.xml
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AdventureGuideActivity.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxOverviewFragment.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogBackgroundContent.kt
#	common/src/main/java/com/habitrpg/common/habitica/views/AvatarView.kt
---
 Habitica/build.gradle                         |    1 +
 Habitica/res/layout/achievement_grid_item.xml |    2 +-
 Habitica/res/layout/achievement_list_item.xml |    2 +-
 Habitica/res/layout/activity_armoire.xml      |    2 +-
 .../res/layout/activity_class_selection.xml   |    8 +-
 Habitica/res/layout/activity_full_profile.xml |    4 +-
 .../res/layout/activity_gift_subscription.xml |    2 +-
 Habitica/res/layout/adventure_guide_item.xml  |    2 +-
 Habitica/res/layout/avatar_with_bars.xml      |    2 +-
 Habitica/res/layout/can_hatch_item.xml        |    4 +-
 Habitica/res/layout/chat_item.xml             |    2 +-
 .../res/layout/customization_grid_item.xml    |    2 +-
 .../res/layout/dialog_achievement_detail.xml  |    2 +-
 .../layout/dialog_completed_quest_content.xml |    2 +-
 Habitica/res/layout/dialog_faint.xml          |    2 +-
 Habitica/res/layout/dialog_first_drop.xml     |    4 +-
 Habitica/res/layout/dialog_levelup.xml        |    2 +-
 .../res/layout/dialog_login_incentive.xml     |    2 +-
 .../res/layout/dialog_open_mysteryitem.xml    |    2 +-
 .../res/layout/dialog_pet_suggest_hatch.xml   |    4 +-
 .../layout/dialog_purchase_content_gear.xml   |    2 +-
 .../layout/dialog_purchase_content_item.xml   |    2 +-
 .../layout/dialog_purchase_content_quest.xml  |    2 +-
 .../layout/dialog_purchase_customization.xml  |    2 +-
 Habitica/res/layout/dialog_purchase_gems.xml  |    2 +-
 Habitica/res/layout/dialog_won_challenge.xml  |    2 +-
 Habitica/res/layout/drawer_main.xml           |    2 +-
 .../res/layout/equipment_overview_item.xml    |    2 +-
 .../res/layout/fragment_challenge_detail.xml  |    2 +-
 .../res/layout/fragment_gift_gem_balance.xml  |    2 +-
 .../res/layout/fragment_gift_gem_purchase.xml |    2 +-
 Habitica/res/layout/fragment_guild_detail.xml |    2 +-
 Habitica/res/layout/fragment_party_detail.xml |    4 +-
 Habitica/res/layout/fragment_quest_detail.xml |    2 +-
 Habitica/res/layout/fragment_setup_avatar.xml |    2 +-
 Habitica/res/layout/fragment_setup_tasks.xml  |    2 +-
 Habitica/res/layout/fragment_subscription.xml |    2 +-
 Habitica/res/layout/gear_list_item.xml        |    2 +-
 Habitica/res/layout/item_image_row.xml        |    2 +-
 Habitica/res/layout/item_inbox_overview.xml   |    2 +-
 Habitica/res/layout/item_item.xml             |    2 +-
 Habitica/res/layout/mount_overview_item.xml   |    2 +-
 Habitica/res/layout/party_member.xml          |    2 +-
 Habitica/res/layout/pet_detail_item.xml       |    2 +-
 Habitica/res/layout/pet_imageview.xml         |    2 +-
 Habitica/res/layout/pet_overview_item.xml     |    2 +-
 .../res/layout/profile_achievement_item.xml   |    2 +-
 Habitica/res/layout/profile_gear_tablerow.xml |    2 +-
 .../res/layout/purchase_dialog_background.xml |    2 +-
 Habitica/res/layout/quest_collect.xml         |    2 +-
 Habitica/res/layout/quest_progress.xml        |    4 +-
 Habitica/res/layout/row_quest_reward.xml      |    2 +-
 Habitica/res/layout/row_shopitem.xml          |    2 +-
 Habitica/res/layout/skill_list_item.xml       |    2 +-
 .../res/layout/tavern_chat_intro_item.xml     |    2 +-
 Habitica/res/layout/view_invitation.xml       |    2 +-
 Habitica/res/values/attrs.xml                 |    7 -
 .../data/implementation/UserRepositoryImpl.kt |    2 +-
 .../habitica/extensions/RxJava-Extensions.kt  |    1 +
 .../habitica/helpers/AppConfigManager.kt      |    4 +-
 .../habitica/helpers/UserStatComputer.kt      |    3 +-
 .../habitica/interactors/FeedPetUseCase.kt    |    4 +-
 .../habitica/interactors/HatchPetUseCase.kt   |    4 +-
 .../habitica/interactors/LevelUpUseCase.kt    |    2 +-
 .../interactors/ShowNotificationInteractor.kt |    4 +-
 .../android/habitica/models/Avatar.kt         |   22 -
 .../android/habitica/models/members/Member.kt |    2 +-
 .../habitica/models/members/MemberFlags.kt    |    2 +-
 .../models/members/MemberPreferences.kt       |    5 +-
 .../habitica/models/social/UserStyles.kt      |    6 +-
 .../android/habitica/models/user/Buffs.kt     |   21 +-
 .../android/habitica/models/user/Flags.kt     |    3 +-
 .../android/habitica/models/user/Hair.kt      |   19 +-
 .../android/habitica/models/user/Outfit.kt    |   35 +-
 .../habitica/models/user/Preferences.kt       |    2 +-
 .../android/habitica/models/user/Stats.kt     |   32 +-
 .../android/habitica/models/user/User.kt      |    2 +-
 .../habitica/ui/AvatarWithBarsViewModel.kt    |    5 +-
 .../android/habitica/ui/ItemDetailDialog.kt   |    4 +-
 .../ui/activities/AdventureGuideActivity.kt   |    1 +
 .../habitica/ui/activities/ArmoireActivity.kt |    2 +-
 .../ui/activities/FullProfileActivity.kt      |    4 +-
 .../habitica/ui/activities/MainActivity.kt    |    2 +-
 .../ui/adapter/AchievementsAdapter.kt         |    4 +-
 ...stomizationEquipmentRecyclerViewAdapter.kt |    4 +-
 .../CustomizationRecyclerViewAdapter.kt       |    1 +
 .../ui/adapter/SkillsRecyclerViewAdapter.kt   |    2 +-
 .../inventory/EquipmentRecyclerViewAdapter.kt |    2 +-
 .../adapter/inventory/ItemRecyclerAdapter.kt  |    2 +-
 .../inventory/PetDetailRecyclerAdapter.kt     |    2 +-
 .../inventory/StableRecyclerAdapter.kt        |    4 +-
 .../social/AchievementProfileAdapter.kt       |    2 +-
 .../habitica/ui/fragments/AboutFragment.kt    |    2 +-
 .../inventory/items/ItemDialogFragment.kt     |    2 +-
 .../inventory/items/ItemRecyclerFragment.kt   |    2 +-
 .../purchases/SubscriptionFragment.kt         |    2 +-
 .../fragments/social/InboxOverviewFragment.kt |    3 +-
 .../fragments/social/QuestDetailFragment.kt   |    2 +-
 .../social/party/NoPartyFragmentFragment.kt   |    4 +-
 .../social/party/PartyDetailFragment.kt       |    6 +-
 .../ui/viewHolders/ChatRecyclerViewHolder.kt  |    2 +-
 .../ui/viewHolders/MountViewHolder.kt         |    2 +-
 .../habitica/ui/viewHolders/PetViewHolder.kt  |    2 +-
 .../ui/viewHolders/ShopItemViewHolder.kt      |    2 +-
 .../habitica/ui/viewmodels/GroupViewModel.kt  |    4 +-
 .../habitica/ui/viewmodels/InboxViewModel.kt  |    4 +-
 .../habitica/ui/views/EquipmentItemRow.kt     |    2 +-
 .../habitica/ui/views/HabiticaProgressBar.kt  |    2 +-
 .../habitica/ui/views/NPCBannerView.kt        |    2 +-
 .../views/dialogs/AchievementDetailDialog.kt  |    4 +-
 .../ui/views/dialogs/AchievementDialog.kt     |    2 +-
 .../ui/views/dialogs/FirstDropDialog.kt       |    4 +-
 .../ui/views/dialogs/PetSuggestHatchDialog.kt |    4 +-
 .../dialogs/QuestCompletedDialogContent.kt    |    4 +-
 .../ui/views/dialogs/WonChallengeDialog.kt    |    4 +-
 .../views/equipment/EquipmentOverviewItem.kt  |    2 +-
 .../shops/PurchaseDialogBackgroundContent.kt  |    1 -
 .../views/shops/PurchaseDialogBaseContent.kt  |    2 +-
 .../ui/views/shops/PurchaseDialogContent.kt   |    6 +-
 .../PurchaseDialogCustomizationContent.kt     |    2 +-
 .../PurchaseDialogCustomizationSetContent.kt  |    4 +-
 .../views/shops/PurchaseDialogGearContent.kt  |    2 +-
 .../views/shops/PurchaseDialogGemsContent.kt  |    2 +-
 .../views/shops/PurchaseDialogItemContent.kt  |    2 +-
 .../views/shops/PurchaseDialogQuestContent.kt |    4 +-
 .../ui/views/social/OldQuestProgressView.kt   |    2 +-
 .../ui/views/social/QuestProgressView.kt      |    4 +-
 .../widget/AvatarStatsWidgetProvider.kt       |    2 +-
 common/.gitignore                             |    1 +
 common/build.gradle                           |   46 +
 common/consumer-rules.pro                     |    0
 common/proguard-rules.pro                     |   21 +
 .../habitica/ExampleInstrumentedTest.kt       |   24 +
 common/src/main/AndroidManifest.xml           |    5 +
 .../habitica/extensions}/DataBindingUtils.kt  |   10 +-
 .../extensions/Drawable-Extendsions.kt        |    0
 .../habitica/extensions/Int-Extensions.kt     |    0
 .../common}/habitica/extensions/Optional.kt   |    2 +-
 .../habitica/extensions/String-Extensions.kt  |    0
 .../habitica/helpers/AppConfigManager.kt      |    9 +
 .../habitrpg/common/habitica/models/Avatar.kt |   17 +
 .../common/habitica/models/AvatarBuffs.kt     |   14 +
 .../common}/habitica/models/AvatarFlags.kt    |    4 +-
 .../common/habitica/models/AvatarHair.kt      |   14 +
 .../common/habitica/models/AvatarOutfit.kt    |   30 +
 .../habitica/models/AvatarPreferences.kt      |    8 +-
 .../common/habitica/models/AvatarStats.kt     |   23 +
 .../common/habitica/views}/AvatarView.kt      | 1014 +++++++++--------
 .../common/habitica}/views/PixelArtView.kt    |    2 +-
 .../main/res/drawable/layout_rounded_bg.xml   |    6 +
 common/src/main/res/values/attrs.xml          |    9 +
 .../common/habitica/ExampleUnitTest.kt        |   17 +
 settings.gradle                               |    4 +-
 wearos/.gitignore                             |    1 +
 wearos/build.gradle                           |   39 +
 wearos/proguard-rules.pro                     |   21 +
 wearos/src/main/AndroidManifest.xml           |   39 +
 .../habitrpg/wearos/habitica/MainActivity.kt  |   17 +
 wearos/src/main/res/layout/activity_main.xml  |   26 +
 .../src/main/res/mipmap-hdpi/ic_launcher.webp |  Bin 0 -> 1404 bytes
 .../src/main/res/mipmap-mdpi/ic_launcher.webp |  Bin 0 -> 982 bytes
 .../main/res/mipmap-xhdpi/ic_launcher.webp    |  Bin 0 -> 1900 bytes
 .../main/res/mipmap-xxhdpi/ic_launcher.webp   |  Bin 0 -> 2884 bytes
 .../main/res/mipmap-xxxhdpi/ic_launcher.webp  |  Bin 0 -> 3844 bytes
 wearos/src/main/res/values-round/strings.xml  |    3 +
 wearos/src/main/res/values/dimens.xml         |   15 +
 wearos/src/main/res/values/strings.xml        |    8 +
 167 files changed, 1131 insertions(+), 772 deletions(-)
 delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/models/Avatar.kt
 create mode 100644 common/.gitignore
 create mode 100644 common/build.gradle
 create mode 100644 common/consumer-rules.pro
 create mode 100644 common/proguard-rules.pro
 create mode 100644 common/src/androidTest/java/com/habitrpg/common/habitica/ExampleInstrumentedTest.kt
 create mode 100644 common/src/main/AndroidManifest.xml
 rename {Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers => common/src/main/java/com/habitrpg/common/habitica/extensions}/DataBindingUtils.kt (95%)
 rename {Habitica/src/main/java/com/habitrpg/android => common/src/main/java/com/habitrpg/common}/habitica/extensions/Drawable-Extendsions.kt (100%)
 rename {Habitica/src/main/java/com/habitrpg/android => common/src/main/java/com/habitrpg/common}/habitica/extensions/Int-Extensions.kt (100%)
 rename {Habitica/src/main/java/com/habitrpg/android => common/src/main/java/com/habitrpg/common}/habitica/extensions/Optional.kt (82%)
 rename {Habitica/src/main/java/com/habitrpg/android => common/src/main/java/com/habitrpg/common}/habitica/extensions/String-Extensions.kt (100%)
 create mode 100644 common/src/main/java/com/habitrpg/common/habitica/helpers/AppConfigManager.kt
 create mode 100644 common/src/main/java/com/habitrpg/common/habitica/models/Avatar.kt
 create mode 100644 common/src/main/java/com/habitrpg/common/habitica/models/AvatarBuffs.kt
 rename {Habitica/src/main/java/com/habitrpg/android => common/src/main/java/com/habitrpg/common}/habitica/models/AvatarFlags.kt (54%)
 create mode 100644 common/src/main/java/com/habitrpg/common/habitica/models/AvatarHair.kt
 create mode 100644 common/src/main/java/com/habitrpg/common/habitica/models/AvatarOutfit.kt
 rename {Habitica/src/main/java/com/habitrpg/android => common/src/main/java/com/habitrpg/common}/habitica/models/AvatarPreferences.kt (65%)
 create mode 100644 common/src/main/java/com/habitrpg/common/habitica/models/AvatarStats.kt
 rename {Habitica/src/main/java/com/habitrpg/android/habitica/ui => common/src/main/java/com/habitrpg/common/habitica/views}/AvatarView.kt (89%)
 rename {Habitica/src/main/java/com/habitrpg/android/habitica/ui => common/src/main/java/com/habitrpg/common/habitica}/views/PixelArtView.kt (97%)
 create mode 100644 common/src/main/res/drawable/layout_rounded_bg.xml
 create mode 100644 common/src/main/res/values/attrs.xml
 create mode 100644 common/src/test/java/com/habitrpg/common/habitica/ExampleUnitTest.kt
 create mode 100644 wearos/.gitignore
 create mode 100644 wearos/build.gradle
 create mode 100644 wearos/proguard-rules.pro
 create mode 100644 wearos/src/main/AndroidManifest.xml
 create mode 100644 wearos/src/main/java/com/habitrpg/wearos/habitica/MainActivity.kt
 create mode 100644 wearos/src/main/res/layout/activity_main.xml
 create mode 100644 wearos/src/main/res/mipmap-hdpi/ic_launcher.webp
 create mode 100644 wearos/src/main/res/mipmap-mdpi/ic_launcher.webp
 create mode 100644 wearos/src/main/res/mipmap-xhdpi/ic_launcher.webp
 create mode 100644 wearos/src/main/res/mipmap-xxhdpi/ic_launcher.webp
 create mode 100644 wearos/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
 create mode 100644 wearos/src/main/res/values-round/strings.xml
 create mode 100644 wearos/src/main/res/values/dimens.xml
 create mode 100644 wearos/src/main/res/values/strings.xml

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 478f70b74..58ba32d0e 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -142,6 +142,7 @@ dependencies {
     implementation 'com.willowtreeapps:signinwithapplebutton:0.3'
 
     implementation project(':shared')
+    implementation project(':common')
 
     ktlint('com.pinterest:ktlint:0.45.2') {
         attributes {
diff --git a/Habitica/res/layout/achievement_grid_item.xml b/Habitica/res/layout/achievement_grid_item.xml
index ff310f861..f888c452c 100644
--- a/Habitica/res/layout/achievement_grid_item.xml
+++ b/Habitica/res/layout/achievement_grid_item.xml
@@ -22,7 +22,7 @@
         <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="66dp">
-            <com.habitrpg.android.habitica.ui.views.PixelArtView
+            <com.habitrpg.common.habitica.views.PixelArtView
                 android:id="@+id/achievement_icon"
                 android:layout_width="64dp"
                 android:layout_height="56dp"
diff --git a/Habitica/res/layout/achievement_list_item.xml b/Habitica/res/layout/achievement_list_item.xml
index 3cbfd37ad..9197112d7 100644
--- a/Habitica/res/layout/achievement_list_item.xml
+++ b/Habitica/res/layout/achievement_list_item.xml
@@ -9,7 +9,7 @@
 <RelativeLayout
     android:layout_width="100dp"
     android:layout_height="86dp">
-    <com.habitrpg.android.habitica.ui.views.PixelArtView
+    <com.habitrpg.common.habitica.views.PixelArtView
         android:id="@+id/achievement_icon"
         android:layout_width="64dp"
         android:layout_height="56dp"
diff --git a/Habitica/res/layout/activity_armoire.xml b/Habitica/res/layout/activity_armoire.xml
index 148227aab..15e6339d5 100644
--- a/Habitica/res/layout/activity_armoire.xml
+++ b/Habitica/res/layout/activity_armoire.xml
@@ -48,7 +48,7 @@
                 android:layout_height="158dp"
                 android:layout_centerInParent="true"
                 android:src="@drawable/circle_gray_700" />
-            <com.habitrpg.android.habitica.ui.views.PixelArtView
+            <com.habitrpg.common.habitica.views.PixelArtView
                 android:id="@+id/icon_view"
                 android:layout_width="136dp"
                 android:layout_height="136dp"
diff --git a/Habitica/res/layout/activity_class_selection.xml b/Habitica/res/layout/activity_class_selection.xml
index 98892185f..c9e70c404 100644
--- a/Habitica/res/layout/activity_class_selection.xml
+++ b/Habitica/res/layout/activity_class_selection.xml
@@ -36,7 +36,7 @@
                 android:orientation="vertical"
                 android:gravity="center_horizontal"
                 android:layout_marginEnd="48dp">
-                <com.habitrpg.android.habitica.ui.AvatarView
+                <com.habitrpg.common.habitica.views.AvatarView
                     android:id="@+id/healerAvatarView"
                     android:layout_width="75dp"
                     android:layout_height="75dp"
@@ -60,7 +60,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
                 android:gravity="center_horizontal">
-                <com.habitrpg.android.habitica.ui.AvatarView
+                <com.habitrpg.common.habitica.views.AvatarView
                     android:id="@+id/mageAvatarView"
                     android:layout_width="75dp"
                     android:layout_height="75dp"
@@ -92,7 +92,7 @@
                 android:orientation="vertical"
                 android:gravity="center_horizontal"
                 android:layout_marginEnd="48dp">
-                <com.habitrpg.android.habitica.ui.AvatarView
+                <com.habitrpg.common.habitica.views.AvatarView
                     android:id="@+id/rogueAvatarView"
                     android:layout_width="75dp"
                     android:layout_height="75dp"
@@ -116,7 +116,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
                 android:gravity="center_horizontal">
-                <com.habitrpg.android.habitica.ui.AvatarView
+                <com.habitrpg.common.habitica.views.AvatarView
                     android:id="@+id/warriorAvatarView"
                     android:layout_width="75dp"
                     android:layout_height="75dp"
diff --git a/Habitica/res/layout/activity_full_profile.xml b/Habitica/res/layout/activity_full_profile.xml
index 718d5f018..7e14d606a 100644
--- a/Habitica/res/layout/activity_full_profile.xml
+++ b/Habitica/res/layout/activity_full_profile.xml
@@ -350,7 +350,7 @@
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 tools:text="#" />
-                            <com.habitrpg.android.habitica.ui.views.PixelArtView
+                            <com.habitrpg.common.habitica.views.PixelArtView
                                 android:id="@+id/current_pet_drawee"
                                 android:layout_width="40dp"
                                 android:layout_height="40dp"/>
@@ -369,7 +369,7 @@
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 tools:text="#" />
-                            <com.habitrpg.android.habitica.ui.views.PixelArtView
+                            <com.habitrpg.common.habitica.views.PixelArtView
                                 android:id="@+id/current_mount_drawee"
                                 android:layout_width="40dp"
                                 android:layout_height="40dp"/>
diff --git a/Habitica/res/layout/activity_gift_subscription.xml b/Habitica/res/layout/activity_gift_subscription.xml
index 8ad042ac1..d10e84f86 100644
--- a/Habitica/res/layout/activity_gift_subscription.xml
+++ b/Habitica/res/layout/activity_gift_subscription.xml
@@ -29,7 +29,7 @@
             android:layout_height="wrap_content"
             android:orientation="vertical"
             android:layout_marginTop="@dimen/spacing_large">
-            <com.habitrpg.android.habitica.ui.AvatarView
+            <com.habitrpg.common.habitica.views.AvatarView
                 android:id="@+id/avatar_view"
                 android:layout_width="88dp"
                 android:layout_height="84dp"
diff --git a/Habitica/res/layout/adventure_guide_item.xml b/Habitica/res/layout/adventure_guide_item.xml
index a102cdccf..5e8fda011 100644
--- a/Habitica/res/layout/adventure_guide_item.xml
+++ b/Habitica/res/layout/adventure_guide_item.xml
@@ -4,7 +4,7 @@
     android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
-    <com.habitrpg.android.habitica.ui.views.PixelArtView
+    <com.habitrpg.common.habitica.views.PixelArtView
         android:id="@+id/icon_view"
         android:layout_width="52dp"
         android:layout_height="56dp"
diff --git a/Habitica/res/layout/avatar_with_bars.xml b/Habitica/res/layout/avatar_with_bars.xml
index 6d6392915..d5382ea8e 100644
--- a/Habitica/res/layout/avatar_with_bars.xml
+++ b/Habitica/res/layout/avatar_with_bars.xml
@@ -14,7 +14,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <com.habitrpg.android.habitica.ui.AvatarView
+        <com.habitrpg.common.habitica.views.AvatarView
             android:id="@+id/avatarView"
             android:layout_width="@dimen/avatar_header_width"
             android:layout_height="@dimen/avatar_header_height"
diff --git a/Habitica/res/layout/can_hatch_item.xml b/Habitica/res/layout/can_hatch_item.xml
index 3fad4f3cb..028180e31 100644
--- a/Habitica/res/layout/can_hatch_item.xml
+++ b/Habitica/res/layout/can_hatch_item.xml
@@ -18,13 +18,13 @@
             android:layout_width="86dp"
             android:layout_height="68dp"
             android:layout_gravity="center">
-            <com.habitrpg.android.habitica.ui.views.PixelArtView
+            <com.habitrpg.common.habitica.views.PixelArtView
                 android:id="@+id/hatchingPotion_view"
                 android:layout_width="72dp"
                 android:layout_height="72dp"
                 android:layout_alignParentTop="true"
                 android:layout_alignParentEnd="true" />
-            <com.habitrpg.android.habitica.ui.views.PixelArtView
+            <com.habitrpg.common.habitica.views.PixelArtView
                 android:id="@+id/egg_view"
                 android:layout_width="72dp"
                 android:layout_height="72dp"
diff --git a/Habitica/res/layout/chat_item.xml b/Habitica/res/layout/chat_item.xml
index 36bd4bba6..ddd6c770d 100644
--- a/Habitica/res/layout/chat_item.xml
+++ b/Habitica/res/layout/chat_item.xml
@@ -16,7 +16,7 @@
         android:clipChildren="true"
         android:layout_marginEnd="@dimen/spacing_medium"
         android:background="@drawable/rounded_avatar_bg">
-        <com.habitrpg.android.habitica.ui.AvatarView
+        <com.habitrpg.common.habitica.views.AvatarView
             android:id="@+id/avatar_view"
             android:layout_width="60dp"
             android:layout_height="60dp"
diff --git a/Habitica/res/layout/customization_grid_item.xml b/Habitica/res/layout/customization_grid_item.xml
index f597cb722..9380199f9 100644
--- a/Habitica/res/layout/customization_grid_item.xml
+++ b/Habitica/res/layout/customization_grid_item.xml
@@ -11,7 +11,7 @@
     <FrameLayout
         android:layout_width="76dp"
         android:layout_height="76dp">
-        <com.habitrpg.android.habitica.ui.views.PixelArtView
+        <com.habitrpg.common.habitica.views.PixelArtView
             android:id="@+id/imageView"
             android:layout_width="60dp"
             android:layout_height="68dp"
diff --git a/Habitica/res/layout/dialog_achievement_detail.xml b/Habitica/res/layout/dialog_achievement_detail.xml
index a2ec0a12a..5c3b429ce 100644
--- a/Habitica/res/layout/dialog_achievement_detail.xml
+++ b/Habitica/res/layout/dialog_achievement_detail.xml
@@ -16,7 +16,7 @@
             android:layout_width="41dp"
             android:layout_height="wrap_content"
             android:src="@drawable/sparkles_left" />
-        <com.habitrpg.android.habitica.ui.views.PixelArtView
+        <com.habitrpg.common.habitica.views.PixelArtView
             android:id="@+id/icon_view"
             android:layout_width="52dp"
             android:layout_height="56dp"
diff --git a/Habitica/res/layout/dialog_completed_quest_content.xml b/Habitica/res/layout/dialog_completed_quest_content.xml
index 0f2dd0b1b..105ef3bf3 100644
--- a/Habitica/res/layout/dialog_completed_quest_content.xml
+++ b/Habitica/res/layout/dialog_completed_quest_content.xml
@@ -46,7 +46,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"/>
-    <com.habitrpg.android.habitica.ui.views.PixelArtView
+    <com.habitrpg.common.habitica.views.PixelArtView
         android:id="@+id/imageView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/Habitica/res/layout/dialog_faint.xml b/Habitica/res/layout/dialog_faint.xml
index c294131b2..0ecee4463 100644
--- a/Habitica/res/layout/dialog_faint.xml
+++ b/Habitica/res/layout/dialog_faint.xml
@@ -13,7 +13,7 @@
         app:barForegroundColor="@color/hpColor"
         app:description="@string/HP_default" />
 
-    <com.habitrpg.android.habitica.ui.AvatarView
+    <com.habitrpg.common.habitica.views.AvatarView
         android:layout_width="@dimen/avatar_small_width"
         android:layout_height="@dimen/avatar_small_height"
         android:id="@+id/avatarView"
diff --git a/Habitica/res/layout/dialog_first_drop.xml b/Habitica/res/layout/dialog_first_drop.xml
index 27f213c83..66561804f 100644
--- a/Habitica/res/layout/dialog_first_drop.xml
+++ b/Habitica/res/layout/dialog_first_drop.xml
@@ -15,7 +15,7 @@
             android:layout_height="80dp"
             android:background="@drawable/layout_rounded_bg_window"
             android:layout_marginEnd="@dimen/spacing_large">
-            <com.habitrpg.android.habitica.ui.views.PixelArtView
+            <com.habitrpg.common.habitica.views.PixelArtView
                 android:id="@+id/egg_view"
                 android:layout_width="@dimen/gear_image_size"
                 android:layout_height="@dimen/gear_image_size"
@@ -25,7 +25,7 @@
             android:layout_width="80dp"
             android:layout_height="80dp"
             android:background="@drawable/layout_rounded_bg_window">
-            <com.habitrpg.android.habitica.ui.views.PixelArtView
+            <com.habitrpg.common.habitica.views.PixelArtView
                 android:id="@+id/hatchingPotion_view"
                 android:layout_width="@dimen/gear_image_size"
                 android:layout_height="@dimen/gear_image_size"
diff --git a/Habitica/res/layout/dialog_levelup.xml b/Habitica/res/layout/dialog_levelup.xml
index 86309fda1..84e28428e 100644
--- a/Habitica/res/layout/dialog_levelup.xml
+++ b/Habitica/res/layout/dialog_levelup.xml
@@ -11,7 +11,7 @@
         android:gravity="center"
         android:background="@drawable/avatar_border"
         android:layout_marginTop="@dimen/spacing_large">
-        <com.habitrpg.android.habitica.ui.AvatarView
+        <com.habitrpg.common.habitica.views.AvatarView
             android:layout_width="94dp"
             android:layout_height="98dp"
             android:id="@+id/avatarView"
diff --git a/Habitica/res/layout/dialog_login_incentive.xml b/Habitica/res/layout/dialog_login_incentive.xml
index 553b94324..57d0e64b5 100644
--- a/Habitica/res/layout/dialog_login_incentive.xml
+++ b/Habitica/res/layout/dialog_login_incentive.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="center_horizontal">
-    <com.habitrpg.android.habitica.ui.views.PixelArtView
+    <com.habitrpg.common.habitica.views.PixelArtView
         android:layout_width="@dimen/shopitem_image_size"
         android:layout_height="@dimen/shopitem_image_size"
         android:id="@+id/imageView"
diff --git a/Habitica/res/layout/dialog_open_mysteryitem.xml b/Habitica/res/layout/dialog_open_mysteryitem.xml
index 238ec0a4e..4980356de 100644
--- a/Habitica/res/layout/dialog_open_mysteryitem.xml
+++ b/Habitica/res/layout/dialog_open_mysteryitem.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_horizontal">
-        <com.habitrpg.android.habitica.ui.views.PixelArtView
+        <com.habitrpg.common.habitica.views.PixelArtView
             android:id="@+id/icon_view"
             android:layout_height="@dimen/shopitem_image_size"
             android:layout_width="@dimen/shopitem_image_size" />
diff --git a/Habitica/res/layout/dialog_pet_suggest_hatch.xml b/Habitica/res/layout/dialog_pet_suggest_hatch.xml
index 48a40aaaf..bdf898fd3 100644
--- a/Habitica/res/layout/dialog_pet_suggest_hatch.xml
+++ b/Habitica/res/layout/dialog_pet_suggest_hatch.xml
@@ -22,7 +22,7 @@
                 android:background="@drawable/layout_rounded_bg_window"
                 android:layout_centerVertical="true"
                 android:layout_alignParentStart="true">
-                <com.habitrpg.android.habitica.ui.views.PixelArtView
+                <com.habitrpg.common.habitica.views.PixelArtView
                     android:id="@+id/egg_view"
                     android:layout_width="@dimen/gear_image_size"
                     android:layout_height="@dimen/gear_image_size"
@@ -71,7 +71,7 @@
                 android:background="@drawable/layout_rounded_bg_window"
                 android:layout_centerVertical="true"
                 android:layout_alignParentStart="true">
-                <com.habitrpg.android.habitica.ui.views.PixelArtView
+                <com.habitrpg.common.habitica.views.PixelArtView
                     android:id="@+id/hatchingPotion_view"
                     android:layout_width="@dimen/gear_image_size"
                     android:layout_height="@dimen/gear_image_size"
diff --git a/Habitica/res/layout/dialog_purchase_content_gear.xml b/Habitica/res/layout/dialog_purchase_content_gear.xml
index 35c9438ca..5989bc4e2 100644
--- a/Habitica/res/layout/dialog_purchase_content_gear.xml
+++ b/Habitica/res/layout/dialog_purchase_content_gear.xml
@@ -10,7 +10,7 @@
     tools:parentTag="LinearLayout"
     tools:orientation="vertical">
 
-    <com.habitrpg.android.habitica.ui.views.PixelArtView
+    <com.habitrpg.common.habitica.views.PixelArtView
         android:id="@+id/imageView"
         android:layout_width="@dimen/shopitem_image_size"
         android:layout_height="@dimen/shopitem_image_size" />
diff --git a/Habitica/res/layout/dialog_purchase_content_item.xml b/Habitica/res/layout/dialog_purchase_content_item.xml
index 1c1cf936f..c910de3c1 100644
--- a/Habitica/res/layout/dialog_purchase_content_item.xml
+++ b/Habitica/res/layout/dialog_purchase_content_item.xml
@@ -11,7 +11,7 @@
     tools:parentTag="LinearLayout"
     tools:orientation="vertical">
 
-    <com.habitrpg.android.habitica.ui.views.PixelArtView
+    <com.habitrpg.common.habitica.views.PixelArtView
         android:id="@+id/imageView"
         android:layout_width="@dimen/shopitem_image_size"
         android:layout_height="@dimen/shopitem_image_size" />
diff --git a/Habitica/res/layout/dialog_purchase_content_quest.xml b/Habitica/res/layout/dialog_purchase_content_quest.xml
index ca22596ad..3a4515b82 100644
--- a/Habitica/res/layout/dialog_purchase_content_quest.xml
+++ b/Habitica/res/layout/dialog_purchase_content_quest.xml
@@ -10,7 +10,7 @@
     tools:parentTag="LinearLayout"
     tools:orientation="vertical">
 
-    <com.habitrpg.android.habitica.ui.views.PixelArtView
+    <com.habitrpg.common.habitica.views.PixelArtView
         android:id="@+id/imageView"
         android:layout_width="@dimen/shopitem_image_size"
         android:layout_height="@dimen/shopitem_image_size" />
diff --git a/Habitica/res/layout/dialog_purchase_customization.xml b/Habitica/res/layout/dialog_purchase_customization.xml
index 617fbad52..1c2af5923 100644
--- a/Habitica/res/layout/dialog_purchase_customization.xml
+++ b/Habitica/res/layout/dialog_purchase_customization.xml
@@ -6,7 +6,7 @@
     android:layout_height="wrap_content"
     tools:parentTag="android.widget.LinearLayout">
 
-    <com.habitrpg.android.habitica.ui.views.PixelArtView
+    <com.habitrpg.common.habitica.views.PixelArtView
         android:layout_width="@dimen/customization_width"
         android:layout_height="@dimen/customization_width"
         android:id="@+id/imageView"
diff --git a/Habitica/res/layout/dialog_purchase_gems.xml b/Habitica/res/layout/dialog_purchase_gems.xml
index bc2b10f2c..18d667849 100644
--- a/Habitica/res/layout/dialog_purchase_gems.xml
+++ b/Habitica/res/layout/dialog_purchase_gems.xml
@@ -12,7 +12,7 @@
     tools:background="?attr/colorContentBackground"
     tools:orientation="vertical">
 
-    <com.habitrpg.android.habitica.ui.views.PixelArtView
+    <com.habitrpg.common.habitica.views.PixelArtView
         android:id="@+id/imageView"
         android:layout_width="@dimen/shopitem_image_size"
         android:layout_height="@dimen/shopitem_image_size" />
diff --git a/Habitica/res/layout/dialog_won_challenge.xml b/Habitica/res/layout/dialog_won_challenge.xml
index 58c57dffc..8d32be4b0 100644
--- a/Habitica/res/layout/dialog_won_challenge.xml
+++ b/Habitica/res/layout/dialog_won_challenge.xml
@@ -25,7 +25,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:src="@drawable/sparkles_left" />
-        <com.habitrpg.android.habitica.ui.views.PixelArtView
+        <com.habitrpg.common.habitica.views.PixelArtView
             android:id="@+id/achievement_view"
             android:layout_width="48dp"
             android:layout_height="52dp"
diff --git a/Habitica/res/layout/drawer_main.xml b/Habitica/res/layout/drawer_main.xml
index a627af9cd..2d1adccae 100644
--- a/Habitica/res/layout/drawer_main.xml
+++ b/Habitica/res/layout/drawer_main.xml
@@ -22,7 +22,7 @@
             android:layout_height="40dp"
             android:layout_marginEnd="@dimen/spacing_large"
             android:background="@drawable/rounded_avatar_bg">
-            <com.habitrpg.android.habitica.ui.AvatarView
+            <com.habitrpg.common.habitica.views.AvatarView
                 android:id="@+id/avatarView"
                 android:layout_width="70dp"
                 android:layout_height="70dp"
diff --git a/Habitica/res/layout/equipment_overview_item.xml b/Habitica/res/layout/equipment_overview_item.xml
index c8b950faa..ab8b9eff6 100644
--- a/Habitica/res/layout/equipment_overview_item.xml
+++ b/Habitica/res/layout/equipment_overview_item.xml
@@ -11,7 +11,7 @@
         android:layout_height="70dp"
         android:layout_gravity="center_horizontal"
         android:background="@drawable/layout_rounded_bg_content">
-        <com.habitrpg.android.habitica.ui.views.PixelArtView
+        <com.habitrpg.common.habitica.views.PixelArtView
             android:id="@+id/icon_view"
             android:layout_width="@dimen/gear_image_size"
             android:layout_height="@dimen/gear_image_size"
diff --git a/Habitica/res/layout/fragment_challenge_detail.xml b/Habitica/res/layout/fragment_challenge_detail.xml
index 15c01dd04..8dab17f2a 100644
--- a/Habitica/res/layout/fragment_challenge_detail.xml
+++ b/Habitica/res/layout/fragment_challenge_detail.xml
@@ -138,7 +138,7 @@
                 android:clipChildren="true"
                 android:layout_marginEnd="@dimen/spacing_medium"
                 android:background="@drawable/rounded_avatar_bg">
-                <com.habitrpg.android.habitica.ui.AvatarView
+                <com.habitrpg.common.habitica.views.AvatarView
                     android:id="@+id/creator_avatarview"
                     android:layout_width="60dp"
                     android:layout_height="60dp"
diff --git a/Habitica/res/layout/fragment_gift_gem_balance.xml b/Habitica/res/layout/fragment_gift_gem_balance.xml
index 1a88b80e0..7d4d0b28e 100644
--- a/Habitica/res/layout/fragment_gift_gem_balance.xml
+++ b/Habitica/res/layout/fragment_gift_gem_balance.xml
@@ -9,7 +9,7 @@
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:layout_marginTop="@dimen/spacing_large">
-        <com.habitrpg.android.habitica.ui.AvatarView
+        <com.habitrpg.common.habitica.views.AvatarView
             android:id="@+id/avatar_view"
             android:layout_width="88dp"
             android:layout_height="84dp"
diff --git a/Habitica/res/layout/fragment_gift_gem_purchase.xml b/Habitica/res/layout/fragment_gift_gem_purchase.xml
index 213587941..72739d1b9 100644
--- a/Habitica/res/layout/fragment_gift_gem_purchase.xml
+++ b/Habitica/res/layout/fragment_gift_gem_purchase.xml
@@ -9,7 +9,7 @@
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:layout_marginTop="@dimen/spacing_large">
-        <com.habitrpg.android.habitica.ui.AvatarView
+        <com.habitrpg.common.habitica.views.AvatarView
             android:id="@+id/avatar_view"
             android:layout_width="88dp"
             android:layout_height="84dp"
diff --git a/Habitica/res/layout/fragment_guild_detail.xml b/Habitica/res/layout/fragment_guild_detail.xml
index 106055841..b6a794b8e 100644
--- a/Habitica/res/layout/fragment_guild_detail.xml
+++ b/Habitica/res/layout/fragment_guild_detail.xml
@@ -149,7 +149,7 @@
                         android:clipChildren="true"
                         android:layout_marginEnd="@dimen/spacing_large"
                         android:background="@drawable/rounded_avatar_bg">
-                        <com.habitrpg.android.habitica.ui.AvatarView
+                        <com.habitrpg.common.habitica.views.AvatarView
                             android:id="@+id/leader_avatar_view"
                             android:layout_width="70dp"
                             android:layout_height="78dp"
diff --git a/Habitica/res/layout/fragment_party_detail.xml b/Habitica/res/layout/fragment_party_detail.xml
index a83c023d8..180b168f4 100644
--- a/Habitica/res/layout/fragment_party_detail.xml
+++ b/Habitica/res/layout/fragment_party_detail.xml
@@ -65,7 +65,7 @@
                         android:gravity="center_vertical"
                         android:layout_marginBottom="@dimen/spacing_medium"
                         android:visibility="gone">
-                        <com.habitrpg.android.habitica.ui.views.PixelArtView
+                        <com.habitrpg.common.habitica.views.PixelArtView
                             android:id="@+id/quest_scroll_image_view"
                             android:layout_width="@dimen/gear_image_size"
                             android:layout_height="@dimen/gear_image_size" />
@@ -101,7 +101,7 @@
                         android:background="@drawable/layout_rounded_bg_window"
                         android:padding="@dimen/spacing_medium"
                         android:layout_marginBottom="@dimen/spacing_medium">
-                        <com.habitrpg.android.habitica.ui.views.PixelArtView
+                        <com.habitrpg.common.habitica.views.PixelArtView
                             android:id="@+id/quest_image_view"
                             android:layout_width="@dimen/quest_image_width"
                             android:layout_height="wrap_content"
diff --git a/Habitica/res/layout/fragment_quest_detail.xml b/Habitica/res/layout/fragment_quest_detail.xml
index 7636b4064..8cfdfda73 100644
--- a/Habitica/res/layout/fragment_quest_detail.xml
+++ b/Habitica/res/layout/fragment_quest_detail.xml
@@ -17,7 +17,7 @@
             android:paddingTop="12dp"
             android:paddingBottom="12dp"
             >
-            <com.habitrpg.android.habitica.ui.views.PixelArtView
+            <com.habitrpg.common.habitica.views.PixelArtView
                 android:id="@+id/quest_scroll_image_view"
                 android:layout_width="63dp"
                 android:layout_height="63dp"
diff --git a/Habitica/res/layout/fragment_setup_avatar.xml b/Habitica/res/layout/fragment_setup_avatar.xml
index a0cb1ecd7..27d118f47 100644
--- a/Habitica/res/layout/fragment_setup_avatar.xml
+++ b/Habitica/res/layout/fragment_setup_avatar.xml
@@ -24,7 +24,7 @@
             android:layout_height="wrap_content"
             android:src="@drawable/creator_hills_bg"
             android:layout_centerInParent="true" />
-        <com.habitrpg.android.habitica.ui.AvatarView
+        <com.habitrpg.common.habitica.views.AvatarView
             android:id="@+id/avatarView"
             android:layout_width="@dimen/avatar_small_width"
             android:layout_height="@dimen/avatar_small_height"
diff --git a/Habitica/res/layout/fragment_setup_tasks.xml b/Habitica/res/layout/fragment_setup_tasks.xml
index 9d09bae62..4db1596a3 100644
--- a/Habitica/res/layout/fragment_setup_tasks.xml
+++ b/Habitica/res/layout/fragment_setup_tasks.xml
@@ -23,7 +23,7 @@
             android:layout_height="wrap_content"
             android:src="@drawable/creator_purple_bg"
             android:layout_centerInParent="true" />
-        <com.habitrpg.android.habitica.ui.AvatarView
+        <com.habitrpg.common.habitica.views.AvatarView
             android:id="@+id/avatarView"
             android:layout_width="@dimen/avatar_small_width"
             android:layout_height="@dimen/avatar_small_height"
diff --git a/Habitica/res/layout/fragment_subscription.xml b/Habitica/res/layout/fragment_subscription.xml
index 344b09431..e2850cc9a 100644
--- a/Habitica/res/layout/fragment_subscription.xml
+++ b/Habitica/res/layout/fragment_subscription.xml
@@ -188,7 +188,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
-                <com.habitrpg.android.habitica.ui.views.PixelArtView
+                <com.habitrpg.common.habitica.views.PixelArtView
                     android:id="@+id/sub_benefits_mystery_item_icon"
                     android:layout_width="68dp"
                     android:layout_height="68dp"
diff --git a/Habitica/res/layout/gear_list_item.xml b/Habitica/res/layout/gear_list_item.xml
index 2e7f01be4..30c93b0d3 100644
--- a/Habitica/res/layout/gear_list_item.xml
+++ b/Habitica/res/layout/gear_list_item.xml
@@ -14,7 +14,7 @@
         android:layout_width="80dp"
         android:layout_height="80dp"
         android:layout_marginEnd="@dimen/row_padding">
-        <com.habitrpg.android.habitica.ui.views.PixelArtView
+        <com.habitrpg.common.habitica.views.PixelArtView
             android:layout_width="@dimen/gear_image_size"
             android:layout_height="@dimen/gear_image_size"
             android:layout_gravity="center"
diff --git a/Habitica/res/layout/item_image_row.xml b/Habitica/res/layout/item_image_row.xml
index 56b668d58..878f276fc 100644
--- a/Habitica/res/layout/item_image_row.xml
+++ b/Habitica/res/layout/item_image_row.xml
@@ -9,7 +9,7 @@
     android:clickable="true"
     android:focusable="true"
     tools:parentTag="android.widget.LinearLayout">
-    <com.habitrpg.android.habitica.ui.views.PixelArtView
+    <com.habitrpg.common.habitica.views.PixelArtView
         android:id="@+id/imageView"
         android:layout_width="@dimen/gear_image_size"
         android:layout_height="@dimen/gear_image_size"
diff --git a/Habitica/res/layout/item_inbox_overview.xml b/Habitica/res/layout/item_inbox_overview.xml
index 16864d5ff..4a70a1ae2 100644
--- a/Habitica/res/layout/item_inbox_overview.xml
+++ b/Habitica/res/layout/item_inbox_overview.xml
@@ -12,7 +12,7 @@
         android:clipChildren="true"
         android:layout_marginEnd="@dimen/spacing_medium"
         android:background="@drawable/rounded_avatar_bg">
-        <com.habitrpg.android.habitica.ui.AvatarView
+        <com.habitrpg.common.habitica.views.AvatarView
             android:id="@+id/avatar_view"
             android:layout_width="60dp"
             android:layout_height="60dp"
diff --git a/Habitica/res/layout/item_item.xml b/Habitica/res/layout/item_item.xml
index 1946338e5..bede9f76b 100644
--- a/Habitica/res/layout/item_item.xml
+++ b/Habitica/res/layout/item_item.xml
@@ -6,7 +6,7 @@
     android:layout_height="wrap_content"
     style="@style/RowWrapper"
     android:clickable="true">
-    <com.habitrpg.android.habitica.ui.views.PixelArtView
+    <com.habitrpg.common.habitica.views.PixelArtView
         android:id="@+id/imageView"
         android:layout_width="@dimen/gear_image_size"
         android:layout_height="@dimen/gear_image_size"
diff --git a/Habitica/res/layout/mount_overview_item.xml b/Habitica/res/layout/mount_overview_item.xml
index defa4539c..0f7bc984b 100644
--- a/Habitica/res/layout/mount_overview_item.xml
+++ b/Habitica/res/layout/mount_overview_item.xml
@@ -21,7 +21,7 @@
             android:layout_width="68dp"
             android:layout_height="66dp"
             android:layout_gravity="center">
-            <com.habitrpg.android.habitica.ui.views.PixelArtView
+            <com.habitrpg.common.habitica.views.PixelArtView
                 android:id="@+id/imageView"
                 android:layout_width="68dp"
                 android:layout_height="68dp"
diff --git a/Habitica/res/layout/party_member.xml b/Habitica/res/layout/party_member.xml
index bf6916cf3..afcabebb0 100644
--- a/Habitica/res/layout/party_member.xml
+++ b/Habitica/res/layout/party_member.xml
@@ -8,7 +8,7 @@
     android:padding="@dimen/spacing_large"
     android:foreground="?android:attr/selectableItemBackground"
     android:focusable="true">
-    <com.habitrpg.android.habitica.ui.AvatarView
+    <com.habitrpg.common.habitica.views.AvatarView
         android:id="@+id/avatarView"
         android:layout_width="97dp"
         android:layout_height="99dp"
diff --git a/Habitica/res/layout/pet_detail_item.xml b/Habitica/res/layout/pet_detail_item.xml
index 100b38f9c..18c5ae785 100644
--- a/Habitica/res/layout/pet_detail_item.xml
+++ b/Habitica/res/layout/pet_detail_item.xml
@@ -14,7 +14,7 @@
         android:background="@drawable/layout_rounded_bg_window"
         android:orientation="vertical"
         android:layout_centerInParent="true">
-        <com.habitrpg.android.habitica.ui.views.PixelArtView
+        <com.habitrpg.common.habitica.views.PixelArtView
             android:id="@+id/imageView"
             android:layout_width="68dp"
             android:layout_height="68dp"
diff --git a/Habitica/res/layout/pet_imageview.xml b/Habitica/res/layout/pet_imageview.xml
index 70522927a..8fecaeab1 100644
--- a/Habitica/res/layout/pet_imageview.xml
+++ b/Habitica/res/layout/pet_imageview.xml
@@ -2,7 +2,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="@dimen/pet_image_width" android:layout_height="@dimen/pet_image_height"
     android:layout_gravity="center">
-    <com.habitrpg.android.habitica.ui.views.PixelArtView
+    <com.habitrpg.common.habitica.views.PixelArtView
         android:id="@+id/pet_imageview"
         android:layout_width="68dp"
         android:layout_height="68dp"
diff --git a/Habitica/res/layout/pet_overview_item.xml b/Habitica/res/layout/pet_overview_item.xml
index b47e75fc7..c1dda17ea 100644
--- a/Habitica/res/layout/pet_overview_item.xml
+++ b/Habitica/res/layout/pet_overview_item.xml
@@ -18,7 +18,7 @@
             android:layout_width="68dp"
             android:layout_height="58dp"
             android:layout_gravity="center">
-            <com.habitrpg.android.habitica.ui.views.PixelArtView
+            <com.habitrpg.common.habitica.views.PixelArtView
                 android:id="@+id/imageView"
                 android:layout_width="68dp"
                 android:layout_height="68dp"
diff --git a/Habitica/res/layout/profile_achievement_item.xml b/Habitica/res/layout/profile_achievement_item.xml
index af07664cb..3c5654df2 100644
--- a/Habitica/res/layout/profile_achievement_item.xml
+++ b/Habitica/res/layout/profile_achievement_item.xml
@@ -10,7 +10,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal">
-        <com.habitrpg.android.habitica.ui.views.PixelArtView
+        <com.habitrpg.common.habitica.views.PixelArtView
             android:id="@+id/achievement_drawee"
             android:layout_width="64dp"
             android:layout_height="56dp"
diff --git a/Habitica/res/layout/profile_gear_tablerow.xml b/Habitica/res/layout/profile_gear_tablerow.xml
index d77f09fb0..0732974e1 100644
--- a/Habitica/res/layout/profile_gear_tablerow.xml
+++ b/Habitica/res/layout/profile_gear_tablerow.xml
@@ -30,7 +30,7 @@
     </LinearLayout>
 
 
-    <com.habitrpg.android.habitica.ui.views.PixelArtView
+    <com.habitrpg.common.habitica.views.PixelArtView
         android:id="@+id/gear_drawee"
         android:layout_width="40dp"
         android:layout_height="40dp"
diff --git a/Habitica/res/layout/purchase_dialog_background.xml b/Habitica/res/layout/purchase_dialog_background.xml
index 19961e095..82c346e3a 100644
--- a/Habitica/res/layout/purchase_dialog_background.xml
+++ b/Habitica/res/layout/purchase_dialog_background.xml
@@ -9,7 +9,7 @@
     tools:parentTag="LinearLayout"
     tools:orientation="vertical">
 
-    <com.habitrpg.android.habitica.ui.AvatarView
+    <com.habitrpg.common.habitica.views.AvatarView
         android:id="@+id/avatar_view"
         android:layout_width="@dimen/avatar_width"
         android:layout_height="@dimen/avatar_height"
diff --git a/Habitica/res/layout/quest_collect.xml b/Habitica/res/layout/quest_collect.xml
index 614999e16..802123134 100644
--- a/Habitica/res/layout/quest_collect.xml
+++ b/Habitica/res/layout/quest_collect.xml
@@ -8,7 +8,7 @@
     android:gravity="center_vertical"
     android:orientation="horizontal">
 
-    <com.habitrpg.android.habitica.ui.views.PixelArtView
+    <com.habitrpg.common.habitica.views.PixelArtView
         android:id="@+id/icon_view"
         android:layout_width="40dp"
         android:layout_height="wrap_content"
diff --git a/Habitica/res/layout/quest_progress.xml b/Habitica/res/layout/quest_progress.xml
index 003411002..bde6b12f6 100644
--- a/Habitica/res/layout/quest_progress.xml
+++ b/Habitica/res/layout/quest_progress.xml
@@ -47,7 +47,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:clipChildren="true">
-        <com.habitrpg.android.habitica.ui.views.PixelArtView
+        <com.habitrpg.common.habitica.views.PixelArtView
             android:id="@+id/questImageView"
             android:layout_width="219dp"
             android:layout_height="wrap_content"
@@ -56,7 +56,7 @@
             android:paddingStart="@dimen/spacing_large"
             android:paddingEnd="@dimen/spacing_large"
             android:layout_gravity="center_horizontal" />
-        <com.habitrpg.android.habitica.ui.views.PixelArtView
+        <com.habitrpg.common.habitica.views.PixelArtView
             android:id="@+id/questFlourishesImageView"
             android:layout_width="310dp"
             android:layout_height="219dp"
diff --git a/Habitica/res/layout/row_quest_reward.xml b/Habitica/res/layout/row_quest_reward.xml
index ca47e97c4..9a9f73b60 100644
--- a/Habitica/res/layout/row_quest_reward.xml
+++ b/Habitica/res/layout/row_quest_reward.xml
@@ -6,7 +6,7 @@
     android:gravity="center_vertical"
     android:layout_marginBottom="4dp">
 
-    <com.habitrpg.android.habitica.ui.views.PixelArtView
+    <com.habitrpg.common.habitica.views.PixelArtView
         android:id="@+id/imageView"
         android:layout_width="@dimen/shopitem_image_size"
         android:layout_height="@dimen/shopitem_image_size"
diff --git a/Habitica/res/layout/row_shopitem.xml b/Habitica/res/layout/row_shopitem.xml
index aa84ae1fc..35e4b3aea 100644
--- a/Habitica/res/layout/row_shopitem.xml
+++ b/Habitica/res/layout/row_shopitem.xml
@@ -14,7 +14,7 @@
         android:orientation="vertical"
         android:background="@drawable/layout_rounded_bg_shopitem"
         android:layout_centerInParent="true">
-        <com.habitrpg.android.habitica.ui.views.PixelArtView
+        <com.habitrpg.common.habitica.views.PixelArtView
             android:id="@+id/imageView"
             android:layout_width="@dimen/shopitem_image_size"
             android:layout_height="@dimen/shopitem_image_size"
diff --git a/Habitica/res/layout/skill_list_item.xml b/Habitica/res/layout/skill_list_item.xml
index d466b5f1d..3a67f3eb7 100644
--- a/Habitica/res/layout/skill_list_item.xml
+++ b/Habitica/res/layout/skill_list_item.xml
@@ -17,7 +17,7 @@
         android:layout_marginTop="4dp"
         android:layout_marginBottom="4dp">
 
-        <com.habitrpg.android.habitica.ui.views.PixelArtView
+        <com.habitrpg.common.habitica.views.PixelArtView
             android:id="@+id/skill_image"
             android:layout_width="40dp"
             android:layout_height="40dp"
diff --git a/Habitica/res/layout/tavern_chat_intro_item.xml b/Habitica/res/layout/tavern_chat_intro_item.xml
index 065d1aa2c..022ce938f 100644
--- a/Habitica/res/layout/tavern_chat_intro_item.xml
+++ b/Habitica/res/layout/tavern_chat_intro_item.xml
@@ -7,7 +7,7 @@
     android:gravity="center_horizontal"
     android:orientation="vertical">
 
-    <com.habitrpg.android.habitica.ui.AvatarView
+    <com.habitrpg.common.habitica.views.AvatarView
         android:id="@+id/avatar_view"
         android:layout_width="87dp"
         android:layout_height="69dp"
diff --git a/Habitica/res/layout/view_invitation.xml b/Habitica/res/layout/view_invitation.xml
index be782544d..e79be4c81 100644
--- a/Habitica/res/layout/view_invitation.xml
+++ b/Habitica/res/layout/view_invitation.xml
@@ -21,7 +21,7 @@
                 android:clipChildren="true"
                 android:layout_marginEnd="@dimen/spacing_medium"
                 android:background="@drawable/rounded_avatar_bg">
-                <com.habitrpg.android.habitica.ui.AvatarView
+                <com.habitrpg.common.habitica.views.AvatarView
                     android:id="@+id/groupleader_avatar_view"
                     android:layout_width="60dp"
                     android:layout_height="60dp"
diff --git a/Habitica/res/values/attrs.xml b/Habitica/res/values/attrs.xml
index 2eb4e62ed..4f359930f 100644
--- a/Habitica/res/values/attrs.xml
+++ b/Habitica/res/values/attrs.xml
@@ -31,13 +31,6 @@
     <attr name="currency" format="string" />
     <attr name="color" format="color" />
 
-    <declare-styleable name="AvatarView">
-        <attr name="showBackground" format="boolean" />
-        <attr name="showMount" format="boolean" />
-        <attr name="showPet" format="boolean" />
-        <attr name="showSleeping" format="boolean" />
-    </declare-styleable>
-
     <declare-styleable name="GemPurchaseOptionsView">
         <attr name="gemAmount" format="integer" />
         <attr name="priceText" format="string" />
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt
index fa48cf115..3258baa09 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt
@@ -6,7 +6,7 @@ import com.habitrpg.android.habitica.data.TaskRepository
 import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.data.local.UserLocalRepository
 import com.habitrpg.android.habitica.data.local.UserQuestStatus
-import com.habitrpg.android.habitica.extensions.Optional
+import com.habitrpg.common.habitica.extensions.Optional
 import com.habitrpg.android.habitica.extensions.filterMapEmpty
 import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/RxJava-Extensions.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/RxJava-Extensions.kt
index e7998c3d2..52ef4419f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/RxJava-Extensions.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/RxJava-Extensions.kt
@@ -1,5 +1,6 @@
 package com.habitrpg.android.habitica.extensions
 
+import com.habitrpg.common.habitica.extensions.Optional
 import io.reactivex.rxjava3.core.Flowable
 import io.reactivex.rxjava3.core.Maybe
 import io.reactivex.rxjava3.core.Observable
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 81a2eda4e..d79ad13d4 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
@@ -12,7 +12,7 @@ import com.habitrpg.android.habitica.models.promotions.HabiticaPromotion
 import com.habitrpg.android.habitica.models.promotions.HabiticaWebPromotion
 import com.habitrpg.android.habitica.models.promotions.getHabiticaPromotionFromKey
 
-class AppConfigManager(contentRepository: ContentRepository?) {
+class AppConfigManager(contentRepository: ContentRepository?): com.habitrpg.common.habitica.helpers.AppConfigManager() {
 
     private var worldState: WorldState? = null
 
@@ -35,7 +35,7 @@ class AppConfigManager(contentRepository: ContentRepository?) {
         return remoteConfig.getLong("maxChatLength")
     }
 
-    fun spriteSubstitutions(): Map<String, Map<String, String>> {
+    override fun spriteSubstitutions(): Map<String, Map<String, String>> {
         val type = object : TypeToken<Map<String, Map<String, String>>>() {}.type
         return Gson().fromJson(remoteConfig.getString("spriteSubstitutions"), type)
     }
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 b15b2f1ad..35adcdf5a 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,7 +1,6 @@
 package com.habitrpg.android.habitica.helpers
 
 import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.models.Avatar
 import com.habitrpg.android.habitica.models.inventory.Equipment
 import com.habitrpg.android.habitica.models.user.Stats
 
@@ -25,7 +24,7 @@ class UserStatComputer {
         var stats: String? = null
     }
 
-    fun computeClassBonus(equipmentList: List<Equipment>, user: Avatar): List<StatsRow> {
+    fun computeClassBonus(equipmentList: List<Equipment>, user: com.habitrpg.common.habitica.models.Avatar): List<StatsRow> {
         val skillRows = ArrayList<StatsRow>()
 
         var strAttributes = 0f
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 d5a991b8a..600a500a6 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
@@ -12,8 +12,8 @@ import com.habitrpg.android.habitica.models.inventory.Food
 import com.habitrpg.android.habitica.models.inventory.Pet
 import com.habitrpg.android.habitica.models.responses.FeedResponse
 import com.habitrpg.android.habitica.ui.activities.BaseActivity
-import com.habitrpg.android.habitica.ui.helpers.loadImage
-import com.habitrpg.android.habitica.ui.views.PixelArtView
+import com.habitrpg.common.habitica.extensions.loadImage
+import com.habitrpg.common.habitica.views.PixelArtView
 import com.habitrpg.android.habitica.ui.views.SnackbarActivity
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import io.reactivex.rxjava3.core.Flowable
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 7efa3b856..a6b08896e 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,8 +13,8 @@ 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.android.habitica.ui.activities.BaseActivity
-import com.habitrpg.android.habitica.ui.helpers.loadImage
-import com.habitrpg.android.habitica.ui.views.PixelArtView
+import com.habitrpg.common.habitica.extensions.loadImage
+import com.habitrpg.common.habitica.views.PixelArtView
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import io.reactivex.rxjava3.core.Flowable
 import javax.inject.Inject
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 615a88601..116a782d5 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
@@ -9,7 +9,7 @@ import com.habitrpg.android.habitica.helpers.RxErrorHandler
 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.AvatarView
+import com.habitrpg.common.habitica.views.AvatarView
 import com.habitrpg.android.habitica.ui.activities.BaseActivity
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
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 c77e0f389..401cadfd4 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
@@ -13,9 +13,9 @@ import com.habitrpg.android.habitica.models.notifications.ChallengeWonData
 import com.habitrpg.android.habitica.models.notifications.FirstDropData
 import com.habitrpg.android.habitica.models.notifications.LoginIncentiveData
 import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.android.habitica.ui.helpers.loadImage
+import com.habitrpg.common.habitica.extensions.loadImage
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
-import com.habitrpg.android.habitica.ui.views.PixelArtView
+import com.habitrpg.common.habitica.views.PixelArtView
 import com.habitrpg.android.habitica.ui.views.SnackbarActivity
 import com.habitrpg.android.habitica.ui.views.dialogs.AchievementDialog
 import com.habitrpg.android.habitica.ui.views.dialogs.FirstDropDialog
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Avatar.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Avatar.kt
deleted file mode 100644
index e9a393c6c..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Avatar.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.habitrpg.android.habitica.models
-
-import com.habitrpg.android.habitica.models.user.Outfit
-import com.habitrpg.android.habitica.models.user.Stats
-
-/**
- * Created by phillip on 29.06.17.
- */
-interface Avatar {
-    val currentMount: String?
-    val currentPet: String?
-    val sleep: Boolean
-    val stats: Stats?
-    val preferences: AvatarPreferences?
-    val flags: AvatarFlags?
-    val gemCount: Int
-    val hourglassCount: Int
-    val costume: Outfit?
-    val equipped: Outfit?
-    val hasClass: Boolean
-    fun isValid(): Boolean
-}
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 d947b4c1a..05fbd9bf6 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
@@ -1,7 +1,6 @@
 package com.habitrpg.android.habitica.models.members
 
 import com.google.gson.annotations.SerializedName
-import com.habitrpg.android.habitica.models.Avatar
 import com.habitrpg.android.habitica.models.BaseMainObject
 import com.habitrpg.android.habitica.models.social.UserParty
 import com.habitrpg.android.habitica.models.user.Authentication
@@ -12,6 +11,7 @@ import com.habitrpg.android.habitica.models.user.Items
 import com.habitrpg.android.habitica.models.user.Outfit
 import com.habitrpg.android.habitica.models.user.Profile
 import com.habitrpg.android.habitica.models.user.Stats
+import com.habitrpg.common.habitica.models.Avatar
 import io.realm.RealmModel
 import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/members/MemberFlags.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/members/MemberFlags.kt
index 4e74fdbd6..caf08c00b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/members/MemberFlags.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/members/MemberFlags.kt
@@ -1,6 +1,6 @@
 package com.habitrpg.android.habitica.models.members
 
-import com.habitrpg.android.habitica.models.AvatarFlags
+import com.habitrpg.common.habitica.models.AvatarFlags
 import io.realm.RealmObject
 import io.realm.annotations.RealmClass
 
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 452ff4ca9..c25ce6c88 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
@@ -1,12 +1,13 @@
 package com.habitrpg.android.habitica.models.members
 
-import com.habitrpg.android.habitica.models.AvatarPreferences
 import com.habitrpg.android.habitica.models.user.Hair
+import com.habitrpg.common.habitica.models.AvatarPreferences
 import io.realm.RealmObject
 import io.realm.annotations.RealmClass
 
 @RealmClass(embedded = true)
-open class MemberPreferences : RealmObject(), AvatarPreferences {
+open class MemberPreferences : RealmObject(),
+    AvatarPreferences {
 
     override var hair: Hair? = null
     override var costume: Boolean = false
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/UserStyles.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/UserStyles.kt
index 3d9525312..a04c9d2f9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/UserStyles.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/UserStyles.kt
@@ -1,7 +1,5 @@
 package com.habitrpg.android.habitica.models.social
 
-import com.habitrpg.android.habitica.models.Avatar
-import com.habitrpg.android.habitica.models.AvatarFlags
 import com.habitrpg.android.habitica.models.user.Items
 import com.habitrpg.android.habitica.models.user.Outfit
 import com.habitrpg.android.habitica.models.user.Preferences
@@ -10,7 +8,7 @@ import io.realm.RealmObject
 import io.realm.annotations.RealmClass
 
 @RealmClass(embedded = true)
-open class UserStyles : RealmObject(), Avatar {
+open class UserStyles : RealmObject(), com.habitrpg.common.habitica.models.Avatar {
     override val currentMount: String?
         get() = items?.currentMount
 
@@ -38,7 +36,7 @@ open class UserStyles : RealmObject(), Avatar {
 
     override var stats: Stats? = null
     override var preferences: Preferences? = null
-    override val flags: AvatarFlags?
+    override val flags: com.habitrpg.common.habitica.models.AvatarFlags?
         get() = null
     private var items: Items? = null
 }
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 9bddd0664..395e9637e 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
@@ -2,26 +2,27 @@ package com.habitrpg.android.habitica.models.user
 
 import com.google.gson.annotations.SerializedName
 import com.habitrpg.android.habitica.models.BaseObject
+import com.habitrpg.common.habitica.models.AvatarBuffs
 import io.realm.RealmObject
 import io.realm.annotations.RealmClass
 
 @RealmClass(embedded = true)
-open class Buffs : RealmObject(), BaseObject {
-    var con: Float? = null
-    var str: Float? = null
-    var per: Float? = null
+open class Buffs : RealmObject(), AvatarBuffs, BaseObject {
+    override var con: Float? = null
+    override var str: Float? = null
+    override var per: Float? = null
 
     @SerializedName("int")
-    var _int: Float? = null
-    var seafoam: Boolean? = null
+    override var _int: Float? = null
+    override var seafoam: Boolean? = null
         get() { return field ?: false }
-    var spookySparkles: Boolean? = null
+    override var spookySparkles: Boolean? = null
         get() { return field ?: false }
-    var shinySeed: Boolean? = null
+    override var shinySeed: Boolean? = null
         get() { return field ?: false }
-    var snowball: Boolean? = null
+    override var snowball: Boolean? = null
         get() { return field ?: false }
-    var streaks: Boolean? = null
+    override var streaks: Boolean? = null
         get() { return field ?: false }
 
     fun merge(stats: Buffs?) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Flags.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Flags.kt
index 395ebb521..ea1672c92 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Flags.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Flags.kt
@@ -1,6 +1,5 @@
 package com.habitrpg.android.habitica.models.user
 
-import com.habitrpg.android.habitica.models.AvatarFlags
 import com.habitrpg.android.habitica.models.BaseObject
 import com.habitrpg.android.habitica.models.TutorialStep
 import io.realm.RealmList
@@ -8,7 +7,7 @@ import io.realm.RealmObject
 import io.realm.annotations.RealmClass
 
 @RealmClass(embedded = true)
-open class Flags : RealmObject(), BaseObject, AvatarFlags {
+open class Flags : RealmObject(), BaseObject, com.habitrpg.common.habitica.models.AvatarFlags {
     var tutorial: RealmList<TutorialStep>? = null
     var showTour = false
     var dropsEnabled = false
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Hair.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Hair.kt
index 5b6064aca..a80745db6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Hair.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Hair.kt
@@ -1,17 +1,18 @@
 package com.habitrpg.android.habitica.models.user
 
 import com.habitrpg.android.habitica.models.BaseObject
+import com.habitrpg.common.habitica.models.AvatarHair
 import io.realm.RealmObject
 import io.realm.annotations.RealmClass
 
 @RealmClass(embedded = true)
-open class Hair : RealmObject, BaseObject {
-    var mustache: Int = 0
-    var beard: Int = 0
-    var bangs: Int = 0
-    var base: Int = 0
-    var flower: Int = 0
-    var color: String? = null
+open class Hair : RealmObject, BaseObject, AvatarHair {
+    final override var mustache: Int = 0
+    final override var beard: Int = 0
+    final override var bangs: Int = 0
+    final override var base: Int = 0
+    final override var flower: Int = 0
+    final override var color: String? = null
 
     constructor()
 
@@ -23,8 +24,4 @@ open class Hair : RealmObject, BaseObject {
         this.color = color
         this.flower = flower
     }
-
-    fun isAvailable(hairId: Int): Boolean {
-        return hairId > 0
-    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Outfit.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Outfit.kt
index f21cebb92..ed8a84cf3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Outfit.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Outfit.kt
@@ -1,35 +1,20 @@
 package com.habitrpg.android.habitica.models.user
 
-import android.text.TextUtils
 import com.google.gson.annotations.SerializedName
 import com.habitrpg.android.habitica.models.BaseObject
+import com.habitrpg.common.habitica.models.AvatarOutfit
 import io.realm.RealmObject
 import io.realm.annotations.RealmClass
 
 @RealmClass(embedded = true)
-open class Outfit : RealmObject(), BaseObject {
-    var armor: String = ""
-    var back: String = ""
-    var body: String = ""
-    var head: String = ""
-    var shield: String = ""
-    var weapon: String = ""
+open class Outfit : RealmObject(), BaseObject, AvatarOutfit {
+    override var armor: String = ""
+    override var back: String = ""
+    override var body: String = ""
+    override var head: String = ""
+    override var shield: String = ""
+    override var weapon: String = ""
     @SerializedName("eyewear")
-    var eyeWear: String = ""
-    var headAccessory: String = ""
-
-    fun isAvailable(outfit: String): Boolean {
-        return !TextUtils.isEmpty(outfit) && !outfit.endsWith("base_0")
-    }
-
-    fun updateWith(newOutfit: Outfit) {
-        this.armor = newOutfit.armor
-        this.back = newOutfit.back
-        this.body = newOutfit.body
-        this.eyeWear = newOutfit.eyeWear
-        this.head = newOutfit.head
-        this.headAccessory = newOutfit.headAccessory
-        this.shield = newOutfit.shield
-        this.weapon = newOutfit.weapon
-    }
+    override var eyeWear: String = ""
+    override var headAccessory: String = ""
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.kt
index 770c8dfd5..38df6c5d9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.kt
@@ -1,8 +1,8 @@
 package com.habitrpg.android.habitica.models.user
 
 import com.google.gson.annotations.SerializedName
-import com.habitrpg.android.habitica.models.AvatarPreferences
 import com.habitrpg.android.habitica.models.BaseObject
+import com.habitrpg.common.habitica.models.AvatarPreferences
 import io.realm.RealmObject
 import io.realm.annotations.RealmClass
 
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 3d67a6118..b93f3d0a6 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
@@ -4,11 +4,12 @@ import android.content.Context
 import com.google.gson.annotations.SerializedName
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.models.BaseObject
+import com.habitrpg.common.habitica.models.AvatarStats
 import io.realm.RealmObject
 import io.realm.annotations.RealmClass
 
 @RealmClass(embedded = true)
-open class Stats : RealmObject(), BaseObject {
+open class Stats : RealmObject(), AvatarStats, BaseObject {
     @SerializedName("con")
     var constitution: Int? = null
     @SerializedName("str")
@@ -18,43 +19,36 @@ open class Stats : RealmObject(), BaseObject {
     @SerializedName("int")
     var intelligence: Int? = null
     var training: Training? = null
-    var buffs: Buffs? = null
-    var points: Int? = null
-    var lvl: Int? = null
+    override var buffs: Buffs? = null
+    override var points: Int? = null
+    override var lvl: Int? = null
     @SerializedName("class")
-    var habitClass: String? = null
-    var gp: Double? = null
-    var exp: Double? = null
-    var mp: Double? = null
-    var hp: Double? = null
-    var toNextLevel: Int? = null
+    override var habitClass: String? = null
+    override var gp: Double? = null
+    override var exp: Double? = null
+    override var mp: Double? = null
+    override var hp: Double? = null
+    override var toNextLevel: Int? = null
         get() = if (field != null) field else 0
         set(value) {
             if (value != 0) {
                 field = value
             }
         }
-    var maxHealth: Int? = null
+    override var maxHealth: Int? = null
         get() = if (field != null) field else 0
         set(value) {
             if (value != 0) {
                 field = value
             }
         }
-    var maxMP: Int? = null
+    override var maxMP: Int? = null
         get() = if (field != null) field else 0
         set(value) {
             if (value != 0) {
                 field = value
             }
         }
-    val isBuffed: Boolean
-        get() {
-            return buffs?.str ?: 0f > 0 ||
-                buffs?.con ?: 0f > 0 ||
-                buffs?._int ?: 0f > 0 ||
-                buffs?.per ?: 0f > 0
-        }
 
     fun getTranslatedClassName(context: Context): String {
         return when (habitClass) {
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 c0f5b74f6..9ba8c6bb8 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
@@ -2,7 +2,6 @@ package com.habitrpg.android.habitica.models.user
 
 import com.google.gson.annotations.SerializedName
 import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.models.Avatar
 import com.habitrpg.android.habitica.models.BaseMainObject
 import com.habitrpg.android.habitica.models.PushDevice
 import com.habitrpg.android.habitica.models.QuestAchievement
@@ -13,6 +12,7 @@ import com.habitrpg.android.habitica.models.social.ChallengeMembership
 import com.habitrpg.android.habitica.models.social.UserParty
 import com.habitrpg.android.habitica.models.tasks.TaskList
 import com.habitrpg.android.habitica.models.tasks.TasksOrder
+import com.habitrpg.common.habitica.models.Avatar
 import io.realm.RealmList
 import io.realm.RealmObject
 import io.realm.annotations.Ignore
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.kt
index 31f25edc3..5a2280465 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.kt
@@ -13,13 +13,14 @@ import com.habitrpg.android.habitica.databinding.AvatarWithBarsBinding
 import com.habitrpg.android.habitica.helpers.Animations
 import com.habitrpg.android.habitica.helpers.HealthFormatter
 import com.habitrpg.android.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.models.Avatar
 import com.habitrpg.android.habitica.models.user.Stats
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.activities.mainActivityCreatedAt
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import java.util.Date
+import com.habitrpg.common.habitica.models.Avatar
+import io.reactivex.rxjava3.disposables.Disposable
 import java.util.Locale
 import kotlin.math.floor
 
@@ -59,7 +60,7 @@ class AvatarWithBarsViewModel(
 
         binding.avatarView.setAvatar(user)
 
-        if (stats.habitClass != null) {
+        if (stats.habitClass != null && stats is Stats) {
             userClass = stats.getTranslatedClassName(context)
         }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/ItemDetailDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/ItemDetailDialog.kt
index 76a6deaf1..83e7e5a62 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/ItemDetailDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/ItemDetailDialog.kt
@@ -9,9 +9,9 @@ import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.ui.helpers.loadImage
+import com.habitrpg.common.habitica.extensions.loadImage
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import com.habitrpg.android.habitica.ui.views.PixelArtView
+import com.habitrpg.common.habitica.views.PixelArtView
 
 class ItemDetailDialog(context: Context) : AlertDialog(context) {
 
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 8f57c73e7..fec58474a 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
@@ -19,6 +19,7 @@ import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.helpers.loadImage
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import javax.inject.Inject
+import com.habitrpg.common.habitica.extensions.loadImage
 
 class AdventureGuideActivity : BaseActivity() {
     private lateinit var binding: ActivityAdventureGuideBinding
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 9ff8d6f9a..da0306dbf 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
@@ -21,7 +21,7 @@ import com.habitrpg.android.habitica.helpers.AdType
 import com.habitrpg.android.habitica.helpers.Animations
 import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
-import com.habitrpg.android.habitica.ui.helpers.loadImage
+import com.habitrpg.common.habitica.extensions.loadImage
 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
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 621aafdd1..f786ca593 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
@@ -34,11 +34,11 @@ import com.habitrpg.android.habitica.models.user.Stats
 import com.habitrpg.android.habitica.ui.AvatarWithBarsViewModel
 import com.habitrpg.android.habitica.ui.adapter.social.AchievementProfileAdapter
 import com.habitrpg.android.habitica.ui.helpers.RecyclerViewState
-import com.habitrpg.android.habitica.ui.helpers.loadImage
+import com.habitrpg.common.habitica.extensions.loadImage
 import com.habitrpg.android.habitica.ui.helpers.setMarkdown
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.SnackbarDisplayType
-import com.habitrpg.android.habitica.ui.views.PixelArtView
+import com.habitrpg.common.habitica.views.PixelArtView
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import io.reactivex.rxjava3.core.Flowable
 import kotlinx.coroutines.Dispatchers
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 fba9ff855..23ae67adb 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
@@ -50,7 +50,7 @@ import com.habitrpg.android.habitica.models.TutorialStep
 import com.habitrpg.android.habitica.models.responses.MaintenanceResponse
 import com.habitrpg.android.habitica.models.responses.TaskScoringResult
 import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.android.habitica.ui.AvatarView
+import com.habitrpg.common.habitica.views.AvatarView
 import com.habitrpg.android.habitica.ui.AvatarWithBarsViewModel
 import com.habitrpg.android.habitica.ui.TutorialView
 import com.habitrpg.android.habitica.ui.fragments.NavigationDrawerFragment
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 cb63d4516..0e80c9eb0 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
@@ -11,8 +11,8 @@ import com.habitrpg.android.habitica.databinding.AchievementSectionHeaderBinding
 import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.android.habitica.models.Achievement
 import com.habitrpg.android.habitica.models.QuestAchievement
-import com.habitrpg.android.habitica.ui.helpers.loadImage
-import com.habitrpg.android.habitica.ui.views.PixelArtView
+import com.habitrpg.common.habitica.extensions.loadImage
+import com.habitrpg.common.habitica.views.PixelArtView
 import com.habitrpg.android.habitica.ui.views.dialogs.AchievementDetailDialog
 
 class AchievementsAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
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 8b30fb146..ae798c8b6 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
@@ -13,9 +13,9 @@ import com.habitrpg.android.habitica.databinding.CustomizationGridItemBinding
 import com.habitrpg.android.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.helpers.loadImage
+import com.habitrpg.common.habitica.extensions.loadImage
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import com.habitrpg.android.habitica.ui.views.PixelArtView
+import com.habitrpg.common.habitica.views.PixelArtView
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import io.reactivex.rxjava3.core.BackpressureStrategy
 import io.reactivex.rxjava3.core.Flowable
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 ccc25f0b3..7bdc99946 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
@@ -18,6 +18,7 @@ import com.habitrpg.android.habitica.models.inventory.CustomizationSet
 import com.habitrpg.android.habitica.models.shops.ShopItem
 import com.habitrpg.android.habitica.ui.AvatarView
 import com.habitrpg.android.habitica.ui.helpers.loadImage
+import com.habitrpg.common.habitica.extensions.loadImage
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.android.habitica.ui.views.shops.PurchaseDialog
 import io.reactivex.rxjava3.core.BackpressureStrategy
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 daf589343..43262ebc8 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
@@ -13,7 +13,7 @@ import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.android.habitica.extensions.isUsingNightModeResources
 import com.habitrpg.android.habitica.models.Skill
 import com.habitrpg.android.habitica.models.user.OwnedItem
-import com.habitrpg.android.habitica.ui.helpers.loadImage
+import com.habitrpg.common.habitica.extensions.loadImage
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import io.reactivex.rxjava3.core.BackpressureStrategy
 import io.reactivex.rxjava3.core.Flowable
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 cccb09944..ba218b5b8 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
@@ -12,7 +12,7 @@ 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.helpers.loadImage
+import com.habitrpg.common.habitica.extensions.loadImage
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import io.reactivex.rxjava3.subjects.PublishSubject
 
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 63d27e613..6a12908e1 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
@@ -20,7 +20,7 @@ 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.helpers.loadImage
+import com.habitrpg.common.habitica.extensions.loadImage
 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
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 d30effe4f..ca6c57903 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
@@ -16,7 +16,7 @@ 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.helpers.loadImage
+import com.habitrpg.common.habitica.extensions.loadImage
 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
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 d780fefc2..e409e17bd 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
@@ -20,11 +20,11 @@ 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.ui.fragments.inventory.stable.StableFragmentDirections
-import com.habitrpg.android.habitica.ui.helpers.loadImage
+import com.habitrpg.common.habitica.extensions.loadImage
 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.android.habitica.ui.views.PixelArtView
+import com.habitrpg.common.habitica.views.PixelArtView
 import io.reactivex.rxjava3.core.BackpressureStrategy
 import io.reactivex.rxjava3.core.Flowable
 import io.reactivex.rxjava3.subjects.PublishSubject
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 7e4043d31..30cdd87a8 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
@@ -8,7 +8,7 @@ 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.helpers.loadImage
+import com.habitrpg.common.habitica.extensions.loadImage
 import com.habitrpg.android.habitica.ui.viewHolders.SectionViewHolder
 import com.habitrpg.android.habitica.ui.views.dialogs.AchievementDetailDialog
 
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 7bc78f54f..52c7dd2d1 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
@@ -17,7 +17,7 @@ import com.habitrpg.android.habitica.databinding.FragmentAboutBinding
 import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.modules.AppModule
-import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
+import com.habitrpg.common.habitica.extensions.DataBindingUtils
 import com.plattysoft.leonids.ParticleSystem
 import javax.inject.Inject
 import javax.inject.Named
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 be68782fd..24bfc8ab3 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
@@ -33,7 +33,7 @@ import com.habitrpg.android.habitica.ui.adapter.inventory.ItemRecyclerAdapter
 import com.habitrpg.android.habitica.ui.fragments.BaseDialogFragment
 import com.habitrpg.android.habitica.ui.helpers.EmptyItem
 import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
-import com.habitrpg.android.habitica.ui.helpers.loadImage
+import com.habitrpg.common.habitica.extensions.loadImage
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import com.habitrpg.android.habitica.ui.views.dialogs.OpenedMysteryitemDialog
 import io.reactivex.rxjava3.disposables.CompositeDisposable
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 613ff7f57..5e7186238 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
@@ -39,7 +39,7 @@ import com.habitrpg.android.habitica.ui.adapter.inventory.ItemRecyclerAdapter
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
 import com.habitrpg.android.habitica.ui.helpers.EmptyItem
 import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
-import com.habitrpg.android.habitica.ui.helpers.loadImage
+import com.habitrpg.common.habitica.extensions.loadImage
 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
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 9cf9b8746..69a532a73 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
@@ -26,7 +26,7 @@ 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.helpers.loadImage
+import com.habitrpg.common.habitica.extensions.loadImage
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView
 import javax.inject.Inject
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 fbcec8bdf..27ca514cc 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
@@ -20,7 +20,8 @@ import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.social.InboxConversation
-import com.habitrpg.android.habitica.ui.AvatarView
+import com.habitrpg.android.habitica.modules.AppModule
+import com.habitrpg.common.habitica.views.AvatarView
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
 import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
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 7b38eb0d9..9198a531b 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
@@ -25,7 +25,7 @@ import com.habitrpg.android.habitica.models.social.Group
 import com.habitrpg.android.habitica.modules.AppModule
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
 import com.habitrpg.android.habitica.ui.helpers.MarkdownParser
-import com.habitrpg.android.habitica.ui.helpers.loadImage
+import com.habitrpg.common.habitica.extensions.loadImage
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import javax.inject.Inject
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 aeecdc6c0..a9680a9ee 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
@@ -24,10 +24,10 @@ import com.habitrpg.android.habitica.databinding.FragmentNoPartyBinding
 import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
-import com.habitrpg.android.habitica.ui.AvatarView
+import com.habitrpg.common.habitica.views.AvatarView
 import com.habitrpg.android.habitica.ui.activities.GroupFormActivity
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
-import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
+import com.habitrpg.common.habitica.extensions.DataBindingUtils
 import com.habitrpg.android.habitica.ui.helpers.setMarkdown
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
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 5bc17e90d..4ec764e8d 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
@@ -28,14 +28,14 @@ import com.habitrpg.android.habitica.models.social.Challenge
 import com.habitrpg.android.habitica.models.social.Group
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.modules.AppModule
-import com.habitrpg.android.habitica.ui.AvatarView
+import com.habitrpg.common.habitica.views.AvatarView
 import com.habitrpg.android.habitica.ui.activities.FullProfileActivity
 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.DataBindingUtils
+import com.habitrpg.common.habitica.extensions.DataBindingUtils
 import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard
-import com.habitrpg.android.habitica.ui.helpers.loadImage
+import com.habitrpg.common.habitica.extensions.loadImage
 import com.habitrpg.android.habitica.ui.helpers.setMarkdown
 import com.habitrpg.android.habitica.ui.viewHolders.GroupMemberViewHolder
 import com.habitrpg.android.habitica.ui.viewmodels.PartyViewModel
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 34553b1dc..768a12e78 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
@@ -18,12 +18,12 @@ import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.models.social.ChatMessage
 import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
 import com.habitrpg.android.habitica.ui.helpers.MarkdownParser
 import com.habitrpg.android.habitica.ui.helpers.setParsedMarkdown
 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 io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.core.Maybe
 import io.reactivex.rxjava3.schedulers.Schedulers
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 fcfa755e7..77cb28d8b 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
@@ -9,7 +9,7 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.MountOverviewItemBinding
 import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.android.habitica.models.inventory.Mount
-import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
+import com.habitrpg.common.habitica.extensions.DataBindingUtils
 import com.habitrpg.android.habitica.ui.menu.BottomSheetMenu
 import com.habitrpg.android.habitica.ui.menu.BottomSheetMenuItem
 import io.reactivex.rxjava3.subjects.PublishSubject
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 3822661bf..f17959cfe 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
@@ -13,7 +13,7 @@ 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.ui.helpers.DataBindingUtils
+import com.habitrpg.common.habitica.extensions.DataBindingUtils
 import com.habitrpg.android.habitica.ui.menu.BottomSheetMenu
 import com.habitrpg.android.habitica.ui.menu.BottomSheetMenuItem
 import com.habitrpg.android.habitica.ui.views.dialogs.PetSuggestHatchDialog
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 4b094a75a..b1f8ec202 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
@@ -10,7 +10,7 @@ import com.habitrpg.android.habitica.databinding.RowShopitemBinding
 import com.habitrpg.android.habitica.extensions.dpToPx
 import com.habitrpg.android.habitica.extensions.isUsingNightModeResources
 import com.habitrpg.android.habitica.models.shops.ShopItem
-import com.habitrpg.android.habitica.ui.helpers.loadImage
+import com.habitrpg.common.habitica.extensions.loadImage
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.shops.PurchaseDialog
 
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 b06bb9a68..9e511bbf2 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
@@ -6,8 +6,8 @@ import androidx.lifecycle.MutableLiveData
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.ChallengeRepository
 import com.habitrpg.android.habitica.data.SocialRepository
-import com.habitrpg.android.habitica.extensions.Optional
-import com.habitrpg.android.habitica.extensions.asOptional
+import com.habitrpg.common.habitica.extensions.Optional
+import com.habitrpg.common.habitica.extensions.asOptional
 import com.habitrpg.android.habitica.extensions.filterOptionalDoOnEmpty
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.helpers.NotificationsManager
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 9ca856d34..620b45ef2 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
@@ -10,8 +10,8 @@ import androidx.paging.PositionalDataSource
 import androidx.paging.toLiveData
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.SocialRepository
-import com.habitrpg.android.habitica.extensions.Optional
-import com.habitrpg.android.habitica.extensions.asOptional
+import com.habitrpg.common.habitica.extensions.Optional
+import com.habitrpg.common.habitica.extensions.asOptional
 import com.habitrpg.android.habitica.extensions.filterOptionalDoOnEmpty
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.members.Member
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/EquipmentItemRow.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/EquipmentItemRow.kt
index 3904587cd..e67cf420f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/EquipmentItemRow.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/EquipmentItemRow.kt
@@ -7,7 +7,7 @@ import android.widget.LinearLayout
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.ItemImageRowBinding
 import com.habitrpg.android.habitica.extensions.layoutInflater
-import com.habitrpg.android.habitica.ui.helpers.loadImage
+import com.habitrpg.common.habitica.extensions.loadImage
 
 class EquipmentItemRow(context: Context, attrs: AttributeSet?) : LinearLayout(context, attrs) {
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaProgressBar.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaProgressBar.kt
index b551f0233..acfb362a8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaProgressBar.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaProgressBar.kt
@@ -13,7 +13,7 @@ import androidx.core.widget.ImageViewCompat
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.ProgressBarBinding
 import com.habitrpg.android.habitica.extensions.layoutInflater
-import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
+import com.habitrpg.common.habitica.extensions.DataBindingUtils
 import kotlin.math.min
 
 class HabiticaProgressBar(context: Context, attrs: AttributeSet?) : FrameLayout(context, attrs) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/NPCBannerView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/NPCBannerView.kt
index 5fb3ba45d..e561695c6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/NPCBannerView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/NPCBannerView.kt
@@ -12,7 +12,7 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.NpcBannerBinding
 import com.habitrpg.android.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
-import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
+import com.habitrpg.common.habitica.extensions.DataBindingUtils
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.core.Observable
 import kotlin.math.roundToInt
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 e310f98fb..ac374a498 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
@@ -8,8 +8,8 @@ import com.habitrpg.android.habitica.databinding.DialogAchievementDetailBinding
 import com.habitrpg.android.habitica.extensions.addCloseButton
 import com.habitrpg.android.habitica.extensions.fromHtml
 import com.habitrpg.android.habitica.models.Achievement
-import com.habitrpg.android.habitica.ui.helpers.loadImage
-import com.habitrpg.android.habitica.ui.views.PixelArtView
+import com.habitrpg.common.habitica.extensions.loadImage
+import com.habitrpg.common.habitica.views.PixelArtView
 
 class AchievementDetailDialog(val achievement: Achievement, context: Context) : HabiticaAlertDialog(context) {
 
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 3c68fc3b6..f85431655 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
@@ -12,7 +12,7 @@ import com.habitrpg.android.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.models.Notification
 import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.android.habitica.ui.helpers.loadImage
+import com.habitrpg.common.habitica.extensions.loadImage
 
 class AchievementDialog(context: Context) : HabiticaAlertDialog(context) {
     var isLastOnboardingAchievement: Boolean = false
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 13919e580..a9bb0a56c 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
@@ -4,8 +4,8 @@ import android.content.Context
 import android.view.LayoutInflater
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.ui.helpers.loadImage
-import com.habitrpg.android.habitica.ui.views.PixelArtView
+import com.habitrpg.common.habitica.extensions.loadImage
+import com.habitrpg.common.habitica.views.PixelArtView
 
 class FirstDropDialog(context: Context) : HabiticaAlertDialog(context) {
 
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 c09503234..46e5977ef 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
@@ -18,8 +18,8 @@ import com.habitrpg.android.habitica.models.inventory.HatchingPotion
 import com.habitrpg.android.habitica.models.inventory.Item
 import com.habitrpg.android.habitica.ui.activities.BaseActivity
 import com.habitrpg.android.habitica.ui.activities.MainActivity
-import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
-import com.habitrpg.android.habitica.ui.helpers.loadImage
+import com.habitrpg.common.habitica.extensions.DataBindingUtils
+import com.habitrpg.common.habitica.extensions.loadImage
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.core.Flowable
 import io.reactivex.rxjava3.core.Observable
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 8f4e046d7..9954ea4d0 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
@@ -15,9 +15,9 @@ import com.habitrpg.android.habitica.extensions.fromHtml
 import com.habitrpg.android.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.models.inventory.QuestContent
 import com.habitrpg.android.habitica.models.inventory.QuestDropItem
-import com.habitrpg.android.habitica.ui.helpers.loadImage
+import com.habitrpg.common.habitica.extensions.loadImage
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import com.habitrpg.android.habitica.ui.views.PixelArtView
+import com.habitrpg.common.habitica.views.PixelArtView
 
 class QuestCompletedDialogContent : LinearLayout {
 
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 ddcbe0ed0..ac1880ee7 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
@@ -8,8 +8,8 @@ import android.widget.TextView
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.extensions.fromHtml
 import com.habitrpg.android.habitica.models.notifications.ChallengeWonData
-import com.habitrpg.android.habitica.ui.helpers.loadImage
-import com.habitrpg.android.habitica.ui.views.PixelArtView
+import com.habitrpg.common.habitica.extensions.loadImage
+import com.habitrpg.common.habitica.views.PixelArtView
 
 class WonChallengeDialog(context: Context) : HabiticaAlertDialog(context) {
     fun configure(data: ChallengeWonData?) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/equipment/EquipmentOverviewItem.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/equipment/EquipmentOverviewItem.kt
index 62146b185..77280c013 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/equipment/EquipmentOverviewItem.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/equipment/EquipmentOverviewItem.kt
@@ -9,7 +9,7 @@ import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.EquipmentOverviewItemBinding
 import com.habitrpg.android.habitica.extensions.layoutInflater
-import com.habitrpg.android.habitica.ui.helpers.loadImage
+import com.habitrpg.common.habitica.extensions.loadImage
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 
 class EquipmentOverviewItem @JvmOverloads constructor(
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 fbb8ed811..a078a789d 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
@@ -4,7 +4,6 @@ import android.content.Context
 import android.widget.TextView
 import com.habitrpg.android.habitica.databinding.PurchaseDialogBackgroundBinding
 import com.habitrpg.android.habitica.extensions.layoutInflater
-import com.habitrpg.android.habitica.models.Avatar
 import com.habitrpg.android.habitica.models.shops.ShopItem
 import com.habitrpg.android.habitica.ui.AvatarView
 import com.habitrpg.android.habitica.ui.views.PixelArtView
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogBaseContent.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogBaseContent.kt
index 6bf12be43..ddeb9fcde 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogBaseContent.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogBaseContent.kt
@@ -4,7 +4,7 @@ import android.content.Context
 import android.widget.TextView
 import com.habitrpg.android.habitica.databinding.DialogPurchaseContentItemBinding
 import com.habitrpg.android.habitica.extensions.layoutInflater
-import com.habitrpg.android.habitica.ui.views.PixelArtView
+import com.habitrpg.common.habitica.views.PixelArtView
 
 class PurchaseDialogBaseContent(context: Context) : PurchaseDialogContent(context) {
     val binding = DialogPurchaseContentItemBinding.inflate(context.layoutInflater, this)
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 ac391c128..69d4d342f 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
@@ -10,9 +10,9 @@ import com.habitrpg.android.habitica.extensions.dpToPx
 import com.habitrpg.android.habitica.extensions.fromHtml
 import com.habitrpg.android.habitica.models.inventory.QuestContent
 import com.habitrpg.android.habitica.models.shops.ShopItem
-import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
-import com.habitrpg.android.habitica.ui.helpers.loadImage
-import com.habitrpg.android.habitica.ui.views.PixelArtView
+import com.habitrpg.common.habitica.extensions.DataBindingUtils
+import com.habitrpg.common.habitica.extensions.loadImage
+import com.habitrpg.common.habitica.views.PixelArtView
 
 abstract class PurchaseDialogContent @JvmOverloads constructor(
     context: Context,
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogCustomizationContent.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogCustomizationContent.kt
index d91dad862..1b7a41f33 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogCustomizationContent.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogCustomizationContent.kt
@@ -4,7 +4,7 @@ import android.content.Context
 import android.widget.TextView
 import com.habitrpg.android.habitica.databinding.DialogPurchaseCustomizationBinding
 import com.habitrpg.android.habitica.extensions.layoutInflater
-import com.habitrpg.android.habitica.ui.views.PixelArtView
+import com.habitrpg.common.habitica.views.PixelArtView
 
 class PurchaseDialogCustomizationContent(context: Context) : PurchaseDialogContent(context) {
     val binding = DialogPurchaseCustomizationBinding.inflate(context.layoutInflater, this)
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 888f0d50c..e62c1d1a5 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
@@ -8,8 +8,8 @@ import com.habitrpg.android.habitica.databinding.DialogPurchaseCustomizationsetB
 import com.habitrpg.android.habitica.extensions.dpToPx
 import com.habitrpg.android.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.models.shops.ShopItem
-import com.habitrpg.android.habitica.ui.helpers.loadImage
-import com.habitrpg.android.habitica.ui.views.PixelArtView
+import com.habitrpg.common.habitica.extensions.loadImage
+import com.habitrpg.common.habitica.views.PixelArtView
 
 class PurchaseDialogCustomizationSetContent(context: Context) : PurchaseDialogContent(context) {
     val binding = DialogPurchaseCustomizationsetBinding.inflate(context.layoutInflater, this)
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 14db2a4f2..f5ca941cf 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
@@ -8,7 +8,7 @@ import com.habitrpg.android.habitica.databinding.DialogPurchaseContentGearBindin
 import com.habitrpg.android.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.models.inventory.Equipment
 import com.habitrpg.android.habitica.models.shops.ShopItem
-import com.habitrpg.android.habitica.ui.views.PixelArtView
+import com.habitrpg.common.habitica.views.PixelArtView
 
 internal class PurchaseDialogGearContent(context: Context) : PurchaseDialogContent(context) {
     val binding = DialogPurchaseContentGearBinding.inflate(context.layoutInflater, this)
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 01aa92c4c..792bed60b 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
@@ -7,7 +7,7 @@ import com.habitrpg.android.habitica.extensions.asDrawable
 import com.habitrpg.android.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.models.shops.ShopItem
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import com.habitrpg.android.habitica.ui.views.PixelArtView
+import com.habitrpg.common.habitica.views.PixelArtView
 
 internal class PurchaseDialogGemsContent(context: Context) : PurchaseDialogContent(context) {
     internal val binding = DialogPurchaseGemsBinding.inflate(context.layoutInflater, this)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogItemContent.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogItemContent.kt
index 948ba73fb..042e7f4d8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogItemContent.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogItemContent.kt
@@ -5,7 +5,7 @@ import android.widget.TextView
 import com.habitrpg.android.habitica.databinding.DialogPurchaseContentItemBinding
 import com.habitrpg.android.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.models.shops.ShopItem
-import com.habitrpg.android.habitica.ui.views.PixelArtView
+import com.habitrpg.common.habitica.views.PixelArtView
 
 class PurchaseDialogItemContent(context: Context) : PurchaseDialogContent(context) {
     private val binding = DialogPurchaseContentItemBinding.inflate(context.layoutInflater, this)
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 ec3a500b2..7e6fdc1b1 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
@@ -12,9 +12,9 @@ import com.habitrpg.android.habitica.databinding.DialogPurchaseContentQuestBindi
 import com.habitrpg.android.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.models.inventory.QuestContent
 import com.habitrpg.android.habitica.models.inventory.QuestDropItem
-import com.habitrpg.android.habitica.ui.helpers.loadImage
+import com.habitrpg.common.habitica.extensions.loadImage
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import com.habitrpg.android.habitica.ui.views.PixelArtView
+import com.habitrpg.common.habitica.views.PixelArtView
 
 class PurchaseDialogQuestContent(context: Context) : PurchaseDialogContent(context) {
     private val binding = DialogPurchaseContentQuestBinding.inflate(context.layoutInflater, this)
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 23b1bb696..59f1dd919 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
@@ -17,7 +17,7 @@ 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.android.habitica.models.user.User
-import com.habitrpg.android.habitica.ui.helpers.loadImage
+import com.habitrpg.common.habitica.extensions.loadImage
 import com.habitrpg.android.habitica.ui.views.HabiticaIcons
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/QuestProgressView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/QuestProgressView.kt
index b16876a7c..eb0406f30 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/QuestProgressView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/QuestProgressView.kt
@@ -25,8 +25,8 @@ import com.habitrpg.android.habitica.models.inventory.Quest
 import com.habitrpg.android.habitica.models.inventory.QuestContent
 import com.habitrpg.android.habitica.models.inventory.QuestProgressCollect
 import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
-import com.habitrpg.android.habitica.ui.helpers.loadImage
+import com.habitrpg.common.habitica.extensions.DataBindingUtils
+import com.habitrpg.common.habitica.extensions.loadImage
 import com.habitrpg.android.habitica.ui.helpers.setMarkdown
 import com.habitrpg.android.habitica.ui.views.HabiticaIcons
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
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 b43e6d762..b9d735b51 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
@@ -16,7 +16,7 @@ import com.habitrpg.android.habitica.helpers.HealthFormatter
 import com.habitrpg.android.habitica.helpers.NumberAbbreviator
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.android.habitica.ui.AvatarView
+import com.habitrpg.common.habitica.views.AvatarView
 import com.habitrpg.android.habitica.ui.activities.MainActivity
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 
diff --git a/common/.gitignore b/common/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/common/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/common/build.gradle b/common/build.gradle
new file mode 100644
index 000000000..871507c17
--- /dev/null
+++ b/common/build.gradle
@@ -0,0 +1,46 @@
+plugins {
+    id 'com.android.library'
+    id 'org.jetbrains.kotlin.android'
+}
+
+android {
+    compileSdk 32
+
+    defaultConfig {
+        minSdk 21
+        targetSdk 32
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
+    }
+}
+
+dependencies {
+
+    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'com.google.android.material:material:1.6.0'
+
+    // Image Management Library
+    implementation("io.coil-kt:coil:1.4.0")
+    implementation("io.coil-kt:coil-gif:1.4.0")
+
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+}
\ No newline at end of file
diff --git a/common/consumer-rules.pro b/common/consumer-rules.pro
new file mode 100644
index 000000000..e69de29bb
diff --git a/common/proguard-rules.pro b/common/proguard-rules.pro
new file mode 100644
index 000000000..481bb4348
--- /dev/null
+++ b/common/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/common/src/androidTest/java/com/habitrpg/common/habitica/ExampleInstrumentedTest.kt b/common/src/androidTest/java/com/habitrpg/common/habitica/ExampleInstrumentedTest.kt
new file mode 100644
index 000000000..9e4a0be54
--- /dev/null
+++ b/common/src/androidTest/java/com/habitrpg/common/habitica/ExampleInstrumentedTest.kt
@@ -0,0 +1,24 @@
+package com.habitrpg.common.habitica
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.habitrpg.common.habitica.test", appContext.packageName)
+    }
+}
\ No newline at end of file
diff --git a/common/src/main/AndroidManifest.xml b/common/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..411eba234
--- /dev/null
+++ b/common/src/main/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.habitrpg.common.habitica">
+
+</manifest>
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.kt b/common/src/main/java/com/habitrpg/common/habitica/extensions/DataBindingUtils.kt
similarity index 95%
rename from Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.kt
rename to common/src/main/java/com/habitrpg/common/habitica/extensions/DataBindingUtils.kt
index 5200028c9..5f556ec29 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/extensions/DataBindingUtils.kt
@@ -1,4 +1,4 @@
-package com.habitrpg.android.habitica.ui.helpers
+package com.habitrpg.common.habitica.extensions
 
 import android.content.Context
 import android.graphics.PorterDuff
@@ -11,10 +11,10 @@ import androidx.core.content.res.ResourcesCompat
 import androidx.core.graphics.drawable.toBitmap
 import coil.imageLoader
 import coil.request.ImageRequest
-import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.extensions.setTintWith
-import com.habitrpg.android.habitica.helpers.AppConfigManager
-import com.habitrpg.android.habitica.ui.views.PixelArtView
+import com.habitrpg.common.habitica.R
+import com.habitrpg.common.habitica.helpers.AppConfigManager
+import com.habitrpg.common.habitica.views.PixelArtView
 import java.util.Collections
 import java.util.Date
 
@@ -101,7 +101,7 @@ object DataBindingUtils {
     private var spriteSubstitutions: Map<String, String> = HashMap()
         get() {
             if (Date().time - (lastSubstitutionCheck?.time ?: 0) > 180000) {
-                field = AppConfigManager(null).spriteSubstitutions()["generic"] ?: HashMap()
+                field = AppConfigManager().spriteSubstitutions()["generic"] ?: HashMap()
                 lastSubstitutionCheck = Date()
             }
             return field
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Drawable-Extendsions.kt b/common/src/main/java/com/habitrpg/common/habitica/extensions/Drawable-Extendsions.kt
similarity index 100%
rename from Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Drawable-Extendsions.kt
rename to common/src/main/java/com/habitrpg/common/habitica/extensions/Drawable-Extendsions.kt
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Int-Extensions.kt b/common/src/main/java/com/habitrpg/common/habitica/extensions/Int-Extensions.kt
similarity index 100%
rename from Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Int-Extensions.kt
rename to common/src/main/java/com/habitrpg/common/habitica/extensions/Int-Extensions.kt
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Optional.kt b/common/src/main/java/com/habitrpg/common/habitica/extensions/Optional.kt
similarity index 82%
rename from Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Optional.kt
rename to common/src/main/java/com/habitrpg/common/habitica/extensions/Optional.kt
index 701d619f3..7b2a62423 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Optional.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/extensions/Optional.kt
@@ -1,4 +1,4 @@
-package com.habitrpg.android.habitica.extensions
+package com.habitrpg.common.habitica.extensions
 
 data class Optional<T>(val value: T?) {
     val isEmpty = value == null
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/String-Extensions.kt b/common/src/main/java/com/habitrpg/common/habitica/extensions/String-Extensions.kt
similarity index 100%
rename from Habitica/src/main/java/com/habitrpg/android/habitica/extensions/String-Extensions.kt
rename to common/src/main/java/com/habitrpg/common/habitica/extensions/String-Extensions.kt
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
new file mode 100644
index 000000000..941eae549
--- /dev/null
+++ b/common/src/main/java/com/habitrpg/common/habitica/helpers/AppConfigManager.kt
@@ -0,0 +1,9 @@
+package com.habitrpg.common.habitica.helpers
+
+open class AppConfigManager() {
+
+    open fun spriteSubstitutions(): Map<String, Map<String, String>> {
+        // TODO actual implementation
+        return emptyMap()
+    }
+}
\ No newline at end of file
diff --git a/common/src/main/java/com/habitrpg/common/habitica/models/Avatar.kt b/common/src/main/java/com/habitrpg/common/habitica/models/Avatar.kt
new file mode 100644
index 000000000..5f0c6fa66
--- /dev/null
+++ b/common/src/main/java/com/habitrpg/common/habitica/models/Avatar.kt
@@ -0,0 +1,17 @@
+package com.habitrpg.common.habitica.models
+
+
+interface Avatar {
+    val currentMount: String?
+    val currentPet: String?
+    val sleep: Boolean
+    val stats: AvatarStats?
+    val preferences: AvatarPreferences?
+    val flags: AvatarFlags?
+    val gemCount: Int
+    val hourglassCount: Int
+    val costume: AvatarOutfit?
+    val equipped: AvatarOutfit?
+    val hasClass: Boolean
+    fun isValid(): Boolean
+}
\ No newline at end of file
diff --git a/common/src/main/java/com/habitrpg/common/habitica/models/AvatarBuffs.kt b/common/src/main/java/com/habitrpg/common/habitica/models/AvatarBuffs.kt
new file mode 100644
index 000000000..1c1ae1531
--- /dev/null
+++ b/common/src/main/java/com/habitrpg/common/habitica/models/AvatarBuffs.kt
@@ -0,0 +1,14 @@
+package com.habitrpg.common.habitica.models
+
+interface AvatarBuffs {
+    var con: Float?
+    var str: Float?
+    var per: Float?
+    var _int: Float?
+
+    var seafoam: Boolean?
+    var spookySparkles: Boolean?
+    var shinySeed: Boolean?
+    var snowball: Boolean?
+    var streaks: Boolean?
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/AvatarFlags.kt b/common/src/main/java/com/habitrpg/common/habitica/models/AvatarFlags.kt
similarity index 54%
rename from Habitica/src/main/java/com/habitrpg/android/habitica/models/AvatarFlags.kt
rename to common/src/main/java/com/habitrpg/common/habitica/models/AvatarFlags.kt
index 4e59e94de..a3a972e89 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/AvatarFlags.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/models/AvatarFlags.kt
@@ -1,5 +1,5 @@
-package com.habitrpg.android.habitica.models
+package com.habitrpg.common.habitica.models
 
 interface AvatarFlags {
     var classSelected: Boolean
-}
+}
\ No newline at end of file
diff --git a/common/src/main/java/com/habitrpg/common/habitica/models/AvatarHair.kt b/common/src/main/java/com/habitrpg/common/habitica/models/AvatarHair.kt
new file mode 100644
index 000000000..937a12ac2
--- /dev/null
+++ b/common/src/main/java/com/habitrpg/common/habitica/models/AvatarHair.kt
@@ -0,0 +1,14 @@
+package com.habitrpg.common.habitica.models
+
+interface AvatarHair {
+    var mustache: Int
+    var beard: Int
+    var bangs: Int
+    var base: Int
+    var flower: Int
+    var color: String?
+
+    fun isAvailable(hairId: Int): Boolean {
+        return hairId > 0
+    }
+}
diff --git a/common/src/main/java/com/habitrpg/common/habitica/models/AvatarOutfit.kt b/common/src/main/java/com/habitrpg/common/habitica/models/AvatarOutfit.kt
new file mode 100644
index 000000000..7745e5663
--- /dev/null
+++ b/common/src/main/java/com/habitrpg/common/habitica/models/AvatarOutfit.kt
@@ -0,0 +1,30 @@
+package com.habitrpg.common.habitica.models
+
+import android.text.TextUtils
+
+interface AvatarOutfit {
+    var armor: String
+    var back: String
+    var body: String
+    var head: String
+    var shield: String
+    var weapon: String
+    var eyeWear: String
+    var headAccessory: String
+
+
+    fun isAvailable(outfit: String): Boolean {
+        return !TextUtils.isEmpty(outfit) && !outfit.endsWith("base_0")
+    }
+
+    fun updateWith(newOutfit: AvatarOutfit) {
+        this.armor = newOutfit.armor
+        this.back = newOutfit.back
+        this.body = newOutfit.body
+        this.eyeWear = newOutfit.eyeWear
+        this.head = newOutfit.head
+        this.headAccessory = newOutfit.headAccessory
+        this.shield = newOutfit.shield
+        this.weapon = newOutfit.weapon
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/AvatarPreferences.kt b/common/src/main/java/com/habitrpg/common/habitica/models/AvatarPreferences.kt
similarity index 65%
rename from Habitica/src/main/java/com/habitrpg/android/habitica/models/AvatarPreferences.kt
rename to common/src/main/java/com/habitrpg/common/habitica/models/AvatarPreferences.kt
index b576faef8..336db2f2d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/AvatarPreferences.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/models/AvatarPreferences.kt
@@ -1,9 +1,7 @@
-package com.habitrpg.android.habitica.models
-
-import com.habitrpg.android.habitica.models.user.Hair
+package com.habitrpg.common.habitica.models
 
 interface AvatarPreferences {
-    val hair: Hair?
+    val hair: AvatarHair?
     val costume: Boolean
     val sleep: Boolean
     val shirt: String?
@@ -12,4 +10,4 @@ interface AvatarPreferences {
     val background: String?
     val chair: String?
     val disableClasses: Boolean
-}
+}
\ No newline at end of file
diff --git a/common/src/main/java/com/habitrpg/common/habitica/models/AvatarStats.kt b/common/src/main/java/com/habitrpg/common/habitica/models/AvatarStats.kt
new file mode 100644
index 000000000..da25846c5
--- /dev/null
+++ b/common/src/main/java/com/habitrpg/common/habitica/models/AvatarStats.kt
@@ -0,0 +1,23 @@
+package com.habitrpg.common.habitica.models
+
+interface AvatarStats {
+    val buffs: AvatarBuffs?
+    var habitClass: String?
+    var points: Int?
+    var lvl: Int?
+    var gp: Double?
+    var exp: Double?
+    var mp: Double?
+    var hp: Double?
+
+    var toNextLevel: Int?
+    var maxHealth: Int?
+    var maxMP: Int?
+    val isBuffed: Boolean
+        get() {
+            return buffs?.str ?: 0f > 0 ||
+                buffs?.con ?: 0f > 0 ||
+                buffs?._int ?: 0f > 0 ||
+                buffs?.per ?: 0f > 0
+        }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.kt b/common/src/main/java/com/habitrpg/common/habitica/views/AvatarView.kt
similarity index 89%
rename from Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.kt
rename to common/src/main/java/com/habitrpg/common/habitica/views/AvatarView.kt
index a20d6a80f..77eab7905 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/views/AvatarView.kt
@@ -1,505 +1,509 @@
-package com.habitrpg.android.habitica.ui
-
-import android.content.Context
-import android.graphics.Bitmap
-import android.graphics.Canvas
-import android.graphics.Matrix
-import android.graphics.PointF
-import android.graphics.Rect
-import android.graphics.RectF
-import android.graphics.drawable.Drawable
-import android.text.TextUtils
-import android.util.AttributeSet
-import android.widget.FrameLayout
-import android.widget.ImageView
-import androidx.core.graphics.drawable.toBitmap
-import androidx.core.view.marginStart
-import androidx.core.view.marginTop
-import coil.clear
-import coil.load
-import coil.target.ImageViewTarget
-import com.habitrpg.android.habitica.BuildConfig
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.extensions.dpToPx
-import com.habitrpg.android.habitica.helpers.AppConfigManager
-import com.habitrpg.android.habitica.models.Avatar
-import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
-import java.util.Date
-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
-    private var showSleeping = true
-    private var hasBackground: Boolean = false
-    private var preview: Map<LayerType, String>? = null
-    private var backgroundForPurchase: String? = null
-    private var hasMount: Boolean = false
-    private var hasPet: Boolean = false
-    private val imageViewHolder = mutableListOf<ImageView>()
-    private var avatar: Avatar? = null
-    private var avatarRectF: RectF? = null
-    private val avatarMatrix = Matrix()
-    private val numberLayersInProcess = AtomicInteger(0)
-    private var avatarImageConsumer: ((Bitmap?) -> Unit)? = null
-    private var avatarBitmap: Bitmap? = null
-    private var avatarCanvas: Canvas? = null
-    private var currentLayers: Map<LayerType, String>? = null
-
-    private val layerMap: Map<LayerType, String>
-        get() {
-            val avatar = this.avatar ?: return emptyMap()
-            return getLayerMap(avatar, true)
-        }
-
-    private var spriteSubstitutions: Map<String, Map<String, String>> = HashMap()
-        get() {
-            if (Date().time - (lastSubstitutionCheck?.time ?: 0) > 180000) {
-                field = AppConfigManager(null).spriteSubstitutions()
-                lastSubstitutionCheck = Date()
-            }
-            return field
-        }
-    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
-
-    private val avatarImage: Bitmap?
-        get() {
-            if (BuildConfig.DEBUG && (avatar == null || avatarRectF == null)) {
-                error("Assertion failed")
-            }
-            val canvasRect = Rect(0, 0, 140.dpToPx(context), 147.dpToPx(context))
-            if (canvasRect.isEmpty) return null
-            avatarBitmap = Bitmap.createBitmap(canvasRect.width(), canvasRect.height(), Bitmap.Config.ARGB_8888)
-            avatarBitmap?.let { avatarCanvas = Canvas(it) }
-            imageViewHolder.forEach {
-                val lp = it.layoutParams
-                val bitmap = it.drawable?.toBitmap(lp.width, lp.height) ?: return@forEach
-                avatarCanvas?.drawBitmap(bitmap, Rect(0, 0, bitmap.width, bitmap.height), Rect(it.marginStart, it.marginTop, bitmap.width, bitmap.height), null)
-            }
-
-            return avatarBitmap
-        }
-
-    constructor(context: Context) : super(context) {
-        init(null, 0)
-    }
-
-    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
-        init(attrs, 0)
-    }
-
-    constructor(context: Context, attrs: AttributeSet, defStyle: Int) : super(context, attrs, defStyle) {
-        init(attrs, defStyle)
-    }
-
-    constructor(context: Context, showBackground: Boolean, showMount: Boolean, showPet: Boolean) : super(context) {
-        this.showBackground = showBackground
-        this.showMount = showMount
-        this.showPet = showPet
-    }
-
-    private fun init(attrs: AttributeSet?, defStyle: Int) {
-        // Load attributes
-        val a = context.obtainStyledAttributes(
-            attrs, R.styleable.AvatarView, defStyle, 0
-        )
-
-        try {
-            showBackground = a.getBoolean(R.styleable.AvatarView_showBackground, true)
-            showMount = a.getBoolean(R.styleable.AvatarView_showMount, true)
-            showPet = a.getBoolean(R.styleable.AvatarView_showPet, true)
-            showSleeping = a.getBoolean(R.styleable.AvatarView_showSleeping, true)
-        } finally {
-            a.recycle()
-        }
-
-        setWillNotDraw(false)
-    }
-
-    private fun showLayers(layerMap: Map<LayerType, String>) {
-        var i = 0
-
-        currentLayers = layerMap
-
-        numberLayersInProcess.set(layerMap.size)
-
-        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]
-            }
-
-            if (imageView.tag == layerName) {
-                continue
-            }
-            imageView.tag = layerName
-            imageView.clear()
-            imageView.setImageResource(0)
-
-            imageView.load(DataBindingUtils.BASE_IMAGE_URL + DataBindingUtils.getFullFilename(layerName)) {
-                allowHardware(false)
-                target(object : ImageViewTarget(imageView) {
-                    override fun onError(error: Drawable?) {
-                        super.onError(error)
-                        onLayerComplete()
-                    }
-
-                    override fun onSuccess(result: Drawable) {
-                        super.onSuccess(result)
-                        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)) {
-            imageViewHolder[i].clear()
-            imageViewHolder[i].setImageResource(0)
-            imageViewHolder[i].tag = null
-            i++
-        }
-    }
-
-    private fun getLayerMap(avatar: Avatar, resetHasAttributes: Boolean): Map<LayerType, String> {
-        val layerMap = getAvatarLayerMap(avatar, spriteSubstitutions)
-
-        if (resetHasAttributes) {
-            hasPet = false
-            hasMount = hasPet
-            hasBackground = hasMount
-        }
-
-        var mountName = avatar.currentMount
-        if (showMount && mountName?.isNotEmpty() == true) {
-            mountName = substituteOrReturn(spriteSubstitutions["mounts"], mountName)
-            layerMap[LayerType.MOUNT_BODY] = "Mount_Body_$mountName"
-            layerMap[LayerType.MOUNT_HEAD] = "Mount_Head_$mountName"
-            if (resetHasAttributes) hasMount = true
-        }
-
-        var petName = avatar.currentPet
-        if (showPet && petName?.isNotEmpty() == true) {
-            petName = substituteOrReturn(spriteSubstitutions["pets"], petName)
-            layerMap[LayerType.PET] = "Pet-$petName"
-            if (resetHasAttributes) hasPet = true
-        }
-
-        var backgroundName = avatar.preferences?.background
-//        if (backgroundForPurchase != null) {
-        if (preview != null) {
-            layerMap[preview?.keys?.first()] = preview?.values?.first()
-            if (resetHasAttributes) hasBackground = true
-        } else if (showBackground && backgroundName?.isNotEmpty() == true) {
-            backgroundName = substituteOrReturn(spriteSubstitutions["backgrounds"], backgroundName)
-            layerMap[LayerType.BACKGROUND] = "background_$backgroundName"
-            if (resetHasAttributes) hasBackground = true
-        }
-
-        if (showSleeping && avatar.sleep) {
-            layerMap[LayerType.ZZZ] = "zzz"
-        }
-
-        return layerMap
-    }
-
-    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
-            }
-        }
-        return name
-    }
-
-    @Suppress("ReturnCount")
-    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()) {
-            return layerMap
-        }
-
-        val prefs = avatar.preferences ?: return layerMap
-        val outfit = if (prefs.costume) {
-            avatar.costume
-        } else {
-            avatar.equipped
-        }
-
-        var hasVisualBuffs = false
-
-        avatar.stats?.buffs?.let { buffs ->
-            if (buffs.snowball == true) {
-                layerMap[LayerType.VISUAL_BUFF] = "avatar_snowball_" + avatar.stats?.habitClass
-                hasVisualBuffs = true
-            }
-
-            if (buffs.seafoam == true) {
-                layerMap[LayerType.VISUAL_BUFF] = "seafoam_star"
-                hasVisualBuffs = true
-            }
-
-            if (buffs.shinySeed == true) {
-                layerMap[LayerType.VISUAL_BUFF] = "avatar_floral_" + avatar.stats?.habitClass
-                hasVisualBuffs = true
-            }
-
-            if (buffs.spookySparkles == true) {
-                layerMap[LayerType.VISUAL_BUFF] = "ghost"
-                hasVisualBuffs = true
-            }
-        }
-
-        val substitutedVisualBuff = substitutions["visualBuff"]?.get("full")
-        if (substitutedVisualBuff != null) {
-            layerMap[LayerType.VISUAL_BUFF] = substitutedVisualBuff
-            hasVisualBuffs = true
-        }
-
-        val hair = prefs.hair
-        if (!hasVisualBuffs) {
-            if (!TextUtils.isEmpty(prefs.chair)) {
-                layerMap[LayerType.CHAIR] = prefs.chair
-            }
-
-            if (outfit != null) {
-                if (!TextUtils.isEmpty(outfit.back) && "back_base_0" != outfit.back) {
-                    layerMap[LayerType.BACK] = outfit.back
-                }
-                if (outfit.isAvailable(outfit.armor)) {
-                    layerMap[LayerType.ARMOR] = prefs.size + "_" + outfit.armor
-                }
-                if (outfit.isAvailable(outfit.body)) {
-                    layerMap[LayerType.BODY] = outfit.body
-                }
-                if (outfit.isAvailable(outfit.eyeWear)) {
-                    layerMap[LayerType.EYEWEAR] = outfit.eyeWear
-                }
-                if (outfit.isAvailable(outfit.head)) {
-                    layerMap[LayerType.HEAD] = outfit.head
-                }
-                if (outfit.isAvailable(outfit.headAccessory)) {
-                    layerMap[LayerType.HEAD_ACCESSORY] = outfit.headAccessory
-                }
-                if (outfit.isAvailable(outfit.shield)) {
-                    layerMap[LayerType.SHIELD] = outfit.shield
-                }
-                if (outfit.isAvailable(outfit.weapon)) {
-                    layerMap[LayerType.WEAPON] = outfit.weapon
-                }
-            }
-
-            layerMap[LayerType.SKIN] = "skin_" + prefs.skin + if (prefs.sleep) "_sleep" else ""
-            layerMap[LayerType.SHIRT] = prefs.size + "_shirt_" + prefs.shirt
-            layerMap[LayerType.HEAD_0] = "head_0"
-
-            if (hair != null) {
-                val hairColor = hair.color
-
-                if (hair.isAvailable(hair.base)) {
-                    layerMap[LayerType.HAIR_BASE] = "hair_base_" + hair.base + "_" + hairColor
-                }
-                if (hair.isAvailable(hair.bangs)) {
-                    layerMap[LayerType.HAIR_BANGS] = "hair_bangs_" + hair.bangs + "_" + hairColor
-                }
-                if (hair.isAvailable(hair.mustache)) {
-                    layerMap[LayerType.HAIR_MUSTACHE] = "hair_mustache_" + hair.mustache + "_" + hairColor
-                }
-                if (hair.isAvailable(hair.beard)) {
-                    layerMap[LayerType.HAIR_BEARD] = "hair_beard_" + hair.beard + "_" + hairColor
-                }
-            }
-        }
-
-        if (hair != null && hair.isAvailable(hair.flower)) {
-            layerMap[LayerType.HAIR_FLOWER] = "hair_flower_" + hair.flower
-        }
-
-        return layerMap
-    }
-
-    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)
-            }
-        }
-
-        // 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.MOUNT_BODY, LayerType.MOUNT_HEAD -> offset = PointF(25.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(25.0f, 18f)
-                        } else {
-                            PointF(25.0f, 0f)
-                        }
-                        hasPet -> PointF(25.0f, 24.5f)
-                        else -> PointF(25.0f, 28.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())
-            }
-        }
-
-        if (offset != null) {
-            when (layerName) {
-                "head_special_0" -> offset = PointF(offset.x - 3, offset.y - 18)
-                "weapon_special_0" -> offset = PointF(offset.x - 12, offset.y + 4)
-                "weapon_special_1" -> offset = PointF(offset.x - 12, offset.y + 4)
-                "weapon_special_critical" -> offset = PointF(offset.x - 12, offset.y + 4)
-                "head_special_1" -> offset = PointF(offset.x, offset.y + 3)
-            }
-
-            val translateMatrix = Matrix()
-            translateMatrix.setTranslate(offset.x, offset.y)
-            translateMatrix.mapRect(boundsF)
-        }
-
-        // resize bounds to fit and keep original aspect ratio
-        avatarMatrix.mapRect(boundsF)
-        boundsF.round(bounds)
-
-        return bounds
-    }
-
-    private fun onLayerComplete() {
-        if (numberLayersInProcess.decrementAndGet() == 0) {
-            avatarImageConsumer?.invoke(avatarImage)
-        }
-    }
-
-    fun onAvatarImageReady(consumer: ((Bitmap?) -> Unit)) {
-        avatarImageConsumer = consumer
-        if (imageViewHolder.size > 0 && numberLayersInProcess.get() == 0) {
-            avatarImageConsumer?.invoke(avatarImage)
-        } else {
-            initAvatarRectMatrix()
-            showLayers(layerMap)
-        }
-    }
-
-    fun setAvatar(avatar: Avatar, preview: Map<LayerType, String>? = null) {
-        val oldUser = this.avatar
-        this.avatar = avatar
-        preview?.let { this.preview = preview }
-
-        var equals = false
-        if (oldUser != null) {
-            val newLayerMap = getLayerMap(avatar, false)
-
-            equals = currentLayers == newLayerMap
-        }
-        if (!equals) {
-            invalidate()
-        }
-    }
-
-    private fun initAvatarRectMatrix() {
-        if (avatarRectF == null) {
-            val srcRect = originalRect
-            // full hero box when showMount and showPet is enabled (140w * 147h)
-            // compact hero box when only showBackground is enabled (114w * 114h)
-            // hero only box when all show settings disabled (90w * 90h)
-            val width = if (this.width > 0) this.width.toFloat() else 140.dpToPx(context).toFloat()
-            val height = if (this.height > 0) this.height.toFloat() else 147.dpToPx(context).toFloat()
-            avatarRectF = RectF(0f, 0f, width, height)
-            avatarMatrix.setRectToRect(RectF(srcRect), avatarRectF, Matrix.ScaleToFit.START)
-            avatarRectF = RectF(srcRect)
-            avatarMatrix.mapRect(avatarRectF)
-        }
-    }
-
-    override fun onDraw(canvas: Canvas?) {
-        super.onDraw(canvas)
-
-        initAvatarRectMatrix()
-
-        // draw only when user is set
-        if (avatar?.isValid() != true) return
-
-        showLayers(layerMap)
-    }
-
-    override fun invalidateDrawable(drawable: Drawable) {
-        invalidate()
-        if (avatarCanvas != null) draw(avatarCanvas)
-    }
-
-    enum class LayerType {
-        BACKGROUND,
-        MOUNT_BODY,
-        CHAIR,
-        BACK,
-        SKIN,
-        SHIRT,
-        ARMOR,
-        BODY,
-        HEAD_0,
-        HAIR_BASE,
-        HAIR_BANGS,
-        HAIR_MUSTACHE,
-        HAIR_BEARD,
-        EYEWEAR,
-        VISUAL_BUFF,
-        HEAD,
-        HEAD_ACCESSORY,
-        HAIR_FLOWER,
-        SHIELD,
-        WEAPON,
-        MOUNT_HEAD,
-        ZZZ,
-        PET
-    }
-
-    companion object {
-        private val FULL_HERO_RECT = Rect(0, 0, 140, 147)
-        private val COMPACT_HERO_RECT = Rect(0, 0, 114, 114)
-        private val HERO_ONLY_RECT = Rect(0, 0, 90, 90)
-    }
-}
+package com.habitrpg.common.habitica.views
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.graphics.Matrix
+import android.graphics.PointF
+import android.graphics.Rect
+import android.graphics.RectF
+import android.graphics.drawable.Drawable
+import android.text.TextUtils
+import android.util.AttributeSet
+import android.widget.FrameLayout
+import android.widget.ImageView
+import androidx.core.graphics.drawable.toBitmap
+import androidx.core.view.marginStart
+import androidx.core.view.marginTop
+import coil.clear
+import coil.load
+import com.habitrpg.common.habitica.BuildConfig
+import com.habitrpg.android.habitica.extensions.dpToPx
+import com.habitrpg.common.habitica.R
+import com.habitrpg.common.habitica.extensions.DataBindingUtils
+import com.habitrpg.common.habitica.helpers.AppConfigManager
+import com.habitrpg.common.habitica.models.Avatar
+import java.util.Date
+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
+    private var showSleeping = true
+    private var hasBackground: Boolean = false
+    private var hasMount: Boolean = false
+    private var hasPet: Boolean = false
+    private val imageViewHolder = mutableListOf<ImageView>()
+    private var avatar: Avatar? = null
+    private var avatarRectF: RectF? = null
+    private val avatarMatrix = Matrix()
+    private val numberLayersInProcess = AtomicInteger(0)
+    private var avatarImageConsumer: ((Bitmap?) -> Unit)? = null
+    private var avatarBitmap: Bitmap? = null
+    private var avatarCanvas: Canvas? = null
+    private var currentLayers: Map<LayerType, String>? = null
+
+    private val layerMap: Map<LayerType, String>
+        get() {
+            val avatar = this.avatar ?: return emptyMap()
+            return getLayerMap(avatar, true)
+        }
+
+    private var spriteSubstitutions: Map<String, Map<String, String>> = HashMap()
+        get() {
+            if (Date().time - (lastSubstitutionCheck?.time ?: 0) > 180000) {
+                field = AppConfigManager().spriteSubstitutions()
+                lastSubstitutionCheck = Date()
+            }
+            return field
+        }
+    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
+
+    private val avatarImage: Bitmap?
+        get() {
+            if (BuildConfig.DEBUG && (avatar == null || avatarRectF == null)) {
+                error("Assertion failed")
+            }
+            val canvasRect = Rect(0, 0, 140.dpToPx(context), 147.dpToPx(context))
+            if (canvasRect.isEmpty) return null
+            avatarBitmap = Bitmap.createBitmap(
+                canvasRect.width(),
+                canvasRect.height(),
+                Bitmap.Config.ARGB_8888
+            )
+            avatarBitmap?.let { avatarCanvas = Canvas(it) }
+            imageViewHolder.forEach {
+                val lp = it.layoutParams
+                val bitmap = it.drawable?.toBitmap(lp.width, lp.height) ?: return@forEach
+                avatarCanvas?.drawBitmap(bitmap,
+                    Rect(0, 0, bitmap.width, bitmap.height),
+                    Rect(it.marginStart, it.marginTop, bitmap.width, bitmap.height), null)
+            }
+
+            return avatarBitmap
+        }
+
+    constructor(context: Context) : super(context) {
+        init(null, 0)
+    }
+
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
+        init(attrs, 0)
+    }
+
+    constructor(context: Context, attrs: AttributeSet, defStyle: Int) : super(context, attrs, defStyle) {
+        init(attrs, defStyle)
+    }
+
+    constructor(context: Context, showBackground: Boolean, showMount: Boolean, showPet: Boolean) : super(context) {
+        this.showBackground = showBackground
+        this.showMount = showMount
+        this.showPet = showPet
+    }
+
+    private fun init(attrs: AttributeSet?, defStyle: Int) {
+        // Load attributes
+        val a = context.obtainStyledAttributes(
+            attrs, R.styleable.AvatarView, defStyle, 0
+        )
+
+        try {
+            showBackground = a.getBoolean(R.styleable.AvatarView_showBackground, true)
+            showMount = a.getBoolean(R.styleable.AvatarView_showMount, true)
+            showPet = a.getBoolean(R.styleable.AvatarView_showPet, true)
+            showSleeping = a.getBoolean(R.styleable.AvatarView_showSleeping, true)
+        } finally {
+            a.recycle()
+        }
+
+        setWillNotDraw(false)
+    }
+
+    private fun showLayers(layerMap: Map<LayerType, String>) {
+        var i = 0
+
+        currentLayers = layerMap
+
+        numberLayersInProcess.set(layerMap.size)
+
+        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]
+            }
+
+            if (imageView.tag == layerName) {
+                continue
+            }
+            imageView.tag = layerName
+            imageView.clear()
+            imageView.setImageResource(0)
+
+            imageView.load(
+                DataBindingUtils.BASE_IMAGE_URL + DataBindingUtils.getFullFilename(
+                    layerName
+                )
+            ) {
+                allowHardware(false)
+                target(object : coil.target.ImageViewTarget(imageView) {
+                    override fun onError(error: Drawable?) {
+                        super.onError(error)
+                        onLayerComplete()
+                    }
+
+                    override fun onSuccess(result: Drawable) {
+                        super.onSuccess(result)
+                        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)) {
+            imageViewHolder[i].clear()
+            imageViewHolder[i].setImageResource(0)
+            imageViewHolder[i].tag = null
+            i++
+        }
+    }
+
+    private fun getLayerMap(avatar: Avatar, resetHasAttributes: Boolean): Map<LayerType, String> {
+        val layerMap = getAvatarLayerMap(avatar, spriteSubstitutions)
+
+        if (resetHasAttributes) {
+            hasPet = false
+            hasMount = hasPet
+            hasBackground = hasMount
+        }
+
+        var mountName = avatar.currentMount
+        if (showMount && mountName?.isNotEmpty() == true) {
+            mountName = substituteOrReturn(spriteSubstitutions["mounts"], mountName)
+            layerMap[LayerType.MOUNT_BODY] = "Mount_Body_$mountName"
+            layerMap[LayerType.MOUNT_HEAD] = "Mount_Head_$mountName"
+            if (resetHasAttributes) hasMount = true
+        }
+
+        var petName = avatar.currentPet
+        if (showPet && petName?.isNotEmpty() == true) {
+            petName = substituteOrReturn(spriteSubstitutions["pets"], petName)
+            layerMap[LayerType.PET] = "Pet-$petName"
+            if (resetHasAttributes) hasPet = true
+        }
+
+        var backgroundName = avatar.preferences?.background
+        if (showBackground && backgroundName?.isNotEmpty() == true) {
+            backgroundName = substituteOrReturn(spriteSubstitutions["backgrounds"], backgroundName)
+            layerMap[LayerType.BACKGROUND] = "background_$backgroundName"
+            if (resetHasAttributes) hasBackground = true
+        }
+
+        if (showSleeping && avatar.sleep) {
+            layerMap[LayerType.ZZZ] = "zzz"
+        }
+
+        return layerMap
+    }
+
+    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
+            }
+        }
+        return name
+    }
+
+    @Suppress("ReturnCount")
+    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()) {
+            return layerMap
+        }
+
+        val prefs = avatar.preferences ?: return layerMap
+        val outfit = if (prefs.costume) {
+            avatar.costume
+        } else {
+            avatar.equipped
+        }
+
+        var hasVisualBuffs = false
+
+        avatar.stats?.buffs?.let { buffs ->
+            if (buffs.snowball == true) {
+                layerMap[LayerType.VISUAL_BUFF] = "avatar_snowball_" + avatar.stats?.habitClass
+                hasVisualBuffs = true
+            }
+
+            if (buffs.seafoam == true) {
+                layerMap[LayerType.VISUAL_BUFF] = "seafoam_star"
+                hasVisualBuffs = true
+            }
+
+            if (buffs.shinySeed == true) {
+                layerMap[LayerType.VISUAL_BUFF] = "avatar_floral_" + avatar.stats?.habitClass
+                hasVisualBuffs = true
+            }
+
+            if (buffs.spookySparkles == true) {
+                layerMap[LayerType.VISUAL_BUFF] = "ghost"
+                hasVisualBuffs = true
+            }
+        }
+
+        val substitutedVisualBuff = substitutions["visualBuff"]?.get("full")
+        if (substitutedVisualBuff != null) {
+            layerMap[LayerType.VISUAL_BUFF] = substitutedVisualBuff
+            hasVisualBuffs = true
+        }
+
+        val hair = prefs.hair
+        if (!hasVisualBuffs) {
+            if (!TextUtils.isEmpty(prefs.chair)) {
+                layerMap[LayerType.CHAIR] = prefs.chair
+            }
+
+            if (outfit != null) {
+                if (!TextUtils.isEmpty(outfit.back) && "back_base_0" != outfit.back) {
+                    layerMap[LayerType.BACK] = outfit.back
+                }
+                if (outfit.isAvailable(outfit.armor)) {
+                    layerMap[LayerType.ARMOR] = prefs.size + "_" + outfit.armor
+                }
+                if (outfit.isAvailable(outfit.body)) {
+                    layerMap[LayerType.BODY] = outfit.body
+                }
+                if (outfit.isAvailable(outfit.eyeWear)) {
+                    layerMap[LayerType.EYEWEAR] = outfit.eyeWear
+                }
+                if (outfit.isAvailable(outfit.head)) {
+                    layerMap[LayerType.HEAD] = outfit.head
+                }
+                if (outfit.isAvailable(outfit.headAccessory)) {
+                    layerMap[LayerType.HEAD_ACCESSORY] = outfit.headAccessory
+                }
+                if (outfit.isAvailable(outfit.shield)) {
+                    layerMap[LayerType.SHIELD] = outfit.shield
+                }
+                if (outfit.isAvailable(outfit.weapon)) {
+                    layerMap[LayerType.WEAPON] = outfit.weapon
+                }
+            }
+
+            layerMap[LayerType.SKIN] = "skin_" + prefs.skin + if (prefs.sleep) "_sleep" else ""
+            layerMap[LayerType.SHIRT] = prefs.size + "_shirt_" + prefs.shirt
+            layerMap[LayerType.HEAD_0] = "head_0"
+
+            if (hair != null) {
+                val hairColor = hair.color
+
+                if (hair.isAvailable(hair.base)) {
+                    layerMap[LayerType.HAIR_BASE] = "hair_base_" + hair.base + "_" + hairColor
+                }
+                if (hair.isAvailable(hair.bangs)) {
+                    layerMap[LayerType.HAIR_BANGS] = "hair_bangs_" + hair.bangs + "_" + hairColor
+                }
+                if (hair.isAvailable(hair.mustache)) {
+                    layerMap[LayerType.HAIR_MUSTACHE] = "hair_mustache_" + hair.mustache + "_" + hairColor
+                }
+                if (hair.isAvailable(hair.beard)) {
+                    layerMap[LayerType.HAIR_BEARD] = "hair_beard_" + hair.beard + "_" + hairColor
+                }
+            }
+        }
+
+        if (hair != null && hair.isAvailable(hair.flower)) {
+            layerMap[LayerType.HAIR_FLOWER] = "hair_flower_" + hair.flower
+        }
+
+        return layerMap
+    }
+
+    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)
+            }
+        }
+
+        // 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.MOUNT_BODY, LayerType.MOUNT_HEAD -> offset =
+                    PointF(25.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(25.0f, 18f)
+                        } else {
+                            PointF(25.0f, 0f)
+                        }
+                        hasPet -> PointF(25.0f, 24.5f)
+                        else -> PointF(25.0f, 28.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())
+            }
+        }
+
+        if (offset != null) {
+            when (layerName) {
+                "head_special_0" -> offset = PointF(offset.x - 3, offset.y - 18)
+                "weapon_special_0" -> offset = PointF(offset.x - 12, offset.y + 4)
+                "weapon_special_1" -> offset = PointF(offset.x - 12, offset.y + 4)
+                "weapon_special_critical" -> offset = PointF(offset.x - 12, offset.y + 4)
+                "head_special_1" -> offset = PointF(offset.x, offset.y + 3)
+            }
+
+            val translateMatrix = Matrix()
+            translateMatrix.setTranslate(offset.x, offset.y)
+            translateMatrix.mapRect(boundsF)
+        }
+
+        // resize bounds to fit and keep original aspect ratio
+        avatarMatrix.mapRect(boundsF)
+        boundsF.round(bounds)
+
+        return bounds
+    }
+
+    private fun onLayerComplete() {
+        if (numberLayersInProcess.decrementAndGet() == 0) {
+            avatarImageConsumer?.invoke(avatarImage)
+        }
+    }
+
+    fun onAvatarImageReady(consumer: ((Bitmap?) -> Unit)) {
+        avatarImageConsumer = consumer
+        if (imageViewHolder.size > 0 && numberLayersInProcess.get() == 0) {
+            avatarImageConsumer?.invoke(avatarImage)
+        } else {
+            initAvatarRectMatrix()
+            showLayers(layerMap)
+        }
+    }
+
+    fun setAvatar(avatar: Avatar) {
+        val oldUser = this.avatar
+        this.avatar = avatar
+
+        var equals = false
+        if (oldUser != null) {
+            val newLayerMap = getLayerMap(avatar, false)
+
+            equals = currentLayers == newLayerMap
+        }
+        if (!equals) {
+            invalidate()
+        }
+    }
+
+    private fun initAvatarRectMatrix() {
+        if (avatarRectF == null) {
+            val srcRect = originalRect
+            // full hero box when showMount and showPet is enabled (140w * 147h)
+            // compact hero box when only showBackground is enabled (114w * 114h)
+            // hero only box when all show settings disabled (90w * 90h)
+            val width = if (this.width > 0) this.width.toFloat() else 140.dpToPx(context).toFloat()
+            val height = if (this.height > 0) this.height.toFloat() else 147.dpToPx(context).toFloat()
+            avatarRectF = RectF(0f, 0f, width, height)
+            avatarMatrix.setRectToRect(RectF(srcRect), avatarRectF, Matrix.ScaleToFit.START)
+            avatarRectF = RectF(srcRect)
+            avatarMatrix.mapRect(avatarRectF)
+        }
+    }
+
+    override fun onDraw(canvas: Canvas?) {
+        super.onDraw(canvas)
+
+        initAvatarRectMatrix()
+
+        // draw only when user is set
+        if (avatar?.isValid() != true) return
+
+        showLayers(layerMap)
+    }
+
+    override fun invalidateDrawable(drawable: Drawable) {
+        invalidate()
+        if (avatarCanvas != null) draw(avatarCanvas)
+    }
+
+    enum class LayerType {
+        BACKGROUND,
+        MOUNT_BODY,
+        CHAIR,
+        BACK,
+        SKIN,
+        SHIRT,
+        ARMOR,
+        BODY,
+        HEAD_0,
+        HAIR_BASE,
+        HAIR_BANGS,
+        HAIR_MUSTACHE,
+        HAIR_BEARD,
+        EYEWEAR,
+        VISUAL_BUFF,
+        HEAD,
+        HEAD_ACCESSORY,
+        HAIR_FLOWER,
+        SHIELD,
+        WEAPON,
+        MOUNT_HEAD,
+        ZZZ,
+        PET
+    }
+
+    companion object {
+        private val FULL_HERO_RECT = Rect(0, 0, 140, 147)
+        private val COMPACT_HERO_RECT = Rect(0, 0, 114, 114)
+        private val HERO_ONLY_RECT = Rect(0, 0, 90, 90)
+    }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/PixelArtView.kt b/common/src/main/java/com/habitrpg/common/habitica/views/PixelArtView.kt
similarity index 97%
rename from Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/PixelArtView.kt
rename to common/src/main/java/com/habitrpg/common/habitica/views/PixelArtView.kt
index 413c747af..2d795e96e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/PixelArtView.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/views/PixelArtView.kt
@@ -1,4 +1,4 @@
-package com.habitrpg.android.habitica.ui.views
+package com.habitrpg.common.habitica.views
 
 import android.content.Context
 import android.graphics.Bitmap
diff --git a/common/src/main/res/drawable/layout_rounded_bg.xml b/common/src/main/res/drawable/layout_rounded_bg.xml
new file mode 100644
index 000000000..b086829ae
--- /dev/null
+++ b/common/src/main/res/drawable/layout_rounded_bg.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/white" />
+    <corners android:radius="@dimen/bar_radius"/>
+    <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
+</shape>
\ No newline at end of file
diff --git a/common/src/main/res/values/attrs.xml b/common/src/main/res/values/attrs.xml
new file mode 100644
index 000000000..2dd19d865
--- /dev/null
+++ b/common/src/main/res/values/attrs.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <declare-styleable name="AvatarView">
+        <attr name="showBackground" format="boolean" />
+        <attr name="showMount" format="boolean" />
+        <attr name="showPet" format="boolean" />
+        <attr name="showSleeping" format="boolean" />
+    </declare-styleable>
+</resources>
\ No newline at end of file
diff --git a/common/src/test/java/com/habitrpg/common/habitica/ExampleUnitTest.kt b/common/src/test/java/com/habitrpg/common/habitica/ExampleUnitTest.kt
new file mode 100644
index 000000000..759425045
--- /dev/null
+++ b/common/src/test/java/com/habitrpg/common/habitica/ExampleUnitTest.kt
@@ -0,0 +1,17 @@
+package com.habitrpg.common.habitica
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index aa64f9dd7..68aeea8b3 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1,4 @@
 include ':shared'
-include 'Habitica', ':Habitica'
\ No newline at end of file
+include 'Habitica', ':Habitica'
+include ':wearos'
+include ':common'
diff --git a/wearos/.gitignore b/wearos/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/wearos/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/wearos/build.gradle b/wearos/build.gradle
new file mode 100644
index 000000000..85e812abc
--- /dev/null
+++ b/wearos/build.gradle
@@ -0,0 +1,39 @@
+plugins {
+    id 'com.android.application'
+    id 'org.jetbrains.kotlin.android'
+}
+
+android {
+    compileSdk 32
+
+    defaultConfig {
+        applicationId "com.habitrpg.wearos.habitica"
+        minSdk 26
+        targetSdk 32
+        versionCode 1
+        versionName "1.0"
+
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    buildFeatures {
+        viewBinding true
+    }
+}
+
+dependencies {
+
+    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'com.google.android.gms:play-services-wearable:17.1.0'
+    implementation 'androidx.percentlayout:percentlayout:1.0.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
+    implementation 'androidx.wear:wear:1.2.0'
+
+    implementation project(':common')
+}
\ No newline at end of file
diff --git a/wearos/proguard-rules.pro b/wearos/proguard-rules.pro
new file mode 100644
index 000000000..481bb4348
--- /dev/null
+++ b/wearos/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/wearos/src/main/AndroidManifest.xml b/wearos/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..24a913094
--- /dev/null
+++ b/wearos/src/main/AndroidManifest.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.habitrpg.wearos.habitica">
+
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+
+    <uses-feature android:name="android.hardware.type.watch" />
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:supportsRtl="true"
+        android:theme="@android:style/Theme.DeviceDefault">
+        <uses-library
+            android:name="com.google.android.wearable"
+            android:required="true" />
+
+        <!--
+               Set to true if your app is Standalone, that is, it does not require the handheld
+               app to run.
+        -->
+        <meta-data
+            android:name="com.google.android.wearable.standalone"
+            android:value="true" />
+
+        <activity
+            android:name=".MainActivity"
+            android:exported="true"
+            android:label="@string/app_name">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/MainActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/MainActivity.kt
new file mode 100644
index 000000000..a552e90bf
--- /dev/null
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/MainActivity.kt
@@ -0,0 +1,17 @@
+package com.habitrpg.wearos.habitica
+
+import android.app.Activity
+import android.os.Bundle
+import com.habitrpg.wearos.habitica.databinding.ActivityMainBinding
+
+class MainActivity : Activity() {
+
+    private lateinit var binding: ActivityMainBinding
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        binding = ActivityMainBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+    }
+}
\ No newline at end of file
diff --git a/wearos/src/main/res/layout/activity_main.xml b/wearos/src/main/res/layout/activity_main.xml
new file mode 100644
index 000000000..81d28e870
--- /dev/null
+++ b/wearos/src/main/res/layout/activity_main.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.wear.widget.BoxInsetLayout
+    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="match_parent"
+    tools:context=".MainActivity"
+    tools:deviceIds="wear"
+    android:padding="@dimen/box_inset_layout_padding">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="@dimen/inner_frame_layout_padding"
+        app:layout_boxedEdges="all">
+
+        <TextView
+            android:id="@+id/text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/hello_world"
+            android:textColor="#FFF" />
+
+    </FrameLayout>
+</androidx.wear.widget.BoxInsetLayout>
\ No newline at end of file
diff --git a/wearos/src/main/res/mipmap-hdpi/ic_launcher.webp b/wearos/src/main/res/mipmap-hdpi/ic_launcher.webp
new file mode 100644
index 0000000000000000000000000000000000000000..c209e78ecd372343283f4157dcfd918ec5165bb3
GIT binary patch
literal 1404
zcmV-?1%vuhNk&F=1pok7MM6+kP&il$0000G0000-002h-06|PpNX!5L00Dqw+t%{r
zzW2vH!KF=w&cMnnN@{whkTw+#mAh0SV?YL=)3MimFYCWp#fpdtz~8$hD5VPuQgtcN
zXl<@<#Cm<R)d19?=)E<{+g@mp0C)CAX%7ksNnpX=jPlJEkqD9%o*fC(U7iySOYHHS
zCLH@bXPyI|^Z)Mc^PG7Oc+NfBJO`d7p5;U`M53Wbd!w|M(MUoNRc2m{@^!wFKzL?&
zx_RAc-^9Azxo%DmXW^9GV0~;n_G9&dym)|QrMEx!y_F=oDunn;1y)cvAc6z{0MHiz
zodGIH07w8nF%*bGq9Gv`YHnm80|d1T$uW=u4vGV%tX#>e5f5yr2h%@8TWh?)bSK`O
z^Z@d={gn7J{iyxL_y_%J|L>ep{dUxUP8a{byupH&!UNR*OutO~0{*T4q5R6@ApLF!
z5{w?Z150gC7#>(VHFJZ-^6O@PYp{t!<r*4*+?g*sysFgiN}}d!-T(>jH(_Z*nzTK4
zkc{fLE4Q3|mA2`CWQ3{8;gxGizgM!zccbdQoOLZc8hThi-IhN90RFT|zlxh3Ty&VG
z?Fe{#<RA5Hg_mG&BZS>9RrRnxzsu|Lg2ddugg7k%>0JeD+{XZ7>Z~{=|M+sh1MF7~
zz>To~`~LVQe1nNoR-gEzkpe{Ak^7{{ZBk2i_<+`Bq<^GB!RYG+z)h;Y3+<{zlMUYd
zrd*W4w&jZ0%kBuDZ1EW&KLpyR7r2=}fF2%0VwHM4pUs}ZI2egi#DRMYZPek*^H9YK
zay4Iy3WXFG(F14xYsoDA|KXgGc5%2DhmQ1gFCkrgHBm!lXG<W<SKpuS2eaDGkL-J-
z!+&UV_N0e<DV*|igwqdC*l{lj0T&&`uq=ycU@f9x0i8jzLa(y*X(YV?PCtUw;ks}p
z4zFn7N(-OG^(9ot1ZhYISOWe9?+l%f6v41n+j<OM$_uJgNP?ZJy}hEMMH=;WiG4I`
zs(bIWwSD<LJnAN(E(Xjr4k(^UYF37F_3f{;E%%FEa&I3I0GbdH@{pD5$m+1PN5CW)
zyZ&*9o#8wstdx@^rci;0B4BP2+H4Y<KbJI5L(bXG(k@`Kp=d>8I5h*uf{rn48Z!_@
z4Bk6TJAB2CKYqPjiX&mWoW>OPFGd$wqro<oln8GL@_6LPC)kg1!M)Y!|NCn7b*0sG
zEN=&c2xMM<>a($ne7EUK;#3V<N-jQ7j($tREa0F&-HzYCQtR#fTCZMRN*ZSm;T7a+
zuxa$}zDL8R9wGYkHb$+gJoiM@z+u{u7a_VUBwtd)bPzHxH}C`W=^2PsBr`s7taBMG
zm#Ss=-o`)W8%%x%>YkXaew%Kh^3OrMht<?zOY6P}#rBhn_hrWY$_P`{#CBR9w?+E6
zt7r#NN-tjxFY{9q75P<|L<ZJBHwn4FhG(&i>jYN?XEoY`tRPQsAkH-DSL^QqyN0>^
zmC>{#F14jz4GeW{pJoRpLFa_*GI{?T93^rX7SPQgT@LbLqpNA}<@2wH;q493)G=1Y
z#-sCiRNX~qf3KgiFzB3I>4Z%AfS(3$`-aMIBU+6?gbgDb!)L~A)je+;fR0jWLL-Fu
z4)<UE%?IC0Du41FrE~F_qc8nOq>P{c7{B4Hp91&%??2$v9iRSFnuckHUm}or9seH6
z>%NbT+5*@L5(I9<vs%8>j@06@(!<!eaZcF<_le1MVaYMg=gRy*f2#IaBH-mJIpy+L
z=Gsbhd6=3>{ZI?U0=pKn8uwIg&L{JV14+8s2hnvbRrU|hZCd}IJu7*;;ECgO%8_*W
Kmw_-CKmY()leWbG

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/mipmap-mdpi/ic_launcher.webp b/wearos/src/main/res/mipmap-mdpi/ic_launcher.webp
new file mode 100644
index 0000000000000000000000000000000000000000..4f0f1d64e58ba64d180ce43ee13bf9a17835fbca
GIT binary patch
literal 982
zcmV;{11bDcNk&G_0{{S5MM6+kP&il$0000G0000l001ul06|PpNU8t;00Dqo+t#w^
z^1csucXz7-Qrhzl9HuH<!ckn_w-(t15itRHmqN0O$B3XH(E|jyV^QXq8=yM`Q**vy
zpEpgQd+no=J<Tlv&+_>B%l>&>1tG2^vb*E&k^T3$FG1eQZ51g$uv4V+kI`0<^1Z@N
zk?Jjh$olyC%l>)Xq;7!>{iBj&BjJ`P&$fsCfpve_epJOBkTF?nu-B7D!hO=2ZR}<p
z;bEy|mw1;}P&gp|0ssKe4*;D3Dlh;r06r}ehC-pC4mGy`3;|+W04+#B4r_x~@mHHy
z)H}bD|I2-n_L$pW;*I)~?=#N<)`92&<$3IR`#<SH6@I&FRQa6xBmQ5wPwJ2PAI(ne
z$L2Yb@JHxb`+bLk*AjR$^`b?pr|?!6=+AboIQ2D-p)UI7x(J0|5(5~ur$_+)`>C%4
zc_9eOXvPbC4kzU8YowIA8cW~Uv|eB&yYwAObSwL2vY~UYI7NXPvf3b+c^?wcs~_t{
ze_m66-0)^{JdOMKPwjpQ@Sna!*?$wTZ~su*tNv7o!gXT!GRgivP}ec?5>l1!7<(rT
zds|8x(qGc673zrvYIz;J23FG{9nHMnAuP}NpAED^laz3mAN1sy+NXK)!6v1FxQ;lh
zOBLA>$~P3r4b*NcqR;y6pwyhZ<hjKiZs6mOSFB&+cIl`GV$93-<ciUjF#*1^<p~gh
ziQ_{)r0dA7$It&Fe=obxu8n!+elxmgqxPbUL!FxW0;AOfqz@8JOz9Qbm)m-9!^7D)
z480@BoIIb<oT``+rVla8L)8fXO&6}3P9n4v$`6WG<DUNWuKb9J9rUsAn7d-_YWT^U
z{NXl@OAPIJ!>3_PiDb|%n1gGjl3ZU}ujInlP{eks-#oA6>rh&g+!f`hv#_%JrgYPu
z(U^&XLW^Q<WhKYr9rXr6*~Tmpuq6NjnD6;;NNBGIg-1ZvfACQ4{ocrwM0)?`oL2ts
zCXY5KT@`(ir63J0?%+_(-dDgf<6R$u{lCdy6Zi5d+Bf;1OXyD;xe3#Gug*&T|0o41
zD8;$|JvUv&@vsLIH&C5+S{!k&{~Z54^y@9r>X7F9Z*SRPpQl{B%x)_AMp^}_v~?j7
zapvHMKxSf*Mtyx8I}-<*UGn3)oHd(nn=)BZ`d$lDBwq_GL($_TPaS{UeevT(AJ`p0
z9%+hQb6z)U9qjbuXjg|dExCLjpS8$VKQ55VsIC%@{N5t{NsW)=hNGI`J=x97_kbz@
E0Of=7!T<mO

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/mipmap-xhdpi/ic_launcher.webp b/wearos/src/main/res/mipmap-xhdpi/ic_launcher.webp
new file mode 100644
index 0000000000000000000000000000000000000000..948a3070fe34c611c42c0d3ad3013a0dce358be0
GIT binary patch
literal 1900
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

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/wearos/src/main/res/mipmap-xxhdpi/ic_launcher.webp
new file mode 100644
index 0000000000000000000000000000000000000000..28d4b77f9f036a47549d47db79c16788749dca10
GIT binary patch
literal 2884
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

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/wearos/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
new file mode 100644
index 0000000000000000000000000000000000000000..aa7d6427e6fa1074b79ccd52ef67ac15c5637e85
GIT binary patch
literal 3844
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
G0001O&w8c+

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/values-round/strings.xml b/wearos/src/main/res/values-round/strings.xml
new file mode 100644
index 000000000..d74c66c62
--- /dev/null
+++ b/wearos/src/main/res/values-round/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="hello_world">Hello Round World!</string>
+</resources>
\ No newline at end of file
diff --git a/wearos/src/main/res/values/dimens.xml b/wearos/src/main/res/values/dimens.xml
new file mode 100644
index 000000000..1a7ba4a1a
--- /dev/null
+++ b/wearos/src/main/res/values/dimens.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--
+    Because the window insets on round devices are larger than 15dp, this padding only applies
+    to square screens.
+    -->
+    <dimen name="box_inset_layout_padding">0dp</dimen>
+
+    <!--
+    This padding applies to both square and round screens. The total padding between the buttons
+    and the window insets is box_inset_layout_padding (above variable) on square screens and
+    inner_frame_layout_padding (below variable) on round screens.
+    -->
+    <dimen name="inner_frame_layout_padding">5dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/wearos/src/main/res/values/strings.xml b/wearos/src/main/res/values/strings.xml
new file mode 100644
index 000000000..56db6aa67
--- /dev/null
+++ b/wearos/src/main/res/values/strings.xml
@@ -0,0 +1,8 @@
+<resources>
+    <string name="app_name">Habitica</string>
+    <!--
+    This string is used for square devices and overridden by hello_world in
+    values-round/strings.xml for round devices.
+    -->
+    <string name="hello_world">Hello Square World!</string>
+</resources>
\ No newline at end of file