Add Report Details, improve Statistics & Graph

app/src/main/AndroidManifest.xml

@@ -49,6 +49,11 @@
 			android:launchMode="singleTop"
 			android:screenOrientation="portrait" />
 
+		<activity
+			android:name=".ui.activity.ReportDetailsActivity"
+			android:launchMode="singleTop"
+			android:screenOrientation="portrait" />
+
 		<activity
 			android:name=".ui.activity.CalendarDetailsActivity"
 			android:launchMode="singleTop"

app/src/main/java/net/pokeranalytics/android/ui/activity/ReportDetailsActivity.kt

@@ -0,0 +1,55 @@
+package net.pokeranalytics.android.ui.activity
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import net.pokeranalytics.android.R
+import net.pokeranalytics.android.calculus.Report
+import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
+import net.pokeranalytics.android.ui.fragment.ReportDetailsFragment
+
+
+
+class ReportDetailsActivity : PokerAnalyticsActivity() {
+
+	companion object {
+
+		// Unparcel fails when setting a custom Parcelable object on Entry so we use a static reference to passe objects
+		private var report: Report? = null
+		private var reportTitle: String = ""
+
+		/**
+		 * Default constructor
+		 */
+		fun newInstance(context: Context, report: Report, reportTitle: String) {
+			//parameters = GraphParameters(stat, group, report)
+			this.report = report
+			this.reportTitle = reportTitle
+			val intent = Intent(context, ReportDetailsActivity::class.java)
+			context.startActivity(intent)
+		}
+
+	}
+
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+		setContentView(R.layout.activity_report_details)
+		initUI()
+	}
+
+	/**
+	 * Init UI
+	 */
+	private fun initUI() {
+
+		report?.let {
+			val fragmentTransaction = supportFragmentManager.beginTransaction()
+			val reportDetailsFragment = ReportDetailsFragment.newInstance(it, reportTitle)
+			fragmentTransaction.add(R.id.reportDetailsContainer, reportDetailsFragment)
+			fragmentTransaction.commit()
+
+			report = null
+		}
+	}
+
+}

app/src/main/java/net/pokeranalytics/android/ui/activity/StatisticDetailsActivity.kt

@@ -8,10 +8,12 @@ import net.pokeranalytics.android.calculus.ComputableGroup
 import net.pokeranalytics.android.calculus.Report
 import net.pokeranalytics.android.calculus.Stat
 import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
-import net.pokeranalytics.android.ui.fragment.GraphParameters
 import net.pokeranalytics.android.ui.fragment.StatisticDetailsFragment
 
 
+class StatisticsDetailsParameters(var stat: Stat, var computableGroup: ComputableGroup, var report: Report) {
+}
+
 class StatisticDetailsActivity : PokerAnalyticsActivity() {
 
 	private enum class IntentKey(val keyName: String) {
@@ -22,14 +24,14 @@ class StatisticDetailsActivity : PokerAnalyticsActivity() {
 	companion object {
 
 		// Unparcel fails when setting a custom Parcelable object on Entry so we use a static reference to passe objects
-		private var parameters: GraphParameters? = null
+		private var parameters: StatisticsDetailsParameters? = null
 		private var displayAggregationChoices: Boolean = true
 
 		/**
 		 * Default constructor
 		 */
 		fun newInstance(context: Context, stat: Stat, group: ComputableGroup, report: Report, displayAggregationChoices: Boolean = true) {
-			parameters = GraphParameters(stat, group, report)
+			parameters = StatisticsDetailsParameters(stat, group, report)
 			this.displayAggregationChoices = displayAggregationChoices
 			val intent = Intent(context, StatisticDetailsActivity::class.java)
 			context.startActivity(intent)

app/src/main/java/net/pokeranalytics/android/ui/adapter/ReportPagerAdapter.kt

@@ -0,0 +1,69 @@
+package net.pokeranalytics.android.ui.adapter
+
+import android.content.Context
+import android.util.SparseArray
+import android.view.ViewGroup
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.FragmentStatePagerAdapter
+import androidx.viewpager.widget.PagerAdapter
+import net.pokeranalytics.android.R
+import net.pokeranalytics.android.calculus.Report
+import net.pokeranalytics.android.ui.fragment.GraphFragment
+import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment
+import java.lang.ref.WeakReference
+
+/**
+ * Home Adapter
+ */
+class ReportPagerAdapter(val context: Context, val fragmentManager: FragmentManager, val report: Report) : FragmentStatePagerAdapter(fragmentManager) {
+
+	var weakReferences = SparseArray<WeakReference<PokerAnalyticsFragment>>()
+
+	override fun getItem(position: Int): PokerAnalyticsFragment {
+		return when (position) {
+			0 -> GraphFragment.newInstance(report)
+			1 -> GraphFragment.newInstance(report)
+			2 -> GraphFragment.newInstance(report)
+			else -> GraphFragment.newInstance()
+		}
+	}
+
+	override fun getCount(): Int {
+		return 3
+	}
+
+	override fun getPageTitle(position: Int): CharSequence? {
+		return when(position) {
+			0 -> context.getString(R.string.bar)
+			1 -> context.getString(R.string.line)
+			2 -> context.getString(R.string.table)
+			else -> ""
+		}
+	}
+
+	override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) {
+		super.destroyItem(container, position, `object`)
+		weakReferences.remove(position)
+	}
+
+	override fun instantiateItem(container: ViewGroup, position: Int): Any {
+		val fragment = super.instantiateItem(container, position) as PokerAnalyticsFragment
+		weakReferences.put(position, WeakReference(fragment))
+		return fragment
+	}
+
+	override fun getItemPosition(obj: Any): Int {
+		return PagerAdapter.POSITION_UNCHANGED
+	}
+
+	/**
+	 * Return the fragment at the position key
+	 */
+	fun getFragment(key: Int): PokerAnalyticsFragment? {
+		if (weakReferences.get(key) != null) {
+			return weakReferences.get(key).get()
+		}
+		return null
+	}
+
+}

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

@@ -24,9 +24,6 @@ import timber.log.Timber
 import kotlin.coroutines.CoroutineContext
 
 
-class GraphParameters(var stat: Stat, var computableGroup: ComputableGroup, var report: Report) {
-}
-
 class GraphFragment : PokerAnalyticsFragment(), OnChartValueSelectedListener, CoroutineScope {
 
 	companion object {
@@ -34,8 +31,13 @@ class GraphFragment : PokerAnalyticsFragment(), OnChartValueSelectedListener, Co
 		/**
 		 * Create new instance
 		 */
-		fun newInstance(): GraphFragment {
+		fun newInstance(report: Report? = null): GraphFragment {
 			val fragment = GraphFragment()
+
+			report?.let {
+				fragment.selectedReport = it
+			}
+
 			val bundle = Bundle()
 			fragment.arguments = bundle
 			return fragment

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

@@ -0,0 +1,140 @@
+package net.pokeranalytics.android.ui.fragment
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.google.android.material.tabs.TabLayout
+import kotlinx.android.synthetic.main.fragment_report_details.*
+import kotlinx.android.synthetic.main.fragment_statistic_details.toolbar
+import net.pokeranalytics.android.R
+import net.pokeranalytics.android.calculus.AggregationType
+import net.pokeranalytics.android.calculus.Report
+import net.pokeranalytics.android.calculus.Stat
+import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
+import net.pokeranalytics.android.ui.adapter.ReportPagerAdapter
+import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment
+
+class ReportDetailsFragment : PokerAnalyticsFragment() {
+
+	companion object {
+		fun newInstance(report: Report?, reportTitle: String): ReportDetailsFragment {
+			val fragment = ReportDetailsFragment()
+			fragment.reportTitle = reportTitle
+			report?.let {
+				fragment.selectedReport = it
+			}
+			val bundle = Bundle()
+			fragment.arguments = bundle
+			return fragment
+
+		}
+	}
+
+	private lateinit var parentActivity: PokerAnalyticsActivity
+	//private lateinit var computableGroup: ComputableGroup
+	//private lateinit var graphFragment: GraphFragment
+	private lateinit var selectedReport: Report
+
+	private var reports: MutableMap<AggregationType, Report> = hashMapOf()
+	private var stat: Stat = Stat.NET_RESULT
+	private var displayAggregationChoices: Boolean = true
+	private var reportTitle: String = ""
+
+	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+		return inflater.inflate(R.layout.fragment_report_details, container, false)
+	}
+
+	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+		super.onViewCreated(view, savedInstanceState)
+		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)
+
+		toolbar.title = reportTitle
+
+		val reportPagerAdapter = ReportPagerAdapter(requireContext(), parentActivity.supportFragmentManager, selectedReport)
+		viewPager.adapter = reportPagerAdapter
+		viewPager.offscreenPageLimit = 3
+
+		tabs.addOnTabSelectedListener(object : TabLayout.OnTabSelectedListener {
+			override fun onTabSelected(tab: TabLayout.Tab) {
+				viewPager.setCurrentItem(tab.position, false)
+			}
+
+			override fun onTabUnselected(tab: TabLayout.Tab) {
+			}
+
+			override fun onTabReselected(tab: TabLayout.Tab) {
+			}
+		})
+
+		/*
+		stat.aggregationTypes.firstOrNull()?.let { aggregationType ->
+			reports[aggregationType]?.let { report ->
+				graphFragment.setData(report, aggregationType)
+			}
+		}
+
+		*/
+
+
+		/*
+		val aggregationTypes = stat.aggregationTypes
+
+		aggregationTypes.forEachIndexed { index, type ->
+			val chip = Chip(requireContext())
+			chip.id = index
+			chip.text = requireContext().getString(type.resId)
+			chip.chipStartPadding = 8f.px
+			chip.chipEndPadding = 8f.px
+			this.chipGroup.addView(chip)
+		}
+
+		this.chipGroup.isVisible = displayAggregationChoices
+		this.chipGroup.check(0)
+
+		this.chipGroup.setOnCheckedChangeListener(object : ChipGroupExtension.SingleSelectionOnCheckedListener() {
+			override fun onCheckedChanged(group: ChipGroup, checkedId: Int) {
+				super.onCheckedChanged(group, checkedId)
+				val aggregationType = aggregationTypes[checkedId]
+
+				reports[aggregationType]?.let { report ->
+					graphFragment.setData(report, aggregationType)
+				} ?: run {
+					launchStatComputation(aggregationType)
+				}
+
+			}
+		})
+		*/
+	}
+
+
+	/**
+	 * Set data
+	 */
+	fun setData(report: Report) {
+		this.selectedReport = report
+
+		/*
+		stat.aggregationTypes.firstOrNull()?.let {
+			reports[it] = report
+		}
+		*/
+	}
+
+}

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

@@ -7,12 +7,14 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.LinearLayoutManager
 import io.realm.Realm
 import kotlinx.android.synthetic.main.fragment_stats.*
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.calculus.Calculator
 import net.pokeranalytics.android.calculus.Stat
 import net.pokeranalytics.android.model.comparison.Comparator
+import net.pokeranalytics.android.ui.activity.ReportDetailsActivity
 import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
 import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource
@@ -67,13 +69,9 @@ class ReportsFragment : PokerAnalyticsFragment(), StaticRowRepresentableDataSour
 
 	override fun onRowSelected(position: Int, row: RowRepresentable, fromAction: Boolean) {
 		super.onRowSelected(position, row, fromAction)
-		Timber.d("row: $row")
+		if (row is ReportRow) {
-		when (row) {
+			val reportName = row.localizedTitle(requireContext())
-
+			launchComputation(row.comparators, reportName)
-			ReportRow.DAY_OF_WEEKS -> {
-				//TODO: Open ComparisonChartActivity with correct data
-				//TODO: Calcul report before or after
-			}
 		}
 	}
 
@@ -102,27 +100,28 @@ class ReportsFragment : PokerAnalyticsFragment(), StaticRowRepresentableDataSour
 		}
 	}
 
-	private fun launchComputation(comparators: List<Comparator>) {
+	/**
-
+	 * Launch computation
+	 */
+	private fun launchComputation(comparators: List<Comparator>, reportName: String) {
 
 		GlobalScope.launch {
 
 			val startDate = Date()
-
 			val realm = Realm.getDefaultInstance()
 
 			val requiredStats: List<Stat> = listOf(Stat.NET_RESULT)
 			val options = Calculator.Options(evolutionValues = Calculator.Options.EvolutionValues.STANDARD, stats = requiredStats)
 			val report = Calculator.computeStatsWithComparators(realm, comparators = comparators, options = options)
 
+			Timber.d("launchComputation: ${System.currentTimeMillis() - startDate.time}ms")
 
-
+			launch(Dispatchers.Main) {
-
+				if (!isDetached) {
-
+					ReportDetailsActivity.newInstance(requireContext(), report, reportName)
-
+				}
+			}
 		}
-
-
 	}
 
 

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

@@ -25,6 +25,7 @@ import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment
 import timber.log.Timber
 import java.util.*
 
+
 class StatisticDetailsFragment : PokerAnalyticsFragment() {
 
 	companion object {

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

@@ -6,9 +6,9 @@ import android.view.MotionEvent
 import androidx.viewpager.widget.ViewPager
 
 /**
- * Poker Analytics ViewPager
+ * ViewPager with paging disabled
  */
-class HomeViewPager(context: Context, attrs: AttributeSet) : ViewPager(context, attrs) {
+class NoPagingViewPager(context: Context, attrs: AttributeSet) : ViewPager(context, attrs) {
 
 	var enablePaging: Boolean = false
 

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

@@ -15,7 +15,7 @@
 		app:layout_constraintTop_toTopOf="parent"
 		app:title="@string/app_name" />
 
-	<net.pokeranalytics.android.ui.view.HomeViewPager
+	<net.pokeranalytics.android.ui.view.NoPagingViewPager
 		android:id="@+id/viewPager"
 		android:layout_width="0dp"
 		android:layout_height="0dp"

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:id="@+id/reportDetailsContainer">
+
+</FrameLayout>

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

@@ -0,0 +1,62 @@
+<?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">
+
+	<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"
+			tools:title="@string/app_name" />
+
+		<com.google.android.material.tabs.TabLayout
+			android:id="@+id/tabs"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content">
+
+			<com.google.android.material.tabs.TabItem
+				android:id="@+id/tabBar"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="@string/bar" />
+
+			<com.google.android.material.tabs.TabItem
+				android:id="@+id/tabLine"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="@string/line" />
+
+			<com.google.android.material.tabs.TabItem
+				android:id="@+id/tabTable"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="@string/table" />
+
+		</com.google.android.material.tabs.TabLayout>
+
+	</com.google.android.material.appbar.AppBarLayout>
+
+	<net.pokeranalytics.android.ui.view.NoPagingViewPager
+		android:id="@+id/viewPager"
+		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>