From df7a8666172d78378854e5f7e1a549a8c694a1be Mon Sep 17 00:00:00 2001
From: Viktor De Pasquale <info@depasquale.wiki>
Date: Sat, 5 Oct 2019 22:51:21 +0200
Subject: [PATCH] Fixed widget order

Content mustn't overlay appbar
---
 app/src/main/res/layout/activity_main_md2.xml | 13 +++++--------
 app/src/main/res/layout/fragment_home_md2.xml |  2 +-
 app/src/main/res/values-night/styles_md2.xml  |  4 ++--
 app/src/main/res/values/dimens.xml            |  2 ++
 app/src/main/res/values/styles_md2.xml        |  6 +++---
 app/src/main/res/values/styles_md2_impl.xml   |  3 ++-
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/src/main/res/layout/activity_main_md2.xml b/app/src/main/res/layout/activity_main_md2.xml
index 06bff9461..1fe7d72de 100644
--- a/app/src/main/res/layout/activity_main_md2.xml
+++ b/app/src/main/res/layout/activity_main_md2.xml
@@ -19,11 +19,15 @@
         android:paddingRight="@{viewModel.insets.right}"
         tools:ignore="RtlHardcoded">
 
+        <FrameLayout
+            android:id="@+id/main_nav_host"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
         <com.google.android.material.appbar.AppBarLayout
             style="?styleAppbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?colorSurfaceVariant"
             android:paddingTop="@{viewModel.insets.top}"
             tools:paddingTop="24dp">
 
@@ -31,7 +35,6 @@
                 android:id="@+id/main_toolbar"
                 style="?styleToolbar"
                 android:layout_width="match_parent"
-                android:layout_height="?actionBarSize"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_scrollFlags="noScroll"
                 tools:title="Home" />
@@ -44,12 +47,6 @@
 
         </com.google.android.material.appbar.AppBarLayout>
 
-        <FrameLayout
-            android:id="@+id/main_nav_host"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
-
         <com.google.android.material.bottomappbar.BottomAppBar
             android:id="@+id/main_bottom_bar"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_home_md2.xml b/app/src/main/res/layout/fragment_home_md2.xml
index 719b847a6..832d886fd 100644
--- a/app/src/main/res/layout/fragment_home_md2.xml
+++ b/app/src/main/res/layout/fragment_home_md2.xml
@@ -18,7 +18,7 @@
         android:layout_height="match_parent"
         android:clipToPadding="false"
         android:paddingStart="@dimen/l1"
-        android:paddingTop="@dimen/l1"
+        android:paddingTop="@{viewModel.insets.top + (int) @dimen/internal_action_bar_size + (int) @dimen/l1}"
         android:paddingEnd="@dimen/l1"
         android:paddingBottom="@{viewModel.insets.bottom + (int) @dimen/margin_fab}"
         tools:layout_marginTop="24dp">
diff --git a/app/src/main/res/values-night/styles_md2.xml b/app/src/main/res/values-night/styles_md2.xml
index 45fb2240c..8ea45210e 100644
--- a/app/src/main/res/values-night/styles_md2.xml
+++ b/app/src/main/res/values-night/styles_md2.xml
@@ -7,9 +7,9 @@
         <item name="colorSecondary">#00C853</item>
         <item name="colorSecondaryVariant">#8000C853</item>
         <item name="colorSurface">#0D0D0D</item>
-        <item name="colorSurfaceVariant">#0DFFFFFF</item>
+        <item name="colorSurfaceVariant">#D9191919</item>
         <item name="colorOnPrimary">#F2F2F2</item>
-        <item name="colorOnPrimaryVariant">#80F2F2F2</item>
+        <item name="colorOnPrimaryVariant">#D9E6E6E6</item>
         <item name="colorOnSecondary">#F2F2F2</item>
         <item name="colorOnBackground">?colorOnSurface</item>
         <item name="colorError">#CC0047</item>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 924237a01..1f6e3b328 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -19,4 +19,6 @@
 
     <!--l1 + fab size-->
     <dimen name="margin_fab">80dp</dimen>
+
+    <dimen name="internal_action_bar_size">56dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles_md2.xml b/app/src/main/res/values/styles_md2.xml
index 8b68efc48..a260074f6 100644
--- a/app/src/main/res/values/styles_md2.xml
+++ b/app/src/main/res/values/styles_md2.xml
@@ -23,7 +23,7 @@
         <!--///-->
 
         <item name="selectableItemBackground">@drawable/bg_selectable</item>
-        <item name="actionBarSize">60dp</item>
+        <item name="actionBarSize">@dimen/internal_action_bar_size</item>
 
         <item name="styleAppbar">@style/WidgetFoundation.Appbar</item>
 
@@ -84,9 +84,9 @@
         <item name="colorSecondary">#00C853</item>
         <item name="colorSecondaryVariant">#8000C853</item>
         <item name="colorSurface">#F2F2F2</item>
-        <item name="colorSurfaceVariant">#0D000000</item>
+        <item name="colorSurfaceVariant">#D9E6E6E6</item>
         <item name="colorOnPrimary">#F2F2F2</item>
-        <item name="colorOnPrimaryVariant">#80F2F2F2</item>
+        <item name="colorOnPrimaryVariant">#D9E6E6E6</item>
         <item name="colorOnSecondary">#F2F2F2</item>
         <item name="colorOnBackground">#F2F2F2</item>
         <item name="colorError">#CC0047</item>
diff --git a/app/src/main/res/values/styles_md2_impl.xml b/app/src/main/res/values/styles_md2_impl.xml
index 4439d6dbf..22f6373ff 100644
--- a/app/src/main/res/values/styles_md2_impl.xml
+++ b/app/src/main/res/values/styles_md2_impl.xml
@@ -9,7 +9,7 @@ variant. Make sure to use style referenced by attribute defined it attrs.xml.
 
     <style name="WidgetFoundation.Appbar" parent="Widget.MaterialComponents.AppBarLayout.Surface">
         <item name="elevation">0dp</item>
-        <item name="android:background">?attr/colorSurface</item>
+        <item name="android:background">?colorSurfaceVariant</item>
     </style>
 
     <style name="WidgetFoundation.Toolbar" parent="Widget.MaterialComponents.Toolbar.Surface">
@@ -19,6 +19,7 @@ variant. Make sure to use style referenced by attribute defined it attrs.xml.
         <item name="subtitleTextColor">?colorOnSurfaceVariant</item>
         <item name="android:background">@android:color/transparent</item>
         <item name="contentInsetStartWithNavigation">0dp</item>
+        <item name="android:layout_height">?actionBarSize</item>
     </style>