From fda7bbd5c150e942e1d47f582e160952ea542692 Mon Sep 17 00:00:00 2001
From: Aurelien Hubert <aurel.hubert@gmail.com>
Date: Tue, 5 Mar 2019 12:45:08 +0100
Subject: [PATCH 01/11] Manage negative net result keyboard

---
 .../main/java/net/pokeranalytics/android/model/realm/Session.kt  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
index 0314e981..435c87da 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
@@ -467,6 +467,7 @@ open class Session : RealmObject(), SessionInterface, Savable,
 						result?.cashout?.round(),
 						inputType = InputType.TYPE_CLASS_NUMBER
 								or InputType.TYPE_NUMBER_FLAG_DECIMAL
+								or InputType.TYPE_NUMBER_FLAG_SIGNED
 					)
 				)
 			}

From f9a2f3ca9d416cf0bf743cb47b909858ec70f7cb Mon Sep 17 00:00:00 2001
From: Laurent <laurent@staxriver.com>
Date: Tue, 5 Mar 2019 14:25:31 +0100
Subject: [PATCH 02/11] Preferences fix

---
 .../java/net/pokeranalytics/android/util/Preferences.kt     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/net/pokeranalytics/android/util/Preferences.kt b/app/src/main/java/net/pokeranalytics/android/util/Preferences.kt
index a283f7dc..74aaff4c 100644
--- a/app/src/main/java/net/pokeranalytics/android/util/Preferences.kt
+++ b/app/src/main/java/net/pokeranalytics/android/util/Preferences.kt
@@ -6,7 +6,7 @@ import java.util.*
 
 class Preferences {
 
-    enum class Keys(identifier: String) {
+    enum class Keys(var identifier: String) {
         CURRENCY_LANGUAGE("CurrencyLanguage")
     }
 
@@ -15,13 +15,13 @@ class Preferences {
         fun setString(key: Keys, value: String, context: Context) {
             var preferences = PreferenceManager.getDefaultSharedPreferences(context)
             var editor = preferences.edit()
-            editor.putString(key.toString(), value)
+            editor.putString(key.identifier, value)
             editor.commit()
         }
 
         fun getString(key: Keys, context: Context) : String? {
             var preferences = PreferenceManager.getDefaultSharedPreferences(context)
-            return preferences.getString(key.name, null)
+            return preferences.getString(key.identifier, null)
         }
 
         fun setCurrencyLanguage(language: String, context: Context) {

From f59d97a5123a28231c4e28acd8b92f0008010c97 Mon Sep 17 00:00:00 2001
From: Aurelien Hubert <aurel.hubert@gmail.com>
Date: Tue, 5 Mar 2019 14:42:24 +0100
Subject: [PATCH 03/11] Fix error message for data management

---
 .../android/ui/fragment/EditableDataFragment.kt   | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt
index bed75b34..7fd60691 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt
@@ -14,15 +14,16 @@ import net.pokeranalytics.android.R
 import net.pokeranalytics.android.model.LiveData
 import net.pokeranalytics.android.model.interfaces.Identifiable
 import net.pokeranalytics.android.model.interfaces.Savable
+import net.pokeranalytics.android.model.realm.*
 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.RowRepresentableDataSource
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
-import net.pokeranalytics.android.ui.helpers.PlacePickerManager
 import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment
 import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetDelegate
 import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetFragment
+import net.pokeranalytics.android.ui.helpers.PlacePickerManager
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.rowrepresentable.LocationRow
 
@@ -137,8 +138,18 @@ class EditableDataFragment : PokerAnalyticsFragment(), RowRepresentableDelegate,
 				finishActivityWithResult(uniqueIdentifier)
 			}
 		} else {
+
+			val message = when(item) {
+				is Bankroll -> R.string.empty_name_for_br_error
+				is Location -> R.string.location_empty_field_error
+				is Game -> R.string.location_empty_field_error
+				is TournamentType -> R.string.tt_empty_field_error
+				is TransactionType -> R.string.operation_type_empty_field_error
+				else -> R.string.empty_name_for_br_error
+			}
+
 			val builder = AlertDialog.Builder(requireContext())
-				.setMessage(R.string.empty_name_for_br_error)
+				.setMessage(message)
 				.setNegativeButton(R.string.ok, null)
 			builder.show()
 		}

From b36d0a582eebda15a2ad0414fbfe15598778c5c1 Mon Sep 17 00:00:00 2001
From: Aurelien Hubert <aurel.hubert@gmail.com>
Date: Tue, 5 Mar 2019 14:42:50 +0100
Subject: [PATCH 04/11] Update tournament type to fix crash when editing

---
 .../android/model/realm/TournamentType.kt     | 38 ++++++++++++++++++-
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/TournamentType.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/TournamentType.kt
index c10cba32..c29e87b7 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/TournamentType.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/TournamentType.kt
@@ -3,13 +3,15 @@ package net.pokeranalytics.android.model.realm
 import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
 import net.pokeranalytics.android.model.interfaces.Savable
-import net.pokeranalytics.android.ui.adapter.RowRepresentableDataSource
+import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource
 import net.pokeranalytics.android.ui.view.RowRepresentable
+import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor
 import net.pokeranalytics.android.ui.view.rowrepresentable.SimpleRow
 import java.util.*
+import kotlin.collections.ArrayList
 
 
-open class TournamentType : RealmObject(), Savable, RowRepresentable {
+open class TournamentType : RealmObject(), Savable, StaticRowRepresentableDataSource, RowRepresentable {
 
     @PrimaryKey
     var id = UUID.randomUUID().toString()
@@ -31,4 +33,36 @@ open class TournamentType : RealmObject(), Savable, RowRepresentable {
 		}
 	}
 
+	override fun adapterRows(): List<RowRepresentable>? {
+		val rows = ArrayList<RowRepresentable>()
+		rows.add(SimpleRow.NAME)
+		//rows.addAll(TournamentType.values())
+		return rows
+	}
+
+	override fun stringForRow(row: RowRepresentable): String {
+		return when (row) {
+			SimpleRow.NAME -> this.name
+			else -> return super.stringForRow(row)
+		}
+	}
+
+	override fun editDescriptors(row: RowRepresentable): ArrayList<RowRepresentableEditDescriptor> {
+		val data = java.util.ArrayList<RowRepresentableEditDescriptor>()
+		when (row) {
+			SimpleRow.NAME -> data.add(
+				RowRepresentableEditDescriptor(
+					this.name,
+					SimpleRow.NAME.resId
+				)
+			)
+		}
+		return data
+	}
+
+	override fun isValidForSave(): Boolean {
+		return this.name.isNotEmpty()
+	}
+
+
 }

From 872a23923622d8a3131df84f2fef2e54b336a1cf Mon Sep 17 00:00:00 2001
From: Aurelien Hubert <aurel.hubert@gmail.com>
Date: Tue, 5 Mar 2019 14:42:57 +0100
Subject: [PATCH 05/11] Format Game

---
 .../android/model/realm/Game.kt               | 107 +++++++++---------
 1 file changed, 53 insertions(+), 54 deletions(-)

diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Game.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Game.kt
index 3a3fea3c..6e82814d 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/Game.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Game.kt
@@ -11,69 +11,68 @@ import net.pokeranalytics.android.ui.view.rowrepresentable.SimpleRow
 import java.util.*
 import kotlin.collections.ArrayList
 
-open class Game : RealmObject(), Savable, StaticRowRepresentableDataSource,
-    RowRepresentable {
+open class Game : RealmObject(), Savable, StaticRowRepresentableDataSource, RowRepresentable {
 
-    @PrimaryKey
-    var id = UUID.randomUUID().toString()
+	@PrimaryKey
+	var id = UUID.randomUUID().toString()
 
-    // The name of the game
-    var name: String = ""
+	// The name of the game
+	var name: String = ""
 
-    // A shorter name for the game
-    var shortName: String? = null
+	// A shorter name for the game
+	var shortName: String? = null
 
-    override fun getDisplayName(): String {
-        return this.name
-    }
+	override fun getDisplayName(): String {
+		return this.name
+	}
 
-    override fun uniqueIdentifier(): String {
-        return this.id
-    }
+	override fun uniqueIdentifier(): String {
+		return this.id
+	}
 
-    override fun adapterRows(): List<RowRepresentable>? {
-        val rows = ArrayList<RowRepresentable>()
-        rows.add(SimpleRow.NAME)
-        rows.addAll(GameRow.values())
-        return rows
-    }
+	override fun adapterRows(): List<RowRepresentable>? {
+		val rows = ArrayList<RowRepresentable>()
+		rows.add(SimpleRow.NAME)
+		rows.addAll(GameRow.values())
+		return rows
+	}
 
-    override fun stringForRow(row: RowRepresentable): String {
-        return when (row) {
-            SimpleRow.NAME -> this.name
-            GameRow.SHORT_NAME -> this.shortName?:""
-            else -> return super.stringForRow(row)
-        }
-    }
+	override fun stringForRow(row: RowRepresentable): String {
+		return when (row) {
+			SimpleRow.NAME -> this.name
+			GameRow.SHORT_NAME -> this.shortName ?: ""
+			else -> return super.stringForRow(row)
+		}
+	}
 
-    override fun editDescriptors(row: RowRepresentable): ArrayList<RowRepresentableEditDescriptor> {
-        val data = java.util.ArrayList<RowRepresentableEditDescriptor>()
-        when (row) {
-            SimpleRow.NAME -> data.add(
-                RowRepresentableEditDescriptor(
-                    this.name,
-                    SimpleRow.NAME.resId
-                )
-            )
-            GameRow.SHORT_NAME -> data.add(
-                RowRepresentableEditDescriptor(
-                    this.shortName,
-                    GameRow.SHORT_NAME.resId
-                )
-            )
-        }
-        return data
-    }
+	override fun editDescriptors(row: RowRepresentable): ArrayList<RowRepresentableEditDescriptor> {
+		val data = java.util.ArrayList<RowRepresentableEditDescriptor>()
+		when (row) {
+			SimpleRow.NAME -> data.add(
+				RowRepresentableEditDescriptor(
+					this.name,
+					SimpleRow.NAME.resId
+				)
+			)
+			GameRow.SHORT_NAME -> data.add(
+				RowRepresentableEditDescriptor(
+					this.shortName,
+					GameRow.SHORT_NAME.resId
+				)
+			)
+		}
+		return data
+	}
 
-    override fun updateValue(value: Any?, row: RowRepresentable) {
-        when (row) {
-            SimpleRow.NAME -> this.name = value as String? ?: ""
-            GameRow.SHORT_NAME -> this.shortName = value as String
-        }
-    }
+	override fun updateValue(value: Any?, row: RowRepresentable) {
+		when (row) {
+			SimpleRow.NAME -> this.name = value as String? ?: ""
+			GameRow.SHORT_NAME -> this.shortName = value as String
+		}
+	}
 
-    override fun isValidForSave(): Boolean {
-        return this.name.isNotEmpty()
-    }
+	override fun isValidForSave(): Boolean {
+		return this.name.isNotEmpty()
+	}
 
 }

From 121d111f96fd61a2a796c10d797ec54252d14aa4 Mon Sep 17 00:00:00 2001
From: Aurelien Hubert <aurel.hubert@gmail.com>
Date: Tue, 5 Mar 2019 15:27:52 +0100
Subject: [PATCH 06/11] Add follow us row (with a small hack to get the clicked
 position)

---
 .../android/ui/fragment/SettingsFragment.kt   |  8 ++
 .../android/ui/view/RowViewType.kt            | 28 +++++++
 .../ui/view/rowrepresentable/SettingRow.kt    |  1 +
 .../net/pokeranalytics/android/util/Global.kt | 11 ++-
 app/src/main/res/layout/row_follow_us.xml     | 84 +++++++++++++++++++
 5 files changed, 131 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/layout/row_follow_us.xml

diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt
index 5341c686..af907192 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt
@@ -67,6 +67,14 @@ class SettingsFragment : PokerAnalyticsFragment(), RowRepresentableDelegate, Sta
 			SettingRow.RATE_APP -> parentActivity.openPlayStorePage()
 			SettingRow.CONTACT_US -> parentActivity.openContactMail()
 			SettingRow.BUG_REPORT -> Toast.makeText(requireContext(), "Bug report", Toast.LENGTH_SHORT).show()
+			SettingRow.FOLLOW_US -> {
+				when(position) {
+					0 -> parentActivity.openUrl(BLOG)
+					1 -> parentActivity.openUrl(INSTAGRAM)
+					2 -> parentActivity.openUrl(TWITTER)
+					3 -> parentActivity.openUrl(FACEBOOK)
+				}
+			}
 			SettingRow.CURRENCY -> Toast.makeText(requireContext(), "Currency", Toast.LENGTH_SHORT).show()
 			SettingRow.PRIVACY_POLICY -> parentActivity.openUrl(URL_PRIVACY_POLICY)
 			SettingRow.TERMS_OF_USE -> parentActivity.openUrl(URL_TERMS)
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt
index 78bc4193..63273611 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt
@@ -3,6 +3,7 @@ package net.pokeranalytics.android.ui.view
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.appcompat.widget.AppCompatImageView
 import androidx.appcompat.widget.AppCompatTextView
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.RecyclerView
@@ -52,6 +53,7 @@ enum class RowViewType {
 	TITLE_GRID,
 	ROW_SESSION,
 	BUTTON,
+	FOLLOW_US,
 	STAT;
 
 	/**
@@ -161,6 +163,15 @@ enum class RowViewType {
 					)
 				)
 			}
+			FOLLOW_US -> {
+				FollowUsViewHolder(
+					LayoutInflater.from(parent.context).inflate(
+						R.layout.row_follow_us,
+						parent,
+						false
+					)
+				)
+			}
 			STAT -> StatsTitleValueViewHolder(
 				LayoutInflater.from(parent.context).inflate(
 					R.layout.row_stats_title_value,
@@ -236,6 +247,23 @@ enum class RowViewType {
 		}
 	}
 
+	inner class FollowUsViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), BindableHolder {
+		override fun bind(position: Int, row: RowRepresentable, adapter: RowRepresentableAdapter) {
+			itemView.findViewById<AppCompatImageView>(R.id.icon1).setOnClickListener {
+				adapter.delegate?.onRowSelected(0, row)
+			}
+			itemView.findViewById<AppCompatImageView>(R.id.icon2).setOnClickListener {
+				adapter.delegate?.onRowSelected(1, row)
+			}
+			itemView.findViewById<AppCompatImageView>(R.id.icon3).setOnClickListener {
+				adapter.delegate?.onRowSelected(2, row)
+			}
+			itemView.findViewById<AppCompatImageView>(R.id.icon4).setOnClickListener {
+				adapter.delegate?.onRowSelected(3, row)
+			}
+		}
+	}
+
 	inner class StatsTitleValueViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView),
 		BindableHolder {
 		override fun bind(position: Int, row: RowRepresentable, adapter: RowRepresentableAdapter) {
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SettingRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SettingRow.kt
index 7d4f27d6..f2bcbf24 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SettingRow.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SettingRow.kt
@@ -90,6 +90,7 @@ enum class SettingRow : RowRepresentable {
 		get() {
 			return when (this) {
 				VERSION -> RowViewType.TITLE_VALUE.ordinal
+				FOLLOW_US -> RowViewType.FOLLOW_US.ordinal
 				else -> RowViewType.TITLE_ARROW.ordinal
 			}
 		}
diff --git a/app/src/main/java/net/pokeranalytics/android/util/Global.kt b/app/src/main/java/net/pokeranalytics/android/util/Global.kt
index 4d98f7ce..e121a598 100644
--- a/app/src/main/java/net/pokeranalytics/android/util/Global.kt
+++ b/app/src/main/java/net/pokeranalytics/android/util/Global.kt
@@ -1,8 +1,17 @@
 package net.pokeranalytics.android.util
 
+val NULL_TEXT: String = "--"
 
+// Support
 const val SUPPORT_EMAIL = "support@pokeranalytics.net"
+
+// Terms
 const val URL_PRIVACY_POLICY = "https://www.poker-analytics.net/privacypolicy.html"
 const val URL_TERMS = "https://www.poker-analytics.net/terms.html"
 
-val NULL_TEXT: String = "--"
+// Social Network
+const val BLOG = "https://medium.com/poker-analytics"
+const val INSTAGRAM = "https://www.instagram.com/pokeranalytics"
+const val TWITTER = "https://twitter.com/paapptweet"
+const val FACEBOOK = "https://www.facebook.com/171053452998758"
+
diff --git a/app/src/main/res/layout/row_follow_us.xml b/app/src/main/res/layout/row_follow_us.xml
new file mode 100644
index 00000000..b8ad4830
--- /dev/null
+++ b/app/src/main/res/layout/row_follow_us.xml
@@ -0,0 +1,84 @@
+<?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:id="@+id/rowTitle.container"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:background="?selectableItemBackground">
+
+	<androidx.appcompat.widget.AppCompatImageView
+		android:id="@+id/icon1"
+		android:layout_width="32dp"
+		android:layout_height="32dp"
+		android:layout_marginTop="16dp"
+		android:layout_marginBottom="16dp"
+		android:background="?selectableItemBackgroundBorderless"
+		android:textSize="16sp"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toStartOf="@+id/icon2"
+		app:layout_constraintHorizontal_bias="0.5"
+		app:layout_constraintHorizontal_chainStyle="spread"
+		app:layout_constraintStart_toStartOf="@+id/guidelineStart"
+		app:layout_constraintTop_toTopOf="parent"
+		app:srcCompat="@drawable/blog" />
+
+	<androidx.appcompat.widget.AppCompatImageView
+		android:id="@+id/icon2"
+		android:layout_width="32dp"
+		android:layout_height="32dp"
+		android:layout_marginTop="16dp"
+		android:layout_marginBottom="16dp"
+		android:background="?selectableItemBackgroundBorderless"
+		android:textSize="16sp"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toStartOf="@+id/icon3"
+		app:layout_constraintHorizontal_bias="0.5"
+		app:layout_constraintStart_toEndOf="@+id/icon1"
+		app:layout_constraintTop_toTopOf="parent"
+		app:srcCompat="@drawable/insta" />
+
+	<androidx.appcompat.widget.AppCompatImageView
+		android:id="@+id/icon3"
+		android:layout_width="32dp"
+		android:layout_height="32dp"
+		android:layout_marginTop="16dp"
+		android:layout_marginBottom="16dp"
+		android:background="?selectableItemBackgroundBorderless"
+		android:textSize="16sp"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toStartOf="@+id/icon4"
+		app:layout_constraintHorizontal_bias="0.5"
+		app:layout_constraintStart_toEndOf="@+id/icon2"
+		app:layout_constraintTop_toTopOf="parent"
+		app:srcCompat="@drawable/twitter" />
+
+	<androidx.appcompat.widget.AppCompatImageView
+		android:id="@+id/icon4"
+		android:layout_width="32dp"
+		android:layout_height="32dp"
+		android:layout_marginTop="16dp"
+		android:layout_marginBottom="16dp"
+		android:background="?selectableItemBackgroundBorderless"
+		android:textSize="16sp"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toStartOf="@+id/guidelineEnd"
+		app:layout_constraintHorizontal_bias="0.5"
+		app:layout_constraintStart_toEndOf="@+id/icon3"
+		app:layout_constraintTop_toTopOf="parent"
+		app:srcCompat="@drawable/facebook" />
+
+	<androidx.constraintlayout.widget.Guideline
+		android:id="@+id/guidelineStart"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:orientation="vertical"
+		app:layout_constraintGuide_begin="16dp" />
+
+	<androidx.constraintlayout.widget.Guideline
+		android:id="@+id/guidelineEnd"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:orientation="vertical"
+		app:layout_constraintGuide_end="16dp" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From f058174914dffc802fe19f11e65d382a42476488 Mon Sep 17 00:00:00 2001
From: Aurelien Hubert <aurel.hubert@gmail.com>
Date: Tue, 5 Mar 2019 15:35:03 +0100
Subject: [PATCH 07/11] Remove Transaction type

---
 .../android/ui/view/rowrepresentable/SettingRow.kt            | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SettingRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SettingRow.kt
index f2bcbf24..bfe74753 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SettingRow.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SettingRow.kt
@@ -25,7 +25,6 @@ enum class SettingRow : RowRepresentable {
 	GAME,
 	LOCATION,
 	TOURNAMENT_TYPE,
-	TRANSACTION_TYPE,
 
 	// Terms
 	PRIVACY_POLICY,
@@ -55,7 +54,7 @@ enum class SettingRow : RowRepresentable {
 					resId = R.string.data_management
 				)
 			)
-			rows.addAll(arrayListOf(BANKROLL, GAME, LOCATION, TOURNAMENT_TYPE, TRANSACTION_TYPE))
+			rows.addAll(arrayListOf(BANKROLL, GAME, LOCATION, TOURNAMENT_TYPE))
 
 			rows.add(HeaderRowRepresentable(customViewType = RowViewType.HEADER_SESSION, resId = R.string.terms))
 			rows.addAll(arrayListOf(PRIVACY_POLICY, TERMS_OF_USE, GDPR))
@@ -102,7 +101,6 @@ enum class SettingRow : RowRepresentable {
 				GAME -> LiveData.GAME
 				LOCATION -> LiveData.LOCATION
 				TOURNAMENT_TYPE -> LiveData.TOURNAMENT_TYPE
-				TRANSACTION_TYPE -> LiveData.TRANSACTION_TYPE
 				else -> null
 			}
 		}

From eb3dec4e6ba35d85fd7e11dc22bf96c720b3a53c Mon Sep 17 00:00:00 2001
From: Aurelien Hubert <aurel.hubert@gmail.com>
Date: Tue, 5 Mar 2019 15:35:13 +0100
Subject: [PATCH 08/11] Remove transaction type

---
 .../android/ui/fragment/EditableDataFragment.kt        | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt
index 7fd60691..8642d0f1 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt
@@ -14,7 +14,10 @@ import net.pokeranalytics.android.R
 import net.pokeranalytics.android.model.LiveData
 import net.pokeranalytics.android.model.interfaces.Identifiable
 import net.pokeranalytics.android.model.interfaces.Savable
-import net.pokeranalytics.android.model.realm.*
+import net.pokeranalytics.android.model.realm.Bankroll
+import net.pokeranalytics.android.model.realm.Game
+import net.pokeranalytics.android.model.realm.Location
+import net.pokeranalytics.android.model.realm.TournamentType
 import net.pokeranalytics.android.ui.activity.EditableDataActivity
 import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
 import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
@@ -144,14 +147,15 @@ class EditableDataFragment : PokerAnalyticsFragment(), RowRepresentableDelegate,
 				is Location -> R.string.location_empty_field_error
 				is Game -> R.string.location_empty_field_error
 				is TournamentType -> R.string.tt_empty_field_error
-				is TransactionType -> R.string.operation_type_empty_field_error
-				else -> R.string.empty_name_for_br_error
+				//is TransactionType -> R.string.operation_type_empty_field_error
+				else -> throw IllegalStateException("Need to manage ${item::class.java} error")
 			}
 
 			val builder = AlertDialog.Builder(requireContext())
 				.setMessage(message)
 				.setNegativeButton(R.string.ok, null)
 			builder.show()
+
 		}
 
 	}

From ce1d3eff8372db3f3397a40ecde22e4df71e02b4 Mon Sep 17 00:00:00 2001
From: Aurelien Hubert <aurel.hubert@gmail.com>
Date: Tue, 5 Mar 2019 16:26:05 +0100
Subject: [PATCH 09/11] Clean style

---
 .../android/ui/fragment/HistoryFragment.kt    |   8 ++++----
 .../android/ui/fragment/StatsFragment.kt      |   2 +-
 .../android/ui/view/RowViewType.kt            |  19 ++++++++----------
 .../HeaderRowRepresentable.kt                 |   4 ++--
 .../ui/view/rowrepresentable/SettingRow.kt    |  10 ++++-----
 .../res/drawable-xxhdpi/add_tournament.png    | Bin 0 -> 1391 bytes
 .../main/res/drawable-xxhdpi/add_tournoi.png  | Bin 2011 -> 0 bytes
 app/src/main/res/layout/fragment_history.xml  |   6 +++---
 ...ession_header.xml => row_header_title.xml} |   0
 app/src/main/res/layout/row_session_view.xml  |   2 +-
 .../main/res/layout/row_stats_title_value.xml |   3 +--
 app/src/main/res/layout/row_title.xml         |   2 +-
 app/src/main/res/layout/row_title_arrow.xml   |   2 +-
 app/src/main/res/layout/row_title_value.xml   |   2 +-
 .../res/layout/row_title_value_action.xml     |   2 +-
 app/src/main/res/values/colors.xml            |   2 +-
 app/src/main/res/values/styles.xml            |   7 ++++---
 17 files changed, 34 insertions(+), 37 deletions(-)
 create mode 100644 app/src/main/res/drawable-xxhdpi/add_tournament.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/add_tournoi.png
 rename app/src/main/res/layout/{row_history_session_header.xml => row_header_title.xml} (100%)

diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt
index aa692789..f13e6b38 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt
@@ -127,7 +127,7 @@ class HistoryFragment : PokerAnalyticsFragment(), LiveRowRepresentableDataSource
 					if (!calendar.isSameDay(currentCalendar) || index == 0) {
 						calendar.time = currentCalendar.time
 						val header = HeaderRowRepresentable(
-							customViewType = RowViewType.HEADER_SESSION,
+							customViewType = RowViewType.HEADER_TITLE,
 							title = session.creationDate.longDate()
 						)
 						rows.add(header)
@@ -136,7 +136,7 @@ class HistoryFragment : PokerAnalyticsFragment(), LiveRowRepresentableDataSource
 					if (!calendar.isSameMonth(currentCalendar) || index == 0) {
 						calendar.time = currentCalendar.time
 						val header = HeaderRowRepresentable(
-							customViewType = RowViewType.HEADER_SESSION,
+							customViewType = RowViewType.HEADER_TITLE,
 							title = session.creationDate.getMonthAndYear()
 						)
 						rows.add(header)
@@ -165,8 +165,8 @@ class HistoryFragment : PokerAnalyticsFragment(), LiveRowRepresentableDataSource
 	}
 
 	override fun viewTypeForPosition(position: Int): Int {
-		return if (rows[position].viewType == RowViewType.HEADER_SESSION.ordinal) {
-			RowViewType.HEADER_SESSION.ordinal
+		return if (rows[position].viewType == RowViewType.HEADER_TITLE.ordinal) {
+			RowViewType.HEADER_TITLE.ordinal
 		} else {
 			RowViewType.ROW_SESSION.ordinal
 		}
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatsFragment.kt
index 918a1bce..6e9d00bf 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatsFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatsFragment.kt
@@ -141,7 +141,7 @@ class StatsFragment : SessionObserverFragment(), StaticRowRepresentableDataSourc
         val rows: ArrayList<RowRepresentable> = ArrayList()
 
         results.forEach { results ->
-            rows.add(HeaderRowRepresentable(RowViewType.TITLE, title = results.group.name))
+            rows.add(HeaderRowRepresentable(title = results.group.name))
             results.group.stats?.forEach { stat ->
                 rows.add(StatRepresentable(stat, results.computedStat(stat)))
             }
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt
index 63273611..c95c2036 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt
@@ -9,10 +9,10 @@ import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.RecyclerView
 import kotlinx.android.synthetic.main.row_bottom_sheet_grid_title.view.*
 import kotlinx.android.synthetic.main.row_bottom_sheet_title.view.*
+import kotlinx.android.synthetic.main.row_header_title.view.*
 import kotlinx.android.synthetic.main.row_header_title_amount.view.*
 import kotlinx.android.synthetic.main.row_header_title_value.view.*
 import kotlinx.android.synthetic.main.row_history_session.view.*
-import kotlinx.android.synthetic.main.row_history_session_header.view.*
 import kotlinx.android.synthetic.main.row_stats_title_value.view.*
 import kotlinx.android.synthetic.main.row_title.view.*
 import kotlinx.android.synthetic.main.row_title_switch.view.*
@@ -29,19 +29,16 @@ import net.pokeranalytics.android.ui.view.rowrepresentable.HeaderRowRepresentabl
  * An interface used to factor the configuration of RecyclerView.ViewHolder
  */
 interface BindableHolder {
-
 	fun bind(position: Int, row: RowRepresentable, adapter: RowRepresentableAdapter) {
-
 	}
 }
 
 
 enum class RowViewType {
-	HEADER,
 	HEADER_TITLE_VALUE,
 	HEADER_TITLE_AMOUNT,
 	HEADER_TITLE_AMOUNT_BIG,
-	HEADER_SESSION,
+	HEADER_TITLE,
 	EDIT_TEXT,
 	TITLE,
 	TITLE_ARROW,
@@ -138,10 +135,10 @@ enum class RowViewType {
 					false
 				)
 			)
-			HEADER_SESSION -> {
+			HEADER_TITLE -> {
 				HeaderSessionViewHolder(
 					LayoutInflater.from(parent.context).inflate(
-						R.layout.row_history_session_header,
+						R.layout.row_header_title,
 						parent,
 						false
 					)
@@ -187,12 +184,12 @@ enum class RowViewType {
 		BindableHolder {
 		override fun bind(position: Int, row: RowRepresentable, adapter: RowRepresentableAdapter) {
 			itemView.rowHeaderTitleValue_title.text = row.localizedTitle(itemView.context)
-			adapter.dataSource?.let {
+			adapter.dataSource.let {
 				itemView.rowHeaderTitleValue_value.text = it.stringForRow(row, itemView.context)
 			}
-//			val listener = View.OnClickListener {
-//				adapter.delegate?.onRowSelected(position, row)
-//			}
+			//val listener = View.OnClickListener {
+			//    adapter.delegate?.onRowSelected(position, row)
+			//}
 			//itemView.rowHeaderTitleValue_container.setOnClickListener(listener)
 			itemView.rowHeaderTitleValue_separator.visibility = if (row.needSeparator) View.VISIBLE else View.GONE
 		}
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/HeaderRowRepresentable.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/HeaderRowRepresentable.kt
index bec9dfe3..62f34061 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/HeaderRowRepresentable.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/HeaderRowRepresentable.kt
@@ -8,7 +8,7 @@ import net.pokeranalytics.android.ui.view.RowViewType
  * A class to display headers as row representable
  */
 class HeaderRowRepresentable(
-    var customViewType: RowViewType? = RowViewType.HEADER,
+    var customViewType: RowViewType? = RowViewType.HEADER_TITLE,
     override var resId: Int? = null,
     var title: String? = null,
     var value: String? = null
@@ -26,6 +26,6 @@ class HeaderRowRepresentable(
     }
 
 
-    override val viewType: Int = customViewType?.ordinal ?: RowViewType.HEADER.ordinal
+    override val viewType: Int = customViewType?.ordinal ?: RowViewType.HEADER_TITLE.ordinal
 
 }
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SettingRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SettingRow.kt
index bfe74753..df23556a 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SettingRow.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SettingRow.kt
@@ -39,24 +39,24 @@ enum class SettingRow : RowRepresentable {
 		fun getRows(): ArrayList<RowRepresentable> {
 
 			val rows = ArrayList<RowRepresentable>()
-			rows.add(HeaderRowRepresentable(customViewType = RowViewType.HEADER_SESSION, resId = R.string.information))
+			rows.add(HeaderRowRepresentable(customViewType = RowViewType.HEADER_TITLE, resId = R.string.information))
 			rows.addAll(arrayListOf(VERSION, RATE_APP, CONTACT_US, BUG_REPORT))
 
-			rows.add(HeaderRowRepresentable(customViewType = RowViewType.HEADER_SESSION, resId = R.string.follow_us))
+			rows.add(HeaderRowRepresentable(customViewType = RowViewType.HEADER_TITLE, resId = R.string.follow_us))
 			rows.addAll(arrayListOf(FOLLOW_US))
 
-			rows.add(HeaderRowRepresentable(customViewType = RowViewType.HEADER_SESSION, resId = R.string.preferences))
+			rows.add(HeaderRowRepresentable(customViewType = RowViewType.HEADER_TITLE, resId = R.string.preferences))
 			rows.addAll(arrayListOf(CURRENCY))
 
 			rows.add(
 				HeaderRowRepresentable(
-					customViewType = RowViewType.HEADER_SESSION,
+					customViewType = RowViewType.HEADER_TITLE,
 					resId = R.string.data_management
 				)
 			)
 			rows.addAll(arrayListOf(BANKROLL, GAME, LOCATION, TOURNAMENT_TYPE))
 
-			rows.add(HeaderRowRepresentable(customViewType = RowViewType.HEADER_SESSION, resId = R.string.terms))
+			rows.add(HeaderRowRepresentable(customViewType = RowViewType.HEADER_TITLE, resId = R.string.terms))
 			rows.addAll(arrayListOf(PRIVACY_POLICY, TERMS_OF_USE, GDPR))
 
 			return rows
diff --git a/app/src/main/res/drawable-xxhdpi/add_tournament.png b/app/src/main/res/drawable-xxhdpi/add_tournament.png
new file mode 100644
index 0000000000000000000000000000000000000000..d2532d17568f0098e2a4f1f7605b296d474791ae
GIT binary patch
literal 1391
zcmeAS@N?(olHy`uVBq!ia0vp^(?FPm8Ax*9Z@d7c<^=eJxB_V@c`0dmX(&>V1_CKL
zkch0TEL2cVT3SIGs1l(JC?YQn)F`PS3DPbHVoS?POUg-#D2srkz$VDa$-%WiL_l06
zs9hitusJd^G7!@sMnO%Jm%cpVF38cwB|(0{3<e(`97tf<{*B|;(*+HTcaFW@a4k~K
z^|YmqGH-RZz2v)=r5!!#V(0slgS~`iPhPuXdhuOOescx}7Jp9{$B>F!Z*JVodu1TN
z_P}0X(gxK;&gcjy?xn4HCHMZ{?X$`B&S4Fe+hO&oyz|LL`!h#e4iw59N1%Vn_pZGc
za$VdX+9sX4x<An6%Gd33dB)x^57{3T==QgZU6Or*_570AUAMn1TT;z;WTlf)>9)od
zm$o@C3z(t(Z%L34-{oWZTV<|&y8o}ML_#g(SC8UG^`#r{6u7<LsbF??ZLn`AuiW!F
zDVud>-*JA>d0x)wPsQD-lR0d?6D|M$TRQ*E0a^Ql_oh8xK6g&3r_Ri5+s`W7H;D0E
zIcRD!Tg|ib!kWrej5!}I<=ZAKF?vz+F3Rk%A&>K<s@6Q6*-G{L(h^lFq7K_1E@$6%
z#m_9UN_`=pPnNInjjj%j)|V4oqzsn2h#Z`@%Cu#rzf<g$buZ^8t@U_Oa6CfM$6bgk
zk;`>s*R8uzlP@^G%@f^Vs<epFr+C+*%jvwk9!V}^6zom;9>#b0vb=xP<aH5;CY*k^
zcCM9KqvAV`<h=(B0_VR=c>1f~S*gc#<=(7g8>R-nJ@@-iME9=V<viEiwqC6|6!CV~
zI`<9RSKqy|PbW;gZE3>R8ONV8y@=Wrp;_X%y~b3;;)<=KapW4g68)$AlUU?)w=F!G
zx^drvO!L#zRGaedmYKS4^fR43l||s;_0|kVUyZJ*3$p}Qo{yTq>9%KWRj{?^8n-o9
zeSem5C~Q%CDj1sVsk8r?XgS-)@}Rz33@?r^3^io4-li3ll$P!ubZ)|F;kflPe>xp%
z`{CR_<KhjSN44h*n=P+vJlny+y3uTE7xTLkKE~pyY*V$oe@ArA?26hExc|)4*tP`u
z*Sz+7j6&tjttVfyco-cJaa`*0?Inpvrf|!7yj*kUzam?mE62B&;XG%qMwNP0aul#1
zoEfp6ciZ;8+m|K0HBWjjQ7-ttL-tvK*|v?-0-h-+?Uwky>HP$uwL4O>B)v<8*DEDe
z-?_L%;h8=|&CR1;3_3MQM_J0J{>?s~S1#0cP@_*?=3FUjp!v2`traXypB8<*^MCJ5
zi^Y3*wh3M{`}i~Vp#9$qThyPvZ{(ew`t^UGmh7W5e@wYE+wvB#vGI<ap*<&lQDj7|
z*-5E25f?b4Hr6C6t~sG~HF}XQ_xmfnhoTp_zOuAY)qbJ9MSFktysz^X*Lq&j(e_Gc
z`M>IQ`pa<nWh>gb^SG<;H{HF(&N?|Qe2t>Sp$#@ETkU#gZ<w?^VUE;>Q%qtiSEKic
zX3H&|zQM`WMy*kG?u7QWiD##<-~F*+`ElmF_6;6Obwv9Tu10J=BQmX&>D}zZyUgG1
z{G51Sy?hCmUPNKH++ohT>C#PnGKQD`6mzEctg)9qb@r$8{lkjix9c1!aF_G95v%H-
zDSh2JU8wN%(c`n<ZhCEz+PVBBkC>`pW+u<dd%I8Zx@}OpY_qPO_w%C(q4z|6W^Za+
z_j28gtua3hG`V*koSJ|0QgW=}naadm|Ku4)kJ#MVg%n!^oH)S5NBbH^N7ut#c}WMX
QfF%=yr>mdKI;Vst0B62XjsO4v

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/add_tournoi.png b/app/src/main/res/drawable-xxhdpi/add_tournoi.png
deleted file mode 100644
index f78065a3c6c9721757311ca606561eeacc35fd07..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2011
zcmZ{ldpy&N8^^aX7GX9UtwW>9ZHbDULfevA7Zl~2OF7?AS?<aGu#MWqWsy-GDxGMV
z%Qtj%)8_2!gic9DE=el&Gn7t_qH=cr`~Cj-y<X4re4f|)_4z#iJ_3JVrhy(w4}m}!
zuzbAsYE<%XV{|mr9hoqWK<HMnyy$_c$f;guV*~<|Lt8BCz}^1#0qs`JO|lB7{%ody
z_$R6pv7;Rbr{?EDazFz(kOrVMJRhy$X8IcLMEpO-{u?QVw5AO^&FYJmvX2knjQOu>
zx%IxTOEubQ-{ezMJ84%@@@OFJanuo;4Ia=q+=V!m!y9vMM4&T~L2~;ZlJfH2c=Hxv
zZ9iBVe4&AcB(|K?RRu?FtOI;JP2Er?HqVT9Ah+T>U+eDRY5Dd~+CGROLE__NGb0o8
zUl9M<P2T4nzxPO82anbZS}MXD4Qz3r4RkmNE(4u&Il54&eUlen3`&bWy*a5Dzl{**
z;f5OB;@@0H-e@Upzh-57GF8j4wq>Zg-xpHojWPGgCP>S&wLR#|6)xY&cr&BX!7tIv
zx6!UQMmq|18Wi#3{glqF>}&lWuXN1)$r9w{TCph^L}ikbcdC=#*PFAgesS^5m4RF3
z2<(s|7!F`NEMS?{lzuF|IE7|n3P$P{<$$=EoMy*9JH6J`{7t#JfDZ-ZZb~T+VLk-L
zF0+(7YOeU+LeEz6$a>%#Q%VYrF=D>P*rD>#X2Hb$j{#VABN+<Djn{7w056mKr4sT)
zxE>fopb*0tBVRN|;7CQ4sQRcaKe^jpno&IN>&gkdZ>^fF+&2<pqFjh7?K5U2Fw1GO
z`SsD(sWyuRTtG-zNr9)?D9D0!U6rnWW&#JVvy0t{=O;_xUf(XTw9l25P<x&xGml+B
z&Yk80adpL;*Vx4##PeGM_tq62fU|beWwrZR_liw6q5Vf5rt}=*&0DlCrLtPmBMI~N
zsx(<VZrpozqGA2l;Vh$(`!&Btx>4Rj-pg<f)MHr#>&8Ksv;H;h+}10${Cxr9XJi)i
z9%s6<L$~ohIo3cAgptAvIv*AVqEg^*d6>0f=^QYC?z9$TQ#=!(@4W{ue&&`B*scA9
zFK9~d&VE>eQ=iLS_=GEJc*ifLi^l?%#m%VkM0I1X`5r%X!Uq50T?q%p5vwbloA5+-
z{iC6cCQ5g|gfidN^s0F}rs7WUHKA$`GmLTcYgU1skg(jM+k*Xa;j|ZQ@0fNxSy#IR
z-`ye1Z6FH@%ZCL*!V5T^f<A<voeUTSS7GXx6?+<@!t#GSbqQFNb5RuXSCRgB7@E^}
zf%_Usq<{Q9G(V`~5^yI>2FKH>`VS(7uHHT;gx++AJ6H$K710DO%SL+aRa<EoKgG<}
z(CJ~`=D=RQ%kE5r-B3GsnDnY{3Ma`!d~pc!_*{Ldsw5%lXnt)h*C~p9SE7^o<Xu&9
zS0@m{7Z9FyZf@)UEUtErto5NB47t+SKqJ|VpRl3y$Jku$O%EP$&M@jly1woj3(u$K
zD$h^H|F$(ox{x#wk;B;a)V9aQe?)O{@I9Zu?>WZ}?i;d2MI{crULqV86iCD|luwDN
z27hnqj9NJ#GQ+t0){swl?ps+GBl{%`g#u(tW$fDp+{e1v!>w&AIBBw{t~2wS$`8L9
zIwrrkc$Zyw_&1M|pN%O4t*$zaW}&iC()<oX$HCUvv#HgUFmBF46}{{Wy1DnABCT%>
zylR};6D*jx7Wh3UDsz2aQX&Bv$Ei|yish5%9d(H6!m)yO&n;mkqK{{6>Kg`cs%T3a
zj%s~fQu|;<beMFhV@|hDHDY4m%Sp|Y6n;+*#hbfHtu8Dq&65IUO7cp#n7EYY%H2e&
zBz0y&P{0k5AMY8=0iPq9rrcvL3hyrf)D?-_QKG5&kPmG@@i`-_StxPFROZ$i#~n48
zrzLnc^fV>rY4hYMTrf-P8y(|`d78nsMyN4@79wQ~zdwuF*ghuYz_+cE;va#XFJw=&
z-Ce|hA8oZ!?8$KGMC`LE>&xm<Kc_>y$LUwm_wt<zK}h+>;Iy`|XqKRS8!%O{Hi+?I
z+wC842VXP-9cAotBi0-uHv+<3dX)Bj&KT;#N*zSju^%VDwM|or#@e+M_f9;P1EaiZ
zEbB8^GB6^#6BNw9N_!bJ?!|D4fFh>eossXsJ_OG(>(LhCNo#&g{m>1-QrVqzbv8iV
zoJth6g*r#xYb5sc{hAyJ1>RcEX(+x*s_i%e?Q#s-{()H>xN_-EHcA91CKr=cE1qP~
zh@v;=rQ5F8kaY&mz`a91WXRz^jn2iuQ4mmX>-crA?7h!%jmI8CodF;@2!$Rt4~4K2
zH4Ofkv9QSA0;&=>T8LnVHA<zx#6K<s{-QaE18TLFi{PgBzsr*=bRE`e?Nhv<O41H7
z7I~Ag>Bir@2`+k~NJptqcmdw=R{xz}wrgeC8m9J6&iGF=Ihj=AZs`pUlQxUXmLtag
z0H2(>e%omJ)IqjH;gKv2M(F!z^6y2NrR<ShC;4ZdH7ASV^_78xZ?eC!j%e;urR}`a
zG-rhB0F_5RIyl{Z7y0A>^+lQeI{)PzRz&rx>0U_ldJ%GRw)()-<O4ERAHwP@8B`@o
hqY#a%S^pP>3(?5YvzCa>$sMGBldSE&UiFM{?ms=4rJDc%

diff --git a/app/src/main/res/layout/fragment_history.xml b/app/src/main/res/layout/fragment_history.xml
index c5b1fb98..e4ab0748 100644
--- a/app/src/main/res/layout/fragment_history.xml
+++ b/app/src/main/res/layout/fragment_history.xml
@@ -82,7 +82,7 @@
 		android:layout_marginEnd="8dp"
 		android:text="@string/new_cash_game"
 		app:icon="@drawable/add_cash_game"
-		app:iconSize="32dp"
+		app:iconSize="28dp"
 		app:layout_constraintEnd_toStartOf="@+id/newTournament"
 		app:layout_constraintHorizontal_bias="0.5"
 		app:layout_constraintHorizontal_chainStyle="spread"
@@ -99,8 +99,8 @@
 		android:layout_marginTop="8dp"
 		android:layout_marginEnd="16dp"
 		android:text="@string/new_tournament"
-		app:icon="@drawable/add_tournoi"
-		app:iconSize="32dp"
+		app:icon="@drawable/add_tournament"
+		app:iconSize="28dp"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintHorizontal_bias="0.5"
 		app:layout_constraintStart_toEndOf="@+id/newCashGame"
diff --git a/app/src/main/res/layout/row_history_session_header.xml b/app/src/main/res/layout/row_header_title.xml
similarity index 100%
rename from app/src/main/res/layout/row_history_session_header.xml
rename to app/src/main/res/layout/row_header_title.xml
diff --git a/app/src/main/res/layout/row_session_view.xml b/app/src/main/res/layout/row_session_view.xml
index fcc7ed1e..67b08d7b 100644
--- a/app/src/main/res/layout/row_session_view.xml
+++ b/app/src/main/res/layout/row_session_view.xml
@@ -3,7 +3,7 @@
 	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:layout_height="56dp"
 	android:background="?selectableItemBackground">
 
 	<androidx.appcompat.widget.AppCompatTextView
diff --git a/app/src/main/res/layout/row_stats_title_value.xml b/app/src/main/res/layout/row_stats_title_value.xml
index 5947b5de..4853b3ec 100644
--- a/app/src/main/res/layout/row_stats_title_value.xml
+++ b/app/src/main/res/layout/row_stats_title_value.xml
@@ -31,7 +31,6 @@
 			android:layout_height="wrap_content"
 			android:layout_marginEnd="8dp"
 			android:layout_marginBottom="8dp"
-			android:paddingTop="-8dp"
 			app:layout_constraintBottom_toBottomOf="parent"
 			app:layout_constraintEnd_toStartOf="@+id/nextArrow"
 			app:layout_constraintStart_toStartOf="@+id/guidelineStart"
@@ -44,11 +43,11 @@
 			android:layout_height="24dp"
 			android:src="@drawable/ic_arrow_right"
 			android:tint="@color/gray_light"
+			android:visibility="gone"
 			app:layout_constraintBottom_toBottomOf="parent"
 			app:layout_constraintEnd_toEndOf="@+id/guidelineEnd"
 			app:layout_constraintTop_toTopOf="parent" />
 
-
 		<androidx.constraintlayout.widget.Guideline
 			android:id="@+id/guidelineStart"
 			android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/row_title.xml b/app/src/main/res/layout/row_title.xml
index a4d6a82d..9365329e 100644
--- a/app/src/main/res/layout/row_title.xml
+++ b/app/src/main/res/layout/row_title.xml
@@ -4,7 +4,7 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:id="@+id/rowTitle.container"
 	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
+	android:layout_height="48dp"
 	android:background="?selectableItemBackground">
 
 	<androidx.appcompat.widget.AppCompatTextView
diff --git a/app/src/main/res/layout/row_title_arrow.xml b/app/src/main/res/layout/row_title_arrow.xml
index 069d72bb..1f922d0f 100644
--- a/app/src/main/res/layout/row_title_arrow.xml
+++ b/app/src/main/res/layout/row_title_arrow.xml
@@ -4,7 +4,7 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:id="@+id/rowTitle.container"
 	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
+	android:layout_height="48dp"
 	android:background="?selectableItemBackground">
 
 	<androidx.appcompat.widget.AppCompatTextView
diff --git a/app/src/main/res/layout/row_title_value.xml b/app/src/main/res/layout/row_title_value.xml
index d5b119fe..718462ed 100644
--- a/app/src/main/res/layout/row_title_value.xml
+++ b/app/src/main/res/layout/row_title_value.xml
@@ -4,7 +4,7 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:id="@+id/rowTitleValue.container"
 	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
+	android:layout_height="48dp"
 	android:orientation="vertical">
 
 	<androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/row_title_value_action.xml b/app/src/main/res/layout/row_title_value_action.xml
index 36e793aa..a0f0ce3b 100644
--- a/app/src/main/res/layout/row_title_value_action.xml
+++ b/app/src/main/res/layout/row_title_value_action.xml
@@ -4,7 +4,7 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:id="@+id/rowTitleValueAction.container"
 	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
+	android:layout_height="48dp"
 	android:background="?selectableItemBackground">
 
 	<androidx.appcompat.widget.AppCompatTextView
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 320151df..b0cd3cbe 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -8,7 +8,7 @@
 	<color name="white">#FFFFFF</color>
 	<color name="white_transparent">#30FFFFFF</color>
 
-	<color name="gray_light">#6AFFFFFF</color>
+	<color name="gray_light">#8AFFFFFF</color>
 	<color name="gray_darker">#141414</color>
 	<color name="gray_dark">#1B1F1B</color>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 6433b80d..3c1d7ae5 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -111,7 +111,7 @@
 	</style>
 
 	<style name="PokerAnalyticsTheme.TextView.RowStatsValue">
-		<item name="android:textSize">24sp</item>
+		<item name="android:textSize">28sp</item>
 		<item name="android:textColor">@color/white</item>
 		<item name="android:fontFamily">@font/roboto_light</item>
 		<item name="android:maxLines">1</item>
@@ -130,7 +130,7 @@
 		<item name="android:textColor">@color/kaki_medium</item>
 		<item name="android:maxLines">1</item>
 		<item name="android:ellipsize">end</item>
-		<item name="android:fontFamily">@font/roboto_bold</item>
+		<item name="android:fontFamily">@font/roboto_medium</item>
 		<item name="android:textSize">16sp</item>
 	</style>
 
@@ -200,8 +200,9 @@
 	<!-- Button -->
 	<style name="PokerAnalyticsTheme.Button" parent="Widget.MaterialComponents.Button">
 		<item name="iconPadding">0dp</item>
+		<item name="android:height">48dp</item>
 		<item name="iconTint">@color/black</item>
-		<item name="android:letterSpacing">-0.02</item>
+		<item name="android:letterSpacing">0</item>
 		<item name="android:fontFamily">@font/roboto_medium</item>
 		<item name="android:textColor">@color/black</item>
 		<item name="android:paddingStart">4dp</item>

From c7fa7b32c1f89cb78056513249a03d6d8c08c65b Mon Sep 17 00:00:00 2001
From: Laurent <laurent@staxriver.com>
Date: Tue, 5 Mar 2019 16:42:52 +0100
Subject: [PATCH 10/11] Fixes issue with duration

---
 .../android/ExampleInstrumentedUnitTest.kt    | 143 +++++++++++++---
 .../android/PokerAnalyticsApplication.kt      |  40 +++--
 .../pokeranalytics/android/calculus/Stat.kt   |   4 +-
 .../android/model/realm/Session.kt            |  17 +-
 .../android/model/realm/SessionSet.kt         |  27 +--
 .../android/model/realm/TimeFrame.kt          | 155 +++++++++++-------
 .../android/util/DateExtension.kt             |   2 +-
 .../android/util/NumbersExtension.kt          |   4 +
 8 files changed, 279 insertions(+), 113 deletions(-)

diff --git a/app/src/androidTest/java/net/pokeranalytics/android/ExampleInstrumentedUnitTest.kt b/app/src/androidTest/java/net/pokeranalytics/android/ExampleInstrumentedUnitTest.kt
index b5c48af6..85ef68bf 100644
--- a/app/src/androidTest/java/net/pokeranalytics/android/ExampleInstrumentedUnitTest.kt
+++ b/app/src/androidTest/java/net/pokeranalytics/android/ExampleInstrumentedUnitTest.kt
@@ -7,6 +7,7 @@ import net.pokeranalytics.android.calculus.ComputedResults
 import net.pokeranalytics.android.calculus.SessionGroup
 import net.pokeranalytics.android.calculus.Stat
 import net.pokeranalytics.android.model.realm.Session
+import net.pokeranalytics.android.model.realm.SessionSet
 import net.pokeranalytics.android.model.realm.TimeFrame
 import org.junit.Assert
 import org.junit.Assert.assertEquals
@@ -26,7 +27,7 @@ class ExampleInstrumentedUnitTest : RealmInstrumentedUnitTest() {
 
     // convenience extension
     fun Session.Companion.testInstance(netResult: Double, startDate: Date, endDate: Date?): Session {
-        val session: Session = Session.newInstance()
+        val session: Session = Session.newInstance(super.mockRealm, false)
         session.result?.netResult = netResult
         session.timeFrame?.setDate(startDate, endDate)
         return session
@@ -67,8 +68,8 @@ class ExampleInstrumentedUnitTest : RealmInstrumentedUnitTest() {
 
         realm.beginTransaction()
 
-        s1.timeFrame?.setDate(sd1, ed1) // duration = 1h, hourly = -100, bb100 = -200bb / 25hands * 100 = -800
-        s2.timeFrame?.setDate(sd2, ed2) // duration = 3h, hourly = 100, bb100 = 150 / 75 * 100 = +200
+        s1.timeFrame?.setDate(sd1, ed1) // netDuration = 1h, hourly = -100, bb100 = -200bb / 25hands * 100 = -800
+        s2.timeFrame?.setDate(sd2, ed2) // netDuration = 3h, hourly = 100, bb100 = 150 / 75 * 100 = +200
 
         realm.copyToRealmOrUpdate(s1)
         realm.copyToRealmOrUpdate(s2)
@@ -102,7 +103,7 @@ class ExampleInstrumentedUnitTest : RealmInstrumentedUnitTest() {
         if (duration != null) {
             assertEquals(4.0, duration.value, delta)
         } else {
-            Assert.fail("No duration stat")
+            Assert.fail("No netDuration stat")
         }
 
         val hourlyRate = results.computedStat(Stat.HOURLY_RATE)
@@ -207,7 +208,6 @@ class ExampleInstrumentedUnitTest : RealmInstrumentedUnitTest() {
 
         realm.insert(s1)
         realm.insert(s2)
-        realm.commitTransaction()
 
         val sdf = SimpleDateFormat("dd/M/yyyy hh:mm")
 
@@ -216,10 +216,9 @@ class ExampleInstrumentedUnitTest : RealmInstrumentedUnitTest() {
         val sd2 = sdf.parse("01/1/2019 08:00")
         val ed2 = sdf.parse("01/1/2019 11:00")
 
-        realm.beginTransaction()
 
-        s1.timeFrame?.setDate(sd1, ed1) // duration = 1h, hourly = -100, bb100 = -200bb / 25hands * 100 = -800
-        s2.timeFrame?.setDate(sd2, ed2) // duration = 4h, hourly = 100, bb100 = 150 / 75 * 100 = +200
+        s1.timeFrame?.setDate(sd1, ed1) // netDuration = 1h, hourly = -100, bb100 = -200bb / 25hands * 100 = -800
+        s2.timeFrame?.setDate(sd2, ed2) // netDuration = 4h, hourly = 100, bb100 = 150 / 75 * 100 = +200
 
         realm.copyToRealmOrUpdate(s1)
         realm.copyToRealmOrUpdate(s2)
@@ -274,7 +273,6 @@ class ExampleInstrumentedUnitTest : RealmInstrumentedUnitTest() {
         realm.insert(s1)
         realm.insert(s2)
         realm.insert(s3)
-        realm.commitTransaction()
 
         val sdf = SimpleDateFormat("dd/M/yyyy hh:mm")
 
@@ -285,11 +283,9 @@ class ExampleInstrumentedUnitTest : RealmInstrumentedUnitTest() {
         val sd3 = sdf.parse("01/1/2019 03:00")
         val ed3 = sdf.parse("01/1/2019 06:00")
 
-        realm.beginTransaction()
-
-        s1.timeFrame?.setDate(sd1, ed1) // duration = 4h
-        s2.timeFrame?.setDate(sd2, ed2) // duration = 4h
-        s3.timeFrame?.setDate(sd3, ed3) // duration = 3h
+        s1.timeFrame?.setDate(sd1, ed1) // netDuration = 4h
+        s2.timeFrame?.setDate(sd2, ed2) // netDuration = 4h
+        s3.timeFrame?.setDate(sd3, ed3) // netDuration = 3h
 
         realm.copyToRealmOrUpdate(s1)
         realm.copyToRealmOrUpdate(s2)
@@ -370,9 +366,9 @@ class ExampleInstrumentedUnitTest : RealmInstrumentedUnitTest() {
 
         realm.beginTransaction()
 
-        s1.timeFrame?.setDate(sd1, ed1) // duration = 4h
-        s2.timeFrame?.setDate(sd2, ed2) // duration = 4h
-        s3.timeFrame?.setDate(sd3, ed3) // duration = 3h
+        s1.timeFrame?.setDate(sd1, ed1) // netDuration = 4h
+        s2.timeFrame?.setDate(sd2, ed2) // netDuration = 4h
+        s3.timeFrame?.setDate(sd3, ed3) // netDuration = 3h
 
         realm.copyToRealmOrUpdate(s1)
         realm.copyToRealmOrUpdate(s2)
@@ -393,12 +389,9 @@ class ExampleInstrumentedUnitTest : RealmInstrumentedUnitTest() {
         if (duration != null) {
             assertEquals(8.0, duration.value, delta)
         } else {
-            Assert.fail("No duration stat")
+            Assert.fail("No netDuration stat")
         }
 
-//        realm.beginTransaction()
-//        s1.deleteFromRealm()
-//        realm.commitTransaction()
         realm.executeTransaction {
             s1.deleteFromRealm()
         }
@@ -414,4 +407,112 @@ class ExampleInstrumentedUnitTest : RealmInstrumentedUnitTest() {
         }
 
     }
+
+
+    @Test
+    fun testSessionSetCount() {
+
+        val realm = this.mockRealm
+
+        realm.beginTransaction()
+        val s1 = realm.createObject(Session::class.java, "1")
+
+        s1.timeFrame = realm.createObject(TimeFrame::class.java)
+
+        s1.result = realm.createObject(net.pokeranalytics.android.model.realm.Result::class.java)
+
+        realm.insert(s1)
+
+        val sdf = SimpleDateFormat("dd/M/yyyy hh:mm")
+
+        val sd1 = sdf.parse("01/1/2019 09:00")
+        val ed1 = sdf.parse("01/1/2019 10:00")
+
+        s1.timeFrame?.setDate(sd1, ed1) // netDuration = 1h, hourly = -100, bb100 = -200bb / 25hands * 100 = -800
+
+        realm.copyToRealmOrUpdate(s1)
+        realm.commitTransaction()
+
+        val sets = realm.where(SessionSet::class.java).findAll()
+
+        Assert.assertEquals(1, sets.size)
+
+        val set = sets.first()
+        if (set != null) {
+            Assert.assertEquals(sd1.time, set.timeFrame?.startDate?.time)
+            Assert.assertEquals(ed1.time, set.timeFrame?.endDate?.time)
+        } else {
+            Assert.fail("No set")
+        }
+
+    }
+
+    @Test
+    fun testSessionSetCount2() {
+
+        val realm = this.mockRealm
+
+        realm.beginTransaction()
+        val s1 = realm.createObject(Session::class.java, "1")
+        val s2 = realm.createObject(Session::class.java, "2")
+
+        s1.timeFrame = realm.createObject(TimeFrame::class.java)
+        s2.timeFrame = realm.createObject(TimeFrame::class.java)
+
+        s1.result = realm.createObject(net.pokeranalytics.android.model.realm.Result::class.java)
+        s2.result = realm.createObject(net.pokeranalytics.android.model.realm.Result::class.java)
+
+        realm.insert(s1)
+        realm.insert(s2)
+
+        val sdf = SimpleDateFormat("dd/M/yyyy hh:mm")
+
+        val sd1 = sdf.parse("01/1/2019 09:00")
+        val ed1 = sdf.parse("01/1/2019 10:00")
+        val sd2 = sdf.parse("01/2/2018 09:00")
+        val ed2 = sdf.parse("01/2/2018 10:00")
+
+        s1.timeFrame?.let {
+            it.setStart(sd1)
+            it.setEnd(ed1)
+        }
+
+        s2.timeFrame?.let {
+            it.setStart(sd2)
+            it.setEnd(ed2)
+        }
+
+//        s1.timeFrame?.setDate(sd1, ed1) // netDuration = 1h, hourly = -100, bb100 = -200bb / 25hands * 100 = -800
+//        s2.timeFrame?.setDate(sd2, ed2) // netDuration = 1h, hourly = -100, bb100 = -200bb / 25hands * 100 = -800
+
+        realm.copyToRealmOrUpdate(s1)
+        realm.copyToRealmOrUpdate(s2)
+
+        realm.commitTransaction()
+
+        val sets = realm.where(SessionSet::class.java).findAll()
+
+        Assert.assertEquals(2, sets.size)
+
+//        val set = sets.first()
+//        if (set != null) {
+//            Assert.assertEquals(sd1.time, set.timeFrame?.startDate?.time)
+//            Assert.assertEquals(ed1.time, set.timeFrame?.endDate?.time)
+//        } else {
+//            Assert.fail("No set")
+//        }
+
+    }
+
+//    @Test
+//    fun testDurationConversion() {
+//
+//        val duration = 6.7555561274509826
+//        val longDuration = duration.toLong()
+//        val formatted = longDuration.toMinutes()
+//
+//        assert(formatted == "11:00")
+//    }
+
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt b/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt
index 0d7c697b..54d41a10 100644
--- a/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt
+++ b/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt
@@ -131,8 +131,8 @@ class PokerAnalyticsApplication : Application() {
 				for (index in 0..50) {
 
 					realm.executeTransaction {
-						val session = Session()
-						session.id = UUID.randomUUID().toString()
+						val session = Session.newInstance(realm, false)
+//						session.id = UUID.randomUUID().toString()
 
 						val calendar = Calendar.getInstance()
 						calendar.set(
@@ -148,21 +148,27 @@ class PokerAnalyticsApplication : Application() {
 						calendar.add(Calendar.MINUTE, (0..59).random())
 						val endDate = calendar.time
 
-						val timeFrame = TimeFrame()
-						timeFrame.setDate(startDate, endDate)
-						session.timeFrame = timeFrame
+//						val timeFrame = TimeFrame()
+
+						session.timeFrame?.let {
+//							it.startDate = startDate
+//							it.endDate = endDate
+							it.setDate(startDate, endDate)
+						}
+
+//						session.timeFrame = timeFrame
 						session.creationDate = startDate
 
 						session.limit = Limit.values().random().ordinal
 						session.game = realm.where<Game>().findAll().random()
 
-						val result = Result()
-						result.buyin = arrayListOf(100, 200, 300, 500, 1000, 2000).random().toDouble()
-						result.netResult = arrayListOf(
-							-2500.0, -2000.0, -1500.0, -1000.0, -500.0, 200.0, 1000.0, 1500.0,
-							2500.0
-						).random()
-						session.result = result
+						session.result?.let { result ->
+							result.buyin = arrayListOf(100, 200, 300, 500, 1000, 2000).random().toDouble()
+							result.netResult = arrayListOf(
+								-2500.0, -2000.0, -1500.0, -1000.0, -500.0, 200.0, 1000.0, 1500.0,
+								2500.0
+							).random()
+						}
 
 						realm.copyToRealmOrUpdate(session)
 					}
@@ -172,6 +178,16 @@ class PokerAnalyticsApplication : Application() {
 
 		realm.close()
 
+		val sets = realm.where(SessionSet::class.java).findAll()
+
+//		Timber.d("sets = ${sets.size}")
+//
+//		sets.forEach { set ->
+//			Timber.d("set sd = : ${set.timeFrame?.startDate}, ed = ${set.timeFrame?.endDate}")
+//		}
+
+
+
 	}
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt b/app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt
index cf3414de..171d5285 100644
--- a/app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt
+++ b/app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt
@@ -7,7 +7,7 @@ import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowViewType
 import net.pokeranalytics.android.util.FormatUtils
 import net.pokeranalytics.android.util.formatted
-import net.pokeranalytics.android.util.toMinutes
+import net.pokeranalytics.android.util.formattedHourlyDuration
 
 /**
  * An enum representing all the types of Session statistics
@@ -138,7 +138,7 @@ class ComputedStat(stat: Stat, value: Double) {
                 return TextFormat("${value.toInt()}")
             } // white durations
             Stat.DURATION, Stat.AVERAGE_DURATION -> {
-                return TextFormat("${value.toLong().toMinutes()}")
+                return TextFormat(value.formattedHourlyDuration())
             } // red/green percentages
             Stat.WIN_RATIO, Stat.ROI -> {
                 val color = if (value >= this.stat.threshold) R.color.green else R.color.red
diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
index c06dc04c..4e146df4 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
@@ -37,6 +37,7 @@ open class Session : RealmObject(), SessionInterface, Savable,
 	companion object {
 		fun newInstance(realm: Realm, isTournament: Boolean): Session {
 			val session = Session()
+			session.timeFrame = TimeFrame()
 			session.result = Result()
 			session.bankroll = realm.where<Bankroll>().findFirst()
 			session.type = if (isTournament) Session.Type.TOURNAMENT.ordinal else Session.Type.CASH_GAME.ordinal
@@ -59,7 +60,7 @@ open class Session : RealmObject(), SessionInterface, Savable,
 	var timeFrame: TimeFrame? = null
 		set(value) {
 			field = value
-			value?.let { it.notifySessionDateChange(this) }
+//			value?.let { it.notifySessionDateChange(this) }
 		}
 
 	// The time frame sessionGroup, which can contain multiple sessions
@@ -142,7 +143,8 @@ open class Session : RealmObject(), SessionInterface, Savable,
 			when (getState()) {
 				SessionState.PENDING, SessionState.PLANNED -> {
 					val sessionTimeFrame = this.timeFrame ?: realm.createObject(TimeFrame::class.java)
-					sessionTimeFrame.setDate(Date(), null)
+					sessionTimeFrame.setStart(Date())
+//					sessionTimeFrame.setDate(Date(), null)
 					this.timeFrame = sessionTimeFrame
 				}
 				SessionState.PAUSED -> {
@@ -178,7 +180,8 @@ open class Session : RealmObject(), SessionInterface, Savable,
 				SessionState.STARTED, SessionState.PAUSED -> {
 					this.timeFrame?.paused = false
 					this.timeFrame?.pauseDate = null
-					this.timeFrame?.setDate(null, Date())
+					this.timeFrame?.setEnd(Date())
+//					this.timeFrame?.setDate(null, Date())
 				}
 				else -> throw Exception("Stopping session in unmanaged state")
 			}
@@ -198,7 +201,7 @@ open class Session : RealmObject(), SessionInterface, Savable,
 	}
 
 	/**
-	 * Return the duration of the current session
+	 * Return the netDuration of the current session
 	 */
 	fun getDuration(): String {
 		val startDate = timeFrame?.startDate ?: Date()
@@ -570,7 +573,8 @@ open class Session : RealmObject(), SessionInterface, Savable,
 			SessionRow.END_DATE -> if (value is Date?) {
 				val timeFrameToUpdate =
 					if (timeFrame != null) timeFrame as TimeFrame else realm.createObject(TimeFrame::class.java)
-				timeFrameToUpdate.setDate(null, value)
+//				timeFrameToUpdate.setDate(null, value)
+				timeFrameToUpdate.setEnd(value)
 				timeFrame = timeFrameToUpdate
 			}
 			SessionRow.GAME -> {
@@ -604,7 +608,8 @@ open class Session : RealmObject(), SessionInterface, Savable,
 				} else {
 					val timeFrameToUpdate =
 						if (timeFrame != null) timeFrame as TimeFrame else realm.createObject(TimeFrame::class.java)
-					timeFrameToUpdate.setDate(value, null)
+					timeFrameToUpdate.setStart(value)
+//					timeFrameToUpdate.setDate(value, null)
 					timeFrame = timeFrameToUpdate
 				}
 			}
diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/SessionSet.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/SessionSet.kt
index 659787a8..88b02fb0 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/SessionSet.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/SessionSet.kt
@@ -9,6 +9,16 @@ import io.realm.annotations.LinkingObjects
 
 open class SessionSet() : RealmObject() {
 
+    companion object {
+
+        fun newInstance(realm: Realm) : SessionSet {
+            val sessionSet: SessionSet = realm.createObject(SessionSet::class.java)
+            sessionSet.timeFrame = realm.createObject(TimeFrame::class.java)
+            return realm.copyToRealm(sessionSet)
+        }
+
+    }
+
     /**
      * The timeframe of the set, i.e. its start & end date
      */
@@ -21,13 +31,13 @@ open class SessionSet() : RealmObject() {
     @LinkingObjects("sessionSet")
     val sessions: RealmResults<Session>? = null
 
-    @Ignore // a duration shortcut
+    @Ignore // a netDuration shortcut
     var duration: Long = 0L
         get() {
-            return this.timeFrame?.duration ?: 0L
+            return this.timeFrame?.netDuration ?: 0L
         }
 
-    @Ignore // a duration in hour
+    @Ignore // a netDuration in hour
     var hourlyDuration: Double = 0.0
         get() {
             return this.timeFrame?.hourlyDuration ?: 0.0
@@ -39,7 +49,7 @@ open class SessionSet() : RealmObject() {
             return this.sessions?.sumByDouble { it.value } ?: 0.0
         }
 
-    @Ignore // a duration shortcut
+    @Ignore // a netDuration shortcut
     var hourlyRate: Double = 0.0
         get () {
             return this.netResult / this.hourlyDuration
@@ -51,15 +61,6 @@ open class SessionSet() : RealmObject() {
     @Ignore
     var bbNetResult: Double = 0.0
 
-    companion object {
-
-        fun newInstance(realm: Realm) : SessionSet {
-            val sessionSet: SessionSet = realm.createObject(SessionSet::class.java)
-            sessionSet.timeFrame = realm.createObject(TimeFrame::class.java)
-            return sessionSet
-        }
-
-    }
 
 
 }
diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/TimeFrame.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/TimeFrame.kt
index 8ac2f2fd..d8f548ea 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/TimeFrame.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/TimeFrame.kt
@@ -1,6 +1,5 @@
 package net.pokeranalytics.android.model.realm
 
-import io.realm.Realm
 import io.realm.RealmObject
 import io.realm.RealmQuery
 import io.realm.RealmResults
@@ -26,32 +25,32 @@ open class TimeFrame : RealmObject() {
             this.computeDuration()
         }
 
-	// The latest pause date
-	var pauseDate: Date? = null
-		set(value) {
-			field?.let {
-				if (value == null && field != null) {
-					breakDuration += Date().time - it.time
-				}
-			}
-			field = value
-			this.computeDuration()
-		}
-
-    // The break duration
+    // The latest pause date
+    var pauseDate: Date? = null
+        set(value) {
+            field?.let {
+                if (value == null && field != null) {
+                    breakDuration += Date().time - it.time
+                }
+            }
+            field = value
+            this.computeDuration()
+        }
+
+    // The break netDuration
     var breakDuration: Long = 0L
         set(value) {
             field = value
             this.computeDuration()
         }
 
-    // the total duration
-    var duration: Long = 0L
+    // the total netDuration
+    var netDuration: Long = 0L
         private set
 
     var hourlyDuration: Double = 0.0
         get() {
-            return this.duration / 3600000.0 // 3.6 millions of milliseconds
+            return this.netDuration / 3600000.0 // 3.6 millions of milliseconds
         }
 
     // indicates a state of pause
@@ -73,29 +72,35 @@ open class TimeFrame : RealmObject() {
     var set: SessionSet? = null
         get() = this.sets?.first()
 
-    fun setDate(startDate: Date?, endDate: Date?) {
-
-        startDate?.let {
-            this.startDate = startDate
+    fun setStart(startDate: Date) {
+        this.startDate = startDate
+        this.session?.let {
+            this.notifySessionDateChange(it)
         }
+    }
 
+    fun setEnd(endDate: Date?) {
         this.endDate = endDate
+        this.session?.let {
+            this.notifySessionDateChange(it)
+        }
+    }
 
-        this.computeDuration()
+    fun setDate(startDate: Date, endDate: Date?) {
+        this.startDate = startDate
+        this.endDate = endDate
 
         this.session?.let {
             this.notifySessionDateChange(it)
         }
-
     }
 
     /**
-     * Computes the net duration of the session
+     * Computes the net netDuration of the session
      */
     private fun computeDuration() {
         var endDate: Date = this.endDate ?: Date()
-        val netDuration = endDate.time - this.startDate.time - this.breakDuration
-        this.duration = netDuration
+        this.netDuration = endDate.time - this.startDate.time - this.breakDuration
     }
 
     /**
@@ -103,25 +108,35 @@ open class TimeFrame : RealmObject() {
      * Makes all necessary changes to keep sequential time frames
      */
     fun notifySessionDateChange(owner: Session) {
-        val realm = Realm.getDefaultInstance()
-        var query: RealmQuery<SessionSet> = realm.where(SessionSet::class.java)
+
+        var query: RealmQuery<SessionSet> = this.realm.where(SessionSet::class.java)
         query.isNotNull("timeFrame")
 
 //        Timber.d("this> sd = : ${this.startDate}, ed = ${this.endDate}")
 
+        val sets = realm.where(SessionSet::class.java).findAll()
+//        Timber.d("set count = ${sets.size}")
+
         if (this.endDate == null) {
-            query.greaterThan("timeFrame.startDate", this.startDate).or().greaterThan("timeFrame.endDate", this.startDate)
+            query.greaterThanOrEqualTo("timeFrame.startDate", this.startDate)
+                .or()
+                .greaterThanOrEqualTo("timeFrame.endDate", this.startDate)
+                .or()
+                .isNull("timeFrame.endDate")
         } else {
             val endDate = this.endDate!!
             query
-                .lessThan("timeFrame.startDate", this.startDate)
-                .greaterThan("timeFrame.endDate", this.startDate)
+                .lessThanOrEqualTo("timeFrame.startDate", this.startDate)
+                .greaterThanOrEqualTo("timeFrame.endDate", this.startDate)
+                .or()
+                .lessThanOrEqualTo("timeFrame.startDate", endDate)
+                .greaterThanOrEqualTo("timeFrame.endDate", endDate)
                 .or()
-                .lessThan("timeFrame.startDate", endDate)
-                .greaterThan("timeFrame.endDate", endDate)
+                .greaterThanOrEqualTo("timeFrame.startDate", this.startDate)
+                .lessThanOrEqualTo("timeFrame.endDate", endDate)
                 .or()
-                .greaterThan("timeFrame.startDate", this.startDate)
-                .lessThan("timeFrame.endDate", endDate)
+                .isNull("timeFrame.endDate")
+                .lessThanOrEqualTo("timeFrame.startDate", endDate)
         }
 
         val sessionGroups = query.findAll()
@@ -137,7 +152,7 @@ open class TimeFrame : RealmObject() {
 
         when (sessionSets.size) {
             0 -> this.createSessionGroup(owner)
-            1 -> this.updateSingleSessionGroup(owner, sessionSets.first()!!)
+            1 -> this.updateSessionGroup(owner, sessionSets.first()!!)
             else -> this.mergeSessionGroups(owner, sessionSets)
         }
 
@@ -148,9 +163,7 @@ open class TimeFrame : RealmObject() {
      */
     private fun createSessionGroup(owner: Session) {
 
-        val realm = Realm.getDefaultInstance()
-
-        val set: SessionSet = SessionSet.newInstance(realm)
+        val set: SessionSet = SessionSet.newInstance(this.realm)
         set.timeFrame?.let {
             it.startDate = this.startDate
             it.endDate = this.endDate
@@ -160,29 +173,53 @@ open class TimeFrame : RealmObject() {
 
         owner.sessionSet = set
 
-        Timber.d("sd = : ${set.timeFrame?.startDate}, ed = ${set.timeFrame?.endDate}")
+//        Timber.d("sd = : ${set.timeFrame?.startDate}, ed = ${set.timeFrame?.endDate}")
+        Timber.d("netDuration 1 = : ${set.timeFrame?.netDuration}")
 
     }
 
     /**
-     * Single session sessionGroup update
+     * Single SessionSet update, the session might be the owner
      * Changes the sessionGroup timeframe using the current timeframe dates
      */
-    private fun updateSingleSessionGroup(owner: Session, sessionSet: SessionSet) {
+    private fun updateSessionGroup(owner: Session, sessionSet: SessionSet) {
 
-        var groupTimeFrame: TimeFrame = sessionSet.timeFrame!! // tested in the query
+        var timeFrame: TimeFrame = sessionSet.timeFrame!! // tested in the query
+//        timeFrame.setDate(this.startDate, this.endDate)
 
-        if (this.startDate.before(groupTimeFrame.startDate)) {
-            groupTimeFrame.startDate = this.startDate
-        }
-        val endDate = this.endDate
-        if (endDate != null && groupTimeFrame.endDate != null && endDate.after(groupTimeFrame.endDate)) {
-            groupTimeFrame.endDate = endDate
-        } else if (endDate == null) {
-            groupTimeFrame.endDate = null
-        }
+        val sisterSessions = sessionSet.sessions!! // shouldn't crash ever
+
+        // if we have only one session in the set and that it corresponds to the set
+        if (sessionSet.sessions?.size == 1 && sessionSet.sessions?.first() == owner) {
+            timeFrame.setDate(this.startDate, this.endDate)
+        } else { // there are 2+ sessions to manage and possible splits
+
+            val endDate = this.endDate
+
+            // case where all sessions are over but the set is not, we might have a split, so we delete the set and save everything again
+            if (endDate != null && sisterSessions.all { it.timeFrame?.endDate != null } && timeFrame.endDate == null) {
+                var sessions = mutableListOf<Session>(owner)
+                sessionSet.sessions?.forEach { sessions.add(it) }
+                sessionSet.deleteFromRealm()
+                sessions.forEach { it.timeFrame?.notifySessionDateChange(it) }
+            } else {
 
-        owner.sessionSet = sessionSet
+                if (this.startDate.before(timeFrame.startDate)) {
+                    timeFrame.startDate = this.startDate
+                }
+                if (endDate != null && timeFrame.endDate != null && endDate.after(timeFrame.endDate)) {
+                    timeFrame.endDate = endDate
+                } else if (endDate == null) {
+                    timeFrame.endDate = null
+                }
+
+                owner.sessionSet = sessionSet
+
+//                Timber.d("sd = : ${sessionSet.timeFrame?.startDate}, ed = ${sessionSet.timeFrame?.endDate}")
+                Timber.d("netDuration 2 = : ${sessionSet.timeFrame?.netDuration}")
+            }
+
+        }
 
     }
 
@@ -216,25 +253,27 @@ open class TimeFrame : RealmObject() {
 
         // get all sessions from sets
         var sessions = mutableSetOf<Session>()
-        sessionSets.forEach { it.sessions?.asIterable()?.let { it1 -> sessions.addAll(it1) } }
+        sessionSets.forEach { set ->
+            set.sessions?.asIterable()?.let { sessions.addAll(it) }
+        }
 
         // delete all sets
         sessionSets.deleteAllFromRealm()
 
         // Create a new sets
-        val set: SessionSet = SessionSet.newInstance(realm)
+        val set: SessionSet = SessionSet.newInstance(this.realm)
         set.timeFrame?.let {
-            it.startDate = startDate
-            it.endDate = endDate
+            it.setDate(startDate, endDate)
         } ?: run {
             throw ModelException("TimeFrame should never be null here")
         }
 
         // Add the session linked to this timeframe to the new sessionGroup
-        owner.sessionSet  = set
+        owner.sessionSet = set
 
         // Add all orphan sessions
         sessions.forEach { it.sessionSet = set }
+        Timber.d("netDuration 3 = : ${set.timeFrame?.netDuration}")
 
     }
 
diff --git a/app/src/main/java/net/pokeranalytics/android/util/DateExtension.kt b/app/src/main/java/net/pokeranalytics/android/util/DateExtension.kt
index af945f5e..6029e96b 100644
--- a/app/src/main/java/net/pokeranalytics/android/util/DateExtension.kt
+++ b/app/src/main/java/net/pokeranalytics/android/util/DateExtension.kt
@@ -84,7 +84,7 @@ fun Date.getMonthAndYear(): String {
     return SimpleDateFormat("MMMM YYYY", Locale.getDefault()).format(this).capitalize()
 }
 
-// Return the duration between two dates
+// Return the netDuration between two dates
 fun Date.getDuration(toDate: Date) : String {
     val difference = (toDate.time - this.time).toInt()
     val numOfDays = (difference / (1000 * 60 * 60 * 24))
diff --git a/app/src/main/java/net/pokeranalytics/android/util/NumbersExtension.kt b/app/src/main/java/net/pokeranalytics/android/util/NumbersExtension.kt
index 40ca65f8..d4d4bfda 100644
--- a/app/src/main/java/net/pokeranalytics/android/util/NumbersExtension.kt
+++ b/app/src/main/java/net/pokeranalytics/android/util/NumbersExtension.kt
@@ -25,6 +25,10 @@ fun Double.toCurrency(): String {
     return format.format(this)
 }
 
+fun Double.formattedHourlyDuration() : String {
+    return (this * 1000 * 3600).toLong().toMinutes()
+}
+
 // Return the time from milliseconds to hours:minutes
 fun Long.toMinutes() : String {
     val totalMinutes = this / (1000 * 60)

From 6edb5f4a0526726581f17b9bfdf94d692ec4e1e4 Mon Sep 17 00:00:00 2001
From: Laurent <laurent@staxriver.com>
Date: Tue, 5 Mar 2019 16:45:02 +0100
Subject: [PATCH 11/11] Fix build issue

---
 .../main/java/net/pokeranalytics/android/model/realm/Session.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
index e7a53aac..6963dd57 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
@@ -573,7 +573,7 @@ open class Session : RealmObject(), SessionInterface, Savable,
 					localResult.cashout =  (value as String).toDouble()
 					val timeFrameToUpdate =
 						if (timeFrame != null) timeFrame as TimeFrame else realm.createObject(TimeFrame::class.java)
-					timeFrameToUpdate.setDate(null, Date())
+					timeFrameToUpdate.setEnd(Date())
 					timeFrame = timeFrameToUpdate
 				}