From d3a65a1c7f9b55d0754636365a3eac89afdd6f4e Mon Sep 17 00:00:00 2001
From: Aurelien Hubert <aurelien@MacBook-Pro-Aurelien.local>
Date: Fri, 17 May 2019 12:06:22 +0200
Subject: [PATCH] Update layouts

---
 .../res/layout-sw320dp/fragment_calendar.xml  |   9 +
 .../res/layout-sw400dp/fragment_calendar.xml  |   9 +
 app/src/main/res/layout/activity_home.xml     |  11 +-
 app/src/main/res/layout/fragment_calendar.xml |   9 +
 app/src/main/res/layout/fragment_feed.xml     | 184 +++++++++---------
 app/src/main/res/layout/fragment_more.xml     |  43 ++--
 app/src/main/res/layout/fragment_reports.xml  |  42 ++--
 app/src/main/res/layout/fragment_stats.xml    |  40 ++--
 8 files changed, 210 insertions(+), 137 deletions(-)

diff --git a/app/src/main/res/layout-sw320dp/fragment_calendar.xml b/app/src/main/res/layout-sw320dp/fragment_calendar.xml
index 7bb22310..e5673d6d 100644
--- a/app/src/main/res/layout-sw320dp/fragment_calendar.xml
+++ b/app/src/main/res/layout-sw320dp/fragment_calendar.xml
@@ -13,6 +13,15 @@
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="parent">
 
+		<androidx.appcompat.widget.Toolbar
+			android:id="@+id/toolbar"
+			android:layout_width="match_parent"
+			android:layout_height="?attr/actionBarSize"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="parent"
+			app:title="@string/calendar" />
+
 		<LinearLayout
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout-sw400dp/fragment_calendar.xml b/app/src/main/res/layout-sw400dp/fragment_calendar.xml
index 7bc77927..5f6cda4a 100644
--- a/app/src/main/res/layout-sw400dp/fragment_calendar.xml
+++ b/app/src/main/res/layout-sw400dp/fragment_calendar.xml
@@ -13,6 +13,15 @@
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="parent">
 
+		<androidx.appcompat.widget.Toolbar
+			android:id="@+id/toolbar"
+			android:layout_width="match_parent"
+			android:layout_height="?attr/actionBarSize"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="parent"
+			app:title="@string/calendar" />
+
 		<LinearLayout
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index 4f76f96f..dd080ad1 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -6,15 +6,6 @@
 	android:layout_height="match_parent"
 	tools:context=".ui.activity.HomeActivity">
 
-	<androidx.appcompat.widget.Toolbar
-		android:id="@+id/toolbar"
-		android:layout_width="match_parent"
-		android:layout_height="?attr/actionBarSize"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toTopOf="parent"
-		app:title="@string/app_name" />
-
 	<net.pokeranalytics.android.ui.view.NoPagingViewPager
 		android:id="@+id/viewPager"
 		android:layout_width="0dp"
@@ -22,7 +13,7 @@
 		app:layout_constraintBottom_toTopOf="@+id/navigation"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/toolbar" />
+		app:layout_constraintTop_toTopOf="parent" />
 
 	<com.google.android.material.bottomnavigation.BottomNavigationView
 		android:id="@+id/navigation"
diff --git a/app/src/main/res/layout/fragment_calendar.xml b/app/src/main/res/layout/fragment_calendar.xml
index 642db7b7..8675f607 100644
--- a/app/src/main/res/layout/fragment_calendar.xml
+++ b/app/src/main/res/layout/fragment_calendar.xml
@@ -14,6 +14,15 @@
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="parent">
 
+		<androidx.appcompat.widget.Toolbar
+			android:id="@+id/toolbar"
+			android:layout_width="match_parent"
+			android:layout_height="?attr/actionBarSize"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="parent"
+			app:title="@string/calendar" />
+
 		<LinearLayout
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_feed.xml b/app/src/main/res/layout/fragment_feed.xml
index 736dbfc7..b2ebe18c 100644
--- a/app/src/main/res/layout/fragment_feed.xml
+++ b/app/src/main/res/layout/fragment_feed.xml
@@ -1,118 +1,126 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-		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:id="@+id/container"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		tools:context=".ui.activity.HomeActivity">
+<androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/container"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	tools:context=".ui.activity.HomeActivity">
 
 	<com.google.android.material.appbar.AppBarLayout
-			android:id="@+id/appBar"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:theme="@style/PokerAnalyticsTheme.Toolbar.Session"
+		android:id="@+id/appBar"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:theme="@style/PokerAnalyticsTheme.Toolbar.Session"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent">
+
+		<androidx.appcompat.widget.Toolbar
+			android:id="@+id/toolbar"
+			android:layout_width="match_parent"
+			android:layout_height="?attr/actionBarSize"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toTopOf="parent">
+			app:layout_constraintTop_toTopOf="parent"
+			app:title="@string/feed" />
 
 		<com.google.android.material.tabs.TabLayout
-				android:id="@+id/tabs"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				app:tabMode="fixed">
+			android:id="@+id/tabs"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			app:tabMode="fixed">
 
 			<com.google.android.material.tabs.TabItem
-					android:id="@+id/filterSessions"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="@string/sessions"/>
+				android:id="@+id/filterSessions"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="@string/sessions" />
 
 			<com.google.android.material.tabs.TabItem
-					android:id="@+id/filterTransactions"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="@string/operations"/>
+				android:id="@+id/filterTransactions"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="@string/operations" />
 
 		</com.google.android.material.tabs.TabLayout>
 
 	</com.google.android.material.appbar.AppBarLayout>
 
 	<androidx.recyclerview.widget.RecyclerView
-			android:id="@+id/recyclerView"
-			android:layout_width="0dp"
-			android:layout_height="0dp"
-			app:layout_constraintBottom_toBottomOf="parent"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/appBar"
-			tools:listitem="@layout/row_feed_session"/>
+		android:id="@+id/recyclerView"
+		android:layout_width="0dp"
+		android:layout_height="0dp"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/appBar"
+		tools:listitem="@layout/row_feed_session" />
 
 	<androidx.appcompat.widget.AppCompatTextView
-			android:id="@+id/noSessionFound"
-			style="@style/PokerAnalyticsTheme.TextView.Header"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_marginStart="8dp"
-			android:layout_marginTop="8dp"
-			android:layout_marginEnd="8dp"
-			android:layout_marginBottom="8dp"
-			android:text="@string/no_sessions"
-			android:textSize="24sp"
-			android:visibility="gone"
-			app:layout_constraintBottom_toBottomOf="parent"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toTopOf="parent"
-			app:layout_constraintVertical_bias="0.5"
-			tools:visibility="visible"/>
+		android:id="@+id/noSessionFound"
+		style="@style/PokerAnalyticsTheme.TextView.Header"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="8dp"
+		android:layout_marginTop="8dp"
+		android:layout_marginEnd="8dp"
+		android:layout_marginBottom="8dp"
+		android:text="@string/no_sessions"
+		android:textSize="24sp"
+		android:visibility="gone"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent"
+		app:layout_constraintVertical_bias="0.5"
+		tools:visibility="visible" />
 
 	<com.google.android.material.floatingactionbutton.FloatingActionButton
-			android:id="@+id/addButton"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_gravity="bottom|end"
-			android:layout_marginEnd="16dp"
-			android:layout_marginBottom="16dp"
-			android:src="@drawable/ic_add"
-			android:tint="@color/black"
-			android:transitionName="floating_action_button"
-			app:fabSize="normal"
-			app:layout_constraintBottom_toBottomOf="parent"
-			app:layout_constraintEnd_toEndOf="parent"/>
+		android:id="@+id/addButton"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="bottom|end"
+		android:layout_marginEnd="16dp"
+		android:layout_marginBottom="16dp"
+		android:src="@drawable/ic_add"
+		android:tint="@color/black"
+		android:transitionName="floating_action_button"
+		app:fabSize="normal"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="parent" />
 
 	<androidx.appcompat.widget.LinearLayoutCompat
-			android:id="@+id/disclaimerContainer"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:background="@color/green_darker"
-			android:orientation="vertical"
-			android:padding="24dp"
-			android:elevation="8dp"
-			app:layout_constraintBottom_toBottomOf="parent"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent">
+		android:id="@+id/disclaimerContainer"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:background="@color/green_darker"
+		android:elevation="8dp"
+		android:orientation="vertical"
+		android:padding="24dp"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent">
 
 		<androidx.appcompat.widget.AppCompatTextView
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_marginStart="8dp"
-				android:layout_marginEnd="8dp"
-				android:layout_marginBottom="8dp"
-				android:text="@string/disclaimer"
-				android:textSize="18sp"
-				tools:visibility="visible"/>
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="8dp"
+			android:layout_marginEnd="8dp"
+			android:layout_marginBottom="8dp"
+			android:text="@string/disclaimer"
+			android:textSize="18sp"
+			tools:visibility="visible" />
 
 		<com.google.android.material.button.MaterialButton
-				android:id="@+id/disclaimerDismiss"
-				style="@style/PokerAnalyticsTheme.Button"
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginStart="8dp"
-				android:layout_marginTop="8dp"
-				android:layout_marginEnd="16dp"
-				android:text="@string/iunderstand"/>
+			android:id="@+id/disclaimerDismiss"
+			style="@style/PokerAnalyticsTheme.Button"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="8dp"
+			android:layout_marginTop="8dp"
+			android:layout_marginEnd="16dp"
+			android:text="@string/iunderstand" />
 
 	</androidx.appcompat.widget.LinearLayoutCompat>
 
diff --git a/app/src/main/res/layout/fragment_more.xml b/app/src/main/res/layout/fragment_more.xml
index aaa1d704..aecbe709 100644
--- a/app/src/main/res/layout/fragment_more.xml
+++ b/app/src/main/res/layout/fragment_more.xml
@@ -1,18 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-		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">
+<androidx.constraintlayout.widget.ConstraintLayout 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">
 
-	<androidx.recyclerview.widget.RecyclerView
-			android:id="@+id/recyclerView"
-			android:layout_width="0dp"
-			android:layout_height="0dp"
-			app:layout_constraintBottom_toBottomOf="parent"
+	<com.google.android.material.appbar.AppBarLayout
+		android:id="@+id/appBar"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:theme="@style/PokerAnalyticsTheme.Toolbar.Session"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent">
+
+		<androidx.appcompat.widget.Toolbar
+			android:id="@+id/toolbar"
+			android:layout_width="match_parent"
+			android:layout_height="?attr/actionBarSize"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toTopOf="parent" />
+			app:layout_constraintTop_toTopOf="parent"
+			app:title="@string/more" />
+
+	</com.google.android.material.appbar.AppBarLayout>
+
+	<androidx.recyclerview.widget.RecyclerView
+		android:id="@+id/recyclerView"
+		android:layout_width="0dp"
+		android:layout_height="0dp"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/appBar" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_reports.xml b/app/src/main/res/layout/fragment_reports.xml
index 461dce4c..f7a184d4 100644
--- a/app/src/main/res/layout/fragment_reports.xml
+++ b/app/src/main/res/layout/fragment_reports.xml
@@ -1,19 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-		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">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
 
-	<androidx.recyclerview.widget.RecyclerView
-			android:id="@+id/recyclerView"
-			android:layout_width="0dp"
-			android:layout_height="0dp"
-			app:layout_constraintBottom_toBottomOf="parent"
+	<com.google.android.material.appbar.AppBarLayout
+		android:id="@+id/appBar"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:theme="@style/PokerAnalyticsTheme.Toolbar.Session"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent">
+
+		<androidx.appcompat.widget.Toolbar
+			android:id="@+id/toolbar"
+			android:layout_width="match_parent"
+			android:layout_height="?attr/actionBarSize"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toTopOf="parent" />
+			app:layout_constraintTop_toTopOf="parent"
+			app:title="@string/reports" />
+
+	</com.google.android.material.appbar.AppBarLayout>
+
+	<androidx.recyclerview.widget.RecyclerView
+		android:id="@+id/recyclerView"
+		android:layout_width="0dp"
+		android:layout_height="0dp"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/appBar" />
 
 	<com.google.android.material.floatingactionbutton.FloatingActionButton
 		android:id="@+id/addButton"
diff --git a/app/src/main/res/layout/fragment_stats.xml b/app/src/main/res/layout/fragment_stats.xml
index e2581b98..468e754d 100644
--- a/app/src/main/res/layout/fragment_stats.xml
+++ b/app/src/main/res/layout/fragment_stats.xml
@@ -1,9 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-		xmlns:android="http://schemas.android.com/apk/res/android"
-		xmlns:app="http://schemas.android.com/apk/res-auto"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<com.google.android.material.appbar.AppBarLayout
+		android:id="@+id/appBar"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:theme="@style/PokerAnalyticsTheme.Toolbar.Session"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent">
+
+		<androidx.appcompat.widget.Toolbar
+			android:id="@+id/toolbar"
+			android:layout_width="match_parent"
+			android:layout_height="?attr/actionBarSize"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="parent"
+			app:title="@string/stats" />
+
+	</com.google.android.material.appbar.AppBarLayout>
 
 	<FrameLayout
 		android:id="@+id/tableContainer"
@@ -12,15 +31,6 @@
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toTopOf="parent" />
-
-	<!--<androidx.recyclerview.widget.RecyclerView-->
-			<!--android:id="@+id/recyclerView"-->
-			<!--android:layout_width="0dp"-->
-			<!--android:layout_height="0dp"-->
-			<!--app:layout_constraintBottom_toBottomOf="parent"-->
-			<!--app:layout_constraintEnd_toEndOf="parent"-->
-			<!--app:layout_constraintStart_toStartOf="parent"-->
-			<!--app:layout_constraintTop_toTopOf="parent" />-->
+		app:layout_constraintTop_toBottomOf="@+id/appBar" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file