Merge branch 'dev' of gitlab.com:stax-river/poker-analytics into dev

app/src/main/AndroidManifest.xml

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

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

@@ -0,0 +1,54 @@
+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.calculus.Stat
+import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
+import net.pokeranalytics.android.ui.fragment.GraphParameters
+
+
+class CalendarDetailsActivity : PokerAnalyticsActivity() {
+
+	private enum class IntentKey(val keyName: String) {
+		STAT("STAT"),
+		ENTRIES("ENTRIES"),
+	}
+
+	companion object {
+
+		// Unparcel fails when setting a custom Parcelable object on Entry so we use a static reference to passe objects
+		var parameters: GraphParameters? = null
+
+		/**
+		 * Default constructor
+		 */
+		fun newInstance(context: Context) {
+			val intent = Intent(context, CalendarDetailsActivity::class.java)
+			context.startActivity(intent)
+		}
+
+		fun newInstance(context: Context, stat: Stat, report: Report) {
+			parameters = GraphParameters(stat, report)
+			val intent = Intent(context, CalendarDetailsActivity::class.java)
+			context.startActivity(intent)
+		}
+
+	}
+
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+		setContentView(R.layout.activity_calendar_details)
+		initUI()
+	}
+
+	/**
+	 * Init UI
+	 */
+	private fun initUI() {
+
+	}
+
+}

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

@@ -0,0 +1,80 @@
+package net.pokeranalytics.android.ui.fragment
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.github.mikephil.charting.data.Entry
+import kotlinx.android.synthetic.main.fragment_calendar_details.*
+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
+
+class CalendarDetailsFragment : PokerAnalyticsFragment() {
+
+	companion object {
+		fun newInstance(context: Context) {
+			val intent = Intent(context, CalendarDetailsFragment::class.java)
+			context.startActivity(intent)
+		}
+	}
+
+	private lateinit var parentActivity: PokerAnalyticsActivity
+
+	//private var stat: Stat = Stat.NETRESULT
+	//private var entries: List<Entry> = ArrayList()
+
+	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+		return inflater.inflate(R.layout.fragment_calendar_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 = stat.localizedTitle(requireContext())
+
+		val fragmentManager = parentActivity.supportFragmentManager
+		val fragmentTransaction = fragmentManager.beginTransaction()
+		val fragment = GraphFragment()
+
+		fragmentTransaction.add(R.id.container, fragment)
+		fragmentTransaction.commit()
+
+		StatisticDetailsActivity.parameters?.let {
+			fragment.setData(it.stat, it.report)
+			StatisticDetailsActivity.parameters = null
+		} ?: run {
+			throw Exception("Missing graph parameters")
+		}
+		*/
+	}
+
+	/**
+	 * Set data
+	 */
+	fun setData(stat: Stat, entries: List<Entry>) {
+		//this.stat = stat
+		//this.entries = entries
+	}
+
+}

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

@@ -18,6 +18,7 @@ import net.pokeranalytics.android.calculus.ComputedResults
 import net.pokeranalytics.android.calculus.Stat
 import net.pokeranalytics.android.model.comparison.Comparator
 import net.pokeranalytics.android.model.comparison.combined
+import net.pokeranalytics.android.ui.activity.CalendarDetailsActivity
 import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
 import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource
@@ -35,8 +36,6 @@ import java.util.*
 import kotlin.coroutines.CoroutineContext
 
 
-
-
 class CalendarFragment : SessionObserverFragment(), CoroutineScope, StaticRowRepresentableDataSource, RowRepresentableDelegate {
 
 	private enum class SessionType {
@@ -69,6 +68,7 @@ class CalendarFragment : SessionObserverFragment(), CoroutineScope, StaticRowRep
 	private var rows: ArrayList<CustomizableRowRepresentable> = ArrayList()
 	private var sortedMonthlyReports: SortedMap<Date, ComputedResults> = HashMap<Date, ComputedResults>().toSortedMap()
 	private var sortedYearlyReports: SortedMap<Date, ComputedResults> = HashMap<Date, ComputedResults>().toSortedMap()
+	private var datesForRows: HashMap<CustomizableRowRepresentable, Date> = HashMap()
 
 	private var currentSessionType = SessionType.ALL
 	private var currentTimeFilter = TimeFilter.MONTH
@@ -93,7 +93,8 @@ class CalendarFragment : SessionObserverFragment(), CoroutineScope, StaticRowRep
 	}
 
 	override fun onRowSelected(position: Int, row: RowRepresentable, fromAction: Boolean) {
-		//toast("Open $row")
+		Timber.d("Open ${datesForRows[row]}")
+		CalendarDetailsActivity.newInstance(requireContext())
 	}
 
 	override fun sessionsChanged() {
@@ -304,6 +305,7 @@ class CalendarFragment : SessionObserverFragment(), CoroutineScope, StaticRowRep
 
 		val startDate = Date()
 
+		datesForRows.clear()
 		rows.clear()
 
 		when (currentTimeFilter) {
@@ -323,14 +325,16 @@ class CalendarFragment : SessionObserverFragment(), CoroutineScope, StaticRowRep
 					}
 
 					sortedMonthlyReports[date]?.computedStat(currentStat)?.let { computedStat ->
-						rows.add(
-							CustomizableRowRepresentable(
-								customViewType = RowViewType.TITLE_VALUE_ARROW,
-								title = date.getDateMonth(),
-								computedStat = computedStat,
-								isSelectable = true
-							)
+
+						val row = CustomizableRowRepresentable(
+							customViewType = RowViewType.TITLE_VALUE_ARROW,
+							title = date.getDateMonth(),
+							computedStat = computedStat,
+							isSelectable = true
 						)
+
+						rows.add(row)
+						datesForRows.put(row, date)
 					}
 				}
 			}
@@ -339,14 +343,15 @@ class CalendarFragment : SessionObserverFragment(), CoroutineScope, StaticRowRep
 			TimeFilter.YEAR -> {
 				sortedYearlyReports.keys.forEach { date ->
 					sortedYearlyReports[date]?.computedStat(currentStat)?.let { computedStat ->
-						rows.add(
-							CustomizableRowRepresentable(
-								customViewType = RowViewType.TITLE_VALUE_ARROW,
-								title = date.getDateYear(),
-								computedStat = computedStat,
-								isSelectable = true
-							)
+						val row = CustomizableRowRepresentable(
+							customViewType = RowViewType.TITLE_VALUE_ARROW,
+							title = date.getDateYear(),
+							computedStat = computedStat,
+							isSelectable = true
 						)
+
+						rows.add(row)
+						datesForRows.put(row, date)
 					}
 				}
 			}

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

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:orientation="vertical">
+
+	<fragment
+		android:id="@+id/calendarDetailsFragment"
+		android:name="net.pokeranalytics.android.ui.fragment.CalendarDetailsFragment"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		tools:layout="@layout/fragment_statistic_details" />
+
+</LinearLayout>

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

@@ -0,0 +1,26 @@
+<?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"
+		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" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>