Update graph with legend and data

app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt

@@ -23,6 +23,28 @@ interface StatBase : RealmModel {
 
 }
 
+enum class GraphType {
+	LINE,
+	BAR,
+}
+
+enum class AggregationType {
+	SESSION,
+	MONTH,
+	YEAR,
+	DURATION;
+
+	val resId: Int
+	get() {
+		return when (this) {
+			SESSION -> R.string.session
+			MONTH -> R.string.month
+			YEAR -> R.string.year
+			DURATION -> R.string.duration
+		}
+	}
+}
+
 /**
  * An enum representing all the types of Session statistics
  */
@@ -165,6 +187,22 @@ enum class Stat(var underlyingClass: Class<out Timed>? = null) : RowRepresentabl
 		}
 	}
 
+	val graphType: GraphType
+		get() {
+			return when (this) {
+				NUMBER_OF_SETS, NUMBER_OF_GAMES -> GraphType.BAR
+				else -> GraphType.LINE
+			}
+		}
+
+	val aggregationTypes: List<AggregationType>
+		get() {
+			return when (this) {
+				NETRESULT -> listOf(AggregationType.SESSION, AggregationType.MONTH, AggregationType.YEAR, AggregationType.DURATION)
+				else -> listOf(AggregationType.SESSION, AggregationType.MONTH, AggregationType.YEAR, AggregationType.DURATION)
+			}
+		}
+
 	override val viewType: Int = RowViewType.TITLE_VALUE.ordinal
 }
 

app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt

@@ -4,17 +4,24 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import com.github.mikephil.charting.charts.BarChart
+import com.github.mikephil.charting.charts.BarLineChartBase
+import com.github.mikephil.charting.charts.LineChart
 import com.github.mikephil.charting.data.Entry
 import com.github.mikephil.charting.data.LineData
 import com.github.mikephil.charting.data.LineDataSet
 import com.github.mikephil.charting.highlight.Highlight
 import com.github.mikephil.charting.listener.OnChartValueSelectedListener
-import kotlinx.android.synthetic.main.fragment_graph.*
+import com.google.android.material.chip.Chip
+import kotlinx.android.synthetic.main.fragment_evograph.*
 import net.pokeranalytics.android.R
+import net.pokeranalytics.android.calculus.GraphType
 import net.pokeranalytics.android.calculus.Stat
 import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
 import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment
 import net.pokeranalytics.android.ui.graph.setStyle
+import net.pokeranalytics.android.ui.view.LegendView
+import net.pokeranalytics.android.util.extensions.px
 
 interface GraphDataSource {
 
@@ -29,6 +36,9 @@ class GraphFragment : PokerAnalyticsFragment(), OnChartValueSelectedListener {
 	lateinit var stat: Stat
 	lateinit var entries: List<Entry>
 
+	lateinit var legendView: LegendView
+	lateinit var chartView: BarLineChartBase<*>
+
 	companion object {
 
 	}
@@ -39,7 +49,7 @@ class GraphFragment : PokerAnalyticsFragment(), OnChartValueSelectedListener {
 	}
 
 	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-		return inflater.inflate(R.layout.fragment_graph, container, false)
+		return inflater.inflate(R.layout.fragment_evograph, container, false)
 	}
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -54,6 +64,10 @@ class GraphFragment : PokerAnalyticsFragment(), OnChartValueSelectedListener {
 
 		parentActivity = activity as PokerAnalyticsActivity
 
+		this.legendView = LegendView(requireContext())
+		this.legendContainer.addView(this.legendView)
+		this.legendView.prepareWithStat(this.stat)
+
 		// Avoid a bug during setting the title
 		toolbar.title = ""
 
@@ -69,10 +83,36 @@ class GraphFragment : PokerAnalyticsFragment(), OnChartValueSelectedListener {
 		dataSet.setColors(colors, context)
 		val lineData = LineData(listOf(dataSet))
 
-		this.chart.setStyle()
+		this.chartView = when (stat.graphType) {
+			GraphType.LINE -> {
+				val lineChart = LineChart(context)
+				lineChart.data = lineData
+				lineChart
+			}
+			GraphType.BAR -> {
+				val barChart = BarChart(context)
+				barChart
+			}
+		}
+
+		this.chartContainer.addView(this.chartView)
 
-		this.chart.data = lineData
+		this.chartView.setStyle(requireContext())
-		this.chart.setOnChartValueSelectedListener(this)
+		this.chartView.setOnChartValueSelectedListener(this)
+
+		this.stat.aggregationTypes.forEachIndexed { index, type ->
+
+			val chip = Chip(requireContext())
+			chip.text = requireContext().getString(type.resId)
+			chip.chipStartPadding = 8f.px
+			chip.chipEndPadding = 8f.px
+			chip.isChecked = index == 0
+			this.chipGroup.addView(chip)
+		}
+
+		this.chipGroup.setOnCheckedChangeListener { group, i ->
+
+		}
 
 	}
 
@@ -101,7 +141,7 @@ class GraphFragment : PokerAnalyticsFragment(), OnChartValueSelectedListener {
 
 				}
 
-				this.text.text = ""
+//				this.text.text = ""
 
 
 

app/src/main/java/net/pokeranalytics/android/ui/graph/GraphExtensions.kt

@@ -1,24 +1,25 @@
 package net.pokeranalytics.android.ui.graph
 
-import com.github.mikephil.charting.charts.BarChart
+import android.content.Context
+import androidx.core.content.ContextCompat
 import com.github.mikephil.charting.charts.BarLineChartBase
-import com.github.mikephil.charting.charts.LineChart
+import net.pokeranalytics.android.R
 
-fun BarChart.setStyle() {
+//fun BarChart.setStyle(context: Context) {
-	GraphHelper.setStyle(this)
+//	GraphHelper.setStyle(this, context)
-}
+//}
 
-fun LineChart.setStyle() {
+fun BarLineChartBase<*>.setStyle(context: Context) {
-	GraphHelper.setStyle(this)
+	GraphHelper.setStyle(this, context)
 }
 
 class GraphHelper {
 
 	companion object {
 
-		fun setStyle(chart: BarLineChartBase<*>) {
+		fun setStyle(chart: BarLineChartBase<*>, context: Context) {
 
-//			this.xAxis.axisLineColor = ContextCompat.getColor(context, R.color.) ChartAppearance.defaultColor
+			chart.xAxis.axisLineColor = ContextCompat.getColor(context, R.color.chart_default)
 //					this.xAxis.axisLineWidth = ChartAppearance.lineWidth
 //			this.xAxis.enableGridDashedLine(3.0f, 5.0f, 1.0f)
 //

app/src/main/java/net/pokeranalytics/android/ui/view/LegendView.kt

@@ -0,0 +1,66 @@
+package net.pokeranalytics.android.ui.view
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.widget.FrameLayout
+import androidx.constraintlayout.widget.ConstraintLayout
+import kotlinx.android.synthetic.main.layout_legend_default.view.*
+import net.pokeranalytics.android.R
+import net.pokeranalytics.android.calculus.Stat
+import net.pokeranalytics.android.model.realm.Session
+
+
+/**
+ * Display a row session
+ */
+class LegendView : FrameLayout {
+
+	private lateinit var legendLayout: ConstraintLayout
+
+	/**
+	 * Constructors
+	 */
+	constructor(context: Context) : super(context) {
+		init()
+	}
+
+	constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) {
+		init()
+	}
+
+	constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
+		init()
+	}
+
+	/**
+	 * Init
+	 */
+	private fun init() {
+		val layoutInflater = LayoutInflater.from(context)
+		legendLayout = layoutInflater.inflate(R.layout.layout_legend_default, this, false) as ConstraintLayout
+		val layoutParams = FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT)
+		addView(legendLayout, layoutParams)
+	}
+
+	fun prepareWithStat(stat: Stat) {
+
+		this.stat1Name.text = stat.name
+		this.stat2Name.text = stat.cumulativeLabelResId(context)
+
+	}
+
+	/**
+	 * Set the session data to the view
+	 */
+	fun setData(session: Session) {
+
+		this.title.text = ""
+		this.title.text = ""
+		this.title.text = ""
+		this.title.text = ""
+		this.title.text = ""
+
+	}
+
+}

app/src/main/res/layout/fragment_evograph.xml

@@ -0,0 +1,57 @@
+<?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.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" />
+
+    <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">
+
+        <!--<include layout="@layout/layout_legend_default"/>-->
+
+    </FrameLayout>
+
+    <FrameLayout
+        android:id="@+id/chartContainer"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toTopOf="@id/chipGroup"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/legendContainer"></FrameLayout>
+
+    <com.google.android.material.chip.ChipGroup
+        android:id="@+id/chipGroup"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:singleSelection="true"
+        tools:layout_height="60dp">
+
+    </com.google.android.material.chip.ChipGroup>
+
+    <!--<com.github.mikephil.charting.charts.LineChart-->
+    <!--android:id="@+id/chart"-->
+    <!--android:layout_width="50dp"-->
+    <!--android:layout_height="50dp" app:layout_constraintTop_toBottomOf="@+id/toolbar" android:layout_marginBottom="8dp"-->
+    <!--app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" android:layout_marginEnd="8dp"-->
+    <!--app:layout_constraintStart_toStartOf="parent" android:layout_marginStart="8dp"/>-->
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_graph.xml

@@ -1,35 +0,0 @@
-<?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.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"/>
-
-	<androidx.appcompat.widget.AppCompatTextView
-			android:id="@+id/text"
-			android:textColor="@color/white"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			app:layout_constraintEnd_toEndOf="parent"
-			android:layout_marginStart="8dp"
-			android:layout_marginTop="8dp"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/toolbar"/>
-
-	<com.github.mikephil.charting.charts.LineChart
-			android:id="@+id/chart"
-			android:layout_width="50dp"
-			android:layout_height="50dp" app:layout_constraintTop_toBottomOf="@+id/toolbar" android:layout_marginBottom="8dp"
-			app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" android:layout_marginEnd="8dp"
-			app:layout_constraintStart_toStartOf="parent" android:layout_marginStart="8dp"/>
-
-</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/layout_legend_default.xml

@@ -0,0 +1,79 @@
+<?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="wrap_content"
+    android:orientation="vertical">
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/title"
+        style="@style/PokerAnalyticsTheme.TextView.LegendStatsValue"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="test" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/stat1Name"
+        style="@style/PokerAnalyticsTheme.TextView.LegendStatsTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="4dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/title"
+        tools:text="NET RESULT" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/stat1Value"
+        style="@style/PokerAnalyticsTheme.TextView.LegendStatsValue"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/stat1Name"
+        tools:text="$2000" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/stat2Name"
+        style="@style/PokerAnalyticsTheme.TextView.LegendStatsTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="8dp"
+        android:layout_marginTop="4dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="1.0"
+        app:layout_constraintStart_toEndOf="@+id/stat1Name"
+        app:layout_constraintTop_toBottomOf="@id/title"
+        tools:text="NET RESULT" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/stat2Value"
+        style="@style/PokerAnalyticsTheme.TextView.LegendStatsValue"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="8dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="1.0"
+        app:layout_constraintStart_toEndOf="@+id/stat1Value"
+        app:layout_constraintTop_toBottomOf="@id/stat2Name"
+        tools:text="$2000000000000000" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/counter"
+        style="@style/PokerAnalyticsTheme.TextView.LegendStatsTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="8dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/stat2Value"
+        app:layout_constraintBottom_toBottomOf="parent"
+        tools:text="152 sessions" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/values/colors.xml

@@ -37,4 +37,6 @@
 
 	<color name="purple">#8e35c8</color>
 
+	<color name="chart_default">#5c7258</color>
+
 </resources>

app/src/main/res/values/styles.xml

@@ -124,6 +124,25 @@
         <item name="android:ellipsize">end</item>
     </style>
 
+    <!-- Graph legend -->
+
+    <style name="PokerAnalyticsTheme.TextView.LegendStatsTitle">
+        <item name="android:textSize">12sp</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="android:fontFamily">@font/roboto_light</item>
+        <item name="android:textAllCaps">true</item>
+        <item name="android:maxLines">1</item>
+        <item name="android:ellipsize">end</item>
+    </style>
+
+    <style name="PokerAnalyticsTheme.TextView.LegendStatsValue">
+        <item name="android:textSize">24sp</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="android:fontFamily">@font/roboto_light</item>
+        <item name="android:maxLines">1</item>
+        <item name="android:ellipsize">end</item>
+    </style>
+
     <!-- Bottom Sheet -->
 	<style name="PokerAnalyticsTheme.TextView.BottomSheetValue">
 		<item name="android:textSize">22sp</item>