From 4252ae7360b119c85e4a1292d4cf4abca190d35c Mon Sep 17 00:00:00 2001
From: Laurent <laurent@staxriver.com>
Date: Tue, 2 Feb 2021 11:56:17 +0100
Subject: [PATCH] Hope it fixes crash

---
 .../android/ui/activity/GraphActivity.kt      | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 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 5c0d084c..b9c45523 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
@@ -24,9 +24,11 @@ class GraphActivity : BaseActivity(), ViewModelHolder {
 
 	companion object {
 
+		const val styleKey = "style"
+
 		private var lineDataSets: List<LineDataSet>? = null
 		private var barDataSets: List<BarDataSet>? = null
-		private var style: Graph.Style? = null
+//		private var style: Graph.Style? = null
 		private var activityTitle: String? = null
 
 		/***
@@ -34,10 +36,11 @@ class GraphActivity : BaseActivity(), ViewModelHolder {
 		 */
 		fun newLineInstance(context: Context, lineDataSets: List<LineDataSet>, title: String? = null) {
 			this.lineDataSets = lineDataSets
-			this.style = Graph.Style.LINE
+//			this.style = Graph.Style.LINE
 			this.activityTitle = title
 
 			val intent = Intent(context, GraphActivity::class.java)
+			intent.putExtra(styleKey, Graph.Style.LINE.ordinal)
 			context.startActivity(intent)
 		}
 
@@ -46,10 +49,11 @@ class GraphActivity : BaseActivity(), ViewModelHolder {
 		 */
 		fun newBarInstance(context: Context, barDataSets: List<BarDataSet>, title: String? = null) {
 			this.barDataSets = barDataSets
-			this.style = Graph.Style.BAR
+//			this.style = Graph.Style.BAR
 			this.activityTitle = title
 
 			val intent = Intent(context, GraphActivity::class.java)
+			intent.putExtra(styleKey, Graph.Style.BAR.ordinal)
 			context.startActivity(intent)
 		}
 
@@ -93,11 +97,14 @@ class GraphActivity : BaseActivity(), ViewModelHolder {
 			}
 		}
 
-		style?.let {
-			this.model.style = it
-		}
+		val styleIndex = this.intent.getIntExtra(styleKey, -1)
+		val style = Graph.Style.values()[styleIndex]
 
-		val style = style ?: this.model.style ?: throw PAIllegalStateException("Graph style not defined")
+//		style?.let {
+//			this.model.style = it
+//		}
+//
+//		val style = style ?: this.model.style ?: throw PAIllegalStateException("Graph style not defined")
 
 		val fragmentTransaction = supportFragmentManager.beginTransaction()
 		val graphFragment = GraphFragment.newInstance(style)