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

stable sheets tweaks

Browse source
This commit is contained in:
Phillip Thelen 2023-09-11 11:13:41 +02:00
parent d1a8d923ca
commit a2c76002f3
7 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -257,6 +257,7 @@
android:text="@string/armoire_drop_rates" android:text="@string/armoire_drop_rates"
android:textColor="@color/brand_600" android:textColor="@color/brand_600"
android:layout_marginTop="22dp" android:layout_marginTop="22dp"
android:layout_marginBottom="8dp"
style="@style/Body2"/> style="@style/Body2"/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

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

@ -141,7 +141,7 @@ class FullProfileActivity : BaseActivity() {
isModerator = it?.hasPermission(Permission.MODERATOR) == true isModerator = it?.hasPermission(Permission.MODERATOR) == true
if (isModerator || isUserSupport) { if (isModerator || isUserSupport) {
binding.adminStatusView.isVisible = true binding.adminStatusView.isVisible = true
refresh(true) refresh(true)
} }
invalidateOptionsMenu() invalidateOptionsMenu()

8
Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stable/MountBottomSheet.kt
View file

@ -105,9 +105,9 @@ fun MountBottomSheet(
) { ) {
BackgroundScene() BackgroundScene()
val regularPosition = 33f val regularPosition = 44f
val highJump = 22f val highJump = 32f
val lowJump = 30f val lowJump = 40f
val position by if (isAnimalFlying(mount)) { val position by if (isAnimalFlying(mount)) {
infiniteTransition.animateFloat( infiniteTransition.animateFloat(
initialValue = 24f, initialValue = 24f,
@ -141,7 +141,7 @@ fun MountBottomSheet(
} }
MountView(mount, modifier = Modifier MountView(mount, modifier = Modifier
.offset(0.dp, position.dp) .offset(0.dp, position.dp)
.size(68.dp) .size(72.dp)
.align(Alignment.TopCenter) .align(Alignment.TopCenter)
.zIndex(2f) .zIndex(2f)
) )

10
Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stable/PetBottomSheet.kt
View file

@ -142,7 +142,7 @@ fun PetBottomSheet(
this@Column.AnimatedVisibility( this@Column.AnimatedVisibility(
visible = showFeedResponse, modifier = Modifier visible = showFeedResponse, modifier = Modifier
.offset(y = 85.dp) .offset(y = 90.dp)
.align(Alignment.TopCenter) .align(Alignment.TopCenter)
.zIndex(4f), enter = fadeIn(), exit = fadeOut() .zIndex(4f), enter = fadeIn(), exit = fadeOut()
) { ) {
@ -189,10 +189,10 @@ fun PetBottomSheet(
) )
} }
val regularPosition = 33f val regularPosition = 44f
val highJump = 22f val highJump = 32f
val midJump = 27f val midJump = 37f
val lowJump = 30f val lowJump = 40f
val position by if (showFeedResponse) { val position by if (showFeedResponse) {
infiniteTransition.animateFloat( infiniteTransition.animateFloat(
initialValue = regularPosition, initialValue = regularPosition,

3
common/src/main/java/com/habitrpg/common/habitica/extensions/DataBindingUtils.kt
View file

@ -145,6 +145,7 @@ object DataBindingUtils {
tempMap["weapon_special_0"] = "gif" tempMap["weapon_special_0"] = "gif"
tempMap["shield_special_0"] = "gif" tempMap["shield_special_0"] = "gif"
tempMap["Pet-Wolf-Cerberus"] = "gif" tempMap["Pet-Wolf-Cerberus"] = "gif"
tempMap["stable_Pet-Wolf-Cerberus"] = "gif"
tempMap["armor_special_ks2019"] = "gif" tempMap["armor_special_ks2019"] = "gif"
tempMap["slim_armor_special_ks2019"] = "gif" tempMap["slim_armor_special_ks2019"] = "gif"
tempMap["broad_armor_special_ks2019"] = "gif" tempMap["broad_armor_special_ks2019"] = "gif"
@ -181,7 +182,7 @@ object DataBindingUtils {
tempNameMap["shield_special_0"] = "BackerOnly-Shield-TormentedSkull" tempNameMap["shield_special_0"] = "BackerOnly-Shield-TormentedSkull"
tempNameMap["weapon_special_0"] = "BackerOnly-Weapon-DarkSoulsBlade" tempNameMap["weapon_special_0"] = "BackerOnly-Weapon-DarkSoulsBlade"
tempNameMap["weapon_special_critical"] = "weapon_special_critical" tempNameMap["weapon_special_critical"] = "weapon_special_critical"
tempNameMap["Pet-Wolf-Cerberus"] = "Pet-Wolf-Cerberus" tempNameMap["Pet-Wolf-Cerberus"] = "BackerOnly-Pet-CerberusPup"
FILENAME_MAP = tempNameMap FILENAME_MAP = tempNameMap
} }
} }

19
common/src/main/java/com/habitrpg/common/habitica/views/PixelArtView.kt
View file

@ -39,23 +39,22 @@ class PixelArtView @JvmOverloads constructor(
var targetWidth = bitmap?.width ?: 0 var targetWidth = bitmap?.width ?: 0
var targetHeight = bitmap?.height ?: 0 var targetHeight = bitmap?.height ?: 0
val smallestSide = min(width, height) val smallestSide = min(width, height)
val divisor = if (targetWidth % 3 == 0 && targetHeight % 3 == 0) 3 else 2
val factor = min( val factor = min(
( if (smallestSide > 0 && targetWidth > 0 && smallestSide != targetWidth) {
if (smallestSide > 0 && targetWidth > 0 && smallestSide != targetWidth) { smallestSide / (targetWidth / divisor)
smallestSide / (targetWidth / 3) } else {
} else { 1
1 },
}
),
if (smallestSide > 0 && targetHeight > 0 && smallestSide != targetHeight) { if (smallestSide > 0 && targetHeight > 0 && smallestSide != targetHeight) {
smallestSide / (targetHeight / 3) smallestSide / (targetHeight / divisor)
} else { } else {
1 1
} }
) )
targetWidth = (targetWidth / 3) * factor targetWidth = (targetWidth / divisor) * factor
targetHeight = (targetHeight / 3) * factor targetHeight = (targetHeight / divisor) * factor
val left = (width - targetWidth) / 2 val left = (width - targetWidth) / 2
val top = (height - targetHeight) / 2 val top = (height - targetHeight) / 2
targetRect = Rect(left, top, left + targetWidth, top + targetHeight) targetRect = Rect(left, top, left + targetWidth, top + targetHeight)

2
version.properties
View file

@ -1,2 +1,2 @@
NAME=4.3 NAME=4.3
CODE=6491 CODE=6511