Feat: Add extract menu item for selection overlay

Fixes: #769
zhanghai · Apr 16, 2024 · 2852651 · 2852651
1 parent d03d233
commit 2852651
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/app/src/main/java/me/zhanghai/android/files/filelist/FileListFragment.kt b/app/src/main/java/me/zhanghai/android/files/filelist/FileListFragment.kt
@@ -889,9 +889,15 @@ class FileListFragment : Fragment(), BreadcrumbLayout.Listener, FileListAdapter.
                     }
                 )
                 .setTitle(
-                    if (areAllFilesArchivePaths) R.string.file_list_select_action_extract else R.string.copy
+                    if (areAllFilesArchivePaths) {
+                        R.string.file_list_select_action_extract
+                    } else {
+                        R.string.copy
+                    }
                 )
             menu.findItem(R.id.action_delete).isVisible = !isAnyFileReadOnly
+            val areAllFilesArchiveFiles = files.all { it.isArchiveFile }
+            menu.findItem(R.id.action_extract).isVisible = areAllFilesArchiveFiles
             val isCurrentPathReadOnly = viewModel.currentPath.fileSystem.isReadOnly
             menu.findItem(R.id.action_archive).isVisible = !isCurrentPathReadOnly
         }
@@ -935,6 +941,10 @@ class FileListFragment : Fragment(), BreadcrumbLayout.Listener, FileListAdapter.
                 confirmDeleteFiles(viewModel.selectedFiles)
                 true
             }
+            R.id.action_extract -> {
+                extractFiles(viewModel.selectedFiles)
+                true
+            }
             R.id.action_archive -> {
                 showCreateArchiveDialog(viewModel.selectedFiles)
                 true
@@ -988,6 +998,11 @@ class FileListFragment : Fragment(), BreadcrumbLayout.Listener, FileListAdapter.
         viewModel.selectFiles(files, false)
     }
 
+    private fun extractFiles(files: FileItemSet) {
+        copyFiles(files.mapTo(fileItemSetOf()) { it.createDummyArchiveRoot() })
+        viewModel.selectFiles(files, false)
+    }
+
     private fun showCreateArchiveDialog(files: FileItemSet) {
         CreateArchiveDialogFragment.show(files, this)
     }

diff --git a/app/src/main/res/menu/file_list_select.xml b/app/src/main/res/menu/file_list_select.xml
@@ -34,6 +34,12 @@
         android:title="@string/delete"
         app:showAsAction="always" />
 
+    <item
+        android:id="@+id/action_extract"
+        android:orderInCategory="100"
+        android:title="@string/file_list_select_action_extract"
+        app:showAsAction="never" />
+
     <item
         android:id="@+id/action_archive"
         android:orderInCategory="100"