From 1dbde30c46af406f2228bf4c83b09ac93d7cc2de Mon Sep 17 00:00:00 2001
From: Stefan Niedermann <info@niedermann.it>
Date: Fri, 7 Apr 2023 13:36:13 +0200
Subject: [PATCH 1/6] feat(theming): Align theming closer to files app

Follow-Up to https://github.com/nextcloud/notes-android/pull/1680

Signed-off-by: Stefan Niedermann <info@niedermann.it>
---
 .../notes/FormattingHelpActivity.java         |  9 +++----
 .../owncloud/notes/about/AboutActivity.java   |  5 ++--
 .../notes/branding/NotesViewThemeUtils.java   | 27 +++++++++++++++++--
 .../owncloud/notes/edit/EditNoteActivity.java |  3 ++-
 .../owncloud/notes/main/MainActivity.java     |  3 ++-
 .../ManageAccountsActivity.java               |  3 ++-
 .../preferences/PreferencesActivity.java      |  3 ++-
 app/src/main/res/layout/activity_about.xml    |  9 ++-----
 app/src/main/res/layout/activity_edit.xml     | 20 +++++---------
 .../main/res/layout/activity_exception.xml    |  7 ++---
 .../res/layout/activity_formatting_help.xml   | 21 +++++----------
 .../res/layout/activity_manage_accounts.xml   | 21 +++++----------
 .../res/layout/activity_notes_list_view.xml   | 12 ++++-----
 .../main/res/layout/activity_preferences.xml  | 23 +++++-----------
 app/src/main/res/values/styles.xml            |  1 +
 15 files changed, 76 insertions(+), 91 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/FormattingHelpActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/FormattingHelpActivity.java
index 6fe0047e3..036d24e93 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/FormattingHelpActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/FormattingHelpActivity.java
@@ -1,6 +1,7 @@
 package it.niedermann.owncloud.notes;
 
-import android.content.SharedPreferences;
+import static it.niedermann.owncloud.notes.shared.util.NoteUtil.getFontSizeFromPreferences;
+
 import android.graphics.Typeface;
 import android.os.Bundle;
 import android.text.method.LinkMovementMethod;
@@ -10,13 +11,10 @@
 import androidx.annotation.Nullable;
 import androidx.preference.PreferenceManager;
 
-import it.niedermann.owncloud.notes.R;
 import it.niedermann.owncloud.notes.branding.BrandedActivity;
 import it.niedermann.owncloud.notes.branding.BrandingUtil;
 import it.niedermann.owncloud.notes.databinding.ActivityFormattingHelpBinding;
 
-import static it.niedermann.owncloud.notes.shared.util.NoteUtil.getFontSizeFromPreferences;
-
 public class FormattingHelpActivity extends BrandedActivity {
 
     private ActivityFormattingHelpBinding binding;
@@ -225,6 +223,7 @@ private String buildFormattingHelp() {
     @Override
     public void applyBrand(int color) {
         final var util = BrandingUtil.of(color, this);
-        util.notes.applyBrandToPrimaryToolbar(binding.appBar, binding.toolbar, colorAccent);
+        util.platform.themeStatusBar(this);
+        util.material.themeToolbar(binding.toolbar);
     }
 }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/about/AboutActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/about/AboutActivity.java
index 3d871f6a2..1a31d88ca 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/about/AboutActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/about/AboutActivity.java
@@ -52,8 +52,9 @@ protected void onCreate(Bundle savedInstanceState) {
     @Override
     public void applyBrand(int color) {
         final var util = BrandingUtil.of(color, this);
-        util.material.themeTabLayout(binding.tabs);
-        util.notes.applyBrandToPrimaryToolbar(binding.appBar, binding.toolbar, colorAccent);
+        util.platform.themeStatusBar(this);
+        util.material.themeToolbar(binding.toolbar);
+        util.material.themeTabLayoutOnSurface(binding.tabs);
     }
 
     private static class TabsStateAdapter extends FragmentStateAdapter {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/branding/NotesViewThemeUtils.java b/app/src/main/java/it/niedermann/owncloud/notes/branding/NotesViewThemeUtils.java
index 5c659afd9..c26b0bf1d 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/branding/NotesViewThemeUtils.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/branding/NotesViewThemeUtils.java
@@ -4,6 +4,7 @@
 import static com.nextcloud.android.common.ui.util.PlatformThemeUtil.isDarkMode;
 
 import android.content.Context;
+import android.content.res.ColorStateList;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.LayerDrawable;
@@ -21,9 +22,9 @@
 
 import com.google.android.material.appbar.AppBarLayout;
 import com.google.android.material.appbar.MaterialToolbar;
+import com.google.android.material.card.MaterialCardView;
 import com.nextcloud.android.common.ui.theme.MaterialSchemes;
 import com.nextcloud.android.common.ui.theme.ViewThemeUtilsBase;
-import com.nextcloud.android.common.ui.theme.utils.ColorRole;
 import com.nextcloud.android.common.ui.theme.utils.MaterialViewThemeUtils;
 
 import it.niedermann.android.util.ColorUtil;
@@ -31,7 +32,6 @@
 import it.niedermann.owncloud.notes.main.navigation.NavigationItem;
 import it.niedermann.owncloud.notes.shared.util.NotesColorUtil;
 import kotlin.Pair;
-import scheme.Scheme;
 
 public class NotesViewThemeUtils extends ViewThemeUtilsBase {
 
@@ -148,4 +148,27 @@ public int getTextHighlightBackgroundColor(@NonNull Context context, @ColorInt i
             }
         }
     }
+
+    /**
+     * @deprecated Should be replaced with {@link com.google.android.material.search.SearchBar} component.
+     */
+    @Deprecated
+    public void themeSearchCardView(@NonNull MaterialCardView searchBarWrapper) {
+        withScheme(searchBarWrapper, scheme -> {
+            searchBarWrapper.setBackgroundTintList(ColorStateList.valueOf(scheme.getSurface()));
+            return searchBarWrapper;
+        });
+    }
+
+    /**
+     * @deprecated Should be replaced with {@link com.google.android.material.search.SearchBar} or {@link MaterialViewThemeUtils#themeToolbar(MaterialToolbar)}
+     */
+    @Deprecated
+    public void themeSearchToolbar(@NonNull MaterialToolbar toolbar) {
+        withScheme(toolbar, scheme -> {
+            toolbar.setNavigationIconTint(scheme.getOnSurface());
+            toolbar.setTitleTextColor(scheme.getOnSurface());
+            return toolbar;
+        });
+    }
 }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/edit/EditNoteActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/edit/EditNoteActivity.java
index d5306d8ac..71b43db5b 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/edit/EditNoteActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/edit/EditNoteActivity.java
@@ -420,6 +420,7 @@ public void onAccountPicked(@NonNull Account account) {
     @Override
     public void applyBrand(int color) {
         final var util = BrandingUtil.of(color, this);
-        util.notes.applyBrandToPrimaryToolbar(binding.appBar, binding.toolbar, colorAccent);
+        util.platform.themeStatusBar(this);
+        util.material.themeToolbar(binding.toolbar);
     }
 }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java
index 479529f30..bcba3df2d 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java
@@ -598,7 +598,8 @@ public void applyBrand(int color) {
         util.androidx.themeSwipeRefreshLayout(activityBinding.swiperefreshlayout);
         util.platform.colorCircularProgressBar(activityBinding.progressCircular, ColorRole.PRIMARY);
         util.platform.colorNavigationView(binding.navigationView);
-        util.notes.applyBrandToPrimaryToolbar(activityBinding.appBar, activityBinding.searchToolbar, colorAccent);
+        util.notes.themeSearchCardView(binding.activityNotesListView.searchBarWrapper);
+        util.notes.themeSearchToolbar(binding.activityNotesListView.searchToolbar);
 
         binding.headerView.setBackgroundColor(color);
         @ColorInt final int headerTextColor = ColorUtil.INSTANCE.getForegroundColorForBackgroundColor(color);
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountsActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountsActivity.java
index 294a530fc..18da71bae 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountsActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountsActivity.java
@@ -210,6 +210,7 @@ public void onFailure(@NonNull Call<NotesSettings> call, @NonNull Throwable t) {
     @Override
     public void applyBrand(int color) {
         final var util = BrandingUtil.of(color, this);
-        util.notes.applyBrandToPrimaryToolbar(binding.appBar, binding.toolbar, colorAccent);
+        util.platform.themeStatusBar(this);
+        util.material.themeToolbar(binding.toolbar);
     }
 }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/preferences/PreferencesActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/preferences/PreferencesActivity.java
index fb3cb8705..8741f76bf 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/preferences/PreferencesActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/preferences/PreferencesActivity.java
@@ -34,6 +34,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
     @Override
     public void applyBrand(int color) {
         final var util = BrandingUtil.of(color, this);
-        util.notes.applyBrandToPrimaryToolbar(binding.appBar, binding.toolbar, colorAccent);
+        util.platform.themeStatusBar(this);
+        util.material.themeToolbar(binding.toolbar);
     }
 }
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index 89c2aaa66..b560bf171 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -4,7 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorPrimary"
     android:orientation="vertical">
 
     <com.google.android.material.appbar.AppBarLayout
@@ -12,12 +11,10 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:layout_marginHorizontal="@dimen/spacer_activity_sides"
-            app:contentInsetStartWithNavigation="0dp"
+            android:layout_height="wrap_content"
             app:navigationIcon="@drawable/ic_arrow_back_grey600_24dp"
             app:titleMarginStart="0dp"
             tools:title="@string/simple_about" />
@@ -26,7 +23,6 @@
             android:id="@+id/tabs"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?attr/colorPrimary"
             app:tabMode="fixed" />
     </com.google.android.material.appbar.AppBarLayout>
 
@@ -34,7 +30,6 @@
         android:id="@+id/pager"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?attr/colorPrimary"
         android:paddingHorizontal="@dimen/spacer_1x" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_edit.xml b/app/src/main/res/layout/activity_edit.xml
index 8948c0768..4d4b375c9 100644
--- a/app/src/main/res/layout/activity_edit.xml
+++ b/app/src/main/res/layout/activity_edit.xml
@@ -6,21 +6,13 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appBar"
+    <com.google.android.material.appbar.MaterialToolbar
+        android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:layout_marginHorizontal="@dimen/spacer_activity_sides"
-            app:contentInsetStartWithNavigation="0dp"
-            app:navigationIcon="@drawable/ic_arrow_back_grey600_24dp"
-            app:titleMarginStart="0dp"
-            tools:title="Edit Sample note" />
-    </com.google.android.material.appbar.AppBarLayout>
+        android:layout_height="wrap_content"
+        app:navigationIcon="@drawable/ic_arrow_back_grey600_24dp"
+        app:titleMarginStart="0dp"
+        tools:title="Edit Sample note" />
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/fragment_container_view"
diff --git a/app/src/main/res/layout/activity_exception.xml b/app/src/main/res/layout/activity_exception.xml
index ce352cc6b..87568578c 100644
--- a/app/src/main/res/layout/activity_exception.xml
+++ b/app/src/main/res/layout/activity_exception.xml
@@ -4,15 +4,12 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorPrimary"
     android:orientation="vertical">
 
-    <androidx.appcompat.widget.Toolbar
+    <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:layout_marginHorizontal="@dimen/spacer_activity_sides"
-        app:contentInsetStartWithNavigation="0dp"
+        android:layout_height="wrap_content"
         app:elevation="4dp"
         app:titleMarginStart="0dp"
         tools:title="@string/simple_exception" />
diff --git a/app/src/main/res/layout/activity_formatting_help.xml b/app/src/main/res/layout/activity_formatting_help.xml
index 99dbb182e..ca8450136 100644
--- a/app/src/main/res/layout/activity_formatting_help.xml
+++ b/app/src/main/res/layout/activity_formatting_help.xml
@@ -4,24 +4,15 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/primary"
     android:orientation="vertical">
 
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appBar"
+    <com.google.android.material.appbar.MaterialToolbar
+        android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:layout_marginHorizontal="@dimen/spacer_activity_sides"
-            app:contentInsetStartWithNavigation="0dp"
-            app:navigationIcon="@drawable/ic_arrow_back_grey600_24dp"
-            app:title="@string/action_formatting_help"
-            app:titleMarginStart="0dp" />
-    </com.google.android.material.appbar.AppBarLayout>
+        android:layout_height="wrap_content"
+        app:navigationIcon="@drawable/ic_arrow_back_grey600_24dp"
+        app:title="@string/action_formatting_help"
+        app:titleMarginStart="0dp" />
 
     <ScrollView
         android:id="@+id/scrollView"
diff --git a/app/src/main/res/layout/activity_manage_accounts.xml b/app/src/main/res/layout/activity_manage_accounts.xml
index 17cd73ccc..a62987857 100644
--- a/app/src/main/res/layout/activity_manage_accounts.xml
+++ b/app/src/main/res/layout/activity_manage_accounts.xml
@@ -4,24 +4,15 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorPrimary"
     android:orientation="vertical">
 
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appBar"
+    <com.google.android.material.appbar.MaterialToolbar
+        android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:layout_marginHorizontal="@dimen/spacer_activity_sides"
-            app:contentInsetStartWithNavigation="0dp"
-            app:navigationIcon="@drawable/ic_arrow_back_grey600_24dp"
-            app:title="@string/manage_accounts"
-            app:titleMarginStart="0dp" />
-    </com.google.android.material.appbar.AppBarLayout>
+        android:layout_height="wrap_content"
+        app:navigationIcon="@drawable/ic_arrow_back_grey600_24dp"
+        app:title="@string/manage_accounts"
+        app:titleMarginStart="0dp" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/accounts"
diff --git a/app/src/main/res/layout/activity_notes_list_view.xml b/app/src/main/res/layout/activity_notes_list_view.xml
index 87d7af901..273093168 100644
--- a/app/src/main/res/layout/activity_notes_list_view.xml
+++ b/app/src/main/res/layout/activity_notes_list_view.xml
@@ -15,6 +15,7 @@
             android:id="@+id/appBar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
+            android:background="@android:color/transparent"
             app:elevation="0dp">
 
             <FrameLayout
@@ -22,6 +23,7 @@
                 android:layout_height="wrap_content">
 
                 <com.google.android.material.card.MaterialCardView
+                    android:id="@+id/searchBarWrapper"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/spacer_activity_sides"
@@ -31,7 +33,7 @@
                     app:cardElevation="2dp"
                     app:strokeWidth="0dp">
 
-                    <androidx.appcompat.widget.Toolbar
+                    <com.google.android.material.appbar.MaterialToolbar
                         android:id="@+id/home_toolbar"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -78,17 +80,15 @@
                                 app:srcCompat="@drawable/ic_account_circle_grey_24dp"
                                 tools:targetApi="o" />
                         </LinearLayout>
-                    </androidx.appcompat.widget.Toolbar>
+                    </com.google.android.material.appbar.MaterialToolbar>
 
                 </com.google.android.material.card.MaterialCardView>
 
-                <androidx.appcompat.widget.Toolbar
+                <com.google.android.material.appbar.MaterialToolbar
                     android:id="@+id/search_toolbar"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:layout_marginHorizontal="@dimen/spacer_activity_sides"
                     android:visibility="gone"
-                    app:contentInsetStartWithNavigation="0dp"
                     app:navigationIcon="@drawable/ic_arrow_back_grey600_24dp"
                     app:titleMarginStart="0dp"
                     tools:title="@string/app_name">
@@ -97,7 +97,7 @@
                         android:id="@+id/search_view"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
-                </androidx.appcompat.widget.Toolbar>
+                </com.google.android.material.appbar.MaterialToolbar>
             </FrameLayout>
         </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/layout/activity_preferences.xml b/app/src/main/res/layout/activity_preferences.xml
index ec4cce0c9..203d7cff1 100644
--- a/app/src/main/res/layout/activity_preferences.xml
+++ b/app/src/main/res/layout/activity_preferences.xml
@@ -5,26 +5,17 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appBar"
+    <com.google.android.material.appbar.MaterialToolbar
+        android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:layout_marginHorizontal="@dimen/spacer_activity_sides"
-            app:contentInsetStartWithNavigation="0dp"
-            app:navigationIcon="@drawable/ic_arrow_back_grey600_24dp"
-            app:title="@string/action_settings"
-            app:titleMarginStart="0dp" />
-    </com.google.android.material.appbar.AppBarLayout>
+        android:layout_height="wrap_content"
+        app:navigationIcon="@drawable/ic_arrow_back_grey600_24dp"
+        app:title="@string/action_settings"
+        app:titleMarginStart="0dp" />
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/fragment_container_view"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?attr/colorPrimary" />
+        android:layout_height="match_parent" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 661bcfd2f..4d8c787af 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -13,6 +13,7 @@
         <item name="android:textColorLink">?android:colorAccent</item>
         <item name="android:textColorHighlight">@color/defaultTextHighlightBackground</item>
         <item name="windowActionModeOverlay">true</item>
+        <item name="android:windowBackground">@color/bg_default</item>
         <item name="android:actionModeBackground">?attr/colorPrimary</item>
 
         <!-- Workaround: Preferences Dialogs are using AlertDialogs instead of MaterialAlertDialogs. -->

From 8eb9890c8a94ae52ac573afc9764d542e53aa163 Mon Sep 17 00:00:00 2001
From: Stefan Niedermann <info@niedermann.it>
Date: Fri, 7 Apr 2023 14:01:36 +0200
Subject: [PATCH 2/6] feat(theming): Align theming closer to files app

Follow-Up to https://github.com/nextcloud/notes-android/pull/1680

Signed-off-by: Stefan Niedermann <info@niedermann.it>
---
 .../notes/branding/NotesViewThemeUtils.java   | 21 +++++++++++++++++++
 .../owncloud/notes/main/MainActivity.java     |  3 ++-
 app/src/main/res/layout/activity_about.xml    |  1 -
 app/src/main/res/layout/activity_edit.xml     |  1 -
 .../main/res/layout/activity_exception.xml    |  1 -
 .../res/layout/activity_formatting_help.xml   |  3 +--
 .../res/layout/activity_manage_accounts.xml   |  3 +--
 .../res/layout/activity_notes_list_view.xml   |  5 ++---
 .../main/res/layout/activity_preferences.xml  |  3 +--
 app/src/main/res/values/styles.xml            |  5 +++++
 10 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/branding/NotesViewThemeUtils.java b/app/src/main/java/it/niedermann/owncloud/notes/branding/NotesViewThemeUtils.java
index c26b0bf1d..f1862e4f0 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/branding/NotesViewThemeUtils.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/branding/NotesViewThemeUtils.java
@@ -16,6 +16,7 @@
 import androidx.annotation.ColorInt;
 import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
+import androidx.appcompat.widget.SearchView;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
 import androidx.core.graphics.drawable.DrawableCompat;
@@ -171,4 +172,24 @@ public void themeSearchToolbar(@NonNull MaterialToolbar toolbar) {
             return toolbar;
         });
     }
+
+    /**
+     * @deprecated Should be replaced with {@link com.google.android.material.search.SearchView}
+     * @see com.nextcloud.android.common.ui.theme.utils.AndroidXViewThemeUtils#themeToolbarSearchView(SearchView)
+     */
+    @Deprecated
+    public void themeToolbarSearchView(@NonNull SearchView searchView) {
+        withScheme(searchView, scheme -> {
+            // hacky as no default way is provided
+            final var editText = (SearchView.SearchAutoComplete) searchView.findViewById(androidx.appcompat.R.id.search_src_text);
+            final var closeButton = (ImageView) searchView.findViewById(androidx.appcompat.R.id.search_close_btn);
+            final var searchButton = (ImageView) searchView.findViewById(androidx.appcompat.R.id.search_button);
+            editText.setHintTextColor(scheme.getOnSurfaceVariant());
+            editText.setHighlightColor(scheme.getInverseOnSurface());
+            editText.setTextColor(scheme.getOnSurface());
+            closeButton.setColorFilter(scheme.getOnSurface());
+            searchButton.setColorFilter(scheme.getOnSurface());
+            return searchView;
+        });
+    }
 }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java
index bcba3df2d..43e482a75 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java
@@ -594,12 +594,13 @@ public void onIconClick(NavigationItem item) {
     @Override
     public void applyBrand(int color) {
         final var util = BrandingUtil.of(color, this);
-        util.material.themeFAB(activityBinding.fabCreate);
         util.androidx.themeSwipeRefreshLayout(activityBinding.swiperefreshlayout);
         util.platform.colorCircularProgressBar(activityBinding.progressCircular, ColorRole.PRIMARY);
         util.platform.colorNavigationView(binding.navigationView);
+        util.material.themeFAB(activityBinding.fabCreate);
         util.notes.themeSearchCardView(binding.activityNotesListView.searchBarWrapper);
         util.notes.themeSearchToolbar(binding.activityNotesListView.searchToolbar);
+        util.notes.themeToolbarSearchView(binding.activityNotesListView.searchView);
 
         binding.headerView.setBackgroundColor(color);
         @ColorInt final int headerTextColor = ColorUtil.INSTANCE.getForegroundColorForBackgroundColor(color);
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index b560bf171..bf04d6f5f 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -16,7 +16,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:navigationIcon="@drawable/ic_arrow_back_grey600_24dp"
-            app:titleMarginStart="0dp"
             tools:title="@string/simple_about" />
 
         <com.google.android.material.tabs.TabLayout
diff --git a/app/src/main/res/layout/activity_edit.xml b/app/src/main/res/layout/activity_edit.xml
index 4d4b375c9..1ef9d274a 100644
--- a/app/src/main/res/layout/activity_edit.xml
+++ b/app/src/main/res/layout/activity_edit.xml
@@ -11,7 +11,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:navigationIcon="@drawable/ic_arrow_back_grey600_24dp"
-        app:titleMarginStart="0dp"
         tools:title="Edit Sample note" />
 
     <androidx.fragment.app.FragmentContainerView
diff --git a/app/src/main/res/layout/activity_exception.xml b/app/src/main/res/layout/activity_exception.xml
index 87568578c..7bfb577f9 100644
--- a/app/src/main/res/layout/activity_exception.xml
+++ b/app/src/main/res/layout/activity_exception.xml
@@ -11,7 +11,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:elevation="4dp"
-        app:titleMarginStart="0dp"
         tools:title="@string/simple_exception" />
 
     <TextView
diff --git a/app/src/main/res/layout/activity_formatting_help.xml b/app/src/main/res/layout/activity_formatting_help.xml
index ca8450136..a2bc569b0 100644
--- a/app/src/main/res/layout/activity_formatting_help.xml
+++ b/app/src/main/res/layout/activity_formatting_help.xml
@@ -11,8 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:navigationIcon="@drawable/ic_arrow_back_grey600_24dp"
-        app:title="@string/action_formatting_help"
-        app:titleMarginStart="0dp" />
+        app:title="@string/action_formatting_help" />
 
     <ScrollView
         android:id="@+id/scrollView"
diff --git a/app/src/main/res/layout/activity_manage_accounts.xml b/app/src/main/res/layout/activity_manage_accounts.xml
index a62987857..5b80ea9da 100644
--- a/app/src/main/res/layout/activity_manage_accounts.xml
+++ b/app/src/main/res/layout/activity_manage_accounts.xml
@@ -11,8 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:navigationIcon="@drawable/ic_arrow_back_grey600_24dp"
-        app:title="@string/manage_accounts"
-        app:titleMarginStart="0dp" />
+        app:title="@string/manage_accounts" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/accounts"
diff --git a/app/src/main/res/layout/activity_notes_list_view.xml b/app/src/main/res/layout/activity_notes_list_view.xml
index 273093168..6d04e18a7 100644
--- a/app/src/main/res/layout/activity_notes_list_view.xml
+++ b/app/src/main/res/layout/activity_notes_list_view.xml
@@ -38,8 +38,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="horizontal"
-                        app:contentInsetStartWithNavigation="0dp"
-                        app:titleMarginStart="0dp">
+                        app:contentInsetStartWithNavigation="0dp">
 
                         <LinearLayout
                             android:layout_width="match_parent"
@@ -86,11 +85,11 @@
 
                 <com.google.android.material.appbar.MaterialToolbar
                     android:id="@+id/search_toolbar"
+                    style="@style/searchToolbarStyle"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:visibility="gone"
                     app:navigationIcon="@drawable/ic_arrow_back_grey600_24dp"
-                    app:titleMarginStart="0dp"
                     tools:title="@string/app_name">
 
                     <androidx.appcompat.widget.SearchView
diff --git a/app/src/main/res/layout/activity_preferences.xml b/app/src/main/res/layout/activity_preferences.xml
index 203d7cff1..e41bbc450 100644
--- a/app/src/main/res/layout/activity_preferences.xml
+++ b/app/src/main/res/layout/activity_preferences.xml
@@ -10,8 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:navigationIcon="@drawable/ic_arrow_back_grey600_24dp"
-        app:title="@string/action_settings"
-        app:titleMarginStart="0dp" />
+        app:title="@string/action_settings" />
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/fragment_container_view"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 4d8c787af..6dc7248f0 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -51,6 +51,11 @@
         <item name="android:paddingEnd">@dimen/spacer_activity_sides</item>
     </style>
 
+    <style name="searchToolbarStyle" parent="@style/Widget.Material3.Toolbar">
+        <item name="android:paddingStart">@dimen/spacer_activity_sides</item>
+        <item name="android:paddingEnd">@dimen/spacer_activity_sides</item>
+    </style>
+
     <style name="tabStyle" parent="Widget.Material3.TabLayout">
         <item name="backgroundColor">@android:color/transparent</item>
         <item name="itemBackground">@android:color/transparent</item>

From 9e62f96e55dc50ddc7dc23fa79342bdda21dd37b Mon Sep 17 00:00:00 2001
From: Stefan Niedermann <info@niedermann.it>
Date: Fri, 7 Apr 2023 15:03:13 +0200
Subject: [PATCH 3/6] feat(theming): Align theming closer to files app

Fix navigation view background

Follow-Up to https://github.com/nextcloud/notes-android/pull/1680

Signed-off-by: Stefan Niedermann <info@niedermann.it>
---
 app/src/main/res/layout/drawer_layout.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/drawer_layout.xml b/app/src/main/res/layout/drawer_layout.xml
index dc273cc57..3a3f3c946 100644
--- a/app/src/main/res/layout/drawer_layout.xml
+++ b/app/src/main/res/layout/drawer_layout.xml
@@ -23,8 +23,7 @@
         <androidx.core.widget.NestedScrollView
             android:id="@+id/scrollView"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="?attr/colorPrimary">
+            android:layout_height="match_parent">
 
             <LinearLayout
                 android:layout_width="match_parent"

From 2b57ad6d3c45410c8efa7c3098cc2e38c26d3246 Mon Sep 17 00:00:00 2001
From: Stefan Niedermann <info@niedermann.it>
Date: Tue, 11 Apr 2023 08:24:20 +0200
Subject: [PATCH 4/6] feat(theming): Bump nextcloud-common to 0.8.0

Follow-Up to https://github.com/nextcloud/notes-android/pull/1680

Signed-off-by: Stefan Niedermann <info@niedermann.it>
---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index c2b6de019..756b04dca 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -76,7 +76,7 @@ dependencies {
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
 
     // Nextcloud SSO
-    implementation 'com.github.nextcloud.android-common:ui:0.7.0'
+    implementation 'com.github.nextcloud.android-common:ui:0.8.0'
     implementation 'com.github.nextcloud:Android-SingleSignOn:0.6.1'
     implementation 'com.github.stefan-niedermann:android-commons:0.2.9'
     implementation 'com.github.stefan-niedermann.nextcloud-commons:sso-glide:1.6.4'

From fc4ed90d2f47cb308d6d0f1ee605162edd2a8579 Mon Sep 17 00:00:00 2001
From: Stefan Niedermann <info@niedermann.it>
Date: Tue, 11 Apr 2023 09:54:22 +0200
Subject: [PATCH 5/6] feat(theming): Reduce dependence on colorPrimary

Signed-off-by: Stefan Niedermann <info@niedermann.it>
---
 app/src/main/res/layout/activity_edit.xml         | 3 +--
 app/src/main/res/layout/fragment_note_edit.xml    | 5 ++---
 app/src/main/res/layout/fragment_note_preview.xml | 3 +--
 app/src/main/res/values-v27/styles.xml            | 2 +-
 app/src/main/res/values/styles.xml                | 4 ++--
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/app/src/main/res/layout/activity_edit.xml b/app/src/main/res/layout/activity_edit.xml
index 1ef9d274a..335beabe0 100644
--- a/app/src/main/res/layout/activity_edit.xml
+++ b/app/src/main/res/layout/activity_edit.xml
@@ -16,7 +16,6 @@
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/fragment_container_view"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?attr/colorPrimary" />
+        android:layout_height="match_parent" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_note_edit.xml b/app/src/main/res/layout/fragment_note_edit.xml
index 79cef9468..8f52126e2 100644
--- a/app/src/main/res/layout/fragment_note_edit.xml
+++ b/app/src/main/res/layout/fragment_note_edit.xml
@@ -3,8 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:background="?attr/colorPrimary">
+    android:layout_height="match_parent">
 
     <!-- Dummy item to prevent editContent from receiving focus -->
     <LinearLayout
@@ -28,7 +27,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="@dimen/spacer_activity_sides"
-            android:background="?attr/colorPrimary"
+            android:background="@android:color/transparent"
             android:ems="10"
             android:gravity="top"
             android:inputType="textMultiLine|textCapSentences"
diff --git a/app/src/main/res/layout/fragment_note_preview.xml b/app/src/main/res/layout/fragment_note_preview.xml
index f9028fb56..c4215c2df 100644
--- a/app/src/main/res/layout/fragment_note_preview.xml
+++ b/app/src/main/res/layout/fragment_note_preview.xml
@@ -3,8 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:background="?attr/colorPrimary">
+    android:layout_height="match_parent">
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/swiperefreshlayout"
diff --git a/app/src/main/res/values-v27/styles.xml b/app/src/main/res/values-v27/styles.xml
index a4f7f37e9..d4d5bb767 100644
--- a/app/src/main/res/values-v27/styles.xml
+++ b/app/src/main/res/values-v27/styles.xml
@@ -2,7 +2,7 @@
 <resources>
 
     <style name="AppTheme" parent="BaseTheme">
-        <item name="android:navigationBarColor">?attr/colorPrimary</item>
+        <item name="android:navigationBarColor">@color/bg_default</item>
         <item name="android:windowLightNavigationBar">@bool/isDayMode</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 6dc7248f0..90dae3ed0 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -6,7 +6,7 @@
         <item name="colorPrimaryDark">?android:colorPrimary</item>
         <item name="colorAccent">@color/accent</item>
 
-        <item name="android:statusBarColor">?attr/colorPrimary</item>
+        <item name="android:statusBarColor">@color/bg_default</item>
         <item name="android:windowLightStatusBar">@bool/isDayMode</item>
         <item name="android:colorControlNormal">?attr/colorAccent</item>
         <item name="android:colorControlActivated">?attr/colorAccent</item>
@@ -14,7 +14,7 @@
         <item name="android:textColorHighlight">@color/defaultTextHighlightBackground</item>
         <item name="windowActionModeOverlay">true</item>
         <item name="android:windowBackground">@color/bg_default</item>
-        <item name="android:actionModeBackground">?attr/colorPrimary</item>
+        <item name="android:actionModeBackground">@color/bg_default</item>
 
         <!-- Workaround: Preferences Dialogs are using AlertDialogs instead of MaterialAlertDialogs. -->
         <!-- https://stackoverflow.com/questions/70650073/adjust-androidx-preference-dialogs-to-follow-material-you -->

From 5cab30bcf19aa97dd9df8ca8096e1e6874e05f1b Mon Sep 17 00:00:00 2001
From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Tue, 11 Apr 2023 10:53:01 +0200
Subject: [PATCH 6/6] reformat for 120 characters line length

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
---
 .../notes/branding/NotesViewThemeUtils.java       | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/branding/NotesViewThemeUtils.java b/app/src/main/java/it/niedermann/owncloud/notes/branding/NotesViewThemeUtils.java
index f1862e4f0..d3970b338 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/branding/NotesViewThemeUtils.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/branding/NotesViewThemeUtils.java
@@ -88,7 +88,9 @@ public void colorNavigationViewItemText(@NonNull TextView view) {
      * @deprecated should be replaced by {@link MaterialViewThemeUtils#themeToolbar(MaterialToolbar)}.
      */
     @Deprecated(forRemoval = true)
-    public void applyBrandToPrimaryToolbar(@NonNull AppBarLayout appBarLayout, @NonNull Toolbar toolbar, @ColorInt int color) {
+    public void applyBrandToPrimaryToolbar(@NonNull AppBarLayout appBarLayout,
+                                           @NonNull Toolbar toolbar,
+                                           @ColorInt int color) {
         // FIXME Workaround for https://github.com/nextcloud/notes-android/issues/889
         appBarLayout.setBackgroundColor(ContextCompat.getColor(appBarLayout.getContext(), R.color.primary));
 
@@ -118,7 +120,10 @@ public void colorLayerDrawable(@NonNull LayerDrawable check, @IdRes int areaToCo
     }
 
     @ColorInt
-    public int getTextHighlightBackgroundColor(@NonNull Context context, @ColorInt int mainColor, @ColorInt int colorPrimary, @ColorInt int colorAccent) {
+    public int getTextHighlightBackgroundColor(@NonNull Context context,
+                                               @ColorInt int mainColor,
+                                               @ColorInt int colorPrimary,
+                                               @ColorInt int colorAccent) {
         if (isDarkMode(context)) { // Dark background
             if (ColorUtil.INSTANCE.isColorDark(mainColor)) { // Dark brand color
                 if (NotesColorUtil.contrastRatioIsSufficient(mainColor, colorPrimary)) { // But also dark text
@@ -162,7 +167,8 @@ public void themeSearchCardView(@NonNull MaterialCardView searchBarWrapper) {
     }
 
     /**
-     * @deprecated Should be replaced with {@link com.google.android.material.search.SearchBar} or {@link MaterialViewThemeUtils#themeToolbar(MaterialToolbar)}
+     * @deprecated Should be replaced with {@link com.google.android.material.search.SearchBar} or
+     * {@link MaterialViewThemeUtils#themeToolbar(MaterialToolbar)}
      */
     @Deprecated
     public void themeSearchToolbar(@NonNull MaterialToolbar toolbar) {
@@ -181,7 +187,8 @@ public void themeSearchToolbar(@NonNull MaterialToolbar toolbar) {
     public void themeToolbarSearchView(@NonNull SearchView searchView) {
         withScheme(searchView, scheme -> {
             // hacky as no default way is provided
-            final var editText = (SearchView.SearchAutoComplete) searchView.findViewById(androidx.appcompat.R.id.search_src_text);
+            final var editText = (SearchView.SearchAutoComplete) searchView
+                    .findViewById(androidx.appcompat.R.id.search_src_text);
             final var closeButton = (ImageView) searchView.findViewById(androidx.appcompat.R.id.search_close_btn);
             final var searchButton = (ImageView) searchView.findViewById(androidx.appcompat.R.id.search_button);
             editText.setHintTextColor(scheme.getOnSurfaceVariant());