From 021106f5586883f3abb92ebb4b3afdd9f627769f Mon Sep 17 00:00:00 2001 From: Laurent Date: Thu, 11 Apr 2019 10:44:23 +0200 Subject: [PATCH 1/5] created BB typealias for BB amount --- .../pokeranalytics/android/model/realm/ComputableResult.kt | 4 ++-- .../java/net/pokeranalytics/android/model/realm/Session.kt | 7 +++++-- .../net/pokeranalytics/android/model/realm/SessionSet.kt | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/ComputableResult.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/ComputableResult.kt index a4c72be8..fd3aa17a 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/ComputableResult.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/ComputableResult.kt @@ -9,7 +9,7 @@ open class ComputableResult() : RealmObject(), Computable, Filterable { override var ratedNet: Double = 0.0 - override var bbNet: Double = 0.0 + override var bbNet: BB = 0.0 override var hasBigBlind: Int = 0 @@ -19,7 +19,7 @@ open class ComputableResult() : RealmObject(), Computable, Filterable { override var estimatedHands: Double = 0.0 - override var bbPer100Hands: Double = 0.0 + override var bbPer100Hands: BB = 0.0 override var sessionSet: SessionSet? = null 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 0cbb2416..8bf81de2 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 @@ -42,9 +42,12 @@ import java.util.* import java.util.Currency import kotlin.collections.ArrayList +typealias BB = Double + open class Session : RealmObject(), Savable, Editable, StaticRowRepresentableDataSource, RowRepresentable, Timed, TimeFilterable, Filterable { + enum class Type { CASH_GAME, TOURNAMENT @@ -293,7 +296,7 @@ open class Session : RealmObject(), Savable, Editable, StaticRowRepresentableDat /** * The net result in big blinds */ - val bbNet: Double + val bbNet: BB get() { val bb = this.cgBigBlind; val result = this.result if (bb != null && result != null) { @@ -367,7 +370,7 @@ open class Session : RealmObject(), Savable, Editable, StaticRowRepresentableDat throw ModelException("Session should have an existing Result relationship") } - val bbHourlyRate: Double + val bbHourlyRate: BB get() { return this.bbNet / this.hourlyDuration } 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 598d66fb..9774e1b7 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 @@ -76,7 +76,7 @@ open class SessionSet() : RealmObject(), Timed, Filterable { var estimatedHands: Double = 0.0 - var bbNet: Double = 0.0 + var bbNet: BB = 0.0 override fun formattedValue(stat: Stat, context: Context) : TextFormat { return when (stat) { From db2e77327891fcf7c93266d2e6cf64ff55a5dd85 Mon Sep 17 00:00:00 2001 From: Laurent Date: Thu, 11 Apr 2019 10:52:24 +0200 Subject: [PATCH 2/5] hide in progress elements for beta --- .../android/ui/activity/HomeActivity.kt | 2 +- .../android/ui/fragment/StatsFragment.kt | 22 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt index 39602da7..071e2a81 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt @@ -61,7 +61,7 @@ class HomeActivity : PokerAnalyticsActivity() { menuInflater.inflate(R.menu.home_menu, menu) this.homeMenu = menu //TODO: Change filter button visibility - homeMenu?.findItem(R.id.filter)?.isVisible = true + homeMenu?.findItem(R.id.filter)?.isVisible = false return super.onCreateOptionsMenu(menu) } 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 000e43de..4f112698 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 @@ -199,17 +199,17 @@ class StatsFragment : SessionObserverFragment(), StaticRowRepresentableDataSourc override fun onRowSelected(position: Int, row: RowRepresentable, fromAction: Boolean) { - if (row is StatRepresentable) { - - // filter groups - val groupResults = this.computedResults?.filter { - it.group.name == row.groupName - } - - groupResults?.firstOrNull()?.let { - this.launchStatComputationWithEvolution(row.stat, it.group) - } - } +// if (row is StatRepresentable) { +// +// // filter groups +// val groupResults = this.computedResults?.filter { +// it.group.name == row.groupName +// } +// +// groupResults?.firstOrNull()?.let { +// this.launchStatComputationWithEvolution(row.stat, it.group) +// } +// } } From 1e8daf29a076bad8c3819bf48733593d7fb4072a Mon Sep 17 00:00:00 2001 From: Laurent Date: Thu, 11 Apr 2019 10:52:34 +0200 Subject: [PATCH 3/5] bumping version for new beta version --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 7f7e82b9..392cef42 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -28,7 +28,7 @@ android { applicationId "net.pokeranalytics.android" minSdkVersion 23 targetSdkVersion 28 - versionCode 7 + versionCode 8 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } From 57b2c5c1fffa4da65a26b3d53836b2a2dfad7abb Mon Sep 17 00:00:00 2001 From: Laurent Date: Thu, 11 Apr 2019 11:06:41 +0200 Subject: [PATCH 4/5] Disable proguard --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 392cef42..18f07644 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -35,7 +35,7 @@ android { buildTypes { release { - minifyEnabled true + minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' applicationVariants.all { variant -> variant.outputs.all { output -> From 68304b806b5b7ab2b5f89299e63a083704b18051 Mon Sep 17 00:00:00 2001 From: Laurent Date: Thu, 11 Apr 2019 11:07:40 +0200 Subject: [PATCH 5/5] enable dev features --- .../android/ui/activity/HomeActivity.kt | 2 +- .../android/ui/fragment/StatsFragment.kt | 22 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt index 071e2a81..39602da7 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt @@ -61,7 +61,7 @@ class HomeActivity : PokerAnalyticsActivity() { menuInflater.inflate(R.menu.home_menu, menu) this.homeMenu = menu //TODO: Change filter button visibility - homeMenu?.findItem(R.id.filter)?.isVisible = false + homeMenu?.findItem(R.id.filter)?.isVisible = true return super.onCreateOptionsMenu(menu) } 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 4f112698..000e43de 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 @@ -199,17 +199,17 @@ class StatsFragment : SessionObserverFragment(), StaticRowRepresentableDataSourc override fun onRowSelected(position: Int, row: RowRepresentable, fromAction: Boolean) { -// if (row is StatRepresentable) { -// -// // filter groups -// val groupResults = this.computedResults?.filter { -// it.group.name == row.groupName -// } -// -// groupResults?.firstOrNull()?.let { -// this.launchStatComputationWithEvolution(row.stat, it.group) -// } -// } + if (row is StatRepresentable) { + + // filter groups + val groupResults = this.computedResults?.filter { + it.group.name == row.groupName + } + + groupResults?.firstOrNull()?.let { + this.launchStatComputationWithEvolution(row.stat, it.group) + } + } }