From da842396556248654acacfdebbc01f5e20132eb6 Mon Sep 17 00:00:00 2001
From: Amit Kumar <amitkma@e.email>
Date: Fri, 14 May 2021 21:20:57 +0530
Subject: Extract toolbar implementation and add back navigation support

---
 app/src/main/res/layout/fragment_dashboard.xml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'app/src/main/res/layout/fragment_dashboard.xml')

diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml
index 663c270..027945d 100644
--- a/app/src/main/res/layout/fragment_dashboard.xml
+++ b/app/src/main/res/layout/fragment_dashboard.xml
@@ -6,14 +6,7 @@
     android:layout_height="match_parent"
     >
 
-    <Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"
-        android:layout_gravity="top|center"
-        android:background="@color/white"
-        tools:layout_height="56dp"
-        />
+    <include layout="@layout/toolbar"/>
 
     <ProgressBar
         android:id="@+id/loadingSpinner"
-- 
cgit v1.2.1


From 47194484d7c2ca6ce8103312b9dbfb1244e8c4e6 Mon Sep 17 00:00:00 2001
From: Amit Kumar <amitkma@e.email>
Date: Sat, 15 May 2021 01:18:21 +0530
Subject: Use MaterialToolbar from MDC instead of android Toolbar

---
 app/src/main/res/layout/fragment_dashboard.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'app/src/main/res/layout/fragment_dashboard.xml')

diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml
index 027945d..dc79878 100644
--- a/app/src/main/res/layout/fragment_dashboard.xml
+++ b/app/src/main/res/layout/fragment_dashboard.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     >
 
-    <include layout="@layout/toolbar"/>
+    <include layout="@layout/topbar"/>
 
     <ProgressBar
         android:id="@+id/loadingSpinner"
@@ -20,8 +20,8 @@
         android:id="@+id/scrollContainer"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="?android:attr/actionBarSize"
         android:visibility="gone"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
         >
 
         <LinearLayout
@@ -340,4 +340,4 @@
 
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
-</FrameLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
-- 
cgit v1.2.1