From 774f9d691bdb360b2ffd9ba8e99e0f18deb73d19 Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 12 Dec 2016 19:11:30 +0100 Subject: [PATCH] simplify some dialogs --- .../simplemobiletools/gallery/dialogs/ChangeSortingDialog.kt | 2 +- .../kotlin/com/simplemobiletools/gallery/dialogs/CopyDialog.kt | 2 +- .../com/simplemobiletools/gallery/dialogs/PickAlbumDialog.kt | 2 +- .../simplemobiletools/gallery/dialogs/RenameDirectoryDialog.kt | 2 +- .../com/simplemobiletools/gallery/dialogs/RenameFileDialog.kt | 2 +- .../com/simplemobiletools/gallery/dialogs/ResizeDialog.kt | 2 +- .../com/simplemobiletools/gallery/dialogs/SaveAsDialog.kt | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/ChangeSortingDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/ChangeSortingDialog.kt index 44933ae44..337b3afac 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/ChangeSortingDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/ChangeSortingDialog.kt @@ -22,7 +22,7 @@ class ChangeSortingDialog(val activity: Activity, val isDirectorySorting: Boolea view = LayoutInflater.from(activity).inflate(R.layout.dialog_change_sorting, null) val dialog = AlertDialog.Builder(activity) - .setTitle(activity.resources.getString(R.string.sort_by)) + .setTitle(R.string.sort_by) .setView(view) .setPositiveButton(R.string.ok, this) .setNegativeButton(R.string.cancel, null) 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 d67a99e33..c4f82cf88 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/CopyDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/CopyDialog.kt @@ -33,7 +33,7 @@ class CopyDialog(val activity: SimpleActivity, val files: ArrayList, val c } AlertDialog.Builder(activity) - .setTitle(activity.resources.getString(if (files.size == 1) R.string.copy_item else R.string.copy_items)) + .setTitle(if (files.size == 1) R.string.copy_item else R.string.copy_items) .setView(view) .setPositiveButton(R.string.ok, null) .setNegativeButton(R.string.cancel, null) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/PickAlbumDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/PickAlbumDialog.kt index da528a477..3bb451b05 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/PickAlbumDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/PickAlbumDialog.kt @@ -22,7 +22,7 @@ class PickAlbumDialog(val activity: SimpleActivity, val callback: (path: String) directoriesGrid = view.directories_grid dialog = AlertDialog.Builder(activity) - .setTitle(activity.resources.getString(R.string.select_destination)) + .setTitle(R.string.select_destination) .setView(view) .setNeutralButton(R.string.other_folder, { dialogInterface, i -> showOtherFolder() }) .setPositiveButton(R.string.ok, null) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/RenameDirectoryDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/RenameDirectoryDialog.kt index 783aaf46e..296bc5277 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/RenameDirectoryDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/RenameDirectoryDialog.kt @@ -19,7 +19,7 @@ class RenameDirectoryDialog(val activity: SimpleActivity, val dir: File, val cal view.directory_path.text = "${activity.humanizePath(dir.parent)}/" AlertDialog.Builder(activity) - .setTitle(activity.resources.getString(R.string.rename_folder)) + .setTitle(R.string.rename_folder) .setView(view) .setPositiveButton(R.string.ok, null) .setNegativeButton(R.string.cancel, null) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/RenameFileDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/RenameFileDialog.kt index f08f29cd1..75dae5ca1 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/RenameFileDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/RenameFileDialog.kt @@ -28,7 +28,7 @@ class RenameFileDialog(val activity: SimpleActivity, val file: File, val callbac view.file_path.text = "${activity.humanizePath(file.parent)}/" AlertDialog.Builder(activity) - .setTitle(activity.resources.getString(R.string.rename_file)) + .setTitle(R.string.rename_file) .setView(view) .setPositiveButton(R.string.ok, null) .setNegativeButton(R.string.cancel, null) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/ResizeDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/ResizeDialog.kt index 64f32b4af..0e71dcc81 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/ResizeDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/ResizeDialog.kt @@ -69,7 +69,7 @@ class ResizeDialog(val activity: SimpleActivity, val size: Point, val callback: }) AlertDialog.Builder(activity) - .setTitle(activity.resources.getString(R.string.resize_and_save)) + .setTitle(R.string.resize_and_save) .setView(view) .setPositiveButton(R.string.ok, null) .setNegativeButton(R.string.cancel, null) 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 ea85e4760..fda4ae24b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/SaveAsDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/SaveAsDialog.kt @@ -43,7 +43,7 @@ class SaveAsDialog(val activity: Activity, val path: String, val callback: (save } AlertDialog.Builder(activity) - .setTitle(activity.resources.getString(R.string.save_as)) + .setTitle(R.string.save_as) .setView(view) .setPositiveButton(R.string.ok, null) .setNegativeButton(R.string.cancel, null)