New color, white for light theme and grey for dark theme. New progressbar

Signed-off-by: Joris Bodin <joris.bodin@infomaniak.com>

src/main/java/com/nextcloud/client/errorhandling/ShowErrorActivity.kt

@@ -44,7 +44,7 @@ class ShowErrorActivity : AppCompatActivity() {
 
         text_view_error.text = intent.getStringExtra(EXTRA_ERROR_TEXT)
 
-        setSupportActionBar(toolbar)
+        setSupportActionBar(default_toolbar)
         supportActionBar!!.title = createErrorTitle()
 
         val snackbar = DisplayUtils.createSnackbar(

src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java

@@ -779,7 +779,7 @@ public abstract class DrawerActivity extends ToolbarActivity
             } else {
                 mDrawerToggle.setDrawerIndicatorEnabled(false);
                 Drawable upArrow = getResources().getDrawable(R.drawable.ic_arrow_back);
-                upArrow.setColorFilter(ThemeUtils.fontColor(this), PorterDuff.Mode.SRC_ATOP);
+                upArrow.setColorFilter(ThemeUtils.fontAppbarColor(this), PorterDuff.Mode.SRC_ATOP);
                 mDrawerToggle.setHomeAsUpIndicator(upArrow);
             }
         } else if (mDrawerToggle != null) {

src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -328,7 +328,7 @@ public class FileDisplayActivity extends FileActivity
             syncAndUpdateFolder(true);
         }
 
-        setIndeterminate(mSyncInProgress);
+        showProgressBar(mSyncInProgress);
         // always AFTER setContentView(...) in onCreate(); to work around bug in its implementation
 
         upgradeNotificationForInstantUpload();
@@ -1394,7 +1394,7 @@ public class FileDisplayActivity extends FileActivity
                         DataHolderUtil.getInstance().delete(intent.getStringExtra(FileSyncAdapter.EXTRA_RESULT));
 
                         Log_OC.d(TAG, "Setting progress visibility to " + mSyncInProgress);
-                        setIndeterminate(mSyncInProgress);
+                        showProgressBar(mSyncInProgress);
 
                         setBackgroundText();
                     }
@@ -1513,7 +1513,7 @@ public class FileDisplayActivity extends FileActivity
                     }
                 }
 
-                setIndeterminate(false);
+                showProgressBar(false);
 
             } finally {
                 if (intent != null) {
@@ -2227,7 +2227,7 @@ public class FileDisplayActivity extends FileActivity
                                         null
                                 );
 
-                                setIndeterminate(true);
+                                showProgressBar(true);//okkk
 
                                 setBackgroundText();
 

src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.java

@@ -152,7 +152,7 @@ public class FolderPickerActivity extends FileActivity implements FileFragment.C
             ThemeUtils.setColoredTitle(getSupportActionBar(), caption, this);
         }
 
-        setIndeterminate(mSyncInProgress);
+        showProgressBar(mSyncInProgress);
         // always AFTER setContentView(...) ; to work around bug in its implementation
 
         // sets message for empty list of folders
@@ -263,7 +263,7 @@ public class FolderPickerActivity extends FileActivity implements FileFragment.C
                                                                             getApplicationContext());
 
         refreshFolderOperation.execute(getAccount(), this, null, null);
-        setIndeterminate(true);
+        showProgressBar(true);
         setBackgroundText();
     }
 
@@ -404,7 +404,7 @@ public class FolderPickerActivity extends FileActivity implements FileFragment.C
 
             Drawable backArrow = getResources().getDrawable(R.drawable.ic_arrow_back);
 
-            actionBar.setHomeAsUpIndicator(ThemeUtils.tintDrawable(backArrow, ThemeUtils.fontColor(this)));
+            actionBar.setHomeAsUpIndicator(ThemeUtils.tintDrawable(backArrow, ThemeUtils.fontAppbarColor(this)));
 
             ThemeUtils.setColoredTitle(getSupportActionBar(), atRoot ? caption : currentDir.getFileName(), this);
         }
@@ -550,7 +550,7 @@ public class FolderPickerActivity extends FileActivity implements FileFragment.C
                     DataHolderUtil.getInstance().delete(intent.getStringExtra(FileSyncAdapter.EXTRA_RESULT));
                     Log_OC.d(TAG, "Setting progress visibility to " + mSyncInProgress);
 
-                    setIndeterminate(mSyncInProgress);
+                    showProgressBar(mSyncInProgress);
 
                     setBackgroundText();
                 }

src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java

@@ -780,14 +780,12 @@ public class ReceiveExternalFilesActivity extends FileActivity
                         ThemeUtils.primaryColor(getAccount(), false, this)));
             }
 
-            ThemeUtils.colorStatusBar(this, ThemeUtils.primaryColor(getAccount(), false, this));
-
-            ThemeUtils.colorToolbarProgressBar(this, ThemeUtils.primaryColor(getAccount(), false, this));
+            ThemeUtils.colorStatusBar(this);
 
             Drawable backArrow = getResources().getDrawable(R.drawable.ic_arrow_back);
 
             if (actionBar != null) {
-                actionBar.setHomeAsUpIndicator(ThemeUtils.tintDrawable(backArrow, ThemeUtils.fontColor(this)));
+                actionBar.setHomeAsUpIndicator(ThemeUtils.tintDrawable(backArrow, ThemeUtils.fontAppbarColor(this)));
             }
 
             Button btnNewFolder = findViewById(R.id.uploader_cancel);

src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java

@@ -751,8 +751,7 @@ public class SettingsActivity extends ThemedPreferenceActivity
             actionBar.setBackgroundDrawable(new ColorDrawable(ThemeUtils.primaryColor(this)));
 
             Drawable backArrow = getResources().getDrawable(R.drawable.ic_arrow_back);
-            actionBar.setHomeAsUpIndicator(ThemeUtils.tintDrawable(backArrow, ThemeUtils.fontColor(this,
-                                                                                                   !ThemeUtils.darkTheme(this))));
+            actionBar.setHomeAsUpIndicator(ThemeUtils.tintDrawable(backArrow, ThemeUtils.fontAppbarColor(this)));
         }
 
         Window window = getWindow();

src/main/java/com/owncloud/android/ui/activity/ToolbarActivity.java

@@ -38,11 +38,9 @@ import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.utils.ThemeUtils;
 
-import androidx.annotation.ColorInt;
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.widget.Toolbar;
-import androidx.core.content.ContextCompat;
 
 /**
  * Base class providing toolbar registration functionality, see {@link #setupToolbar()}.
@@ -64,26 +62,22 @@ public abstract class ToolbarActivity extends BaseActivity {
      * want to use the toolbar.
      */
     protected void setupToolbar(boolean useBackgroundImage) {
-        int primaryColor = ThemeUtils.primaryColor(this, false);
-        int fontColor = ThemeUtils.fontColor(this, !ThemeUtils.darkTheme(getApplicationContext()));
+        int primaryColor = ThemeUtils.primaryAppbarColor(this);
+        int fontColor = ThemeUtils.fontAppbarColor(this);
 
-        Toolbar toolbar = findViewById(R.id.toolbar);
+        Toolbar toolbar = findViewById(R.id.default_toolbar);
         setSupportActionBar(toolbar);
 
-        mProgressBar = findViewById(R.id.progressBar);
-        if (mProgressBar != null) {
-            mProgressBar.setIndeterminateDrawable(
-                    ContextCompat.getDrawable(this, R.drawable.actionbar_progress_indeterminate_horizontal));
+        mProgressBar = findViewById(R.id.toolbar_progressBar);
+        setProgressBarBackgroundColor();
 
-            ThemeUtils.colorToolbarProgressBar(this, primaryColor);
-        }
         mInfoBox = findViewById(R.id.info_box);
         mInfoBoxMessage = findViewById(R.id.info_box_message);
 
         mPreviewImage = findViewById(R.id.preview_image);
         mPreviewImageContainer = findViewById(R.id.preview_image_frame);
 
-        ThemeUtils.colorStatusBar(this, primaryColor);
+        ThemeUtils.colorStatusBar(this);
 
         if (toolbar.getOverflowIcon() != null) {
             ThemeUtils.tintDrawable(toolbar.getOverflowIcon(), fontColor);
@@ -166,25 +160,14 @@ public abstract class ToolbarActivity extends BaseActivity {
         mInfoBox.setVisibility(View.GONE);
     }
 
-    /**
-     * Change the indeterminate mode for the toolbar's progress bar.
-     *
-     * @param indeterminate <code>true</code> to enable the indeterminate mode
-     */
-    public void setIndeterminate(boolean indeterminate) {
-        if (mProgressBar != null) {
-            mProgressBar.setIndeterminate(indeterminate);
-        }
-    }
-
     /**
      * Change the visibility for the toolbar's progress bar.
      *
-     * @param visibility visibility of the progress bar
+     * @param isVisibility visibility of the progress bar
      */
-    public void setProgressBarVisibility(int visibility) {
+    public void showProgressBar(boolean isVisibility) {
         if (mProgressBar != null) {
-            mProgressBar.setVisibility(visibility);
+            mProgressBar.setVisibility(isVisibility? View.VISIBLE : View.GONE);
         }
     }
 
@@ -232,10 +215,11 @@ public abstract class ToolbarActivity extends BaseActivity {
      * Set the background to to progress bar of the toolbar. The resource should refer to
      * a Drawable object or 0 to remove the background.#
      *
-     * @param color The identifier of the color.
      */
-    public void setProgressBarBackgroundColor(@ColorInt int color) {
-        mProgressBar.setBackgroundColor(color);
-        mProgressBar.getProgressDrawable().setColorFilter(color, PorterDuff.Mode.SRC_IN);
+    private void setProgressBarBackgroundColor() {
+        if (mProgressBar != null) {
+            mProgressBar.setBackgroundColor(ThemeUtils.primaryAppbarColor(this));
+            mProgressBar.getIndeterminateDrawable().setColorFilter(ThemeUtils.primaryColor(this), PorterDuff.Mode.SRC_IN);
+        }
     }
 }

src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.java

@@ -213,7 +213,7 @@ public class UploadFilesActivity extends FileActivity implements
             actionBar.setListNavigationCallbacks(mDirectories, this);
 
             Drawable backArrow = getResources().getDrawable(R.drawable.ic_arrow_back);
-            actionBar.setHomeAsUpIndicator(ThemeUtils.tintDrawable(backArrow, ThemeUtils.fontColor(this)));
+            actionBar.setHomeAsUpIndicator(ThemeUtils.tintDrawable(backArrow, ThemeUtils.fontAppbarColor(this)));
         }
 
         // wait dialog

src/main/java/com/owncloud/android/ui/asynctasks/PhotoSearchTask.java

@@ -119,7 +119,7 @@ public class PhotoSearchTask extends AsyncTask<Void, Void, RemoteOperationResult
             final ToolbarActivity fileDisplayActivity = (ToolbarActivity) photoFragment.getActivity();
 
             if (fileDisplayActivity != null) {
-                fileDisplayActivity.setIndeterminate(false);
+                fileDisplayActivity.showProgressBar(false);
             }
 
             if (!result.isSuccess() && !isCancelled()) {

src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java

@@ -268,17 +268,7 @@ public class ExtendedListFragment extends Fragment implements
             }
         });
 
-        int fontColor = ThemeUtils.fontColor(getContext());
-
         LinearLayout searchBar = searchView.findViewById(R.id.search_bar);
-        TextView searchBadge = searchView.findViewById(R.id.search_badge);
-
-        searchBadge.setTextColor(fontColor);
-        searchBadge.setHintTextColor(fontColor);
-
-        ImageView searchButton = searchView.findViewById(R.id.search_button);
-        searchButton.setImageDrawable(ThemeUtils.tintDrawable(R.drawable.ic_search, fontColor));
-
         searchBar.setLayoutTransition(new LayoutTransition());
     }
 

src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java

@@ -241,7 +241,7 @@ public class FileDetailFragment extends FileFragment implements OnClickListener,
     private void activatePreviewImage() {
         if (activity != null) {
             activity.setPreviewImageVisibility(View.VISIBLE);
-            activity.setProgressBarVisibility(View.GONE);
+            activity.showProgressBar(false);
             ThemeUtils.setStatusBarColor(activity, activity.getResources().getColor(R.color.background_color_inverse));
             if (activity.getSupportActionBar() != null) {
                 activity.getSupportActionBar().setTitle(null);
@@ -376,9 +376,9 @@ public class FileDetailFragment extends FileFragment implements OnClickListener,
         leaveTransferProgress();
 
         if(activity != null) {
-            activity.setPreviewImageVisibility(View.GONE);
-            activity.setProgressBarVisibility(View.VISIBLE);
             activity.setupToolbar();
+            activity.setPreviewImageVisibility(View.GONE);
+            activity.showProgressBar(true);
         }
 
         super.onStop();

src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -181,8 +181,6 @@ public class OCFileListFragment extends ExtendedListFragment implements
 
     protected int mSystemBarActionModeColor;
     protected int mSystemBarColor;
-    protected int mProgressBarActionModeColor;
-    protected int mProgressBarColor;
 
     protected boolean mHideFab = true;
     protected ActionMode mActiveActionMode;
@@ -211,8 +209,6 @@ public class OCFileListFragment extends ExtendedListFragment implements
         setHasOptionsMenu(true);
         mSystemBarActionModeColor = getResources().getColor(R.color.action_mode_status_bar_background);
         mSystemBarColor = ThemeUtils.primaryColor(getContext());
-        mProgressBarActionModeColor = getResources().getColor(R.color.action_mode_background);
-        mProgressBarColor = ThemeUtils.primaryColor(getContext());
         mMultiChoiceModeListener = new MultiChoiceModeListener();
 
         if (savedInstanceState != null) {
@@ -635,7 +631,6 @@ public class OCFileListFragment extends ExtendedListFragment implements
 
             //set gray color
             ThemeUtils.colorStatusBar(getActivity(), mSystemBarActionModeColor);
-            ThemeUtils.colorToolbarProgressBar(getActivity(), mProgressBarActionModeColor);
 
             // hide FAB in multi selection mode
             setFabVisible(false);
@@ -690,8 +685,7 @@ public class OCFileListFragment extends ExtendedListFragment implements
             // reset to previous color
             final FragmentActivity activity = getActivity();
             if (activity != null) {
-                ThemeUtils.colorStatusBar(activity, mSystemBarColor);
-                ThemeUtils.colorToolbarProgressBar(activity, mProgressBarColor);
+                ThemeUtils.colorStatusBar(activity);
             }
 
             // show FAB on multi selection mode exit
@@ -1571,7 +1565,7 @@ public class OCFileListFragment extends ExtendedListFragment implements
                                 @Override
                                 public void run() {
                                     if (fileDisplayActivity != null) {
-                                        fileDisplayActivity.setIndeterminate(false);
+                                        fileDisplayActivity.showProgressBar(false);
                                     }
                                 }
                             });

src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactsBackupFragment.java

@@ -136,7 +136,7 @@ public class ContactsBackupFragment extends FileFragment implements DatePickerDi
             actionBar.setDisplayHomeAsUpEnabled(true);
 
             Drawable backArrow = getResources().getDrawable(R.drawable.ic_arrow_back);
-            actionBar.setHomeAsUpIndicator(ThemeUtils.tintDrawable(backArrow, ThemeUtils.fontColor(getContext())));
+            actionBar.setHomeAsUpIndicator(ThemeUtils.tintDrawable(backArrow, ThemeUtils.fontAppbarColor(getContext())));
         }
 
         arbitraryDataProvider = new ArbitraryDataProvider(getContext().getContentResolver());

src/main/java/com/owncloud/android/ui/trashbin/TrashbinActivity.java

@@ -224,7 +224,8 @@ public class TrashbinActivity extends FileActivity implements
 
             mDrawerToggle.setDrawerIndicatorEnabled(false);
 
-            Toolbar toolbar = findViewById(R.id.toolbar);
+            // TODO remove?
+            Toolbar toolbar = findViewById(R.id.default_toolbar);
             if (toolbar != null && toolbar.getNavigationIcon() != null) {
                 ThemeUtils.tintDrawable(toolbar.getNavigationIcon(), ThemeUtils.fontColor(this));
             }

src/main/java/com/owncloud/android/utils/ThemeUtils.java

@@ -53,7 +53,6 @@ import com.owncloud.android.R;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.status.OCCapability;
-import com.owncloud.android.ui.activity.ToolbarActivity;
 
 import java.lang.reflect.Field;
 
@@ -218,9 +217,8 @@ public final class ThemeUtils {
      * Tests if light color is set
      * @return  true if primaryColor is lighter than MAX_LIGHTNESS
      */
-    public static boolean lightTheme(Context context) {
-        int primaryColor = primaryColor(context);
-        float[] hsl = colorToHSL(primaryColor);
+    public static boolean lightTheme(Context context, int color) {
+        float[] hsl = colorToHSL(color);
 
         return hsl[INDEX_LUMINATION] >= MAX_LIGHTNESS;
     }
@@ -236,6 +234,14 @@ public final class ThemeUtils {
         return hsl[INDEX_LUMINATION] <= 0.55;
     }
 
+    public static int primaryAppbarColor(Context context) {
+        return ContextCompat.getColor(context, R.color.appbar);
+    }
+
+    public static int fontAppbarColor(Context context) {
+        return ContextCompat.getColor(context, R.color.fontAppbar);
+    }
+
     /**
      * Set color of title to white/black depending on background color
      *
@@ -248,7 +254,7 @@ public final class ThemeUtils {
                 actionBar.setTitle(title);
             } else {
                 Spannable text = new SpannableString(title);
-                text.setSpan(new ForegroundColorSpan(fontColor(context, !darkTheme(context))),
+                text.setSpan(new ForegroundColorSpan(fontAppbarColor(context)),
                              0,
                              text.length(),
                              Spannable.SPAN_INCLUSIVE_INCLUSIVE);
@@ -273,7 +279,7 @@ public final class ThemeUtils {
                 actionBar.setSubtitle(title);
             } else {
                 Spannable text = new SpannableString(title);
-                text.setSpan(new ForegroundColorSpan(fontColor(context)),
+                text.setSpan(new ForegroundColorSpan(fontAppbarColor(context)),
                              0,
                              text.length(),
                              Spannable.SPAN_INCLUSIVE_INCLUSIVE);
@@ -294,7 +300,7 @@ public final class ThemeUtils {
         }
 
         Drawable backArrow = context.getResources().getDrawable(R.drawable.ic_arrow_back);
-        supportActionBar.setHomeAsUpIndicator(ThemeUtils.tintDrawable(backArrow, ThemeUtils.fontColor(context)));
+        supportActionBar.setHomeAsUpIndicator(ThemeUtils.tintDrawable(backArrow, ThemeUtils.fontAppbarColor(context)));
     }
 
     public static Spanned getColoredTitle(String title, int color) {
@@ -437,7 +443,7 @@ public final class ThemeUtils {
             window.setStatusBarColor(color);
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                 View decor = window.getDecorView();
-                if (lightTheme(fragmentActivity.getApplicationContext())) {
+                if (lightTheme(fragmentActivity.getApplicationContext(), color)) {
                     decor.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
                 } else {
                     decor.setSystemUiVisibility(0);
@@ -446,16 +452,8 @@ public final class ThemeUtils {
         }
     }
 
-    /**
-     * Sets the color of the progressbar to {@code color} within the given toolbar.
-     *
-     * @param activity         the toolbar activity instance
-     * @param progressBarColor the color to be used for the toolbar's progress bar
-     */
-    public static void colorToolbarProgressBar(FragmentActivity activity, int progressBarColor) {
-        if (activity instanceof ToolbarActivity) {
-            ((ToolbarActivity) activity).setProgressBarBackgroundColor(progressBarColor);
-        }
+    public static void colorStatusBar(FragmentActivity fragmentActivity) {
+        colorStatusBar(fragmentActivity, primaryAppbarColor(fragmentActivity));
     }
 
     /**
@@ -511,6 +509,10 @@ public final class ThemeUtils {
             }
         }
 
+        setEditTextColor(context, editText, color);
+    }
+
+    private static void setEditTextColor(Context context, EditText editText, int color) {
         editText.setTextColor(color);
         editText.setHighlightColor(context.getResources().getColor(R.color.fg_contrast));
         setEditTextCursorColor(editText, color);
@@ -526,9 +528,10 @@ public final class ThemeUtils {
      */
     public static void themeSearchView(SearchView searchView, boolean themedBackground, Context context) {
         // hacky as no default way is provided
-        int fontColor = ThemeUtils.fontColor(context, !darkTheme(context));
+        int fontColor = ThemeUtils.fontAppbarColor(context);
         SearchView.SearchAutoComplete editText = searchView.findViewById(R.id.search_src_text);
-        themeEditText(context, editText, themedBackground);
+        setEditTextColor(context, editText, fontColor);
+        editText.setHintTextColor(fontColor);
 
         ImageView closeButton = searchView.findViewById(androidx.appcompat.R.id.search_close_btn);
         closeButton.setColorFilter(fontColor);

src/main/res/drawable/actionbar_progress_horizontal.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@android:id/background"
-        android:drawable="@color/primary" />
-    <item android:id="@android:id/secondaryProgress">
-        <scale
-            android:drawable="@color/primary"
-            android:scaleWidth="100%" />
-    </item>
-    <item android:id="@android:id/progress">
-        <scale
-            android:drawable="@color/primary"
-            android:scaleWidth="100%" />
-    </item>
-
-</layer-list>

src/main/res/drawable/actionbar_progress_indeterminate_horizontal.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<animation-list
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:oneshot="false">
-    <item android:drawable="@drawable/owncloud_progressbar_indeterminate_1" android:duration="50" />
-    <item android:drawable="@drawable/owncloud_progressbar_indeterminate_2" android:duration="50" />
-    <item android:drawable="@drawable/owncloud_progressbar_indeterminate_3" android:duration="50" />
-    <item android:drawable="@drawable/owncloud_progressbar_indeterminate_4" android:duration="50" />
-    <item android:drawable="@drawable/owncloud_progressbar_indeterminate_5" android:duration="50" />
-    <item android:drawable="@drawable/owncloud_progressbar_indeterminate_6" android:duration="50" />
-    <item android:drawable="@drawable/owncloud_progressbar_indeterminate_7" android:duration="50" />
-    <item android:drawable="@drawable/owncloud_progressbar_indeterminate_8" android:duration="50" />
-</animation-list>

src/main/res/layout/toolbar_standard.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   Nextcloud Android client application
 
   Copyright (C) 2016 Andy Scherzinger
@@ -21,12 +20,12 @@
 -->
 <com.google.android.material.appbar.AppBarLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/appbar"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:viewBindingIgnore="true"
-    android:theme="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar">
+    android:theme="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar"
+    tools:viewBindingIgnore="true">
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -52,24 +51,23 @@
         </FrameLayout>
 
         <androidx.appcompat.widget.Toolbar
-            android:id="@id/toolbar"
+            android:id="@+id/default_toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             app:popupTheme="@style/Theme.AppCompat.DayNight.NoActionBar" />
 
         <ProgressBar
-            android:id="@+id/progressBar"
-            style="@style/Widget.ownCloud.TopProgressBar"
+            android:id="@+id/toolbar_progressBar"
+            style="@style/Base.Widget.AppCompat.ProgressBar.Horizontal"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/standard_quarter_margin"
-            android:layout_below="@+id/toolbar"
-            android:layout_margin="@dimen/zero"
-            android:indeterminate="false"
-            android:indeterminateOnly="false"
-            android:padding="@dimen/zero"
-            android:visibility="visible" />
+            android:layout_height="wrap_content"
+            android:layout_below="@id/default_toolbar"
+            android:layout_marginTop="-7dp"
+            android:layout_marginBottom="-7dp"
+            android:indeterminate="true"
+            android:visibility="gone" />
     </RelativeLayout>
 
-    <include layout="@layout/info_box"/>
+    <include layout="@layout/info_box" />
 
 </com.google.android.material.appbar.AppBarLayout>

src/main/res/values-night/colors.xml

@@ -42,4 +42,7 @@
     <color name="switch_track_color_unchecked">#B3FFFFFF</color>
     <color name="drawer_active_item_background">@color/white</color>
 
+    <!-- App bar -->
+    <color name="appbar">#1E1E1E</color>
+    <color name="fontAppbar">#99FFFFFF</color>
 </resources>

src/main/res/values/colors.xml

@@ -85,4 +85,8 @@
     <color name="themed_fg">#FFFFFF</color>
     <color name="themed_fg_inverse">#000000</color>
     <color name="themed_bg">#222222</color>
+
+    <!-- App bar -->
+    <color name="appbar">@android:color/white</color>
+    <color name="fontAppbar">#666666</color>
 </resources>

src/main/res/values/styles.xml

@@ -199,12 +199,6 @@
         <item name="android:textColorHint">@color/secondary_text_color</item>
 	</style>
 
-	<!-- Progress bar -->
-	<style name="Widget.ownCloud.TopProgressBar" parent="@style/Widget.AppCompat.ProgressBar.Horizontal">
-		<item name="android:progressDrawable">@drawable/actionbar_progress_horizontal</item>
-		<item name="android:indeterminateDrawable">@drawable/actionbar_progress_indeterminate_horizontal</item>
-	</style>
-
 	<style name="Theme.ownCloud.Fullscreen" parent="@style/Theme.MaterialComponents.DayNight">
         <item name="android:windowFullscreen">true</item>
 		<item name="colorAccent">@color/color_accent</item>