Improve dialog wordings

FazliMolaJan · Oct 31, 2017 · c95e457 · c95e457
1 parent 5959263
commit c95e457
Show file tree

Hide file tree

Showing 19 changed files with 46 additions and 25 deletions.
diff --git a/.gitignore b/.gitignore
@@ -96,6 +96,7 @@ app/src/main/res/raw/changelog.*
 app/src/main/res/raw/license.*
 app/src/main/res/raw/readme.*
 app/src/main/res/raw/contributors.*
+app/flavor*
 
 # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
 !gradle-wrapper.jar

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:targetApi="jelly_bean"
     package="net.gsantner.markor">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

diff --git a/app/src/main/java/net/gsantner/markor/activity/FilesystemListFragment.java b/app/src/main/java/net/gsantner/markor/activity/FilesystemListFragment.java
@@ -136,15 +136,16 @@ private void retrieveCurrentFolder() {
 
     private void saveCurrentFolder() {
         AppSettings appSettings = AppSettings.get();
-        SharedPreferences pm = PreferenceManager.getDefaultSharedPreferences(getActivity().getApplicationContext());
         String saveDir = (_currentDir == null) ? _rootDir.getAbsolutePath() : _currentDir.getAbsolutePath();
         appSettings.setLastOpenedDirectory(saveDir);
         _markorSingleton.setNotesLastDirectory(_currentDir);
     }
 
     private void confirmDelete() {
         final ArrayList<File> itemsToDelete = new ArrayList<>(_selectedItems);
-        ConfirmDialog confirmDialog = ConfirmDialog.newInstance(R.string.confirm_delete, itemsToDelete,
+        String message = String.format(getString(R.string.confirm_delete_description), getResources().getQuantityString(R.plurals.documents, itemsToDelete.size()));
+        ConfirmDialog confirmDialog = ConfirmDialog.newInstance(
+                getString(R.string.confirm_delete), message, itemsToDelete,
                 new ConfirmDialog.ConfirmDialogCallback() {
                     @Override
                     public void onConfirmDialogAnswer(boolean confirmed, Serializable data) {
@@ -155,7 +156,7 @@ public void onConfirmDialogAnswer(boolean confirmed, Serializable data) {
                         }
                     }
                 });
-        confirmDialog.show(getFragmentManager(), ConfirmDialog.FRAGMENT_TAG);
+        confirmDialog.show(getActivity().getSupportFragmentManager(), ConfirmDialog.FRAGMENT_TAG);
     }
 
     private void promptForMoveDirectory() {
@@ -171,7 +172,7 @@ public void onFsSelected(String request, File file) {
 
             @Override
             public void onFsDialogConfig(FilesystemDialogData.Options opt) {
-                opt.titleText = R.string.select_folder;
+                opt.titleText = R.string.move;
                 opt.rootFolder = new File(AppSettings.get().getSaveDirectory());
             }
         }, getActivity().getSupportFragmentManager(), getActivity());

diff --git a/app/src/main/java/net/gsantner/markor/activity/MainActivity.java b/app/src/main/java/net/gsantner/markor/activity/MainActivity.java
@@ -373,8 +373,10 @@ public void onFsDialogConfig(FilesystemDialogData.Options opt) {
 
     private void importFile(final File file) {
         if (new File(_filesystemListFragment.getCurrentDir().getAbsolutePath(), file.getName()).exists()) {
+            String message = getString(R.string.confirm_overwrite_description) + "\n[" + file.getName() + "]";
             // Ask if overwriting is okay
-            ConfirmDialog d = ConfirmDialog.newInstance(R.string.confirm_overwrite, file,
+            ConfirmDialog d = ConfirmDialog.newInstance(
+                    getString(R.string.confirm_overwrite), message, file,
                     new ConfirmDialog.ConfirmDialogCallback() {
                         @Override
                         public void onConfirmDialogAnswer(boolean confirmed, Serializable data) {

diff --git a/app/src/main/java/net/gsantner/markor/dialog/ConfirmDialog.java b/app/src/main/java/net/gsantner/markor/dialog/ConfirmDialog.java
@@ -11,9 +11,9 @@
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
-import android.support.annotation.StringRes;
 import android.support.v4.app.DialogFragment;
 import android.support.v7.app.AlertDialog;
+import android.text.TextUtils;
 
 import net.gsantner.markor.R;
 import net.gsantner.markor.util.AppSettings;
@@ -23,18 +23,21 @@
 public class ConfirmDialog extends DialogFragment {
     public static final String FRAGMENT_TAG = "ConfirmDialog";
 
-    private static final String EXTRA_TITLE_RES_ID = "EXTRA_TITLE_RES_ID";
+    private static final String EXTRA_TITLE = "EXTRA_TITLE";
+    private static final String EXTRA_MESSAGE = "EXTRA_MESSAGE";
     public static final String EXTRA_DATA = "EXTRA_DATA";
 
     private Serializable _data;
     private ConfirmDialogCallback[] _callbacks;
+    private String _summary;
 
-    public static ConfirmDialog newInstance(@StringRes int titleResId,
+    public static ConfirmDialog newInstance(String title, String message,
                                             Serializable data, ConfirmDialogCallback... callbacks) {
         ConfirmDialog confirmDialog = new ConfirmDialog();
         Bundle args = new Bundle();
         args.putSerializable(EXTRA_DATA, data);
-        args.putInt(EXTRA_TITLE_RES_ID, titleResId);
+        args.putString(EXTRA_TITLE, title);
+        args.putString(EXTRA_MESSAGE, message);
         confirmDialog.setArguments(args);
         confirmDialog.setCallbacks(callbacks);
         return confirmDialog;
@@ -47,16 +50,19 @@ public void setCallbacks(ConfirmDialogCallback[] callbacks) {
     @Override
     @NonNull
     public Dialog onCreateDialog(Bundle savedInstanceState) {
-        int titleResId = getArguments().getInt(EXTRA_TITLE_RES_ID);
+        String title = getArguments().getString(EXTRA_TITLE);
+        String message = getArguments().getString(EXTRA_MESSAGE);
         _data = getArguments().getSerializable(EXTRA_DATA);
 
         AlertDialog.Builder dialogBuilder;
         boolean darkTheme = AppSettings.get().isDarkThemeEnabled();
         dialogBuilder = new AlertDialog.Builder(getActivity(), darkTheme ?
                 R.style.Theme_AppCompat_Dialog : R.style.Theme_AppCompat_Light_Dialog);
 
-
-        dialogBuilder.setTitle(getResources().getString(titleResId));
+        dialogBuilder.setTitle(title);
+        if (!TextUtils.isEmpty(message)){
+            dialogBuilder.setMessage(message);
+        }
 
         dialogBuilder.setPositiveButton(getString(android.R.string.ok), new
                 DialogInterface.OnClickListener() {

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -6,7 +6,7 @@
     <string name="delete">Löschen</string>
     <string name="rename">Umbenennen</string>
     <string name="confirm_delete">Löschen bestätigen</string>
-    <string name="confirm_overwrite">Datei existiert bereits. Überschreiben?</string>
+    <string name="confirm_overwrite_description">Datei existiert bereits. Überschreiben?</string>
     <string name="title">Titel</string>
     <string name="empty_directory">Dieser Ordner ist leer</string>
     <string name="navigate_up_folder">Zurück zum vorherigen Ordner</string>

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -6,7 +6,7 @@
     <string name="delete">Borrar</string>
     <string name="rename">Cambiar nombre</string>
     <string name="confirm_delete">Confirmar borrado</string>
-    <string name="confirm_overwrite">El archivo ya existe, ¿sobrescribir?</string>
+    <string name="confirm_overwrite_description">El archivo ya existe, ¿sobrescribir?</string>
     <string name="title">Título</string>
     <string name="empty_directory">Este directorio está vacío</string>
     <string name="navigate_up_folder">Volver a la carpeta anterior</string>

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
@@ -6,7 +6,7 @@
     <string name="delete">Supprimer</string>
     <string name="rename">Renommer</string>
     <string name="confirm_delete">Confirmez la suppression</string>
-    <string name="confirm_overwrite">Un fichier portant le même nom existe déjà : faut-il l\'écraser ?</string>
+    <string name="confirm_overwrite_description">Un fichier portant le même nom existe déjà : faut-il l\'écraser ?</string>
     <string name="title">Titre</string>
     <string name="empty_directory">Ce dossier est vide</string>
     <string name="navigate_up_folder">Retourner au dossier précédent</string>

diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
@@ -6,7 +6,7 @@
     <string name="delete">हटाना</string>
     <string name="rename">नाम बदलने</string>
     <string name="confirm_delete">हटाने की पुष्टि करें</string>
-    <string name="confirm_overwrite">फ़ाइल पहले से मौजूद है, अधिलेखित?</string>
+    <string name="confirm_overwrite_description">फ़ाइल पहले से मौजूद है, अधिलेखित?</string>
     <string name="title">शीर्षक</string>
     <string name="empty_directory">यह फ़ोल्डर खाली है</string>
     <string name="navigate_up_folder">पिछले फ़ोल्डर पर वापस जाएं</string>

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
@@ -6,7 +6,7 @@
     <string name="delete">Cancella</string>
     <string name="rename">Rinomina</string>
     <string name="confirm_delete">Conferma la cancellazione</string>
-    <string name="confirm_overwrite">File già esistente, sovrascrivere?</string>
+    <string name="confirm_overwrite_description">File già esistente, sovrascrivere?</string>
     <string name="title">Titolo</string>
     <string name="empty_directory">Questa cartella è vuota</string>
     <string name="navigate_up_folder">Vai alla cartella precedente</string>

diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
@@ -6,7 +6,7 @@
     <string name="delete">Verwijderen</string>
     <string name="rename">Hernoemen</string>
     <string name="confirm_delete">Bevestig verwijderen</string>
-    <string name="confirm_overwrite">Bestand bestaat al, overschrijven?</string>
+    <string name="confirm_overwrite_description">Bestand bestaat al, overschrijven?</string>
     <string name="title">Titel</string>
     <string name="empty_directory">Deze folder is leeg</string>
     <string name="navigate_up_folder">Terug naar vorige map</string>

diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
@@ -6,7 +6,7 @@
     <string name="delete">Usuń</string>
     <string name="rename">Zmień nazwę</string>
     <string name="confirm_delete">Potwierdź usunięcie</string>
-    <string name="confirm_overwrite">Plik już istnieje, nadpisać?</string>
+    <string name="confirm_overwrite_description">Plik już istnieje, nadpisać?</string>
     <string name="title">Tytuł</string>
     <string name="empty_directory">Ten katalog jest pusty</string>
     <string name="navigate_up_folder">Wróć do poprzedniego folderu</string>

diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
@@ -6,7 +6,7 @@
     <string name="delete">Apagar</string>
     <string name="rename">Renomear</string>
     <string name="confirm_delete">Confirmar exclusão</string>
-    <string name="confirm_overwrite">O arquivo já existe. Sobrescrever?</string>
+    <string name="confirm_overwrite_description">O arquivo já existe. Sobrescrever?</string>
     <string name="title">Título</string>
     <string name="empty_directory">Pasta vazia</string>
     <string name="navigate_up_folder">Retornar à pasta anterior</string>

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
@@ -6,7 +6,7 @@
     <string name="delete">Удалить</string>
     <string name="rename">Переименовать</string>
     <string name="confirm_delete">Подтвердить удаление</string>
-    <string name="confirm_overwrite">Файл уже существует, перезаписать?</string>
+    <string name="confirm_overwrite_description">Файл уже существует, перезаписать?</string>
     <string name="title">Заголовок</string>
     <string name="empty_directory">Эта директория пуста</string>
     <string name="navigate_up_folder">В предыдущую директорию</string>

diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
@@ -6,7 +6,7 @@
     <string name="delete">Radera</string>
     <string name="rename">Byt namn</string>
     <string name="confirm_delete">Bekräfta radering</string>
-    <string name="confirm_overwrite">Filen finns redan, skriva över?</string>
+    <string name="confirm_overwrite_description">Filen finns redan, skriva över?</string>
     <string name="title">Titel</string>
     <string name="empty_directory">Den här mappen är tom</string>
     <string name="navigate_up_folder">Tillbaka till föregående mapp</string>

diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
@@ -6,7 +6,7 @@
     <string name="delete">Sil</string>
     <string name="rename">Yeniden Adlandır</string>
     <string name="confirm_delete">Silmeyi Onayla</string>
-    <string name="confirm_overwrite">Dosya zaten var, üzerine yazılsın mı?</string>
+    <string name="confirm_overwrite_description">Dosya zaten var, üzerine yazılsın mı?</string>
     <string name="title">Başlık</string>
     <string name="empty_directory">Bu dizin boş</string>
     <string name="navigate_up_folder">Önceki klasöre dön</string>

diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
@@ -6,7 +6,7 @@
     <string name="delete">Видалити</string>
     <string name="rename">Перейменувати</string>
     <string name="confirm_delete">Підтвердіть видалення</string>
-    <string name="confirm_overwrite">Файл вже існує, перезаписати?</string>
+    <string name="confirm_overwrite_description">Файл вже існує, перезаписати?</string>
     <string name="title">Заголовок</string>
     <string name="empty_directory">Поточна директорія порожня</string>
     <string name="navigate_up_folder">В попередню директорію</string>

diff --git a/app/src/main/res/values/string-not_translatable.xml b/app/src/main/res/values/string-not_translatable.xml
@@ -35,6 +35,11 @@
         <item quantity="other">@string/more_items_selected</item>
     </plurals>
 
+    <plurals name="documents" translatable="false">
+        <item quantity="one">@string/document_one</item>
+        <item quantity="other">@string/document_multiple</item>
+    </plurals>
+
 
     <!-- Preference keys -->
     <string name="pref_key__is_preview_first" translatable="false">pref_key__is_preview_first</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -6,7 +6,9 @@
     <string name="delete">Delete</string>
     <string name="rename">Rename</string>
     <string name="confirm_delete">Confirm Delete</string>
-    <string name="confirm_overwrite">File already exists, overwrite?</string>
+    <string name="confirm_delete_description">Do you really want to delete this %s?</string>
+    <string name="confirm_overwrite">Confirm Overwrite</string>
+    <string name="confirm_overwrite_description">File already exists, overwrite?</string>
     <string name="title">Title</string>
     <string name="empty_directory">This directory is empty</string>
     <string name="navigate_up_folder">Back to previous folder</string>
@@ -27,6 +29,8 @@
     <string name="editor_settings">Editor Settings</string>
     <string name="folders">Folders</string>
     <string name="files">Files</string>
+    <string name="document_one">Document</string>
+    <string name="document_multiple">Documents</string>
 
     <!-- Preferences -->
     <string name="pref_title__remember_directory">Remember last folder location on startup</string>