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

Improve hatch suggestion flow

Browse source
This commit is contained in:
Phillip Thelen 2023-05-15 12:00:49 +02:00
parent b0814cde07
commit 775310ccde
2 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt
View file

@ -226,7 +226,7 @@ open class ShopFragment : BaseMainFragment<FragmentRefreshRecyclerviewBinding>()
lifecycleScope.launch(ExceptionHandler.coroutine()) {
val user = userViewModel.user.value ?: return@launch
context?.let { context ->
if ((user.gemCount ?: 0) <= 2) {
if (user.gemCount <= 2) {
val dialog = mainActivity?.let { InsufficientGemsDialog(it, 3) }
dialog?.show()
return@launch

38
Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/PetSuggestHatchDialog.kt
View file

@ -16,6 +16,8 @@ import com.habitrpg.android.habitica.models.inventory.Egg
import com.habitrpg.android.habitica.models.inventory.HatchingPotion
import com.habitrpg.android.habitica.models.inventory.Item
import com.habitrpg.android.habitica.ui.activities.MainActivity
import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
import com.habitrpg.android.habitica.ui.views.insufficientCurrency.InsufficientGemsDialog
import com.habitrpg.common.habitica.extensions.DataBindingUtils
import com.habitrpg.common.habitica.extensions.loadImage
import com.habitrpg.common.habitica.helpers.launchCatching
@ -31,8 +33,11 @@ class PetSuggestHatchDialog(context: Context) : HabiticaAlertDialog(context) {
@InstallIn(SingletonComponent::class)
interface PetSuggestHatchDialogEntryPoint {
fun useCase(): HatchPetUseCase
fun mainUserViewModel(): MainUserViewModel
}
var hatchPetUseCase: HatchPetUseCase
private val userViewModel : MainUserViewModel
private val hatchPetUseCase: HatchPetUseCase
private lateinit var binding: DialogPetSuggestHatchBinding
@ -44,6 +49,7 @@ class PetSuggestHatchDialog(context: Context) : HabiticaAlertDialog(context) {
val hiltEntryPoint = EntryPointAccessors.fromApplication(context, PetSuggestHatchDialogEntryPoint::class.java)
hatchPetUseCase = hiltEntryPoint.useCase()
userViewModel = hiltEntryPoint.mainUserViewModel()
}
fun configure(
@ -142,22 +148,26 @@ class PetSuggestHatchDialog(context: Context) : HabiticaAlertDialog(context) {
binding.currencyView.setTextColor(ContextCompat.getColor(context, R.color.white))
addButton(binding.root, true) { _, _ ->
val activity = (getActivity() as? MainActivity) ?: return@addButton
if ((userViewModel.user.value?.gemCount ?: hatchPrice) < hatchPrice) {
InsufficientGemsDialog(activity, hatchPrice).show()
return@addButton
}
val thisPotion = potion ?: return@addButton
val thisEgg = egg ?: return@addButton
longLivingScope.launchCatching {
if (!hasEgg) {
activity.inventoryRepository.purchaseItem("eggs", thisEgg.key, 1)
}
if (!hasPotion) {
activity.inventoryRepository.purchaseItem(
"hatchingPotions",
thisPotion.key,
1
)
}
activity.userRepository.retrieveUser(true, forced = true)
hatchPet(thisPotion, thisEgg)
longLivingScope.launchCatching {
if (!hasEgg) {
activity.inventoryRepository.purchaseItem("eggs", thisEgg.key, 1)
}
if (!hasPotion) {
activity.inventoryRepository.purchaseItem(
"hatchingPotions",
thisPotion.key,
1
)
}
activity.userRepository.retrieveUser(true, forced = true)
hatchPet(thisPotion, thisEgg)
}
}
}