Optimize icons and stuff

Habitica/proguard-rules.pro

@@ -97,21 +97,6 @@
 -keepclassmembers class * {
     native <methods>;
 }
-# Keep our interfaces so they can be used by other ProGuard rules.
-# See http://sourceforge.net/p/proguard/bugs/466/
--keep,allowobfuscation @interface com.facebook.common.internal.DoNotStrip
-
-# Do not strip any method/class that is annotated with @DoNotStrip
--keep @com.facebook.common.internal.DoNotStrip class *
--keepclassmembers class * {
-    @com.facebook.common.internal.DoNotStrip *;
-}
-
-# Keep native methods
--keepclassmembers class * {
-    native <methods>;
-}
-#end fresko
 
 #amplitude
 -keep class com.google.android.gms.ads.** { *; }

Habitica/res/layout/activity_armoire.xml

@@ -23,7 +23,7 @@
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:gravity="center_horizontal">
-        <com.habitrpg.common.habitica.views.CurrencyView
+        <com.habitrpg.android.habitica.ui.views.CurrencyView
             android:id="@+id/gold_view"
             android:layout_width="wrap_content"
             android:layout_height="30dp"

Habitica/res/layout/activity_gift_subscription.xml

@@ -38,7 +38,7 @@
                 app:showMount="false"
                 app:showSleeping="false"
                 android:layout_gravity="center_horizontal"/>
-            <com.habitrpg.common.habitica.views.UsernameLabel
+            <com.habitrpg.android.habitica.ui.views.UsernameLabel
                 android:id="@+id/display_name_text_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"

Habitica/res/layout/ad_button.xml

@@ -11,7 +11,7 @@
         android:layout_height="wrap_content"
         android:textStyle="bold"
         android:textSize="16sp" />
-    <com.habitrpg.common.habitica.views.CurrencyView
+    <com.habitrpg.android.habitica.ui.views.CurrencyView
         android:id="@+id/currency_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

Habitica/res/layout/autocomplete_username.xml

@@ -6,7 +6,7 @@
     android:paddingBottom="@dimen/spacing_medium"
     android:paddingStart="@dimen/spacing_large"
     android:paddingEnd="@dimen/spacing_large">
-<com.habitrpg.common.habitica.views.UsernameLabel
+<com.habitrpg.android.habitica.ui.views.UsernameLabel
     android:id="@+id/display_name_view"
     android:layout_width="match_parent"
     android:layout_height="wrap_content" />

Habitica/res/layout/chat_item.xml

@@ -35,7 +35,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
-                    <com.habitrpg.common.habitica.views.UsernameLabel
+                    <com.habitrpg.android.habitica.ui.views.UsernameLabel
                         android:id="@+id/user_label"
                         style="@style/ChatMessageUserTextViewStyle"
                         android:layout_width="wrap_content"

Habitica/res/layout/customization_grid_background_item.xml

@@ -23,7 +23,7 @@
             android:layout_width="match_parent"
             android:layout_height="32dp"
             android:background="@drawable/layout_rounded_bg_shopitem_price">
-            <com.habitrpg.common.habitica.views.CurrencyView
+            <com.habitrpg.android.habitica.ui.views.CurrencyView
                 android:id="@+id/price_label"
                 android:layout_width="wrap_content"
                 android:layout_height="32dp"

Habitica/res/layout/customization_grid_item.xml

@@ -23,7 +23,7 @@
             android:layout_width="match_parent"
             android:layout_height="32dp"
             android:background="@drawable/layout_rounded_bg_shopitem_price">
-                    <com.habitrpg.common.habitica.views.CurrencyView
+                    <com.habitrpg.android.habitica.ui.views.CurrencyView
                         android:id="@+id/price_label"
                         android:layout_width="wrap_content"
                         android:layout_height="32dp"

Habitica/res/layout/customization_section_footer.xml

@@ -22,7 +22,7 @@
             android:textColor="@color/text_primary"
             style="@style/Body1"
             android:layout_marginEnd="@dimen/spacing_medium"/>
-        <com.habitrpg.common.habitica.views.CurrencyView
+        <com.habitrpg.android.habitica.ui.views.CurrencyView
             android:id="@+id/set_price_label"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />

Habitica/res/layout/dialog_hatch_pet_button.xml

@@ -15,7 +15,7 @@
         android:textColor="@color/white"
         android:layout_marginEnd="6dp"
         />
-    <com.habitrpg.common.habitica.views.CurrencyView
+    <com.habitrpg.android.habitica.ui.views.CurrencyView
         android:id="@+id/currencyView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>

Habitica/res/layout/dialog_purchase_shopitem_button.xml

@@ -15,7 +15,7 @@
         android:text="@string/reward_dialog_buy"
         android:textColor="@color/brand_300"
         style="@style/SubHeader1" />
-    <com.habitrpg.common.habitica.views.CurrencyView
+    <com.habitrpg.android.habitica.ui.views.CurrencyView
         android:id="@+id/priceLabel"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

Habitica/res/layout/fragment_challenge_detail.xml

@@ -151,7 +151,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
                 android:layout_weight="1">
-                <com.habitrpg.common.habitica.views.UsernameLabel
+                <com.habitrpg.android.habitica.ui.views.UsernameLabel
                     android:id="@+id/creator_label"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />

Habitica/res/layout/fragment_gift_gem_balance.xml

@@ -18,7 +18,7 @@
             app:showMount="false"
             app:showSleeping="false"
             android:layout_gravity="center_horizontal"/>
-        <com.habitrpg.common.habitica.views.UsernameLabel
+        <com.habitrpg.android.habitica.ui.views.UsernameLabel
             android:id="@+id/display_name_textview"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

Habitica/res/layout/fragment_gift_gem_purchase.xml

@@ -18,7 +18,7 @@
             app:showMount="false"
             app:showSleeping="false"
             android:layout_gravity="center_horizontal"/>
-        <com.habitrpg.common.habitica.views.UsernameLabel
+        <com.habitrpg.android.habitica.ui.views.UsernameLabel
             android:id="@+id/display_name_textview"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

Habitica/res/layout/fragment_guild_detail.xml

@@ -162,7 +162,7 @@
                         android:layout_height="wrap_content"
                         android:orientation="vertical"
                         android:gravity="center_vertical">
-                        <com.habitrpg.common.habitica.views.UsernameLabel
+                        <com.habitrpg.android.habitica.ui.views.UsernameLabel
                             android:id="@+id/leader_profile_name"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content" />

Habitica/res/layout/item_inbox_overview.xml

@@ -30,7 +30,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal">
-            <com.habitrpg.common.habitica.views.UsernameLabel
+            <com.habitrpg.android.habitica.ui.views.UsernameLabel
                 android:id="@+id/display_name_textview"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content" />

Habitica/res/layout/menu_bottom_sheet_item.xml

@@ -18,7 +18,7 @@
         android:layout_height="wrap_content"
         style="@style/BottomMenuItemText"
         tools:text="Menu Item"/>
-    <com.habitrpg.common.habitica.views.CurrencyView
+    <com.habitrpg.android.habitica.ui.views.CurrencyView
         android:id="@+id/currency_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

Habitica/res/layout/party_member.xml

@@ -24,7 +24,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
-        <com.habitrpg.common.habitica.views.UsernameLabel
+        <com.habitrpg.android.habitica.ui.views.UsernameLabel
             android:id="@+id/display_name_textview"
             android:layout_height="wrap_content"
             android:layout_width="0dp"

Habitica/res/layout/row_shopitem.xml

@@ -27,7 +27,7 @@
             android:minHeight="40dp"
             android:gravity="center"
             android:background="@drawable/layout_rounded_bg_shopitem_price">
-            <com.habitrpg.common.habitica.views.CurrencyView
+            <com.habitrpg.android.habitica.ui.views.CurrencyView
                 android:id="@+id/priceLabel"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"

Habitica/res/layout/tavern_chat_intro_item.xml

@@ -30,7 +30,7 @@
         android:textColor="@color/gray_300"
         android:textSize="12sp" />
 
-    <com.habitrpg.common.habitica.views.UsernameLabel
+    <com.habitrpg.android.habitica.ui.views.UsernameLabel
         android:id="@+id/display_name_textview"
         android:layout_width="wrap_content"
         android:layout_height="24dp"

Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt

@@ -38,7 +38,7 @@ import com.habitrpg.android.habitica.ui.activities.LoginActivity
 import com.habitrpg.common.habitica.extensions.setupCoil
 import com.habitrpg.common.habitica.helpers.LanguageHelper
 import com.habitrpg.common.habitica.helpers.MarkdownParser
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import io.realm.Realm
 import io.realm.RealmConfiguration
 import java.lang.ref.WeakReference

Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.kt

@@ -11,7 +11,7 @@ import com.habitrpg.android.habitica.models.user.Stats
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.common.habitica.views.AvatarView
 import com.habitrpg.android.habitica.ui.activities.BaseActivity
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import io.reactivex.rxjava3.core.Flowable

Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.kt

@@ -19,7 +19,7 @@ import com.habitrpg.android.habitica.extensions.round
 import com.habitrpg.android.habitica.models.user.Stats
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.activities.BaseActivity
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.SnackbarDisplayType
 import io.reactivex.rxjava3.core.Flowable

Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.kt

@@ -18,7 +18,7 @@ import com.habitrpg.android.habitica.ui.activities.mainActivityCreatedAt
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import com.habitrpg.common.habitica.helpers.HealthFormatter
 import com.habitrpg.common.habitica.models.Avatar
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import java.util.Date
 import java.util.Locale
 import kotlin.math.floor

Habitica/src/main/java/com/habitrpg/android/habitica/ui/ItemDetailDialog.kt

@@ -10,7 +10,7 @@ import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import com.habitrpg.android.habitica.R
 import com.habitrpg.common.habitica.extensions.loadImage
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.common.habitica.views.PixelArtView
 
 class ItemDetailDialog(context: Context) : AlertDialog(context) {

Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt

@@ -34,10 +34,9 @@ import com.habitrpg.common.habitica.models.tasks.TaskType
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.adapter.social.challenges.ChallengeTasksRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallengesOverviewFragmentDirections
-import com.habitrpg.android.habitica.ui.helpers.ToolbarColorHelper
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import com.habitrpg.android.habitica.ui.viewmodels.TasksViewModel
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaProgressDialog
 import io.reactivex.rxjava3.core.Flowable

Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt

@@ -21,7 +21,7 @@ import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaProgressDialog
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import io.reactivex.rxjava3.functions.Consumer
 import javax.inject.Inject
 

Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/DeathActivity.kt

@@ -19,7 +19,7 @@ import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import com.habitrpg.android.habitica.ui.views.ads.AdButton
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.plattysoft.leonids.ParticleSystem
 import javax.inject.Inject
 

Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FixCharacterValuesActivity.kt

@@ -13,9 +13,7 @@ import com.habitrpg.android.habitica.databinding.ActivityFixcharacterBinding
 import com.habitrpg.android.habitica.extensions.setTintWith
 import com.habitrpg.android.habitica.models.user.Stats
 import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.android.habitica.modules.AppModule
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
-import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaProgressDialog
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 
 import javax.inject.Inject

Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftGemsActivity.kt

@@ -16,7 +16,7 @@ import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.ui.fragments.purchases.GiftBalanceGemsFragment
 import com.habitrpg.android.habitica.ui.fragments.purchases.GiftPurchaseGemsFragment
-import com.habitrpg.common.habitica.views.CurrencyView
+import com.habitrpg.android.habitica.ui.views.CurrencyView
 import javax.inject.Inject
 
 class GiftGemsActivity : PurchaseActivity() {

Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/VerifyUsernameActivity.kt

@@ -12,7 +12,7 @@ import com.habitrpg.android.habitica.databinding.ActivityVerifyUsernameBinding
 import com.habitrpg.android.habitica.extensions.OnChangeTextWatcher
 import com.habitrpg.android.habitica.extensions.runDelayed
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
 import io.reactivex.rxjava3.core.BackpressureStrategy
 import io.reactivex.rxjava3.core.Flowable

Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationEquipmentRecyclerViewAdapter.kt

@@ -14,7 +14,7 @@ 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.common.habitica.extensions.loadImage
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.common.habitica.views.PixelArtView
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import io.reactivex.rxjava3.core.BackpressureStrategy
@@ -126,7 +126,8 @@ class CustomizationEquipmentRecyclerViewAdapter : androidx.recyclerview.widget.R
                     equipment?.value ?: 0
                 }.toString()
 
-                (dialogContent.findViewById<View>(R.id.gem_icon) as? ImageView)?.setImageBitmap(HabiticaIconsHelper.imageOfGem())
+                (dialogContent.findViewById<View>(R.id.gem_icon) as? ImageView)?.setImageBitmap(
+                    HabiticaIconsHelper.imageOfGem())
 
                 val dialog = HabiticaAlertDialog(itemView.context)
                 dialog.addButton(R.string.purchase_button, true) { _, _ ->

Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillsRecyclerViewAdapter.kt

@@ -14,7 +14,7 @@ import com.habitrpg.common.habitica.extensions.isUsingNightModeResources
 import com.habitrpg.android.habitica.models.Skill
 import com.habitrpg.android.habitica.models.user.OwnedItem
 import com.habitrpg.common.habitica.extensions.loadImage
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import io.reactivex.rxjava3.core.BackpressureStrategy
 import io.reactivex.rxjava3.core.Flowable
 import io.reactivex.rxjava3.subjects.PublishSubject

Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/EquipmentRecyclerViewAdapter.kt

@@ -13,7 +13,7 @@ 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.common.habitica.extensions.loadImage
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import io.reactivex.rxjava3.subjects.PublishSubject
 
 class EquipmentRecyclerViewAdapter : BaseRecyclerViewAdapter<Equipment, EquipmentRecyclerViewAdapter.GearViewHolder>() {

Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/HabiticaClassArrayAdapter.kt

@@ -10,7 +10,7 @@ import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.android.habitica.models.user.Stats
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 
 class HabiticaClassArrayAdapter(context: Context, resource: Int, objects: List<CharSequence>) : ArrayAdapter<CharSequence>(context, resource, R.id.textView, objects) {
 

Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.kt

@@ -11,7 +11,7 @@ import com.habitrpg.android.habitica.models.social.ChallengeMembership
 import com.habitrpg.android.habitica.ui.adapter.BaseRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallengeFilterOptions
 import com.habitrpg.common.habitica.helpers.EmojiParser
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import io.reactivex.rxjava3.core.BackpressureStrategy
 import io.reactivex.rxjava3.core.Flowable
 import io.reactivex.rxjava3.subjects.PublishSubject

Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/GuildListAdapter.kt

@@ -19,7 +19,7 @@ import com.habitrpg.common.habitica.helpers.NumberAbbreviator
 import com.habitrpg.android.habitica.models.social.Group
 import com.habitrpg.android.habitica.ui.adapter.BaseRecyclerViewAdapter
 import com.habitrpg.common.habitica.helpers.EmojiParser
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import io.realm.Case
 import io.realm.OrderedRealmCollection
 import java.util.Locale

Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.kt

@@ -18,7 +18,7 @@ import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.adapter.BaseRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.viewHolders.tasks.BaseTaskViewHolder
 import com.habitrpg.android.habitica.ui.viewmodels.TasksViewModel
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import io.reactivex.rxjava3.core.BackpressureStrategy
 import io.reactivex.rxjava3.core.Flowable
 import io.reactivex.rxjava3.functions.Action

Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt

@@ -19,7 +19,7 @@ import com.habitrpg.common.habitica.models.tasks.Attribute
 import com.habitrpg.android.habitica.models.user.Stats
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.android.habitica.ui.views.stats.BulkAllocateStatsDialog
 import javax.inject.Inject

Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/TaskSetupFragment.kt

@@ -17,7 +17,7 @@ import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.activities.SetupActivity
 import com.habitrpg.android.habitica.ui.adapter.setup.TaskSetupAdapter
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import java.util.Date
 
 class TaskSetupFragment : BaseFragment<FragmentSetupTasksBinding>() {

Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.kt

@@ -15,7 +15,7 @@ import com.habitrpg.android.habitica.databinding.FragmentWelcomeBinding
 import com.habitrpg.android.habitica.extensions.OnChangeTextWatcher
 import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import io.reactivex.rxjava3.core.BackpressureStrategy
 import io.reactivex.rxjava3.subjects.PublishSubject
 import java.util.concurrent.TimeUnit

Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.kt

@@ -24,7 +24,7 @@ import com.habitrpg.android.habitica.ui.adapter.SkillsRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
 import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.Companion.showSnackbar
 import io.reactivex.rxjava3.core.Flowable

Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxOverviewFragment.kt

@@ -25,7 +25,7 @@ import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
 import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import com.habitrpg.common.habitica.views.UsernameLabel
+import com.habitrpg.android.habitica.ui.views.UsernameLabel
 import javax.inject.Inject
 
 class InboxOverviewFragment : BaseMainFragment<FragmentInboxBinding>(), androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener, View.OnClickListener {

Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernDetailFragment.kt

@@ -28,7 +28,7 @@ import com.habitrpg.android.habitica.ui.fragments.BaseFragment
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.common.habitica.models.PlayerTier
-import com.habitrpg.common.habitica.views.UsernameLabel
+import com.habitrpg.android.habitica.ui.views.UsernameLabel
 import javax.inject.Inject
 
 class TavernDetailFragment : BaseFragment<FragmentTavernDetailBinding>() {

Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailFragment.kt

@@ -36,7 +36,7 @@ import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.common.habitica.helpers.EmojiParser
 import com.habitrpg.common.habitica.helpers.setMarkdown
 import com.habitrpg.common.habitica.models.tasks.TaskType
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import retrofit2.HttpException
 import javax.inject.Inject
 

Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildDetailFragment.kt

@@ -26,8 +26,8 @@ import com.habitrpg.android.habitica.ui.activities.MainActivity
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
 import com.habitrpg.common.habitica.helpers.setMarkdown
 import com.habitrpg.android.habitica.ui.viewmodels.GroupViewModel
-import com.habitrpg.common.habitica.views.HabiticaIcons
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIcons
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.SnackbarActivity
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import kotlinx.coroutines.Dispatchers

Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQOverviewFragment.kt

@@ -17,7 +17,7 @@ import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
 import com.habitrpg.common.habitica.helpers.setMarkdown
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import io.reactivex.rxjava3.functions.Consumer
 import javax.inject.Inject
 
@@ -45,13 +45,20 @@ class FAQOverviewFragment : BaseMainFragment<FragmentFaqOverviewBinding>() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        binding?.healthSection?.findViewById<ImageView>(R.id.icon_view)?.setImageBitmap(HabiticaIconsHelper.imageOfHeartLarge())
-        binding?.experienceSection?.findViewById<ImageView>(R.id.icon_view)?.setImageBitmap(HabiticaIconsHelper.imageOfExperienceReward())
-        binding?.manaSection?.findViewById<ImageView>(R.id.icon_view)?.setImageBitmap(HabiticaIconsHelper.imageOfMagicLarge())
-        binding?.goldSection?.findViewById<ImageView>(R.id.icon_view)?.setImageBitmap(HabiticaIconsHelper.imageOfGoldReward())
-        binding?.gemsSection?.findViewById<ImageView>(R.id.icon_view)?.setImageBitmap(HabiticaIconsHelper.imageOfGem())
-        binding?.hourglassesSection?.findViewById<ImageView>(R.id.icon_view)?.setImageBitmap(HabiticaIconsHelper.imageOfHourglassLarge())
-        binding?.statsSection?.findViewById<ImageView>(R.id.icon_view)?.setImageBitmap(HabiticaIconsHelper.imageOfStats())
+        binding?.healthSection?.findViewById<ImageView>(R.id.icon_view)?.setImageBitmap(
+            HabiticaIconsHelper.imageOfHeartLarge())
+        binding?.experienceSection?.findViewById<ImageView>(R.id.icon_view)?.setImageBitmap(
+            HabiticaIconsHelper.imageOfExperienceReward())
+        binding?.manaSection?.findViewById<ImageView>(R.id.icon_view)?.setImageBitmap(
+            HabiticaIconsHelper.imageOfMagicLarge())
+        binding?.goldSection?.findViewById<ImageView>(R.id.icon_view)?.setImageBitmap(
+            HabiticaIconsHelper.imageOfGoldReward())
+        binding?.gemsSection?.findViewById<ImageView>(R.id.icon_view)?.setImageBitmap(
+            HabiticaIconsHelper.imageOfGem())
+        binding?.hourglassesSection?.findViewById<ImageView>(R.id.icon_view)?.setImageBitmap(
+            HabiticaIconsHelper.imageOfHourglassLarge())
+        binding?.statsSection?.findViewById<ImageView>(R.id.icon_view)?.setImageBitmap(
+            HabiticaIconsHelper.imageOfStats())
 
         binding?.moreHelpTextView?.setMarkdown(context?.getString(R.string.need_help_header_description, "[Habitica Help Guild](https://habitica.com/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a)"))
         binding?.moreHelpTextView?.setOnClickListener { MainNavigationController.navigate(R.id.guildFragment, bundleOf("groupID" to "5481ccf3-5d2d-48a9-a871-70a7380cee5a")) }

Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt

@@ -47,7 +47,7 @@ import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.common.habitica.models.responses.TaskDirection
 import com.habitrpg.common.habitica.models.responses.TaskScoringResult
 import com.habitrpg.common.habitica.models.tasks.TaskType
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import kotlinx.coroutines.Job

Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/AutocompleteAdapter.kt

@@ -15,7 +15,7 @@ import com.habitrpg.android.habitica.models.social.ChatMessage
 import com.habitrpg.android.habitica.models.social.FindUsernameResult
 import com.habitrpg.android.habitica.models.user.Authentication
 import com.habitrpg.android.habitica.models.user.Profile
-import com.habitrpg.common.habitica.views.UsernameLabel
+import com.habitrpg.android.habitica.ui.views.UsernameLabel
 import com.habitrpg.common.habitica.helpers.EmojiMap
 import com.habitrpg.common.habitica.helpers.EmojiParser
 import java.util.Date

Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ChatRecyclerViewHolder.kt

@@ -23,7 +23,7 @@ import com.habitrpg.common.habitica.extensions.DataBindingUtils
 import com.habitrpg.common.habitica.extensions.dpToPx
 import com.habitrpg.common.habitica.helpers.MarkdownParser
 import com.habitrpg.common.habitica.helpers.setParsedMarkdown
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.core.Maybe
 import io.reactivex.rxjava3.schedulers.Schedulers

Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/GroupMemberViewHolder.kt

@@ -8,7 +8,7 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.PartyMemberBinding
 import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.models.user.Stats
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 
 class GroupMemberViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView), PopupMenu.OnMenuItemClickListener {
     private val binding = PartyMemberBinding.bind(itemView)

Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ShopItemViewHolder.kt

@@ -11,7 +11,7 @@ import com.habitrpg.common.habitica.extensions.dpToPx
 import com.habitrpg.common.habitica.extensions.isUsingNightModeResources
 import com.habitrpg.android.habitica.models.shops.ShopItem
 import com.habitrpg.common.habitica.extensions.loadImage
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.shops.PurchaseDialog
 
 class ShopItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), View.OnClickListener {

Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.kt

@@ -10,7 +10,7 @@ import com.habitrpg.common.habitica.helpers.NumberAbbreviator
 import com.habitrpg.common.habitica.models.responses.TaskDirection
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.ui.ItemDetailDialog
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 
 class RewardViewHolder(
     itemView: View,

Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CollapsibleSectionView.kt

@@ -13,7 +13,6 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.ViewCollapsibleSectionBinding
 import com.habitrpg.common.habitica.extensions.getThemeColor
 import com.habitrpg.common.habitica.extensions.layoutInflater
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
 
 class CollapsibleSectionView(context: Context, attrs: AttributeSet?) : LinearLayout(context, attrs) {
     val infoIconView: ImageView

Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyView.kt

@@ -1,4 +1,4 @@
-package com.habitrpg.common.habitica.views
+package com.habitrpg.android.habitica.ui.views
 
 import android.animation.ValueAnimator
 import android.content.Context
@@ -13,8 +13,8 @@ import androidx.core.animation.doOnEnd
 import androidx.core.animation.doOnStart
 import androidx.core.content.ContextCompat
 import androidx.core.view.updateLayoutParams
-import com.habitrpg.common.habitica.extensions.isUsingNightModeResources
 import com.habitrpg.common.habitica.R
+import com.habitrpg.common.habitica.extensions.isUsingNightModeResources
 import com.habitrpg.common.habitica.helpers.NumberAbbreviator
 
 class CurrencyView : androidx.appcompat.widget.AppCompatTextView {
@@ -69,21 +69,21 @@ class CurrencyView : androidx.appcompat.widget.AppCompatTextView {
 
     private fun configureCurrency() {
         if ("gold" == currency) {
-            icon = HabiticaIconsHelper.imageOfGold()
+            icon = com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper.imageOfGold()
             if (lightBackground) {
                 setTextColor(ContextCompat.getColor(context, R.color.yellow_1))
             } else {
                 setTextColor(ContextCompat.getColor(context, R.color.yellow_100))
             }
         } else if ("gems" == currency) {
-            icon = HabiticaIconsHelper.imageOfGem()
+            icon = com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper.imageOfGem()
             if (lightBackground) {
                 setTextColor(ContextCompat.getColor(context, R.color.green_10))
             } else {
                 setTextColor(ContextCompat.getColor(context, R.color.green_50))
             }
         } else if ("hourglasses" == currency) {
-            icon = HabiticaIconsHelper.imageOfHourglass()
+            icon = com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper.imageOfHourglass()
             if (lightBackground) {
                 setTextColor(ContextCompat.getColor(context, R.color.brand_300))
             } else {

Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyViews.kt

@@ -6,7 +6,6 @@ import android.util.TypedValue
 import android.widget.LinearLayout
 import com.habitrpg.android.habitica.R
 import com.habitrpg.common.habitica.extensions.isUsingNightModeResources
-import com.habitrpg.common.habitica.views.CurrencyView
 
 class CurrencyViews : LinearLayout {
     var lightBackground: Boolean = false

Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIcons.java

@@ -1,4 +1,4 @@
-package com.habitrpg.common.habitica.views;
+package com.habitrpg.android.habitica.ui.views;
 
 import android.content.Context;
 import android.graphics.Bitmap;

Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIconsHelper.java

@@ -1,4 +1,4 @@
-package com.habitrpg.common.habitica.views;
+package com.habitrpg.android.habitica.ui.views;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -8,8 +8,6 @@ import android.graphics.RectF;
 
 import androidx.annotation.ColorInt;
 
-import com.habitrpg.common.habitica.views.HabiticaIcons;
-
 /**
  * Created by phillip on 05.09.17.
  */

Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/UsernameLabel.kt

@@ -1,4 +1,4 @@
-package com.habitrpg.common.habitica.views
+package com.habitrpg.android.habitica.ui.views
 
 import android.content.Context
 import android.util.AttributeSet
@@ -44,7 +44,7 @@ class UsernameLabel @JvmOverloads constructor(
                 tierIconView.visibility = View.GONE
             } else {
                 tierIconView.visibility = View.VISIBLE
-                tierIconView.setImageBitmap(HabiticaIconsHelper.imageOfContributorBadge(value.toFloat(), isNPC))
+                tierIconView.setImageBitmap(com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper.imageOfContributorBadge(value.toFloat(), isNPC))
             }
         }
 

Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/QuestCompletedDialogContent.kt

@@ -16,7 +16,7 @@ import com.habitrpg.common.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.models.inventory.QuestContent
 import com.habitrpg.android.habitica.models.inventory.QuestDropItem
 import com.habitrpg.common.habitica.extensions.loadImage
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.common.habitica.views.PixelArtView
 
 class QuestCompletedDialogContent : LinearLayout {

Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/equipment/EquipmentOverviewItem.kt

@@ -10,7 +10,7 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.EquipmentOverviewItemBinding
 import com.habitrpg.common.habitica.extensions.layoutInflater
 import com.habitrpg.common.habitica.extensions.loadImage
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 
 class EquipmentOverviewItem @JvmOverloads constructor(
     context: Context,

Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientHourglassesDialog.kt

@@ -6,7 +6,7 @@ import androidx.core.os.bundleOf
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.extensions.addCloseButton
 import com.habitrpg.android.habitica.helpers.MainNavigationController
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 
 class InsufficientHourglassesDialog(context: Context) : InsufficientCurrencyDialog(context) {
     override fun onCreate(savedInstanceState: Bundle?) {

Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/StarView.kt

@@ -8,7 +8,7 @@ import android.content.Context
 import android.util.AttributeSet
 import android.view.View
 import androidx.appcompat.widget.AppCompatImageView
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 
 class StarView : AppCompatImageView {
 

Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt

@@ -28,9 +28,9 @@ import com.habitrpg.android.habitica.models.shops.ShopItem
 import com.habitrpg.android.habitica.models.user.OwnedItem
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.activities.ArmoireActivityDirections
-import com.habitrpg.common.habitica.views.CurrencyView
+import com.habitrpg.android.habitica.ui.views.CurrencyView
 import com.habitrpg.android.habitica.ui.views.CurrencyViews
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.SnackbarActivity
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.android.habitica.ui.views.insufficientCurrency.InsufficientGemsDialog

Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogGemsContent.kt

@@ -6,7 +6,7 @@ import com.habitrpg.android.habitica.databinding.DialogPurchaseGemsBinding
 import com.habitrpg.android.habitica.extensions.asDrawable
 import com.habitrpg.common.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.models.shops.ShopItem
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.common.habitica.views.PixelArtView
 
 internal class PurchaseDialogGemsContent(context: Context) : PurchaseDialogContent(context) {

Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogQuestContent.kt

@@ -13,7 +13,7 @@ import com.habitrpg.common.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.models.inventory.QuestContent
 import com.habitrpg.android.habitica.models.inventory.QuestDropItem
 import com.habitrpg.common.habitica.extensions.loadImage
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.common.habitica.views.PixelArtView
 
 class PurchaseDialogQuestContent(context: Context) : PurchaseDialogContent(context) {

Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/OldQuestProgressView.kt

@@ -18,8 +18,8 @@ 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.common.habitica.extensions.loadImage
-import com.habitrpg.common.habitica.views.HabiticaIcons
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIcons
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 
 class OldQuestProgressView : LinearLayout {
     private val binding = QuestProgressOldBinding.inflate(context.layoutInflater, this)

Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/QuestMenuView.kt

@@ -13,7 +13,7 @@ import com.habitrpg.common.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.models.inventory.Quest
 import com.habitrpg.android.habitica.models.inventory.QuestContent
 import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import java.util.Locale
 
 class QuestMenuView : LinearLayout {

Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/QuestProgressView.kt

@@ -28,8 +28,8 @@ import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.common.habitica.extensions.DataBindingUtils
 import com.habitrpg.common.habitica.extensions.loadImage
 import com.habitrpg.common.habitica.helpers.setMarkdown
-import com.habitrpg.common.habitica.views.HabiticaIcons
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIcons
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.NPCBannerView
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers

Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/StatsView.kt

@@ -11,7 +11,7 @@ import com.habitrpg.android.habitica.databinding.StatsViewBinding
 import com.habitrpg.common.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.extensions.setTintWith
 import com.habitrpg.android.habitica.helpers.HapticFeedbackManager
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 
 class StatsView(context: Context, attrs: AttributeSet?) : LinearLayout(context, attrs) {
     private val binding = StatsViewBinding.inflate(context.layoutInflater, this, true)

Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionDetailsView.kt

@@ -11,7 +11,7 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.SubscriptionDetailsBinding
 import com.habitrpg.common.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.models.user.SubscriptionPlan
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import java.text.DateFormat
 import java.time.LocalDate
 import java.time.format.DateTimeFormatter

Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/HabitScoringButtonsView.kt

@@ -11,7 +11,7 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.TaskFormHabitScoringBinding
 import com.habitrpg.android.habitica.extensions.asDrawable
 import com.habitrpg.common.habitica.extensions.layoutInflater
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 
 class HabitScoringButtonsView @JvmOverloads constructor(
     context: Context,

Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/StepperValueFormView.kt

@@ -9,7 +9,7 @@ import com.habitrpg.android.habitica.databinding.FormStepperValueBinding
 import com.habitrpg.android.habitica.extensions.OnChangeTextWatcher
 import com.habitrpg.android.habitica.extensions.asDrawable
 import com.habitrpg.common.habitica.extensions.layoutInflater
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import java.text.DecimalFormat
 
 class StepperValueFormView @JvmOverloads constructor(

Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskDifficultyButtons.kt

@@ -15,7 +15,7 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.extensions.asDrawable
 import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.common.habitica.models.tasks.TaskDifficulty
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 
 class TaskDifficultyButtons @JvmOverloads constructor(
     context: Context,

Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.kt

@@ -18,7 +18,7 @@ import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.common.habitica.views.AvatarView
 import com.habitrpg.android.habitica.ui.activities.MainActivity
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 
 class AvatarStatsWidgetProvider : BaseWidgetProvider() {
 

wearos/src/main/java/com/habitrpg/wearos/habitica/MainApplication.kt

@@ -4,7 +4,6 @@ import android.app.Application
 import android.content.Intent
 import com.habitrpg.common.habitica.extensions.setupCoil
 import com.habitrpg.common.habitica.helpers.MarkdownParser
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
 import com.habitrpg.wearos.habitica.data.repositories.TaskRepository
 import com.habitrpg.wearos.habitica.data.repositories.UserRepository
 import com.habitrpg.wearos.habitica.ui.activities.BaseActivity
@@ -26,7 +25,6 @@ class MainApplication : Application() {
 
     override fun onCreate() {
         super.onCreate()
-        HabiticaIconsHelper.init(this)
         MarkdownParser.setup(this)
         setupCoil()
 

wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/StatsActivity.kt

@@ -8,7 +8,6 @@ import androidx.activity.viewModels
 import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.ActivityStatsBinding
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
 import com.habitrpg.wearos.habitica.models.user.Stats
 import com.habitrpg.wearos.habitica.models.user.User
 import com.habitrpg.wearos.habitica.ui.viewmodels.StatsViewModel
@@ -25,6 +24,8 @@ class StatsActivity : BaseActivity<ActivityStatsBinding, StatsViewModel>() {
         viewModel.user.observe(this) {
             loadViews(it)
         }
+
+        viewModel.retrieveUser()
     }
 
     private fun setViews() {
@@ -58,9 +59,9 @@ class StatsActivity : BaseActivity<ActivityStatsBinding, StatsViewModel>() {
         binding.expStatValue.visibility = INVISIBLE
         binding.mpStatValue.visibility = INVISIBLE
 
-        binding.hpStatValue.setStatValueResources(HabiticaIconsHelper.imageOfHeartLarge(), R.color.hp_bar_color)
-        binding.expStatValue.setStatValueResources(HabiticaIconsHelper.imageOfExperience(), R.color.exp_bar_color)
-        binding.mpStatValue.setStatValueResources(HabiticaIconsHelper.imageOfMagic(), R.color.mpColor)
+        binding.hpStatValue.setStatValueResources(R.drawable.heart, R.color.hp_bar_color)
+        binding.expStatValue.setStatValueResources(R.drawable.experience, R.color.exp_bar_color)
+        binding.mpStatValue.setStatValueResources(R.drawable.magic, R.color.mpColor)
     }
 
     private fun updateStats(user: User) {

wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskResultActivity.kt

@@ -16,7 +16,6 @@ import com.habitrpg.android.habitica.extensions.localizedCapitalize
 import com.habitrpg.common.habitica.extensions.dpToPx
 import com.habitrpg.common.habitica.extensions.loadImage
 import com.habitrpg.common.habitica.models.responses.TaskScoringResult
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
 import com.habitrpg.wearos.habitica.ui.viewmodels.TaskResultViewModel
 import com.habitrpg.wearos.habitica.ui.views.TaskRewardChip
 import dagger.hilt.android.AndroidEntryPoint
@@ -57,7 +56,7 @@ class TaskResultActivity : BaseActivity<ActivityTaskResultBinding, TaskResultVie
             val chip = TaskRewardChip(this)
             chip.set(
                 viewModel.result?.healthDelta,
-                HabiticaIconsHelper.imageOfHeartDarkBg()
+                R.drawable.heart
             )
             chips.add(chip)
         }
@@ -65,7 +64,7 @@ class TaskResultActivity : BaseActivity<ActivityTaskResultBinding, TaskResultVie
             val chip = TaskRewardChip(this)
             chip.set(
                 viewModel.result?.experienceDelta,
-                HabiticaIconsHelper.imageOfExperience()
+                R.drawable.experience
             )
             chips.add(chip)
         }
@@ -73,7 +72,7 @@ class TaskResultActivity : BaseActivity<ActivityTaskResultBinding, TaskResultVie
             val chip = TaskRewardChip(this)
             chip.set(
                 viewModel.result?.goldDelta,
-                HabiticaIconsHelper.imageOfGold()
+                R.drawable.gold
             )
             chips.add(chip)
         }
@@ -81,7 +80,7 @@ class TaskResultActivity : BaseActivity<ActivityTaskResultBinding, TaskResultVie
             val chip = TaskRewardChip(this)
             chip.set(
                 viewModel.result?.manaDelta,
-                HabiticaIconsHelper.imageOfMagic()
+                R.drawable.magic
             )
             chips.add(chip)
         }

wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/StatsViewModel.kt

@@ -2,12 +2,14 @@ package com.habitrpg.wearos.habitica.ui.viewmodels
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.asLiveData
+import androidx.lifecycle.viewModelScope
 import com.habitrpg.wearos.habitica.data.repositories.TaskRepository
 import com.habitrpg.wearos.habitica.data.repositories.UserRepository
 import com.habitrpg.wearos.habitica.managers.LoadingManager
 import com.habitrpg.wearos.habitica.models.user.User
 import com.habitrpg.wearos.habitica.util.ExceptionHandlerBuilder
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltViewModel
@@ -15,6 +17,11 @@ class StatsViewModel @Inject constructor(userRepository: UserRepository,
     taskRepository: TaskRepository,
     exceptionBuilder: ExceptionHandlerBuilder, loadingManager: LoadingManager
 ) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, loadingManager) {
+    fun retrieveUser() {
+        viewModelScope.launch(exceptionBuilder.silent()) {
+            userRepository.retrieveUser(true)
+        }
+    }
 
     var user: LiveData<User> = userRepository.getUser().asLiveData()
 

wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/StatValue.kt

@@ -2,7 +2,6 @@ package com.habitrpg.wearos.habitica.ui.views
 
 import android.animation.ValueAnimator
 import android.content.Context
-import android.graphics.Bitmap
 import android.graphics.Color
 import android.util.AttributeSet
 import androidx.constraintlayout.widget.ConstraintLayout
@@ -31,8 +30,8 @@ class StatValue @JvmOverloads constructor(
         startUpdateCountAnimation(currentValue)
     }
 
-    fun setStatValueResources(bitmap: Bitmap, bitmapColor: Int) {
-        binding.bitmap.setImageBitmap(bitmap)
+    fun setStatValueResources(resId: Int, bitmapColor: Int) {
+        binding.bitmap.setImageResource(resId)
         binding.currentValue.setTextColor(
             context?.resources?.getColor(bitmapColor, null) ?: Color.WHITE
         )

wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/TaskRewardChip.kt

@@ -47,8 +47,8 @@ class TaskRewardChip @JvmOverloads constructor(
         gravity = Gravity.CENTER
     }
 
-    fun set(value: Double?, icon: Bitmap) {
-        binding.iconView.setImageBitmap(icon)
+    fun set(value: Double?, iconRes: Int) {
+        binding.iconView.setImageResource(iconRes)
         var text = formatter.format(value?.round(if (value < 1 && value > -1) 1 else 0))
         if (text.firstOrNull() == '0') {
             text = text.substring(1)