Uploads: create extension

vector/src/main/java/im/vector/riotx/core/extensions/RecyclerView.kt

@@ -21,6 +21,7 @@ import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.airbnb.epoxy.EpoxyController
+import com.airbnb.epoxy.EpoxyVisibilityTracker
 import im.vector.riotx.R
 import im.vector.riotx.features.themes.ThemeUtils
 
@@ -61,3 +62,5 @@ fun RecyclerView.configureWith(epoxyController: EpoxyController,
 fun RecyclerView.cleanup() {
     adapter = null
 }
+
+fun RecyclerView.trackItemsVisibilityChange() = EpoxyVisibilityTracker().attach(this)

vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt

@@ -46,7 +46,6 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import butterknife.BindView
 import com.airbnb.epoxy.EpoxyModel
-import com.airbnb.epoxy.EpoxyVisibilityTracker
 import com.airbnb.epoxy.OnModelBuildFinishedListener
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.Fail
@@ -92,6 +91,7 @@ import im.vector.riotx.core.extensions.exhaustive
 import im.vector.riotx.core.extensions.hideKeyboard
 import im.vector.riotx.core.extensions.setTextOrHide
 import im.vector.riotx.core.extensions.showKeyboard
+import im.vector.riotx.core.extensions.trackItemsVisibilityChange
 import im.vector.riotx.core.files.addEntryToDownloadManager
 import im.vector.riotx.core.glide.GlideApp
 import im.vector.riotx.core.intent.getMimeTypeFromUri
@@ -148,7 +148,6 @@ import im.vector.riotx.features.html.PillImageSpan
 import im.vector.riotx.features.invite.VectorInviteView
 import im.vector.riotx.features.media.ImageContentRenderer
 import im.vector.riotx.features.media.VideoContentRenderer
-import im.vector.riotx.features.media.VideoMediaViewerActivity
 import im.vector.riotx.features.notifications.NotificationDrawerManager
 import im.vector.riotx.features.permalink.NavigationInterceptor
 import im.vector.riotx.features.permalink.PermalinkHandler
@@ -539,8 +538,7 @@ class RoomDetailFragment @Inject constructor(
         timelineEventController.callback = this
         timelineEventController.timeline = roomDetailViewModel.timeline
 
-        val epoxyVisibilityTracker = EpoxyVisibilityTracker()
+        recyclerView.trackItemsVisibilityChange()
-        epoxyVisibilityTracker.attach(recyclerView)
         layoutManager = LinearLayoutManager(context, RecyclerView.VERTICAL, true)
         val stateRestorer = LayoutManagerStateRestorer(layoutManager).register()
         scrollOnNewMessageCallback = ScrollOnNewMessageCallback(layoutManager, timelineEventController)

vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomsFragment.kt

@@ -19,7 +19,6 @@ package im.vector.riotx.features.roomdirectory
 import android.os.Bundle
 import android.view.MenuItem
 import android.view.View
-import com.airbnb.epoxy.EpoxyVisibilityTracker
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.snackbar.Snackbar
@@ -29,6 +28,7 @@ import im.vector.riotx.R
 import im.vector.riotx.core.extensions.cleanup
 import im.vector.riotx.core.extensions.configureWith
 import im.vector.riotx.core.extensions.exhaustive
+import im.vector.riotx.core.extensions.trackItemsVisibilityChange
 import im.vector.riotx.core.platform.VectorBaseFragment
 import io.reactivex.rxkotlin.subscribeBy
 import kotlinx.android.synthetic.main.fragment_public_rooms.*
@@ -107,8 +107,7 @@ class PublicRoomsFragment @Inject constructor(
     }
 
     private fun setupRecyclerView() {
-        val epoxyVisibilityTracker = EpoxyVisibilityTracker()
+        publicRoomsList.trackItemsVisibilityChange()
-        epoxyVisibilityTracker.attach(publicRoomsList)
         publicRoomsList.configureWith(publicRoomsController)
         publicRoomsController.callback = this
     }

vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/files/RoomUploadsFilesFragment.kt

@@ -18,13 +18,13 @@ package im.vector.riotx.features.roomprofile.uploads.files
 
 import android.os.Bundle
 import android.view.View
-import com.airbnb.epoxy.EpoxyVisibilityTracker
 import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
 import im.vector.matrix.android.api.session.events.model.Event
 import im.vector.riotx.R
 import im.vector.riotx.core.extensions.cleanup
 import im.vector.riotx.core.extensions.configureWith
+import im.vector.riotx.core.extensions.trackItemsVisibilityChange
 import im.vector.riotx.core.platform.VectorBaseFragment
 import im.vector.riotx.features.roomprofile.uploads.RoomUploadsAction
 import im.vector.riotx.features.roomprofile.uploads.RoomUploadsViewModel
@@ -42,8 +42,7 @@ class RoomUploadsFilesFragment @Inject constructor(
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        val epoxyVisibilityTracker = EpoxyVisibilityTracker()
+        recyclerView.trackItemsVisibilityChange()
-        epoxyVisibilityTracker.attach(recyclerView)
         recyclerView.configureWith(controller, showDivider = true)
         controller.listener = this
     }

vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/media/RoomUploadsMediaFragment.kt

@@ -20,11 +20,11 @@ import android.os.Bundle
 import android.util.DisplayMetrics
 import android.view.View
 import androidx.recyclerview.widget.GridLayoutManager
-import com.airbnb.epoxy.EpoxyVisibilityTracker
 import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
 import im.vector.riotx.R
 import im.vector.riotx.core.extensions.cleanup
+import im.vector.riotx.core.extensions.trackItemsVisibilityChange
 import im.vector.riotx.core.platform.VectorBaseFragment
 import im.vector.riotx.core.utils.DimensionConverter
 import im.vector.riotx.features.media.ImageContentRenderer
@@ -46,8 +46,7 @@ class RoomUploadsMediaFragment @Inject constructor(
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        val epoxyVisibilityTracker = EpoxyVisibilityTracker()
+        recyclerView.trackItemsVisibilityChange()
-        epoxyVisibilityTracker.attach(recyclerView)
         recyclerView.layoutManager = GridLayoutManager(context, getNumberOfColumns())
         recyclerView.adapter = controller.adapter
         recyclerView.setHasFixedSize(true)