diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 03707291e..dcdbfa64f 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -155,7 +155,7 @@ android {
multiDexEnabled true
resConfigs "en", "bg", "de", "en-rGB", "es", "fr", "hr-rHR", "in", "it", "iw", "ja", "ko", "lt", "nl", "pl", "pt-rBR", "pt-rPT", "ru", "tr", "zh", "zh-rTW"
- versionCode 2386
+ versionCode 2388
versionName "2.5"
}
diff --git a/Habitica/res/drawable/layout_rounded_bg_gray_700_brand_border.xml b/Habitica/res/drawable/layout_rounded_bg_gray_700_brand_border.xml
new file mode 100644
index 000000000..727262a5e
--- /dev/null
+++ b/Habitica/res/drawable/layout_rounded_bg_gray_700_brand_border.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Habitica/res/layout/customization_grid_item.xml b/Habitica/res/layout/customization_grid_item.xml
index c37ca4360..5d60f1577 100644
--- a/Habitica/res/layout/customization_grid_item.xml
+++ b/Habitica/res/layout/customization_grid_item.xml
@@ -1,37 +1,41 @@
-
-
+
+
-
+ android:layout_gravity="center">
+
-
-
-
\ No newline at end of file
+ android:layout_height="76dp"
+ android:layout_gravity="start"
+ android:scaleType="fitEnd" />
+
+
+
+
+
\ No newline at end of file
diff --git a/Habitica/res/layout/customization_section_header.xml b/Habitica/res/layout/customization_section_header.xml
index 66ef678c9..8a7df6961 100644
--- a/Habitica/res/layout/customization_section_header.xml
+++ b/Habitica/res/layout/customization_section_header.xml
@@ -1,21 +1,42 @@
+ android:paddingTop="16dp"
+ android:gravity="bottom"
+ android:layout_marginStart="20dp"
+ android:layout_marginEnd="20dp">
+ android:textAppearance="?android:attr/textAppearanceMedium"/>
-
+ android:visibility="gone"
+ android:orientation="horizontal"
+ android:gravity="center"
+ tools:visibility="visible"
+ android:paddingStart="@dimen/spacing_medium"
+ android:paddingEnd="@dimen/spacing_medium"
+ android:background="@drawable/layout_rounded_bg_gray_700">
+
+
+
\ No newline at end of file
diff --git a/Habitica/res/layout/fragment_avatar_overview.xml b/Habitica/res/layout/fragment_avatar_overview.xml
index 73006f3e3..3df829751 100644
--- a/Habitica/res/layout/fragment_avatar_overview.xml
+++ b/Habitica/res/layout/fragment_avatar_overview.xml
@@ -33,7 +33,8 @@
+ android:layout_height="50dp"
+ android:gravity="center_vertical">
@@ -66,6 +66,30 @@
android:layout_height="wrap_content"
android:id="@+id/avatarSkinView"
app:equipmentTitle="@string/avatar_skin"/>
+
+
+
+
+
+
+
+ android:id="@+id/avatar_accent_view"
+ app:equipmentTitle="@string/avatar_accent" />
+
-
+
+
+
+
+
6dp
90dp
90dp
- 100dp
+ 76dp
68dp
12dp
16sp
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index cb7ae02c8..fc6d791a1 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -1001,4 +1001,7 @@
Could not find user
Animal Ears
Animal Tail
+ Headband
+ Accent
+ Buy All
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.kt
index 310a24668..2b64387ac 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.kt
@@ -31,6 +31,7 @@ interface InventoryRepository : BaseRepository {
fun retrieveInAppRewards(): Flowable>
fun getOwnedEquipment(type: String): Flowable>
+ fun getEquipmentType(type: String, set: String): Flowable>
fun getOwnedItems(itemType: String): Flowable>
fun getOwnedItems(): Flowable>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.kt
index 81fcc8f4a..328826ac5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.kt
@@ -46,6 +46,10 @@ class InventoryRepositoryImpl(localRepository: InventoryLocalRepository, apiClie
return localRepository.getOwnedEquipment()
}
+ override fun getEquipmentType(type: String, set: String): Flowable> {
+ return localRepository.getEquipmentType(type, set)
+ }
+
override fun getOwnedItems(itemType: String): Flowable> {
return localRepository.getOwnedItems(itemType, userID)
}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.kt
index be2942e53..08331e26e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.kt
@@ -33,6 +33,7 @@ interface InventoryLocalRepository : ContentLocalRepository {
fun getItems(itemClass: Class, keys: Array, user: User?): Flowable>
fun getOwnedItems(itemType: String, userID: String): Flowable>
fun getOwnedItems(userID: String): Flowable>
+ fun getEquipmentType(type: String, set: String): Flowable>
fun getEquipment(key: String): Flowable
fun getMounts(type: String, group: String, color: String?): Flowable>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.kt
index d331ce09a..2d5aeb0d6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.kt
@@ -70,6 +70,15 @@ class RealmInventoryLocalRepository(realm: Realm, private val context: Context)
.filter { it.isLoaded }
}
+ override fun getEquipmentType(type: String, set: String): Flowable> {
+ return realm.where(Equipment::class.java)
+ .equalTo("type", type)
+ .equalTo("gearSet", set)
+ .findAll()
+ .asFlowable()
+ .filter { it.isLoaded }
+ }
+
override fun getOwnedItems(itemType: String, userID: String): Flowable> {
return realm.where(OwnedItem::class.java)
.greaterThan("numberOwned", 0)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Equipment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Equipment.kt
index 2eadf6a3f..7213096d8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Equipment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Equipment.kt
@@ -24,4 +24,5 @@ open class Equipment : RealmObject() {
var owned: Boolean? = null
var twoHanded = false
var mystery = ""
+ var gearSet = ""
}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationEquipmentRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationEquipmentRecyclerViewAdapter.kt
new file mode 100644
index 000000000..68f6edf29
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationEquipmentRecyclerViewAdapter.kt
@@ -0,0 +1,157 @@
+package com.habitrpg.android.habitica.ui.adapter
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.core.os.bundleOf
+import com.facebook.drawee.view.SimpleDraweeView
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.CustomizationGridItemBinding
+import com.habitrpg.android.habitica.helpers.MainNavigationController
+import com.habitrpg.android.habitica.models.inventory.CustomizationSet
+import com.habitrpg.android.habitica.models.inventory.Equipment
+import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
+import io.reactivex.BackpressureStrategy
+import io.reactivex.Flowable
+import io.reactivex.subjects.PublishSubject
+import java.util.*
+
+class CustomizationEquipmentRecyclerViewAdapter : androidx.recyclerview.widget.RecyclerView.Adapter() {
+
+ var gemBalance: Int = 0
+ var equipmentList
+ : MutableList = ArrayList()
+ set(value) {
+ field = value
+ notifyDataSetChanged()
+ }
+ var activeEquipment: String? = null
+ set(value) {
+ field = value
+ this.notifyDataSetChanged()
+ }
+
+ private val selectCustomizationEvents = PublishSubject.create()
+ private val unlockCustomizationEvents = PublishSubject.create()
+ private val unlockSetEvents = PublishSubject.create()
+
+ override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder {
+ val viewID: Int = R.layout.customization_grid_item
+
+ val view = LayoutInflater.from(parent.context).inflate(viewID, parent, false)
+ return EquipmentViewHolder(view)
+ }
+
+ override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) {
+ (holder as EquipmentViewHolder).bind(equipmentList[position])
+ }
+
+ override fun getItemCount(): Int {
+ return equipmentList.size
+ }
+
+ override fun getItemViewType(position: Int): Int {
+ return if (this.equipmentList[position].javaClass == CustomizationSet::class.java) {
+ 0
+ } else {
+ 1
+ }
+ }
+
+ fun setEquipment(newEquipmentList: List) {
+ this.equipmentList = newEquipmentList.toMutableList()
+ this.notifyDataSetChanged()
+ }
+
+ fun getSelectCustomizationEvents(): Flowable {
+ return selectCustomizationEvents.toFlowable(BackpressureStrategy.DROP)
+ }
+
+ fun getUnlockCustomizationEvents(): Flowable {
+ return unlockCustomizationEvents.toFlowable(BackpressureStrategy.DROP)
+ }
+
+ fun getUnlockSetEvents(): Flowable {
+ return unlockSetEvents.toFlowable(BackpressureStrategy.DROP)
+ }
+
+ internal inner class EquipmentViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView), View.OnClickListener {
+
+ private val binding = CustomizationGridItemBinding.bind(itemView)
+ var equipment: Equipment? = null
+
+ init {
+ itemView.setOnClickListener(this)
+ }
+
+ fun bind(equipment: Equipment) {
+ this.equipment = equipment
+ DataBindingUtils.loadImage(binding.imageView, "shop_" + this.equipment?.key)
+ if (equipment.owned == true || equipment.value == 0.0) {
+ binding.buyButton.visibility = View.GONE
+ } else {
+ binding.buyButton.visibility = View.VISIBLE
+ binding.priceLabel.currency = "gems"
+ binding.priceLabel.value = if (equipment.gearSet == "animal") {
+ 2.0
+ } else {
+ equipment.value
+ }
+ }
+
+ if (activeEquipment == equipment.key) {
+ binding.wrapper.background = itemView.context.getDrawable(R.drawable.layout_rounded_bg_gray_700_brand_border)
+ } else {
+ binding.wrapper.background = itemView.context.getDrawable(R.drawable.layout_rounded_bg_gray_700)
+ }
+ }
+
+ override fun onClick(v: View) {
+ if (equipment?.owned != true && (equipment?.value ?: 0.0) > 0.0) {
+ val dialogContent = LayoutInflater.from(itemView.context).inflate(R.layout.dialog_purchase_customization, null) as LinearLayout
+
+ val imageView = dialogContent.findViewById(R.id.imageView)
+ DataBindingUtils.loadImage(imageView, "shop_" + this.equipment?.key)
+
+ val priceLabel = dialogContent.findViewById(R.id.priceLabel)
+ priceLabel.text = if (equipment?.gearSet == "animal") {
+ 2.0
+ } else {
+ equipment?.value ?: 0
+ }.toString()
+
+ (dialogContent.findViewById(R.id.gem_icon) as? ImageView)?.setImageBitmap(HabiticaIconsHelper.imageOfGem())
+
+ val dialog = HabiticaAlertDialog(itemView.context)
+ dialog.addButton(R.string.purchase_button, true) { _, _ ->
+ if (equipment?.value ?: 0.0 > gemBalance) {
+ MainNavigationController.navigate(R.id.gemPurchaseActivity, bundleOf(Pair("openSubscription", false)))
+ return@addButton
+ }
+
+ equipment?.let {
+ unlockCustomizationEvents.onNext(it)
+ }
+ }
+ dialog.setTitle(R.string.purchase_customization)
+ dialog.setAdditionalContentView(dialogContent)
+ dialog.addButton(R.string.reward_dialog_dismiss, false)
+ dialog.show()
+ return
+ }
+
+ if (equipment?.key == activeEquipment) {
+ return
+ }
+
+ equipment?.let {
+ selectCustomizationEvents.onNext(it)
+ }
+ }
+ }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.kt
index 97cd93b1b..d1603b19e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.kt
@@ -4,11 +4,14 @@ import android.content.Context
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
-import android.widget.*
-import androidx.core.content.ContextCompat
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.TextView
import androidx.core.os.bundleOf
import com.facebook.drawee.view.SimpleDraweeView
import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.CustomizationGridItemBinding
+import com.habitrpg.android.habitica.databinding.CustomizationSectionHeaderBinding
import com.habitrpg.android.habitica.helpers.MainNavigationController
import com.habitrpg.android.habitica.models.inventory.Customization
import com.habitrpg.android.habitica.models.inventory.CustomizationSet
@@ -125,35 +128,33 @@ class CustomizationRecyclerViewAdapter : androidx.recyclerview.widget.RecyclerVi
internal inner class CustomizationViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView), View.OnClickListener {
- private val cardView: androidx.cardview.widget.CardView by bindView(itemView, R.id.card_view)
- private val linearLayout: RelativeLayout by bindView(itemView, R.id.linearLayout)
- private val imageView: SimpleDraweeView by bindView(itemView, R.id.imageView)
- private val purchaseOverlay: View by bindView(itemView, R.id.purchaseOverlay)
-
+ private val binding = CustomizationGridItemBinding.bind(itemView)
var customization: Customization? = null
init {
- linearLayout.setOnClickListener(this)
+ itemView.setOnClickListener(this)
}
fun bind(customization: Customization) {
this.customization = customization
if (customization.customizationSet?.contains("timeTravel") == true) {
- DataBindingUtils.loadImage(this.imageView, customization.getImageName(userSize, hairColor), imageFormat = "gif")
+ DataBindingUtils.loadImage(binding.imageView, customization.getImageName(userSize, hairColor), imageFormat = "gif")
} else {
- DataBindingUtils.loadImage(this.imageView, customization.getImageName(userSize, hairColor))
+ DataBindingUtils.loadImage(binding.imageView, customization.getImageName(userSize, hairColor))
}
- cardView.setCardBackgroundColor(ContextCompat.getColor(itemView.context, android.R.color.white))
if (customization.isUsable) {
- imageView.alpha = 1.0f
- purchaseOverlay.alpha = 0.0f
- if (customization.identifier == activeCustomization) {
- cardView.setCardBackgroundColor(ContextCompat.getColor(itemView.context, R.color.brand_500))
- }
+ binding.buyButton.visibility = View.GONE
} else {
- imageView.alpha = 0.3f
- purchaseOverlay.alpha = 0.8f
+ binding.buyButton.visibility = View.VISIBLE
+ binding.priceLabel.currency = "gems"
+ binding.priceLabel.value = customization.price.toDouble()
+ }
+
+ if (activeCustomization == customization.identifier) {
+ binding.wrapper.background = itemView.context.getDrawable(R.drawable.layout_rounded_bg_gray_700_brand_border)
+ } else {
+ binding.wrapper.background = itemView.context.getDrawable(R.drawable.layout_rounded_bg_gray_700)
}
}
@@ -209,23 +210,24 @@ class CustomizationRecyclerViewAdapter : androidx.recyclerview.widget.RecyclerVi
internal inner class SectionViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView), View.OnClickListener {
+ private val binding = CustomizationSectionHeaderBinding.bind(itemView)
private val label: TextView by bindView(itemView, R.id.label)
- private val purchaseSetButton: Button by bindView(itemView, R.id.purchaseSetButton)
var context: Context = itemView.context
private var set: CustomizationSet? = null
init {
- purchaseSetButton.setOnClickListener(this)
+ binding.purchaseSetButton.setOnClickListener(this)
}
fun bind(set: CustomizationSet) {
this.set = set
this.label.text = set.text
if (set.hasPurchasable && !set.identifier.contains("timeTravel")) {
- this.purchaseSetButton.visibility = View.VISIBLE
- this.purchaseSetButton.text = context.getString(R.string.purchase_set_button, set.price)
+ binding.purchaseSetButton.visibility = View.VISIBLE
+ binding.setPriceLabel.value = set.price.toDouble()
+ binding.setPriceLabel.currency = "gems"
} else {
- this.purchaseSetButton.visibility = View.GONE
+ binding.purchaseSetButton.visibility = View.GONE
}
}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt
index 7de853f05..682c31e50 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt
@@ -83,8 +83,7 @@ class AvatarCustomizationFragment : BaseMainFragment() {
}
}
- setGridSpanCount(view.width)
- val layoutManager = GridLayoutManager(activity, 2)
+ val layoutManager = GridLayoutManager(activity, 4)
layoutManager.spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() {
override fun getSpanSize(position: Int): Int {
return if (adapter.getItemViewType(position) == 0) {
@@ -94,6 +93,7 @@ class AvatarCustomizationFragment : BaseMainFragment() {
}
}
}
+ setGridSpanCount(view.width)
recyclerView.layoutManager = layoutManager
recyclerView.addItemDecoration(MarginDecoration(context))
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarEquipmentFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarEquipmentFragment.kt
index 11a8ff1c7..2e55d5d05 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarEquipmentFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarEquipmentFragment.kt
@@ -12,7 +12,7 @@ import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
import com.habitrpg.android.habitica.helpers.RxErrorHandler
import com.habitrpg.android.habitica.models.responses.UnlockResponse
import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.android.habitica.ui.adapter.CustomizationRecyclerViewAdapter
+import com.habitrpg.android.habitica.ui.adapter.CustomizationEquipmentRecyclerViewAdapter
import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
import com.habitrpg.android.habitica.ui.helpers.MarginDecoration
import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
@@ -30,7 +30,7 @@ class AvatarEquipmentFragment : BaseMainFragment() {
var category: String? = null
private var activeEquipment: String? = null
- internal var adapter: CustomizationRecyclerViewAdapter = CustomizationRecyclerViewAdapter()
+ internal var adapter: CustomizationEquipmentRecyclerViewAdapter = CustomizationEquipmentRecyclerViewAdapter()
internal var layoutManager: GridLayoutManager = GridLayoutManager(activity, 2)
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
@@ -39,18 +39,13 @@ class AvatarEquipmentFragment : BaseMainFragment() {
val view = inflater.inflate(R.layout.fragment_recyclerview, container, false)
compositeSubscription.add(adapter.getSelectCustomizationEvents()
- .flatMap { customization ->
- userRepository.useCustomization(user, customization.type ?: "", customization.category, customization.identifier ?: "")
+ .flatMap { equipment ->
+ inventoryRepository.equip(user, if (user?.preferences?.costume == true) "costume" else "equipped", equipment.key ?: "")
}
.subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
compositeSubscription.add(adapter.getUnlockCustomizationEvents()
- .flatMap { customization ->
- val user = this.user
- if (user != null) {
- userRepository.unlockPath(user, customization)
- } else {
- Flowable.empty()
- }
+ .flatMap {
+ Flowable.empty()
}
.subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
compositeSubscription.add(adapter.getUnlockSetEvents()
@@ -69,7 +64,7 @@ class AvatarEquipmentFragment : BaseMainFragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
arguments?.let {
- val args = AvatarCustomizationFragmentArgs.fromBundle(it)
+ val args = AvatarEquipmentFragmentArgs.fromBundle(it)
type = args.type
if (args.category.isNotEmpty()) {
category = args.category
@@ -77,7 +72,7 @@ class AvatarEquipmentFragment : BaseMainFragment() {
}
setGridSpanCount(view.width)
- val layoutManager = GridLayoutManager(activity, 2)
+ val layoutManager = GridLayoutManager(activity, 4)
layoutManager.spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() {
override fun getSpanSize(position: Int): Int {
return if (adapter.getItemViewType(position) == 0) {
@@ -105,6 +100,9 @@ class AvatarEquipmentFragment : BaseMainFragment() {
private fun loadEquipment() {
val type = this.type ?: return
+ inventoryRepository.getEquipmentType(type, category ?: "").subscribe(Consumer {
+ adapter.setEquipment(it)
+ }, RxErrorHandler.handleEmptyError())
}
private fun setGridSpanCount(width: Int) {
@@ -118,15 +116,6 @@ class AvatarEquipmentFragment : BaseMainFragment() {
fun updateUser(user: User) {
this.updateActiveCustomization(user)
- if (adapter.customizationList.size != 0) {
- val ownedCustomizations = ArrayList()
- user.purchased?.customizations?.filter { it.type == this.type }?.mapTo(ownedCustomizations) { it.id }
- adapter.updateOwnership(ownedCustomizations)
- } else {
- this.loadEquipment()
- }
- this.adapter.userSize = this.user?.preferences?.size
- this.adapter.hairColor = this.user?.preferences?.hair?.color
this.adapter.gemBalance = user.gemCount
adapter.notifyDataSetChanged()
}
@@ -135,25 +124,16 @@ class AvatarEquipmentFragment : BaseMainFragment() {
if (this.type == null || user.preferences == null) {
return
}
- val prefs = this.user?.preferences
+ val outfit = if (user.preferences?.costume == true) this.user?.items?.gear?.costume else this.user?.items?.gear?.equipped
val activeEquipment = when (this.type) {
- "skin" -> prefs?.skin
- "shirt" -> prefs?.shirt
- "background" -> prefs?.background
- "hair" -> when (this.category) {
- "bangs" -> prefs?.hair?.bangs.toString()
- "base" -> prefs?.hair?.base.toString()
- "color" -> prefs?.hair?.color
- "flower" -> prefs?.hair?.flower.toString()
- "beard" -> prefs?.hair?.beard.toString()
- "mustache" -> prefs?.hair?.mustache.toString()
- else -> ""
- }
+ "headAccessory" -> outfit?.headAccessory
+ "back" -> outfit?.back
+ "eyewear" -> outfit?.eyeWear
else -> ""
}
if (activeEquipment != null) {
this.activeEquipment = activeEquipment
- this.adapter.activeCustomization = activeEquipment
+ this.adapter.activeEquipment = activeEquipment
}
}
}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt
index 66e3efef2..2cfb1db99 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt
@@ -32,13 +32,14 @@ class AvatarOverviewFragment : BaseMainFragment(), AdapterView.OnItemSelectedLis
binding.avatarShirtView.setOnClickListener { displayCustomizationFragment("shirt", null) }
binding.avatarSkinView.setOnClickListener { displayCustomizationFragment("skin", null) }
binding.avatarChairView.setOnClickListener { displayCustomizationFragment("chair", null) }
- binding.avatarGlassesView.setOnClickListener { displayCustomizationFragment("eyewear", null) }
- binding.avatarAnimalEarsView.setOnClickListener { displayCustomizationFragment("animal_ears", null) }
- binding.avatarAnimalTailView.setOnClickListener { displayCustomizationFragment("animal_tails", null) }
+ binding.avatarGlassesView.setOnClickListener { displayEquipmentFragment("eyewear", "glasses") }
+ binding.avatarAnimalEarsView.setOnClickListener { displayEquipmentFragment("headAccessory", "animal") }
+ binding.avatarAnimalTailView.setOnClickListener { displayEquipmentFragment("back", "animal") }
+ binding.avatarHeadbandView.setOnClickListener { displayEquipmentFragment("headAccessory", "headband") }
binding.avatarHairColorView.setOnClickListener { displayCustomizationFragment("hair", "color") }
binding.avatarHairBangsView.setOnClickListener { displayCustomizationFragment("hair", "bangs") }
binding.avatarHairBaseView.setOnClickListener { displayCustomizationFragment("hair", "base") }
- binding.avatarHairFlowerView.setOnClickListener { displayCustomizationFragment("hair", "flower") }
+ binding.avatarAccentView.setOnClickListener { displayCustomizationFragment("hair", "flower") }
binding.avatarHairBeardView.setOnClickListener { displayCustomizationFragment("hair", "beard") }
binding.avatarHairMustacheView.setOnClickListener { displayCustomizationFragment("hair", "mustache") }
binding.avatarBackgroundView.setOnClickListener { displayCustomizationFragment("background", null) }
@@ -56,6 +57,10 @@ class AvatarOverviewFragment : BaseMainFragment(), AdapterView.OnItemSelectedLis
MainNavigationController.navigate(AvatarOverviewFragmentDirections.openAvatarDetail(type, category ?: ""))
}
+ private fun displayEquipmentFragment(type: String, category: String?) {
+ MainNavigationController.navigate(AvatarOverviewFragmentDirections.openAvatarEquipment(type, category ?: ""))
+ }
+
fun updateUser(user: User) {
this.setSize(user.preferences?.size)
setCustomizations(user)
@@ -63,32 +68,20 @@ class AvatarOverviewFragment : BaseMainFragment(), AdapterView.OnItemSelectedLis
private fun setCustomizations(user: User) {
binding.avatarShirtView.customizationIdentifier = user.preferences?.size + "_shirt_" + user.preferences?.shirt
- binding.avatarShirtView.equipmentName = user.preferences?.shirt
binding.avatarSkinView.customizationIdentifier = "skin_" + user.preferences?.skin
- binding.avatarSkinView.equipmentName = user.preferences?.skin
val chair = user.preferences?.chair
binding.avatarChairView.customizationIdentifier = if (chair?.startsWith("handleless") == true) "chair_$chair" else chair
- binding.avatarChairView.equipmentName = chair?.removePrefix("chair_")
- binding.avatarGlassesView.customizationIdentifier = "shop_" + user.equipped?.eyeWear
- binding.avatarGlassesView.equipmentName = user.equipped?.eyeWear
- binding.avatarAnimalEarsView.customizationIdentifier = "shop_" + user.equipped?.headAccessory
- binding.avatarAnimalEarsView.equipmentName = user.equipped?.headAccessory
- binding.avatarAnimalTailView.customizationIdentifier = "shop_" + user.equipped?.back
- binding.avatarAnimalTailView.equipmentName = user.equipped?.back
+ binding.avatarGlassesView.equipmentIdentifier = user.equipped?.eyeWear
+ binding.avatarAnimalEarsView.equipmentIdentifier = user.equipped?.headAccessory
+ binding.avatarHeadbandView.equipmentIdentifier = user.equipped?.headAccessory
+ binding.avatarAnimalTailView.equipmentIdentifier = user.equipped?.back
binding.avatarHairColorView.customizationIdentifier = if (user.preferences?.hair?.color != null && user.preferences?.hair?.color != "") "hair_bangs_1_" + user.preferences?.hair?.color else ""
- binding.avatarHairColorView.equipmentName = user.preferences?.hair?.color
binding.avatarHairBangsView.customizationIdentifier = if (user.preferences?.hair?.bangs != null && user.preferences?.hair?.bangs != 0) "hair_bangs_" + user.preferences?.hair?.bangs + "_" + user.preferences?.hair?.color else ""
- binding.avatarHairBangsView.equipmentName = user.preferences?.hair?.bangs.toString()
binding.avatarHairBaseView.customizationIdentifier = if (user.preferences?.hair?.base != null && user.preferences?.hair?.base != 0) "hair_base_" + user.preferences?.hair?.base + "_" + user.preferences?.hair?.color else ""
- binding.avatarHairBaseView.equipmentName = user.preferences?.hair?.base.toString()
- binding.avatarHairFlowerView.customizationIdentifier = if (user.preferences?.hair?.flower != null && user.preferences?.hair?.flower != 0) "hair_flower_" + user.preferences?.hair?.flower else ""
- binding.avatarHairFlowerView.equipmentName = user.preferences?.hair?.bangs.toString()
+ binding.avatarAccentView.customizationIdentifier = if (user.preferences?.hair?.flower != null && user.preferences?.hair?.flower != 0) "hair_flower_" + user.preferences?.hair?.flower else ""
binding.avatarHairBeardView.customizationIdentifier = if (user.preferences?.hair?.beard != null && user.preferences?.hair?.beard != 0) "hair_beard_" + user.preferences?.hair?.beard + "_" + user.preferences?.hair?.color else ""
- binding.avatarHairBeardView.equipmentName = user.preferences?.hair?.beard.toString()
binding.avatarHairMustacheView.customizationIdentifier = if (user.preferences?.hair?.mustache != null && user.preferences?.hair?.mustache != 0) "hair_mustache_" + user.preferences?.hair?.mustache + "_" + user.preferences?.hair?.color else ""
- binding.avatarHairMustacheView.equipmentName = user.preferences?.hair?.mustache.toString()
binding.avatarBackgroundView.customizationIdentifier = "background_" + user.preferences?.background
- binding.avatarBackgroundView.equipmentName = user.preferences?.background
}
private fun setSize(size: String?) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/EquipmentItemRow.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/EquipmentItemRow.kt
index 8e50fe6bd..f53dda804 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/EquipmentItemRow.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/EquipmentItemRow.kt
@@ -5,40 +5,37 @@ import android.util.AttributeSet
import android.view.View
import android.widget.LinearLayout
import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.ItemImageRowBinding
+import com.habitrpg.android.habitica.extensions.layoutInflater
import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
-import kotlinx.android.synthetic.main.item_image_row.view.*
-class EquipmentItemRow(context: Context?, attrs: AttributeSet?) : LinearLayout(context, attrs) {
+class EquipmentItemRow(context: Context, attrs: AttributeSet?) : LinearLayout(context, attrs) {
+ private val binding: ItemImageRowBinding = ItemImageRowBinding.inflate(context.layoutInflater, this)
var equipmentIdentifier: String? = null
set(value) {
field = value
val imageName = if (equipmentIdentifier?.isNotEmpty() == true && equipmentIdentifier?.endsWith("base_0") == false) "shop_$equipmentIdentifier" else "head_0"
- DataBindingUtils.loadImage(imageView, imageName)
+ DataBindingUtils.loadImage(binding.imageView, imageName)
}
var customizationIdentifier: String? = null
set(value) {
field = value
val imageName = if (customizationIdentifier?.isNotEmpty() == true) customizationIdentifier else "head_0"
- DataBindingUtils.loadImage(imageView, imageName)
- }
-
- var equipmentName: String? = ""
- set(value) {
- field = value
- valueTextView.text = equipmentName
+ DataBindingUtils.loadImage(binding.imageView, imageName)
}
init {
View.inflate(context, R.layout.item_image_row, this)
isClickable = true
- val attributes = context?.theme?.obtainStyledAttributes(
+ val attributes = context.theme?.obtainStyledAttributes(
attrs,
R.styleable.EquipmentItemRow,
0, 0)
- titleTextView.text = attributes?.getString(R.styleable.EquipmentItemRow_equipmentTitle)
+ binding.titleTextView.text = attributes?.getString(R.styleable.EquipmentItemRow_equipmentTitle)
+ binding.valueTextView.visibility = View.GONE
}
}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/EquipmentListDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/EquipmentListDeserializer.java
index d1516f9ff..366a3009a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/EquipmentListDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/EquipmentListDeserializer.java
@@ -44,6 +44,7 @@ public class EquipmentListDeserializer implements JsonDeserializer