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

tweak the SaveImageDialog, make it more flexible

This commit is contained in:
tibbi 2020-03-13 10:56:12 +01:00
parent c51834b502
commit e93b10aa32
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/kotlin/com/simplemobiletools/draw/pro/activities/MainActivity.kt
View File

@ -369,13 +369,12 @@ class MainActivity : SimpleActivity(), CanvasListener {
} }
private fun saveImage() { private fun saveImage() {
SaveImageDialog(this, defaultExtension, defaultPath, defaultFilename) { SaveImageDialog(this, defaultPath, defaultFilename, defaultExtension, false) { fullPath, filename, extension ->
savedPathsHash = my_canvas.getDrawingHashCode() savedPathsHash = my_canvas.getDrawingHashCode()
saveFile(it) saveFile(fullPath)
defaultPath = it.getParentPath() defaultPath = fullPath.getParentPath()
defaultFilename = it.getFilenameFromPath() defaultFilename = filename
defaultFilename = defaultFilename.substring(0, defaultFilename.lastIndexOf(".")) defaultExtension = extension
defaultExtension = it.getFilenameExtension()
config.lastSaveFolder = defaultPath config.lastSaveFolder = defaultPath
} }
} }

23
app/src/main/kotlin/com/simplemobiletools/draw/pro/dialogs/SaveImageDialog.kt
View File

@ -12,8 +12,8 @@ import com.simplemobiletools.draw.pro.helpers.SVG
import kotlinx.android.synthetic.main.dialog_save_image.view.* import kotlinx.android.synthetic.main.dialog_save_image.view.*
import java.io.File import java.io.File
class SaveImageDialog(val activity: SimpleActivity, val defaultExtension: String, val defaultPath: String, val defaultFilename: String, class SaveImageDialog(val activity: SimpleActivity, val defaultPath: String, val defaultFilename: String, val defaultExtension: String,
callback: (savePath: String) -> Unit) { val hidePath: Boolean, callback: (fullPath: String, filename: String, extension: String) -> Unit) {
private val SIMPLE_DRAW = "Simple Draw" private val SIMPLE_DRAW = "Simple Draw"
init { init {
@ -27,11 +27,16 @@ class SaveImageDialog(val activity: SimpleActivity, val defaultExtension: String
else -> R.id.save_image_radio_png else -> R.id.save_image_radio_png
}) })
save_image_path.text = activity.humanizePath(folder) if (hidePath) {
save_image_path.setOnClickListener { save_image_path_label.beGone()
FilePickerDialog(activity, folder, false, showFAB = true) { save_image_path.beGone()
save_image_path.text = activity.humanizePath(it) } else {
folder = it save_image_path.text = activity.humanizePath(folder)
save_image_path.setOnClickListener {
FilePickerDialog(activity, folder, false, showFAB = true) {
save_image_path.text = activity.humanizePath(it)
folder = it
}
} }
} }
} }
@ -64,11 +69,11 @@ class SaveImageDialog(val activity: SimpleActivity, val defaultExtension: String
if (File(newPath).exists()) { if (File(newPath).exists()) {
val title = String.format(activity.getString(R.string.file_already_exists_overwrite), newPath.getFilenameFromPath()) val title = String.format(activity.getString(R.string.file_already_exists_overwrite), newPath.getFilenameFromPath())
ConfirmationDialog(activity, title) { ConfirmationDialog(activity, title) {
callback(newPath) callback(newPath, filename, extension)
dismiss() dismiss()
} }
} else { } else {
callback(newPath) callback(newPath, filename, extension)
dismiss() dismiss()
} }
} }