Merge remote-tracking branch 'origin/dev'

Author: Majid Arabi

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

@@ -4,7 +4,7 @@ import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import com.github.file_picker.FileType
-import com.github.file_picker.adapter.ItemAdapter
+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
@@ -16,10 +16,11 @@ class MainActivity : AppCompatActivity() {
     private lateinit var adapter: FileAdapter
     private val selectedFiles = arrayListOf<Media>()
     private lateinit var binding: ActivityMainBinding
-    
+
     private var fileType: FileType = FileType.IMAGE
     private var accentColor: Int = R.color.purple_500
     private var spanCount: Int = 2
+    private var limit: Int = 2
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -38,16 +39,19 @@ class MainActivity : AppCompatActivity() {
             fileType = when (i) {
                 1 -> {
                     spanCount = 2
+                    limit = 7
                     accentColor = R.color.purple_500
                     FileType.IMAGE
                 }
                 2 -> {
                     spanCount = 2
+                    limit = 3
                     accentColor = R.color.pink_500
                     FileType.VIDEO
                 }
                 3 -> {
                     spanCount = 3
+                    limit = 1
                     accentColor = R.color.blue_500
                     FileType.AUDIO
                 }
@@ -58,7 +62,7 @@ class MainActivity : AppCompatActivity() {
 
     private fun showFiles(): Unit = showFilePicker(
         fileType = fileType,
-        limitItemSelection = 2,
+        limitItemSelection = limit,
         gridSpanCount = spanCount,
         selectedFiles = selectedFiles,
         accentColor = ContextCompat.getColor(this@MainActivity, accentColor),
@@ -70,7 +74,7 @@ class MainActivity : AppCompatActivity() {
             }
         },
         onItemClickListener = object : OnItemClickListener {
-            override fun onClick(media: Media, position: Int, adapter: ItemAdapter) {
+            override fun onClick(media: Media, position: Int, adapter: FilePickerAdapter) {
                 if (!media.file.isDirectory) {
                     adapter.setSelected(position)
                 }

file-picker/build.gradle

@@ -58,7 +58,7 @@ afterEvaluate {
                 from components.release
                 groupId = 'com.github.majidarabi'
                 artifactId = 'file-picker'
-                version = '0.0.8'
+                version = '0.0.9'
             }
         }
     }

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

@@ -48,7 +48,7 @@ class FilePicker private constructor(
     private val binding get() = _binding!!
     private var _binding: FilePickerBinding? = null
 
-    private var itemAdapter: ItemAdapter? = null
+    private var itemsAdapter: ItemAdapter? = null
 
     private var title: String
     private var titleTextColor by Delegates.notNull<Int>()
@@ -331,15 +331,14 @@ class FilePicker private constructor(
         changeSubmitButtonState()
         setupRecyclerView(rvFiles)
         setFixedSubmitButton()
-        showSelectedCount()
+        updateSelectedCount()
 
         cardLine.setCardBackgroundColor(ColorStateList.valueOf(accentColor))
         progress.indeterminateTintList = ColorStateList.valueOf(accentColor)
         tvTitle.apply {
             text = title
             setTextColor(titleTextColor)
         }
-
         btnSubmit.apply {
             text = submitText
             setOnClickListener {
@@ -353,45 +352,48 @@ class FilePicker private constructor(
      * Show selected count
      *
      */
-    private fun showSelectedCount() {
+    private fun updateSelectedCount() {
         val selectedCount = getSelectedItems()?.size ?: 0
         binding.tvTitle.text = "$title ($selectedCount/$limitCount)"
     }
 
     /**
      * Setup recycler view
      *
-     * @param rvFiles
+     * @param recyclerView
      */
-    private fun setupRecyclerView(rvFiles: RecyclerView) {
-        itemAdapter = ItemAdapter(
+    private fun setupRecyclerView(recyclerView: RecyclerView) {
+        itemsAdapter = ItemAdapter(
             accentColor = accentColor,
             limitSelectionCount = limitCount,
             listener = { itemPosition ->
-                if (onItemClickListener != null) {
-                    if (itemAdapter == null) return@ItemAdapter
-                    val media = itemAdapter?.currentList?.get(itemPosition)
-                    if (media != null) {
-                        onItemClickListener?.onClick(media, itemPosition, itemAdapter!!)
-                    }
-                } else {
-                    itemAdapter?.setSelected(itemPosition)
-                }
-
-                showSelectedCount()
+                setupOnItemClickListener(itemPosition)
+                updateSelectedCount()
                 changeSubmitButtonState()
             }
         )
-        rvFiles.apply {
+        recyclerView.apply {
             layoutDirection = when (listDirection) {
                 ListDirection.LTR -> RecyclerView.LAYOUT_DIRECTION_LTR
                 ListDirection.RTL -> RecyclerView.LAYOUT_DIRECTION_RTL
             }
             layoutManager = GridLayoutManager(requireContext(), gridSpanCount)
-            adapter = itemAdapter
+            adapter = itemsAdapter
         }
     }
 
+    /**
+     * Setup on item click listener
+     *
+     * @param position
+     */
+    private fun setupOnItemClickListener(position: Int) {
+        if (onItemClickListener == null) return
+        if (itemsAdapter == null) return
+        val media = itemsAdapter?.currentList?.get(position) ?: return
+        onItemClickListener?.onClick(media, position, itemsAdapter!!)
+    }
+
     /**
      * change submit button state
      * if has selected item change to enable otherwise disable it
@@ -415,16 +417,19 @@ class FilePicker private constructor(
         val files = getStorageFiles(fileType = fileType)
             .map { Media(file = it, type = fileType) }
 
-        selectedFiles.forEach { media ->
-            val selectedMedia = files.find { it.id == media.id }
-            if (selectedMedia != null) {
-                selectedMedia.isSelected = media.isSelected
+        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
+                }
             }
         }
 
         requireActivity().runOnUiThread {
-            itemAdapter?.submitList(files)
-            showSelectedCount()
+            itemsAdapter?.submitList(files)
+            updateSelectedCount()
             setFixedSubmitButton()
             changeSubmitButtonState()
             binding.progress.isVisible = false
@@ -445,7 +450,7 @@ class FilePicker private constructor(
      * @return
      */
     private fun getSelectedItems(): List<Media>? =
-        itemAdapter?.currentList?.filter { it.isSelected }
+        itemsAdapter?.currentList?.filter { it.isSelected }?.sortedBy { it.order }
 
     /**
      * Has selected item

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

@@ -0,0 +1,5 @@
+package com.github.file_picker.adapter
+
+interface FilePickerAdapter {
+    fun setSelected(position: Int)
+}

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

@@ -9,19 +9,20 @@ import com.github.file_picker.extension.isValidPosition
 import com.github.file_picker.model.Media
 import ir.one_developer.file_picker.databinding.ItemLayoutBinding
 
-class ItemAdapter(
+internal class ItemAdapter(
     private var accentColor: Int = FilePicker.DEFAULT_ACCENT_COLOR,
     private var limitSelectionCount: Int = FilePicker.DEFAULT_LIMIT_COUNT,
     private var listener: ((Int) -> Unit)? = null
-) : ListAdapter<Media, ItemVH>(COMPARATOR) {
+) : ListAdapter<Media, ItemVH>(COMPARATOR), FilePickerAdapter {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemVH(
         listener = listener,
         accentColor = accentColor,
+        limitSelectionCount = limitSelectionCount,
         binding = ItemLayoutBinding.inflate(
-            LayoutInflater.from(
-                parent.context
-            ), parent, false
+            LayoutInflater.from(parent.context),
+            parent,
+            false
         )
     )
 
@@ -34,31 +35,40 @@ class ItemAdapter(
      *
      * @param position the selected item position
      */
-    fun setSelected(position: Int) {
+    override fun setSelected(position: Int) {
         if (limitSelectionCount > 1) {
             val item = getItem(position)
+            val selectedItems = currentList.filter { it.isSelected && it.id != item.id }
+            val selectedItemCount = selectedItems.size
 
             if (item.isSelected) {
-                item.isSelected = !item.isSelected
+                item.isSelected = false
                 notifyItemChanged(position)
+                selectedItems.forEach { media ->
+                    if (media.order > item.order) {
+                        media.order--
+                        notifyItemChanged(currentList.indexOf(media))
+                    }
+                }
                 return
             }
 
-            if (currentList.filter { it.isSelected }.size < limitSelectionCount) {
-                item.isSelected = !item.isSelected
+            if (selectedItemCount < limitSelectionCount) {
+                item.isSelected = true
+                item.order = selectedItemCount + 1
                 notifyItemChanged(position)
             }
+            return
+        }
 
-        } else {
-            if (!currentList.isValidPosition(lastSelectedPosition)) {
-                lastSelectedPosition = position
-            }
-            getItem(lastSelectedPosition).isSelected = false
-            notifyItemChanged(lastSelectedPosition)
+        if (!currentList.isValidPosition(lastSelectedPosition)) {
             lastSelectedPosition = position
-            getItem(lastSelectedPosition).isSelected = true
-            notifyItemChanged(lastSelectedPosition)
         }
+        getItem(lastSelectedPosition).isSelected = false
+        notifyItemChanged(lastSelectedPosition)
+        lastSelectedPosition = position
+        getItem(lastSelectedPosition).isSelected = true
+        notifyItemChanged(lastSelectedPosition)
     }
 
     override fun setHasStableIds(hasStableIds: Boolean) {

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

@@ -18,10 +18,11 @@ import com.github.file_picker.model.Media
 import ir.one_developer.file_picker.R
 import ir.one_developer.file_picker.databinding.ItemLayoutBinding
 
-class ItemVH(
+internal class ItemVH(
     private val listener: ((Int) -> Unit)?,
     private val binding: ItemLayoutBinding,
-    private val accentColor: Int
+    private val accentColor: Int,
+    private val limitSelectionCount: Int
 ) : RecyclerView.ViewHolder(binding.root) {
 
     init {
@@ -35,11 +36,14 @@ class ItemVH(
 
     fun bind(item: Media) = binding.apply {
         cardErrorState.isVisible = false
-        tvFileSize.text = item.file.size()
-        ivChecked.isVisible = item.isSelected
         frameChecked.isVisible = item.isSelected
+        cardOrder.isVisible = item.isSelected && limitSelectionCount > 1
+        ivChecked.isVisible = item.isSelected && limitSelectionCount == 1
+
+        tvOrder.text = "${item.order}"
+        tvFileSize.text = item.file.size()
 
-        val previewImage = when (item.type) {
+        val previewImage: Any? = when (item.type) {
             FileType.AUDIO -> {
                 tvPath.text = item.file.name
                 ivMediaIcon.setImageResource(R.drawable.ic_audiotrack)
@@ -59,6 +63,8 @@ class ItemVH(
 
         Glide.with(ivImage)
             .load(previewImage)
+            .diskCacheStrategy(DiskCacheStrategy.NONE)
+            .transition(DrawableTransitionOptions.withCrossFade())
             .listener(object : RequestListener<Drawable> {
                 override fun onLoadFailed(
                     e: GlideException?,
@@ -81,8 +87,6 @@ class ItemVH(
                 }
 
             })
-            .diskCacheStrategy(DiskCacheStrategy.NONE)
-            .transition(DrawableTransitionOptions.withCrossFade())
             .into(ivImage)
     }
 

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

@@ -6,6 +6,6 @@ package com.github.file_picker.extension
  * @param position
  * @return
  */
-fun List<*>.isValidPosition(position: Int): Boolean {
+internal fun List<*>.isValidPosition(position: Int): Boolean {
     return if (isNotEmpty()) position in 0 until size else position >= 0
-}
+}

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

@@ -13,7 +13,7 @@ import java.io.File
  * @param permission permission name ex: Manifest.permission.READ_EXTERNAL_STORAGE
  * @return if has permission return true otherwise false
  */
-fun Context.hasPermission(
+internal fun Context.hasPermission(
     permission: String
 ): Boolean = ActivityCompat.checkSelfPermission(
     this,
@@ -25,7 +25,7 @@ fun Context.hasPermission(
  *
  * @return list of file path, ex: /storage/0/emulated/download/image.jpg
  */
-fun Context.getStorageFiles(
+internal fun Context.getStorageFiles(
     fileType: FileType = FileType.IMAGE
 ): List<File> {
 
@@ -53,7 +53,8 @@ fun Context.getStorageFiles(
         cursor.moveToPosition(i)
         val dataColumnIndex = cursor.getColumnIndex(MediaStore.Images.Media.DATA)
         //Store the path of the image
-        files.add(File(cursor.getString(dataColumnIndex)))
+        val file = File(cursor.getString(dataColumnIndex))
+        if (file.size > 0.0) files.add(file)
     }
 
     // The cursor should be freed up after use with close()