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

fix insufficient gem dialog

Browse source
This commit is contained in:
Phillip Thelen 2024-06-10 16:38:42 +02:00
parent 18c106fc7e
commit 07db8671b3
6 changed files with 15 additions and 6 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/customization/AvatarCustomizationFragment.kt
View file

@ -104,7 +104,7 @@ class AvatarCustomizationFragment :
}
}
adapter.onShowPurchaseDialog = { item ->
val dialog = PurchaseDialog(requireContext(), item)
val dialog = PurchaseDialog(requireContext(), item, mainActivity)
dialog.show()
}

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

@ -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)

3
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/RewardsRecyclerviewFragment.kt
View file

@ -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 { }

8
fastlane/README.md
View file

@ -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.

4
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -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

2
version.properties
View file

@ -1,2 +1,2 @@
NAME=4.4
CODE=7920
CODE=7951