From 6f812bbbaaec347d82a3f1a8d1175c8b94380760 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Mon, 22 Oct 2018 11:30:46 +0200
Subject: [PATCH] adding a simple way of renaming multiple items at once

---
 app/build.gradle                              |  2 +-
 .../gallery/adapters/DirectoryAdapter.kt      | 46 +++++++++++--------
 .../gallery/adapters/MediaAdapter.kt          | 31 ++++++++-----
 3 files changed, 48 insertions(+), 31 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 3cc62e0bb..7fbdd5d2f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -48,7 +48,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:5.1.14'
+    implementation 'com.simplemobiletools:commons:5.1.15'
     implementation 'com.theartofdev.edmodo:android-image-cropper:2.7.0'
     implementation 'androidx.multidex:multidex:2.0.0'
     implementation 'it.sephiroth.android.exif:library:1.0.1'
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
index 784e2e65e..b40908788 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
@@ -10,6 +10,7 @@ import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter
 import com.simplemobiletools.commons.dialogs.ConfirmationDialog
 import com.simplemobiletools.commons.dialogs.PropertiesDialog
 import com.simplemobiletools.commons.dialogs.RenameItemDialog
+import com.simplemobiletools.commons.dialogs.RenameItemsDialog
 import com.simplemobiletools.commons.extensions.*
 import com.simplemobiletools.commons.helpers.OTG_PATH
 import com.simplemobiletools.commons.models.FileDirItem
@@ -68,7 +69,7 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList<Directo
 
         val isOneItemSelected = isOneItemSelected()
         menu.apply {
-            findItem(R.id.cab_rename).isVisible = isOneItemSelected && !selectedPaths.contains(FAVORITES) && !selectedPaths.contains(RECYCLE_BIN)
+            findItem(R.id.cab_rename).isVisible = !selectedPaths.contains(FAVORITES) && !selectedPaths.contains(RECYCLE_BIN)
             findItem(R.id.cab_change_cover_image).isVisible = isOneItemSelected
 
             findItem(R.id.cab_empty_recycle_bin).isVisible = isOneItemSelected && selectedPaths.first() == RECYCLE_BIN
@@ -141,26 +142,33 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList<Directo
     }
 
     private fun renameDir() {
-        val firstDir = getFirstSelectedItem() ?: return
-        val sourcePath = firstDir.path
-        val dir = File(sourcePath)
-        if (activity.isAStorageRootFolder(dir.absolutePath)) {
-            activity.toast(R.string.rename_folder_root)
-            return
-        }
+        if (selectedKeys.size == 1) {
+            val firstDir = getFirstSelectedItem() ?: return
+            val sourcePath = firstDir.path
+            val dir = File(sourcePath)
+            if (activity.isAStorageRootFolder(dir.absolutePath)) {
+                activity.toast(R.string.rename_folder_root)
+                return
+            }
 
-        RenameItemDialog(activity, dir.absolutePath) {
-            activity.runOnUiThread {
-                firstDir.apply {
-                    path = it
-                    name = it.getFilenameFromPath()
-                    tmb = File(it, tmb.getFilenameFromPath()).absolutePath
+            RenameItemDialog(activity, dir.absolutePath) {
+                activity.runOnUiThread {
+                    firstDir.apply {
+                        path = it
+                        name = it.getFilenameFromPath()
+                        tmb = File(it, tmb.getFilenameFromPath()).absolutePath
+                    }
+                    updateDirs(dirs)
+                    Thread {
+                        activity.galleryDB.DirectoryDao().updateDirectoryAfterRename(firstDir.tmb, firstDir.name, firstDir.path, sourcePath)
+                        listener?.refreshItems()
+                    }.start()
                 }
-                updateDirs(dirs)
-                Thread {
-                    activity.galleryDB.DirectoryDao().updateDirectoryAfterRename(firstDir.tmb, firstDir.name, firstDir.path, sourcePath)
-                    listener?.refreshItems()
-                }.start()
+            }
+        } else {
+            val paths = getSelectedPaths().filter { !activity.isAStorageRootFolder(it) } as ArrayList<String>
+            RenameItemsDialog(activity, paths) {
+                listener?.refreshItems()
             }
         }
     }
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt
index 364e02b9b..52d40caf8 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt
@@ -13,6 +13,7 @@ import com.simplemobiletools.commons.activities.BaseSimpleActivity
 import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter
 import com.simplemobiletools.commons.dialogs.PropertiesDialog
 import com.simplemobiletools.commons.dialogs.RenameItemDialog
+import com.simplemobiletools.commons.dialogs.RenameItemsDialog
 import com.simplemobiletools.commons.extensions.*
 import com.simplemobiletools.commons.helpers.OTG_PATH
 import com.simplemobiletools.commons.models.FileDirItem
@@ -111,7 +112,7 @@ class MediaAdapter(activity: BaseSimpleActivity, var media: MutableList<Thumbnai
         val isOneItemSelected = isOneItemSelected()
         val selectedPaths = selectedItems.map { it.path } as ArrayList<String>
         menu.apply {
-            findItem(R.id.cab_rename).isVisible = isOneItemSelected && selectedItems.firstOrNull()?.getIsInRecycleBin() == false
+            findItem(R.id.cab_rename).isVisible = selectedItems.firstOrNull()?.getIsInRecycleBin() == false
             findItem(R.id.cab_open_with).isVisible = isOneItemSelected
             findItem(R.id.cab_confirm_selection).isVisible = isAGetIntent && allowMultiplePicks && selectedKeys.isNotEmpty()
             findItem(R.id.cab_restore_recycle_bin_files).isVisible = selectedPaths.all { it.startsWith(activity.filesDir.absolutePath) }
@@ -195,17 +196,25 @@ class MediaAdapter(activity: BaseSimpleActivity, var media: MutableList<Thumbnai
     }
 
     private fun renameFile() {
-        val oldPath = getFirstSelectedItemPath() ?: return
-        RenameItemDialog(activity, oldPath) {
-            Thread {
-                activity.updateDBMediaPath(oldPath, it)
+        if (selectedKeys.size == 1) {
+            val oldPath = getFirstSelectedItemPath() ?: return
+            RenameItemDialog(activity, oldPath) {
+                Thread {
+                    activity.updateDBMediaPath(oldPath, it)
 
-                activity.runOnUiThread {
-                    enableInstantLoad()
-                    listener?.refreshItems()
-                    finishActMode()
-                }
-            }.start()
+                    activity.runOnUiThread {
+                        enableInstantLoad()
+                        listener?.refreshItems()
+                        finishActMode()
+                    }
+                }.start()
+            }
+        } else {
+            RenameItemsDialog(activity, getSelectedPaths()) {
+                enableInstantLoad()
+                listener?.refreshItems()
+                finishActMode()
+            }
         }
     }