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
2026-04-14 11:46:32 +00:00 · 2022-05-17 15:16:19 +02:00 · 2022-05-17 15:16:19 +02:00 · c5473c58bc
commit c5473c58bc
parent 641fe2615e
167 changed files with 1131 additions and 772 deletions
--- 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 {
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"/>
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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" />
--- 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"
--- 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" />
--- 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" />
--- 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" />
--- 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"
--- 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" />
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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" />
--- 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
--- 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
--- 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)
    }
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Avatar.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Avatar.kt
@ -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
-}
--- 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
--- 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

--- 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
--- 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
 }
--- 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?) {
--- 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
--- 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
-    }
 }
--- 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 = ""
 }
--- 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

--- 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) {
--- 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
--- 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)
        }

--- 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) {

--- 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
--- 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
--- 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
--- 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
--- 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>() {
--- 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
--- 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
--- 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
--- 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

--- 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
--- 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
--- 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
--- 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

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/Show more
+++ b/Show more