From e0a94522f4d87f5e55d61e8fa00e2714378d7b49 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Tue, 1 Jun 2021 10:21:19 +0200 Subject: [PATCH] fix crash --- Habitica/build.gradle | 4 ++-- .../inventory/items/ItemRecyclerFragment.kt | 16 ++++++++++++++-- fastlane/changelog.txt | 3 +-- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/Habitica/build.gradle b/Habitica/build.gradle index 0e641fbda..4f036ef2d 100644 --- a/Habitica/build.gradle +++ b/Habitica/build.gradle @@ -149,8 +149,8 @@ android { buildConfigField "String", "TESTING_LEVEL", "\"production\"" 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 2950 - versionName "3.2.3" + versionCode 2956 + versionName "3.2.4" } buildFeatures { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt index 6b2533b27..8a61d1f9b 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt @@ -63,6 +63,20 @@ class ItemRecyclerFragment : BaseFragment(), SwipeRefreshL component.inject(this) } + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + when { + this.isHatching -> { + dialog?.requestWindowFeature(Window.FEATURE_NO_TITLE) + } + this.isFeeding -> { + dialog?.requestWindowFeature(Window.FEATURE_NO_TITLE) + } + else -> { + } + } + return super.onCreateView(inflater, container, savedInstanceState) + } + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) @@ -140,7 +154,6 @@ class ItemRecyclerFragment : BaseFragment(), SwipeRefreshL when { this.isHatching -> { - dialog?.requestWindowFeature(Window.FEATURE_NO_TITLE) binding?.titleTextView?.text = getString(R.string.hatch_with, this.hatchingItem?.text) binding?.titleTextView?.visibility = View.VISIBLE binding?.footerTextView?.text = getString(R.string.hatching_market_info) @@ -148,7 +161,6 @@ class ItemRecyclerFragment : BaseFragment(), SwipeRefreshL binding?.openMarketButton?.visibility = View.VISIBLE } this.isFeeding -> { - dialog?.requestWindowFeature(Window.FEATURE_NO_TITLE) binding?.titleTextView?.text = getString(R.string.dialog_feeding, this.feedingPet?.text) binding?.titleTextView?.visibility = View.VISIBLE binding?.footerTextView?.text = getString(R.string.feeding_market_info) diff --git a/fastlane/changelog.txt b/fastlane/changelog.txt index fc43194e8..d1afef1e2 100644 --- a/fastlane/changelog.txt +++ b/fastlane/changelog.txt @@ -1,3 +1,2 @@ -We’ve added a countdown to all limited time items! No more guessing when our seasonal Galas may end. Now you can see exactly how much longer you have to get everything you want before time’s up. We hope you enjoy! - +This latest update improves the use of certain skills. Now we will display how much damage you do to a boss right when you use a skill like Brutal Smash. The list of tasks that displays when you use a skill will only show viable tasks as well now. We’ve also made some improvements to the mini notifications you receive when getting an item or level up, clarified the reason given for equipment being locked, and fixed a few pesky bugs in the process. Hope you enjoy!