Clear all parent references when ExpandablePageLayout is detached

Saket Narayan · Saket Narayan · commit 0b80ec6d2da1 · 2018-10-22T20:34:03.000+05:30
diff --git a/inboxrecyclerview/src/main/java/me/saket/inboxrecyclerview/InboxRecyclerView.kt b/inboxrecyclerview/src/main/java/me/saket/inboxrecyclerview/InboxRecyclerView.kt
@@ -80,11 +80,11 @@ class InboxRecyclerView(
   }
 
   override fun onDetachedFromWindow() {
-    super.onDetachedFromWindow()
     if (pageSetupDone) {
       itemExpandAnimator.onDetachRecyclerView(this)
       tintPainter.onDetachRecyclerView(this)
     }
+    super.onDetachedFromWindow()
   }
 
   /**
diff --git a/inboxrecyclerview/src/main/java/me/saket/inboxrecyclerview/page/ExpandablePageLayout.kt b/inboxrecyclerview/src/main/java/me/saket/inboxrecyclerview/page/ExpandablePageLayout.kt
@@ -30,7 +30,7 @@ open class ExpandablePageLayout @JvmOverloads constructor(
   /** Alpha of this page when it's collapsed. */
   internal var collapsedAlpha = 0F
 
-  var pullToCollapseInterceptor: OnPullToCollapseInterceptor = { _, _, _ -> InterceptResult.IGNORED }
+  var pullToCollapseInterceptor: OnPullToCollapseInterceptor = IGNORE_ALL_PULL_TO_COLLAPSE_INTERCEPTOR
 
   /** Minimum Y-distance the page has to be pulled before it's eligible for collapse. */
   var pullToCollapseThresholdDistance: Int
@@ -102,6 +102,16 @@ open class ExpandablePageLayout @JvmOverloads constructor(
     }.start()
   }
 
+  override fun onDetachedFromWindow() {
+    pullToCollapseInterceptor = IGNORE_ALL_PULL_TO_COLLAPSE_INTERCEPTOR
+    parentToolbar = null
+    nestedPage = null
+    internalStateCallbacksForNestedPage = InternalPageCallbacks.NoOp()
+    internalStateCallbacksForRecyclerView = InternalPageCallbacks.NoOp()
+    stateChangeCallbacks.clear()
+    super.onDetachedFromWindow()
+  }
+
   private fun changeState(newPageState: PageState) {
     currentState = newPageState
   }
diff --git a/inboxrecyclerview/src/main/java/me/saket/inboxrecyclerview/page/OnPullToCollapseInterceptor.kt b/inboxrecyclerview/src/main/java/me/saket/inboxrecyclerview/page/OnPullToCollapseInterceptor.kt
@@ -20,3 +20,5 @@ package me.saket.inboxrecyclerview.page
  * @return True to consume this touch event. False otherwise.
  */
 typealias OnPullToCollapseInterceptor = (downX: Float, downY: Float, upwardPull: Boolean) -> InterceptResult
+
+val IGNORE_ALL_PULL_TO_COLLAPSE_INTERCEPTOR : OnPullToCollapseInterceptor = { _, _, _ -> InterceptResult.IGNORED }

Original file line number	Diff line number	Diff line change
`@@ -80,11 +80,11 @@ class InboxRecyclerView(`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`override fun onDetachedFromWindow() {`
`83`		`- super.onDetachedFromWindow()`
`84`	`83`	`if (pageSetupDone) {`
`85`	`84`	`itemExpandAnimator.onDetachRecyclerView(this)`
`86`	`85`	`tintPainter.onDetachRecyclerView(this)`
`87`	`86`	`}`
	`87`	`+ super.onDetachedFromWindow()`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`/**`