From 004bf5031ab9957f110cff0545644832d6459c6a Mon Sep 17 00:00:00 2001 From: Laurent Date: Tue, 28 Feb 2023 10:18:16 +0100 Subject: [PATCH] Fix lifecycle crashes --- .../android/ui/modules/feed/FeedFragment.kt | 16 ++++++++++------ .../ui/modules/feed/NewDataMenuActivity.kt | 18 +++++++++++------- .../ui/modules/session/SessionFragment.kt | 2 +- 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/feed/FeedFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/feed/FeedFragment.kt index 8886cec4..614e024c 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/feed/FeedFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/feed/FeedFragment.kt @@ -603,13 +603,17 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate, PurchaseLis } private fun displayBlogPostButton(newCount: Int = 0) { - var show = false - if (Preferences.shouldShowBlogTips(requireContext()) && newCount > 0) { - show = true - this.badgeDrawable?.number = newCount + + context?.let { context -> + var show = false + if (Preferences.shouldShowBlogTips(context) && newCount > 0) { + show = true + this.badgeDrawable?.number = newCount + } + this.binding.postButton.isVisible = show + this.badgeDrawable?.isVisible = show } - this.binding.postButton.isVisible = show - this.badgeDrawable?.isVisible = show + } } \ No newline at end of file diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/feed/NewDataMenuActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/feed/NewDataMenuActivity.kt index fa2cf02e..c5707d4e 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/feed/NewDataMenuActivity.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/feed/NewDataMenuActivity.kt @@ -117,14 +117,18 @@ class NewDataMenuActivity : BaseActivity() { private fun showMenu() { val menuContainer = binding.menuContainer - val cx = menuContainer.measuredWidth - fabSize / 2 - val cy = menuContainer.measuredHeight - fabSize / 2 - val finalRadius = max(menuContainer.width, menuContainer.height) - val anim = ViewAnimationUtils.createCircularReveal(menuContainer, cx, cy, 0f, finalRadius.toFloat()) - anim.duration = 150 - menuContainer.visibility = View.VISIBLE - anim.start() + if (menuContainer.isAttachedToWindow) { + val cx = menuContainer.measuredWidth - fabSize / 2 + val cy = menuContainer.measuredHeight - fabSize / 2 + val finalRadius = max(menuContainer.width, menuContainer.height) + val anim = ViewAnimationUtils.createCircularReveal(menuContainer, cx, cy, 0f, finalRadius.toFloat()) + anim.duration = 150 + + menuContainer.visibility = View.VISIBLE + anim.start() + } + } /** diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/session/SessionFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/session/SessionFragment.kt index 368d6b92..feef21fc 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/session/SessionFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/session/SessionFragment.kt @@ -76,7 +76,7 @@ class SessionFragment : RealmFragment(), RowRepresentableDelegate, StaticRowRepr override fun onResume() { super.onResume() - CrashLogging.log("session (id=${this.currentSession.id}): valid=${currentSession.isValid}, managed=${currentSession.isManaged}, loaded=${currentSession.isLoaded} ") +// CrashLogging.log("session (id=${this.currentSession.id}): valid=${currentSession.isValid}, managed=${currentSession.isManaged}, loaded=${currentSession.isLoaded} ") this.refreshTimer() }