sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-04-14 11:46:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move AvatarView to common module

Browse source 
# 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
This commit is contained in:
Phillip Thelen 2022-05-17 15:16:19 +02:00
parent 641fe2615e
commit c5473c58bc
167 changed files with 1131 additions and 772 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Habitica/build.gradle
View file

@ -142,6 +142,7 @@ dependencies {
implementation 'com.willowtreeapps:signinwithapplebutton:0.3' implementation 'com.willowtreeapps:signinwithapplebutton:0.3'
implementation project(':shared') implementation project(':shared')
implementation project(':common')
ktlint('com.pinterest:ktlint:0.45.2') { ktlint('com.pinterest:ktlint:0.45.2') {
attributes { attributes {

2
Habitica/res/layout/achievement_grid_item.xml
View file

@ -22,7 +22,7 @@
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="66dp"> android:layout_height="66dp">
<com.habitrpg.android.habitica.ui.views.PixelArtView <com.habitrpg.common.habitica.views.PixelArtView
android:id="@+id/achievement_icon" android:id="@+id/achievement_icon"
android:layout_width="64dp" android:layout_width="64dp"
android:layout_height="56dp" android:layout_height="56dp"

2
Habitica/res/layout/achievement_list_item.xml
View file

@ -9,7 +9,7 @@
<RelativeLayout <RelativeLayout
android:layout_width="100dp" android:layout_width="100dp"
android:layout_height="86dp"> android:layout_height="86dp">
<com.habitrpg.android.habitica.ui.views.PixelArtView <com.habitrpg.common.habitica.views.PixelArtView
android:id="@+id/achievement_icon" android:id="@+id/achievement_icon"
android:layout_width="64dp" android:layout_width="64dp"
android:layout_height="56dp" android:layout_height="56dp"

2
Habitica/res/layout/activity_armoire.xml
View file

@ -48,7 +48,7 @@
android:layout_height="158dp" android:layout_height="158dp"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:src="@drawable/circle_gray_700" /> 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:id="@+id/icon_view"
android:layout_width="136dp" android:layout_width="136dp"
android:layout_height="136dp" android:layout_height="136dp"

8
Habitica/res/layout/activity_class_selection.xml
View file

@ -36,7 +36,7 @@
android:orientation="vertical" android:orientation="vertical"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:layout_marginEnd="48dp"> android:layout_marginEnd="48dp">
<com.habitrpg.android.habitica.ui.AvatarView <com.habitrpg.common.habitica.views.AvatarView
android:id="@+id/healerAvatarView" android:id="@+id/healerAvatarView"
android:layout_width="75dp" android:layout_width="75dp"
android:layout_height="75dp" android:layout_height="75dp"
@ -60,7 +60,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:gravity="center_horizontal"> android:gravity="center_horizontal">
<com.habitrpg.android.habitica.ui.AvatarView <com.habitrpg.common.habitica.views.AvatarView
android:id="@+id/mageAvatarView" android:id="@+id/mageAvatarView"
android:layout_width="75dp" android:layout_width="75dp"
android:layout_height="75dp" android:layout_height="75dp"
@ -92,7 +92,7 @@
android:orientation="vertical" android:orientation="vertical"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:layout_marginEnd="48dp"> android:layout_marginEnd="48dp">
<com.habitrpg.android.habitica.ui.AvatarView <com.habitrpg.common.habitica.views.AvatarView
android:id="@+id/rogueAvatarView" android:id="@+id/rogueAvatarView"
android:layout_width="75dp" android:layout_width="75dp"
android:layout_height="75dp" android:layout_height="75dp"
@ -116,7 +116,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:gravity="center_horizontal"> android:gravity="center_horizontal">
<com.habitrpg.android.habitica.ui.AvatarView <com.habitrpg.common.habitica.views.AvatarView
android:id="@+id/warriorAvatarView" android:id="@+id/warriorAvatarView"
android:layout_width="75dp" android:layout_width="75dp"
android:layout_height="75dp" android:layout_height="75dp"

4
Habitica/res/layout/activity_full_profile.xml
View file

@ -350,7 +350,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
tools:text="#" /> tools:text="#" />
<com.habitrpg.android.habitica.ui.views.PixelArtView <com.habitrpg.common.habitica.views.PixelArtView
android:id="@+id/current_pet_drawee" android:id="@+id/current_pet_drawee"
android:layout_width="40dp" android:layout_width="40dp"
android:layout_height="40dp"/> android:layout_height="40dp"/>
@ -369,7 +369,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
tools:text="#" /> tools:text="#" />
<com.habitrpg.android.habitica.ui.views.PixelArtView <com.habitrpg.common.habitica.views.PixelArtView
android:id="@+id/current_mount_drawee" android:id="@+id/current_mount_drawee"
android:layout_width="40dp" android:layout_width="40dp"
android:layout_height="40dp"/> android:layout_height="40dp"/>

2
Habitica/res/layout/activity_gift_subscription.xml
View file

@ -29,7 +29,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:layout_marginTop="@dimen/spacing_large"> android:layout_marginTop="@dimen/spacing_large">
<com.habitrpg.android.habitica.ui.AvatarView <com.habitrpg.common.habitica.views.AvatarView
android:id="@+id/avatar_view" android:id="@+id/avatar_view"
android:layout_width="88dp" android:layout_width="88dp"
android:layout_height="84dp" android:layout_height="84dp"

2
Habitica/res/layout/adventure_guide_item.xml
View file

@ -4,7 +4,7 @@
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<com.habitrpg.android.habitica.ui.views.PixelArtView <com.habitrpg.common.habitica.views.PixelArtView
android:id="@+id/icon_view" android:id="@+id/icon_view"
android:layout_width="52dp" android:layout_width="52dp"
android:layout_height="56dp" android:layout_height="56dp"

2
Habitica/res/layout/avatar_with_bars.xml
View file

@ -14,7 +14,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<com.habitrpg.android.habitica.ui.AvatarView <com.habitrpg.common.habitica.views.AvatarView
android:id="@+id/avatarView" android:id="@+id/avatarView"
android:layout_width="@dimen/avatar_header_width" android:layout_width="@dimen/avatar_header_width"
android:layout_height="@dimen/avatar_header_height" android:layout_height="@dimen/avatar_header_height"

4
Habitica/res/layout/can_hatch_item.xml
View file

@ -18,13 +18,13 @@
android:layout_width="86dp" android:layout_width="86dp"
android:layout_height="68dp" android:layout_height="68dp"
android:layout_gravity="center"> android:layout_gravity="center">
<com.habitrpg.android.habitica.ui.views.PixelArtView <com.habitrpg.common.habitica.views.PixelArtView
android:id="@+id/hatchingPotion_view" android:id="@+id/hatchingPotion_view"
android:layout_width="72dp" android:layout_width="72dp"
android:layout_height="72dp" android:layout_height="72dp"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_alignParentEnd="true" /> android:layout_alignParentEnd="true" />
<com.habitrpg.android.habitica.ui.views.PixelArtView <com.habitrpg.common.habitica.views.PixelArtView
android:id="@+id/egg_view" android:id="@+id/egg_view"
android:layout_width="72dp" android:layout_width="72dp"
android:layout_height="72dp" android:layout_height="72dp"

2
Habitica/res/layout/chat_item.xml
View file

@ -16,7 +16,7 @@
android:clipChildren="true" android:clipChildren="true"
android:layout_marginEnd="@dimen/spacing_medium" android:layout_marginEnd="@dimen/spacing_medium"
android:background="@drawable/rounded_avatar_bg"> android:background="@drawable/rounded_avatar_bg">
<com.habitrpg.android.habitica.ui.AvatarView <com.habitrpg.common.habitica.views.AvatarView
android:id="@+id/avatar_view" android:id="@+id/avatar_view"
android:layout_width="60dp" android:layout_width="60dp"
android:layout_height="60dp" android:layout_height="60dp"

2
Habitica/res/layout/customization_grid_item.xml
View file

@ -11,7 +11,7 @@
<FrameLayout <FrameLayout
android:layout_width="76dp" android:layout_width="76dp"
android:layout_height="76dp"> android:layout_height="76dp">
<com.habitrpg.android.habitica.ui.views.PixelArtView <com.habitrpg.common.habitica.views.PixelArtView
android:id="@+id/imageView" android:id="@+id/imageView"
android:layout_width="60dp" android:layout_width="60dp"
android:layout_height="68dp" android:layout_height="68dp"

2
Habitica/res/layout/dialog_achievement_detail.xml
View file

@ -16,7 +16,7 @@
android:layout_width="41dp" android:layout_width="41dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@drawable/sparkles_left" /> android:src="@drawable/sparkles_left" />
<com.habitrpg.android.habitica.ui.views.PixelArtView <com.habitrpg.common.habitica.views.PixelArtView
android:id="@+id/icon_view" android:id="@+id/icon_view"
android:layout_width="52dp" android:layout_width="52dp"
android:layout_height="56dp" android:layout_height="56dp"

2
Habitica/res/layout/dialog_completed_quest_content.xml
View file

@ -46,7 +46,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"/> android:orientation="vertical"/>
<com.habitrpg.android.habitica.ui.views.PixelArtView <com.habitrpg.common.habitica.views.PixelArtView
android:id="@+id/imageView" android:id="@+id/imageView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"

2
Habitica/res/layout/dialog_faint.xml
View file

@ -13,7 +13,7 @@
app:barForegroundColor="@color/hpColor" app:barForegroundColor="@color/hpColor"
app:description="@string/HP_default" /> 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_width="@dimen/avatar_small_width"
android:layout_height="@dimen/avatar_small_height" android:layout_height="@dimen/avatar_small_height"
android:id="@+id/avatarView" android:id="@+id/avatarView"

4
Habitica/res/layout/dialog_first_drop.xml
View file

@ -15,7 +15,7 @@
android:layout_height="80dp" android:layout_height="80dp"
android:background="@drawable/layout_rounded_bg_window" android:background="@drawable/layout_rounded_bg_window"
android:layout_marginEnd="@dimen/spacing_large"> 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:id="@+id/egg_view"
android:layout_width="@dimen/gear_image_size" android:layout_width="@dimen/gear_image_size"
android:layout_height="@dimen/gear_image_size" android:layout_height="@dimen/gear_image_size"
@ -25,7 +25,7 @@
android:layout_width="80dp" android:layout_width="80dp"
android:layout_height="80dp" android:layout_height="80dp"
android:background="@drawable/layout_rounded_bg_window"> 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:id="@+id/hatchingPotion_view"
android:layout_width="@dimen/gear_image_size" android:layout_width="@dimen/gear_image_size"
android:layout_height="@dimen/gear_image_size" android:layout_height="@dimen/gear_image_size"

2
Habitica/res/layout/dialog_levelup.xml
View file

@ -11,7 +11,7 @@
android:gravity="center" android:gravity="center"
android:background="@drawable/avatar_border" android:background="@drawable/avatar_border"
android:layout_marginTop="@dimen/spacing_large"> android:layout_marginTop="@dimen/spacing_large">
<com.habitrpg.android.habitica.ui.AvatarView <com.habitrpg.common.habitica.views.AvatarView
android:layout_width="94dp" android:layout_width="94dp"
android:layout_height="98dp" android:layout_height="98dp"
android:id="@+id/avatarView" android:id="@+id/avatarView"

2
Habitica/res/layout/dialog_login_incentive.xml
View file

@ -5,7 +5,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center_horizontal"> 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_width="@dimen/shopitem_image_size"
android:layout_height="@dimen/shopitem_image_size" android:layout_height="@dimen/shopitem_image_size"
android:id="@+id/imageView" android:id="@+id/imageView"

2
Habitica/res/layout/dialog_open_mysteryitem.xml
View file

@ -5,7 +5,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_horizontal"> android:gravity="center_horizontal">
<com.habitrpg.android.habitica.ui.views.PixelArtView <com.habitrpg.common.habitica.views.PixelArtView
android:id="@+id/icon_view" android:id="@+id/icon_view"
android:layout_height="@dimen/shopitem_image_size" android:layout_height="@dimen/shopitem_image_size"
android:layout_width="@dimen/shopitem_image_size" /> android:layout_width="@dimen/shopitem_image_size" />

4
Habitica/res/layout/dialog_pet_suggest_hatch.xml
View file

@ -22,7 +22,7 @@
android:background="@drawable/layout_rounded_bg_window" android:background="@drawable/layout_rounded_bg_window"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_alignParentStart="true"> android:layout_alignParentStart="true">
<com.habitrpg.android.habitica.ui.views.PixelArtView <com.habitrpg.common.habitica.views.PixelArtView
android:id="@+id/egg_view" android:id="@+id/egg_view"
android:layout_width="@dimen/gear_image_size" android:layout_width="@dimen/gear_image_size"
android:layout_height="@dimen/gear_image_size" android:layout_height="@dimen/gear_image_size"
@ -71,7 +71,7 @@
android:background="@drawable/layout_rounded_bg_window" android:background="@drawable/layout_rounded_bg_window"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_alignParentStart="true"> android:layout_alignParentStart="true">
<com.habitrpg.android.habitica.ui.views.PixelArtView <com.habitrpg.common.habitica.views.PixelArtView
android:id="@+id/hatchingPotion_view" android:id="@+id/hatchingPotion_view"
android:layout_width="@dimen/gear_image_size" android:layout_width="@dimen/gear_image_size"
android:layout_height="@dimen/gear_image_size" android:layout_height="@dimen/gear_image_size"

2
Habitica/res/layout/dialog_purchase_content_gear.xml
View file

@ -10,7 +10,7 @@
tools:parentTag="LinearLayout" tools:parentTag="LinearLayout"
tools:orientation="vertical"> tools:orientation="vertical">
<com.habitrpg.android.habitica.ui.views.PixelArtView <com.habitrpg.common.habitica.views.PixelArtView
android:id="@+id/imageView" android:id="@+id/imageView"
android:layout_width="@dimen/shopitem_image_size" android:layout_width="@dimen/shopitem_image_size"
android:layout_height="@dimen/shopitem_image_size" /> android:layout_height="@dimen/shopitem_image_size" />

2
Habitica/res/layout/dialog_purchase_content_item.xml
View file

@ -11,7 +11,7 @@
tools:parentTag="LinearLayout" tools:parentTag="LinearLayout"
tools:orientation="vertical"> tools:orientation="vertical">
<com.habitrpg.android.habitica.ui.views.PixelArtView <com.habitrpg.common.habitica.views.PixelArtView
android:id="@+id/imageView" android:id="@+id/imageView"
android:layout_width="@dimen/shopitem_image_size" android:layout_width="@dimen/shopitem_image_size"
android:layout_height="@dimen/shopitem_image_size" /> android:layout_height="@dimen/shopitem_image_size" />

2
Habitica/res/layout/dialog_purchase_content_quest.xml
View file

@ -10,7 +10,7 @@
tools:parentTag="LinearLayout" tools:parentTag="LinearLayout"
tools:orientation="vertical"> tools:orientation="vertical">
<com.habitrpg.android.habitica.ui.views.PixelArtView <com.habitrpg.common.habitica.views.PixelArtView
android:id="@+id/imageView" android:id="@+id/imageView"
android:layout_width="@dimen/shopitem_image_size" android:layout_width="@dimen/shopitem_image_size"
android:layout_height="@dimen/shopitem_image_size" /> android:layout_height="@dimen/shopitem_image_size" />

2
Habitica/res/layout/dialog_purchase_customization.xml
View file

@ -6,7 +6,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
tools:parentTag="android.widget.LinearLayout"> 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_width="@dimen/customization_width"
android:layout_height="@dimen/customization_width" android:layout_height="@dimen/customization_width"
android:id="@+id/imageView" android:id="@+id/imageView"

2
Habitica/res/layout/dialog_purchase_gems.xml
View file

@ -12,7 +12,7 @@
tools:background="?attr/colorContentBackground" tools:background="?attr/colorContentBackground"
tools:orientation="vertical"> tools:orientation="vertical">
<com.habitrpg.android.habitica.ui.views.PixelArtView <com.habitrpg.common.habitica.views.PixelArtView
android:id="@+id/imageView" android:id="@+id/imageView"
android:layout_width="@dimen/shopitem_image_size" android:layout_width="@dimen/shopitem_image_size"
android:layout_height="@dimen/shopitem_image_size" /> android:layout_height="@dimen/shopitem_image_size" />

2
Habitica/res/layout/dialog_won_challenge.xml
View file

@ -25,7 +25,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:src="@drawable/sparkles_left" /> android:src="@drawable/sparkles_left" />
<com.habitrpg.android.habitica.ui.views.PixelArtView <com.habitrpg.common.habitica.views.PixelArtView
android:id="@+id/achievement_view" android:id="@+id/achievement_view"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="52dp" android:layout_height="52dp"

2
Habitica/res/layout/drawer_main.xml
View file

@ -22,7 +22,7 @@
android:layout_height="40dp" android:layout_height="40dp"
android:layout_marginEnd="@dimen/spacing_large" android:layout_marginEnd="@dimen/spacing_large"
android:background="@drawable/rounded_avatar_bg"> android:background="@drawable/rounded_avatar_bg">
<com.habitrpg.android.habitica.ui.AvatarView <com.habitrpg.common.habitica.views.AvatarView
android:id="@+id/avatarView" android:id="@+id/avatarView"
android:layout_width="70dp" android:layout_width="70dp"
android:layout_height="70dp" android:layout_height="70dp"

2
Habitica/res/layout/equipment_overview_item.xml
View file

@ -11,7 +11,7 @@
android:layout_height="70dp" android:layout_height="70dp"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:background="@drawable/layout_rounded_bg_content"> 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:id="@+id/icon_view"
android:layout_width="@dimen/gear_image_size" android:layout_width="@dimen/gear_image_size"
android:layout_height="@dimen/gear_image_size" android:layout_height="@dimen/gear_image_size"

2
Habitica/res/layout/fragment_challenge_detail.xml
View file

@ -138,7 +138,7 @@
android:clipChildren="true" android:clipChildren="true"
android:layout_marginEnd="@dimen/spacing_medium" android:layout_marginEnd="@dimen/spacing_medium"
android:background="@drawable/rounded_avatar_bg"> android:background="@drawable/rounded_avatar_bg">
<com.habitrpg.android.habitica.ui.AvatarView <com.habitrpg.common.habitica.views.AvatarView
android:id="@+id/creator_avatarview" android:id="@+id/creator_avatarview"
android:layout_width="60dp" android:layout_width="60dp"
android:layout_height="60dp" android:layout_height="60dp"

2
Habitica/res/layout/fragment_gift_gem_balance.xml
View file

@ -9,7 +9,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:layout_marginTop="@dimen/spacing_large"> android:layout_marginTop="@dimen/spacing_large">
<com.habitrpg.android.habitica.ui.AvatarView <com.habitrpg.common.habitica.views.AvatarView
android:id="@+id/avatar_view" android:id="@+id/avatar_view"
android:layout_width="88dp" android:layout_width="88dp"
android:layout_height="84dp" android:layout_height="84dp"

2
Habitica/res/layout/fragment_gift_gem_purchase.xml
View file

@ -9,7 +9,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:layout_marginTop="@dimen/spacing_large"> android:layout_marginTop="@dimen/spacing_large">
<com.habitrpg.android.habitica.ui.AvatarView <com.habitrpg.common.habitica.views.AvatarView
android:id="@+id/avatar_view" android:id="@+id/avatar_view"
android:layout_width="88dp" android:layout_width="88dp"
android:layout_height="84dp" android:layout_height="84dp"

2
Habitica/res/layout/fragment_guild_detail.xml
View file

@ -149,7 +149,7 @@
android:clipChildren="true" android:clipChildren="true"
android:layout_marginEnd="@dimen/spacing_large" android:layout_marginEnd="@dimen/spacing_large"
android:background="@drawable/rounded_avatar_bg"> 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:id="@+id/leader_avatar_view"
android:layout_width="70dp" android:layout_width="70dp"
android:layout_height="78dp" android:layout_height="78dp"

4
Habitica/res/layout/fragment_party_detail.xml
View file

@ -65,7 +65,7 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:layout_marginBottom="@dimen/spacing_medium" android:layout_marginBottom="@dimen/spacing_medium"
android:visibility="gone"> android:visibility="gone">
<com.habitrpg.android.habitica.ui.views.PixelArtView <com.habitrpg.common.habitica.views.PixelArtView
android:id="@+id/quest_scroll_image_view" android:id="@+id/quest_scroll_image_view"
android:layout_width="@dimen/gear_image_size" android:layout_width="@dimen/gear_image_size"
android:layout_height="@dimen/gear_image_size" /> android:layout_height="@dimen/gear_image_size" />
@ -101,7 +101,7 @@
android:background="@drawable/layout_rounded_bg_window" android:background="@drawable/layout_rounded_bg_window"
android:padding="@dimen/spacing_medium" android:padding="@dimen/spacing_medium"
android:layout_marginBottom="@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:id="@+id/quest_image_view"
android:layout_width="@dimen/quest_image_width" android:layout_width="@dimen/quest_image_width"
android:layout_height="wrap_content" android:layout_height="wrap_content"

2
Habitica/res/layout/fragment_quest_detail.xml
View file

@ -17,7 +17,7 @@
android:paddingTop="12dp" android:paddingTop="12dp"
android:paddingBottom="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:id="@+id/quest_scroll_image_view"
android:layout_width="63dp" android:layout_width="63dp"
android:layout_height="63dp" android:layout_height="63dp"

2
Habitica/res/layout/fragment_setup_avatar.xml
View file

@ -24,7 +24,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@drawable/creator_hills_bg" android:src="@drawable/creator_hills_bg"
android:layout_centerInParent="true" /> android:layout_centerInParent="true" />
<com.habitrpg.android.habitica.ui.AvatarView <com.habitrpg.common.habitica.views.AvatarView
android:id="@+id/avatarView" android:id="@+id/avatarView"
android:layout_width="@dimen/avatar_small_width" android:layout_width="@dimen/avatar_small_width"
android:layout_height="@dimen/avatar_small_height" android:layout_height="@dimen/avatar_small_height"

2
Habitica/res/layout/fragment_setup_tasks.xml
View file

@ -23,7 +23,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@drawable/creator_purple_bg" android:src="@drawable/creator_purple_bg"
android:layout_centerInParent="true" /> android:layout_centerInParent="true" />
<com.habitrpg.android.habitica.ui.AvatarView <com.habitrpg.common.habitica.views.AvatarView
android:id="@+id/avatarView" android:id="@+id/avatarView"
android:layout_width="@dimen/avatar_small_width" android:layout_width="@dimen/avatar_small_width"
android:layout_height="@dimen/avatar_small_height" android:layout_height="@dimen/avatar_small_height"

2
Habitica/res/layout/fragment_subscription.xml
View file

@ -188,7 +188,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> 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:id="@+id/sub_benefits_mystery_item_icon"
android:layout_width="68dp" android:layout_width="68dp"
android:layout_height="68dp" android:layout_height="68dp"

2
Habitica/res/layout/gear_list_item.xml
View file

@ -14,7 +14,7 @@
android:layout_width="80dp" android:layout_width="80dp"
android:layout_height="80dp" android:layout_height="80dp"
android:layout_marginEnd="@dimen/row_padding"> 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_width="@dimen/gear_image_size"
android:layout_height="@dimen/gear_image_size" android:layout_height="@dimen/gear_image_size"
android:layout_gravity="center" android:layout_gravity="center"

2
Habitica/res/layout/item_image_row.xml
View file

@ -9,7 +9,7 @@
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true"
tools:parentTag="android.widget.LinearLayout"> tools:parentTag="android.widget.LinearLayout">
<com.habitrpg.android.habitica.ui.views.PixelArtView <com.habitrpg.common.habitica.views.PixelArtView
android:id="@+id/imageView" android:id="@+id/imageView"
android:layout_width="@dimen/gear_image_size" android:layout_width="@dimen/gear_image_size"
android:layout_height="@dimen/gear_image_size" android:layout_height="@dimen/gear_image_size"

2
Habitica/res/layout/item_inbox_overview.xml
View file

@ -12,7 +12,7 @@
android:clipChildren="true" android:clipChildren="true"
android:layout_marginEnd="@dimen/spacing_medium" android:layout_marginEnd="@dimen/spacing_medium"
android:background="@drawable/rounded_avatar_bg"> android:background="@drawable/rounded_avatar_bg">
<com.habitrpg.android.habitica.ui.AvatarView <com.habitrpg.common.habitica.views.AvatarView
android:id="@+id/avatar_view" android:id="@+id/avatar_view"
android:layout_width="60dp" android:layout_width="60dp"
android:layout_height="60dp" android:layout_height="60dp"

2
Habitica/res/layout/item_item.xml
View file

@ -6,7 +6,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/RowWrapper" style="@style/RowWrapper"
android:clickable="true"> android:clickable="true">
<com.habitrpg.android.habitica.ui.views.PixelArtView <com.habitrpg.common.habitica.views.PixelArtView
android:id="@+id/imageView" android:id="@+id/imageView"
android:layout_width="@dimen/gear_image_size" android:layout_width="@dimen/gear_image_size"
android:layout_height="@dimen/gear_image_size" android:layout_height="@dimen/gear_image_size"

2
Habitica/res/layout/mount_overview_item.xml
View file

@ -21,7 +21,7 @@
android:layout_width="68dp" android:layout_width="68dp"
android:layout_height="66dp" android:layout_height="66dp"
android:layout_gravity="center"> android:layout_gravity="center">
<com.habitrpg.android.habitica.ui.views.PixelArtView <com.habitrpg.common.habitica.views.PixelArtView
android:id="@+id/imageView" android:id="@+id/imageView"
android:layout_width="68dp" android:layout_width="68dp"
android:layout_height="68dp" android:layout_height="68dp"

2
Habitica/res/layout/party_member.xml
View file

@ -8,7 +8,7 @@
android:padding="@dimen/spacing_large" android:padding="@dimen/spacing_large"
android:foreground="?android:attr/selectableItemBackground" android:foreground="?android:attr/selectableItemBackground"
android:focusable="true"> android:focusable="true">
<com.habitrpg.android.habitica.ui.AvatarView <com.habitrpg.common.habitica.views.AvatarView
android:id="@+id/avatarView" android:id="@+id/avatarView"
android:layout_width="97dp" android:layout_width="97dp"
android:layout_height="99dp" android:layout_height="99dp"

2
Habitica/res/layout/pet_detail_item.xml
View file

@ -14,7 +14,7 @@
android:background="@drawable/layout_rounded_bg_window" android:background="@drawable/layout_rounded_bg_window"
android:orientation="vertical" android:orientation="vertical"
android:layout_centerInParent="true"> android:layout_centerInParent="true">
<com.habitrpg.android.habitica.ui.views.PixelArtView <com.habitrpg.common.habitica.views.PixelArtView
android:id="@+id/imageView" android:id="@+id/imageView"
android:layout_width="68dp" android:layout_width="68dp"
android:layout_height="68dp" android:layout_height="68dp"

2
Habitica/res/layout/pet_imageview.xml
View file

@ -2,7 +2,7 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <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_width="@dimen/pet_image_width" android:layout_height="@dimen/pet_image_height"
android:layout_gravity="center"> android:layout_gravity="center">
<com.habitrpg.android.habitica.ui.views.PixelArtView <com.habitrpg.common.habitica.views.PixelArtView
android:id="@+id/pet_imageview" android:id="@+id/pet_imageview"
android:layout_width="68dp" android:layout_width="68dp"
android:layout_height="68dp" android:layout_height="68dp"

2
Habitica/res/layout/pet_overview_item.xml
View file

@ -18,7 +18,7 @@
android:layout_width="68dp" android:layout_width="68dp"
android:layout_height="58dp" android:layout_height="58dp"
android:layout_gravity="center"> android:layout_gravity="center">
<com.habitrpg.android.habitica.ui.views.PixelArtView <com.habitrpg.common.habitica.views.PixelArtView
android:id="@+id/imageView" android:id="@+id/imageView"
android:layout_width="68dp" android:layout_width="68dp"
android:layout_height="68dp" android:layout_height="68dp"

2
Habitica/res/layout/profile_achievement_item.xml
View file

@ -10,7 +10,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"> android:layout_gravity="center_horizontal">
<com.habitrpg.android.habitica.ui.views.PixelArtView <com.habitrpg.common.habitica.views.PixelArtView
android:id="@+id/achievement_drawee" android:id="@+id/achievement_drawee"
android:layout_width="64dp" android:layout_width="64dp"
android:layout_height="56dp" android:layout_height="56dp"

2
Habitica/res/layout/profile_gear_tablerow.xml
View file

@ -30,7 +30,7 @@
</LinearLayout> </LinearLayout>
<com.habitrpg.android.habitica.ui.views.PixelArtView <com.habitrpg.common.habitica.views.PixelArtView
android:id="@+id/gear_drawee" android:id="@+id/gear_drawee"
android:layout_width="40dp" android:layout_width="40dp"
android:layout_height="40dp" android:layout_height="40dp"

2
Habitica/res/layout/purchase_dialog_background.xml
View file

@ -9,7 +9,7 @@
tools:parentTag="LinearLayout" tools:parentTag="LinearLayout"
tools:orientation="vertical"> tools:orientation="vertical">
<com.habitrpg.android.habitica.ui.AvatarView <com.habitrpg.common.habitica.views.AvatarView
android:id="@+id/avatar_view" android:id="@+id/avatar_view"
android:layout_width="@dimen/avatar_width" android:layout_width="@dimen/avatar_width"
android:layout_height="@dimen/avatar_height" android:layout_height="@dimen/avatar_height"

2
Habitica/res/layout/quest_collect.xml
View file

@ -8,7 +8,7 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
<com.habitrpg.android.habitica.ui.views.PixelArtView <com.habitrpg.common.habitica.views.PixelArtView
android:id="@+id/icon_view" android:id="@+id/icon_view"
android:layout_width="40dp" android:layout_width="40dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"

4
Habitica/res/layout/quest_progress.xml
View file

@ -47,7 +47,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:clipChildren="true"> android:clipChildren="true">
<com.habitrpg.android.habitica.ui.views.PixelArtView <com.habitrpg.common.habitica.views.PixelArtView
android:id="@+id/questImageView" android:id="@+id/questImageView"
android:layout_width="219dp" android:layout_width="219dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -56,7 +56,7 @@
android:paddingStart="@dimen/spacing_large" android:paddingStart="@dimen/spacing_large"
android:paddingEnd="@dimen/spacing_large" android:paddingEnd="@dimen/spacing_large"
android:layout_gravity="center_horizontal" /> android:layout_gravity="center_horizontal" />
<com.habitrpg.android.habitica.ui.views.PixelArtView <com.habitrpg.common.habitica.views.PixelArtView
android:id="@+id/questFlourishesImageView" android:id="@+id/questFlourishesImageView"
android:layout_width="310dp" android:layout_width="310dp"
android:layout_height="219dp" android:layout_height="219dp"

2
Habitica/res/layout/row_quest_reward.xml
View file

@ -6,7 +6,7 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:layout_marginBottom="4dp"> android:layout_marginBottom="4dp">
<com.habitrpg.android.habitica.ui.views.PixelArtView <com.habitrpg.common.habitica.views.PixelArtView
android:id="@+id/imageView" android:id="@+id/imageView"
android:layout_width="@dimen/shopitem_image_size" android:layout_width="@dimen/shopitem_image_size"
android:layout_height="@dimen/shopitem_image_size" android:layout_height="@dimen/shopitem_image_size"

2
Habitica/res/layout/row_shopitem.xml
View file

@ -14,7 +14,7 @@
android:orientation="vertical" android:orientation="vertical"
android:background="@drawable/layout_rounded_bg_shopitem" android:background="@drawable/layout_rounded_bg_shopitem"
android:layout_centerInParent="true"> android:layout_centerInParent="true">
<com.habitrpg.android.habitica.ui.views.PixelArtView <com.habitrpg.common.habitica.views.PixelArtView
android:id="@+id/imageView" android:id="@+id/imageView"
android:layout_width="@dimen/shopitem_image_size" android:layout_width="@dimen/shopitem_image_size"
android:layout_height="@dimen/shopitem_image_size" android:layout_height="@dimen/shopitem_image_size"

2
Habitica/res/layout/skill_list_item.xml
View file

@ -17,7 +17,7 @@
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:layout_marginBottom="4dp"> android:layout_marginBottom="4dp">
<com.habitrpg.android.habitica.ui.views.PixelArtView <com.habitrpg.common.habitica.views.PixelArtView
android:id="@+id/skill_image" android:id="@+id/skill_image"
android:layout_width="40dp" android:layout_width="40dp"
android:layout_height="40dp" android:layout_height="40dp"

2
Habitica/res/layout/tavern_chat_intro_item.xml
View file

@ -7,7 +7,7 @@
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:orientation="vertical"> android:orientation="vertical">
<com.habitrpg.android.habitica.ui.AvatarView <com.habitrpg.common.habitica.views.AvatarView
android:id="@+id/avatar_view" android:id="@+id/avatar_view"
android:layout_width="87dp" android:layout_width="87dp"
android:layout_height="69dp" android:layout_height="69dp"

2
Habitica/res/layout/view_invitation.xml
View file

@ -21,7 +21,7 @@
android:clipChildren="true" android:clipChildren="true"
android:layout_marginEnd="@dimen/spacing_medium" android:layout_marginEnd="@dimen/spacing_medium"
android:background="@drawable/rounded_avatar_bg"> 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:id="@+id/groupleader_avatar_view"
android:layout_width="60dp" android:layout_width="60dp"
android:layout_height="60dp" android:layout_height="60dp"

7
Habitica/res/values/attrs.xml
View file

@ -31,13 +31,6 @@
<attr name="currency" format="string" /> <attr name="currency" format="string" />
<attr name="color" format="color" /> <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"> <declare-styleable name="GemPurchaseOptionsView">
<attr name="gemAmount" format="integer" /> <attr name="gemAmount" format="integer" />
<attr name="priceText" format="string" /> <attr name="priceText" format="string" />

2
Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt
View file

@ -6,7 +6,7 @@ import com.habitrpg.android.habitica.data.TaskRepository
import com.habitrpg.android.habitica.data.UserRepository import com.habitrpg.android.habitica.data.UserRepository
import com.habitrpg.android.habitica.data.local.UserLocalRepository import com.habitrpg.android.habitica.data.local.UserLocalRepository
import com.habitrpg.android.habitica.data.local.UserQuestStatus 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.extensions.filterMapEmpty
import com.habitrpg.android.habitica.helpers.AppConfigManager import com.habitrpg.android.habitica.helpers.AppConfigManager
import com.habitrpg.android.habitica.helpers.RxErrorHandler import com.habitrpg.android.habitica.helpers.RxErrorHandler

1
Habitica/src/main/java/com/habitrpg/android/habitica/extensions/RxJava-Extensions.kt
View file

@ -1,5 +1,6 @@
package com.habitrpg.android.habitica.extensions package com.habitrpg.android.habitica.extensions
import com.habitrpg.common.habitica.extensions.Optional
import io.reactivex.rxjava3.core.Flowable import io.reactivex.rxjava3.core.Flowable
import io.reactivex.rxjava3.core.Maybe import io.reactivex.rxjava3.core.Maybe
import io.reactivex.rxjava3.core.Observable import io.reactivex.rxjava3.core.Observable

4
Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AppConfigManager.kt
View file

@ -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.HabiticaWebPromotion
import com.habitrpg.android.habitica.models.promotions.getHabiticaPromotionFromKey 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 private var worldState: WorldState? = null
@ -35,7 +35,7 @@ class AppConfigManager(contentRepository: ContentRepository?) {
return remoteConfig.getLong("maxChatLength") 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 val type = object : TypeToken<Map<String, Map<String, String>>>() {}.type
return Gson().fromJson(remoteConfig.getString("spriteSubstitutions"), type) return Gson().fromJson(remoteConfig.getString("spriteSubstitutions"), type)
} }

3
Habitica/src/main/java/com/habitrpg/android/habitica/helpers/UserStatComputer.kt
View file

@ -1,7 +1,6 @@
package com.habitrpg.android.habitica.helpers package com.habitrpg.android.habitica.helpers
import com.habitrpg.android.habitica.R 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.inventory.Equipment
import com.habitrpg.android.habitica.models.user.Stats import com.habitrpg.android.habitica.models.user.Stats
@ -25,7 +24,7 @@ class UserStatComputer {
var stats: String? = null 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>() val skillRows = ArrayList<StatsRow>()
var strAttributes = 0f var strAttributes = 0f

4
Habitica/src/main/java/com/habitrpg/android/habitica/interactors/FeedPetUseCase.kt
View file

@ -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.inventory.Pet
import com.habitrpg.android.habitica.models.responses.FeedResponse import com.habitrpg.android.habitica.models.responses.FeedResponse
import com.habitrpg.android.habitica.ui.activities.BaseActivity import com.habitrpg.android.habitica.ui.activities.BaseActivity
import com.habitrpg.android.habitica.ui.helpers.loadImage import com.habitrpg.common.habitica.extensions.loadImage
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.SnackbarActivity
import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
import io.reactivex.rxjava3.core.Flowable import io.reactivex.rxjava3.core.Flowable

4
Habitica/src/main/java/com/habitrpg/android/habitica/interactors/HatchPetUseCase.kt
View file

@ -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.inventory.HatchingPotion
import com.habitrpg.android.habitica.models.user.Items import com.habitrpg.android.habitica.models.user.Items
import com.habitrpg.android.habitica.ui.activities.BaseActivity import com.habitrpg.android.habitica.ui.activities.BaseActivity
import com.habitrpg.android.habitica.ui.helpers.loadImage import com.habitrpg.common.habitica.extensions.loadImage
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 com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
import io.reactivex.rxjava3.core.Flowable import io.reactivex.rxjava3.core.Flowable
import javax.inject.Inject import javax.inject.Inject

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

@ -9,7 +9,7 @@ import com.habitrpg.android.habitica.helpers.RxErrorHandler
import com.habitrpg.android.habitica.helpers.SoundManager import com.habitrpg.android.habitica.helpers.SoundManager
import com.habitrpg.android.habitica.models.user.Stats import com.habitrpg.android.habitica.models.user.Stats
import com.habitrpg.android.habitica.models.user.User 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.activities.BaseActivity
import com.habitrpg.android.habitica.ui.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

4
Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ShowNotificationInteractor.kt
View file

@ -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.FirstDropData
import com.habitrpg.android.habitica.models.notifications.LoginIncentiveData import com.habitrpg.android.habitica.models.notifications.LoginIncentiveData
import com.habitrpg.android.habitica.models.user.User 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.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.SnackbarActivity
import com.habitrpg.android.habitica.ui.views.dialogs.AchievementDialog import com.habitrpg.android.habitica.ui.views.dialogs.AchievementDialog
import com.habitrpg.android.habitica.ui.views.dialogs.FirstDropDialog import com.habitrpg.android.habitica.ui.views.dialogs.FirstDropDialog

22
Habitica/src/main/java/com/habitrpg/android/habitica/models/Avatar.kt
View file

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

2
Habitica/src/main/java/com/habitrpg/android/habitica/models/members/Member.kt
View file

@ -1,7 +1,6 @@
package com.habitrpg.android.habitica.models.members package com.habitrpg.android.habitica.models.members
import com.google.gson.annotations.SerializedName 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.BaseMainObject
import com.habitrpg.android.habitica.models.social.UserParty import com.habitrpg.android.habitica.models.social.UserParty
import com.habitrpg.android.habitica.models.user.Authentication 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.Outfit
import com.habitrpg.android.habitica.models.user.Profile import com.habitrpg.android.habitica.models.user.Profile
import com.habitrpg.android.habitica.models.user.Stats import com.habitrpg.android.habitica.models.user.Stats
import com.habitrpg.common.habitica.models.Avatar
import io.realm.RealmModel import io.realm.RealmModel
import io.realm.RealmObject import io.realm.RealmObject
import io.realm.annotations.PrimaryKey import io.realm.annotations.PrimaryKey

2
Habitica/src/main/java/com/habitrpg/android/habitica/models/members/MemberFlags.kt
View file

@ -1,6 +1,6 @@
package com.habitrpg.android.habitica.models.members 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.RealmObject
import io.realm.annotations.RealmClass import io.realm.annotations.RealmClass

5
Habitica/src/main/java/com/habitrpg/android/habitica/models/members/MemberPreferences.kt
View file

@ -1,12 +1,13 @@
package com.habitrpg.android.habitica.models.members 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.android.habitica.models.user.Hair
import com.habitrpg.common.habitica.models.AvatarPreferences
import io.realm.RealmObject import io.realm.RealmObject
import io.realm.annotations.RealmClass import io.realm.annotations.RealmClass
@RealmClass(embedded = true) @RealmClass(embedded = true)
open class MemberPreferences : RealmObject(), AvatarPreferences { open class MemberPreferences : RealmObject(),
AvatarPreferences {
override var hair: Hair? = null override var hair: Hair? = null
override var costume: Boolean = false override var costume: Boolean = false

6
Habitica/src/main/java/com/habitrpg/android/habitica/models/social/UserStyles.kt
View file

@ -1,7 +1,5 @@
package com.habitrpg.android.habitica.models.social 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.Items
import com.habitrpg.android.habitica.models.user.Outfit import com.habitrpg.android.habitica.models.user.Outfit
import com.habitrpg.android.habitica.models.user.Preferences import com.habitrpg.android.habitica.models.user.Preferences
@ -10,7 +8,7 @@ import io.realm.RealmObject
import io.realm.annotations.RealmClass import io.realm.annotations.RealmClass
@RealmClass(embedded = true) @RealmClass(embedded = true)
open class UserStyles : RealmObject(), Avatar { open class UserStyles : RealmObject(), com.habitrpg.common.habitica.models.Avatar {
override val currentMount: String? override val currentMount: String?
get() = items?.currentMount get() = items?.currentMount
@ -38,7 +36,7 @@ open class UserStyles : RealmObject(), Avatar {
override var stats: Stats? = null override var stats: Stats? = null
override var preferences: Preferences? = null override var preferences: Preferences? = null
override val flags: AvatarFlags? override val flags: com.habitrpg.common.habitica.models.AvatarFlags?
get() = null get() = null
private var items: Items? = null private var items: Items? = null
} }

21
Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Buffs.kt
View file

@ -2,26 +2,27 @@ package com.habitrpg.android.habitica.models.user
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.habitrpg.android.habitica.models.BaseObject import com.habitrpg.android.habitica.models.BaseObject
import com.habitrpg.common.habitica.models.AvatarBuffs
import io.realm.RealmObject import io.realm.RealmObject
import io.realm.annotations.RealmClass import io.realm.annotations.RealmClass
@RealmClass(embedded = true) @RealmClass(embedded = true)
open class Buffs : RealmObject(), BaseObject { open class Buffs : RealmObject(), AvatarBuffs, BaseObject {
var con: Float? = null override var con: Float? = null
var str: Float? = null override var str: Float? = null
var per: Float? = null override var per: Float? = null
@SerializedName("int") @SerializedName("int")
var _int: Float? = null override var _int: Float? = null
var seafoam: Boolean? = null override var seafoam: Boolean? = null
get() { return field ?: false } get() { return field ?: false }
var spookySparkles: Boolean? = null override var spookySparkles: Boolean? = null
get() { return field ?: false } get() { return field ?: false }
var shinySeed: Boolean? = null override var shinySeed: Boolean? = null
get() { return field ?: false } get() { return field ?: false }
var snowball: Boolean? = null override var snowball: Boolean? = null
get() { return field ?: false } get() { return field ?: false }
var streaks: Boolean? = null override var streaks: Boolean? = null
get() { return field ?: false } get() { return field ?: false }
fun merge(stats: Buffs?) { fun merge(stats: Buffs?) {

3
Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Flags.kt
View file

@ -1,6 +1,5 @@
package com.habitrpg.android.habitica.models.user 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.BaseObject
import com.habitrpg.android.habitica.models.TutorialStep import com.habitrpg.android.habitica.models.TutorialStep
import io.realm.RealmList import io.realm.RealmList
@ -8,7 +7,7 @@ import io.realm.RealmObject
import io.realm.annotations.RealmClass import io.realm.annotations.RealmClass
@RealmClass(embedded = true) @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 tutorial: RealmList<TutorialStep>? = null
var showTour = false var showTour = false
var dropsEnabled = false var dropsEnabled = false

19
Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Hair.kt
View file

@ -1,17 +1,18 @@
package com.habitrpg.android.habitica.models.user package com.habitrpg.android.habitica.models.user
import com.habitrpg.android.habitica.models.BaseObject import com.habitrpg.android.habitica.models.BaseObject
import com.habitrpg.common.habitica.models.AvatarHair
import io.realm.RealmObject import io.realm.RealmObject
import io.realm.annotations.RealmClass import io.realm.annotations.RealmClass
@RealmClass(embedded = true) @RealmClass(embedded = true)
open class Hair : RealmObject, BaseObject { open class Hair : RealmObject, BaseObject, AvatarHair {
var mustache: Int = 0 final override var mustache: Int = 0
var beard: Int = 0 final override var beard: Int = 0
var bangs: Int = 0 final override var bangs: Int = 0
var base: Int = 0 final override var base: Int = 0
var flower: Int = 0 final override var flower: Int = 0
var color: String? = null final override var color: String? = null
constructor() constructor()
@ -23,8 +24,4 @@ open class Hair : RealmObject, BaseObject {
this.color = color this.color = color
this.flower = flower this.flower = flower
} }
fun isAvailable(hairId: Int): Boolean {
return hairId > 0
}
} }

35
Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Outfit.kt
View file

@ -1,35 +1,20 @@
package com.habitrpg.android.habitica.models.user package com.habitrpg.android.habitica.models.user
import android.text.TextUtils
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.habitrpg.android.habitica.models.BaseObject import com.habitrpg.android.habitica.models.BaseObject
import com.habitrpg.common.habitica.models.AvatarOutfit
import io.realm.RealmObject import io.realm.RealmObject
import io.realm.annotations.RealmClass import io.realm.annotations.RealmClass
@RealmClass(embedded = true) @RealmClass(embedded = true)
open class Outfit : RealmObject(), BaseObject { open class Outfit : RealmObject(), BaseObject, AvatarOutfit {
var armor: String = "" override var armor: String = ""
var back: String = "" override var back: String = ""
var body: String = "" override var body: String = ""
var head: String = "" override var head: String = ""
var shield: String = "" override var shield: String = ""
var weapon: String = "" override var weapon: String = ""
@SerializedName("eyewear") @SerializedName("eyewear")
var eyeWear: String = "" override var eyeWear: String = ""
var headAccessory: String = "" override 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
}
} }

2
Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.kt
View file

@ -1,8 +1,8 @@
package com.habitrpg.android.habitica.models.user package com.habitrpg.android.habitica.models.user
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.habitrpg.android.habitica.models.AvatarPreferences
import com.habitrpg.android.habitica.models.BaseObject import com.habitrpg.android.habitica.models.BaseObject
import com.habitrpg.common.habitica.models.AvatarPreferences
import io.realm.RealmObject import io.realm.RealmObject
import io.realm.annotations.RealmClass import io.realm.annotations.RealmClass

32
Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Stats.kt
View file

@ -4,11 +4,12 @@ import android.content.Context
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.models.BaseObject import com.habitrpg.android.habitica.models.BaseObject
import com.habitrpg.common.habitica.models.AvatarStats
import io.realm.RealmObject import io.realm.RealmObject
import io.realm.annotations.RealmClass import io.realm.annotations.RealmClass
@RealmClass(embedded = true) @RealmClass(embedded = true)
open class Stats : RealmObject(), BaseObject { open class Stats : RealmObject(), AvatarStats, BaseObject {
@SerializedName("con") @SerializedName("con")
var constitution: Int? = null var constitution: Int? = null
@SerializedName("str") @SerializedName("str")
@ -18,43 +19,36 @@ open class Stats : RealmObject(), BaseObject {
@SerializedName("int") @SerializedName("int")
var intelligence: Int? = null var intelligence: Int? = null
var training: Training? = null var training: Training? = null
var buffs: Buffs? = null override var buffs: Buffs? = null
var points: Int? = null override var points: Int? = null
var lvl: Int? = null override var lvl: Int? = null
@SerializedName("class") @SerializedName("class")
var habitClass: String? = null override var habitClass: String? = null
var gp: Double? = null override var gp: Double? = null
var exp: Double? = null override var exp: Double? = null
var mp: Double? = null override var mp: Double? = null
var hp: Double? = null override var hp: Double? = null
var toNextLevel: Int? = null override var toNextLevel: Int? = null
get() = if (field != null) field else 0 get() = if (field != null) field else 0
set(value) { set(value) {
if (value != 0) { if (value != 0) {
field = value field = value
} }
} }
var maxHealth: Int? = null override var maxHealth: Int? = null
get() = if (field != null) field else 0 get() = if (field != null) field else 0
set(value) { set(value) {
if (value != 0) { if (value != 0) {
field = value field = value
} }
} }
var maxMP: Int? = null override var maxMP: Int? = null
get() = if (field != null) field else 0 get() = if (field != null) field else 0
set(value) { set(value) {
if (value != 0) { if (value != 0) {
field = value 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 { fun getTranslatedClassName(context: Context): String {
return when (habitClass) { return when (habitClass) {

2
Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.kt
View file

@ -2,7 +2,6 @@ package com.habitrpg.android.habitica.models.user
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.habitrpg.android.habitica.R 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.BaseMainObject
import com.habitrpg.android.habitica.models.PushDevice import com.habitrpg.android.habitica.models.PushDevice
import com.habitrpg.android.habitica.models.QuestAchievement 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.social.UserParty
import com.habitrpg.android.habitica.models.tasks.TaskList import com.habitrpg.android.habitica.models.tasks.TaskList
import com.habitrpg.android.habitica.models.tasks.TasksOrder import com.habitrpg.android.habitica.models.tasks.TasksOrder
import com.habitrpg.common.habitica.models.Avatar
import io.realm.RealmList import io.realm.RealmList
import io.realm.RealmObject import io.realm.RealmObject
import io.realm.annotations.Ignore import io.realm.annotations.Ignore

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

@ -13,13 +13,14 @@ import com.habitrpg.android.habitica.databinding.AvatarWithBarsBinding
import com.habitrpg.android.habitica.helpers.Animations import com.habitrpg.android.habitica.helpers.Animations
import com.habitrpg.android.habitica.helpers.HealthFormatter import com.habitrpg.android.habitica.helpers.HealthFormatter
import com.habitrpg.android.habitica.helpers.MainNavigationController 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.Stats
import com.habitrpg.android.habitica.models.user.User import com.habitrpg.android.habitica.models.user.User
import com.habitrpg.android.habitica.ui.activities.mainActivityCreatedAt import com.habitrpg.android.habitica.ui.activities.mainActivityCreatedAt
import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
import java.util.Date import java.util.Date
import com.habitrpg.common.habitica.models.Avatar
import io.reactivex.rxjava3.disposables.Disposable
import java.util.Locale import java.util.Locale
import kotlin.math.floor import kotlin.math.floor
@ -59,7 +60,7 @@ class AvatarWithBarsViewModel(
binding.avatarView.setAvatar(user) binding.avatarView.setAvatar(user)
if (stats.habitClass != null) { if (stats.habitClass != null && stats is Stats) {
userClass = stats.getTranslatedClassName(context) userClass = stats.getTranslatedClassName(context)
} }

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

@ -9,9 +9,9 @@ import android.widget.LinearLayout
import android.widget.TextView import android.widget.TextView
import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog
import com.habitrpg.android.habitica.R 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.HabiticaIconsHelper
import com.habitrpg.android.habitica.ui.views.PixelArtView import com.habitrpg.common.habitica.views.PixelArtView
class ItemDetailDialog(context: Context) : AlertDialog(context) { class ItemDetailDialog(context: Context) : AlertDialog(context) {

1
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AdventureGuideActivity.kt
View file

@ -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.helpers.loadImage
import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
import javax.inject.Inject import javax.inject.Inject
import com.habitrpg.common.habitica.extensions.loadImage
class AdventureGuideActivity : BaseActivity() { class AdventureGuideActivity : BaseActivity() {
private lateinit var binding: ActivityAdventureGuideBinding private lateinit var binding: ActivityAdventureGuideBinding

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ArmoireActivity.kt
View file

@ -21,7 +21,7 @@ import com.habitrpg.android.habitica.helpers.AdType
import com.habitrpg.android.habitica.helpers.Animations import com.habitrpg.android.habitica.helpers.Animations
import com.habitrpg.android.habitica.helpers.AppConfigManager import com.habitrpg.android.habitica.helpers.AppConfigManager
import com.habitrpg.android.habitica.helpers.RxErrorHandler 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.viewmodels.MainUserViewModel
import com.habitrpg.android.habitica.ui.views.ads.AdButton import com.habitrpg.android.habitica.ui.views.ads.AdButton
import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaBottomSheetDialog import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaBottomSheetDialog

4
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt
View file

@ -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.AvatarWithBarsViewModel
import com.habitrpg.android.habitica.ui.adapter.social.AchievementProfileAdapter import com.habitrpg.android.habitica.ui.adapter.social.AchievementProfileAdapter
import com.habitrpg.android.habitica.ui.helpers.RecyclerViewState 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.helpers.setMarkdown
import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.SnackbarDisplayType 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 com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
import io.reactivex.rxjava3.core.Flowable import io.reactivex.rxjava3.core.Flowable
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
View file

@ -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.MaintenanceResponse
import com.habitrpg.android.habitica.models.responses.TaskScoringResult import com.habitrpg.android.habitica.models.responses.TaskScoringResult
import com.habitrpg.android.habitica.models.user.User 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.AvatarWithBarsViewModel
import com.habitrpg.android.habitica.ui.TutorialView import com.habitrpg.android.habitica.ui.TutorialView
import com.habitrpg.android.habitica.ui.fragments.NavigationDrawerFragment import com.habitrpg.android.habitica.ui.fragments.NavigationDrawerFragment

4
Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/AchievementsAdapter.kt
View file

@ -11,8 +11,8 @@ import com.habitrpg.android.habitica.databinding.AchievementSectionHeaderBinding
import com.habitrpg.android.habitica.extensions.inflate import com.habitrpg.android.habitica.extensions.inflate
import com.habitrpg.android.habitica.models.Achievement import com.habitrpg.android.habitica.models.Achievement
import com.habitrpg.android.habitica.models.QuestAchievement import com.habitrpg.android.habitica.models.QuestAchievement
import com.habitrpg.android.habitica.ui.helpers.loadImage import com.habitrpg.common.habitica.extensions.loadImage
import com.habitrpg.android.habitica.ui.views.PixelArtView import com.habitrpg.common.habitica.views.PixelArtView
import com.habitrpg.android.habitica.ui.views.dialogs.AchievementDetailDialog import com.habitrpg.android.habitica.ui.views.dialogs.AchievementDetailDialog
class AchievementsAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() { class AchievementsAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {

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

@ -13,9 +13,9 @@ import com.habitrpg.android.habitica.databinding.CustomizationGridItemBinding
import com.habitrpg.android.habitica.helpers.MainNavigationController import com.habitrpg.android.habitica.helpers.MainNavigationController
import com.habitrpg.android.habitica.models.inventory.CustomizationSet import com.habitrpg.android.habitica.models.inventory.CustomizationSet
import com.habitrpg.android.habitica.models.inventory.Equipment 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.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 com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
import io.reactivex.rxjava3.core.BackpressureStrategy import io.reactivex.rxjava3.core.BackpressureStrategy
import io.reactivex.rxjava3.core.Flowable import io.reactivex.rxjava3.core.Flowable

1
Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.kt
View file

@ -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.models.shops.ShopItem
import com.habitrpg.android.habitica.ui.AvatarView import com.habitrpg.android.habitica.ui.AvatarView
import com.habitrpg.android.habitica.ui.helpers.loadImage 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.dialogs.HabiticaAlertDialog
import com.habitrpg.android.habitica.ui.views.shops.PurchaseDialog import com.habitrpg.android.habitica.ui.views.shops.PurchaseDialog
import io.reactivex.rxjava3.core.BackpressureStrategy import io.reactivex.rxjava3.core.BackpressureStrategy

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

@ -13,7 +13,7 @@ import com.habitrpg.android.habitica.extensions.inflate
import com.habitrpg.android.habitica.extensions.isUsingNightModeResources import com.habitrpg.android.habitica.extensions.isUsingNightModeResources
import com.habitrpg.android.habitica.models.Skill import com.habitrpg.android.habitica.models.Skill
import com.habitrpg.android.habitica.models.user.OwnedItem 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 com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
import io.reactivex.rxjava3.core.BackpressureStrategy import io.reactivex.rxjava3.core.BackpressureStrategy
import io.reactivex.rxjava3.core.Flowable import io.reactivex.rxjava3.core.Flowable

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

@ -12,7 +12,7 @@ import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.databinding.GearListItemBinding import com.habitrpg.android.habitica.databinding.GearListItemBinding
import com.habitrpg.android.habitica.models.inventory.Equipment import com.habitrpg.android.habitica.models.inventory.Equipment
import com.habitrpg.android.habitica.ui.adapter.BaseRecyclerViewAdapter 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 com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
import io.reactivex.rxjava3.subjects.PublishSubject import io.reactivex.rxjava3.subjects.PublishSubject

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.kt
View file

@ -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.OwnedPet
import com.habitrpg.android.habitica.models.user.User import com.habitrpg.android.habitica.models.user.User
import com.habitrpg.android.habitica.ui.adapter.BaseRecyclerViewAdapter 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.BottomSheetMenu
import com.habitrpg.android.habitica.ui.menu.BottomSheetMenuItem import com.habitrpg.android.habitica.ui.menu.BottomSheetMenuItem
import com.habitrpg.android.habitica.ui.views.dialogs.DetailDialog import com.habitrpg.android.habitica.ui.views.dialogs.DetailDialog

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.kt
View file

@ -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.OwnedItem
import com.habitrpg.android.habitica.models.user.OwnedMount import com.habitrpg.android.habitica.models.user.OwnedMount
import com.habitrpg.android.habitica.models.user.OwnedPet 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.PetViewHolder
import com.habitrpg.android.habitica.ui.viewHolders.SectionViewHolder import com.habitrpg.android.habitica.ui.viewHolders.SectionViewHolder
import com.habitrpg.android.habitica.ui.views.dialogs.PetSuggestHatchDialog import com.habitrpg.android.habitica.ui.views.dialogs.PetSuggestHatchDialog

4
Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.kt
View file

@ -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.OwnedItem
import com.habitrpg.android.habitica.models.user.OwnedMount import com.habitrpg.android.habitica.models.user.OwnedMount
import com.habitrpg.android.habitica.ui.fragments.inventory.stable.StableFragmentDirections 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.MountViewHolder
import com.habitrpg.android.habitica.ui.viewHolders.PetViewHolder import com.habitrpg.android.habitica.ui.viewHolders.PetViewHolder
import com.habitrpg.android.habitica.ui.viewHolders.SectionViewHolder 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.BackpressureStrategy
import io.reactivex.rxjava3.core.Flowable import io.reactivex.rxjava3.core.Flowable
import io.reactivex.rxjava3.subjects.PublishSubject import io.reactivex.rxjava3.subjects.PublishSubject

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/AchievementProfileAdapter.kt
View file

@ -8,7 +8,7 @@ import com.habitrpg.android.habitica.databinding.ProfileAchievementItemBinding
import com.habitrpg.android.habitica.extensions.inflate import com.habitrpg.android.habitica.extensions.inflate
import com.habitrpg.android.habitica.models.Achievement import com.habitrpg.android.habitica.models.Achievement
import com.habitrpg.android.habitica.ui.activities.MainActivity 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.viewHolders.SectionViewHolder
import com.habitrpg.android.habitica.ui.views.dialogs.AchievementDetailDialog import com.habitrpg.android.habitica.ui.views.dialogs.AchievementDetailDialog

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AboutFragment.kt
View file

@ -17,7 +17,7 @@ import com.habitrpg.android.habitica.databinding.FragmentAboutBinding
import com.habitrpg.android.habitica.helpers.AppConfigManager import com.habitrpg.android.habitica.helpers.AppConfigManager
import com.habitrpg.android.habitica.helpers.MainNavigationController import com.habitrpg.android.habitica.helpers.MainNavigationController
import com.habitrpg.android.habitica.modules.AppModule 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 com.plattysoft.leonids.ParticleSystem
import javax.inject.Inject import javax.inject.Inject
import javax.inject.Named import javax.inject.Named

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemDialogFragment.kt
View file

@ -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.fragments.BaseDialogFragment
import com.habitrpg.android.habitica.ui.helpers.EmptyItem import com.habitrpg.android.habitica.ui.helpers.EmptyItem
import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator 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.viewmodels.MainUserViewModel
import com.habitrpg.android.habitica.ui.views.dialogs.OpenedMysteryitemDialog import com.habitrpg.android.habitica.ui.views.dialogs.OpenedMysteryitemDialog
import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.disposables.CompositeDisposable

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt
View file

@ -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.fragments.BaseFragment
import com.habitrpg.android.habitica.ui.helpers.EmptyItem import com.habitrpg.android.habitica.ui.helpers.EmptyItem
import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator 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.viewmodels.MainUserViewModel
import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt
View file

@ -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.activities.GiftSubscriptionActivity
import com.habitrpg.android.habitica.ui.fragments.BaseFragment import com.habitrpg.android.habitica.ui.fragments.BaseFragment
import com.habitrpg.android.habitica.ui.fragments.PromoInfoFragment 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.dialogs.HabiticaAlertDialog
import com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView import com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView
import javax.inject.Inject import javax.inject.Inject

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

@ -20,7 +20,8 @@ import com.habitrpg.android.habitica.helpers.AppConfigManager
import com.habitrpg.android.habitica.helpers.MainNavigationController import com.habitrpg.android.habitica.helpers.MainNavigationController
import com.habitrpg.android.habitica.helpers.RxErrorHandler import com.habitrpg.android.habitica.helpers.RxErrorHandler
import com.habitrpg.android.habitica.models.social.InboxConversation 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.fragments.BaseMainFragment
import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard
import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/QuestDetailFragment.kt
View file

@ -25,7 +25,7 @@ import com.habitrpg.android.habitica.models.social.Group
import com.habitrpg.android.habitica.modules.AppModule import com.habitrpg.android.habitica.modules.AppModule
import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
import com.habitrpg.android.habitica.ui.helpers.MarkdownParser 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.viewmodels.MainUserViewModel
import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
import javax.inject.Inject import javax.inject.Inject

4
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/NoPartyFragmentFragment.kt
View file

@ -24,10 +24,10 @@ import com.habitrpg.android.habitica.databinding.FragmentNoPartyBinding
import com.habitrpg.android.habitica.helpers.AppConfigManager import com.habitrpg.android.habitica.helpers.AppConfigManager
import com.habitrpg.android.habitica.helpers.MainNavigationController import com.habitrpg.android.habitica.helpers.MainNavigationController
import com.habitrpg.android.habitica.helpers.RxErrorHandler 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.activities.GroupFormActivity
import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment 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.helpers.setMarkdown
import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar

6
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt
View file

@ -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.social.Group
import com.habitrpg.android.habitica.models.user.User import com.habitrpg.android.habitica.models.user.User
import com.habitrpg.android.habitica.modules.AppModule 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.FullProfileActivity
import com.habitrpg.android.habitica.ui.activities.MainActivity import com.habitrpg.android.habitica.ui.activities.MainActivity
import com.habitrpg.android.habitica.ui.fragments.BaseFragment import com.habitrpg.android.habitica.ui.fragments.BaseFragment
import com.habitrpg.android.habitica.ui.fragments.inventory.items.ItemDialogFragment 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.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.helpers.setMarkdown
import com.habitrpg.android.habitica.ui.viewHolders.GroupMemberViewHolder import com.habitrpg.android.habitica.ui.viewHolders.GroupMemberViewHolder
import com.habitrpg.android.habitica.ui.viewmodels.PartyViewModel import com.habitrpg.android.habitica.ui.viewmodels.PartyViewModel

Some files were not shown because too many files have changed in this diff Show more