Close #3

Paginate Files (faster load files)

Author: Majid Arabi

app/src/main/java/ir/one_developer/filepickerlibrary/FileAdapter.kt

@@ -6,7 +6,7 @@ import androidx.core.net.toUri
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
-import com.github.file_picker.model.Media
+import com.github.file_picker.data.model.Media
 import ir.one_developer.filepickerlibrary.databinding.FileLayoutBinding
 import java.io.File
 

app/src/main/java/ir/one_developer/filepickerlibrary/MainActivity.kt

@@ -8,7 +8,7 @@ import com.github.file_picker.adapter.FilePickerAdapter
 import com.github.file_picker.extension.showFilePicker
 import com.github.file_picker.listener.OnItemClickListener
 import com.github.file_picker.listener.OnSubmitClickListener
-import com.github.file_picker.model.Media
+import com.github.file_picker.data.model.Media
 import ir.one_developer.filepickerlibrary.databinding.ActivityMainBinding
 
 class MainActivity : AppCompatActivity() {

file-picker/build.gradle

@@ -35,20 +35,32 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'androidx.core:core-ktx:1.8.0'
     implementation 'androidx.appcompat:appcompat:1.4.1'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
-    implementation 'com.google.android.material:material:1.5.0'
+    implementation 'com.google.android.material:material:1.6.1'
 
-    // Coroutines
-    def coroutine_version = "1.6.0"
+    def activity_version = "1.5.1"
+    implementation "androidx.activity:activity-ktx:$activity_version"
+
+    def fragment_version = "1.5.2"
+    implementation "androidx.fragment:fragment-ktx:$fragment_version"
+
+    def coroutine_version = "1.6.1"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutine_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutine_version"
 
-    // Glide
     def glide_version = "4.13.0"
     implementation "com.github.bumptech.glide:glide:$glide_version"
     annotationProcessor "com.github.bumptech.glide:compiler:$glide_version"
+
+    def paging_version = "3.1.1"
+    implementation "androidx.paging:paging-runtime:$paging_version"
+
+    def lifecycle_version = "2.5.1"
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
+    implementation "androidx.lifecycle:lifecycle-runtime:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
 }
 
 afterEvaluate {
@@ -58,7 +70,7 @@ afterEvaluate {
                 from components.release
                 groupId = 'com.github.majidarabi'
                 artifactId = 'file-picker'
-                version = '0.0.9'
+                version = '0.2.0'
             }
         }
     }

file-picker/src/main/java/com/github/file_picker/Const.kt

@@ -14,4 +14,6 @@ enum class FileType : Parcelable {
     VIDEO,
     IMAGE,
     AUDIO,
-}
+}
+
+const val PAGE_SIZE = 10

file-picker/src/main/java/com/github/file_picker/FilePicker.kt

@@ -14,14 +14,15 @@ import androidx.annotation.FloatRange
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentManager
+import androidx.paging.LoadState
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.github.file_picker.adapter.ItemAdapter
-import com.github.file_picker.extension.getStorageFiles
+import com.github.file_picker.data.model.Media
+import com.github.file_picker.data.repository.FilesRepository
 import com.github.file_picker.extension.hasPermission
 import com.github.file_picker.listener.OnItemClickListener
 import com.github.file_picker.listener.OnSubmitClickListener
-import com.github.file_picker.model.Media
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
@@ -50,6 +51,7 @@ class FilePicker private constructor(
     private var _binding: FilePickerBinding? = null
 
     private var itemsAdapter: ItemAdapter? = null
+    private lateinit var repository: FilesRepository
 
     private var title: String
     private var titleTextColor by Delegates.notNull<Int>()
@@ -269,6 +271,7 @@ class FilePicker private constructor(
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        repository = FilesRepository(requireActivity().application)
         setCancellableDialog(cancellable)
         setupViews()
     }
@@ -403,7 +406,7 @@ class FilePicker private constructor(
     private fun setupOnItemClickListener(position: Int) {
         if (onItemClickListener == null) return
         if (itemsAdapter == null) return
-        val media = itemsAdapter?.currentList?.get(position) ?: return
+        val media = itemsAdapter?.snapshot()?.items?.get(position) ?: return
         onItemClickListener?.onClick(media, position, itemsAdapter!!)
     }
 
@@ -424,34 +427,29 @@ class FilePicker private constructor(
 
     /**
      * Load files
-     *
      */
     private fun loadFiles() = CoroutineScope(Dispatchers.IO).launch {
-        val files = getStorageFiles(fileType = fileType)
-            .map { Media(file = it, type = fileType) }
-
-        if (selectedFiles.isNotEmpty()) {
-            selectedFiles.forEach { media ->
-                val selectedMedia = files.find { it.id == media.id }
-                if (selectedMedia != null) {
-                    selectedMedia.isSelected = media.isSelected
-                    selectedMedia.order = media.order
+        itemsAdapter?.addLoadStateListener { state ->
+            binding.progress.isVisible = state.source.refresh is LoadState.Loading
+            if (state.source.refresh is LoadState.NotLoading) {
+                selectedFiles.forEach { media ->
+                    itemsAdapter?.snapshot()?.items?.find { it.id == media.id }?.let {
+                        it.isSelected = media.isSelected
+                        it.order = media.order
+                    }
                 }
+                updateSelectedCount()
+                setFixedSubmitButton()
+                changeSubmitButtonState()
             }
         }
-
-        requireActivity().runOnUiThread {
-            itemsAdapter?.submitList(files)
-            updateSelectedCount()
-            setFixedSubmitButton()
-            changeSubmitButtonState()
-            binding.progress.isVisible = false
+        repository.getFiles(fileType = fileType).collect { pagingData ->
+            itemsAdapter?.submitData(pagingData)
         }
     }
 
     /**
      * Submit list
-     *
      */
     private fun submitList() = getSelectedItems()?.let {
         onSubmitClickListener?.onClick(it)
@@ -463,7 +461,7 @@ class FilePicker private constructor(
      * @return
      */
     private fun getSelectedItems(): List<Media>? =
-        itemsAdapter?.currentList?.filter { it.isSelected }?.sortedBy { it.order }
+        itemsAdapter?.snapshot()?.items?.filter { it.isSelected }?.sortedBy { it.order }
 
     /**
      * Has selected item

file-picker/src/main/java/com/github/file_picker/adapter/ItemAdapter.kt

@@ -2,19 +2,21 @@ package com.github.file_picker.adapter
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import androidx.paging.PagingDataAdapter
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import com.github.file_picker.FilePicker
 import com.github.file_picker.extension.isValidPosition
-import com.github.file_picker.model.Media
+import com.github.file_picker.data.model.Media
 import ir.one_developer.file_picker.databinding.ItemLayoutBinding
+import java.util.Locale.filter
 
 internal class ItemAdapter(
     private var accentColor: Int = FilePicker.DEFAULT_ACCENT_COLOR,
     private var overlayAlpha: Float = FilePicker.DEFAULT_OVERLAY_ALPHA,
     private var limitSelectionCount: Int = FilePicker.DEFAULT_LIMIT_COUNT,
     private var listener: ((Int) -> Unit)? = null
-) : ListAdapter<Media, ItemVH>(COMPARATOR), FilePickerAdapter {
+) : PagingDataAdapter<Media, ItemVH>(COMPARATOR), FilePickerAdapter {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemVH(
         listener = listener,
@@ -29,7 +31,7 @@ internal class ItemAdapter(
     )
 
     override fun onBindViewHolder(holder: ItemVH, position: Int) {
-        holder.bind(getItem(position))
+        getItem(position)?.let { holder.bind(it) }
     }
 
     /**
@@ -39,8 +41,8 @@ internal class ItemAdapter(
      */
     override fun setSelected(position: Int) {
         if (limitSelectionCount > 1) {
-            val item = getItem(position)
-            val selectedItems = currentList.filter { it.isSelected && it.id != item.id }
+            val item = getItem(position) ?: return
+            val selectedItems = snapshot().items.filter { it.isSelected && it.id != item.id }
             val selectedItemCount = selectedItems.size
 
             if (item.isSelected) {
@@ -49,7 +51,7 @@ internal class ItemAdapter(
                 selectedItems.forEach { media ->
                     if (media.order > item.order) {
                         media.order--
-                        notifyItemChanged(currentList.indexOf(media))
+                        notifyItemChanged(snapshot().items.indexOf(media))
                     }
                 }
                 return
@@ -63,22 +65,16 @@ internal class ItemAdapter(
             return
         }
 
-        if (!currentList.isValidPosition(lastSelectedPosition)) {
+        if (!snapshot().items.isValidPosition(lastSelectedPosition)) {
             lastSelectedPosition = position
         }
-        getItem(lastSelectedPosition).isSelected = false
+        getItem(lastSelectedPosition)?.isSelected = false
         notifyItemChanged(lastSelectedPosition)
         lastSelectedPosition = position
-        getItem(lastSelectedPosition).isSelected = true
+        getItem(lastSelectedPosition)?.isSelected = true
         notifyItemChanged(lastSelectedPosition)
     }
 
-    override fun setHasStableIds(hasStableIds: Boolean) {
-        super.setHasStableIds(true)
-    }
-
-    override fun getItemId(position: Int): Long = getItem(position).id.toLong()
-
     companion object {
         private var lastSelectedPosition = -1
 

file-picker/src/main/java/com/github/file_picker/adapter/ItemVH.kt

@@ -11,10 +11,10 @@ import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
 import com.bumptech.glide.request.RequestListener
 import com.bumptech.glide.request.target.Target
 import com.github.file_picker.FileType
+import com.github.file_picker.data.model.Media
 import com.github.file_picker.extension.getMusicCoverArt
 import com.github.file_picker.extension.lastPathTitle
 import com.github.file_picker.extension.size
-import com.github.file_picker.model.Media
 import ir.one_developer.file_picker.R
 import ir.one_developer.file_picker.databinding.ItemLayoutBinding
 
@@ -65,7 +65,7 @@ internal class ItemVH(
 
         Glide.with(ivImage)
             .load(previewImage)
-            .diskCacheStrategy(DiskCacheStrategy.NONE)
+            .diskCacheStrategy(DiskCacheStrategy.RESOURCE)
             .transition(DrawableTransitionOptions.withCrossFade())
             .listener(object : RequestListener<Drawable> {
                 override fun onLoadFailed(
@@ -84,20 +84,18 @@ internal class ItemVH(
                     target: Target<Drawable>?,
                     dataSource: DataSource?,
                     isFirstResource: Boolean
-                ): Boolean {
-                    return false
-                }
-
+                ): Boolean = false
             })
             .into(ivImage)
     }
 
     private fun setErrorState(type: FileType) = binding.apply {
         cardErrorState.isVisible = true
         when (type) {
-            FileType.AUDIO -> ivErrorIcon.setImageResource(R.drawable.ic_audiotrack)
-            FileType.IMAGE -> ivErrorIcon.setImageResource(R.drawable.ic_image)
-            FileType.VIDEO -> ivErrorIcon.setImageResource(R.drawable.ic_play)
+            FileType.VIDEO -> Glide.with(ivErrorIcon).load(R.drawable.ic_play).into(ivErrorIcon)
+            FileType.IMAGE -> Glide.with(ivErrorIcon).load(R.drawable.ic_image).into(ivErrorIcon)
+            FileType.AUDIO -> Glide.with(ivErrorIcon).load(R.drawable.ic_audiotrack)
+                .into(ivErrorIcon)
         }
     }
 

…va/com/github/file_picker/model/Media.kt …m/github/file_picker/data/model/Media.ktfile-picker/src/main/java/com/github/file_picker/model/Media.kt renamed to file-picker/src/main/java/com/github/file_picker/data/model/Media.kt file-picker/src/main/java/com/github/file_picker/model/Media.kt renamed to file-picker/src/main/java/com/github/file_picker/data/model/Media.kt

@@ -1,4 +1,4 @@
-package com.github.file_picker.model
+package com.github.file_picker.data.model
 
 import android.os.Parcelable
 import com.github.file_picker.FileType

file-picker/src/main/java/com/github/file_picker/data/repository/FilesPagingSource.kt

@@ -0,0 +1,59 @@
+package com.github.file_picker.data.repository
+
+import android.app.Application
+import androidx.paging.PagingSource
+import androidx.paging.PagingState
+import com.github.file_picker.FileType
+import com.github.file_picker.data.model.Media
+import com.github.file_picker.extension.getStorageFiles
+
+internal class FilesPagingSource(
+    private val application: Application,
+    private val fileType: FileType,
+) : PagingSource<Int, Media>() {
+
+    // the initial load size for the first page may be different from the requested size
+    var initialLoadSize: Int = 0
+
+    override fun getRefreshKey(state: PagingState<Int, Media>): Int? =
+        state.anchorPosition?.let { anchorPosition ->
+            val anchorPage = state.closestPageToPosition(anchorPosition)
+            anchorPage?.prevKey?.plus(1) ?: anchorPage?.nextKey?.minus(1)
+        }
+
+    override suspend fun load(params: LoadParams<Int>): LoadResult<Int, Media> {
+        return try {
+            // Start refresh at page 1 if undefined.
+            val nextPageNumber = params.key ?: 1
+
+            if (params.key == null) initialLoadSize = params.loadSize
+
+            // work out the offset into the database to retrieve records from the page number,
+            // allow for a different load size for the first page
+            val offsetCalc = {
+                if (nextPageNumber == 2)
+                    initialLoadSize
+                else
+                    ((nextPageNumber - 1) * params.loadSize) + (initialLoadSize - params.loadSize)
+            }
+
+            val offset = offsetCalc.invoke()
+
+            val files = application.getStorageFiles(
+                fileType = fileType,
+                limit = params.loadSize,
+                offset = offset
+            )
+            val count = files.size
+
+            LoadResult.Page(
+                data = files,
+                prevKey = null,
+                nextKey = if (count < params.loadSize) null else nextPageNumber + 1
+            )
+        } catch (e: Exception) {
+            LoadResult.Error(e)
+        }
+    }
+
+}

file-picker/src/main/java/com/github/file_picker/data/repository/FilesRepository.kt

@@ -0,0 +1,28 @@
+package com.github.file_picker.data.repository
+
+import android.app.Application
+import androidx.paging.Pager
+import androidx.paging.PagingConfig
+import com.github.file_picker.FileType
+import com.github.file_picker.PAGE_SIZE
+
+class FilesRepository(
+    private val application: Application
+) {
+
+    fun getFiles(
+        fileType: FileType = FileType.IMAGE,
+    ) = Pager(
+        PagingConfig(
+            pageSize = PAGE_SIZE,
+            enablePlaceholders = true,
+            initialLoadSize = PAGE_SIZE,
+        )
+    ) {
+        FilesPagingSource(
+            application = application,
+            fileType = fileType
+        )
+    }.flow
+
+}