From fa14b43e3ee647f0c52c881ba870c7ed7b7bb5a9 Mon Sep 17 00:00:00 2001 From: tibbi Date: Wed, 9 Nov 2016 23:02:13 +0100 Subject: [PATCH] comment out Move function for now --- .../com/simplemobiletools/gallery/dialogs/CopyDialog.kt | 8 +++----- app/src/main/res/layout/copy_item.xml | 4 ++-- app/src/main/res/menu/cab_media.xml | 2 +- app/src/main/res/menu/directories_cab.xml | 2 +- app/src/main/res/menu/viewpager_menu.xml | 2 +- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/CopyDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/CopyDialog.kt index 897c11655..6fae4f98a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/CopyDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/CopyDialog.kt @@ -9,11 +9,9 @@ import com.simplemobiletools.filepicker.extensions.humanizePath import com.simplemobiletools.gallery.R import com.simplemobiletools.gallery.Utils import com.simplemobiletools.gallery.asynctasks.CopyTask -import com.simplemobiletools.gallery.extensions.scanFile import com.simplemobiletools.gallery.extensions.toast import kotlinx.android.synthetic.main.copy_item.view.* import java.io.File -import java.util.* class CopyDialog(val activity: Activity, val files: List, val copyListener: CopyTask.CopyDoneListener, val listener: OnCopyListener) { @@ -71,12 +69,12 @@ class CopyDialog(val activity: Activity, val files: List, val copyListener return@setOnClickListener } - if (view.dialog_radio_group.checkedRadioButtonId == R.id.dialog_radio_copy) { + //if (view.dialog_radio_group.checkedRadioButtonId == R.id.dialog_radio_copy) { context.toast(R.string.copying) val pair = Pair, File>(files, destinationDir) CopyTask(copyListener, context).execute(pair) dismiss() - } else { + /*} else { if (Utils.isPathOnSD(context, sourcePath) && Utils.isPathOnSD(context, destinationPath)) { val paths = ArrayList() for (f in files) { @@ -94,7 +92,7 @@ class CopyDialog(val activity: Activity, val files: List, val copyListener CopyTask(copyListener, context).execute(pair) dismiss() } - } + }*/ }) } } diff --git a/app/src/main/res/layout/copy_item.xml b/app/src/main/res/layout/copy_item.xml index 47db395bd..c0f7098ea 100644 --- a/app/src/main/res/layout/copy_item.xml +++ b/app/src/main/res/layout/copy_item.xml @@ -44,7 +44,7 @@ android:paddingTop="@dimen/small_padding" android:text="@string/select_destination"/> - - + --> diff --git a/app/src/main/res/menu/cab_media.xml b/app/src/main/res/menu/cab_media.xml index 79fa17c9b..40ba89645 100644 --- a/app/src/main/res/menu/cab_media.xml +++ b/app/src/main/res/menu/cab_media.xml @@ -18,6 +18,6 @@ app:showAsAction="ifRoom"/> diff --git a/app/src/main/res/menu/directories_cab.xml b/app/src/main/res/menu/directories_cab.xml index 349a6524c..16b579fa9 100644 --- a/app/src/main/res/menu/directories_cab.xml +++ b/app/src/main/res/menu/directories_cab.xml @@ -23,7 +23,7 @@ app:showAsAction="ifRoom"/>