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

app/build.gradle

@@ -28,14 +28,14 @@ android {
         applicationId "net.pokeranalytics.android"
         minSdkVersion 23
         targetSdkVersion 28
-        versionCode 7
+        versionCode 8
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
         release {
-            minifyEnabled true
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             applicationVariants.all { variant ->
                 variant.outputs.all { output ->

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
 

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
 		}

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) {