From 8b7b1511fcfeb6a83f18cf89a0414260dfcc6c1f Mon Sep 17 00:00:00 2001
From: Ryan Harg <ryan.harg@mailbox.org>
Date: Sat, 3 Jul 2021 13:06:23 +0200
Subject: [PATCH] Improve dark scheme background colors

- Change background color of bottom app bar
- Change background color of navigation bar
---
 app/src/main/res/layout/activity_main.xml | 70 +++++++++++------------
 app/src/main/res/values/styles.xml        |  2 +-
 2 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index b2e90af..e554002 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,45 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout 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"
-    android:background="@color/surface">
-
-  <org.funkwhale.ffa.views.DisableableFrameLayout
-    android:id="@+id/container"
+    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:layout_marginBottom="?attr/actionBarSize"
-    app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+    android:background="@color/surface">
 
-  <org.funkwhale.ffa.views.NowPlayingView
-    android:id="@+id/now_playing"
-    android:layout_width="match_parent"
-    android:layout_height="?attr/actionBarSize"
-    android:layout_gravity="bottom"
-    android:layout_margin="8dp"
-    android:alpha="0"
-    android:visibility="gone"
-    app:cardCornerRadius="3dp"
-    app:cardElevation="12dp"
-    app:layout_dodgeInsetEdges="bottom"
-    tools:alpha="1"
-    tools:visibility="visible">
+    <org.funkwhale.ffa.views.DisableableFrameLayout
+        android:id="@+id/container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginBottom="?attr/actionBarSize"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
-    <include layout="@layout/partial_now_playing" />
+    <org.funkwhale.ffa.views.NowPlayingView
+        android:id="@+id/now_playing"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:layout_gravity="bottom"
+        android:layout_margin="8dp"
+        android:alpha="0"
+        android:visibility="gone"
+        app:cardCornerRadius="3dp"
+        app:cardElevation="12dp"
+        app:layout_dodgeInsetEdges="bottom"
+        tools:alpha="1"
+        tools:visibility="visible">
 
-  </org.funkwhale.ffa.views.NowPlayingView>
+        <include layout="@layout/partial_now_playing" />
 
-  <com.google.android.material.bottomappbar.BottomAppBar
-    android:id="@+id/appbar"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_gravity="bottom"
-    android:theme="@style/AppTheme.AppBar"
-    app:backgroundTint="@color/colorPrimary"
-    app:layout_insetEdge="bottom"
-    app:navigationIcon="@drawable/funkwhaleshape"
-    tools:menu="@menu/toolbar" />
+    </org.funkwhale.ffa.views.NowPlayingView>
+
+    <com.google.android.material.bottomappbar.BottomAppBar
+        android:id="@+id/appbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:theme="@style/AppTheme.AppBar"
+        app:backgroundTint="@color/surface"
+        app:layout_insetEdge="bottom"
+        app:navigationIcon="@drawable/funkwhaleshape"
+        tools:menu="@menu/toolbar" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 290ca69..e03e008 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -6,7 +6,7 @@
     <item name="colorPrimary">@color/colorPrimary</item>
     <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
     <item name="colorAccent">@color/colorAccent</item>
-    <item name="android:navigationBarColor">@color/colorPrimary</item>
+    <item name="android:navigationBarColor">@color/surface</item>
 
     <item name="materialButtonStyle">@style/AppTheme.ButtonStyle</item>