From bf07a65ee931416a5f5f5ab105e077ac4f7a578e Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 8 Sep 2023 08:45:28 +0200
Subject: [PATCH] Added progress bar to importing dialog

---
 .../eu/faircode/email/FragmentOptionsBackup.java    |  8 ++++++++
 app/src/main/res/layout/dialog_import_progress.xml  | 13 ++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsBackup.java b/app/src/main/java/eu/faircode/email/FragmentOptionsBackup.java
index f0be845a67..8c70f90a89 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsBackup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsBackup.java
@@ -49,6 +49,7 @@ import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.ImageButton;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -651,6 +652,7 @@ public class FragmentOptionsBackup extends FragmentBase implements SharedPrefere
         final int colorWarning = Helper.resolveColor(context, R.attr.colorWarning);
 
         View dview = LayoutInflater.from(context).inflate(R.layout.dialog_import_progress, null);
+        ProgressBar pbWait = dview.findViewById(R.id.pbWait);
         TextView tvLog = dview.findViewById(R.id.tvLog);
         tvLog.setText(null);
 
@@ -697,6 +699,11 @@ public class FragmentOptionsBackup extends FragmentBase implements SharedPrefere
         new SimpleTask<Void>() {
             private SpannableStringBuilder ssb = new SpannableStringBuilderEx();
 
+            @Override
+            protected void onPreExecute(Bundle args) {
+                pbWait.setVisibility(View.VISIBLE);
+            }
+
             @Override
             protected void onProgress(CharSequence status, Bundle data) {
                 ssb.append(status).append("\n");
@@ -705,6 +712,7 @@ public class FragmentOptionsBackup extends FragmentBase implements SharedPrefere
 
             @Override
             protected void onPostExecute(Bundle args) {
+                pbWait.setVisibility(View.GONE);
                 ok.setEnabled(true);
             }
 
diff --git a/app/src/main/res/layout/dialog_import_progress.xml b/app/src/main/res/layout/dialog_import_progress.xml
index 9556ccacc8..3fc1adab17 100644
--- a/app/src/main/res/layout/dialog_import_progress.xml
+++ b/app/src/main/res/layout/dialog_import_progress.xml
@@ -12,15 +12,26 @@
 
         <TextView
             android:id="@+id/tvCaption"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="6dp"
             android:drawableStart="@drawable/twotone_unarchive_24"
             android:drawablePadding="6dp"
             android:text="@string/title_setup_import"
             android:textAppearance="@style/TextAppearance.AppCompat.Large"
+            app:layout_constraintEnd_toStartOf="@+id/pbWait"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
+        <eu.faircode.email.ContentLoadingProgressBar
+            android:id="@+id/pbWait"
+            style="@style/Base.Widget.AppCompat.ProgressBar"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:indeterminate="true"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
         <TextView
             android:id="@+id/tvLog"
             android:layout_width="0dp"