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

Improve stable display

Browse source
This commit is contained in:
Phillip Thelen 2020-07-22 15:14:41 +02:00
parent 5b72add5ef
commit bda64ecbff
17 changed files with 254 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Habitica/build.gradle
View file

@ -162,7 +162,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 2485
versionCode 2488
versionName "2.8"
}

2
Habitica/res/drawable/layout_rounded_bg_gray_700_brand_border.xml
View file

@ -3,5 +3,5 @@
<solid android:color="@color/gray_700" />
<corners android:radius="@dimen/rounded_button_radius"/>
<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
<stroke android:color="@color/brand_300" android:width="2dp" />
<stroke android:color="@color/brand_400" android:width="2dp" />
</shape>

12
Habitica/res/layout/main_navigation_view.xml
View file

@ -5,7 +5,8 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:parentTag="android.widget.RelativeLayout">
tools:parentTag="android.widget.RelativeLayout"
tools:background="@color/gray_600">
<LinearLayout
android:id="@+id/bottom_navigation_background"
@ -20,13 +21,14 @@
android:background="?barColor" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<ImageView
android:id="@+id/cutout_background"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/bottom_navigation_inset"/>
android:layout_height="62dp"
android:src="@drawable/bottom_navigation_inset"
android:layout_gravity="top"/>
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -42,7 +44,7 @@
android:id="@+id/item_wrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="62dp"
android:minHeight="48dp"
android:layout_alignParentBottom="true"
android:paddingTop="@dimen/spacing_small"
android:paddingBottom="@dimen/spacing_small">

4
Habitica/res/layout/pet_detail_item.xml
View file

@ -22,8 +22,8 @@
android:progressTint="@color/green_100"
android:progressBackgroundTint="@color/gray_600"
android:layout_marginTop="4dp"
android:layout_marginStart="9dp"
android:layout_marginEnd="9dp"
android:layout_marginStart="7dp"
android:layout_marginEnd="7dp"
android:max="50" />
<LinearLayout
android:id="@+id/items_available_wrapper"

4
Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.kt
View file

@ -41,8 +41,8 @@ interface InventoryRepository : BaseRepository {
fun openMysteryItem(user: User?): Flowable<Equipment>
fun saveEquipment(equipment: Equipment)
fun getMounts(type: String, group: String, color: String?): Flowable<RealmResults<Mount>>
fun getPets(type: String, group: String, color: String?): Flowable<RealmResults<Pet>>
fun getMounts(type: String?, group: String?, color: String?): Flowable<RealmResults<Mount>>
fun getPets(type: String?, group: String?, color: String?): Flowable<RealmResults<Pet>>
fun updateOwnedEquipment(user: User)

4
Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.kt
View file

@ -82,7 +82,7 @@ class InventoryRepositoryImpl(localRepository: InventoryLocalRepository, apiClie
return localRepository.getMounts()
}
override fun getMounts(type: String, group: String, color: String?): Flowable<RealmResults<Mount>> {
override fun getMounts(type: String?, group: String?, color: String?): Flowable<RealmResults<Mount>> {
return localRepository.getMounts(type, group, color)
}
@ -94,7 +94,7 @@ class InventoryRepositoryImpl(localRepository: InventoryLocalRepository, apiClie
return localRepository.getPets()
}
override fun getPets(type: String, group: String, color: String?): Flowable<RealmResults<Pet>> {
override fun getPets(type: String?, group: String?, color: String?): Flowable<RealmResults<Pet>> {
return localRepository.getPets(type, group, color)
}

4
Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.kt
View file

@ -36,8 +36,8 @@ interface InventoryLocalRepository : ContentLocalRepository {
fun getEquipmentType(type: String, set: String): Flowable<RealmResults<Equipment>>
fun getEquipment(key: String): Flowable<Equipment>
fun getMounts(type: String, group: String, color: String?): Flowable<RealmResults<Mount>>
fun getPets(type: String, group: String, color: String?): Flowable<RealmResults<Pet>>
fun getMounts(type: String?, group: String?, color: String?): Flowable<RealmResults<Mount>>
fun getPets(type: String?, group: String?, color: String?): Flowable<RealmResults<Pet>>
fun updateOwnedEquipment(user: User)

24
Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.kt
View file

@ -132,11 +132,15 @@ class RealmInventoryLocalRepository(realm: Realm, private val context: Context)
.filter { it.isLoaded }
}
override fun getMounts(type: String, group: String, color: String?): Flowable<RealmResults<Mount>> {
override fun getMounts(type: String?, group: String?, color: String?): Flowable<RealmResults<Mount>> {
var query = realm.where(Mount::class.java)
.sort("color", Sort.ASCENDING)
.equalTo("type", group)
.equalTo("animal", type)
.sort("type", Sort.ASCENDING, if (color == null) "color" else "animal", Sort.ASCENDING)
if (type != null) {
query = query.equalTo("animal", type)
}
if (group != null) {
query = query.equalTo("type", group)
}
if (color != null) {
query = query.equalTo("color", color)
}
@ -162,11 +166,15 @@ class RealmInventoryLocalRepository(realm: Realm, private val context: Context)
.filter { it.isLoaded }
}
override fun getPets(type: String, group: String, color: String?): Flowable<RealmResults<Pet>> {
override fun getPets(type: String?, group: String?, color: String?): Flowable<RealmResults<Pet>> {
var query = realm.where(Pet::class.java)
.sort("color", Sort.ASCENDING)
.equalTo("type", group)
.equalTo("animal", type)
.sort("type", Sort.ASCENDING, if (color == null) "color" else "animal", Sort.ASCENDING)
if (type != null) {
query = query.equalTo("animal", type)
}
if (group != null) {
query = query.equalTo("type", group)
}
if (color != null) {
query = query.equalTo("color", color)
}

7
Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/StableSection.kt Normal file
View file

@ -0,0 +1,7 @@
package com.habitrpg.android.habitica.models.inventory
class StableSection(val key: Any?, val text: String) {
var ownedCount = 0
var totalCount = 0
}

54
Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.kt
View file

@ -11,11 +11,13 @@ import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.extensions.inflate
import com.habitrpg.android.habitica.helpers.RxErrorHandler
import com.habitrpg.android.habitica.models.inventory.Mount
import com.habitrpg.android.habitica.models.inventory.Pet
import com.habitrpg.android.habitica.models.user.OwnedMount
import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
import com.habitrpg.android.habitica.ui.helpers.bindView
import com.habitrpg.android.habitica.ui.menu.BottomSheetMenu
import com.habitrpg.android.habitica.ui.menu.BottomSheetMenuItem
import com.habitrpg.android.habitica.ui.viewHolders.SectionViewHolder
import io.reactivex.BackpressureStrategy
import io.reactivex.Flowable
import io.reactivex.Observable
@ -25,7 +27,7 @@ import io.reactivex.subjects.PublishSubject
import io.realm.OrderedRealmCollection
import io.realm.RealmRecyclerViewAdapter
class MountDetailRecyclerAdapter(data: OrderedRealmCollection<Mount>?, autoUpdate: Boolean) : RealmRecyclerViewAdapter<Mount, MountDetailRecyclerAdapter.MountViewHolder>(data, autoUpdate) {
class MountDetailRecyclerAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>() {
var itemType: String? = null
var context: Context? = null
@ -33,19 +35,60 @@ class MountDetailRecyclerAdapter(data: OrderedRealmCollection<Mount>?, autoUpdat
private val equipEvents = PublishSubject.create<String>()
private var itemList: List<Any> = ArrayList()
fun setItemList(itemList: List<Any>) {
this.itemList = itemList
this.notifyDataSetChanged()
}
fun getEquipFlowable(): Flowable<String> {
return equipEvents.toFlowable(BackpressureStrategy.DROP)
}
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MountViewHolder {
return MountViewHolder(parent.inflate(R.layout.mount_overview_item))
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder =
when (viewType) {
0 -> {
val view = parent.inflate(R.layout.shop_header)
StableRecyclerAdapter.StableHeaderViewHolder(view)
}
1 -> {
val view = parent.inflate(R.layout.customization_section_header)
SectionViewHolder(view)
}
else -> {
MountViewHolder(parent.inflate(R.layout.mount_overview_item))
}
}
override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) {
val obj = this.itemList[position]
when {
obj.javaClass == String::class.java -> {
(holder as? SectionViewHolder)?.bind(obj as? String ?: "")
}
else -> {
(obj as? Mount)?.let { (holder as? MountViewHolder)?.bind(it, ownedMounts?.get(it.key ?: "")) }
}
}
}
override fun onBindViewHolder(holder: MountViewHolder, position: Int) {
data?.let { holder.bind(it[position], ownedMounts?.get(it[position].key)) }
override fun getItemViewType(position: Int): Int {
val item = itemList[position]
return if (item.javaClass == String::class.java) {
1
}
else if (itemType == "pets") {
2
}
else {
3
}
}
override fun getItemCount(): Int = itemList.size
fun setOwnedMounts(ownedMounts: Map<String, OwnedMount>) {
this.ownedMounts = ownedMounts
notifyDataSetChanged()
@ -97,6 +140,7 @@ class MountDetailRecyclerAdapter(data: OrderedRealmCollection<Mount>?, autoUpdat
return
}
val menu = BottomSheetMenu(itemView.context)
menu.setTitle(animal?.text)
menu.addMenuItem(BottomSheetMenuItem(resources.getString(R.string.equip)))
menu.setSelectionRunnable {
animal?.let { equipEvents.onNext(it.key) }

56
Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.kt
View file

@ -7,6 +7,7 @@ import android.view.View
import android.view.ViewGroup
import android.widget.ImageView
import android.widget.ProgressBar
import androidx.recyclerview.widget.GridLayoutManager
import com.facebook.drawee.view.SimpleDraweeView
import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.events.commands.FeedCommand
@ -20,6 +21,7 @@ import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
import com.habitrpg.android.habitica.ui.helpers.bindView
import com.habitrpg.android.habitica.ui.menu.BottomSheetMenu
import com.habitrpg.android.habitica.ui.menu.BottomSheetMenuItem
import com.habitrpg.android.habitica.ui.viewHolders.SectionViewHolder
import com.habitrpg.android.habitica.ui.views.dialogs.PetSuggestHatchDialog
import io.reactivex.BackpressureStrategy
import io.reactivex.Flowable
@ -32,7 +34,7 @@ import io.realm.RealmRecyclerViewAdapter
import io.realm.RealmResults
import org.greenrobot.eventbus.EventBus
class PetDetailRecyclerAdapter(data: OrderedRealmCollection<Pet>?, autoUpdate: Boolean) : RealmRecyclerViewAdapter<Pet, PetDetailRecyclerAdapter.PetViewHolder>(data, autoUpdate) {
class PetDetailRecyclerAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>() {
var itemType: String? = null
var context: Context? = null
@ -43,22 +45,62 @@ class PetDetailRecyclerAdapter(data: OrderedRealmCollection<Pet>?, autoUpdate: B
private val equipEvents = PublishSubject.create<String>()
private var ownsSaddles: Boolean = false
private var itemList: List<Any> = ArrayList()
fun setItemList(itemList: List<Any>) {
this.itemList = itemList
this.notifyDataSetChanged()
}
fun getEquipFlowable(): Flowable<String> {
return equipEvents.toFlowable(BackpressureStrategy.DROP)
}
var animalIngredientsRetriever: ((Animal) -> Pair<Egg?, HatchingPotion?>)? = null
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): PetViewHolder {
return PetViewHolder(parent.inflate(R.layout.pet_detail_item))
}
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder =
when (viewType) {
0 -> {
val view = parent.inflate(R.layout.shop_header)
StableRecyclerAdapter.StableHeaderViewHolder(view)
}
1 -> {
val view = parent.inflate(R.layout.customization_section_header)
SectionViewHolder(view)
}
else -> {
PetViewHolder(parent.inflate(R.layout.pet_detail_item))
}
}
override fun onBindViewHolder(holder: PetViewHolder, position: Int) {
data?.let {
holder.bind(it[position], ownedPets?.get(it[position]?.key ?: ""))
override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) {
val obj = this.itemList[position]
when {
obj.javaClass == String::class.java -> {
(holder as? SectionViewHolder)?.bind(obj as? String ?: "")
}
else -> {
(obj as? Pet)?.let { (holder as? PetViewHolder)?.bind(it, ownedPets?.get(it.key ?: "")) }
}
}
}
override fun getItemViewType(position: Int): Int {
val item = itemList[position]
return if (item.javaClass == String::class.java) {
1
}
else if (itemType == "pets") {
2
}
else {
3
}
}
override fun getItemCount(): Int = itemList.size
fun setExistingMounts(existingMounts: RealmResults<Mount>) {
this.existingMounts = existingMounts
notifyDataSetChanged()

30
Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.kt
View file

@ -51,18 +51,23 @@ class StableRecyclerAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<
}
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder =
if (viewType == 0) {
val view = parent.inflate(R.layout.shop_header)
StableHeaderViewHolder(view)
} else if (viewType == 1) {
val view = parent.inflate(R.layout.customization_section_header)
SectionViewHolder(view)
} else if (viewType == 2) {
val view = parent.inflate(R.layout.pet_overview_item)
StableViewHolder(view)
} else {
val view = parent.inflate(R.layout.mount_overview_item)
StableViewHolder(view)
when (viewType) {
0 -> {
val view = parent.inflate(R.layout.shop_header)
StableHeaderViewHolder(view)
}
1 -> {
val view = parent.inflate(R.layout.customization_section_header)
SectionViewHolder(view)
}
2 -> {
val view = parent.inflate(R.layout.pet_overview_item)
StableViewHolder(view)
}
else -> {
val view = parent.inflate(R.layout.mount_overview_item)
StableViewHolder(view)
}
}
override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) {
@ -78,7 +83,6 @@ class StableRecyclerAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<
holder.itemView.layoutParams = params
}
(holder as? SectionViewHolder)?.bind(obj as? String ?: "")
}
else -> {
(obj as? Animal)?.let { (holder as? StableViewHolder)?.bind(it) }

36
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.kt
View file

@ -8,7 +8,10 @@ import android.view.ViewGroup
import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.components.UserComponent
import com.habitrpg.android.habitica.data.InventoryRepository
import com.habitrpg.android.habitica.extensions.getTranslatedType
import com.habitrpg.android.habitica.helpers.RxErrorHandler
import com.habitrpg.android.habitica.models.inventory.Mount
import com.habitrpg.android.habitica.models.inventory.Pet
import com.habitrpg.android.habitica.models.user.OwnedMount
import com.habitrpg.android.habitica.ui.adapter.inventory.MountDetailRecyclerAdapter
import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
@ -51,18 +54,29 @@ class MountDetailRecyclerFragment : BaseMainFragment() {
arguments?.let {
val args = MountDetailRecyclerFragmentArgs.fromBundle(it)
animalGroup = args.group
if (args.group != "drop") {
animalGroup = args.group
}
animalType = args.type
animalColor = args.color
}
layoutManager = androidx.recyclerview.widget.GridLayoutManager(activity, 2)
layoutManager?.spanSizeLookup = object : androidx.recyclerview.widget.GridLayoutManager.SpanSizeLookup() {
override fun getSpanSize(position: Int): Int {
return if (adapter?.getItemViewType(position) == 0 || adapter?.getItemViewType(position) == 1) {
layoutManager?.spanCount ?: 1
} else {
1
}
}
}
recyclerView.layoutManager = layoutManager
recyclerView.addItemDecoration(MarginDecoration(activity))
adapter = recyclerView.adapter as? MountDetailRecyclerAdapter
if (adapter == null) {
adapter = MountDetailRecyclerAdapter(null, true)
adapter = MountDetailRecyclerAdapter()
adapter?.itemType = this.animalType
adapter?.context = context
recyclerView.adapter = adapter
@ -101,7 +115,7 @@ class MountDetailRecyclerFragment : BaseMainFragment() {
}
private fun loadItems() {
if (animalType != null && animalGroup != null) {
if (animalType != null || animalGroup != null) {
compositeSubscription.add(inventoryRepository.getOwnedMounts().firstElement()
.map { ownedMounts ->
val mountMap = mutableMapOf<String, OwnedMount>()
@ -109,7 +123,21 @@ class MountDetailRecyclerFragment : BaseMainFragment() {
return@map mountMap
}
.subscribe(Consumer { adapter?.setOwnedMounts(it) }, RxErrorHandler.handleEmptyError()))
compositeSubscription.add(inventoryRepository.getMounts(animalType!!, animalGroup!!, animalColor).firstElement().subscribe(Consumer { adapter?.updateData(it) }, RxErrorHandler.handleEmptyError()))
compositeSubscription.add(inventoryRepository.getMounts(animalType, animalGroup, animalColor)
.map {
val items = mutableListOf<Any>()
var lastMount: Mount? = null
for (mount in it) {
if (mount.type == "wacky" || mount.type == "special") continue
if (mount.type != lastMount?.type) {
items.add(mount.getTranslatedType(context))
}
items.add(mount)
lastMount = mount
}
items
}
.subscribe(Consumer { adapter?.setItemList(it) }, RxErrorHandler.handleEmptyError()))
}
}

43
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.kt
View file

@ -8,6 +8,7 @@ import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.components.UserComponent
import com.habitrpg.android.habitica.data.InventoryRepository
import com.habitrpg.android.habitica.events.commands.FeedCommand
import com.habitrpg.android.habitica.extensions.getTranslatedType
import com.habitrpg.android.habitica.helpers.RxErrorHandler
import com.habitrpg.android.habitica.models.inventory.Egg
import com.habitrpg.android.habitica.models.inventory.HatchingPotion
@ -35,9 +36,9 @@ class PetDetailRecyclerFragment : BaseMainFragment() {
private val recyclerView: androidx.recyclerview.widget.RecyclerView by bindView(R.id.recyclerView)
var adapter: PetDetailRecyclerAdapter = PetDetailRecyclerAdapter(null, true)
var animalType: String = ""
var animalGroup: String = ""
var adapter: PetDetailRecyclerAdapter = PetDetailRecyclerAdapter()
var animalType: String? = null
var animalGroup: String? = null
var animalColor: String? = null
internal var layoutManager: androidx.recyclerview.widget.GridLayoutManager? = null
@ -65,7 +66,9 @@ class PetDetailRecyclerFragment : BaseMainFragment() {
arguments?.let {
val args = MountDetailRecyclerFragmentArgs.fromBundle(it)
animalGroup = args.group
if (args.group != "drop") {
animalGroup = args.group
}
animalType = args.type
animalColor = args.color
}
@ -73,6 +76,15 @@ class PetDetailRecyclerFragment : BaseMainFragment() {
resetViews()
layoutManager = androidx.recyclerview.widget.GridLayoutManager(getActivity(), 2)
layoutManager?.spanSizeLookup = object : androidx.recyclerview.widget.GridLayoutManager.SpanSizeLookup() {
override fun getSpanSize(position: Int): Int {
return if (adapter.getItemViewType(position) == 0 || adapter.getItemViewType(position) == 1) {
layoutManager?.spanCount ?: 1
} else {
1
}
}
}
recyclerView.layoutManager = layoutManager
recyclerView.addItemDecoration(MarginDecoration(getActivity()))
@ -102,7 +114,8 @@ class PetDetailRecyclerFragment : BaseMainFragment() {
private fun setGridSpanCount(width: Int) {
var spanCount = 0
if (context != null && context?.resources != null) {
val itemWidth: Float = context?.resources?.getDimension(R.dimen.pet_width) ?: 120f
val animalWidth = R.dimen.pet_width
val itemWidth: Float = context?.resources?.getDimension(animalWidth) ?: 0.toFloat()
spanCount = (width / itemWidth).toInt()
}
@ -110,11 +123,10 @@ class PetDetailRecyclerFragment : BaseMainFragment() {
spanCount = 1
}
layoutManager?.spanCount = spanCount
layoutManager?.requestLayout()
}
private fun loadItems() {
if (animalType.isNotEmpty() && animalGroup.isNotEmpty()) {
if (animalType?.isNotEmpty() == true || animalGroup?.isNotEmpty() == true) {
compositeSubscription.add(inventoryRepository.getOwnedPets()
.map { ownedMounts ->
val mountMap = mutableMapOf<String, OwnedPet>()
@ -130,11 +142,26 @@ class PetDetailRecyclerFragment : BaseMainFragment() {
}
.subscribe(Consumer { adapter.setOwnedMounts(it) }, RxErrorHandler.handleEmptyError()))
compositeSubscription.add(inventoryRepository.getOwnedItems(true).subscribe(Consumer { adapter.setOwnedItems(it) }, RxErrorHandler.handleEmptyError()))
compositeSubscription.add(inventoryRepository.getPets(animalType, animalGroup, animalColor).firstElement().subscribe(Consumer<RealmResults<Pet>> { adapter.updateData(it) }, RxErrorHandler.handleEmptyError()))
compositeSubscription.add(inventoryRepository.getPets(animalType, animalGroup, animalColor)
.map {
val items = mutableListOf<Any>()
var lastPet: Pet? = null
for (pet in it) {
if (pet.type == "wacky" || pet.type == "special") continue
if (pet.type != lastPet?.type) {
items.add(pet.getTranslatedType(context))
}
items.add(pet)
lastPet = pet
}
items
}
.subscribe(Consumer { adapter.setItemList(it) }, RxErrorHandler.handleEmptyError()))
compositeSubscription.add(inventoryRepository.getMounts(animalType, animalGroup, animalColor).subscribe(Consumer<RealmResults<Mount>> { adapter.setExistingMounts(it) }, RxErrorHandler.handleEmptyError()))
}
}
@Subscribe
fun showFeedingDialog(event: FeedCommand) {
if (event.usingPet == null || event.usingFood == null) {

42
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.kt
View file

@ -12,6 +12,7 @@ import com.habitrpg.android.habitica.extensions.getTranslatedType
import com.habitrpg.android.habitica.extensions.inflate
import com.habitrpg.android.habitica.helpers.RxErrorHandler
import com.habitrpg.android.habitica.models.inventory.Animal
import com.habitrpg.android.habitica.models.inventory.StableSection
import com.habitrpg.android.habitica.models.user.*
import com.habitrpg.android.habitica.ui.activities.MainActivity
import com.habitrpg.android.habitica.ui.adapter.inventory.StableRecyclerAdapter
@ -147,41 +148,50 @@ class StableRecyclerFragment : BaseFragment() {
private fun mapAnimals(unsortedAnimals: RealmResults<out Animal>, ownedAnimals: Map<String, OwnedObject>): ArrayList<Any> {
val items = ArrayList<Any>()
var lastAnimal: Animal = unsortedAnimals[0] ?: return items
var lastSectionTitle = ""
var lastSection: StableSection? = null
for (animal in unsortedAnimals) {
val identifier = if (animal.animal.isNotEmpty() && (animal.type != "special" && animal.type != "wacky")) animal.animal else animal.key
val lastIdentifier = if (lastAnimal.animal.isNotEmpty()) lastAnimal.animal else lastAnimal.key
if (identifier != lastIdentifier || animal === unsortedAnimals[unsortedAnimals.size - 1]) {
if (!((lastAnimal.type == "premium" || lastAnimal.type == "special") && lastAnimal.numberOwned == 0)) {
if (animal.type == "premium") {
if (!items.contains(lastAnimal)) {
items.add(lastAnimal)
}
lastAnimal = items.first { (it as? Animal)?.animal == animal.animal } as Animal
} else if (identifier != lastIdentifier || animal === unsortedAnimals[unsortedAnimals.size - 1]) {
if (!((lastAnimal.type == "special") && lastAnimal.numberOwned == 0) && !items.contains(lastAnimal)) {
items.add(lastAnimal)
}
lastAnimal = animal
}
lastAnimal.totalNumber += 1
if (animal.type != lastSectionTitle) {
if (items.size > 0 && items[items.size - 1].javaClass == String::class.java) {
if (animal.type != lastSection?.key) {
if (items.size > 0 && items[items.size - 1].javaClass == StableSection::class.java) {
items.removeAt(items.size - 1)
}
items.add(animal.getTranslatedType(context))
lastSectionTitle = animal.type
val section = StableSection(animal.type, animal.getTranslatedType(context))
items.add(section)
lastSection = section
}
when (itemType) {
val isOwned = when (itemType) {
"pets" -> {
val ownedPet = ownedAnimals[animal?.key] as? OwnedPet
if (ownedPet?.trained ?: 0 > 0) {
lastAnimal.numberOwned += 1
}
ownedPet?.trained ?: 0 > 0
}
"mounts" -> {
val ownedMount = ownedAnimals[animal?.key] as? OwnedMount
if (ownedMount?.owned == true) {
lastAnimal.numberOwned = lastAnimal.numberOwned + 1
}
ownedMount?.owned == true
}
else -> false
}
if (animal.type != "premium" || isOwned) {
lastAnimal.totalNumber += 1
lastSection?.totalCount = lastSection?.totalCount ?: 0 + 1
}
if (isOwned) {
lastAnimal.numberOwned += 1
lastSection?.ownedCount = lastSection?.ownedCount ?: 0 + 1
}
}
if (!((lastAnimal.type == "premium" || lastAnimal.type == "special") && lastAnimal.numberOwned == 0)) {
items.add(lastAnimal)

7
Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/BottomNavigationItem.kt
View file

@ -22,16 +22,19 @@ class BottomNavigationItem @JvmOverloads constructor(
private val titleView: TextView by bindView(R.id.title_view)
private val badge: TextView by bindView(R.id.badge)
var selectedVisibility = View.VISIBLE
var deselectedVisibility = View.VISIBLE
var isActive = false
set(value) {
field = value
if (isActive) {
selectedTitleView.visibility = View.VISIBLE
selectedTitleView.visibility = selectedVisibility
titleView.visibility = View.GONE
iconView.drawable.setColorFilter(ContextCompat.getColor(context, R.color.white), PorterDuff.Mode.MULTIPLY )
} else {
selectedTitleView.visibility = View.GONE
titleView.visibility = View.VISIBLE
titleView.visibility = deselectedVisibility
iconView.drawable.setColorFilter(context.getThemeColor(R.attr.textColorPrimaryDark), PorterDuff.Mode.MULTIPLY )
}
}

2
fastlane/README.md
View file

@ -12,7 +12,7 @@ Install _fastlane_ using
```
[sudo] gem install fastlane -NV
```
or alternatively using `brew cask install fastlane`
or alternatively using `brew install fastlane`
# Available Actions
## Android