From 08338f3d7a16917284d937637c87b991ce46414c Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 11 Nov 2016 18:39:29 +0100 Subject: [PATCH] show a success toast after successufull copy --- app/src/main/java/com/simplemobiletools/filemanager/Utils.kt | 4 ++-- .../filemanager/fragments/ItemsFragment.java | 3 ++- app/src/main/res/values-de/strings.xml | 3 ++- app/src/main/res/values-it/strings.xml | 3 ++- app/src/main/res/values-ja/strings.xml | 3 ++- app/src/main/res/values-pt-rPT/strings.xml | 3 ++- app/src/main/res/values-sv/strings.xml | 3 ++- app/src/main/res/values/strings.xml | 3 ++- 8 files changed, 16 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/simplemobiletools/filemanager/Utils.kt b/app/src/main/java/com/simplemobiletools/filemanager/Utils.kt index 1bb3cd56..62dbf575 100644 --- a/app/src/main/java/com/simplemobiletools/filemanager/Utils.kt +++ b/app/src/main/java/com/simplemobiletools/filemanager/Utils.kt @@ -7,8 +7,8 @@ import android.net.Uri import android.os.Build import android.support.v4.content.ContextCompat import android.support.v4.provider.DocumentFile -import android.widget.Toast import com.simplemobiletools.filepicker.extensions.getSDCardPath +import com.simplemobiletools.filepicker.extensions.toast import java.util.regex.Pattern class Utils { @@ -22,7 +22,7 @@ class Utils { } fun showToast(context: Context, resId: Int) { - Toast.makeText(context, context.resources.getString(resId), Toast.LENGTH_SHORT).show() + context.toast(resId) } fun hasStoragePermission(cxt: Context): Boolean { diff --git a/app/src/main/java/com/simplemobiletools/filemanager/fragments/ItemsFragment.java b/app/src/main/java/com/simplemobiletools/filemanager/fragments/ItemsFragment.java index a80808af..0823c894 100644 --- a/app/src/main/java/com/simplemobiletools/filemanager/fragments/ItemsFragment.java +++ b/app/src/main/java/com/simplemobiletools/filemanager/fragments/ItemsFragment.java @@ -495,11 +495,12 @@ public class ItemsFragment extends android.support.v4.app.Fragment public void copySucceeded(File file) { rescanItem(file); fillItems(); + Utils.Companion.showToast(getContext(), R.string.copying_success); } @Override public void copyFailed() { - Utils.Companion.showToast(getContext(), R.string.copy_failed); + Utils.Companion.showToast(getContext(), R.string.copying_failed); } public interface ItemInteractionListener { diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index abc4ea15..4ebc1b59 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -30,8 +30,9 @@ Konnte nicht an ausgewähltes Ziel schreiben Bitte wähle ein Ziel Source and destination cannot be the same - Konnte die Datei nicht kopieren Kopiere + Files copied successfully + Konnte die Datei nicht kopieren Copying, please delete source files manually A file with that name already exists OK diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 7beb0b08..a780890e 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -30,8 +30,9 @@ Impossibile scrivere nella destinazione selezionata Seleziona una destinazione Source and destination cannot be the same - Impossibile copiare i file Copia in corso + Files copied successfully + Impossibile copiare i file Copying, please delete source files manually A file with that name already exists OK diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index a8a7f31f..02b1d0be 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -30,8 +30,9 @@ 選択した宛先に書き込みできませんでした 宛先を選択してください Source and destination cannot be the same - ファイルをコピーできませんでした コピー中 + Files copied successfully + ファイルをコピーできませんでした Copying, please delete source files manually A file with that name already exists OK diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index f6e8ba1a..f59a0dd9 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -30,8 +30,9 @@ Não foi possível escrever no destino selecionado Por favor selecione um destino A origem e o destino não podem ser iguais - Não foi possível copiar os ficheiros A copiar + Files copied successfully + Não foi possível copiar os ficheiros A copiar, apague os ficheiros originais manualmente Já existe um ficheiro com este nome/string> OK diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index e11fc03a..277e5bfb 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -30,8 +30,9 @@ Det gick inte att skriva till målet Please select a destination Source and destination cannot be the same - Kunde inte kopiera filen Kopierar + Files copied successfully + Kunde inte kopiera filen Copying, please delete source files manually A file with that name already exists OK diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b4a2605c..eb44587f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -30,8 +30,9 @@ Could not write to the selected destination Please select a destination Source and destination cannot be the same - Could not copy the files Copying + Files copied successfully + An error occurred during the copy Copying, please delete source files manually A file with that name already exists OK