From e93b10aa32fa7895a27d7621cc781e1157e13f78 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Fri, 13 Mar 2020 10:56:12 +0100
Subject: [PATCH] tweak the SaveImageDialog, make it more flexible

---
 .../draw/pro/activities/MainActivity.kt       | 11 ++++-----
 .../draw/pro/dialogs/SaveImageDialog.kt       | 23 +++++++++++--------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/draw/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/draw/pro/activities/MainActivity.kt
index 724e05d..68d27a9 100644
--- a/app/src/main/kotlin/com/simplemobiletools/draw/pro/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/draw/pro/activities/MainActivity.kt
@@ -369,13 +369,12 @@ class MainActivity : SimpleActivity(), CanvasListener {
     }
 
     private fun saveImage() {
-        SaveImageDialog(this, defaultExtension, defaultPath, defaultFilename) {
+        SaveImageDialog(this, defaultPath, defaultFilename, defaultExtension, false) { fullPath, filename, extension ->
             savedPathsHash = my_canvas.getDrawingHashCode()
-            saveFile(it)
-            defaultPath = it.getParentPath()
-            defaultFilename = it.getFilenameFromPath()
-            defaultFilename = defaultFilename.substring(0, defaultFilename.lastIndexOf("."))
-            defaultExtension = it.getFilenameExtension()
+            saveFile(fullPath)
+            defaultPath = fullPath.getParentPath()
+            defaultFilename = filename
+            defaultExtension = extension
             config.lastSaveFolder = defaultPath
         }
     }
diff --git a/app/src/main/kotlin/com/simplemobiletools/draw/pro/dialogs/SaveImageDialog.kt b/app/src/main/kotlin/com/simplemobiletools/draw/pro/dialogs/SaveImageDialog.kt
index 600cea6..82eb4bf 100644
--- a/app/src/main/kotlin/com/simplemobiletools/draw/pro/dialogs/SaveImageDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/draw/pro/dialogs/SaveImageDialog.kt
@@ -12,8 +12,8 @@ import com.simplemobiletools.draw.pro.helpers.SVG
 import kotlinx.android.synthetic.main.dialog_save_image.view.*
 import java.io.File
 
-class SaveImageDialog(val activity: SimpleActivity, val defaultExtension: String, val defaultPath: String, val defaultFilename: String,
-                      callback: (savePath: String) -> Unit) {
+class SaveImageDialog(val activity: SimpleActivity, val defaultPath: String, val defaultFilename: String, val defaultExtension: String,
+                      val hidePath: Boolean, callback: (fullPath: String, filename: String, extension: String) -> Unit) {
     private val SIMPLE_DRAW = "Simple Draw"
 
     init {
@@ -27,11 +27,16 @@ class SaveImageDialog(val activity: SimpleActivity, val defaultExtension: String
                 else -> R.id.save_image_radio_png
             })
 
-            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
+            if (hidePath) {
+                save_image_path_label.beGone()
+                save_image_path.beGone()
+            } else {
+                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()) {
                                 val title = String.format(activity.getString(R.string.file_already_exists_overwrite), newPath.getFilenameFromPath())
                                 ConfirmationDialog(activity, title) {
-                                    callback(newPath)
+                                    callback(newPath, filename, extension)
                                     dismiss()
                                 }
                             } else {
-                                callback(newPath)
+                                callback(newPath, filename, extension)
                                 dismiss()
                             }
                         }