From 975c0f3bd2e88299e9a50a7b073655d21d0ca8c6 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 27 Dec 2018 12:31:02 +0000
Subject: [PATCH] Show spinners only after 0.5 seconds

---
 .../eu/faircode/email/AdapterMessage.java     |  7 ++--
 .../email/ContentLoadingProgressBar.java      | 35 +++++++++++++++++++
 .../eu/faircode/email/FragmentAccount.java    |  7 ++--
 .../eu/faircode/email/FragmentAccounts.java   |  3 +-
 .../eu/faircode/email/FragmentAnswer.java     |  3 +-
 .../eu/faircode/email/FragmentAnswers.java    |  3 +-
 .../eu/faircode/email/FragmentCompose.java    |  3 +-
 .../eu/faircode/email/FragmentFolder.java     |  5 ++-
 .../eu/faircode/email/FragmentFolders.java    |  3 +-
 .../eu/faircode/email/FragmentIdentities.java |  3 +-
 .../eu/faircode/email/FragmentIdentity.java   |  5 ++-
 .../java/eu/faircode/email/FragmentLogs.java  |  3 +-
 .../eu/faircode/email/FragmentMessages.java   |  3 +-
 .../eu/faircode/email/FragmentOperations.java |  3 +-
 app/src/main/res/layout/fragment_account.xml  |  6 ++--
 app/src/main/res/layout/fragment_accounts.xml |  2 +-
 app/src/main/res/layout/fragment_answer.xml   |  2 +-
 app/src/main/res/layout/fragment_answers.xml  |  2 +-
 app/src/main/res/layout/fragment_compose.xml  |  2 +-
 app/src/main/res/layout/fragment_folder.xml   |  4 +--
 app/src/main/res/layout/fragment_folders.xml  |  2 +-
 .../main/res/layout/fragment_identities.xml   |  2 +-
 app/src/main/res/layout/fragment_identity.xml |  4 +--
 app/src/main/res/layout/fragment_logs.xml     |  2 +-
 app/src/main/res/layout/fragment_messages.xml |  2 +-
 .../main/res/layout/fragment_operations.xml   |  2 +-
 .../main/res/layout/item_message_compact.xml  |  6 ++--
 .../main/res/layout/item_message_normal.xml   |  6 ++--
 28 files changed, 76 insertions(+), 54 deletions(-)
 create mode 100644 app/src/main/java/eu/faircode/email/ContentLoadingProgressBar.java

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index b558cf8d51..55f52ab0cb 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -62,7 +62,6 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.ImageView;
-import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import com.google.android.material.bottomnavigation.BottomNavigationView;
@@ -160,7 +159,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         private ImageView ivThread;
         private TextView tvPreview;
         private TextView tvError;
-        private ProgressBar pbLoading;
+        private ContentLoadingProgressBar pbLoading;
 
         private ImageView ivExpanderAddress;
         private TextView tvFromEx;
@@ -175,7 +174,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         private TextView tvKeywords;
 
         private TextView tvHeaders;
-        private ProgressBar pbHeaders;
+        private ContentLoadingProgressBar pbHeaders;
         private TextView tvNoInternetHeaders;
 
         private RecyclerView rvAttachment;
@@ -187,7 +186,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         private ImageButton ibQuotes;
         private ImageButton ibImages;
         private TextView tvBody;
-        private ProgressBar pbBody;
+        private ContentLoadingProgressBar pbBody;
         private TextView tvNoInternetBody;
 
         private Group grpAddress;
diff --git a/app/src/main/java/eu/faircode/email/ContentLoadingProgressBar.java b/app/src/main/java/eu/faircode/email/ContentLoadingProgressBar.java
new file mode 100644
index 0000000000..33c6028b3f
--- /dev/null
+++ b/app/src/main/java/eu/faircode/email/ContentLoadingProgressBar.java
@@ -0,0 +1,35 @@
+package eu.faircode.email;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.ProgressBar;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+public class ContentLoadingProgressBar extends ProgressBar {
+    public ContentLoadingProgressBar(@NonNull Context context) {
+        this(context, null);
+    }
+
+    public ContentLoadingProgressBar(@NonNull Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs, 0);
+    }
+
+    @Override
+    public void setVisibility(int visibility) {
+        removeCallbacks(delayedShow);
+        if (visibility == VISIBLE) {
+            super.setVisibility(INVISIBLE);
+            postDelayed(delayedShow, 500);
+        } else
+            super.setVisibility(visibility);
+    }
+
+    private final Runnable delayedShow = new Runnable() {
+        @Override
+        public void run() {
+            ContentLoadingProgressBar.super.setVisibility(VISIBLE);
+        }
+    };
+}
diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java
index 137fbb18f6..deaf5e6324 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccount.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java
@@ -51,7 +51,6 @@ import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.ImageView;
-import android.widget.ProgressBar;
 import android.widget.ScrollView;
 import android.widget.Spinner;
 import android.widget.TextView;
@@ -117,7 +116,7 @@ public class FragmentAccount extends FragmentEx {
     private EditText etPrefix;
 
     private Button btnCheck;
-    private ProgressBar pbCheck;
+    private ContentLoadingProgressBar pbCheck;
     private TextView tvIdle;
 
     private ArrayAdapter<EntityFolder> adapter;
@@ -128,8 +127,8 @@ public class FragmentAccount extends FragmentEx {
     private Spinner spJunk;
 
     private Button btnSave;
-    private ProgressBar pbSave;
-    private ProgressBar pbWait;
+    private ContentLoadingProgressBar pbSave;
+    private ContentLoadingProgressBar pbWait;
 
     private Group grpServer;
     private Group grpAuthorize;
diff --git a/app/src/main/java/eu/faircode/email/FragmentAccounts.java b/app/src/main/java/eu/faircode/email/FragmentAccounts.java
index 855e9a2087..ac0a9b1a75 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccounts.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccounts.java
@@ -25,7 +25,6 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ProgressBar;
 
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
@@ -42,7 +41,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 public class FragmentAccounts extends FragmentEx {
     private RecyclerView rvAccount;
-    private ProgressBar pbWait;
+    private ContentLoadingProgressBar pbWait;
     private Group grpReady;
     private FloatingActionButton fab;
     private ObjectAnimator animator;
diff --git a/app/src/main/java/eu/faircode/email/FragmentAnswer.java b/app/src/main/java/eu/faircode/email/FragmentAnswer.java
index a556700e99..6df5a72bce 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAnswer.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAnswer.java
@@ -28,7 +28,6 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.EditText;
-import android.widget.ProgressBar;
 
 import com.google.android.material.bottomnavigation.BottomNavigationView;
 
@@ -42,7 +41,7 @@ public class FragmentAnswer extends FragmentEx {
     private EditText etName;
     private EditText etText;
     private BottomNavigationView bottom_navigation;
-    private ProgressBar pbWait;
+    private ContentLoadingProgressBar pbWait;
     private Group grpReady;
 
     private long id = -1;
diff --git a/app/src/main/java/eu/faircode/email/FragmentAnswers.java b/app/src/main/java/eu/faircode/email/FragmentAnswers.java
index c6761b872b..05fed7064d 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAnswers.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAnswers.java
@@ -23,7 +23,6 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ProgressBar;
 
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
@@ -39,7 +38,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 public class FragmentAnswers extends FragmentEx {
     private RecyclerView rvAnswer;
-    private ProgressBar pbWait;
+    private ContentLoadingProgressBar pbWait;
     private Group grpReady;
     private FloatingActionButton fab;
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index d0cce4c1da..8829d6d570 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -64,7 +64,6 @@ import android.widget.EditText;
 import android.widget.FilterQueryProvider;
 import android.widget.ImageView;
 import android.widget.MultiAutoCompleteTextView;
-import android.widget.ProgressBar;
 import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -138,7 +137,7 @@ public class FragmentCompose extends FragmentEx {
     private TextView tvReference;
     private BottomNavigationView edit_bar;
     private BottomNavigationView bottom_navigation;
-    private ProgressBar pbWait;
+    private ContentLoadingProgressBar pbWait;
     private Group grpHeader;
     private Group grpExtra;
     private Group grpAddresses;
diff --git a/app/src/main/java/eu/faircode/email/FragmentFolder.java b/app/src/main/java/eu/faircode/email/FragmentFolder.java
index c3994fe2b5..d9fc978ff5 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolder.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolder.java
@@ -34,7 +34,6 @@ import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.EditText;
-import android.widget.ProgressBar;
 
 import com.google.android.material.snackbar.Snackbar;
 
@@ -57,8 +56,8 @@ public class FragmentFolder extends FragmentEx {
     private EditText etKeepDays;
     private CheckBox cbKeepAll;
     private Button btnSave;
-    private ProgressBar pbSave;
-    private ProgressBar pbWait;
+    private ContentLoadingProgressBar pbSave;
+    private ContentLoadingProgressBar pbWait;
 
     private long id = -1;
     private long account = -1;
diff --git a/app/src/main/java/eu/faircode/email/FragmentFolders.java b/app/src/main/java/eu/faircode/email/FragmentFolders.java
index bc41e4161f..d79742b252 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolders.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolders.java
@@ -27,7 +27,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CompoundButton;
 import android.widget.ImageButton;
-import android.widget.ProgressBar;
 import android.widget.ToggleButton;
 
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
@@ -46,7 +45,7 @@ public class FragmentFolders extends FragmentEx {
     private ImageButton ibHintActions;
     private ToggleButton tbShowHidden;
     private RecyclerView rvFolder;
-    private ProgressBar pbWait;
+    private ContentLoadingProgressBar pbWait;
     private Group grpHintActions;
     private Group grpReady;
     private FloatingActionButton fab;
diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentities.java b/app/src/main/java/eu/faircode/email/FragmentIdentities.java
index 95ef6b4a88..6680f2f55e 100644
--- a/app/src/main/java/eu/faircode/email/FragmentIdentities.java
+++ b/app/src/main/java/eu/faircode/email/FragmentIdentities.java
@@ -25,7 +25,6 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ProgressBar;
 
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
@@ -42,7 +41,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 public class FragmentIdentities extends FragmentEx {
     private RecyclerView rvIdentity;
-    private ProgressBar pbWait;
+    private ContentLoadingProgressBar pbWait;
     private Group grpReady;
     private FloatingActionButton fab;
     private ObjectAnimator animator;
diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
index cb0f8a9525..1443e5d7e1 100644
--- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java
+++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
@@ -44,7 +44,6 @@ import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.ImageView;
-import android.widget.ProgressBar;
 import android.widget.ScrollView;
 import android.widget.Spinner;
 import android.widget.TextView;
@@ -110,8 +109,8 @@ public class FragmentIdentity extends FragmentEx {
     private Spinner spSent;
 
     private Button btnSave;
-    private ProgressBar pbSave;
-    private ProgressBar pbWait;
+    private ContentLoadingProgressBar pbSave;
+    private ContentLoadingProgressBar pbWait;
 
     private Group grpAuthorize;
     private Group grpAdvanced;
diff --git a/app/src/main/java/eu/faircode/email/FragmentLogs.java b/app/src/main/java/eu/faircode/email/FragmentLogs.java
index 1b51271b82..099e68e31b 100644
--- a/app/src/main/java/eu/faircode/email/FragmentLogs.java
+++ b/app/src/main/java/eu/faircode/email/FragmentLogs.java
@@ -26,7 +26,6 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ProgressBar;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -41,7 +40,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 public class FragmentLogs extends FragmentEx {
     private RecyclerView rvLog;
-    private ProgressBar pbWait;
+    private ContentLoadingProgressBar pbWait;
     private Group grpReady;
 
     private boolean autoScroll = true;
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 1631e45e99..5b4cd69dc0 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -42,7 +42,6 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageButton;
-import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import com.google.android.material.bottomnavigation.BottomNavigationView;
@@ -90,7 +89,7 @@ public class FragmentMessages extends FragmentEx {
     private TextView tvNoEmail;
     private RecyclerView rvMessage;
     private BottomNavigationView bottom_navigation;
-    private ProgressBar pbWait;
+    private ContentLoadingProgressBar pbWait;
     private Group grpSupport;
     private Group grpHintSupport;
     private Group grpHintSwipe;
diff --git a/app/src/main/java/eu/faircode/email/FragmentOperations.java b/app/src/main/java/eu/faircode/email/FragmentOperations.java
index 466c7e59b1..c4305f719d 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOperations.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOperations.java
@@ -31,7 +31,6 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ProgressBar;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -45,7 +44,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 public class FragmentOperations extends FragmentEx {
     private RecyclerView rvOperation;
-    private ProgressBar pbWait;
+    private ContentLoadingProgressBar pbWait;
     private Group grpReady;
 
     private AdapterOperation adapter;
diff --git a/app/src/main/res/layout/fragment_account.xml b/app/src/main/res/layout/fragment_account.xml
index 73071a3fc8..49253790e3 100644
--- a/app/src/main/res/layout/fragment_account.xml
+++ b/app/src/main/res/layout/fragment_account.xml
@@ -399,7 +399,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/etPrefix" />
 
-        <ProgressBar
+        <eu.faircode.email.ContentLoadingProgressBar
             android:id="@+id/pbCheck"
             style="@style/Base.Widget.AppCompat.ProgressBar"
             android:layout_width="24dp"
@@ -541,7 +541,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/spJunk" />
 
-        <ProgressBar
+        <eu.faircode.email.ContentLoadingProgressBar
             android:id="@+id/pbSave"
             style="@style/Base.Widget.AppCompat.ProgressBar"
             android:layout_width="24dp"
@@ -552,7 +552,7 @@
             app:layout_constraintStart_toEndOf="@id/btnSave"
             app:layout_constraintTop_toTopOf="@id/btnSave" />
 
-        <ProgressBar
+        <eu.faircode.email.ContentLoadingProgressBar
             android:id="@+id/pbWait"
             style="@style/Base.Widget.AppCompat.ProgressBar"
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/fragment_accounts.xml b/app/src/main/res/layout/fragment_accounts.xml
index 811275bbbc..ea3f997cf7 100644
--- a/app/src/main/res/layout/fragment_accounts.xml
+++ b/app/src/main/res/layout/fragment_accounts.xml
@@ -17,7 +17,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <ProgressBar
+    <eu.faircode.email.ContentLoadingProgressBar
         android:id="@+id/pbWait"
         style="@style/Base.Widget.AppCompat.ProgressBar"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/fragment_answer.xml b/app/src/main/res/layout/fragment_answer.xml
index 0dec482173..bdedeb0ae6 100644
--- a/app/src/main/res/layout/fragment_answer.xml
+++ b/app/src/main/res/layout/fragment_answer.xml
@@ -87,7 +87,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:menu="@menu/action_answer" />
 
-    <ProgressBar
+    <eu.faircode.email.ContentLoadingProgressBar
         android:id="@+id/pbWait"
         style="@style/Base.Widget.AppCompat.ProgressBar"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/fragment_answers.xml b/app/src/main/res/layout/fragment_answers.xml
index bbd3732864..943614344a 100644
--- a/app/src/main/res/layout/fragment_answers.xml
+++ b/app/src/main/res/layout/fragment_answers.xml
@@ -17,7 +17,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <ProgressBar
+    <eu.faircode.email.ContentLoadingProgressBar
         android:id="@+id/pbWait"
         style="@style/Base.Widget.AppCompat.ProgressBar"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/fragment_compose.xml b/app/src/main/res/layout/fragment_compose.xml
index 46354f7596..1690e1602f 100644
--- a/app/src/main/res/layout/fragment_compose.xml
+++ b/app/src/main/res/layout/fragment_compose.xml
@@ -327,7 +327,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:menu="@menu/action_compose" />
 
-    <ProgressBar
+    <eu.faircode.email.ContentLoadingProgressBar
         android:id="@+id/pbWait"
         style="@style/Base.Widget.AppCompat.ProgressBar"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/fragment_folder.xml b/app/src/main/res/layout/fragment_folder.xml
index 3648df1747..41edb244f5 100644
--- a/app/src/main/res/layout/fragment_folder.xml
+++ b/app/src/main/res/layout/fragment_folder.xml
@@ -178,7 +178,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbKeepAll" />
 
-        <ProgressBar
+        <eu.faircode.email.ContentLoadingProgressBar
             android:id="@+id/pbSave"
             style="@style/Base.Widget.AppCompat.ProgressBar"
             android:layout_width="24dp"
@@ -189,7 +189,7 @@
             app:layout_constraintStart_toEndOf="@id/btnSave"
             app:layout_constraintTop_toTopOf="@id/btnSave" />
 
-        <ProgressBar
+        <eu.faircode.email.ContentLoadingProgressBar
             android:id="@+id/pbWait"
             style="@style/Base.Widget.AppCompat.ProgressBar"
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/fragment_folders.xml b/app/src/main/res/layout/fragment_folders.xml
index 38b0c08e7c..228125fbf0 100644
--- a/app/src/main/res/layout/fragment_folders.xml
+++ b/app/src/main/res/layout/fragment_folders.xml
@@ -69,7 +69,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tbShowHidden" />
 
-        <ProgressBar
+        <eu.faircode.email.ContentLoadingProgressBar
             android:id="@+id/pbWait"
             style="@style/Base.Widget.AppCompat.ProgressBar"
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/fragment_identities.xml b/app/src/main/res/layout/fragment_identities.xml
index 3efd729ccf..94db76c16f 100644
--- a/app/src/main/res/layout/fragment_identities.xml
+++ b/app/src/main/res/layout/fragment_identities.xml
@@ -17,7 +17,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <ProgressBar
+    <eu.faircode.email.ContentLoadingProgressBar
         android:id="@+id/pbWait"
         style="@style/Base.Widget.AppCompat.ProgressBar"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/fragment_identity.xml b/app/src/main/res/layout/fragment_identity.xml
index b1fcf39a96..90d7434db5 100644
--- a/app/src/main/res/layout/fragment_identity.xml
+++ b/app/src/main/res/layout/fragment_identity.xml
@@ -478,7 +478,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvSentHint" />
 
-        <ProgressBar
+        <eu.faircode.email.ContentLoadingProgressBar
             android:id="@+id/pbSave"
             style="@style/Base.Widget.AppCompat.ProgressBar"
             android:layout_width="24dp"
@@ -489,7 +489,7 @@
             app:layout_constraintStart_toEndOf="@id/btnSave"
             app:layout_constraintTop_toTopOf="@id/btnSave" />
 
-        <ProgressBar
+        <eu.faircode.email.ContentLoadingProgressBar
             android:id="@+id/pbWait"
             style="@style/Base.Widget.AppCompat.ProgressBar"
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/fragment_logs.xml b/app/src/main/res/layout/fragment_logs.xml
index c794a653f0..f35e39c724 100644
--- a/app/src/main/res/layout/fragment_logs.xml
+++ b/app/src/main/res/layout/fragment_logs.xml
@@ -17,7 +17,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <ProgressBar
+    <eu.faircode.email.ContentLoadingProgressBar
         android:id="@+id/pbWait"
         style="@style/Base.Widget.AppCompat.ProgressBar"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/fragment_messages.xml b/app/src/main/res/layout/fragment_messages.xml
index 47edc9901a..d251b89ba4 100644
--- a/app/src/main/res/layout/fragment_messages.xml
+++ b/app/src/main/res/layout/fragment_messages.xml
@@ -189,7 +189,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/vSeparatorHintCompact" />
 
-            <ProgressBar
+            <eu.faircode.email.ContentLoadingProgressBar
                 android:id="@+id/pbWait"
                 style="@style/Base.Widget.AppCompat.ProgressBar"
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/fragment_operations.xml b/app/src/main/res/layout/fragment_operations.xml
index 86d4d5fa0a..c3a8c1d605 100644
--- a/app/src/main/res/layout/fragment_operations.xml
+++ b/app/src/main/res/layout/fragment_operations.xml
@@ -17,7 +17,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <ProgressBar
+    <eu.faircode.email.ContentLoadingProgressBar
         android:id="@+id/pbWait"
         style="@style/Base.Widget.AppCompat.ProgressBar"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/item_message_compact.xml b/app/src/main/res/layout/item_message_compact.xml
index e62029996b..7a01a3e493 100644
--- a/app/src/main/res/layout/item_message_compact.xml
+++ b/app/src/main/res/layout/item_message_compact.xml
@@ -246,7 +246,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvError" />
 
-        <ProgressBar
+        <eu.faircode.email.ContentLoadingProgressBar
             android:id="@+id/pbLoading"
             style="@style/Base.Widget.AppCompat.ProgressBar"
             android:layout_width="24dp"
@@ -502,7 +502,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/vSeparatorHeaders" />
 
-        <ProgressBar
+        <eu.faircode.email.ContentLoadingProgressBar
             android:id="@+id/pbHeaders"
             style="@style/Base.Widget.AppCompat.ProgressBar"
             android:layout_width="24dp"
@@ -627,7 +627,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/barrier_body" />
 
-        <ProgressBar
+        <eu.faircode.email.ContentLoadingProgressBar
             android:id="@+id/pbBody"
             style="@style/Base.Widget.AppCompat.ProgressBar"
             android:layout_width="24dp"
diff --git a/app/src/main/res/layout/item_message_normal.xml b/app/src/main/res/layout/item_message_normal.xml
index 5c89bf8783..42b2b8e0d2 100644
--- a/app/src/main/res/layout/item_message_normal.xml
+++ b/app/src/main/res/layout/item_message_normal.xml
@@ -243,7 +243,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvError" />
 
-        <ProgressBar
+        <eu.faircode.email.ContentLoadingProgressBar
             android:id="@+id/pbLoading"
             style="@style/Base.Widget.AppCompat.ProgressBar"
             android:layout_width="24dp"
@@ -499,7 +499,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/vSeparatorHeaders" />
 
-        <ProgressBar
+        <eu.faircode.email.ContentLoadingProgressBar
             android:id="@+id/pbHeaders"
             style="@style/Base.Widget.AppCompat.ProgressBar"
             android:layout_width="24dp"
@@ -624,7 +624,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/barrier_body" />
 
-        <ProgressBar
+        <eu.faircode.email.ContentLoadingProgressBar
             android:id="@+id/pbBody"
             style="@style/Base.Widget.AppCompat.ProgressBar"
             android:layout_width="24dp"