Link Bankroll & Bankroll details

app/src/main/AndroidManifest.xml

@@ -40,6 +40,11 @@
             android:launchMode="singleTop"
             android:screenOrientation="portrait" />
 
+        <activity
+            android:name="net.pokeranalytics.android.ui.activity.BankrollDetailsActivity"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait" />
+
         <activity
             android:name="net.pokeranalytics.android.ui.activity.SettingsActivity"
             android:launchMode="singleTop"

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

@@ -0,0 +1,48 @@
+package net.pokeranalytics.android.ui.activity
+
+import android.content.Intent
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import net.pokeranalytics.android.R
+import net.pokeranalytics.android.calculus.bankroll.BankrollReport
+import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
+import net.pokeranalytics.android.ui.fragment.BankrollDetailsFragment
+
+class BankrollDetailsActivity : PokerAnalyticsActivity() {
+
+	companion object {
+
+		private var bankrollReport: BankrollReport? = null
+
+		/**
+		 * Default constructor
+		 */
+		fun newInstanceForResult(fragment: Fragment, bankrollReport: BankrollReport, requestCode: Int) {
+			this.bankrollReport = bankrollReport
+			val intent = Intent(fragment.requireContext(), BankrollDetailsActivity::class.java)
+			fragment.startActivityForResult(intent, requestCode)
+		}
+	}
+
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+		setContentView(R.layout.activity_bankroll_details)
+		initUI()
+	}
+
+	/**
+	 * Init UI
+	 */
+	private fun initUI() {
+
+		bankrollReport?.let {
+			val fragmentTransaction = supportFragmentManager.beginTransaction()
+			val reportDetailsFragment = BankrollDetailsFragment.newInstance(it)
+			fragmentTransaction.add(R.id.container, reportDetailsFragment)
+			fragmentTransaction.commit()
+
+			bankrollReport = null
+		}
+	}
+
+}

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

@@ -0,0 +1,151 @@
+package net.pokeranalytics.android.ui.fragment
+
+import android.os.Bundle
+import android.view.*
+import androidx.recyclerview.widget.LinearLayoutManager
+import kotlinx.android.synthetic.main.fragment_bankroll.*
+import kotlinx.android.synthetic.main.fragment_stats.recyclerView
+import net.pokeranalytics.android.R
+import net.pokeranalytics.android.calculus.ComputedStat
+import net.pokeranalytics.android.calculus.Stat
+import net.pokeranalytics.android.calculus.bankroll.BankrollReport
+import net.pokeranalytics.android.model.LiveData
+import net.pokeranalytics.android.ui.activity.EditableDataActivity
+import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
+import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
+import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
+import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource
+import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment
+import net.pokeranalytics.android.ui.view.RowRepresentable
+import net.pokeranalytics.android.ui.view.RowViewType
+import net.pokeranalytics.android.ui.view.rowrepresentable.CustomizableRowRepresentable
+import timber.log.Timber
+
+class BankrollDetailsFragment : PokerAnalyticsFragment(), StaticRowRepresentableDataSource, RowRepresentableDelegate {
+
+	companion object {
+
+		const val REQUEST_CODE_EDIT = 1000
+
+		/**
+		 * Create new instance
+		 */
+		fun newInstance(bankrollReport: BankrollReport): BankrollDetailsFragment {
+			val fragment = BankrollDetailsFragment()
+			fragment.bankrollReport = bankrollReport
+			return fragment
+		}
+	}
+
+	private lateinit var parentActivity: PokerAnalyticsActivity
+	private lateinit var bankrollAdapter: RowRepresentableAdapter
+	private lateinit var bankrollReport: BankrollReport
+
+	private var bankrollDetailsMenu: Menu? = null
+	private var rows: ArrayList<RowRepresentable> = ArrayList()
+
+	// Life Cycle
+
+	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+		return inflater.inflate(R.layout.fragment_bankroll_details, container, false)
+	}
+
+	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+		super.onViewCreated(view, savedInstanceState)
+		initUI()
+		initData()
+	}
+
+	override fun adapterRows(): List<RowRepresentable>? {
+		return rows
+	}
+
+	override fun onRowSelected(position: Int, row: RowRepresentable, fromAction: Boolean) {
+
+	}
+
+	override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) {
+		menu?.clear()
+		inflater?.inflate(R.menu.toolbar_comparison_chart, menu)
+		this.bankrollDetailsMenu = menu
+		updateMenuUI()
+		super.onCreateOptionsMenu(menu, inflater)
+	}
+
+	override fun onOptionsItemSelected(item: MenuItem?): Boolean {
+		when (item!!.itemId) {
+			R.id.settings -> editBankroll()
+		}
+		return true
+	}
+
+	// Business
+
+	/**
+	 * Init data
+	 */
+	private fun initData() {
+
+		rows.clear()
+
+		rows.add(CustomizableRowRepresentable(RowViewType.HEADER_TITLE, resId = R.string.global))
+
+		val totalComputedStat = ComputedStat(Stat.NET_RESULT, bankrollReport.total)
+		val netComputedStat = ComputedStat(Stat.NET_RESULT, bankrollReport.netResult)
+		val netBankedComputedStat = ComputedStat(Stat.NET_RESULT, bankrollReport.netBanked)
+
+		rows.add(CustomizableRowRepresentable(RowViewType.TITLE_VALUE, resId = R.string.bankroll, computedStat = totalComputedStat))
+		rows.add(CustomizableRowRepresentable(RowViewType.TITLE_VALUE, resId = R.string.net_result, computedStat = netComputedStat))
+		rows.add(CustomizableRowRepresentable(RowViewType.TITLE_VALUE, resId = R.string.net_banked, computedStat = netBankedComputedStat))
+
+	}
+
+	/**
+	 * Init UI
+	 */
+	private fun initUI() {
+
+		parentActivity = activity as PokerAnalyticsActivity
+
+		parentActivity.setSupportActionBar(toolbar)
+		parentActivity.supportActionBar?.setDisplayHomeAsUpEnabled(true)
+		setHasOptionsMenu(true)
+
+		Timber.d("bankrollReport: ${bankrollReport.setup.bankroll} ${bankrollReport.setup.virtualBankroll}")
+
+		if (bankrollReport.setup.virtualBankroll) {
+			toolbar.title = getString(R.string.total)
+			bankrollDetailsMenu?.findItem(R.id.settings)?.isVisible = false
+		} else {
+			toolbar.title = bankrollReport.setup.bankroll?.name
+			bankrollDetailsMenu?.findItem(R.id.settings)?.isVisible = true
+		}
+
+		toolbar.title = if (bankrollReport.setup.virtualBankroll) getString(R.string.total) else bankrollReport.setup.bankroll?.name
+
+		bankrollAdapter = RowRepresentableAdapter(this, this)
+
+		val viewManager = LinearLayoutManager(requireContext())
+
+		recyclerView.apply {
+			setHasFixedSize(true)
+			layoutManager = viewManager
+			adapter = bankrollAdapter
+		}
+	}
+
+	/**
+	 * Update menu UI
+	 */
+	private fun updateMenuUI() {
+		bankrollDetailsMenu?.findItem(R.id.settings)?.isVisible = !bankrollReport.setup.virtualBankroll
+	}
+
+	/**
+	 * Open Bankroll edit activity
+	 */
+	private fun editBankroll() {
+		EditableDataActivity.newInstanceForResult(this, LiveData.BANKROLL.ordinal, bankrollReport.setup.bankroll?.id, REQUEST_CODE_EDIT)
+	}
+
+}

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

@@ -32,6 +32,7 @@ import net.pokeranalytics.android.model.Criteria
 import net.pokeranalytics.android.model.LiveData
 import net.pokeranalytics.android.model.interfaces.Deletable
 import net.pokeranalytics.android.model.realm.Bankroll
+import net.pokeranalytics.android.ui.activity.BankrollDetailsActivity
 import net.pokeranalytics.android.ui.activity.DataListActivity
 import net.pokeranalytics.android.ui.activity.EditableDataActivity
 import net.pokeranalytics.android.ui.activity.StatisticDetailsActivity
@@ -39,8 +40,6 @@ import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
 import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
 import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource
-import net.pokeranalytics.android.ui.extensions.toast
-import net.pokeranalytics.android.ui.fragment.DataListFragment.Companion.REQUEST_CODE_DETAILS
 import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowViewType
@@ -54,6 +53,8 @@ class BankrollFragment : PokerAnalyticsFragment(), StaticRowRepresentableDataSou
 
 	companion object {
 
+		const val REQUEST_CODE_DETAILS = 1000
+
 		/**
 		 * Create new instance
 		 */
@@ -114,8 +115,9 @@ class BankrollFragment : PokerAnalyticsFragment(), StaticRowRepresentableDataSou
 			}
 			else -> {
 				if (bankrollReportForRow.containsKey(row)) {
-					val bankrollReport = bankrollReportForRow[row]
+					bankrollReportForRow[row]?.let { bankrollReport ->
-					toast("${bankrollReport?.total}")
+						BankrollDetailsActivity.newInstanceForResult(this, bankrollReport, REQUEST_CODE_DETAILS)
+					}
 				}
 			}
 		}
@@ -156,7 +158,12 @@ class BankrollFragment : PokerAnalyticsFragment(), StaticRowRepresentableDataSou
 			// Bankrolls
 			rows.add(CustomizableRowRepresentable(RowViewType.HEADER_TITLE, resId = R.string.bankrolls))
 
-			val bankrolls = LiveData.BANKROLL.items(realm) as RealmResults<Bankroll>
+			realm.close()
+			Timber.d("initData: ${System.currentTimeMillis() - startDate.time}ms")
+
+			launch(Dispatchers.Main) {
+
+				val bankrolls = LiveData.BANKROLL.items(getRealm()) as RealmResults<Bankroll>
 
 				bankrolls.forEach {
 					val bankrollReportSetup = BankrollReportSetup(it)
@@ -168,10 +175,7 @@ class BankrollFragment : PokerAnalyticsFragment(), StaticRowRepresentableDataSou
 					bankrollReportForRow[row] = bankrollReport
 				}
 
-			realm.close()
-			Timber.d("initData: ${System.currentTimeMillis() - startDate.time}ms")
 
-			launch(Dispatchers.Main) {
 				if (!isDetached) {
 					bankrollAdapter.notifyDataSetChanged()
 				}

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

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

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

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout 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.core.widget.NestedScrollView
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:fillViewport="true"
+		app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+		<FrameLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content">
+
+			<androidx.recyclerview.widget.RecyclerView
+				android:id="@+id/recyclerView"
+				android:layout_width="match_parent"
+				android:layout_height="match_parent"
+				android:clipToPadding="false" />
+
+		</FrameLayout>
+
+	</androidx.core.widget.NestedScrollView>
+
+	<com.google.android.material.appbar.AppBarLayout
+		android:id="@+id/appBar"
+		android:layout_width="match_parent"
+		android:layout_height="128dp"
+		android:theme="@style/PokerAnalyticsTheme.Toolbar.Session">
+
+		<com.google.android.material.appbar.CollapsingToolbarLayout
+			android:id="@+id/collapsingToolbar"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			app:collapsedTitleTextAppearance="@style/PokerAnalyticsTheme.Toolbar.CollapsedTitleAppearance"
+			app:contentScrim="?attr/colorPrimary"
+			app:expandedTitleGravity="bottom"
+			app:expandedTitleMarginStart="72dp"
+			app:expandedTitleTextAppearance="@style/PokerAnalyticsTheme.Toolbar.ExpandedTitleAppearance"
+			app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
+
+			<androidx.appcompat.widget.Toolbar
+				android:id="@+id/toolbar"
+				android:layout_width="match_parent"
+				android:layout_height="?attr/actionBarSize"
+				app:layout_collapseMode="pin"
+				app:title="@string/bankroll"
+				app:titleTextColor="@color/white" />
+
+		</com.google.android.material.appbar.CollapsingToolbarLayout>
+
+	</com.google.android.material.appbar.AppBarLayout>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/menu/toolbar_bankroll_details.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto">
+
+	<item
+		android:id="@+id/settings"
+		android:title="@string/services"
+		android:icon="@drawable/ic_outline_settings"
+		app:showAsAction="always" />
+
+</menu>