From 40fbcb6e9e534a5443841e74ea877ea5682a0638 Mon Sep 17 00:00:00 2001 From: mcarare Date: Mon, 4 Jul 2022 17:57:40 +0300 Subject: [PATCH] For #25808: Update method signatures for View.OnAttachStateChangeListener --- .../org/mozilla/fenix/components/toolbar/MenuPresenter.kt | 4 ++-- .../org/mozilla/fenix/utils/view/LifecycleViewProvider.kt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/MenuPresenter.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/MenuPresenter.kt index 80b12d786..522d03df8 100644 --- a/app/src/main/java/org/mozilla/fenix/components/toolbar/MenuPresenter.kt +++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/MenuPresenter.kt @@ -49,11 +49,11 @@ class MenuPresenter( menuToolbar.invalidateActions() } - override fun onViewDetachedFromWindow(v: View?) { + override fun onViewDetachedFromWindow(v: View) { menuToolbar.onStop() } - override fun onViewAttachedToWindow(v: View?) { + override fun onViewAttachedToWindow(v: View) { // no-op } } diff --git a/app/src/main/java/org/mozilla/fenix/utils/view/LifecycleViewProvider.kt b/app/src/main/java/org/mozilla/fenix/utils/view/LifecycleViewProvider.kt index 75d94cd22..50e1aae6e 100644 --- a/app/src/main/java/org/mozilla/fenix/utils/view/LifecycleViewProvider.kt +++ b/app/src/main/java/org/mozilla/fenix/utils/view/LifecycleViewProvider.kt @@ -35,11 +35,11 @@ class LifecycleViewProvider(view: View) : LifecycleOwner { internal class ViewBinding( private val registry: LifecycleRegistry, ) : View.OnAttachStateChangeListener { - override fun onViewAttachedToWindow(v: View?) { + override fun onViewAttachedToWindow(v: View) { registry.currentState = State.RESUMED } - override fun onViewDetachedFromWindow(v: View?) { + override fun onViewDetachedFromWindow(v: View) { registry.currentState = State.DESTROYED } }