From ee111172102a694b5fe0e82afa3f571bf2553650 Mon Sep 17 00:00:00 2001
From: Kirill Kamakin <k.kamakin@protonmail.ch>
Date: Fri, 18 Nov 2022 23:21:18 +0100
Subject: [PATCH] Disable toolbar background

---
 app/src/main/res/drawable/ic_menu.xml     | 10 +++++++
 app/src/main/res/drawable/ic_search.xml   | 10 +++++++
 app/src/main/res/drawable/ic_toolbar.xml  | 35 -----------------------
 app/src/main/res/layout/main_activity.xml |  3 +-
 app/src/main/res/menu/main_toolbar.xml    |  2 +-
 5 files changed, 22 insertions(+), 38 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_menu.xml
 create mode 100644 app/src/main/res/drawable/ic_search.xml
 delete mode 100644 app/src/main/res/drawable/ic_toolbar.xml

diff --git a/app/src/main/res/drawable/ic_menu.xml b/app/src/main/res/drawable/ic_menu.xml
new file mode 100644
index 0000000..d632557
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M3,18V16H21V18ZM3,13V11H21V13ZM3,8V6H21V8Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml
new file mode 100644
index 0000000..055dd39
--- /dev/null
+++ b/app/src/main/res/drawable/ic_search.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M19.6,21 L13.3,14.7Q12.55,15.3 11.575,15.65Q10.6,16 9.5,16Q6.775,16 4.888,14.113Q3,12.225 3,9.5Q3,6.775 4.888,4.887Q6.775,3 9.5,3Q12.225,3 14.113,4.887Q16,6.775 16,9.5Q16,10.6 15.65,11.575Q15.3,12.55 14.7,13.3L21,19.6ZM9.5,14Q11.375,14 12.688,12.688Q14,11.375 14,9.5Q14,7.625 12.688,6.312Q11.375,5 9.5,5Q7.625,5 6.312,6.312Q5,7.625 5,9.5Q5,11.375 6.312,12.688Q7.625,14 9.5,14Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_toolbar.xml b/app/src/main/res/drawable/ic_toolbar.xml
deleted file mode 100644
index 7c9f16f..0000000
--- a/app/src/main/res/drawable/ic_toolbar.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="50dp"
-    android:height="50dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-  <group
-      android:scaleX="1.7767742"
-      android:scaleY="1.7767742"
-      android:translateX="26.46"
-      android:translateY="26.46">
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M22.6128,14.1675L22.3938,14.2642L22.3318,14.4955L18.7865,27.7266C18.6268,28.3225 18.0205,28.6712 17.4379,28.5151L1.9968,24.3777C1.4142,24.2216 1.0635,23.6165 1.2232,23.0205L4.7684,9.7894L4.8304,9.5581L4.6891,9.3648C3.6072,7.8855 3.2064,6.3541 3.578,4.9673C4.0332,3.2684 5.6083,1.9554 7.9527,1.2763C10.2865,0.6002 13.2976,0.5853 16.4225,1.4226C19.5473,2.2599 22.1475,3.7784 23.8307,5.5308C25.5214,7.2911 26.229,9.2157 25.7737,10.9146C25.4021,12.3014 24.2894,13.4272 22.6128,14.1675ZM25.6576,4.9637C26.6549,5.6419 27.4994,6.3946 28.1585,7.183C29.5107,8.8003 30.0445,10.5131 29.6338,12.0457C29.2623,13.4325 28.1495,14.5583 26.4729,15.2985L26.2539,15.3952L26.1919,15.6265L22.6466,28.8576C22.4869,29.4536 21.8806,29.8023 21.298,29.6462L20.0265,29.3055C20.2507,29.0109 20.4226,28.6685 20.5243,28.2889L23.9141,15.638C25.6464,14.7352 27.0104,13.3474 27.5116,11.477C28.1292,9.1717 27.2542,6.8659 25.6576,4.9637Z"
-        android:strokeWidth="1"
-        android:strokeColor="#ffffff" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M8,9C10,7 11,7.5 11.5,10"
-        android:strokeWidth="1"
-        android:strokeColor="#ffffff"
-        android:strokeLineCap="round" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M16,11.2341C18,9.2341 19,9.7341 19.5,12.2341"
-        android:strokeWidth="1"
-        android:strokeColor="#ffffff"
-        android:strokeLineCap="round" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M11,15.1199C11.9172,16.2266 12.5604,16.4972 14.0376,15.9992"
-        android:strokeWidth="1"
-        android:strokeColor="#ffffff"
-        android:strokeLineCap="round" />
-  </group>
-</vector>
diff --git a/app/src/main/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml
index d5c4d2a..b2355f2 100644
--- a/app/src/main/res/layout/main_activity.xml
+++ b/app/src/main/res/layout/main_activity.xml
@@ -20,12 +20,11 @@
 
 			<com.google.android.material.appbar.MaterialToolbar
 				android:id="@+id/toolbar"
-				style="@style/Widget.MaterialComponents.Toolbar.Primary"
 				android:layout_width="match_parent"
 				android:layout_height="?actionBarSize"
 				app:layout_scrollFlags="scroll|snap|enterAlways"
 				app:menu="@menu/main_toolbar"
-				app:navigationIcon="@drawable/ic_toolbar" />
+				app:navigationIcon="@drawable/ic_menu" />
 		</com.google.android.material.appbar.AppBarLayout>
 
 		<androidx.fragment.app.FragmentContainerView
diff --git a/app/src/main/res/menu/main_toolbar.xml b/app/src/main/res/menu/main_toolbar.xml
index 8e4cf4e..31e0dfc 100644
--- a/app/src/main/res/menu/main_toolbar.xml
+++ b/app/src/main/res/menu/main_toolbar.xml
@@ -4,7 +4,7 @@
 
 	<item
 		android:id="@+id/search_recipe_action"
-		android:icon="@android:drawable/ic_menu_search"
+		android:icon="@drawable/ic_search"
 		android:title="@string/search_recipes_hint"
 		app:actionViewClass="androidx.appcompat.widget.SearchView"
 		app:showAsAction="ifRoom" />