Merge pull request #1070 from Infomaniak/replace-kx-vb-gallery

Replace kotlin extension with view bindings in GalleryFragment
Infomaniak · Oct 23, 2023 · 6a7d351 · 6a7d351
2 parents 77b63bb + 2ef9dab
commit 6a7d351
Showing 1 changed file with 23 additions and 15 deletions.
diff --git a/app/src/main/java/com/infomaniak/drive/ui/menu/GalleryFragment.kt b/app/src/main/java/com/infomaniak/drive/ui/menu/GalleryFragment.kt
@@ -36,6 +36,7 @@ import com.infomaniak.drive.R
 import com.infomaniak.drive.data.models.BulkOperationType
 import com.infomaniak.drive.data.models.File
 import com.infomaniak.drive.data.services.DownloadWorker
+import com.infomaniak.drive.databinding.FragmentGalleryBinding
 import com.infomaniak.drive.databinding.FragmentMenuGalleryBinding
 import com.infomaniak.drive.databinding.MultiSelectLayoutBinding
 import com.infomaniak.drive.ui.fileList.multiSelect.MultiSelectFragment
@@ -45,18 +46,18 @@ import com.infomaniak.drive.utils.getAdjustedColumnNumber
 import com.infomaniak.drive.views.NoItemsLayoutView
 import com.infomaniak.lib.core.utils.Utils.createRefreshTimer
 import com.infomaniak.lib.core.utils.setPagination
-import kotlinx.android.synthetic.main.fragment_gallery.galleryFastScroller
-import kotlinx.android.synthetic.main.fragment_gallery.galleryRecyclerView
-import kotlinx.android.synthetic.main.fragment_gallery.noGalleryLayout
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 
 class GalleryFragment : MultiSelectFragment(MATOMO_CATEGORY), NoItemsLayoutView.INoItemsLayoutView {
 
+    private var _binding: FragmentGalleryBinding? = null
+    private val binding get() = _binding!! // This property is only valid between onCreateView and onDestroyView
+
     override val noItemsIcon = R.drawable.ic_images
     override val noItemsTitle = R.string.picturesNoFile
-    override val noItemsInitialListView: View by lazy { galleryFastScroller }
+    override val noItemsInitialListView: View by lazy { binding.galleryFastScroller }
 
     private val galleryViewModel: GalleryViewModel by viewModels()
     private lateinit var galleryAdapter: GalleryAdapter
@@ -70,8 +71,8 @@ class GalleryFragment : MultiSelectFragment(MATOMO_CATEGORY), NoItemsLayoutView.
         createRefreshTimer { menuGalleryBinding?.swipeRefreshLayout?.isRefreshing = true }
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_gallery, container, false)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+        return FragmentGalleryBinding.inflate(inflater, container, false).also { _binding = it }.root
     }
 
     override fun initMultiSelectLayout(): MultiSelectLayoutBinding? = menuGalleryBinding?.multiSelectLayout
@@ -111,10 +112,12 @@ class GalleryFragment : MultiSelectFragment(MATOMO_CATEGORY), NoItemsLayoutView.
 
         if (isCurrentlyInGallery) multiSelectManager.isMultiSelectAuthorized = true
 
-        galleryRecyclerView.adapter = galleryAdapter
-        configGalleryLayoutManager()
+        with(binding) {
+            galleryRecyclerView.adapter = galleryAdapter
+            configGalleryLayoutManager()
 
-        noGalleryLayout.iNoItemsLayoutView = this
+            noGalleryLayout.iNoItemsLayoutView = this@GalleryFragment
+        }
 
         mainViewModel.observeDownloadOffline(requireContext()).observe(viewLifecycleOwner) { workInfoList ->
             if (workInfoList.isEmpty()) return@observe
@@ -141,12 +144,12 @@ class GalleryFragment : MultiSelectFragment(MATOMO_CATEGORY), NoItemsLayoutView.
             it?.let { (galleryFiles, isComplete) ->
                 stateRestorationPolicy = RecyclerView.Adapter.StateRestorationPolicy.PREVENT_WHEN_EMPTY
                 val galleryList = formatList(galleryFiles)
-                galleryRecyclerView.post { addAll(galleryList) }
+                binding.galleryRecyclerView.post { addAll(galleryList) }
                 this.isComplete = isComplete
-                noGalleryLayout.toggleVisibility(galleryList.isEmpty())
+                binding.noGalleryLayout.toggleVisibility(galleryList.isEmpty())
             } ?: run {
                 isComplete = true
-                noGalleryLayout.toggleVisibility(
+                binding.noGalleryLayout.toggleVisibility(
                     noNetwork = mainViewModel.isInternetAvailable.value == false,
                     isVisible = galleryList.isEmpty(),
                     showRefreshButton = true,
@@ -160,7 +163,7 @@ class GalleryFragment : MultiSelectFragment(MATOMO_CATEGORY), NoItemsLayoutView.
     }
 
     private fun setupPagination() {
-        galleryRecyclerView.apply {
+        binding.galleryRecyclerView.apply {
             paginationListener?.let(::removeOnScrollListener)
             paginationListener = setPagination(
                 whenLoadMoreIsPossible = {
@@ -181,6 +184,11 @@ class GalleryFragment : MultiSelectFragment(MATOMO_CATEGORY), NoItemsLayoutView.
         configGalleryLayoutManager()
     }
 
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
     private fun configGalleryLayoutManager() {
         val numGalleryColumns = requireActivity().getAdjustedColumnNumber(150, minColumns = 3, maxColumns = 15)
 
@@ -195,7 +203,7 @@ class GalleryFragment : MultiSelectFragment(MATOMO_CATEGORY), NoItemsLayoutView.
             }
         }
 
-        galleryRecyclerView?.layoutManager = gridLayoutManager
+        _binding?.galleryRecyclerView?.layoutManager = gridLayoutManager
     }
 
     private fun loadMoreGallery(driveId: Int, forceDownload: Boolean = false) {
@@ -296,7 +304,7 @@ class GalleryFragment : MultiSelectFragment(MATOMO_CATEGORY), NoItemsLayoutView.
     }
 
     fun setScrollbarTrackOffset(offset: Int) {
-        galleryFastScroller?.trackMarginEnd = offset
+        _binding?.galleryFastScroller?.trackMarginEnd = offset
     }
 
     companion object {