From 8388a8c5b709e3a4abecc3165ba260e9481373ce Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Fri, 31 May 2024 09:54:06 +0200 Subject: [PATCH] Improve insufficient gem display --- Habitica/res/layout/dialog_habitica_primary_button.xml | 6 ++++-- .../layout/dialog_habitica_primary_destructive_button.xml | 2 +- .../inventory/equipment/EquipmentDetailFragment.kt | 5 ++++- .../ui/fragments/purchases/GemsPurchaseFragment.kt | 1 + .../habitica/ui/views/dialogs/HabiticaAlertDialog.kt | 7 +++++++ .../insufficientCurrency/InsufficientCurrencyDialog.kt | 1 + fastlane/README.md | 8 -------- version.properties | 2 +- 8 files changed, 19 insertions(+), 13 deletions(-) diff --git a/Habitica/res/layout/dialog_habitica_primary_button.xml b/Habitica/res/layout/dialog_habitica_primary_button.xml index e4668cc3fe..126ad09578 100644 --- a/Habitica/res/layout/dialog_habitica_primary_button.xml +++ b/Habitica/res/layout/dialog_habitica_primary_button.xml @@ -3,7 +3,9 @@ xmlns:tools="http://schemas.android.com/tools" android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="60dp" + android:layout_height="wrap_content" style="@style/HabiticaButton.Primary" - tools:text="Test"> + android:paddingTop="@dimen/spacing_medium" + android:paddingBottom="@dimen/spacing_medium" + tools:text="Tesqweqwe qweqwe qweq eqweq weqwe qweqweqw eqwe qwe qweqweq qwe qweq weq w qweq weqw eqwe qwe qwe qwet"> \ No newline at end of file diff --git a/Habitica/res/layout/dialog_habitica_primary_destructive_button.xml b/Habitica/res/layout/dialog_habitica_primary_destructive_button.xml index 6d3ee24595..c414bcfbaf 100644 --- a/Habitica/res/layout/dialog_habitica_primary_destructive_button.xml +++ b/Habitica/res/layout/dialog_habitica_primary_destructive_button.xml @@ -1,6 +1,6 @@ \ No newline at end of file diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.kt index 5c130fe048..195888fab3 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.kt @@ -22,6 +22,7 @@ import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.common.habitica.helpers.MainNavigationController import com.habitrpg.common.habitica.helpers.launchCatching import dagger.hilt.android.AndroidEntryPoint +import kotlinx.coroutines.flow.map import kotlinx.coroutines.launch import javax.inject.Inject @@ -116,7 +117,9 @@ class EquipmentDetailFragment : type?.let { type -> lifecycleScope.launchCatching { - inventoryRepository.getOwnedEquipment(type).collect { adapter.data = it } + inventoryRepository.getOwnedEquipment(type) + .map { it.sortedBy { equipment -> equipment.text } } + .collect { adapter.data = it } } } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GemsPurchaseFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GemsPurchaseFragment.kt index f0780b91b8..022c43443c 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GemsPurchaseFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GemsPurchaseFragment.kt @@ -118,6 +118,7 @@ class GemsPurchaseFragment : BaseFragment() { } binding?.promoComposeView?.isVisible = true } + loadInventory() Analytics.sendNavigationEvent("gem screen") } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/HabiticaAlertDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/HabiticaAlertDialog.kt index 01bd4378ed..c6bbc95aa0 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/HabiticaAlertDialog.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/HabiticaAlertDialog.kt @@ -18,6 +18,7 @@ import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AppCompatActivity import androidx.core.content.ContextCompat import androidx.core.view.children +import androidx.core.view.isVisible import androidx.lifecycle.lifecycleScope import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.databinding.DialogHabiticaBaseBinding @@ -82,6 +83,12 @@ open class HabiticaAlertDialog(context: Context) : AlertDialog(context, R.style. } } + var titleTextViewVisibility: Boolean + get() = binding.titleTextView.isVisible + set(value) { + binding.titleTextView.isVisible = value + } + init { setView(binding.root) binding.closeButton.setOnClickListener { dismiss() } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientCurrencyDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientCurrencyDialog.kt index c0f6a8446d..a2f1d75e7e 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientCurrencyDialog.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientCurrencyDialog.kt @@ -25,6 +25,7 @@ abstract class InsufficientCurrencyDialog(context: Context) : HabiticaAlertDialo val inflater = LayoutInflater.from(context) val view = inflater.inflate(getLayoutID(), null) setAdditionalContentView(view) + titleTextViewVisibility = false imageView = view.findViewById(R.id.imageView) textView = view.findViewById(R.id.textView) diff --git a/fastlane/README.md b/fastlane/README.md index 2eff082feb..f57928b5df 100644 --- a/fastlane/README.md +++ b/fastlane/README.md @@ -63,14 +63,6 @@ Submit a new Beta Build to Google Play Deploy a new version to the Google Play -### android upload_to_slack - -```sh -[bundle exec] fastlane android upload_to_slack -``` - -Upload the latest output APK to slack - ---- This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run. diff --git a/version.properties b/version.properties index 0900d94639..699e020394 100644 --- a/version.properties +++ b/version.properties @@ -1,2 +1,2 @@ NAME=4.3.7 -CODE=7801 \ No newline at end of file +CODE=7821 \ No newline at end of file