Listen to scroll changes for video sink visibility (#231)

@@ -84,10 +84,11 @@ class ViewVisibility(private val view: View) : VideoSinkVisibility() {
 
 
     private val handler = Handler(Looper.getMainLooper())
     private val handler = Handler(Looper.getMainLooper())
     private val globalLayoutListener = ViewTreeObserver.OnGlobalLayoutListener {
     private val globalLayoutListener = ViewTreeObserver.OnGlobalLayoutListener {
-        handler.removeCallbacksAndMessages(null)
-        handler.postDelayed({
-            recalculate()
-        }, 2000)
+        scheduleRecalculate()
+    }
+
+    private val scrollListener = ViewTreeObserver.OnScrollChangedListener {
+        scheduleRecalculate()
     }
     }
 
 
     interface Notifier {
     interface Notifier {
@@ -96,6 +97,7 @@ class ViewVisibility(private val view: View) : VideoSinkVisibility() {
 
 
     init {
     init {
         view.viewTreeObserver.addOnGlobalLayoutListener(globalLayoutListener)
         view.viewTreeObserver.addOnGlobalLayoutListener(globalLayoutListener)
+        view.viewTreeObserver.addOnScrollChangedListener(scrollListener)
         if (view is Notifier) {
         if (view is Notifier) {
             view.viewVisibility = this
             view.viewVisibility = this
         }
         }
@@ -105,6 +107,13 @@ class ViewVisibility(private val view: View) : VideoSinkVisibility() {
     private val viewRect = Rect()
     private val viewRect = Rect()
     private val windowRect = Rect()
     private val windowRect = Rect()
 
 
+    private fun scheduleRecalculate() {
+        handler.removeCallbacksAndMessages(null)
+        handler.postDelayed({
+            recalculate()
+        }, 2000)
+    }
+
     fun recalculate() {
     fun recalculate() {
         var shouldNotify = false
         var shouldNotify = false
         val newVisibility = isVisible()
         val newVisibility = isVisible()
@@ -154,6 +163,7 @@ class ViewVisibility(private val view: View) : VideoSinkVisibility() {
     override fun close() {
     override fun close() {
         super.close()
         super.close()
         handler.removeCallbacksAndMessages(null)
         handler.removeCallbacksAndMessages(null)
+        view.viewTreeObserver.removeOnScrollChangedListener(scrollListener)
         view.viewTreeObserver.removeOnGlobalLayoutListener(globalLayoutListener)
         view.viewTreeObserver.removeOnGlobalLayoutListener(globalLayoutListener)
         if (view is Notifier && view.viewVisibility == this) {
         if (view is Notifier && view.viewVisibility == this) {
             view.viewVisibility = null
             view.viewVisibility = null