From 40e50dddc869a875050be3816b27e809efa5808f Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 4 Dec 2016 13:20:37 +0100 Subject: [PATCH] show the path at Save as dialog of editor --- .../gallery/dialogs/SaveAsDialog.kt | 8 ++--- app/src/main/res/layout/dialog_save_as.xml | 29 +++++++++++++++---- app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values-es/strings.xml | 1 + app/src/main/res/values-it/strings.xml | 1 + app/src/main/res/values-ja/strings.xml | 1 + app/src/main/res/values-pt-rPT/strings.xml | 1 + app/src/main/res/values-ru/strings.xml | 1 + app/src/main/res/values-sv/strings.xml | 1 + app/src/main/res/values-zh/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 11 files changed, 36 insertions(+), 10 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/SaveAsDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/SaveAsDialog.kt index abbe56a34..f568d81be 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/SaveAsDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/SaveAsDialog.kt @@ -4,17 +4,17 @@ import android.app.Activity import android.app.AlertDialog import android.view.LayoutInflater import android.view.WindowManager -import com.simplemobiletools.filepicker.extensions.getFilenameFromPath -import com.simplemobiletools.filepicker.extensions.isAValidFilename -import com.simplemobiletools.filepicker.extensions.toast -import com.simplemobiletools.filepicker.extensions.value +import com.simplemobiletools.filepicker.extensions.* import com.simplemobiletools.gallery.R import kotlinx.android.synthetic.main.rename_file.view.* +import java.io.File class SaveAsDialog(val activity: Activity, val path: String, val callback: (filename: String) -> Unit) { init { val view = LayoutInflater.from(activity).inflate(R.layout.dialog_save_as, null) + val realPath = File(path).parent.trimEnd('/') + view.file_path.text = activity.humanizePath(realPath) view.file_name.setText(path.getFilenameFromPath()) AlertDialog.Builder(activity) diff --git a/app/src/main/res/layout/dialog_save_as.xml b/app/src/main/res/layout/dialog_save_as.xml index 1e224d9d7..f94203323 100644 --- a/app/src/main/res/layout/dialog_save_as.xml +++ b/app/src/main/res/layout/dialog_save_as.xml @@ -1,10 +1,27 @@ - + + + + + Editor Speichern Drehen + Path Ungültiger Dateipfad Bildbearbeitung fehlgeschlagen Bearbeite Bild mit: diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 3dbdf0023..0d5ea5ecf 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -76,6 +76,7 @@ Editor Save Rotate + Path Invalid image path Image editing failed Editar image usando: diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index d9d84e0c8..3b8ec0165 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -76,6 +76,7 @@ Editor Salva Ruota + Path Percorso immagine non valido Modifica immagine non riuscita Modifica immagine con: diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 571176a2a..bbc0b823d 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -76,6 +76,7 @@ エディター 保存 回転 + Path 無効な画像パス 画像の編集に失敗しました 画像を編集: diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 774555cf9..6b34a2dd4 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -76,6 +76,7 @@ Editor Guardar Rodar + Path Caminho inválido Falha de edição de imagem Editar imagem com: diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 0c1de0394..bed748554 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -77,6 +77,7 @@ Редактор Сохранить Поворот + Path Недопустимый путь изображения Редактирование изображения не удалось Редактирование изображений в: diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 3c9a080a8..60e0dc0b8 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -76,6 +76,7 @@ Editor Save Rotate + Path Invalid image path Image editing failed Edit image with: diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 0aa7a0a9c..95ec4d3ab 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -77,6 +77,7 @@ 编辑器 保存 旋转 + Path 错误图片路径 图像编辑失败 编辑方式: diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d23a8959e..70898e37e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -76,6 +76,7 @@ Editor Save Rotate + Path Invalid image path Image editing failed Edit image with: