From a2c76002f316f68bd3affcad14ee2e1efc485d4e Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Mon, 11 Sep 2023 11:13:41 +0200 Subject: [PATCH] stable sheets tweaks --- Habitica/res/layout/activity_armoire.xml | 1 + .../ui/activities/FullProfileActivity.kt | 2 +- .../ui/views/stable/MountBottomSheet.kt | 8 ++++---- .../ui/views/stable/PetBottomSheet.kt | 10 +++++----- .../habitica/extensions/DataBindingUtils.kt | 3 ++- .../common/habitica/views/PixelArtView.kt | 19 +++++++++---------- version.properties | 2 +- 7 files changed, 23 insertions(+), 22 deletions(-) diff --git a/Habitica/res/layout/activity_armoire.xml b/Habitica/res/layout/activity_armoire.xml index 34e05f5e7..bc8ef3dd0 100644 --- a/Habitica/res/layout/activity_armoire.xml +++ b/Habitica/res/layout/activity_armoire.xml @@ -257,6 +257,7 @@ android:text="@string/armoire_drop_rates" android:textColor="@color/brand_600" android:layout_marginTop="22dp" + android:layout_marginBottom="8dp" style="@style/Body2"/> diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt index 7eba9f1b1..5b322e61f 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt @@ -141,7 +141,7 @@ class FullProfileActivity : BaseActivity() { isModerator = it?.hasPermission(Permission.MODERATOR) == true if (isModerator || isUserSupport) { binding.adminStatusView.isVisible = true - refresh(true) + refresh(true) } invalidateOptionsMenu() diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stable/MountBottomSheet.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stable/MountBottomSheet.kt index 0fe089a15..08dc3e4f3 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stable/MountBottomSheet.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stable/MountBottomSheet.kt @@ -105,9 +105,9 @@ fun MountBottomSheet( ) { BackgroundScene() - val regularPosition = 33f - val highJump = 22f - val lowJump = 30f + val regularPosition = 44f + val highJump = 32f + val lowJump = 40f val position by if (isAnimalFlying(mount)) { infiniteTransition.animateFloat( initialValue = 24f, @@ -141,7 +141,7 @@ fun MountBottomSheet( } MountView(mount, modifier = Modifier .offset(0.dp, position.dp) - .size(68.dp) + .size(72.dp) .align(Alignment.TopCenter) .zIndex(2f) ) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stable/PetBottomSheet.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stable/PetBottomSheet.kt index 7ba70dbae..4f1b3b338 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stable/PetBottomSheet.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stable/PetBottomSheet.kt @@ -142,7 +142,7 @@ fun PetBottomSheet( this@Column.AnimatedVisibility( visible = showFeedResponse, modifier = Modifier - .offset(y = 85.dp) + .offset(y = 90.dp) .align(Alignment.TopCenter) .zIndex(4f), enter = fadeIn(), exit = fadeOut() ) { @@ -189,10 +189,10 @@ fun PetBottomSheet( ) } - val regularPosition = 33f - val highJump = 22f - val midJump = 27f - val lowJump = 30f + val regularPosition = 44f + val highJump = 32f + val midJump = 37f + val lowJump = 40f val position by if (showFeedResponse) { infiniteTransition.animateFloat( initialValue = regularPosition, diff --git a/common/src/main/java/com/habitrpg/common/habitica/extensions/DataBindingUtils.kt b/common/src/main/java/com/habitrpg/common/habitica/extensions/DataBindingUtils.kt index 2e4322fd1..b7c93dc0e 100644 --- a/common/src/main/java/com/habitrpg/common/habitica/extensions/DataBindingUtils.kt +++ b/common/src/main/java/com/habitrpg/common/habitica/extensions/DataBindingUtils.kt @@ -145,6 +145,7 @@ object DataBindingUtils { tempMap["weapon_special_0"] = "gif" tempMap["shield_special_0"] = "gif" tempMap["Pet-Wolf-Cerberus"] = "gif" + tempMap["stable_Pet-Wolf-Cerberus"] = "gif" tempMap["armor_special_ks2019"] = "gif" tempMap["slim_armor_special_ks2019"] = "gif" tempMap["broad_armor_special_ks2019"] = "gif" @@ -181,7 +182,7 @@ object DataBindingUtils { tempNameMap["shield_special_0"] = "BackerOnly-Shield-TormentedSkull" tempNameMap["weapon_special_0"] = "BackerOnly-Weapon-DarkSoulsBlade" tempNameMap["weapon_special_critical"] = "weapon_special_critical" - tempNameMap["Pet-Wolf-Cerberus"] = "Pet-Wolf-Cerberus" + tempNameMap["Pet-Wolf-Cerberus"] = "BackerOnly-Pet-CerberusPup" FILENAME_MAP = tempNameMap } } diff --git a/common/src/main/java/com/habitrpg/common/habitica/views/PixelArtView.kt b/common/src/main/java/com/habitrpg/common/habitica/views/PixelArtView.kt index 0fb3d3606..5d65c7c2b 100644 --- a/common/src/main/java/com/habitrpg/common/habitica/views/PixelArtView.kt +++ b/common/src/main/java/com/habitrpg/common/habitica/views/PixelArtView.kt @@ -39,23 +39,22 @@ class PixelArtView @JvmOverloads constructor( var targetWidth = bitmap?.width ?: 0 var targetHeight = bitmap?.height ?: 0 val smallestSide = min(width, height) + val divisor = if (targetWidth % 3 == 0 && targetHeight % 3 == 0) 3 else 2 val factor = min( - ( - if (smallestSide > 0 && targetWidth > 0 && smallestSide != targetWidth) { - smallestSide / (targetWidth / 3) - } else { - 1 - } - ), + if (smallestSide > 0 && targetWidth > 0 && smallestSide != targetWidth) { + smallestSide / (targetWidth / divisor) + } else { + 1 + }, if (smallestSide > 0 && targetHeight > 0 && smallestSide != targetHeight) { - smallestSide / (targetHeight / 3) + smallestSide / (targetHeight / divisor) } else { 1 } ) - targetWidth = (targetWidth / 3) * factor - targetHeight = (targetHeight / 3) * factor + targetWidth = (targetWidth / divisor) * factor + targetHeight = (targetHeight / divisor) * factor val left = (width - targetWidth) / 2 val top = (height - targetHeight) / 2 targetRect = Rect(left, top, left + targetWidth, top + targetHeight) diff --git a/version.properties b/version.properties index 98dc2e560..c6c4d9e12 100644 --- a/version.properties +++ b/version.properties @@ -1,2 +1,2 @@ NAME=4.3 -CODE=6491 \ No newline at end of file +CODE=6511 \ No newline at end of file