From a7b6a08e44b348c2fb289f376b1d8015294ccb56 Mon Sep 17 00:00:00 2001 From: Aurelien Hubert Date: Thu, 11 Apr 2019 15:44:21 +0200 Subject: [PATCH] Improve UI --- .../android/ui/fragment/GraphFragment.kt | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) 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 a126610a..a5877680 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 @@ -12,6 +12,7 @@ import com.github.mikephil.charting.listener.OnChartValueSelectedListener import kotlinx.android.synthetic.main.fragment_graph.* import net.pokeranalytics.android.R 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 @@ -22,6 +23,7 @@ interface GraphDataSource { class GraphFragment : PokerAnalyticsFragment(), OnChartValueSelectedListener { + private lateinit var parentActivity: PokerAnalyticsActivity lateinit var dataSource: GraphDataSource lateinit var stat: Stat @@ -29,7 +31,6 @@ class GraphFragment : PokerAnalyticsFragment(), OnChartValueSelectedListener { companion object { - } fun setData(stat: Stat, entries: List) { @@ -46,8 +47,23 @@ class GraphFragment : PokerAnalyticsFragment(), OnChartValueSelectedListener { initUI() } + /** + * Init UI + */ private fun initUI() { + parentActivity = activity as PokerAnalyticsActivity + + // Avoid a bug during setting the title + toolbar.title = "" + + parentActivity.setSupportActionBar(toolbar) + parentActivity.supportActionBar?.setDisplayHomeAsUpEnabled(true) + setHasOptionsMenu(true) + + //TODO: Set correct title + toolbar.title = "Stats" + val dataSet = LineDataSet(this.entries, this.stat.name) val colors = arrayOf(R.color.green_light).toIntArray() dataSet.setColors(colors, context)