Skip to content

Commit 69aacd5

Browse files
committed
use the copy function of the Commons library
1 parent 40ce55a commit 69aacd5

File tree

3 files changed

+27
-6
lines changed

3 files changed

+27
-6
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ android {
3232
}
3333

3434
dependencies {
35-
compile 'com.simplemobiletools:commons:2.16.9'
35+
compile 'com.simplemobiletools:commons:2.17.2'
3636
compile 'com.bignerdranch.android:recyclerview-multiselect:0.2'
3737
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
3838
}

app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import com.bignerdranch.android.multiselector.SwappingHolder
1212
import com.bumptech.glide.Glide
1313
import com.simplemobiletools.commons.asynctasks.CopyMoveTask
1414
import com.simplemobiletools.commons.dialogs.ConfirmationDialog
15+
import com.simplemobiletools.commons.dialogs.FilePickerDialog
1516
import com.simplemobiletools.commons.dialogs.PropertiesDialog
1617
import com.simplemobiletools.commons.dialogs.RenameItemDialog
1718
import com.simplemobiletools.commons.extensions.formatSize
@@ -73,7 +74,8 @@ class ItemsAdapter(val activity: SimpleActivity, var mItems: MutableList<FileDir
7374
R.id.cab_rename -> displayRenameDialog()
7475
R.id.cab_properties -> showProperties()
7576
R.id.cab_share -> shareFiles()
76-
R.id.cab_copy_move -> displayCopyDialog()
77+
R.id.cab_copy_to -> copyMoveTo(true)
78+
R.id.cab_move_to -> copyMoveTo(false)
7779
R.id.cab_delete -> askConfirmDelete()
7880
else -> return false
7981
}
@@ -162,6 +164,22 @@ class ItemsAdapter(val activity: SimpleActivity, var mItems: MutableList<FileDir
162164
})
163165
}
164166

167+
private fun copyMoveTo(isCopyOperation: Boolean) {
168+
val files = ArrayList<File>()
169+
val positions = multiSelector.selectedPositions
170+
positions.forEach { files.add(File(mItems[it].path)) }
171+
172+
val source = if (files[0].isFile) files[0].parent else files[0].absolutePath
173+
FilePickerDialog(activity, source, false, config.showHidden, true) {
174+
activity.copyMoveFilesTo(files, source, it, isCopyOperation, false) {
175+
if (!isCopyOperation) {
176+
listener?.refreshItems()
177+
}
178+
actMode?.finish()
179+
}
180+
}
181+
}
182+
165183
private fun askConfirmDelete() {
166184
ConfirmationDialog(activity) {
167185
actMode?.finish()

app/src/main/res/menu/cab.xml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,13 @@
1717
android:title="@string/share"
1818
app:showAsAction="ifRoom"/>
1919
<item
20-
android:id="@+id/cab_copy_move"
21-
android:icon="@drawable/ic_copy"
22-
android:title="@string/copy_move"
23-
app:showAsAction="ifRoom"/>
20+
android:id="@+id/cab_copy_to"
21+
android:title="@string/copy_to"
22+
app:showAsAction="never"/>
23+
<item
24+
android:id="@+id/cab_move_to"
25+
android:title="@string/move_to"
26+
app:showAsAction="never"/>
2427
<item
2528
android:id="@+id/cab_delete"
2629
android:icon="@drawable/ic_delete"

0 commit comments

Comments
 (0)