#116[30m]. Show loading messages.

Author: Evgenii Kanivets

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/base/BaseActivity.java

@@ -68,14 +68,16 @@ protected void showToast(@StringRes int messageId) {
         Toast.makeText(BaseActivity.this, messageId, Toast.LENGTH_SHORT).show();
     }
 
-    public void startProgress() {
-        if (getProgressBar() == null) return;
-        getProgressBar().show();
+    public void startProgress(@Nullable String message) {
+        ProgressDialog progressDialog = getProgressDialog();
+        if (progressDialog == null) return;
+        if (message != null) progressDialog.setMessage(message);
+        progressDialog.show();
     }
 
     public void stopProgress() {
-        if (getProgressBar() == null) return;
-        getProgressBar().dismiss();
+        if (getProgressDialog() == null) return;
+        getProgressDialog().dismiss();
     }
 
     public void showAlert(@Nullable String title, @Nullable String message) {
@@ -90,7 +92,7 @@ public void showAlert(@Nullable String title, @Nullable String message) {
         dialog.show();
     }
 
-    private ProgressDialog getProgressBar() {
+    private ProgressDialog getProgressDialog() {
         if (progressDialog == null) progressDialog = new ProgressDialog(this);
         return progressDialog;
     }

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/external/BackupActivity.java

@@ -89,7 +89,7 @@ protected void onResume() {
 
     @OnClick(R.id.btn_backup_now)
     public void backupNow() {
-        startProgress();
+        startProgress(getString(R.string.making_backup));
         backupController.makeBackup(dbApi, new BackupController.OnBackupListener() {
             @Override
             public void onBackupSuccess() {
@@ -131,7 +131,7 @@ public void onClick(DialogInterface dialog, int which) {
     }
 
     private void restoreBackup(final String backupName) {
-        startProgress();
+        startProgress(getString(R.string.restoring_backup));
         backupController.restoreBackup(dbApi, backupName, new BackupController.OnRestoreBackupListener() {
             @Override
             public void onRestoreSuccess() {
@@ -170,7 +170,7 @@ public void onRestoreFailure(String reason) {
     }
 
     private void fetchBackups() {
-        startProgress();
+        startProgress(getString(R.string.fetching_backups));
         backupController.fetchBackups(dbApi, new BackupController.OnFetchBackupListListener() {
             @Override
             public void onBackupsFetched(@NonNull List<String> backupList) {

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/external/ImportExportActivity.java

@@ -80,7 +80,7 @@ public void importRecords() {
             @Override
             protected void onPreExecute() {
                 super.onPreExecute();
-                startProgress();
+                startProgress(getString(R.string.importing_records));
             }
 
             @Override

app/src/main/res/values-ru/strings.xml

@@ -96,4 +96,9 @@
 
     <string name="title_edit_income">Редактировать доход</string>
     <string name="title_edit_expense">Редактировать расход</string>
+
+    <string name="importing_records">Импортирование записей…</string>
+    <string name="making_backup">Создание бэкапа…</string>
+    <string name="restoring_backup">Восстановление бэкапа…</string>
+    <string name="fetching_backups">Загрузка бэкапов…</string>
 </resources>

app/src/main/res/values-uk/strings.xml

@@ -96,4 +96,9 @@
 
     <string name="title_edit_income">Редагувати дохід</string>
     <string name="title_edit_expense">Редагувати витрату</string>
+
+    <string name="importing_records">Імпорт записів…</string>
+    <string name="making_backup">Створення бекапу…</string>
+    <string name="restoring_backup">Відновлення бекапу…</string>
+    <string name="fetching_backups">Завантаження бекапів…</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -104,5 +104,10 @@
 
     <string name="title_edit_income">Edit income</string>
     <string name="title_edit_expense">Edit expense</string>
+
+    <string name="importing_records">Importing records…</string>
+    <string name="making_backup">Making backup…</string>
+    <string name="restoring_backup">Restoring backup…</string>
+    <string name="fetching_backups">Fetching backups…</string>
     <!-- Not translated strings -->
 </resources>