From ebd31829b884c4cd721170f11656dc64ef092f6c Mon Sep 17 00:00:00 2001
From: Bnyro <82752168+Bnyro@users.noreply.github.com>
Date: Tue, 13 Jun 2023 21:32:15 +0200
Subject: [PATCH] Fix contrast of top app bar (#1916)

---
 .../{ic_add_white_24dp.xml => ic_add_24dp.xml}         |  1 +
 app/src/main/res/layout/activity_main.xml              |  9 +--------
 app/src/main/res/layout/widget_toolbar.xml             |  8 ++------
 app/src/main/res/menu/device_list.xml                  |  2 +-
 app/src/main/res/menu/folder_list.xml                  |  2 +-
 app/src/main/res/values/dimens.xml                     |  1 -
 app/src/main/res/values/styles.xml                     |  5 -----
 app/src/main/res/values/themes.xml                     | 10 +---------
 8 files changed, 7 insertions(+), 31 deletions(-)
 rename app/src/main/res/drawable/{ic_add_white_24dp.xml => ic_add_24dp.xml} (88%)

diff --git a/app/src/main/res/drawable/ic_add_white_24dp.xml b/app/src/main/res/drawable/ic_add_24dp.xml
similarity index 88%
rename from app/src/main/res/drawable/ic_add_white_24dp.xml
rename to app/src/main/res/drawable/ic_add_24dp.xml
index 6b6146ec..d783f822 100644
--- a/app/src/main/res/drawable/ic_add_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_add_24dp.xml
@@ -1,6 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
+        android:tint="?colorControlNormal"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index fd67229e..9ddb647a 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -15,13 +14,7 @@
         <com.google.android.material.tabs.TabLayout
             android:id="@+id/tabContainer"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?colorPrimary"
-            android:elevation="@dimen/toolbar_elevation"
-            android:theme="@style/ThemeOverlay.Syncthing.Toolbar"
-            app:tabIndicatorColor="@android:color/white"
-            app:tabSelectedTextColor="@android:color/white"
-            app:tabTextColor="@android:color/white" />
+            android:layout_height="wrap_content" />
 
         <androidx.viewpager.widget.ViewPager
             android:id="@+id/pager"
diff --git a/app/src/main/res/layout/widget_toolbar.xml b/app/src/main/res/layout/widget_toolbar.xml
index 7fa88ae8..a589ae79 100644
--- a/app/src/main/res/layout/widget_toolbar.xml
+++ b/app/src/main/res/layout/widget_toolbar.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.appcompat.widget.Toolbar
+<com.google.android.material.appbar.MaterialToolbar
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/toolbar"
     android:layout_width="match_parent"
     android:layout_height="?android:actionBarSize"
     android:minHeight="?android:actionBarSize"
-    android:background="?colorPrimary"
-    android:elevation="@dimen/toolbar_elevation"
-    app:titleMarginStart="16dp"
-    android:theme="@style/ThemeOverlay.Syncthing.Toolbar"
-    android:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
+    app:titleMarginStart="16dp" />
diff --git a/app/src/main/res/menu/device_list.xml b/app/src/main/res/menu/device_list.xml
index 182d2d84..638aad20 100644
--- a/app/src/main/res/menu/device_list.xml
+++ b/app/src/main/res/menu/device_list.xml
@@ -5,7 +5,7 @@
 
     <item
         android:id="@+id/add_device"
-        android:icon="@drawable/ic_add_white_24dp"
+        android:icon="@drawable/ic_add_24dp"
         android:title="@string/add_device"
         app:showAsAction="always|withText" />
 
diff --git a/app/src/main/res/menu/folder_list.xml b/app/src/main/res/menu/folder_list.xml
index 3e2bae32..d7d29564 100644
--- a/app/src/main/res/menu/folder_list.xml
+++ b/app/src/main/res/menu/folder_list.xml
@@ -5,7 +5,7 @@
 
     <item
         android:id="@+id/add_folder"
-        android:icon="@drawable/ic_add_white_24dp"
+        android:icon="@drawable/ic_add_24dp"
         android:title="@string/add_folder"
         app:showAsAction="always|withText" />
 
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 82f975f4..49493fa1 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="material_divider_inset">72dp</dimen>
-    <dimen name="toolbar_elevation">4dp</dimen>
 
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="dots_height">30dp</dimen>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 95e5df0b..1fd1fa98 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -41,11 +41,6 @@
         <item name="android:background">@null</item>
     </style>
 
-    <style name="Widget.Syncthing.DrawerArrowToggle" parent="Widget.AppCompat.DrawerArrowToggle">
-        <item name="spinBars">false</item>
-        <item name="color">@android:color/white</item>
-    </style>
-
     <!-- Text appearances -->
     <eat-comment />
 
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 895ddb49..642950b0 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -15,7 +15,6 @@
         <item name="windowActionModeOverlay">true</item>
         <item name="android:listViewStyle">@style/Widget.Syncthing.ListView</item>
         <item name="android:listDivider">@drawable/list_divider_inset</item>
-        <item name="drawerArrowStyle">@style/Widget.Syncthing.DrawerArrowToggle</item>
 
         <item name="android:actionBarSize">@dimen/abc_action_bar_default_height_material</item>
 
@@ -27,7 +26,7 @@
         <item name="android:dialogCornerRadius" tools:targetApi="p">@dimen/dialog_corner_radius</item>
         <item name="dialogCornerRadius">@dimen/dialog_corner_radius</item>
 
-        <item name="android:statusBarColor" tools:targetApi="m">?attr/colorPrimary</item>
+        <item name="android:statusBarColor" tools:targetApi="m">@android:color/transparent</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
     </style>
 
@@ -56,13 +55,6 @@
 
     <style name="Theme.Syncthing.ButtonStyle" parent="Widget.Material3.Button.TextButton.Dialog" />
 
-    <!-- Toolbar themes -->
-    <eat-comment/>
-
-    <style name="ThemeOverlay.Syncthing.Toolbar" parent="ThemeOverlay.Material3.Dark.ActionBar">
-        <item name="android:windowBackground">@null</item>
-    </style>
-
     <!-- Preference dialog theme -->
     <eat-comment/>