From 07db8671b31ef33f2219d4bc30fc19a5f6a00c84 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Mon, 10 Jun 2024 16:38:42 +0200 Subject: [PATCH] fix insufficient gem dialog --- .../customization/AvatarCustomizationFragment.kt | 2 +- .../inventory/customization/AvatarEquipmentFragment.kt | 2 +- .../ui/fragments/tasks/RewardsRecyclerviewFragment.kt | 3 ++- fastlane/README.md | 8 ++++++++ gradle/wrapper/gradle-wrapper.properties | 4 ++-- version.properties | 2 +- 6 files changed, 15 insertions(+), 6 deletions(-) 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 0c792a5fb0..71883c1f95 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 @@ -104,7 +104,7 @@ class AvatarCustomizationFragment : } } adapter.onShowPurchaseDialog = { item -> - val dialog = PurchaseDialog(requireContext(), item) + val dialog = PurchaseDialog(requireContext(), item, mainActivity) dialog.show() } 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 b19a98c38d..d1b2156c62 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 @@ -74,7 +74,7 @@ class AvatarEquipmentFragment : } } adapter.onShowPurchaseDialog = { item -> - val dialog = PurchaseDialog(requireContext(), item) + val dialog = PurchaseDialog(requireContext(), item, mainActivity) dialog.show() } return super.onCreateView(inflater, container, savedInstanceState) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/RewardsRecyclerviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/RewardsRecyclerviewFragment.kt index b3852282b0..2c5a5eb694 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/RewardsRecyclerviewFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/RewardsRecyclerviewFragment.kt @@ -8,6 +8,7 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.activity.result.contract.ActivityResultContracts +import androidx.appcompat.app.AppCompatActivity import androidx.core.content.ContextCompat import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.GridLayoutManager @@ -91,7 +92,7 @@ class RewardsRecyclerviewFragment : TaskRecyclerViewFragment() { cardSelectedResult.launch(intent) } (recyclerAdapter as? RewardsRecyclerViewAdapter)?.onShowPurchaseDialog = { item, isPinned -> - val dialog = PurchaseDialog(requireContext(), item) + val dialog = PurchaseDialog(requireContext(), item, activity as? AppCompatActivity) dialog.isPinned = isPinned dialog.onShopNeedsRefresh = { viewModel.refreshData { } diff --git a/fastlane/README.md b/fastlane/README.md index f57928b5df..2eff082feb 100644 --- a/fastlane/README.md +++ b/fastlane/README.md @@ -63,6 +63,14 @@ 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/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 618e690163..5735e52751 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Apr 22 16:17:19 CEST 2024 +#Mon Jun 10 15:25:21 CEST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/version.properties b/version.properties index 224d08dbb0..93f2924d8d 100644 --- a/version.properties +++ b/version.properties @@ -1,2 +1,2 @@ NAME=4.4 -CODE=7920 +CODE=7951 \ No newline at end of file