fenix
/
Simple-Gallery
mirror of https://github.com/SimpleMobileTools/Simple-Gallery.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

comment out Move function for now

This commit is contained in:
tibbi 2016-11-09 23:02:13 +01:00
parent beba22b764
commit fa14b43e3e
5 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/CopyDialog.kt
View File

@ -9,11 +9,9 @@ import com.simplemobiletools.filepicker.extensions.humanizePath
import com.simplemobiletools.gallery.R import com.simplemobiletools.gallery.R
import com.simplemobiletools.gallery.Utils import com.simplemobiletools.gallery.Utils
import com.simplemobiletools.gallery.asynctasks.CopyTask import com.simplemobiletools.gallery.asynctasks.CopyTask
import com.simplemobiletools.gallery.extensions.scanFile
import com.simplemobiletools.gallery.extensions.toast import com.simplemobiletools.gallery.extensions.toast
import kotlinx.android.synthetic.main.copy_item.view.* import kotlinx.android.synthetic.main.copy_item.view.*
import java.io.File import java.io.File
import java.util.*
class CopyDialog(val activity: Activity, val files: List<File>, val copyListener: CopyTask.CopyDoneListener, val listener: OnCopyListener) { class CopyDialog(val activity: Activity, val files: List<File>, val copyListener: CopyTask.CopyDoneListener, val listener: OnCopyListener) {
@ -71,12 +69,12 @@ class CopyDialog(val activity: Activity, val files: List<File>, val copyListener
return@setOnClickListener 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) context.toast(R.string.copying)
val pair = Pair<List<File>, File>(files, destinationDir) val pair = Pair<List<File>, File>(files, destinationDir)
CopyTask(copyListener, context).execute(pair) CopyTask(copyListener, context).execute(pair)
dismiss() dismiss()
} else { /*} else {
if (Utils.isPathOnSD(context, sourcePath) && Utils.isPathOnSD(context, destinationPath)) { if (Utils.isPathOnSD(context, sourcePath) && Utils.isPathOnSD(context, destinationPath)) {
val paths = ArrayList<String>() val paths = ArrayList<String>()
for (f in files) { for (f in files) {
@ -94,7 +92,7 @@ class CopyDialog(val activity: Activity, val files: List<File>, val copyListener
CopyTask(copyListener, context).execute(pair) CopyTask(copyListener, context).execute(pair)
dismiss() dismiss()
} }
} }*/
}) })
} }
} }

4
app/src/main/res/layout/copy_item.xml
View File

@ -44,7 +44,7 @@
android:paddingTop="@dimen/small_padding" android:paddingTop="@dimen/small_padding"
android:text="@string/select_destination"/> android:text="@string/select_destination"/>
<RadioGroup <!--<RadioGroup
android:id="@+id/dialog_radio_group" android:id="@+id/dialog_radio_group"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -62,5 +62,5 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/move"/> android:text="@string/move"/>
</RadioGroup> </RadioGroup>-->
</LinearLayout> </LinearLayout>

2
app/src/main/res/menu/cab_media.xml
View File

@ -18,6 +18,6 @@
app:showAsAction="ifRoom"/> app:showAsAction="ifRoom"/>
<item <item
android:id="@+id/cab_copy" android:id="@+id/cab_copy"
android:title="@string/copy_move" android:title="@string/copy"
app:showAsAction="never"/> app:showAsAction="never"/>
</menu> </menu>

2
app/src/main/res/menu/directories_cab.xml
View File

@ -23,7 +23,7 @@
app:showAsAction="ifRoom"/> app:showAsAction="ifRoom"/>
<item <item
android:id="@+id/cab_copy" android:id="@+id/cab_copy"
android:title="@string/copy_move" android:title="@string/copy"
app:showAsAction="never"/> app:showAsAction="never"/>
<item <item
android:id="@+id/cab_delete" android:id="@+id/cab_delete"

2
app/src/main/res/menu/viewpager_menu.xml
View File

@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"> xmlns:app="http://schemas.android.com/apk/res-auto">
<item <item
android:id="@+id/menu_copy" android:id="@+id/menu_copy"
android:title="@string/copy_move" android:title="@string/copy"
app:showAsAction="never"/> app:showAsAction="never"/>
<item <item
android:id="@+id/menu_set_as_wallpaper" android:id="@+id/menu_set_as_wallpaper"