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

fix levelup dialog

Browse source
This commit is contained in:
Phillip Thelen 2023-08-21 15:13:06 +02:00
parent 8ebca19ffa
commit 19bf9cf3d4
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Habitica/res/navigation/navigation.xml
View file

@ -443,24 +443,28 @@
android:name="com.habitrpg.android.habitica.ui.fragments.inventory.shops.MarketFragment"
android:label="@string/market">
<deepLink app:uri="habitica.com/inventory/market" />
<deepLink app:uri="habitica.com/shops/market" />
</fragment>
<fragment
android:id="@+id/questShopFragment"
android:name="com.habitrpg.android.habitica.ui.fragments.inventory.shops.QuestShopFragment"
android:label="@string/questShop">
<deepLink app:uri="habitica.com/inventory/quests" />
<deepLink app:uri="habitica.com/shops/quests" />
</fragment>
<fragment
android:id="@+id/seasonalShopFragment"
android:name="com.habitrpg.android.habitica.ui.fragments.inventory.shops.SeasonalShopFragment"
android:label="@string/seasonalShop">
<deepLink app:uri="habitica.com/inventory/seasonal" />
<deepLink app:uri="habitica.com/shops/seasonal" />
</fragment>
<fragment
android:id="@+id/timeTravelersShopFragment"
android:name="com.habitrpg.android.habitica.ui.fragments.inventory.shops.TimeTravelersShopFragment"
android:label="@string/timeTravelers">
<deepLink app:uri="habitica.com/inventory/time" />
<deepLink app:uri="habitica.com/shops/time" />
</fragment>
<fragment
android:id="@+id/supportMainFragment"

4
common/src/main/java/com/habitrpg/common/habitica/views/AvatarView.kt
View file

@ -473,8 +473,8 @@ class AvatarView : FrameLayout {
// full hero box when showMount and showPet is enabled (140w * 147h)
// compact hero box when only showBackground is enabled (114w * 114h)
// hero only box when all show settings disabled (90w * 90h)
val viewWidth = if (width > 0) width else layoutParams.width
val viewHeight = if (height > 0) height else layoutParams.height
val viewWidth = if (width > 0) width else (layoutParams?.width ?: 140)
val viewHeight = if (height > 0) height else (layoutParams?.height ?: 147)
val width = if (viewWidth > 0) viewWidth.toFloat() else 140.dpToPx(context).toFloat()
val height = if (viewHeight > 0) viewHeight.toFloat() else 147.dpToPx(context).toFloat()
avatarRectF = RectF(0f, 0f, width, height)

2
version.properties
View file

@ -1,2 +1,2 @@
NAME=4.2.5
CODE=6331
CODE=6341