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

Show background for purchase when selecting background item

Browse source
This commit is contained in:
Hafiz 2022-05-14 21:39:45 -04:00
parent 73246fa354
commit f89847feea
3 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.kt
View file

@ -35,6 +35,7 @@ class AvatarView : FrameLayout {
private var showPet = true
private var showSleeping = true
private var hasBackground: Boolean = false
private var backgroundForPurchase: String? = null
private var hasMount: Boolean = false
private var hasPet: Boolean = false
private val imageViewHolder = mutableListOf<ImageView>()
@ -203,7 +204,10 @@ class AvatarView : FrameLayout {
}
var backgroundName = avatar.preferences?.background
if (showBackground && backgroundName?.isNotEmpty() == true) {
if (backgroundForPurchase != null) {
layerMap[LayerType.BACKGROUND] = backgroundForPurchase
if (resetHasAttributes) hasBackground = true
} else if (showBackground && backgroundName?.isNotEmpty() == true) {
backgroundName = substituteOrReturn(spriteSubstitutions["backgrounds"], backgroundName)
layerMap[LayerType.BACKGROUND] = "background_$backgroundName"
if (resetHasAttributes) hasBackground = true
@ -433,6 +437,22 @@ class AvatarView : FrameLayout {
}
}
fun setAvatarWithBackgroundForPurchase(avatar: Avatar, backgroundForPurchase: String?) {
val oldUser = this.avatar
this.avatar = avatar
this.backgroundForPurchase = backgroundForPurchase
var equals = false
if (oldUser != null) {
val newLayerMap = getLayerMap(avatar, false)
equals = currentLayers == newLayerMap
}
if (!equals) {
invalidate()
}
}
private fun initAvatarRectMatrix() {
if (avatarRectF == null) {
val srcRect = originalRect

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

@ -288,7 +288,7 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
setLimitedTextView()
if (additionalContentView is PurchaseDialogBackgroundContent) {
(additionalContentView as PurchaseDialogBackgroundContent).setAvatar(userRepository.getUnmanagedCopy(user))
(additionalContentView as PurchaseDialogBackgroundContent).setAvatarWithBackgroundForPurchase(userRepository.getUnmanagedCopy(user), shopItem)
}
}

4
Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogBackgroundContent.kt
View file

@ -20,7 +20,7 @@ class PurchaseDialogBackgroundContent(context: Context) : PurchaseDialogContent(
binding.notesTextView.text = item.notes
}
fun setAvatar(avatar: Avatar) {
binding.avatarView.setAvatar(avatar)
fun setAvatarWithBackgroundForPurchase(avatar: Avatar, item: ShopItem) {
binding.avatarView.setAvatarWithBackgroundForPurchase(avatar, item.imageName)
}
}