From f95b620c46d3632f50854cf8096868e0ad42326d Mon Sep 17 00:00:00 2001
From: Aurelien Hubert <aurel.hubert@gmail.com>
Date: Fri, 12 Apr 2019 14:02:49 +0200
Subject: [PATCH] Update Graph UI

---
 .../android/ui/activity/GraphActivity.kt      |  8 ++++--
 .../android/ui/fragment/GraphFragment.kt      | 14 ++--------
 app/src/main/res/layout/activity_graph.xml    | 28 +++++++++++++++----
 app/src/main/res/layout/fragment_evograph.xml | 11 +-------
 4 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/app/src/main/java/net/pokeranalytics/android/ui/activity/GraphActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/activity/GraphActivity.kt
index e0a840d9..dfb626d5 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/activity/GraphActivity.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/activity/GraphActivity.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import com.github.mikephil.charting.data.Entry
+import kotlinx.android.synthetic.main.activity_graph.*
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.calculus.Stat
 import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
@@ -30,9 +31,7 @@ class GraphActivity : PokerAnalyticsActivity() {
 		 * Default constructor
 		 */
 		fun newInstance(context: Context, stat: Stat, entries: List<Entry>) {
-
-			GraphActivity.parameters = GraphParameters(stat, entries)
-
+			parameters = GraphParameters(stat, entries)
 			val intent = Intent(context, GraphActivity::class.java)
 			context.startActivity(intent)
 		}
@@ -50,6 +49,9 @@ class GraphActivity : PokerAnalyticsActivity() {
 	 */
 	private fun initUI() {
 
+		setSupportActionBar(toolbar)
+		supportActionBar?.setDisplayHomeAsUpEnabled(true)
+
 		val fragmentManager = supportFragmentManager
 		val fragmentTransaction = fragmentManager.beginTransaction()
 		val fragment = GraphFragment()
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt
index 1293fc0a..9577935c 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt
@@ -36,8 +36,8 @@ class GraphFragment : PokerAnalyticsFragment(), OnChartValueSelectedListener {
 	private lateinit var parentActivity: PokerAnalyticsActivity
 	lateinit var dataSource: GraphDataSource
 
-	lateinit var stat: Stat
-	lateinit var entries: List<Entry>
+	private var stat: Stat = Stat.NETRESULT
+	private var entries: List<Entry> = ArrayList()
 
 	lateinit var legendView: LegendView
 	lateinit var chartView: BarLineChartBase<*>
@@ -66,20 +66,12 @@ class GraphFragment : PokerAnalyticsFragment(), OnChartValueSelectedListener {
 	private fun initUI() {
 
 		parentActivity = activity as PokerAnalyticsActivity
+		parentActivity.title = stat.localizedTitle(requireContext())
 
 		this.legendView = LegendView(requireContext())
 		this.legendContainer.addView(this.legendView)
 		this.legendView.prepareWithStat(this.stat)
 
-		// Avoid a bug during setting the title
-		toolbar.title = ""
-
-		parentActivity.setSupportActionBar(toolbar)
-		parentActivity.supportActionBar?.setDisplayHomeAsUpEnabled(true)
-		setHasOptionsMenu(true)
-
-		toolbar.title = stat.localizedTitle(requireContext())
-
 		val dataSet = LineDataSet(this.entries, this.stat.name)
 		val colors = arrayOf(R.color.green_light).toIntArray()
 		dataSet.setColors(colors, context)
diff --git a/app/src/main/res/layout/activity_graph.xml b/app/src/main/res/layout/activity_graph.xml
index b1ce6c7a..44e1e283 100644
--- a/app/src/main/res/layout/activity_graph.xml
+++ b/app/src/main/res/layout/activity_graph.xml
@@ -1,8 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-		xmlns:android="http://schemas.android.com/apk/res/android"
-		android:id="@+id/container"
+<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.appcompat.widget.Toolbar
+		android:id="@+id/toolbar"
 		android:layout_width="match_parent"
-		android:layout_height="match_parent">
+		android:layout_height="?attr/actionBarSize"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent"
+		tools:title="@string/app_name" />
+
+	<FrameLayout
+		android:id="@+id/container"
+		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/toolbar" />
 
-</FrameLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_evograph.xml b/app/src/main/res/layout/fragment_evograph.xml
index eba9d9ac..63506299 100644
--- a/app/src/main/res/layout/fragment_evograph.xml
+++ b/app/src/main/res/layout/fragment_evograph.xml
@@ -5,22 +5,13 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_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"
-		tools:title="@string/app_name" />
-
 	<FrameLayout
 		android:id="@+id/legendContainer"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/toolbar" />
+		app:layout_constraintTop_toTopOf="parent" />
 
 	<FrameLayout
 		android:id="@+id/chartContainer"