Make toolbars the same background color as the main content

22 files changed, 116 insertions, 90 deletions

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java
index a1b375f2..33888333 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java
@@ -75,6 +75,7 @@ import it.niedermann.owncloud.notes.persistence.NotesDatabase;
 import it.niedermann.owncloud.notes.util.ColorUtil;
 import it.niedermann.owncloud.notes.util.NoteUtil;
 
+import static it.niedermann.owncloud.notes.util.ColorUtil.contrastRatioIsSufficient;
 import static it.niedermann.owncloud.notes.util.SSOUtil.askForNewAccount;
 
 public class NotesListViewActivity extends LockedActivity implements NoteClickListener, NoteServerSyncHelper.ViewProvider, AccountChooserListener {
@@ -447,6 +448,9 @@ public class NotesListViewActivity extends LockedActivity implements NoteClickLi
     public void applyBrand(int mainColor, int textColor) {
         applyBrandToPrimaryToolbar(mainColor, textColor, activityBinding.toolbar);
         applyBrandToFAB(mainColor, textColor, activityBinding.fabCreate);
+
+        // TODO We assume, that the background of the spinner is always white
+        activityBinding.swiperefreshlayout.setColorSchemeColors(contrastRatioIsSufficient(Color.WHITE, mainColor) ? mainColor : Color.BLACK);
         binding.headerViewBackground.setBackgroundColor(mainColor);
         binding.appName.setTextColor(textColor);
         binding.account.setTextColor(textColor);
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandingUtil.java b/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandingUtil.java
index 46f92f93..dc627b4e 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandingUtil.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandingUtil.java
@@ -13,7 +13,6 @@ import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.preference.PreferenceManager;
 
 import it.niedermann.owncloud.notes.R;
-import it.niedermann.owncloud.notes.android.DarkModeSetting;
 import it.niedermann.owncloud.notes.util.Notes;
 
 import static it.niedermann.owncloud.notes.util.ColorUtil.contrastRatioIsSufficient;
@@ -39,9 +38,9 @@ public class BrandingUtil {
         if (BrandingUtil.isBrandingEnabled(context)) {
             SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context.getApplicationContext());
             Log.v(TAG, "--- Read: shared_preference_theme_main");
-            return sharedPreferences.getInt(pref_key_branding_main, context.getApplicationContext().getResources().getColor(R.color.primary));
+            return sharedPreferences.getInt(pref_key_branding_main, context.getApplicationContext().getResources().getColor(R.color.defaultBrand));
         } else {
-            return context.getResources().getColor(R.color.primary);
+            return context.getResources().getColor(R.color.defaultBrand);
         }
     }
 
@@ -78,11 +77,12 @@ public class BrandingUtil {
      */
     @ColorInt
     public static int getSecondaryForegroundColorDependingOnTheme(@NonNull Context context, @ColorInt int mainColor) {
-        final boolean isDarkTheme = Notes.getAppTheme(context) == DarkModeSetting.DARK;
-        if (isDarkTheme && !contrastRatioIsSufficient(mainColor, Color.BLACK)) {
+        final int primaryColor = context.getResources().getColor(R.color.primary);
+        final boolean isDarkTheme = Notes.isDarkThemeActive(context);
+        if (isDarkTheme && !contrastRatioIsSufficient(mainColor, primaryColor)) {
             Log.v(TAG, "Contrast ratio between brand color " + String.format("#%06X", (0xFFFFFF & mainColor)) + " and dark theme is too low. Falling back to WHITE as brand color.");
             return Color.WHITE;
-        } else if (!isDarkTheme && !contrastRatioIsSufficient(mainColor, Color.WHITE)) {
+        } else if (!isDarkTheme && !contrastRatioIsSufficient(mainColor, primaryColor)) {
             Log.v(TAG, "Contrast ratio between brand color " + String.format("#%06X", (0xFFFFFF & mainColor)) + " and light theme is too low. Falling back to BLACK as brand color.");
             return Color.BLACK;
         } else {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/model/ItemAdapter.java b/app/src/main/java/it/niedermann/owncloud/notes/model/ItemAdapter.java
index b98c23b9..8da36203 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/model/ItemAdapter.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/model/ItemAdapter.java
@@ -38,7 +38,7 @@ public class ItemAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> i
     public <T extends Context & NoteClickListener> ItemAdapter(@NonNull T context) {
         this.context = context;
         this.noteClickListener = context;
-        this.mainColor = context.getResources().getColor(R.color.primary);
+        this.mainColor = context.getResources().getColor(R.color.defaultBrand);
         this.textColor = context.getResources().getColor(android.R.color.white);
     }
 
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/model/NoteViewHolder.java b/app/src/main/java/it/niedermann/owncloud/notes/model/NoteViewHolder.java
index df55e39a..954ad8a2 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/model/NoteViewHolder.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/model/NoteViewHolder.java
@@ -53,7 +53,7 @@ public class NoteViewHolder extends RecyclerView.ViewHolder implements View.OnLo
         binding.noteCategory.setText(Html.fromHtml(note.getCategory()));
 
         DrawableCompat.setTint(binding.noteCategory.getBackground(), mainColor);
-        binding.noteCategory.setTextColor(Notes.isDarkThemeActive(binding.getRoot().getContext()) ? Color.WHITE : Color.BLACK);
+        binding.noteCategory.setTextColor(Notes.isDarkThemeActive(binding.getRoot().getContext()) ? textColor : Color.BLACK);
 
         binding.noteExcerpt.setText(Html.fromHtml(note.getExcerpt()));
         binding.noteStatus.setVisibility(DBStatus.VOID.equals(note.getStatus()) ? View.INVISIBLE : View.VISIBLE);
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/LoadNotesListTask.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/LoadNotesListTask.java
index a6b77024..ff3673d9 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/LoadNotesListTask.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/LoadNotesListTask.java
@@ -45,7 +45,7 @@ public class LoadNotesListTask extends AsyncTask<Void, Void, List<Item>> {
         this.searchQuery = searchQuery;
         this.accountId = accountId;
         this.searchBackground = context.getResources().getColor(R.color.bg_highlighted);
-        this.searchForeground = DisplayUtils.getForeground(Integer.toHexString(this.searchBackground)) ? Color.WHITE : context.getResources().getColor(R.color.primary);
+        this.searchForeground = DisplayUtils.getForeground(Integer.toHexString(this.searchBackground)) ? Color.WHITE : context.getResources().getColor(R.color.defaultBrand);
     }
 
     @Override
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/util/MarkDownUtil.java b/app/src/main/java/it/niedermann/owncloud/notes/util/MarkDownUtil.java
index 9d9abe95..66f89280 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/util/MarkDownUtil.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/util/MarkDownUtil.java
@@ -65,7 +65,7 @@ public class MarkDownUtil {
                         darkTheme ? R.color.widget_fg_dark_theme : R.color.widget_fg_default, null))
                 .setTodoDoneColor(ResourcesCompat.getColor(context.getResources(),
                         darkTheme ? R.color.widget_fg_dark_theme : R.color.widget_fg_default, null))
-                .setLinkFontColor(ResourcesCompat.getColor(context.getResources(), R.color.primary, null))
+                .setLinkFontColor(ResourcesCompat.getColor(context.getResources(), R.color.defaultBrand, null))
                 .setRxMDImageLoader(new NotesImageLoader(context))
                 .setDefaultImageSize(400, 300);
     }
diff --git a/app/src/main/res/drawable/ic_delete_white_24dp.xml b/app/src/main/res/drawable/ic_delete_white_24dp.xml
deleted file mode 100644
index 4d020aff..00000000
--- a/app/src/main/res/drawable/ic_delete_white_24dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:tint="#FFFFFF" android:viewportHeight="24.0"
-    android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFFFF" android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_edit_white_24dp.xml b/app/src/main/res/drawable/ic_edit_grey600_24dp.xml
index 5af858dd..1c520a99 100644
--- a/app/src/main/res/drawable/ic_edit_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_edit_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <vector android:autoMirrored="true" android:height="24dp"
-    android:tint="#FFFFFF" android:viewportHeight="24.0"
+    android:tint="#757575" android:viewportHeight="24.0"
     android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FFFFFFFF" android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_send_white_24dp.xml b/app/src/main/res/drawable/ic_send_grey600_24dp.xml
index 97dd32a4..08fdc123 100644
--- a/app/src/main/res/drawable/ic_send_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_send_grey600_24dp.xml
@@ -1,5 +1,5 @@
 <vector android:autoMirrored="true" android:height="24dp"
-    android:tint="#FFFFFF" android:viewportHeight="24.0"
+    android:tint="#757575" android:viewportHeight="24.0"
     android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/>
 </vector>
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index 7582ef75..10444a88 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -1,30 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
     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"
     android:orientation="vertical">
 
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="?attr/colorPrimary"
-        app:contentInsetStartWithNavigation="0dp"
-        app:elevation="4dp"
-        app:navigationIcon="@drawable/ic_arrow_back_grey600_24dp"
-        app:titleMarginStart="0dp"
-        tools:title="@string/simple_about" />
+        android:layout_height="wrap_content">
 
-    <com.google.android.material.tabs.TabLayout
-        android:id="@+id/tabs"
-        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:background="?attr/colorPrimary"
+            app:contentInsetStartWithNavigation="0dp"
+            app:navigationIcon="@drawable/ic_arrow_back_grey600_24dp"
+            app:titleMarginStart="0dp"
+            tools:title="@string/simple_about" />
+
+        <com.google.android.material.tabs.TabLayout
+            android:id="@+id/tabs"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?attr/colorPrimary" />
+    </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.viewpager.widget.ViewPager
         android:id="@+id/pager"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:background="?attr/colorPrimary" />
 
 </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 d089db72..2c884af4 100644
--- a/app/src/main/res/layout/activity_edit.xml
+++ b/app/src/main/res/layout/activity_edit.xml
@@ -1,21 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical">
 
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="?attr/colorPrimary"
-        app:contentInsetStartWithNavigation="0dp"
-        app:elevation="4dp"
-        app:navigationIcon="@drawable/ic_arrow_back_grey600_24dp"
-        app:titleMarginStart="0dp"
-        tools:title="Edit Sample note" />
+        android:layout_height="wrap_content">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            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>
 
     <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 89d270b1..5ed3c605 100644
--- a/app/src/main/res/layout/activity_exception.xml
+++ b/app/src/main/res/layout/activity_exception.xml
@@ -4,6 +4,7 @@
     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
@@ -55,7 +56,8 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_weight=".5"
-            android:text="@string/simple_close" />
+            android:text="@string/simple_close"
+            android:textColor="@color/defaultBrand" />
 
         <Button
             android:id="@+id/copy"
@@ -65,7 +67,7 @@
             android:layout_marginTop="6dp"
             android:layout_marginBottom="6dp"
             android:layout_weight=".5"
-            android:background="@color/primary"
+            android:background="@color/defaultBrand"
             android:foreground="?attr/selectableItemBackground"
             android:text="@string/simple_copy"
             android:textColor="@color/fg_contrast"
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 cc1e7ca6..c1f5302d 100644
--- a/app/src/main/res/layout/activity_notes_list_view.xml
+++ b/app/src/main/res/layout/activity_notes_list_view.xml
@@ -11,16 +11,20 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
+        <com.google.android.material.appbar.AppBarLayout
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:contentInsetStartWithNavigation="0dp"
-            app:elevation="4dp"
-            app:titleMarginStart="0dp"
-            tools:navigationIcon="@drawable/ic_arrow_back_grey600_24dp"
-            tools:title="@string/app_name" />
+            android:layout_height="wrap_content">
+
+            <androidx.appcompat.widget.Toolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:background="?attr/colorPrimary"
+                app:contentInsetStartWithNavigation="0dp"
+                app:titleMarginStart="0dp"
+                tools:navigationIcon="@drawable/ic_arrow_back_grey600_24dp"
+                tools:title="@string/app_name" />
+        </com.google.android.material.appbar.AppBarLayout>
 
         <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
             android:id="@+id/swiperefreshlayout"
@@ -60,6 +64,6 @@
         android:id="@+id/fab_create"
         style="@style/fab"
         android:title="@string/action_create"
-        app:backgroundTint="@color/primary"
+        app:backgroundTint="@color/defaultBrand"
         app:srcCompat="@drawable/ic_add_white_24dp" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_preferences.xml b/app/src/main/res/layout/activity_preferences.xml
index 2b4c4f4d..10b8089e 100644
--- a/app/src/main/res/layout/activity_preferences.xml
+++ b/app/src/main/res/layout/activity_preferences.xml
@@ -5,20 +5,25 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="?attr/colorPrimary"
-        app:contentInsetStartWithNavigation="0dp"
-        app:elevation="4dp"
-        app:navigationIcon="@drawable/ic_arrow_back_grey600_24dp"
-        app:title="@string/action_settings"
-        app:titleMarginStart="0dp" />
+        android:layout_height="wrap_content">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            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>
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/fragment_container_view"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        android:background="?attr/colorPrimary" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/drawer_layout.xml b/app/src/main/res/layout/drawer_layout.xml
index cf1f0d7b..5f04008e 100644
--- a/app/src/main/res/layout/drawer_layout.xml
+++ b/app/src/main/res/layout/drawer_layout.xml
@@ -41,6 +41,7 @@
                         android:id="@+id/header_view_background"
                         android:layout_width="match_parent"
                         android:layout_height="164dp"
+                        android:background="@color/defaultBrand"
                         android:contentDescription="@null"
                         android:scaleType="centerCrop"
                         app:srcCompat="@drawable/background" />
@@ -61,9 +62,9 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_below="@id/current_account_image"
-                        android:layout_marginTop="6dp"
                         android:layout_marginStart="@dimen/header_padding"
                         android:layout_marginLeft="@dimen/header_padding"
+                        android:layout_marginTop="6dp"
                         android:layout_marginEnd="@dimen/header_padding"
                         android:layout_marginRight="@dimen/header_padding"
                         android:ellipsize="end"
@@ -81,34 +82,34 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_below="@+id/app_name"
+                        android:layout_alignParentStart="true"
+                        android:layout_alignParentLeft="true"
                         android:layout_marginStart="@dimen/header_padding"
                         android:layout_marginLeft="@dimen/header_padding"
                         android:layout_marginEnd="@dimen/widget_margin"
                         android:layout_marginRight="@dimen/widget_margin"
+                        android:layout_toStartOf="@id/account_arrow"
+                        android:layout_toLeftOf="@id/account_arrow"
                         android:ellipsize="end"
                         android:maxLines="1"
                         android:shadowColor="@android:color/black"
-                        android:layout_alignParentStart="true"
-                        android:layout_toStartOf="@id/account_arrow"
                         android:shadowDx="0.5"
                         android:shadowDy="0"
                         android:shadowRadius="2"
                         android:textColor="@android:color/white"
                         android:textSize="12sp"
-                        tools:text="user@nextcloud.example.comuser@nextcloud.example.comuser@nextcloud.example.com"
-                        android:layout_alignParentLeft="true"
-                        android:layout_toLeftOf="@id/account_arrow" />
+                        tools:text="user@nextcloud.example.comuser@nextcloud.example.comuser@nextcloud.example.com" />
 
                     <androidx.appcompat.widget.AppCompatImageView
+                        android:id="@+id/account_arrow"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:id="@+id/account_arrow"
-                        app:srcCompat="@drawable/ic_arrow_drop_down_white_24dp"
-                        android:layout_alignParentEnd="true"
                         android:layout_alignBottom="@+id/account"
-                        android:layout_marginEnd="@dimen/header_padding"
+                        android:layout_alignParentEnd="true"
                         android:layout_alignParentRight="true"
-                        android:layout_marginRight="@dimen/header_padding" />
+                        android:layout_marginEnd="@dimen/header_padding"
+                        android:layout_marginRight="@dimen/header_padding"
+                        app:srcCompat="@drawable/ic_arrow_drop_down_white_24dp" />
                 </RelativeLayout>
 
                 <LinearLayout
@@ -140,10 +141,10 @@
                     android:id="@+id/accountChooser"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:orientation="vertical"
                     android:paddingTop="8dp"
                     android:paddingBottom="8dp"
-                    android:orientation="vertical"
-                    android:visibility="gone"/>
+                    android:visibility="gone" />
             </LinearLayout>
 
         </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/fragment_note_edit.xml b/app/src/main/res/layout/fragment_note_edit.xml
index 954351b0..2d5a49ec 100644
--- a/app/src/main/res/layout/fragment_note_edit.xml
+++ b/app/src/main/res/layout/fragment_note_edit.xml
@@ -17,7 +17,7 @@
             android:id="@+id/editContent"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@null"
+            android:background="?attr/colorPrimary"
             android:ems="10"
             android:gravity="top"
             android:inputType="textMultiLine|textCapSentences"
diff --git a/app/src/main/res/menu/menu_list_context_multiple.xml b/app/src/main/res/menu/menu_list_context_multiple.xml
index e6054140..7bb28c41 100644
--- a/app/src/main/res/menu/menu_list_context_multiple.xml
+++ b/app/src/main/res/menu/menu_list_context_multiple.xml
@@ -4,14 +4,14 @@
 
     <item
         android:id="@+id/menu_delete"
-        android:icon="@drawable/ic_delete_white_24dp"
+        android:icon="@drawable/ic_delete_grey600_24dp"
         android:orderInCategory="100"
         android:title="@string/menu_delete"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/menu_move"
-        android:icon="@drawable/ic_send_white_24dp"
+        android:icon="@drawable/ic_send_grey600_24dp"
         android:orderInCategory="110"
         android:title="@string/simple_move"
         app:showAsAction="ifRoom" />
diff --git a/app/src/main/res/menu/menu_note_activity.xml b/app/src/main/res/menu/menu_note_activity.xml
index 72437c30..967bb4f0 100644
--- a/app/src/main/res/menu/menu_note_activity.xml
+++ b/app/src/main/res/menu/menu_note_activity.xml
@@ -9,7 +9,7 @@
         app:showAsAction="ifRoom" />
     <item
         android:id="@+id/menu_edit"
-        android:icon="@drawable/ic_edit_white_24dp"
+        android:icon="@drawable/ic_edit_grey600_24dp"
         android:orderInCategory="60"
         android:title="@string/simple_edit"
         app:showAsAction="ifRoom" />
diff --git a/app/src/main/res/menu/menu_note_fragment.xml b/app/src/main/res/menu/menu_note_fragment.xml
index ba29dce3..644dacb0 100644
--- a/app/src/main/res/menu/menu_note_fragment.xml
+++ b/app/src/main/res/menu/menu_note_fragment.xml
@@ -31,7 +31,7 @@
         app:actionProviderClass="androidx.appcompat.widget.ShareActionProvider" />
     <item
         android:id="@+id/menu_move"
-        android:icon="@drawable/ic_send_white_24dp"
+        android:icon="@drawable/ic_send_grey600_24dp"
         android:orderInCategory="120"
         android:title="@string/simple_move"
         app:showAsAction="never" />
@@ -43,7 +43,7 @@
         app:showAsAction="never" />
     <item
         android:id="@+id/menu_delete"
-        android:icon="@drawable/ic_delete_white_24dp"
+        android:icon="@drawable/ic_delete_grey600_24dp"
         android:orderInCategory="140"
         android:title="@string/menu_delete"
         app:showAsAction="never" />
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index c01010ad..cb22415c 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -2,7 +2,7 @@
 <resources>
     <!-- Colors -->
 
-    <color name="primary_dark">#286090</color>
+    <color name="primary">#121212</color>
 
     <color name="bg_highlighted">#2a2a2a</color>
     <color name="bg_normal">#121212</color>
@@ -13,5 +13,5 @@
     <color name="fg_default_high">#757575</color>
     <color name="fg_contrast">#000000</color>
 
-    <color name="category_background">@color/primary</color>
+    <color name="category_background">@color/defaultBrand</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index cf29b665..f8d7fbb4 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -2,7 +2,8 @@
 <resources>
     <!-- Colors -->
 
-    <color name="primary">#0082C9</color>
+    <color name="primary">#ffffff</color>
+    <color name="defaultBrand">#0082C9</color>
 
     <color name="bg_highlighted">#eee</color>
     <color name="bg_normal">#ffffff</color>
@@ -16,7 +17,7 @@
 
     <color name="icon_color_default">#757575</color>
 
-    <color name="bg_search_primary">@color/primary</color>
+    <color name="bg_search_primary">@color/defaultBrand</color>
     <color name="bg_search_secondary">#eee</color>
 
     <color name="widget_background">#dfffffff</color>
@@ -24,7 +25,7 @@
     <color name="widget_fg_contrast">#ffffff</color>
 
     <color name="category_background">@color/bg_normal</color>
-    <color name="category_border">@color/primary</color>
+    <color name="category_border">@color/defaultBrand</color>
 
     <!-- Dark Theme -->
     <!-- Defined here until appwidgets can use night/colors -->
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 2e0bb5af..76f51d90 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android">
+<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
 
     <style name="AppTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar.Bridge">
         <item name="windowActionModeOverlay">true</item>
+        <item name="colorPrimary">@color/primary</item>
         <item name="android:statusBarColor" tools:targetApi="lollipop">?attr/colorPrimary</item>
         <item name="android:windowLightStatusBar" tools:targetApi="m">@bool/isDayMode</item>
+        <item name="android:actionModeBackground">?attr/colorPrimary</item>
     </style>
 
     <style name="fab">
@@ -16,5 +18,7 @@
 
     <style name="SplashTheme" parent="AppTheme">
         <item name="android:windowBackground">@drawable/splashscreen</item>
+        <item name="android:windowTranslucentStatus" tools:targetApi="kitkat">true</item>
+        <item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
     </style>
 </resources>
\ No newline at end of file