From d1913702fe8ea6fe5f2ed37aeeff1f512b7648d8 Mon Sep 17 00:00:00 2001
From: Johan von Forstner <johan.forstner@gmail.com>
Date: Sun, 5 Apr 2020 19:04:26 +0200
Subject: [PATCH] fix position of toolbar

---
 app/build.gradle                          |  2 +-
 app/src/main/res/layout/activity_maps.xml |  1 +
 app/src/main/res/layout/fragment_map.xml  | 47 +++++++++++++----------
 app/src/main/res/values/colors.xml        |  1 +
 4 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index df4b8ca3..a9929bf1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -66,7 +66,7 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
     implementation 'com.google.maps.android:android-maps-utils:0.5'
-    implementation 'com.github.johan12345:CustomBottomSheetBehavior:efe0127962'
+    implementation 'com.github.johan12345:CustomBottomSheetBehavior:4e43539e'
     implementation 'com.google.android.gms:play-services-maps:17.0.0'
     implementation 'com.google.android.gms:play-services-location:17.0.0'
     implementation 'com.squareup.retrofit2:retrofit:2.7.2'
diff --git a/app/src/main/res/layout/activity_maps.xml b/app/src/main/res/layout/activity_maps.xml
index 05821369..9ab7251b 100644
--- a/app/src/main/res/layout/activity_maps.xml
+++ b/app/src/main/res/layout/activity_maps.xml
@@ -10,6 +10,7 @@
         android:name="androidx.navigation.fragment.NavHostFragment"
         android:layout_height="match_parent"
         android:layout_width="match_parent"
+        android:fitsSystemWindows="true"
         app:defaultNavHost="true"
         app:navGraph="@navigation/nav_graph" />
 
diff --git a/app/src/main/res/layout/fragment_map.xml b/app/src/main/res/layout/fragment_map.xml
index 425ef466..dce9bd29 100644
--- a/app/src/main/res/layout/fragment_map.xml
+++ b/app/src/main/res/layout/fragment_map.xml
@@ -15,43 +15,48 @@
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:id="@+id/root"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fitsSystemWindows="false">
+        android:layout_height="match_parent">
 
         <fragment
             android:id="@+id/map"
             android:name="com.google.android.gms.maps.SupportMapFragment"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:fitsSystemWindows="true"
             tools:context=".MapsActivity" />
 
-        <com.google.android.material.appbar.AppBarLayout
-            android:id="@+id/toolbar_container"
+        <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="8dp"
-            android:elevation="8dp"
-            app:layout_behavior="@string/ScrollingAppBarLayoutBehavior"
-            android:background="@drawable/rounded_rect_4dp"
-            android:backgroundTint="?android:colorBackground">
+            android:fitsSystemWindows="true"
+            app:layout_behavior="@string/ScrollingAppBarLayoutBehavior">
 
-            <androidx.appcompat.widget.Toolbar
-                android:id="@+id/toolbar"
+            <com.google.android.material.appbar.AppBarLayout
+                android:id="@+id/toolbar_container"
                 android:layout_width="match_parent"
-                android:layout_height="48dp">
+                android:layout_height="wrap_content"
+                android:layout_margin="8dp"
+                android:elevation="8dp"
+                android:background="@drawable/rounded_rect_4dp"
+                android:backgroundTint="?android:colorBackground">
 
-                <TextView
-                    android:id="@+id/search"
+                <androidx.appcompat.widget.Toolbar
+                    android:id="@+id/toolbar"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/search"
-                    android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
-                    android:textColor="?android:textColorSecondary" />
+                    android:layout_height="48dp">
 
-            </androidx.appcompat.widget.Toolbar>
+                    <TextView
+                        android:id="@+id/search"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/search"
+                        android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
+                        android:textColor="?android:textColorSecondary" />
 
-        </com.google.android.material.appbar.AppBarLayout>
+                </androidx.appcompat.widget.Toolbar>
+
+            </com.google.android.material.appbar.AppBarLayout>
+
+        </FrameLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/gallery"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index b3bdfda2..71fbc619 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -11,4 +11,5 @@
     <color name="charger_low">#9e9e9e</color>
     <color name="available">#4caf50</color>
     <color name="unavailable">#f44336</color>
+    <color name="status_bar_scrim">#C3000000</color>
 </resources>