From 3023e8b797ee3b773e56fff8db28742781e4d14a Mon Sep 17 00:00:00 2001
From: h4h13 <hemanths@live.com>
Date: Tue, 1 Oct 2019 23:45:06 +0530
Subject: [PATCH] Fix toolbar colors

---
 app/src/main/res/layout/activity_about.xml  |   2 +-
 app/src/main/res/layout/activity_search.xml |   7 +-
 app/src/main/res/layout/bread_crumb.xml     |   8 +-
 app/src/main/res/layout/fragment_folder.xml | 112 ++++++++++----------
 4 files changed, 64 insertions(+), 65 deletions(-)

diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index 797fa238..045b6b89 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -8,7 +8,7 @@
         android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?android:colorBackground"
+        android:background="?colorPrimary"
         app:liftOnScroll="true">
 
         <com.google.android.material.appbar.MaterialToolbar
diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml
index ac434b1b..6fe4baaf 100755
--- a/app/src/main/res/layout/activity_search.xml
+++ b/app/src/main/res/layout/activity_search.xml
@@ -11,6 +11,7 @@
         android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="?colorPrimary"
         android:fitsSystemWindows="true"
         app:liftOnScroll="true">
 
@@ -24,7 +25,6 @@
             android:layout_marginBottom="@dimen/toolbar_margin_vertical"
             app:cardBackgroundColor="?colorSurface"
             app:cardCornerRadius="8dp"
-            app:cardElevation="0dp"
             app:cardUseCompatPadding="true"
             app:layout_scrollFlags="scroll|enterAlways">
 
@@ -37,7 +37,7 @@
                     android:id="@+id/back"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:padding="14dp"
+                    android:padding="12dp"
                     app:srcCompat="@drawable/ic_keyboard_backspace_black_24dp"
                     app:tint="?colorOnSurface" />
 
@@ -50,7 +50,6 @@
                     android:background="@null"
                     android:hint="@string/action_search"
                     android:inputType="text|textAutoComplete"
-                    android:padding="12dp"
                     android:textAppearance="@style/TextViewSubtitle1">
 
                     <requestFocus />
@@ -62,7 +61,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="0"
                     android:background="?roundSelector"
-                    android:padding="14dp"
+                    android:padding="12dp"
                     app:srcCompat="@drawable/ic_mic_white_24dp"
                     app:tint="?colorOnSurface"
                     tools:visibility="visible" />
diff --git a/app/src/main/res/layout/bread_crumb.xml b/app/src/main/res/layout/bread_crumb.xml
index 51b6262c..5322fe6d 100644
--- a/app/src/main/res/layout/bread_crumb.xml
+++ b/app/src/main/res/layout/bread_crumb.xml
@@ -8,12 +8,12 @@
     android:gravity="center_vertical|start"
     android:minHeight="@dimen/tab_height"
     android:orientation="horizontal"
-    android:paddingEnd="4dp"
+    android:paddingStart="12dp"
     android:paddingLeft="12dp"
-    android:paddingRight="4dp"
-    android:paddingStart="12dp">
+    android:paddingEnd="4dp"
+    android:paddingRight="4dp">
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingEnd="8dp"
diff --git a/app/src/main/res/layout/fragment_folder.xml b/app/src/main/res/layout/fragment_folder.xml
index b907abab..c05717d3 100644
--- a/app/src/main/res/layout/fragment_folder.xml
+++ b/app/src/main/res/layout/fragment_folder.xml
@@ -19,16 +19,13 @@
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:id="@+id/coordinatorLayout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1">
-
+        android:layout_height="match_parent">
 
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/appBarLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:elevation="0dp"
-            app:elevation="0dp">
+            app:liftOnScroll="true">
 
             <com.google.android.material.card.MaterialCardView
                 android:id="@+id/toolbarContainer"
@@ -40,75 +37,78 @@
                 android:layout_marginBottom="@dimen/toolbar_margin_vertical"
                 app:cardBackgroundColor="?colorSurface"
                 app:cardCornerRadius="8dp"
-                app:cardElevation="0dp"
                 app:cardUseCompatPadding="true"
                 app:layout_collapseMode="pin">
 
-                <FrameLayout
+                <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
 
-                    <com.google.android.material.appbar.MaterialToolbar
-                        android:id="@+id/toolbar"
+                    <FrameLayout
                         android:layout_width="match_parent"
-                        android:layout_height="@dimen/toolbar_height"
-                        android:background="?colorSurface"
-                        app:contentInsetStart="0dp"
-                        app:contentInsetStartWithNavigation="0dp"
-                        app:popupTheme="?toolbarPopupTheme"
-                        app:title="@string/search_hint"
-                        app:titleMarginStart="0dp"
-                        app:titleTextAppearance="@style/ToolbarTextAppearanceSearch"
-                        tools:ignore="UnusedAttribute" />
+                        android:layout_height="wrap_content">
 
-                    <ViewStub
-                        android:id="@+id/cab_stub"
+                        <com.google.android.material.appbar.MaterialToolbar
+                            android:id="@+id/toolbar"
+                            android:layout_width="match_parent"
+                            android:layout_height="@dimen/toolbar_height"
+                            android:background="?colorSurface"
+                            app:contentInsetStart="0dp"
+                            app:contentInsetStartWithNavigation="0dp"
+                            app:popupTheme="?toolbarPopupTheme"
+                            app:title="@string/search_hint"
+                            app:titleMarginStart="0dp"
+                            app:titleTextAppearance="@style/ToolbarTextAppearanceSearch"
+                            tools:ignore="UnusedAttribute" />
+
+                        <ViewStub
+                            android:id="@+id/cab_stub"
+                            android:layout_width="match_parent"
+                            android:layout_height="48dp" />
+                    </FrameLayout>
+
+                    <code.name.monkey.retromusic.views.BreadCrumbLayout
+                        android:id="@+id/breadCrumbs"
                         android:layout_width="match_parent"
-                        android:layout_height="48dp" />
-                </FrameLayout>
+                        android:layout_height="@dimen/tab_height"
+                        android:background="?colorSecondary"
+                        android:paddingStart="60dp"
+                        android:paddingEnd="8dp" />
+                </LinearLayout>
+
             </com.google.android.material.card.MaterialCardView>
+
         </com.google.android.material.appbar.AppBarLayout>
 
-        <FrameLayout
+        <androidx.core.widget.NestedScrollView
             android:id="@+id/container"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_weight="1"
             app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-            <com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
-                android:id="@+id/recyclerView"
+            <FrameLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:clipToPadding="false"
-                android:layoutAnimation="@anim/layout_animation_fall_down"
-                android:scrollbars="none" />
+                android:layout_height="wrap_content">
 
-            <com.google.android.material.textview.MaterialTextView
-                android:id="@android:id/empty"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="@string/empty"
-                android:textAppearance="@style/TextViewNormal"
-                android:textColor="?colorOnSecondary" />
-
-        </FrameLayout>
+                <com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
+                    android:id="@+id/recyclerView"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:clipToPadding="false"
+                    android:layoutAnimation="@anim/layout_animation_fall_down"
+                    android:scrollbars="none" />
 
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@android:id/empty"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:padding="24dp"
+                    android:text="@string/empty"
+                    android:textAppearance="@style/TextViewNormal"
+                    android:textColor="?colorOnSecondary" />
+            </FrameLayout>
+        </androidx.core.widget.NestedScrollView>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?dividerColor" />
-
-    <code.name.monkey.retromusic.views.BreadCrumbLayout
-        android:id="@+id/breadCrumbs"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/tab_height"
-        android:layout_weight="0"
-        android:background="?colorSurface"
-        android:elevation="6dp"
-        android:paddingStart="60dp"
-        android:paddingEnd="8dp" />
 </LinearLayout>
\ No newline at end of file