Mirrors/FossifyGallery
2
0
Fork 1
mirror of https://github.com/FossifyOrg/Gallery.git synced 2024-11-26 14:37:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

reimplement copy and move at folder and thumbnail views

Browse source
This commit is contained in:
tibbi 2017-04-01 18:29:39 +02:00
parent bc54d58dbe
commit ed59c51b99
3 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -32,7 +32,7 @@ android {
} }
dependencies { dependencies {
compile 'com.simplemobiletools:commons:2.14.9' compile 'com.simplemobiletools:commons:2.15.0'
compile 'com.davemorrissey.labs:subsampling-scale-image-view:3.6.0' compile 'com.davemorrissey.labs:subsampling-scale-image-view:3.6.0'
compile 'com.theartofdev.edmodo:android-image-cropper:2.3.1' compile 'com.theartofdev.edmodo:android-image-cropper:2.3.1'
compile 'com.bignerdranch.android:recyclerview-multiselect:0.2' compile 'com.bignerdranch.android:recyclerview-multiselect:0.2'

13
app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
View file

@ -224,7 +224,7 @@ class DirectoryAdapter(val activity: SimpleActivity, val dirs: MutableList<Direc
actMode?.finish() actMode?.finish()
} }
private fun displayCopyDialog() { private fun copyMoveTo(isCopyOperation: Boolean) {
val files = ArrayList<File>() val files = ArrayList<File>()
val positions = multiSelector.selectedPositions val positions = multiSelector.selectedPositions
if (positions.isEmpty()) if (positions.isEmpty())
@ -234,14 +234,21 @@ class DirectoryAdapter(val activity: SimpleActivity, val dirs: MutableList<Direc
val dir = File(dirs[it].path) val dir = File(dirs[it].path)
files.addAll(dir.listFiles().filter { it.isFile && it.isImageVideoGif() }) files.addAll(dir.listFiles().filter { it.isFile && it.isImageVideoGif() })
} }
activity.copyMoveFilesTo(files, isCopyOperation) {
if (!isCopyOperation) {
listener?.refreshItems()
}
actMode?.finish()
}
} }
private fun copyTo() { private fun copyTo() {
copyMoveTo(true)
} }
private fun moveTo() { private fun moveTo() {
copyMoveTo(false)
} }
fun selectAll() { fun selectAll() {

13
app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt
View file

@ -137,18 +137,25 @@ class MediaAdapter(val activity: SimpleActivity, var media: MutableList<Medium>,
} }
} }
private fun displayCopyDialog() { private fun copyMoveTo(isCopyOperation: Boolean) {
val files = ArrayList<File>() val files = ArrayList<File>()
val positions = multiSelector.selectedPositions val positions = multiSelector.selectedPositions
positions.forEach { files.add(File(media[it].path)) } positions.forEach { files.add(File(media[it].path)) }
activity.copyMoveFilesTo(files, isCopyOperation) {
if (!isCopyOperation) {
listener?.refreshItems()
}
actMode?.finish()
}
} }
private fun copyTo() { private fun copyTo() {
copyMoveTo(true)
} }
private fun moveTo() { private fun moveTo() {
copyMoveTo(false)
} }
fun selectAll() { fun selectAll() {