merge

WIP refactoring synthetic to viewBinding

CLAUDE.md

@@ -1,139 +0,0 @@
-# CLAUDE.md
-
-This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
-
-## Project Overview
-
-This is **Poker Analytics**, a comprehensive Android application for tracking and analyzing poker sessions. The app supports both cash games and tournaments, providing detailed statistics, reporting, and data visualization capabilities.
-
-### Key Features
-- Session tracking (cash games and tournaments)
-- Advanced filtering and reporting
-- Bankroll management
-- Hand history import and replay
-- Statistical analysis and charting
-- Data backup and export functionality
-- Multi-currency support
-
-## Development Commands
-
-### Building the Project
-```bash
-./gradlew assembleStandardRelease  # Build release APK
-./gradlew assembleStandardDebug    # Build debug APK
-./gradlew build                    # Build all variants
-```
-
-### Running Tests
-```bash
-./gradlew test                     # Run unit tests
-./gradlew connectedAndroidTest     # Run instrumented tests (requires device/emulator)
-./gradlew testStandardDebugUnitTest # Run specific unit tests
-```
-
-### Cleaning
-```bash
-./gradlew clean                    # Clean build artifacts
-```
-
-### Build Configuration
-- **Target SDK**: 35 (Android 15)
-- **Min SDK**: 23 (Android 6.0)
-- **Build Tools**: 30.0.3
-- **Kotlin Version**: 1.9.24
-- **Realm Schema Version**: 14
-
-## Architecture Overview
-
-### Package Structure
-The main source code is organized under `app/src/main/java/net/pokeranalytics/android/`:
-
-#### Core Components
-- **`model/`** - Data models and business logic
-  - `realm/` - Realm database models (Session, Bankroll, Result, etc.)
-  - `filter/` - Query system for filtering sessions
-  - `migrations/` - Database migration handling
-  - `handhistory/` - Hand history data structures
-
-- **`ui/`** - User interface components
-  - `activity/` - Main activities (HomeActivity, SessionActivity, etc.)
-  - `fragment/` - UI fragments organized by feature
-  - `adapter/` - RecyclerView adapters and data sources
-  - `modules/` - Feature-specific UI modules
-
-- **`calculus/`** - Statistics and calculation engine
-  - Core calculation logic for poker statistics
-  - Report generation system
-  - Performance tracking
-
-- **`util/`** - Utility classes
-  - `csv/` - CSV import/export functionality
-  - `billing/` - In-app purchase handling
-  - `extensions/` - Kotlin extension functions
-
-#### Key Classes
-- **`Session`** (`model/realm/Session.kt`): Core session data model
-- **`HomeActivity`** (`ui/activity/HomeActivity.kt`): Main app entry point with tab navigation
-- **`PokerAnalyticsApplication`**: Application class handling initialization
-
-### Database Architecture
-The app uses **Realm** database with these key entities:
-- `Session` - Individual poker sessions
-- `Bankroll` - Bankroll management
-- `Result` - Session results and statistics
-- `ComputableResult` - Pre-computed statistics for performance
-- `Filter` - Saved filter configurations
-- `HandHistory` - Hand-by-hand game data
-
-### UI Architecture
-- **MVVM pattern** with Android Architecture Components
-- **Fragment-based navigation** with bottom navigation tabs
-- **Custom RecyclerView adapters** for data presentation
-- **Material Design** components
-
-## Key Technologies
-
-### Core Dependencies
-- **Realm Database** (10.15.1) - Local data storage
-- **Kotlin Coroutines** - Asynchronous programming
-- **Firebase Crashlytics** - Crash reporting and analytics
-- **Material Design Components** - UI framework
-- **MPAndroidChart** - Data visualization
-- **CameraX** - Image capture functionality
-
-### Testing
-- **JUnit** for unit testing
-- **Android Instrumented Tests** for integration testing
-- Test files located in `app/src/androidTest/` and `app/src/test/`
-
-## Development Guidelines
-
-### Working with Sessions
-- Sessions are the core data model representing individual poker games
-- Use `Session.newInstance()` to create new sessions properly
-- Always call `computeStats()` after modifying session data
-- Sessions can be in various states: PENDING, STARTED, PAUSED, ENDED
-
-### Database Operations
-- Use Realm transactions for data modifications
-- The app uses schema version 14 - increment when making schema changes
-- Migration logic is in `PokerAnalyticsMigration.kt`
-
-### Testing Data
-- Use `FakeDataManager.createFakeSessions()` for generating test data
-- Seed data is available through the `Seed` class
-
-### Build Variants
-- **standard** - Main production flavor
-- Release builds are optimized and obfuscated with ProGuard
-
-## Performance Considerations
-- Sessions use `ComputableResult` for pre-computed statistics
-- Large datasets are handled with Realm's lazy loading
-- Chart rendering is optimized for large data sets
-- Background processing uses Kotlin Coroutines
-
-## Security & Privacy
-- Sensitive data is encrypted in Realm database
-- Crash logging excludes personal information
-- Backup functionality includes data encryption

app/build.gradle

@@ -6,9 +6,7 @@ apply plugin: 'realm-android'
 // Crashlytics
 apply plugin: 'com.google.gms.google-services'
 apply plugin: 'com.google.firebase.crashlytics'
-// Serialization
+//////////////
-apply plugin: "kotlinx-serialization"
-
 
 repositories {
     maven { url 'https://jitpack.io' } // required for MPAndroidChart
@@ -17,8 +15,8 @@ repositories {
 
 android {
 
-    compileSdkVersion 35
+    compileSdkVersion 29
-    buildToolsVersion "30.0.3"
+    buildToolsVersion "29.0.2"
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -29,22 +27,22 @@ android {
         jvmTarget = JavaVersion.VERSION_1_8
     }
 
+    lintOptions {
+        disable 'MissingTranslation'
+    }
 
     defaultConfig {
         applicationId "net.pokeranalytics.android"
         minSdkVersion 23
-        targetSdkVersion 35
+        targetSdkVersion 29
-        versionCode 180
+        versionCode 116
-        versionName "6.0.38"
+        versionName "5.1.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
         debug {
             ext.enableCrashlytics = false
-            firebaseCrashlytics {
-                mappingFileUploadEnabled false  // should help speed up build times: https://firebase.google.com/docs/crashlytics/get-deobfuscated-reports?hl=en&platform=android
-            }
         }
         release {
             minifyEnabled true
@@ -68,15 +66,25 @@ android {
         }
     }
     flavorDimensions 'endOfUse'
-    productFlavors { // already used: 50000, 51000, 52000, 52130, 52110, 52120
+    productFlavors { // already used: 50000, 51000, 52000
         standard {
             dimension = 'endOfUse'
         }
-//        oct2021 {
+        april2021 {
-//            dimension = 'endOfUse'
+            dimension = 'endOfUse'
-//            versionNameSuffix = '_oct2021'
+            versionNameSuffix = '_april2021'
-//            versionCode = 52120 + android.defaultConfig.versionCode
+            versionCode = 52130 + android.defaultConfig.versionCode
-//        }
+        }
+        nov2020 {
+            dimension = 'endOfUse'
+            versionNameSuffix = '_nov2020'
+            versionCode = 52110 + android.defaultConfig.versionCode
+        }
+        oct2021 {
+            dimension = 'endOfUse'
+            versionNameSuffix = '_oct2021'
+            versionCode = 52120 + android.defaultConfig.versionCode
+        }
     }
 
     configurations {
@@ -88,10 +96,6 @@ android {
     buildFeatures {
         viewBinding true
     }
-    namespace 'net.pokeranalytics.android'
-    lint {
-        disable 'MissingTranslation'
-    }
 
 }
 
@@ -99,29 +103,26 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     // Kotlin
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.6'
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.6"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-//    implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.20.0") // JVM dependency
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.20.0") // JVM dependency
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1"
 
     // Android
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.core:core-ktx:1.3.1'
-    implementation 'com.google.android.material:material:1.3.0'
+    implementation 'com.google.android.material:material:1.2.1'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    implementation 'androidx.work:work-runtime-ktx:2.7.1'
+    implementation 'androidx.work:work-runtime-ktx:2.4.0'
-//    implementation 'com.google.android.play:core-ktx:1.8.1' // In-app Reviews
+    implementation 'com.google.android.play:core-ktx:1.8.1' // In-app Reviews
-
-    implementation 'com.google.android.play:review:2.0.1'
-    implementation 'com.google.android.play:review-ktx:2.0.1'
 
     // Places
     implementation 'com.google.android.libraries.places:places:2.3.0'
 
     // Billing / Subscriptions
-    implementation 'com.android.billingclient:billing:7.0.0'
+    implementation 'com.android.billingclient:billing:3.0.1'
 
     // Import the BoM for the Firebase platform
     implementation platform('com.google.firebase:firebase-bom:26.1.0')
@@ -143,36 +144,16 @@ dependencies {
     implementation 'org.apache.commons:commons-math3:3.6.1'
 
     // ffmpeg for encoding video (HH export)
-//    implementation 'com.arthenica:ffmpeg-kit-min-gpl:4.4.LTS'
+    implementation 'com.arthenica:mobile-ffmpeg-min-gpl:4.4.LTS'
-
-    // Camera
-    def camerax_version = "1.1.0"
-    implementation "androidx.camera:camera-core:${camerax_version}"
-    implementation "androidx.camera:camera-camera2:${camerax_version}"
-    implementation "androidx.camera:camera-lifecycle:${camerax_version}"
-    implementation "androidx.camera:camera-video:${camerax_version}"
-
-    implementation "androidx.camera:camera-view:${camerax_version}"
-    implementation "androidx.camera:camera-extensions:${camerax_version}"
-
-    // Image picking and registerForActivityResult
-    implementation 'androidx.activity:activity-ktx:1.6.1'
-    implementation "androidx.fragment:fragment-ktx:1.4.1"
-
-    // Retrofit
-    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
-
-    // Volley
-    implementation 'com.android.volley:volley:1.2.1'
 
     // Instrumented Tests
-    androidTestImplementation 'androidx.test:core:1.6.1'
+    androidTestImplementation 'androidx.test:core:1.3.0'
-    androidTestImplementation 'androidx.test:runner:1.6.2'
+    androidTestImplementation 'androidx.test:runner:1.3.0'
-    androidTestImplementation 'androidx.test:rules:1.6.1'
+    androidTestImplementation 'androidx.test:rules:1.3.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
 
     // Test
-    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'junit:junit:4.12'
     testImplementation 'com.android.support.test:runner:1.0.2'
     testImplementation 'com.android.support.test:rules:1.0.2'
 

app/proguard-rules.pro

@@ -30,7 +30,6 @@
 -dontwarn io.realm.**
 -keep class net.pokeranalytics.android.model.** { *; }
 -keep class net.pokeranalytics.android.ui.fragment.** { *; }
--keep class net.pokeranalytics.android.ui.modules.** { *; }
 -keepattributes SourceFile,LineNumberTable        # Keep file names and line numbers.
 -keep public class * extends java.lang.Exception  # Optional: Keep custom exceptions.
 
@@ -65,25 +64,3 @@
 
 # Enum
 -optimizations !class/unboxing/enum
-
-# Serialization
--keepattributes *Annotation*, InnerClasses
--dontnote kotlinx.serialization.AnnotationsKt # core serialization annotations
-
-# kotlinx-serialization-json specific. Add this if you have java.lang.NoClassDefFoundError kotlinx.serialization.json.JsonObjectSerializer
--keepclassmembers class kotlinx.serialization.json.** {
-    *** Companion;
-}
--keepclasseswithmembers class kotlinx.serialization.json.** {
-    kotlinx.serialization.KSerializer serializer(...);
-}
-
--keep,includedescriptorclasses class net.pokeranalytics.android.**$$serializer { *; }
--keepclassmembers class net.pokeranalytics.android.** {
-    *** Companion;
-}
--keepclasseswithmembers class net.pokeranalytics.android.** {
-    kotlinx.serialization.KSerializer serializer(...);
-}
-
-

app/src/androidTest/java/net/pokeranalytics/android/unitTests/FavoriteSessionUnitTest.kt

@@ -30,9 +30,12 @@ class FavoriteSessionUnitTest : RealmInstrumentedUnitTest() {
         s2.endDate = Date()
         s3.endDate = Date()
 
-        s1.cgBlinds = "2/4"
+        s1.cgBigBlind = 4.0
-        s2.cgBlinds = "2/4"
+        s1.cgSmallBlind = 2.0
-        s3.cgBlinds = "1/2"
+        s2.cgBigBlind = 4.0
+        s2.cgSmallBlind = 2.0
+        s3.cgBigBlind = 1.0
+        s3.cgSmallBlind = 1.0
 
         realm.insert(s1)
         realm.insert(s2)
@@ -42,7 +45,7 @@ class FavoriteSessionUnitTest : RealmInstrumentedUnitTest() {
         val favSession = FavoriteSessionFinder.favoriteSession(Session.Type.CASH_GAME.ordinal, null, realm, InstrumentationRegistry.getInstrumentation().targetContext)
 
         if (favSession != null) {
-            Assert.assertEquals(4.0, favSession.cgBiggestBet)
+            Assert.assertEquals(4.0, favSession.cgBigBlind)
         } else {
             Assert.fail("session shouldn't be null")
         }
@@ -62,9 +65,9 @@ class FavoriteSessionUnitTest : RealmInstrumentedUnitTest() {
         val loc1 = realm.createObject(Location::class.java, "1")
         val loc2 = realm.createObject(Location::class.java, "2")
 
-        s1.cgBiggestBet = 4.0
+        s1.cgBigBlind = 4.0
-        s2.cgBiggestBet = 4.0
+        s2.cgBigBlind = 4.0
-        s3.cgBiggestBet = 1.0
+        s3.cgBigBlind = 1.0
 
         s1.location = loc1
         s2.location = loc1
@@ -78,7 +81,7 @@ class FavoriteSessionUnitTest : RealmInstrumentedUnitTest() {
         val favSession = FavoriteSessionFinder.favoriteSession(Session.Type.CASH_GAME.ordinal, loc2, realm, InstrumentationRegistry.getInstrumentation().targetContext)
 
         if (favSession != null) {
-            Assert.assertEquals(1.0, favSession.cgBiggestBet)
+            Assert.assertEquals(1.0, favSession.cgBigBlind)
         } else {
             Assert.fail("session shouldn't be null")
         }

app/src/androidTest/java/net/pokeranalytics/android/unitTests/StatsInstrumentedUnitTest.kt

@@ -44,8 +44,8 @@ class StatsInstrumentedUnitTest : SessionInstrumentedUnitTest() {
 		s2.result?.buyin = 200.0
 		s2.result?.cashout = 500.0 // net result = 300
 
-		s1.cgBlinds = "0.5" // bb net result = -200bb
+		s1.cgBigBlind = 0.5 // bb net result = -200bb
-		s2.cgBlinds = "2.0" // bb net result = 150bb
+		s2.cgBigBlind = 2.0 // bb net result = 150bb
 
 		s2.tableSize = 5
 
@@ -186,13 +186,13 @@ class StatsInstrumentedUnitTest : SessionInstrumentedUnitTest() {
 			Assert.fail("No std100 stat")
 		}
 
-		results.computedStat(Stat.MAXIMUM_NET_RESULT)?.let {
+		results.computedStat(Stat.MAXIMUM_NETRESULT)?.let {
 			assertEquals(300.0, it.value, delta)
 		} ?: run {
 			Assert.fail("No MAXIMUM_NETRESULT")
 		}
 
-		results.computedStat(Stat.MINIMUM_NET_RESULT)?.let {
+		results.computedStat(Stat.MINIMUM_NETRESULT)?.let {
 			assertEquals(-100.0, it.value, delta)
 		} ?: run {
 			Assert.fail("No MINIMUM_NETRESULT")

app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/BlindFilterInstrumentedTest.kt

@@ -7,7 +7,7 @@ import net.pokeranalytics.android.model.realm.Bankroll
 import net.pokeranalytics.android.model.realm.Filter
 import net.pokeranalytics.android.model.realm.FilterCondition
 import net.pokeranalytics.android.model.realm.Session
-import net.pokeranalytics.android.ui.view.rows.FilterSectionRow
+import net.pokeranalytics.android.ui.view.rowrepresentable.FilterSectionRow
 import org.junit.Assert
 import org.junit.Test
 import java.util.*
@@ -28,25 +28,28 @@ class BlindFilterInstrumentedTest : BaseFilterInstrumentedUnitTest() {
         b2.currency = currency
 
         val s1 = Session.testInstance(100.0, false, Date(), 1, b1)
-        s1.cgBlinds = "0.5/1"
+        s1.cgBigBlind = 1.0
+        s1.cgSmallBlind = 0.5
 
         val s2 = Session.testInstance(100.0, false, Date(), 1, b1)
-        s2.cgBlinds = "0.5/1"
+        s2.cgBigBlind = 1.0
+        s2.cgSmallBlind = 0.5
 
         val s3 = Session.testInstance(100.0, false, Date(), 1, b1)
-        s3.cgBlinds = "1/2"
+        s3.cgBigBlind = 2.0
+        s3.cgSmallBlind = 1.0
 
         realm.commitTransaction()
 
-        val filter = QueryCondition.AnyStake()
+        val filter = QueryCondition.AnyBlind()
 
-        val blind = QueryCondition.AnyStake().apply {
+        val blind = QueryCondition.AnyBlind().apply {
             listOfValues = arrayListOf(s1.blinds!!)
         }
 
 //        blind.filterSectionRow = FilterSectionRow.Blind
 
-        val filterElement = FilterCondition(arrayListOf(blind), FilterSectionRow.Stakes)
+        val filterElement = FilterCondition(arrayListOf(blind), FilterSectionRow.Blind)
         filter.updateValueBy(filterElement)
 
         val sessions = Filter.queryOn<Session>(realm, Query(filter))
@@ -71,27 +74,30 @@ class BlindFilterInstrumentedTest : BaseFilterInstrumentedUnitTest() {
         b2.currency = currency
 
         val s1 = Session.testInstance(100.0, false, Date(), 1, b1)
-        s1.cgBlinds = "0.5/1"
+        s1.cgBigBlind = 1.0
+        s1.cgSmallBlind = 0.5
 
         val s2 = Session.testInstance(100.0, false, Date(), 1, b1)
-        s2.cgBlinds = "0.5/1"
+        s2.cgBigBlind = 1.0
+        s2.cgSmallBlind = 0.5
 
         val s3 = Session.testInstance(100.0, false, Date(), 1, b1)
-        s3.cgBlinds = "1/2"
+        s3.cgBigBlind = 2.0
+        s3.cgSmallBlind = 1.0
 
         realm.commitTransaction()
 
 
-        val filter = QueryCondition.AnyStake()
+        val filter = QueryCondition.AnyBlind()
 
-        val blind1 = QueryCondition.AnyStake().apply {
+        val blind1 = QueryCondition.AnyBlind().apply {
             listOfValues = arrayListOf(s1.blinds!!)
         }
-        val blind2 = QueryCondition.AnyStake().apply {
+        val blind2 = QueryCondition.AnyBlind().apply {
             listOfValues = arrayListOf(s2.blinds!!)
         }
 
-        val filterElements = FilterCondition(arrayListOf(blind1, blind2), FilterSectionRow.Stakes)
+        val filterElements = FilterCondition(arrayListOf(blind1, blind2), FilterSectionRow.Blind)
         filter.updateValueBy(filterElements)
 
         val sessions = Filter.queryOn<Session>(realm, Query(filter))
@@ -116,24 +122,28 @@ class BlindFilterInstrumentedTest : BaseFilterInstrumentedUnitTest() {
         b2.currency = currency
 
         val s1 = Session.testInstance(100.0, false, Date(), 1, b1)
-        s1.cgBlinds = "0.5/1"
+
+        s1.cgBigBlind = 1.0
+        s1.cgSmallBlind = 0.5
 
         val s2 = Session.testInstance(100.0, false, Date(), 1, b1)
-        s2.cgBlinds = "0.5/1"
+        s2.cgBigBlind = 1.0
+        s2.cgSmallBlind = 0.5
 
         val s3 = Session.testInstance(100.0, false, Date(), 1, b2)
-        s3.cgBlinds = "1/2"
+        s3.cgBigBlind = 2.0
+        s3.cgSmallBlind = 1.0
 
         realm.commitTransaction()
 
 
-        val filter = QueryCondition.AnyStake()
+        val filter = QueryCondition.AnyBlind()
 
-        val blind = QueryCondition.AnyStake().apply {
+        val blind = QueryCondition.AnyBlind().apply {
             listOfValues = arrayListOf(s3.blinds!!)
         }
 
-        val filterElement = FilterCondition(arrayListOf(blind), FilterSectionRow.Stakes)
+        val filterElement = FilterCondition(arrayListOf(blind), FilterSectionRow.Blind)
         filter.updateValueBy(filterElement)
         val sessions = Filter.queryOn<Session>(realm, Query(filter))
 
@@ -157,27 +167,31 @@ class BlindFilterInstrumentedTest : BaseFilterInstrumentedUnitTest() {
         b2.currency = currency
 
         val s1 = Session.testInstance(100.0, false, Date(), 1, b1)
-        s1.cgBlinds = "0.5/1"
+        s1.cgBigBlind = 1.0
+        s1.cgSmallBlind = 0.5
 
         val s2 = Session.testInstance(100.0, false, Date(), 1, b1)
-        s2.cgBlinds = "0.5/1"
+        s2.cgBigBlind = 2.0
+        s2.cgSmallBlind = 1.0
 
         val s3 = Session.testInstance(100.0, false, Date(), 1, b2)
-        s3.cgBlinds = "1/2"
+        s3.cgBigBlind = 2.0
+        s3.cgSmallBlind = 1.0
 
         realm.commitTransaction()
 
 
-        val filter = QueryCondition.AnyStake()
 
-        val stake1 = QueryCondition.AnyStake().apply {
+        val filter = QueryCondition.AnyBlind()
-            listOfValues = arrayListOf(s1.cgStakes!!)
+
+        val blind1 = QueryCondition.AnyBlind().apply {
+            listOfValues = arrayListOf(s1.blinds!!)
         }
-        val stake2 = QueryCondition.AnyStake().apply {
+        val blind2 = QueryCondition.AnyBlind().apply {
-            listOfValues = arrayListOf(s2.cgStakes!!)
+            listOfValues = arrayListOf(s2.blinds!!)
         }
 
-        val filterElement = FilterCondition(arrayListOf(stake1, stake2), FilterSectionRow.Stakes)
+        val filterElement = FilterCondition(arrayListOf(blind1, blind2), FilterSectionRow.Blind)
         filter.updateValueBy(filterElement)
 
         val sessions = Filter.queryOn<Session>(realm, Query(filter))

app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/DateFilterInstrumentedUnitTest.kt

@@ -7,7 +7,7 @@ import net.pokeranalytics.android.model.filter.QueryCondition
 import net.pokeranalytics.android.model.realm.Filter
 import net.pokeranalytics.android.model.realm.FilterCondition
 import net.pokeranalytics.android.model.realm.Session
-import net.pokeranalytics.android.ui.view.rows.FilterSectionRow
+import net.pokeranalytics.android.ui.view.rowrepresentable.FilterSectionRow
 import net.pokeranalytics.android.util.extensions.hourMinute
 import net.pokeranalytics.android.util.extensions.startOfDay
 import org.junit.Assert

app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/RealmFilterInstrumentedUnitTest.kt

@@ -5,9 +5,9 @@ import net.pokeranalytics.android.components.BaseFilterInstrumentedUnitTest
 import net.pokeranalytics.android.model.filter.QueryCondition
 import net.pokeranalytics.android.model.realm.Filter
 import net.pokeranalytics.android.model.realm.Session
-import net.pokeranalytics.android.ui.view.rows.FixedValueFilterItemRow
+import net.pokeranalytics.android.ui.view.rowrepresentable.FixedValueFilterItemRow
-import net.pokeranalytics.android.ui.view.rows.FilterCategoryRow
+import net.pokeranalytics.android.ui.view.rowrepresentable.FilterCategoryRow
-import net.pokeranalytics.android.ui.view.rows.FilterSectionRow
+import net.pokeranalytics.android.ui.view.rowrepresentable.FilterSectionRow
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith

app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/SessionFilterInstrumentedUnitTest.kt

@@ -6,7 +6,7 @@ import net.pokeranalytics.android.components.BaseFilterInstrumentedUnitTest
 import net.pokeranalytics.android.model.filter.Query
 import net.pokeranalytics.android.model.filter.QueryCondition
 import net.pokeranalytics.android.model.realm.*
-import net.pokeranalytics.android.ui.view.rows.FilterSectionRow
+import net.pokeranalytics.android.ui.view.rowrepresentable.FilterSectionRow
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -458,7 +458,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
         realm.commitTransaction()
 
         val filter = QueryCondition.NetAmountWon()
-        val filterElementRow = QueryCondition.moreOrEqual<QueryCondition.NetAmountWon>().apply { listOfValues = arrayListOf(204.0) }
+        val filterElementRow = QueryCondition.more<QueryCondition.NetAmountWon>().apply { listOfValues = arrayListOf(204.0) }
         filter.updateValueBy(FilterCondition(arrayListOf(filterElementRow), FilterSectionRow.Value))
 
         val sessions = Filter.queryOn<Session>(realm, Query(filterElementRow))
@@ -482,7 +482,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
         realm.commitTransaction()
 
         val filter = QueryCondition.NetAmountWon()
-        val filterElementRow = QueryCondition.lessOrEqual<QueryCondition.NetAmountWon>().apply { listOfValues = arrayListOf(540.0) }
+        val filterElementRow = QueryCondition.less<QueryCondition.NetAmountWon>().apply { listOfValues = arrayListOf(540.0) }
         filter.updateValueBy(FilterCondition(arrayListOf(filterElementRow), FilterSectionRow.Value))
 
         val sessions = Filter.queryOn<Session>(realm, Query(filter))
@@ -506,11 +506,11 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
         realm.commitTransaction()
 
         val filterMore = QueryCondition.NetAmountWon()
-        val filterElementRow = QueryCondition.moreOrEqual<QueryCondition.NetAmountWon>().apply { listOfValues = arrayListOf(199.0) }
+        val filterElementRow = QueryCondition.more<QueryCondition.NetAmountWon>().apply { listOfValues = arrayListOf(199.0) }
         filterMore.updateValueBy(FilterCondition(arrayListOf(filterElementRow), FilterSectionRow.Value))
 
         val filterLess = QueryCondition.NetAmountWon()
-        val filterElementRow2 = QueryCondition.lessOrEqual<QueryCondition.NetAmountWon>().apply { listOfValues = arrayListOf(400.0) }
+        val filterElementRow2 = QueryCondition.less<QueryCondition.NetAmountWon>().apply { listOfValues = arrayListOf(400.0) }
         filterLess.updateValueBy(FilterCondition(arrayListOf(filterElementRow2), FilterSectionRow.Value))
 
         val sessions = Filter.queryOn<Session>(realm, Query(filterMore, filterLess))
@@ -536,11 +536,11 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
 
 
         val s3 = Session.testInstance(netResult = 500.0)
-        s3.cgBlinds = "2.0"
+        s3.cgBigBlind = 2.0
         s3.result!!.buyin = 1000.0
 
         val s4 = Session.testInstance(netResult = 570.0)
-        s4.cgBlinds = "5.0"
+        s4.cgBigBlind = 5.0
         s4.result!!.buyin = 200.0
         realm.commitTransaction()
 
@@ -584,7 +584,7 @@ class SessionFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
 
 
         val filterMore = QueryCondition.TournamentFinalPosition(QueryCondition.Operator.MORE, finalPosition = 10)
-        sessions = Filter.queryOn(realm, Query(filterMore))
+        sessions = Filter.queryOn<Session>(realm, Query(filterMore))
 
         Assert.assertEquals(1, sessions.size)
 

app/src/debug/AndroidManifest.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+	package="net.pokeranalytics.android">
 
 	<!-- Add WRITE_EXTERNAL_STORAGE only for debug / test -->
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

app/src/main/AndroidManifest.xml

@@ -1,21 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:tools="http://schemas.android.com/tools"
-
+    package="net.pokeranalytics.android">
-    <uses-permission android:name="android.permission.CAMERA" />
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+<!--
+        android:requestLegacyExternalStorage="true"
+        has been added due to a crash:
+
+        Fatal Exception: java.io.FileNotFoundException
+        /storage/emulated/0/Movies/gif_20_09_18_09_59_41.gif: open failed: EACCES (Permission denied)
 
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="28" />
+        happening here:
 
-    <uses-feature android:name="android.hardware.camera.any" android:required="false" />
+        net.pokeranalytics.android.ui.modules.handhistory.replayer.ReplayExportService$startGIFExport$1$c$1.invokeSuspend (ReplayExportService.java:88)
-<!--    <uses-feature android:name="android.hardware.camera" android:required="false" />-->
+
+        The temporary fix comes from here:
+        https://medium.com/@sriramaripirala/android-10-open-failed-eacces-permission-denied-da8b630a89df
+  -->
 
     <application
         android:name=".PokerAnalyticsApplication"
+        android:requestLegacyExternalStorage="true"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -32,8 +42,7 @@
             android:name="net.pokeranalytics.android.ui.activity.HomeActivity"
             android:label="@string/app_name"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
+            android:screenOrientation="portrait">
-            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.intent.action.VIEW" />
@@ -46,8 +55,7 @@
         <activity
             android:name="net.pokeranalytics.android.ui.activity.ImportActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
+            android:screenOrientation="portrait">
-            android:exported="true">
 
             <intent-filter tools:ignore="AppLinkUrlError">
                 <action android:name="android.intent.action.VIEW" />
@@ -62,186 +70,121 @@
 
         </activity>
 
-        <!-- DatabaseCopyActivity is only used in development for now -->
-
-<!--        <activity android:name=".ui.activity.DatabaseCopyActivity"-->
-<!--            android:launchMode="singleTop"-->
-<!--            android:screenOrientation="portrait"-->
-<!--            android:exported="true">-->
-
-<!--            <intent-filter>-->
-<!--                <action android:name="android.intent.action.VIEW" />-->
-<!--                <category android:name="android.intent.category.DEFAULT" />-->
-
-<!--                <data android:scheme="content" />-->
-<!--                <data android:scheme="file" />-->
-<!--                <data android:mimeType="*/*" />-->
-<!--            </intent-filter>-->
-
-<!--        </activity>-->
-
         <activity
             android:name="net.pokeranalytics.android.ui.modules.session.SessionActivity"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
-            android:exported="true" />
+            android:windowSoftInputMode="adjustNothing" />
 
         <!-- No screenOrientation="portrait" to fix Oreo crash -->
         <activity
             android:name="net.pokeranalytics.android.ui.modules.feed.NewDataMenuActivity"
             android:launchMode="singleTop"
-            android:theme="@style/PokerAnalyticsTheme.MenuDialog"
+            android:theme="@style/PokerAnalyticsTheme.MenuDialog" />
-            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.modules.bankroll.BankrollActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
+            android:screenOrientation="portrait" />
-            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.modules.handhistory.HandHistoryActivity"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateAlwaysHidden"
+            android:windowSoftInputMode="stateAlwaysHidden"/>
-            android:exported="true"/>
 
         <activity
             android:name="net.pokeranalytics.android.ui.modules.bankroll.BankrollDetailsActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
+            android:screenOrientation="portrait" />
-            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.activity.Top10Activity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
+            android:screenOrientation="portrait" />
-            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.activity.SettingsActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
+            android:screenOrientation="portrait" />
-            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.activity.GraphActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
+            android:screenOrientation="portrait" />
-            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.activity.ProgressReportActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
+            android:screenOrientation="portrait" />
-            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.activity.ComparisonReportActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
+            android:screenOrientation="portrait" />
-            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.modules.calendar.CalendarDetailsActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
+            android:screenOrientation="portrait" />
-            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.activity.ComparisonChartActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
+            android:screenOrientation="portrait" />
-            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.modules.datalist.DataListActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
+            android:screenOrientation="portrait" />
-            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.modules.filter.FiltersListActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
+            android:screenOrientation="portrait" />
-            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.modules.data.EditableDataActivity"
-            android:launchMode="standard"
+            android:launchMode="singleTop"
-            android:screenOrientation="portrait"
+            android:screenOrientation="portrait" />
-            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.activity.CurrenciesActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
+            android:screenOrientation="portrait" />
-            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.modules.filter.FiltersActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
+            android:screenOrientation="portrait" />
-            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.activity.GDPRActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
+            android:screenOrientation="portrait" />
-            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.activity.BillingActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
+            android:screenOrientation="portrait" />
-            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.activity.ReportCreationActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
+            android:screenOrientation="portrait" />
-            android:exported="true" />
 
         <activity
             android:name="net.pokeranalytics.android.ui.activity.TableReportActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
+            android:screenOrientation="portrait" />
-            android:exported="true" />
-
-        <activity
-            android:name="net.pokeranalytics.android.ui.modules.settings.DealtHandsPerHourActivity"
-            android:launchMode="singleTop"
-            android:screenOrientation="portrait"
-            android:exported="true" />
-
-        <activity
-            android:name="net.pokeranalytics.android.ui.modules.calendar.GridCalendarActivity"
-            android:launchMode="singleTop"
-            android:screenOrientation="portrait"
-            android:exported="true" />
-
-        <activity
-            android:name="net.pokeranalytics.android.ui.modules.settings.TransactionFilterActivity"
-            android:launchMode="singleTop"
-            android:screenOrientation="portrait"
-            android:exported="true" />
 
         <!-- No screenOrientation="portrait" to fix Oreo crash -->
         <activity
             android:name="net.pokeranalytics.android.ui.activity.ColorPickerActivity"
             android:theme="@style/PokerAnalyticsTheme.AlertDialog"
-            android:launchMode="singleTop"
+            android:launchMode="singleTop"/>
-            android:exported="true"/>
-
-        <activity
-            android:name="net.pokeranalytics.android.ui.activity.components.CameraActivity"
-            android:launchMode="singleTop"
-            android:screenOrientation="portrait"
-            android:exported="true" />
 
-        <service
+        <service android:name="net.pokeranalytics.android.ui.modules.handhistory.replayer.ReplayExportService" android:exported="false"/>
-            android:name="net.pokeranalytics.android.ui.modules.handhistory.replayer.ReplayExportService"
-            android:exported="false"/>
 
         <meta-data
             android:name="preloaded_fonts"

app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt

@@ -4,18 +4,19 @@ import android.app.Application
 import android.content.Context
 import android.os.Build
 import com.google.firebase.FirebaseApp
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 import io.realm.Realm
 import io.realm.RealmConfiguration
 import io.realm.kotlin.where
-import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import net.pokeranalytics.android.calculus.ReportWhistleBlower
 import net.pokeranalytics.android.model.migrations.Patcher
 import net.pokeranalytics.android.model.migrations.PokerAnalyticsMigration
 import net.pokeranalytics.android.model.realm.Session
 import net.pokeranalytics.android.model.utils.Seed
-import net.pokeranalytics.android.util.*
+import net.pokeranalytics.android.util.FakeDataManager
+import net.pokeranalytics.android.util.PokerAnalyticsLogs
+import net.pokeranalytics.android.util.UserDefaults
 import net.pokeranalytics.android.util.billing.AppGuard
 import timber.log.Timber
 import java.util.*
@@ -23,9 +24,6 @@ import java.util.*
 
 class PokerAnalyticsApplication : Application() {
 
-	var reportWhistleBlower: ReportWhistleBlower? = null
-	var backupOperator: BackupOperator? = null
-
 	companion object {
 
 		fun timeSinceInstall(context: Context): Long {
@@ -38,9 +36,7 @@ class PokerAnalyticsApplication : Application() {
 	override fun onCreate() {
 		super.onCreate()
 
-		if (!BuildConfig.DEBUG) {
 		FirebaseApp.initializeApp(this)
-		}
 
 		UserDefaults.init(this)
 
@@ -51,8 +47,7 @@ class PokerAnalyticsApplication : Application() {
 		Realm.init(this)
 		val realmConfiguration = RealmConfiguration.Builder()
 			.name(Realm.DEFAULT_REALM_NAME)
-			.schemaVersion(14)
+			.schemaVersion(9)
-			.allowWritesOnUiThread(true)
 			.migration(PokerAnalyticsMigration())
 			.initialData(Seed(this))
 			.build()
@@ -60,14 +55,13 @@ class PokerAnalyticsApplication : Application() {
 
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
 			val locales = resources.configuration.locales
-			CrashLogging.log("App onCreate. Locales = $locales")
+			FirebaseCrashlytics.getInstance().log("App onCreate. Locales = $locales")
 		}
 
 		if (BuildConfig.DEBUG) {
 			// Logs
 			Timber.plant(PokerAnalyticsLogs())
 		}
-		Timber.d("SDK version = ${Build.VERSION.SDK_INT}")
 
 		if (BuildConfig.DEBUG) {
 			Timber.d("UserPreferences.defaultCurrency: ${UserDefaults.currency.symbol}")
@@ -76,23 +70,10 @@ class PokerAnalyticsApplication : Application() {
 //			this.createFakeSessions()
 		}
 
-		// Patch
+		Patcher.patchAll(this.applicationContext)
-		Patcher.patchAll(this)
-
-		// Report
-		this.reportWhistleBlower = ReportWhistleBlower(this.applicationContext)
 
-		// Backups
-		this.backupOperator = BackupOperator(this.applicationContext)
-
-		// Infos
 		val locale = Locale.getDefault()
-		CrashLogging.log("Country: ${locale.country}, language: ${locale.language}")
+		FirebaseCrashlytics.getInstance().log("Country: ${locale.country}, language: ${locale.language}")
-
-
-//		Realm.getDefaultInstance().executeTransaction {
-//			it.delete(Performance::class.java)
-//		}
 
 	}
 
@@ -106,7 +87,7 @@ class PokerAnalyticsApplication : Application() {
 		realm.close()
 
 		if (sessionsCount < 10) {
-			CoroutineScope(context = Dispatchers.IO).launch {
+			GlobalScope.launch {
 				FakeDataManager.createFakeSessions(500)
 			}
 		}

app/src/main/java/net/pokeranalytics/android/api/BackupApi.kt

@@ -1,75 +0,0 @@
-package net.pokeranalytics.android.api
-
-import android.content.Context
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import net.pokeranalytics.android.util.CrashLogging
-import net.pokeranalytics.android.util.extensions.isNetworkAvailable
-import okhttp3.MediaType
-import okhttp3.MultipartBody
-import okhttp3.RequestBody
-import retrofit2.Call
-import retrofit2.Retrofit
-import retrofit2.http.Multipart
-import retrofit2.http.POST
-import retrofit2.http.Part
-import timber.log.Timber
-
-object RetrofitClient {
-    private const val BASE_URL = "https://www.pokeranalytics.net/backup/"
-    fun getClient(): Retrofit =
-        Retrofit.Builder()
-            .baseUrl(BASE_URL)
-            .build()
-
-}
-
-class BackupService {
-    private val retrofit = RetrofitClient.getClient()
-    val backupApi: MyBackupApi = retrofit.create(MyBackupApi::class.java)
-}
-
-interface MyBackupApi {
-    @Multipart
-    @POST("send")
-    fun postFile(@Part mail: MultipartBody.Part, @Part fileBody: MultipartBody.Part): Call<Void>
-}
-
-object BackupApi {
-
-    private val service = BackupService()
-
-    // curl -F recipient=laurent@staxriver.com -F file=@test.txt https://www.pokeranalytics.net/backup/send
-    suspend fun backupFile(context: Context, mail: String, fileName: String, fileContent: String): Boolean {
-
-        val filePart = MultipartBody.Part.createFormData(
-            "file",
-            fileName,
-            RequestBody.create(MediaType.parse("text/csv"), fileContent)
-        )
-
-        val mailPart = MultipartBody.Part.createFormData("recipient", mail)
-
-        return if (context.isNetworkAvailable()) {
-            var success = false
-            val job = CoroutineScope(context = Dispatchers.IO).async {
-                success = try {
-                    val response = service.backupApi.postFile(mailPart, filePart).execute()
-                    Timber.d("response code = ${response.code()}")
-                    Timber.d("success = ${response.isSuccessful}")
-                    true
-                } catch (e: Exception) {
-                    Timber.d("!!! backup failed: ${e.message}")
-                    CrashLogging.logException(e)
-                    false
-                }
-            }
-            job.await()
-            return success
-        } else {
-            false
-        }
-    }
-
-}

app/src/main/java/net/pokeranalytics/android/api/BlogPostApi.kt

@@ -1,49 +0,0 @@
-package net.pokeranalytics.android.api
-
-import android.content.Context
-import com.android.volley.Request
-import com.android.volley.toolbox.JsonArrayRequest
-import com.android.volley.toolbox.Volley
-import org.json.JSONArray
-import timber.log.Timber
-
-data class BlogPost(var id: Int, var content: String)
-
-private fun JSONArray.toBlogPosts(): List<BlogPost> {
-
-	val posts = mutableListOf<BlogPost>()
-	(0 until this.length()).forEach { index ->
-		val jo = this.getJSONObject(index)
-		val post = BlogPost(jo.getInt("id"), jo.getJSONObject("content").getString("rendered"))
-		posts.add(post)
-	}
-	return posts
-}
-
-class BlogPostApi {
-
-	companion object {
-
-		private const val tipsLastPostsURL = "https://www.poker-analytics.net/blog/wp-json/wp/v2/posts/?categories=109\n"
-
-		fun getLatestPosts(context: Context, callback: (List<BlogPost>) -> (Unit)) {
-
-			val queue = Volley.newRequestQueue(context)
-
-			val jsonObjectRequest = JsonArrayRequest(
-				Request.Method.GET, tipsLastPostsURL, null,
-				{ response ->
-//					Timber.d("posts = $response")
-					callback(response.toBlogPosts())
-				},
-				{ error ->
-					Timber.w("Error while retrieving blog posts: $error")
-				}
-			)
-
-			queue.add(jsonObjectRequest)
-		}
-
-	}
-
-}

app/src/main/java/net/pokeranalytics/android/api/CurrencyConverterApi.kt

@@ -1,60 +0,0 @@
-package net.pokeranalytics.android.api
-
-import android.content.Context
-import androidx.annotation.Keep
-import com.android.volley.VolleyError
-import com.android.volley.toolbox.StringRequest
-import com.android.volley.toolbox.Volley
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.decodeFromString
-import kotlinx.serialization.json.Json
-import timber.log.Timber
-
-@Keep
-@Serializable
-data class RateResponse(var info: RateInfo)
-
-@Keep
-@Serializable
-data class RateInfo(var rate: Double)
-
-class CurrencyConverterApi {
-
-	companion object {
-
-		val json = Json { ignoreUnknownKeys = true }
-
-		fun currencyRate(fromCurrency: String, toCurrency: String, context: Context, callback: (Double?, VolleyError?) -> (Unit)) {
-
-			val queue = Volley.newRequestQueue(context)
-			val url = "https://api.apilayer.com/exchangerates_data/convert?to=$toCurrency&from=$fromCurrency&amount=1"
-
-			Timber.d("Api call = $url")
-
-			val stringRequest = object : StringRequest(
-				Method.GET, url,
-				{ response ->
-
-					val o = json.decodeFromString<RateResponse>(response)
-					Timber.d("rate = ${o.info.rate}")
-					callback(o.info.rate, null)
-				},
-				{
-					Timber.d("Api call failed: ${it.message}")
-					callback(null, it)
-				}) {
-
-				override fun getHeaders(): MutableMap<String, String> {
-					val headers = HashMap<String, String>()
-					headers["apikey"] = "XnfeyID3PMKd3k4zTPW0XmZAbcZlZgqH"
-					return headers
-				}
-
-			}
-			queue.add(stringRequest)
-
-		}
-
-	}
-
-}

app/src/main/java/net/pokeranalytics/android/api/FreeConverterApi.kt

@@ -0,0 +1,47 @@
+package net.pokeranalytics.android.api
+
+import android.content.Context
+import com.android.volley.Request
+import com.android.volley.Response
+import com.android.volley.toolbox.StringRequest
+import com.android.volley.toolbox.Volley
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonConfiguration
+import timber.log.Timber
+
+class FreeConverterApi {
+
+	companion object {
+
+		fun currencyRate(pair: String, context: Context, callback: (Double) -> (Unit)) {
+
+			val queue = Volley.newRequestQueue(context)
+			val url = "https://free.currconv.com/api/v7/convert?q=${pair}&compact=ultra&apiKey=5ba8d38995282fe8b1c8"
+
+			// https://free.currconv.com/api/v7/convert?q=GBP_USD&compact=ultra&apiKey=5ba8d38995282fe8b1c8
+			// { "USD_PHP": 44.1105, "PHP_USD": 0.0227 }
+
+			val stringRequest = StringRequest(
+				Request.Method.GET, url,
+				Response.Listener { response ->
+
+					val json = Json(JsonConfiguration.Stable)
+					val f = json.parseJson(response)
+					f.jsonObject[pair]?.primitive?.double?.let { rate ->
+						callback(rate)
+					} ?: run {
+						Timber.d("no rate: $response")
+					}
+
+				},
+				Response.ErrorListener {
+					Timber.d("Api call failed: ${it.message}")
+				})
+
+			queue.add(stringRequest)
+
+		}
+
+	}
+
+}

app/src/main/java/net/pokeranalytics/android/api/MultipartRequest.kt

@@ -1,242 +0,0 @@
-package net.pokeranalytics.android.api
-
-import com.android.volley.*
-import com.android.volley.toolbox.HttpHeaderParser
-import java.io.*
-
-
-open class VolleyMultipartRequest : Request<NetworkResponse?> {
-
-    private val twoHyphens = "--"
-    private val lineEnd = "\r\n"
-    private val boundary = "apiclient-" + System.currentTimeMillis()
-    private var mListener: Response.Listener<NetworkResponse>
-    private var mErrorListener: Response.ErrorListener
-    private var mHeaders: Map<String, String>? = null
-    private var byteData: Map<String, DataPart>? = null
-
-    /**
-     * Default constructor with predefined header and post method.
-     *
-     * @param url           request destination
-     * @param headers       predefined custom header
-     * @param listener      on success achieved 200 code from request
-     * @param errorListener on error http or library timeout
-     */
-    constructor(
-        url: String?, headers: Map<String, String>?,
-        byteData: Map<String, DataPart>,
-        listener: Response.Listener<NetworkResponse>,
-        errorListener: Response.ErrorListener
-    ) : super(Method.POST, url, errorListener) {
-        mListener = listener
-        this.mErrorListener = errorListener
-        mHeaders = headers
-        this.byteData = byteData
-    }
-
-    /**
-     * Constructor with option method and default header configuration.
-     *
-     * @param method        method for now accept POST and GET only
-     * @param url           request destination
-     * @param listener      on success event handler
-     * @param errorListener on error event handler
-     */
-    constructor(
-        method: Int, url: String?,
-        listener: Response.Listener<NetworkResponse>,
-        errorListener: Response.ErrorListener
-    ) : super(method, url, errorListener) {
-        mListener = listener
-        this.mErrorListener = errorListener
-    }
-
-    @Throws(AuthFailureError::class)
-    override fun getHeaders(): Map<String, String> {
-        return if (mHeaders != null) mHeaders!! else super.getHeaders()
-    }
-
-    override fun getBodyContentType(): String {
-        return "multipart/form-data;boundary=$boundary"
-    }
-
-    @Throws(AuthFailureError::class)
-    override fun getBody(): ByteArray? {
-        val bos = ByteArrayOutputStream()
-        val dos = DataOutputStream(bos)
-        try {
-            // populate text payload
-            val params = params
-            if (params != null && params.isNotEmpty()) {
-                textParse(dos, params, paramsEncoding)
-            }
-
-            // populate data byte payload
-            val data =
-                byteData
-            if (data != null && data.isNotEmpty()) {
-                dataParse(dos, data)
-            }
-
-            // close multipart form data after text and file data
-            dos.writeBytes(twoHyphens + boundary + twoHyphens + lineEnd)
-            return bos.toByteArray()
-        } catch (e: IOException) {
-            e.printStackTrace()
-        }
-        return null
-    }
-
-    override fun parseNetworkResponse(response: NetworkResponse?): Response<NetworkResponse?> {
-        return try {
-            Response.success(
-                response,
-                HttpHeaderParser.parseCacheHeaders(response)
-            )
-        } catch (e: Exception) {
-            Response.error(ParseError(e))
-        }
-    }
-
-    override fun deliverResponse(response: NetworkResponse?) {
-        mListener.onResponse(response)
-    }
-
-    override fun deliverError(error: VolleyError?) {
-        mErrorListener.onErrorResponse(error)
-    }
-
-    /**
-     * Parse string map into data output stream by key and value.
-     *
-     * @param dataOutputStream data output stream handle string parsing
-     * @param params           string inputs collection
-     * @param encoding         encode the inputs, default UTF-8
-     * @throws IOException
-     */
-    @Throws(IOException::class)
-    private fun textParse(
-        dataOutputStream: DataOutputStream,
-        params: Map<String, String>,
-        encoding: String
-    ) {
-        try {
-            for ((key, value) in params) {
-                buildTextPart(dataOutputStream, key, value)
-            }
-        } catch (uee: UnsupportedEncodingException) {
-            throw RuntimeException("Encoding not supported: $encoding", uee)
-        }
-    }
-
-    /**
-     * Parse data into data output stream.
-     *
-     * @param dataOutputStream data output stream handle file attachment
-     * @param data             loop through data
-     * @throws IOException
-     */
-    @Throws(IOException::class)
-    private fun dataParse(dataOutputStream: DataOutputStream, data: Map<String, DataPart>) {
-        for ((key, value) in data) {
-            buildDataPart(dataOutputStream, value, key)
-        }
-    }
-
-    /**
-     * Write string data into header and data output stream.
-     *
-     * @param dataOutputStream data output stream handle string parsing
-     * @param parameterName    name of input
-     * @param parameterValue   value of input
-     * @throws IOException
-     */
-    @Throws(IOException::class)
-    private fun buildTextPart(
-        dataOutputStream: DataOutputStream,
-        parameterName: String,
-        parameterValue: String
-    ) {
-        dataOutputStream.writeBytes(twoHyphens + boundary + lineEnd)
-        dataOutputStream.writeBytes("Content-Disposition: form-data; name=\"$parameterName\"$lineEnd")
-        //dataOutputStream.writeBytes("Content-Type: text/plain; charset=UTF-8" + lineEnd);
-        dataOutputStream.writeBytes(lineEnd)
-        dataOutputStream.writeBytes(parameterValue + lineEnd)
-    }
-
-    /**
-     * Write data file into header and data output stream.
-     *
-     * @param dataOutputStream data output stream handle data parsing
-     * @param dataFile         data byte as DataPart from collection
-     * @param inputName        name of data input
-     * @throws IOException
-     */
-    @Throws(IOException::class)
-    private fun buildDataPart(
-        dataOutputStream: DataOutputStream,
-        dataFile: DataPart,
-        inputName: String
-    ) {
-        dataOutputStream.writeBytes(twoHyphens + boundary + lineEnd)
-        dataOutputStream.writeBytes(
-            "Content-Disposition: form-data; name=\"" +
-                    inputName + "\"; filename=\"" + dataFile.fileName + "\"" + lineEnd
-        )
-        if (dataFile.type != null && !dataFile.type!!.trim { it <= ' ' }.isEmpty()) {
-            dataOutputStream.writeBytes("Content-Type: " + dataFile.type + lineEnd)
-        }
-        dataOutputStream.writeBytes(lineEnd)
-        val fileInputStream = ByteArrayInputStream(dataFile.content)
-        var bytesAvailable: Int = fileInputStream.available()
-        val maxBufferSize = 1024 * 1024
-        var bufferSize = Math.min(bytesAvailable, maxBufferSize)
-        val buffer = ByteArray(bufferSize)
-        var bytesRead: Int = fileInputStream.read(buffer, 0, bufferSize)
-        while (bytesRead > 0) {
-            dataOutputStream.write(buffer, 0, bufferSize)
-            bytesAvailable = fileInputStream.available()
-            bufferSize = Math.min(bytesAvailable, maxBufferSize)
-            bytesRead = fileInputStream.read(buffer, 0, bufferSize)
-        }
-        dataOutputStream.writeBytes(lineEnd)
-    }
-
-    /**
-     * Simple data container use for passing byte file
-     */
-    class DataPart {
-
-        var fileName: String? = null
-
-        var content: ByteArray? = null
-
-        var type: String? = null
-
-        /**
-         * Constructor with data.
-         *
-         * @param name label of data
-         * @param data byte data
-         */
-        constructor(name: String?, data: ByteArray) {
-            fileName = name
-            content = data
-        }
-
-        /**
-         * Constructor with mime data type.
-         *
-         * @param name     label of data
-         * @param data     byte data
-         * @param mimeType mime data like "image/jpeg"
-         */
-        constructor(name: String?, data: ByteArray, mimeType: String?) {
-            fileName = name
-            content = data
-            type = mimeType
-        }
-    }
-
-}

app/src/main/java/net/pokeranalytics/android/calcul/ComputedResultsExtensions.kt

@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.calculus.calcul
+package net.pokeranalytics.android.calcul
 
 import android.content.Context
 import com.github.mikephil.charting.data.*

app/src/main/java/net/pokeranalytics/android/calcul/ReportExtensions.kt

@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.calculus.calcul
+package net.pokeranalytics.android.calcul
 
 import android.content.Context
 import com.github.mikephil.charting.data.BarDataSet

app/src/main/java/net/pokeranalytics/android/calculus/AggregationType.kt

@@ -2,7 +2,12 @@ package net.pokeranalytics.android.calculus
 
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.model.Criteria
-import net.pokeranalytics.android.ui.graph.Graph
+
+enum class AxisFormatting {
+	DEFAULT,
+	X_DURATION,
+	Y_DURATION,
+}
 
 enum class AggregationType {
 	SESSION,
@@ -20,6 +25,14 @@ enum class AggregationType {
 			}
 		}
 
+	val axisFormatting: AxisFormatting
+		get() {
+			return when (this) {
+				DURATION -> AxisFormatting.X_DURATION
+				else -> AxisFormatting.DEFAULT
+			}
+		}
+
 	val criterias: List<Criteria>
 		get() {
 			return when (this) {

app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt

@@ -2,6 +2,7 @@ package net.pokeranalytics.android.calculus
 
 import android.content.Context
 import io.realm.Realm
+import net.pokeranalytics.android.R
 import net.pokeranalytics.android.calculus.Stat.*
 import net.pokeranalytics.android.exceptions.PAIllegalStateException
 import net.pokeranalytics.android.model.Criteria
@@ -9,7 +10,13 @@ import net.pokeranalytics.android.model.combined
 import net.pokeranalytics.android.model.extensions.hourlyDuration
 import net.pokeranalytics.android.model.filter.Query
 import net.pokeranalytics.android.model.filter.filter
-import net.pokeranalytics.android.model.realm.*
+import net.pokeranalytics.android.model.realm.ComputableResult
+import net.pokeranalytics.android.model.realm.Filter
+import net.pokeranalytics.android.model.realm.SessionSet
+import net.pokeranalytics.android.ui.activity.ComparisonReportActivity
+import net.pokeranalytics.android.ui.activity.ProgressReportActivity
+import net.pokeranalytics.android.ui.activity.TableReportActivity
+import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.util.extensions.startOfDay
 import java.util.*
 import kotlin.math.max
@@ -26,18 +33,18 @@ class Calculator {
 	 * The options used for calculations and display
 	 */
 	class Options(
-		var progressValues: ProgressValues = ProgressValues.NONE,
+		var display: Display = Display.TABLE,
+		progressValues: ProgressValues = ProgressValues.NONE,
 		var stats: List<Stat> = listOf(),
 		var criterias: List<Criteria> = listOf(),
 		var query: Query = Query(),
 		var filterId: String? = null,
 		private var aggregationType: AggregationType? = null,
 		var userGenerated: Boolean = false,
-		var reportSetupId: String? = null,
+		var reportSetupId: String? = null
-		var includedTransactions: List<TransactionType> = listOf()
 	) {
 
-		constructor(
+		constructor(display: Display = Display.TABLE,
 		            progressValues: ProgressValues = ProgressValues.NONE,
 		            stats: List<Stat> = listOf(),
 		            criterias: List<Criteria> = listOf(),
@@ -45,18 +52,18 @@ class Calculator {
 		            aggregationType: AggregationType? = null,
 		            userGenerated: Boolean = false,
 		            reportSetupId: String? = null) :
-			this(progressValues, stats, criterias, filter?.query ?: Query(), filter?.id, aggregationType, userGenerated, reportSetupId)
+			this(display, progressValues, stats, criterias, filter?.query ?: Query(), filter?.id, aggregationType, userGenerated, reportSetupId)
 
 		/**
 		 * Specifies whether progress values should be added and their kind
 		 */
-//		var progressValues: ProgressValues = progressValues
+		var progressValues: ProgressValues = progressValues
-//			get() {
+			get() {
-//				if (field == ProgressValues.NONE && this.display.requireProgressValues) {
+				if (field == ProgressValues.NONE && this.display == Display.PROGRESS) {
-//					return ProgressValues.STANDARD
+					return ProgressValues.STANDARD
-//				}
+				}
-//				return field
+				return field
-//			}
+			}
 
 		init {
 			this.aggregationType?.let {
@@ -64,6 +71,40 @@ class Calculator {
 			}
 		}
 
+		/**
+		 * The way the computed stats are going to be displayed
+		 */
+		enum class Display : RowRepresentable {
+			TABLE,
+			PROGRESS,
+			COMPARISON,
+			MAP,
+			POLYNOMIAL;
+
+			override val resId: Int?
+				get() {
+					return when (this) {
+						TABLE -> R.string.table
+						PROGRESS -> R.string.progress
+						COMPARISON -> R.string.comparison
+						MAP -> R.string.map
+						POLYNOMIAL -> null
+					}
+				}
+
+			val activityClass: Class<*>
+				get() {
+					return when (this) {
+						TABLE -> TableReportActivity::class.java
+						PROGRESS -> ProgressReportActivity::class.java
+						COMPARISON -> ComparisonReportActivity::class.java
+						else -> throw PAIllegalStateException("undefined activity for report display")
+//						MAP -> R.string.map
+//						POLYNOMIAL -> null
+
+					}
+				}
+		}
 
 		/**
 		 * The type of evolution numericValues
@@ -94,7 +135,6 @@ class Calculator {
 			get() {
 				return this.stats.contains(LONGEST_STREAKS)
 			}
-
 		/**
 		 * Whether the values should be sorted
 		 */
@@ -102,7 +142,6 @@ class Calculator {
 			get() {
 				return this.progressValues != ProgressValues.NONE || this.computeLongestStreak
 			}
-
 		/**
 		 * Whether the number of locations played should be computed
 		 */
@@ -152,6 +191,7 @@ class Calculator {
 		): Report {
 
 			val options = Options(
+				display = Options.Display.PROGRESS,
 				progressValues = Options.ProgressValues.STANDARD,
 				stats = listOf(stat),
 				aggregationType = aggregationType
@@ -177,13 +217,13 @@ class Calculator {
 
 			val computableGroups: MutableList<ComputableGroup> = mutableListOf()
 
-			val combinations = options.criterias.combined()
+			options.criterias.combined().forEach { comparatorQuery ->
-//			Timber.d("Combinations: ${ combinations.map { it.defaultName }}")
 
-			for (comparatorQuery in combinations) {
 				comparatorQuery.merge(options.query)
+
 				val group = ComputableGroup(comparatorQuery)
 				computableGroups.add(group)
+
 			}
 
 			if (computableGroups.size == 0) {
@@ -201,6 +241,7 @@ class Calculator {
 
 			val report = Report(options)
 			groups.forEach { group ->
+				//				val s = Date()
 
 				// Clean existing computables / sessionSets if group is reused
 				group.cleanup()
@@ -240,27 +281,14 @@ class Calculator {
 			val results = ComputedResults(computableGroup, options.shouldManageMultiGroupProgressValues)
 
 			val computables = computableGroup.computables(realm, options.shouldSortValues)
-
-			if (computables.size == 0) { // we don't want to return stats with 0 as a value when comparing best performances
-				return results
-			}
-
 //			Timber.d("#### Start computing group, ${computables.size} computables")
 			results.addStat(NUMBER_OF_GAMES, computables.size.toDouble())
 //			computables.forEach {
 //				Timber.d("$$$ buyin = ${it.ratedBuyin} $$$ net result = ${it.ratedNet}")
 //			}
 
-			var ratedNet = computables.sum(ComputableResult.Field.RATED_NET.identifier).toDouble()
+			val sum = computables.sum(ComputableResult.Field.RATED_NET.identifier).toDouble()
-			if (options.includedTransactions.isNotEmpty()) {
+			results.addStat(NET_RESULT, sum)
-				for (transactionType in options.includedTransactions) {
-					val transactions = computableGroup.transactions(realm, transactionType, options.shouldSortValues)
-					val transactionRatedAmount = transactions.sum(Transaction.Field.RATED_AMOUNT.identifier).toDouble()
-					ratedNet += transactionRatedAmount
-				}
-			}
-
-			results.addStat(NET_RESULT, ratedNet)
 
 			val totalHands = computables.sum(ComputableResult.Field.ESTIMATED_HANDS.identifier).toDouble()
 			results.addStat(HANDS_PLAYED, totalHands)
@@ -276,52 +304,39 @@ class Calculator {
 
 			val totalBuyin = computables.sum(ComputableResult.Field.RATED_BUYIN.identifier).toDouble()
 			results.addStat(TOTAL_BUYIN, totalBuyin)
-
-			val totalTips = computables.sum(ComputableResult.Field.RATED_TIPS.identifier).toDouble()
-			results.addStat(TOTAL_TIPS, totalTips)
-
 //			Timber.d("########## totalBuyin = ${totalBuyin} ### sum = ${sum}")
 
 			val maxNetResult = computables.max(ComputableResult.Field.RATED_NET.identifier)?.toDouble()
 			maxNetResult?.let {
-				results.addStat(MAXIMUM_NET_RESULT, it)
+				results.addStat(MAXIMUM_NETRESULT, it)
 			}
 
 			val minNetResult = computables.min(ComputableResult.Field.RATED_NET.identifier)?.toDouble()
 			minNetResult?.let {
-				results.addStat(MINIMUM_NET_RESULT, it)
+				results.addStat(MINIMUM_NETRESULT, it)
 			}
 
 			Stat.netBBPer100Hands(bbSum, totalHands)?.let { netBB100 ->
 				results.addStat(NET_BB_PER_100_HANDS, netBB100)
 			}
-			Stat.returnOnInvestment(ratedNet, totalBuyin)?.let { roi ->
+			Stat.returnOnInvestment(sum, totalBuyin)?.let { roi ->
 				results.addStat(ROI, roi)
 			}
 
-//			val shouldComputeITMRatio = options.stats.contains(TOURNAMENT_ITM_RATIO) || computableGroup.displayedStats?.contains(TOURNAMENT_ITM_RATIO) == true
-//			if (shouldComputeITMRatio) {
-//				val itmCount = computables.count { it.session?.result?.cashout ?: 0.0 > 0.0 } // should we add a property inside ComputableResult for better performance?
-//				val itmRatio = itmCount.toDouble() / computables.size.toDouble()
-//				results.addStat(TOURNAMENT_ITM_RATIO, itmRatio)
-//			}
-
 			if (options.computeLocationsPlayed) {
 				results.addStat(LOCATIONS_PLAYED, computables.distinctBy { it.session?.location?.id }.size.toDouble())
 			}
 
 			var average = 0.0 // also used for standard deviation later
 			if (computables.size > 0) {
-				average = ratedNet / computables.size.toDouble()
+				average = sum / computables.size.toDouble()
 				val winRatio = winningSessionCount.toDouble() / computables.size.toDouble()
-				val itmRatio = winningSessionCount.toDouble() / computables.size.toDouble()
 				val avgBuyin = totalBuyin / computables.size.toDouble()
 
 				results.addStats(
 					setOf(
 						ComputedStat(AVERAGE, average),
 						ComputedStat(WIN_RATIO, winRatio),
-						ComputedStat(TOURNAMENT_ITM_RATIO, itmRatio),
 						ComputedStat(AVERAGE_BUYIN, avgBuyin)
 					)
 				)
@@ -348,7 +363,6 @@ class Calculator {
 				var longestWinStreak = 0
 				var longestLoseStreak = 0
 				var currentStreak = 0
-				var tITMCount = 0
 
 				computables.forEach { computable ->
 					index++
@@ -356,7 +370,6 @@ class Calculator {
 					tBBSum += computable.bbNet
 					tBBSessionCount += computable.hasBigBlind
 					tWinningSessionCount += computable.isPositive
-					tITMCount += computable.isPositive
 					tBuyinSum += computable.ratedBuyin
 					tHands += computable.estimatedHands
 
@@ -382,16 +395,11 @@ class Calculator {
 					results.addEvolutionValue(tSum / index, stat = AVERAGE, data = session)
 					results.addEvolutionValue(index.toDouble(), stat = NUMBER_OF_GAMES, data = session)
 					results.addEvolutionValue(tBBSum / tBBSessionCount, stat = AVERAGE_NET_BB, data = session)
-					results.addEvolutionValue(tBBSum, stat = BB_NET_RESULT, data = session)
 					results.addEvolutionValue(
 						(tWinningSessionCount.toDouble() / index.toDouble()),
 						stat = WIN_RATIO,
 						data = session
 					)
-					results.addEvolutionValue(
-						tITMCount.toDouble() / index.toDouble(),
-						stat = TOURNAMENT_ITM_RATIO,
-						data = session)
 					results.addEvolutionValue(tBuyinSum / index, stat = AVERAGE_BUYIN, data = session)
 					results.addEvolutionValue(computable.ratedNet, stat = STANDARD_DEVIATION, data = session)
 
@@ -433,9 +441,9 @@ class Calculator {
 				}
 			}
 
-			val shouldIterateOverSets = computableGroup.conditions.isNotEmpty()
+			val shouldIterateOverSets = computableGroup.conditions.isNotEmpty() ||
-					|| options.progressValues != Options.ProgressValues.NONE
+					options.progressValues != Options.ProgressValues.NONE ||
-					|| options.computeDaysPlayed
+					options.computeDaysPlayed
 
 			// Session Set
 			if (shouldIterateOverSets) {
@@ -482,6 +490,10 @@ class Calculator {
 							)
 							results.addEvolutionValue(tHourlyRateBB, stat = HOURLY_RATE_BB, data = sessionSet)
 
+							Stat.netBBPer100Hands(tBBSum, tTotalHands)?.let { netBB100 ->
+								results.addEvolutionValue(netBB100, stat = NET_BB_PER_100_HANDS, data = sessionSet)
+							}
+
 						}
 						Options.ProgressValues.TIMED -> {
 							results.addEvolutionValue(tRatedNetSum, tHourlyDuration, NET_RESULT, sessionSet)
@@ -533,7 +545,7 @@ class Calculator {
 			var hourlyRate = 0.0
 			if (gHourlyDuration != null) {
 
-				hourlyRate = ratedNet / gHourlyDuration
+				hourlyRate = sum / gHourlyDuration
 				if (sessionSets.size > 0) {
 					val avgDuration = gHourlyDuration / sessionSets.size
 					results.addStat(HOURLY_RATE, hourlyRate)
@@ -619,10 +631,10 @@ class SSStats(sessionSet: SessionSet, query: Query) { // Session Set Stats
 			if (setSessions.size == filteredSessions.size) {
 				this.initStatsWithSet(sessionSet)
 			} else {
-				ratedNet = filteredSessions.sumOf { it.computableResult?.ratedNet ?: 0.0 }
+				ratedNet = filteredSessions.sumByDouble { it.computableResult?.ratedNet ?: 0.0 }
-				bbSum = filteredSessions.sumOf { it.bbNet }
+				bbSum = filteredSessions.sumByDouble { it.bbNet }
 				hourlyDuration = filteredSessions.hourlyDuration
-				estimatedHands = filteredSessions.sumOf { it.estimatedHands }
+				estimatedHands = filteredSessions.sumByDouble { it.estimatedHands }
 			}
 		}
 	}

app/src/main/java/net/pokeranalytics/android/calculus/ComputableGroup.kt

@@ -4,14 +4,15 @@ import io.realm.Realm
 import io.realm.RealmResults
 import net.pokeranalytics.android.model.filter.Query
 import net.pokeranalytics.android.model.filter.QueryCondition
-import net.pokeranalytics.android.model.realm.*
+import net.pokeranalytics.android.model.realm.ComputableResult
-import timber.log.Timber
+import net.pokeranalytics.android.model.realm.Filter
+import net.pokeranalytics.android.model.realm.SessionSet
 
 
 /**
  * A sessionGroup of computable items identified by a name
  */
-class ComputableGroup(val query: Query, var displayedStats: List<Stat>? = null) {
+class ComputableGroup(var query: Query, var stats: List<Stat>? = null) {
 
 	/**
 	 * A subgroup used to compute stat variation
@@ -31,11 +32,6 @@ class ComputableGroup(val query: Query, var displayedStats: List<Stat>? = null)
 			return this.query.conditions
 		}
 
-	/**
-	 * The size of the retrieved computables list
-	 */
-	var size: Int = 0
-
 	/**
 	 * The list of endedSessions to compute
 	 */
@@ -55,10 +51,7 @@ class ComputableGroup(val query: Query, var displayedStats: List<Stat>? = null)
 
 		val sortedField = if (sorted) "session.startDate" else null
 		val computables = Filter.queryOn<ComputableResult>(realm, this.query, sortedField)
-
-		this.size = computables.size
 		this._computables = computables
-
 		return computables
 	}
 
@@ -84,20 +77,6 @@ class ComputableGroup(val query: Query, var displayedStats: List<Stat>? = null)
 		return sets
 	}
 
-	/**
-	 * Retrieves the transactions on the relative [realm] filtered with the provided [conditions]
-	 */
-	fun transactions(realm: Realm, transactionType: TransactionType, sorted: Boolean = false): RealmResults<Transaction> {
-		val query = this.query.copy()
-		query.add(QueryCondition.AnyTransactionType(transactionType))
-		val sortedField = if (sorted) "date" else null
-		Timber.d("query = ${query.defaultName}")
-		return Filter.queryOn(realm, query, sortedField)
-	}
-
-	/**
-	 * Nullifies used Realm results
-	 */
 	fun cleanup() {
 		this._computables = null
 		this._sessionSets = null

app/src/main/java/net/pokeranalytics/android/calculus/Report.kt

@@ -3,6 +3,7 @@ package net.pokeranalytics.android.calculus
 import android.content.Context
 import net.pokeranalytics.android.exceptions.PAIllegalStateException
 import net.pokeranalytics.android.model.interfaces.GraphIdentifiableEntry
+import net.pokeranalytics.android.ui.fragment.GraphFragment
 import net.pokeranalytics.android.ui.graph.Graph
 import net.pokeranalytics.android.ui.graph.GraphUnderlyingEntry
 import net.pokeranalytics.android.ui.view.DefaultLegendValues
@@ -31,23 +32,6 @@ class Report(var options: Calculator.Options) {
 		this._results.add(result)
 	}
 
-	fun max(stat: Stat): ComputedResults? {
-
-		var computedResults: ComputedResults? = null
-		var count = 0
-		var max = Double.MIN_VALUE
-		for (cr in this._results) {
-			cr.computedStat(stat)?.value?.let { value ->
-				count += 1
-				if (value > max) {
-					computedResults = cr
-					max = value
-				}
-			}
-		}
-		return if (count >= 2) { computedResults } else { null }
-	}
-
 }
 
 

app/src/main/java/net/pokeranalytics/android/calculus/ReportWhistleBlower.kt

@@ -1,338 +0,0 @@
-package net.pokeranalytics.android.calculus
-
-import android.content.Context
-import android.os.CountDownTimer
-import io.realm.Realm
-import io.realm.RealmQuery
-import io.realm.RealmResults
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import net.pokeranalytics.android.calculus.optimalduration.CashGameOptimalDurationCalculator
-import net.pokeranalytics.android.model.LiveOnline
-import net.pokeranalytics.android.model.realm.*
-import net.pokeranalytics.android.ui.view.rows.StaticReport
-import net.pokeranalytics.android.util.CrashLogging
-import net.pokeranalytics.android.util.extensions.formattedHourlyDuration
-import timber.log.Timber
-import kotlin.coroutines.CoroutineContext
-
-
-interface NewPerformanceListener {
-    fun newBestPerformanceHandler()
-}
-
-class ReportWhistleBlower(var context: Context) {
-
-    private var sessions: RealmResults<Session>? = null
-    private var results: RealmResults<Result>? = null
-
-    private var currentTask: ReportTask? = null
-
-    private val currentNotifications: MutableList<String> = mutableListOf() // Performance.id
-
-    private val listeners: MutableList<NewPerformanceListener> = mutableListOf()
-
-    var paused: Boolean = false
-
-    private var timer: CountDownTimer? = null
-
-    init {
-
-        val realm = Realm.getDefaultInstance()
-
-        this.sessions = realm.where(Session::class.java).findAll()
-        this.sessions?.addChangeListener { _ ->
-            requestReportLaunch()
-        }
-
-        this.results = realm.where(Result::class.java).findAll()
-        this.results?.addChangeListener { _ ->
-            requestReportLaunch()
-        }
-
-        realm.close()
-    }
-
-    fun addListener(newPerformanceListener: NewPerformanceListener) {
-        this.listeners.add(newPerformanceListener)
-    }
-
-    fun removeListener(listener: NewPerformanceListener) {
-        this.listeners.remove(listener)
-    }
-
-    fun requestReportLaunch() {
-//        Timber.d(">>> Launch report")
-
-        if (paused) {
-            CrashLogging.log("can't start reports comparisons because of paused state")
-            return
-        }
-
-        this.timer?.cancel()
-
-        val launchStart = 100L
-        val timer = object: CountDownTimer(launchStart, launchStart) {
-            override fun onTick(p0: Long) { }
-
-            override fun onFinish() {
-                launchReportTask()
-            }
-        }
-        this.timer = timer
-        timer.start()
-
-    }
-
-    private fun launchReportTask() {
-
-        synchronized(this) {
-            this.currentTask?.cancel()
-
-            val reportTask = ReportTask(this, this.context)
-            this.currentTask = reportTask
-            reportTask.start()
-        }
-
-    }
-
-    /**
-     * Pauses the whistleblower, for example when importing data
-     */
-    fun pause() {
-        this.paused = true
-        this.currentTask?.cancel()
-        this.currentTask = null
-    }
-
-    fun resume() {
-        this.paused = false
-        this.requestReportLaunch()
-    }
-
-    fun has(performanceId: String): Boolean {
-        return this.currentNotifications.contains(performanceId)
-    }
-
-    fun notify(performance: Performance) {
-
-        this.currentNotifications.add(performance.id)
-        for (listener in this.listeners) {
-            listener.newBestPerformanceHandler()
-        }
-    }
-
-    fun clearNotifications() {
-        this.currentNotifications.clear()
-    }
-
-}
-
-class ReportTask(private var whistleBlower: ReportWhistleBlower, var context: Context) {
-
-    private var cancelled = false
-
-    var handler: (() -> Unit)? = null
-
-    private val coroutineContext: CoroutineContext
-        get() = Dispatchers.Default
-
-    fun start() {
-        messages.add("Starting task...")
-        launchReports()
-    }
-
-    fun cancel() {
-        this.cancelled = true
-    }
-
-    var messages: MutableList<String> = mutableListOf()
-
-    private fun launchReports() {
-        CoroutineScope(coroutineContext).launch {
-
-            val realm = Realm.getDefaultInstance()
-
-            // Basic
-            for (basicReport in StaticReport.basicReports) {
-                if (cancelled) {
-                    break
-                }
-                launchReport(realm, basicReport)
-            }
-
-            // CustomField
-            val customFields = realm.where(CustomField::class.java)
-                .equalTo("type", CustomField.Type.LIST.uniqueIdentifier).findAll()
-            for (customField in customFields) {
-                if (cancelled) {
-                    break
-                }
-                launchReport(realm, StaticReport.CustomFieldList(customField))
-            }
-            realm.close()
-        }
-
-    }
-
-    private fun launchReport(realm: Realm, report: StaticReport) {
-
-//        Timber.d(">>> launch report = $report")
-
-        when (report) {
-            StaticReport.OptimalDuration -> launchOptimalDuration(realm, report)
-            else -> launchDefaultReport(realm, report)
-        }
-    }
-
-    private fun launchDefaultReport(realm: Realm, report: StaticReport) {
-        val options = Calculator.Options(
-            stats = report.stats,
-            criterias = report.criteria
-        )
-
-        val result = Calculator.computeStats(realm, options = options)
-        analyseDefaultReport(realm, report, result)
-    }
-
-    private fun launchOptimalDuration(realm: Realm, report: StaticReport) {
-        LiveOnline.entries.forEach { key ->
-            val duration = CashGameOptimalDurationCalculator.start(key.isLive)
-            analyseOptimalDuration(realm, report, key, duration)
-        }
-
-        this.handler?.let { it() }
-    }
-
-    private fun analyseDefaultReport(realm: Realm, staticReport: StaticReport, result: Report) {
-
-        messages.add("Analyse report $staticReport...")
-
-        val nameSeparator = " "
-
-        for (stat in result.options.stats) {
-
-//            Timber.d("analyse stat: $stat for report: $staticReport")
-
-            // Get current performance
-            var query = performancesQuery(realm, staticReport, stat)
-
-            val customField: CustomField? =
-                (staticReport as? StaticReport.CustomFieldList)?.customField
-            customField?.let {
-                query = query.equalTo("customFieldId", it.id)
-            }
-            val currentPerf = query.findFirst()
-
-            // Store if necessary, delete if necessary
-            val bestComputedResults = result.max(stat)
-            bestComputedResults?.let { computedResults ->
-                messages.add("found new perf...")
-
-                val performanceQuery = computedResults.group.query
-                val performanceName = performanceQuery.getName(this.context, nameSeparator)
-
-                Timber.d("Best computed = $performanceName, ${computedResults.computedStat(Stat.NET_RESULT)?.value}")
-
-                var storePerf = true
-                currentPerf?.let {
-                    messages.add("has current perf...")
-
-                    currentPerf.name?.let { name ->
-                        if (computedResults.group.query.getName(this.context, nameSeparator) == name) {
-                            storePerf = false
-                        }
-                    }
-                    currentPerf.objectId?.let { objectId ->
-                        if (computedResults.group.query.objectId == objectId) {
-                            storePerf = false
-                        }
-                    }
-
-                    if (storePerf) {
-                        realm.executeTransaction {
-                            currentPerf.name = performanceName
-                            currentPerf.objectId = performanceQuery.objectId
-                            currentPerf.customFieldId = customField?.id
-                        }
-                        this.whistleBlower.notify(currentPerf)
-                    }
-
-                }
-                messages.add("storePerf = $storePerf...")
-
-                if (currentPerf == null && storePerf) {
-                    val performance = Performance(
-                        staticReport,
-                        stat,
-                        performanceName,
-                        performanceQuery.objectId,
-                        customField?.id,
-                        null
-                    )
-                    realm.executeTransaction { it.copyToRealm(performance) }
-                    this.whistleBlower.notify(performance)
-                }
-
-            } ?: run { // if there is no max but a now irrelevant Performance, we delete it
-
-                messages.add("deletes current perf if necessary: $currentPerf...")
-
-//                Timber.d("NO best computed value, current perf = $currentPerf ")
-                currentPerf?.let { perf ->
-                    realm.executeTransaction {
-//                        Timber.d("Delete perf: stat = ${perf.stat}, report = ${perf.reportId}")
-                        perf.deleteFromRealm()
-                    }
-                }
-            }
-
-        }
-
-    }
-
-    private fun analyseOptimalDuration(realm: Realm, staticReport: StaticReport, key: PerformanceKey, duration: Double?) {
-
-        val performance = performancesQuery(realm, staticReport, key).findFirst()
-
-        duration?.let {
-            var storePerf = true
-
-            val formattedDuration = (duration / 3600 / 1000).formattedHourlyDuration()
-            performance?.let { perf ->
-                if (perf.value == duration) {
-                    storePerf = false
-                }
-
-                if (storePerf) {
-                    realm.executeTransaction {
-                        perf.name = formattedDuration
-                        perf.value = duration
-                    }
-                }
-            }
-
-            if (storePerf) {
-                val perf = Performance(staticReport, key, name = formattedDuration, value = duration)
-                realm.executeTransaction { it.copyToRealm(perf) }
-                this.whistleBlower.notify(perf)
-            }
-
-        } ?: run { // no duration
-            performance?.let { perf ->
-                realm.executeTransaction {
-                    perf.deleteFromRealm() // delete if the perf exists
-                }
-            }
-        }
-
-    }
-
-    private fun performancesQuery(realm: Realm, staticReport: StaticReport, key: PerformanceKey): RealmQuery<Performance> {
-        return realm.where(Performance::class.java)
-            .equalTo("reportId", staticReport.uniqueIdentifier)
-            .equalTo("key", key.value)
-    }
-
-}

app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt

@@ -4,7 +4,6 @@ import android.content.Context
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.exceptions.FormattingException
 import net.pokeranalytics.android.exceptions.PAIllegalStateException
-import net.pokeranalytics.android.model.realm.PerformanceKey
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowViewType
 import net.pokeranalytics.android.util.NULL_TEXT
@@ -23,7 +22,7 @@ class StatFormattingException(message: String) : Exception(message)
 /**
  * An enum representing all the types of Session statistics
  */
-enum class Stat(override var uniqueIdentifier: Int) : IntIdentifiable, RowRepresentable, PerformanceKey {
+enum class Stat(override var uniqueIdentifier: Int) : IntIdentifiable, RowRepresentable {
 
 	NET_RESULT(1),
 	BB_NET_RESULT(2),
@@ -45,8 +44,8 @@ enum class Stat(override var uniqueIdentifier: Int) : IntIdentifiable, RowRepres
 	HANDS_PLAYED(18),
 	LOCATIONS_PLAYED(19),
 	LONGEST_STREAKS(20),
-	MAXIMUM_NET_RESULT(21),
+	MAXIMUM_NETRESULT(21),
-	MINIMUM_NET_RESULT(22),
+	MINIMUM_NETRESULT(22),
 	MAXIMUM_DURATION(23),
 	DAYS_PLAYED(24),
 	WINNING_SESSION_COUNT(25),
@@ -54,8 +53,6 @@ enum class Stat(override var uniqueIdentifier: Int) : IntIdentifiable, RowRepres
 	TOTAL_BUYIN(27),
 	RISK_OF_RUIN(28),
 	STANDARD_DEVIATION_BB(29),
-	TOURNAMENT_ITM_RATIO(30),
-	TOTAL_TIPS(31)
 	;
 
 	companion object : IntSearchable<Stat> {
@@ -103,8 +100,6 @@ enum class Stat(override var uniqueIdentifier: Int) : IntIdentifiable, RowRepres
 
 	}
 
-	override val value: Int = this.uniqueIdentifier
-
 	override val resId: Int?
 		get() {
 			return when (this) {
@@ -129,13 +124,11 @@ enum class Stat(override var uniqueIdentifier: Int) : IntIdentifiable, RowRepres
 				HANDS_PLAYED -> R.string.number_of_hands
 				LOCATIONS_PLAYED -> R.string.locations_played
 				LONGEST_STREAKS -> R.string.longest_streaks
-				MAXIMUM_NET_RESULT -> R.string.max_net_result
+				MAXIMUM_NETRESULT -> R.string.max_net_result
-				MINIMUM_NET_RESULT -> R.string.min_net_result
+				MINIMUM_NETRESULT -> R.string.min_net_result
 				MAXIMUM_DURATION -> R.string.longest_session
 				DAYS_PLAYED -> R.string.days_played
 				TOTAL_BUYIN -> R.string.total_buyin
-				TOURNAMENT_ITM_RATIO -> R.string.itm_ratio
-				TOTAL_TIPS -> R.string.total_tips
 				else -> throw PAIllegalStateException("Stat ${this.name} name required but undefined")
 			}
 		}
@@ -152,7 +145,7 @@ enum class Stat(override var uniqueIdentifier: Int) : IntIdentifiable, RowRepres
 
 		when (this) {
 			// Amounts + red/green
-			NET_RESULT, HOURLY_RATE, AVERAGE, MAXIMUM_NET_RESULT, MINIMUM_NET_RESULT -> {
+			NET_RESULT, HOURLY_RATE, AVERAGE, MAXIMUM_NETRESULT, MINIMUM_NETRESULT -> {
 				val color = if (value >= this.threshold) R.color.green else R.color.red
 				return TextFormat(value.toCurrency(currency), color)
 			}
@@ -168,7 +161,7 @@ enum class Stat(override var uniqueIdentifier: Int) : IntIdentifiable, RowRepres
 			HOURLY_DURATION, AVERAGE_HOURLY_DURATION, MAXIMUM_DURATION -> {
 				return TextFormat(value.formattedHourlyDuration())
 			} // red/green percentages
-			WIN_RATIO, ROI, TOURNAMENT_ITM_RATIO -> {
+			WIN_RATIO, ROI -> {
 				val color = if (value * 100 >= this.threshold) R.color.green else R.color.red
 				return TextFormat("${(value * 100).formatted}%", color)
 			}
@@ -176,9 +169,9 @@ enum class Stat(override var uniqueIdentifier: Int) : IntIdentifiable, RowRepres
 				val color = if (value * 100 <= this.threshold) R.color.green else R.color.red
 				return TextFormat("${(value * 100).formatted}%", color)
 			}
-			// white amounts
+			// white amountsr
 			AVERAGE_BUYIN, STANDARD_DEVIATION, STANDARD_DEVIATION_HOURLY,
-			STANDARD_DEVIATION_BB_PER_100_HANDS, STANDARD_DEVIATION_BB, TOTAL_BUYIN, TOTAL_TIPS -> {
+			STANDARD_DEVIATION_BB_PER_100_HANDS, STANDARD_DEVIATION_BB, TOTAL_BUYIN -> {
 				return TextFormat(value.toCurrency(currency))
 			}
 			LONGEST_STREAKS -> {
@@ -192,7 +185,6 @@ enum class Stat(override var uniqueIdentifier: Int) : IntIdentifiable, RowRepres
 		get() {
 			return when (this) {
 				RISK_OF_RUIN -> 5.0
-				TOURNAMENT_ITM_RATIO -> 10.0
 				WIN_RATIO -> 50.0
 				else -> 0.0
 			}
@@ -208,12 +200,12 @@ enum class Stat(override var uniqueIdentifier: Int) : IntIdentifiable, RowRepres
 			HOURLY_RATE_BB, AVERAGE_NET_BB, ROI, HOURLY_RATE -> R.string.average
 			NUMBER_OF_SETS -> R.string.number_of_sessions
 			NUMBER_OF_GAMES -> R.string.number_of_records
-			NET_RESULT, BB_NET_RESULT -> R.string.total
+			NET_RESULT -> R.string.total
 			STANDARD_DEVIATION -> R.string.net_result
 			STANDARD_DEVIATION_BB -> R.string.average_net_result_bb_
 			STANDARD_DEVIATION_HOURLY -> R.string.hour_rate_without_pauses
 			STANDARD_DEVIATION_BB_PER_100_HANDS -> R.string.net_result_bb_per_100_hands
-			WIN_RATIO, HOURLY_DURATION, TOURNAMENT_ITM_RATIO -> return this.localizedTitle(context)
+			WIN_RATIO, HOURLY_DURATION -> return this.localizedTitle(context)
 			else -> null
 		}
 		resId?.let {
@@ -247,8 +239,8 @@ enum class Stat(override var uniqueIdentifier: Int) : IntIdentifiable, RowRepres
 		get() {
 			return when (this) {
 				HOURLY_DURATION, AVERAGE_HOURLY_DURATION, STANDARD_DEVIATION_BB,
-				STANDARD_DEVIATION, STANDARD_DEVIATION_HOURLY, HANDS_PLAYED,
+				STANDARD_DEVIATION, STANDARD_DEVIATION_HOURLY,
-				STANDARD_DEVIATION_BB_PER_100_HANDS, TOTAL_TIPS -> false
+				STANDARD_DEVIATION_BB_PER_100_HANDS -> false
 				else -> true
 			}
 		}
@@ -265,7 +257,7 @@ enum class Stat(override var uniqueIdentifier: Int) : IntIdentifiable, RowRepres
 	val legendHideRightValue: Boolean
 		get() {
 			return when (this) {
-				AVERAGE, NUMBER_OF_SETS, NUMBER_OF_GAMES, WIN_RATIO, TOURNAMENT_ITM_RATIO,
+				AVERAGE, NUMBER_OF_SETS, NUMBER_OF_GAMES, WIN_RATIO,
 				HOURLY_DURATION, AVERAGE_HOURLY_DURATION -> true
 				else -> false
 			}
@@ -277,8 +269,7 @@ enum class Stat(override var uniqueIdentifier: Int) : IntIdentifiable, RowRepres
 	val graphSignificantIndividualValue: Boolean
 		get() {
 			return when (this) {
-				AVERAGE, WIN_RATIO, TOURNAMENT_ITM_RATIO,
+				AVERAGE, WIN_RATIO, NUMBER_OF_SETS, NUMBER_OF_GAMES,
-				NUMBER_OF_SETS, NUMBER_OF_GAMES,
 				STANDARD_DEVIATION, HOURLY_DURATION -> false
 				else -> true
 			}
@@ -324,8 +315,7 @@ enum class Stat(override var uniqueIdentifier: Int) : IntIdentifiable, RowRepres
 			return when (this) {
 				NET_RESULT, NET_BB_PER_100_HANDS, HOURLY_RATE_BB,
 				AVERAGE_HOURLY_DURATION, HOURLY_DURATION,
-				NUMBER_OF_SETS, ROI, AVERAGE_BUYIN,
+				NUMBER_OF_SETS, ROI, AVERAGE_BUYIN, WIN_RATIO,
-				WIN_RATIO, TOURNAMENT_ITM_RATIO,
 				AVERAGE_NET_BB, NUMBER_OF_GAMES, AVERAGE -> true
 				else -> false
 			}

app/src/main/java/net/pokeranalytics/android/calculus/bankroll/BankrollCalculator.kt

@@ -39,28 +39,10 @@ class BankrollCalculator {
 					initialValue += bankroll.initialValue * rate
 				}
 
-				if (setup.virtualBankroll) {
-					val sum = realm.where(Transaction::class.java)
-						.equalTo("bankroll.id", bankroll.id)
-						.notEqualTo("type.kind", TransactionType.Value.TRANSFER.uniqueIdentifier)
-						.sum("amount") // we remove transfer as they don't impact the overall bankroll
-					transactionNet += rate * sum.toDouble()
-				} else {
-
 				bankroll.transactions?.let { transactions ->
 					val sum = transactions.sum("amount")
 					transactionNet += rate * sum.toDouble()
 				}
-
-					bankroll.destinationTransactions?.let { transactions ->
-						for (transaction in transactions) {
-							val transferRate = transaction.transferRate ?: 1.0
-							transactionNet += transferRate * transaction.amount * -1
-						}
-					}
-
-				}
-
 			}
 
 			report.transactionsNet = transactionNet
@@ -89,18 +71,20 @@ class BankrollCalculator {
 				this.computeRiskOfRuin(report, result)
 
 			} else {
+
 				val results = Filter.queryOn<Result>(realm, baseQuery)
 				report.netResult = results.sum("net").toDouble()
+
 			}
 
 			val depositType = TransactionType.getByValue(TransactionType.Value.DEPOSIT, realm)
 			report.transactionBuckets[depositType.id]?.let {  bucket ->
-				report.depositTotal = bucket.transactions.sumOf { it.amount }
+				report.depositTotal = bucket.transactions.sumByDouble { it.amount }
 			}
 
 			val withdrawalType = TransactionType.getByValue(TransactionType.Value.WITHDRAWAL, realm)
 			report.transactionBuckets[withdrawalType.id]?.let {  bucket ->
-				report.withdrawalTotal = bucket.transactions.sumOf { it.amount }
+				report.withdrawalTotal = bucket.transactions.sumByDouble { it.amount }
 			}
 
 			report.generateGraphPointsIfNecessary()

app/src/main/java/net/pokeranalytics/android/calculus/bankroll/BankrollReport.kt

@@ -13,6 +13,7 @@ import net.pokeranalytics.android.model.realm.Transaction
 import net.pokeranalytics.android.ui.graph.DataSetFactory
 import net.pokeranalytics.android.util.extensions.findById
 import java.util.*
+import kotlin.collections.HashMap
 
 /**
  * This class holds the results from the BankrollCalculator computations
@@ -63,7 +64,6 @@ class BankrollReport(var setup: BankrollReportSetup) {
 	 */
 	private fun computeBankrollTotal() {
 		this.total = this.initial + this.netResult + this.transactionsNet
-//		Timber.d("init = $initial, net = $netResult, trans = $transactionsNet")
 	}
 
 	/**

app/src/main/java/net/pokeranalytics/android/calculus/calcul/AggregationTypeExtensions.kt

@@ -1,12 +0,0 @@
-package net.pokeranalytics.android.calculus.calcul
-
-import net.pokeranalytics.android.calculus.AggregationType
-import net.pokeranalytics.android.ui.graph.Graph
-
-val AggregationType.axisFormatting: Graph.AxisFormatting
-	get() {
-		return when (this) {
-			AggregationType.DURATION -> Graph.AxisFormatting.X_DURATION
-			else -> Graph.AxisFormatting.DEFAULT
-		}
-	}

app/src/main/java/net/pokeranalytics/android/calculus/calcul/ReportDisplay.kt

@@ -1,64 +0,0 @@
-package net.pokeranalytics.android.calculus.calcul
-
-import net.pokeranalytics.android.R
-import net.pokeranalytics.android.calculus.Calculator
-import net.pokeranalytics.android.exceptions.PAIllegalStateException
-import net.pokeranalytics.android.ui.activity.ComparisonReportActivity
-import net.pokeranalytics.android.ui.activity.ProgressReportActivity
-import net.pokeranalytics.android.ui.activity.TableReportActivity
-import net.pokeranalytics.android.ui.view.RowRepresentable
-
-/**
- * The way the computed stats are going to be displayed
- */
-enum class ReportDisplay : RowRepresentable {
-	TABLE,
-	PROGRESS,
-	COMPARISON,
-	MAP;
-
-	override val resId: Int?
-		get() {
-			return when (this) {
-				TABLE -> R.string.table
-				PROGRESS -> R.string.progress
-				COMPARISON -> R.string.comparison
-				MAP -> R.string.map
-			}
-		}
-
-	val activityClass: Class<*>
-		get() {
-			return when (this) {
-				TABLE -> TableReportActivity::class.java
-				PROGRESS -> ProgressReportActivity::class.java
-				COMPARISON -> ComparisonReportActivity::class.java
-				else -> throw PAIllegalStateException("undefined activity for report display")
-			}
-		}
-
-	val progressValues: Calculator.Options.ProgressValues
-		get() {
-			return when (this) {
-				PROGRESS, COMPARISON -> Calculator.Options.ProgressValues.STANDARD
-				else -> Calculator.Options.ProgressValues.NONE
-			}
-		}
-
-//	val requireProgressValues: Boolean
-//		get() {
-//			return when (this) {
-//				PROGRESS, COMPARISON -> true
-//				else -> false
-//			}
-//		}
-
-	val multipleStatSelection: Boolean
-		get() {
-			return when (this) {
-				PROGRESS -> false
-				else -> true
-			}
-		}
-
-}

app/src/main/java/net/pokeranalytics/android/calculus/calcul/StatRepresentable.kt

@@ -1,81 +0,0 @@
-package net.pokeranalytics.android.calculus.calcul
-
-import android.content.Context
-import net.pokeranalytics.android.R
-import net.pokeranalytics.android.calculus.Stat
-import net.pokeranalytics.android.exceptions.PAIllegalStateException
-import net.pokeranalytics.android.ui.view.RowRepresentable
-import net.pokeranalytics.android.ui.view.RowViewType
-import net.pokeranalytics.android.util.NULL_TEXT
-
-class StatRepresentable(var stat: Stat) : RowRepresentable {
-
-    companion object {
-        fun resId(stat: Stat): Int {
-            return when (stat) {
-                Stat.NET_RESULT -> R.string.net_result
-                Stat.BB_NET_RESULT -> R.string.total_net_result_bb_
-                Stat.HOURLY_RATE -> R.string.average_hour_rate
-                Stat.AVERAGE -> R.string.average
-                Stat.NUMBER_OF_SETS -> R.string.number_of_sessions
-                Stat.NUMBER_OF_GAMES -> R.string.number_of_records
-                Stat.HOURLY_DURATION -> R.string.duration
-                Stat.AVERAGE_HOURLY_DURATION -> R.string.average_hours_played
-                Stat.NET_BB_PER_100_HANDS -> R.string.net_result_bb_per_100_hands
-                Stat.HOURLY_RATE_BB -> R.string.average_hour_rate_bb_
-                Stat.AVERAGE_NET_BB -> R.string.average_net_result_bb_
-                Stat.WIN_RATIO -> R.string.win_ratio
-                Stat.AVERAGE_BUYIN -> R.string.average_buyin
-                Stat.ROI -> R.string.tournament_roi
-                Stat.STANDARD_DEVIATION -> R.string.standard_deviation
-                Stat.STANDARD_DEVIATION_HOURLY -> R.string.standard_deviation_per_hour
-                Stat.STANDARD_DEVIATION_BB_PER_100_HANDS -> R.string.standard_deviation_bb_per_100_hands
-                Stat.STANDARD_DEVIATION_BB -> R.string.bb_standard_deviation
-                Stat.HANDS_PLAYED -> R.string.number_of_hands
-                Stat.LOCATIONS_PLAYED -> R.string.locations_played
-                Stat.LONGEST_STREAKS -> R.string.longest_streaks
-                Stat.MAXIMUM_NET_RESULT -> R.string.max_net_result
-                Stat.MINIMUM_NET_RESULT -> R.string.min_net_result
-                Stat.MAXIMUM_DURATION -> R.string.longest_session
-                Stat.DAYS_PLAYED -> R.string.days_played
-                Stat.TOTAL_BUYIN -> R.string.total_buyin
-                else -> throw PAIllegalStateException("Stat ${stat.name} name required but undefined")
-            }
-        }
-        fun localizedTitle(stat: Stat, context: Context): String {
-            return context.getString(resId(stat))
-        }
-    }
-
-    override val resId: Int
-        get() {
-            return resId(this.stat)
-        }
-
-    /**
-     * Returns a label used to display the legend right value, typically a total or an average
-     */
-    fun cumulativeLabelResId(context: Context): String {
-        val resId = when (this.stat) {
-            Stat.AVERAGE, Stat.AVERAGE_HOURLY_DURATION, Stat.NET_BB_PER_100_HANDS,
-            Stat.HOURLY_RATE_BB, Stat.AVERAGE_NET_BB, Stat.ROI, Stat.HOURLY_RATE -> R.string.average
-            Stat.NUMBER_OF_SETS -> R.string.number_of_sessions
-            Stat.NUMBER_OF_GAMES -> R.string.number_of_records
-            Stat.NET_RESULT -> R.string.total
-            Stat.STANDARD_DEVIATION -> R.string.net_result
-            Stat.STANDARD_DEVIATION_BB -> R.string.average_net_result_bb_
-            Stat.STANDARD_DEVIATION_HOURLY -> R.string.hour_rate_without_pauses
-            Stat.STANDARD_DEVIATION_BB_PER_100_HANDS -> R.string.net_result_bb_per_100_hands
-            Stat.WIN_RATIO, Stat.HOURLY_DURATION -> return this.localizedTitle(context)
-            else -> null
-        }
-        resId?.let {
-            return context.getString(it)
-        } ?: run {
-            return NULL_TEXT
-        }
-    }
-
-    override val viewType: Int = RowViewType.TITLE_VALUE.ordinal
-
-}

app/src/main/java/net/pokeranalytics/android/calculus/optimalduration/CashGameOptimalDurationCalculator.kt

@@ -24,12 +24,9 @@ class CashGameOptimalDurationCalculator {
 	companion object {
 
 		private const val bucket = 60 * 60 * 1000L // the duration of bucket
-        private const val bucketInterval =
+		private const val bucketInterval = 4 // number of duration tests inside the bucket to find the best duration
-            4 // number of duration tests inside the bucket to find the best duration
+		private const val minimumValidityCount = 10 // the number of sessions inside a bucket to start having a reasonable average
-        private const val minimumValidityCount =
+		private const val intervalValidity = 3 // the minimum number of unit between the shortest & longest valid buckets
-            10 // the number of sessions inside a bucket to start having a reasonable average
-        private const val intervalValidity =
-            3 // the minimum number of unit between the shortest & longest valid buckets
 		private const val polynomialDegree = 7 // the degree of the computed polynomial
 
 		/***
@@ -42,20 +39,14 @@ class CashGameOptimalDurationCalculator {
 			val realm = Realm.getDefaultInstance()
 
 			val query = Query().add(QueryCondition.IsCash) // cash game
-            query.add(
+			query.add(if (isLive) { QueryCondition.IsLive } else { QueryCondition.IsOnline }) // live / online
-                if (isLive) {
-                    QueryCondition.IsLive
-                } else {
-                    QueryCondition.IsOnline
-                }
-            ) // live / online
 			query.add(QueryCondition.EndDateNotNull) // ended
-            query.add(QueryCondition.BiggestBetNotNull) // has BB value
+			query.add(QueryCondition.BigBlindNotNull) // has BB value
 
 			val sessions = query.queryWith(realm.where(Session::class.java)).findAll()
 			val sessionsByDuration = sessions.groupBy {
 				val dur = round((it.netDuration / bucket).toDouble()) * bucket
-//				Timber.d("Stop notif > key: $dur")
+				Timber.d("Stop notif > key: $dur")
 				dur
 			}
 
@@ -65,7 +56,7 @@ class CashGameOptimalDurationCalculator {
 			var validBuckets = 0
 
 			val hkeys = sessionsByDuration.keys.map { it / 3600 / 1000.0 }.sorted()
-//            Timber.d("Stop notif > keys: $hkeys ")
+			Timber.d("Stop notif > keys: $hkeys ")
 			for (key in sessionsByDuration.keys.sorted()) {
 				val sessionCount = sessionsByDuration[key]?.size ?: 0
 				if (start == null && sessionCount >= minimumValidityCount) {
@@ -76,23 +67,22 @@ class CashGameOptimalDurationCalculator {
 					validBuckets++
 				}
 			}
-//            Timber.d("Stop notif > validBuckets: $validBuckets ")
+			Timber.d("Stop notif > validBuckets: $validBuckets ")
 			if (!(start != null && end != null && (end - start) >= intervalValidity)) {
-//                Timber.d("Stop notif > invalid setup: $start / $end ")
+				Timber.d("Stop notif > invalid setup: $start / $end ")
 				return null
 			}
 
 			// define if we have enough sessions
 			if (sessions.size < 50) {
-//                Timber.d("Stop notif > not enough sessions: ${sessions.size} ")
+				Timber.d("Stop notif > not enough sessions: ${sessions.size} ")
 				return null
 			}
 
 			val options = Calculator.Options()
 			options.query = query
 			val report = Calculator.computeStats(realm, options)
-            val stdBB =
+			val stdBB = report.results.firstOrNull()?.computedStat(Stat.STANDARD_DEVIATION_BB)?.value
-                report.results.firstOrNull()?.computedStat(Stat.STANDARD_DEVIATION_BB)?.value
 
 			val p = polynomialRegression(sessions, stdBB)
 
@@ -123,7 +113,7 @@ class CashGameOptimalDurationCalculator {
 					if (duration > 0 && hourly > bestHourlyRate) {
 						bestHourlyRate = hourly
 					}
-                    if (duration > maxDuration) {
+					if (duration > maxDuration){
 						maxDuration = duration
 					}
 				}
@@ -134,7 +124,7 @@ class CashGameOptimalDurationCalculator {
 				return bestDuration
 			}
 
-//            Timber.d("Stop notif > not found, best duration: $bestDuration")
+			Timber.d("Stop notif > not found, best duration: $bestDuration")
 			realm.close()
 			return null
 		}
@@ -147,10 +137,7 @@ class CashGameOptimalDurationCalculator {
 			return y
 		}
 
-        private fun polynomialRegression(
+		private fun polynomialRegression(sessions: List<Session>, bbStandardDeviation: Double?): DoubleArray {
-            sessions: List<Session>,
-            bbStandardDeviation: Double?
-        ): DoubleArray {
 
 			val stdBB = bbStandardDeviation ?: Double.MAX_VALUE
 

app/src/main/java/net/pokeranalytics/android/exceptions/Exceptions.kt

@@ -1,7 +1,5 @@
 package net.pokeranalytics.android.exceptions
 
-import net.pokeranalytics.android.model.Criteria
-
 class ModelException(message: String) : Exception(message)
 class FormattingException(message: String) : Exception(message)
 class RowRepresentableEditDescriptorException(message: String) : Exception(message)
@@ -17,11 +15,8 @@ sealed class PokerAnalyticsException(message: String) : Exception(message) {
 //    object FilterElementUnknownSectionName: PokerAnalyticsException(message = "No filterElement section name was found to identify the queryCondition")
 //    object FilterMissingEntity: PokerAnalyticsException(message = "This queryWith has no entity initialized")
 //    object FilterUnhandledEntity : PokerAnalyticsException(message = "This entity is not filterable")
-class QueryValueMapUnknown(message: String = "fieldName is missing"): PokerAnalyticsException(message)
+    object QueryValueMapUnknown: PokerAnalyticsException(message = "fieldName is missing")
-    class QueryTypeUnhandled(clazz: String) :
+    object QueryTypeUnhandled: PokerAnalyticsException(message = "queryWith type not handled")
-        PokerAnalyticsException(message = "queryWith type not handled: $clazz")
-    class ComparisonCriteriaUnhandled(criteria: Criteria) :
-        PokerAnalyticsException(message = "Criteria type not handled: ${criteria.uniqueIdentifier}")
     object QueryValueMapUnexpectedValue: PokerAnalyticsException(message = "valueMap null not expected")
     object FilterElementExpectedValueMissing : PokerAnalyticsException(message = "queryWith is empty or null")
 //    data class FilterElementTypeMissing(val filterElementRow: FilterElementRow) : PokerAnalyticsException(message = "queryWith element '$filterElementRow' type is missing")

app/src/main/java/net/pokeranalytics/android/model/Criteria.kt

@@ -7,10 +7,10 @@ import net.pokeranalytics.android.R
 import net.pokeranalytics.android.exceptions.PAIllegalStateException
 import net.pokeranalytics.android.exceptions.PokerAnalyticsException
 import net.pokeranalytics.android.model.Criteria.Bankrolls.comparison
+import net.pokeranalytics.android.model.Criteria.Blinds.comparison
 import net.pokeranalytics.android.model.Criteria.Games.comparison
 import net.pokeranalytics.android.model.Criteria.Limits.comparison
 import net.pokeranalytics.android.model.Criteria.Locations.comparison
-import net.pokeranalytics.android.model.Criteria.Stakes.comparison
 import net.pokeranalytics.android.model.Criteria.TableSizes.comparison
 import net.pokeranalytics.android.model.Criteria.TournamentFeatures.comparison
 import net.pokeranalytics.android.model.Criteria.TournamentFees.comparison
@@ -68,7 +68,7 @@ sealed class Criteria(override var uniqueIdentifier: Int) : IntIdentifiable, Row
 	            realm.findById(CustomField::class.java, this.customFieldId)?.entries?.forEach {
 		            objects.add(QueryCondition.CustomFieldListQuery(it))
 	            }
-                objects.sort()
+                objects.sorted()
                 realm.close()
                 return objects.map { Query(it) }
             }
@@ -104,10 +104,11 @@ sealed class Criteria(override var uniqueIdentifier: Int) : IntIdentifiable, Row
                     }
                     objects.add(condition)
                 }
-                objects.sort()
+                objects.sorted()
                 return objects.map { Query(it) }
             }
 
+
 			QueryCondition.distinct<Session, T, S>()?.let {
 				val values = it.mapNotNull { session ->
 					when (this) {
@@ -123,8 +124,8 @@ sealed class Criteria(override var uniqueIdentifier: Int) : IntIdentifiable, Row
 						is TournamentFees -> if (session.tournamentEntryFee is S) {
 							session.tournamentEntryFee as S
 						} else throw PokerAnalyticsException.QueryValueMapUnexpectedValue
-						is Stakes -> if (session.cgStakes is S) {
+						is Blinds -> if (session.blinds is S) {
-							session.cgStakes as S
+							session.blinds as S
 						} else throw PokerAnalyticsException.QueryValueMapUnexpectedValue
 						else -> null
 					}
@@ -158,13 +159,12 @@ sealed class Criteria(override var uniqueIdentifier: Int) : IntIdentifiable, Row
 	object DayPeriods : SimpleCriteria(listOf(QueryCondition.IsWeekDay, QueryCondition.IsWeekEnd), 14)
 	object Years : ListCriteria(15)
 	object AllMonthsUpToNow : ListCriteria(16)
-	object Stakes : ListCriteria(17)
+	object Blinds : ListCriteria(17)
 	object TournamentFees : ListCriteria(18)
 	object Cash : SimpleCriteria(listOf(QueryCondition.IsCash), 19)
 	object Tournament : SimpleCriteria(listOf(QueryCondition.IsTournament), 20)
 	data class ListCustomFields(override var customFieldId: String) : RealmCriteria(21), CustomFieldCriteria
 	data class ValueCustomFields(override var customFieldId: String) : ListCriteria(22), CustomFieldCriteria
-	object Duration : ListCriteria(23)
 
 	val queries: List<Query>
 		get() {
@@ -237,34 +237,19 @@ sealed class Criteria(override var uniqueIdentifier: Int) : IntIdentifiable, Row
 					realm.close()
 					years
 				}
-				is Stakes -> comparison<QueryCondition.AnyStake, String>()
+				is Blinds -> comparison<QueryCondition.AnyBlind, String>()
                 is ListCustomFields -> comparison<CustomFieldEntry>()
                 is ValueCustomFields -> {
 	                val realm = Realm.getDefaultInstance()
 	                val queries = when (this.customFieldType(realm)) {
                         CustomField.Type.AMOUNT.uniqueIdentifier -> comparison<QueryCondition.CustomFieldAmountQuery, Double >()
                         CustomField.Type.NUMBER.uniqueIdentifier -> comparison<QueryCondition.CustomFieldNumberQuery, Double >()
-                        else -> throw PokerAnalyticsException.ComparisonCriteriaUnhandled(this)
+                        else -> throw PokerAnalyticsException.QueryTypeUnhandled
                     }
 	                realm.close()
 	                queries
                 }
-				is Duration -> {
+				else -> throw PokerAnalyticsException.QueryTypeUnhandled
-					val hourlyQueries = (0..12).map { i ->
-						val more = QueryCondition.Duration(i * 60)
-						more.operator = QueryCondition.Operator.MORE_OR_EQUAL
-						val less = QueryCondition.Duration((i + 1) * 60)
-						less.operator = QueryCondition.Operator.LESS
-						Query(more, less)
-					}.toMutableList()
-
-					val moreThan12Hours = QueryCondition.Duration(12 * 60)
-					moreThan12Hours.operator = QueryCondition.Operator.MORE_OR_EQUAL
-					hourlyQueries.add(Query(moreThan12Hours))
-
-					hourlyQueries
-				}
-				else -> throw PokerAnalyticsException.ComparisonCriteriaUnhandled(this)
 			}
 		}
 
@@ -286,7 +271,7 @@ sealed class Criteria(override var uniqueIdentifier: Int) : IntIdentifiable, Row
 				DayPeriods -> R.string.weekdays_or_weekend
 				Years -> R.string.year
 				AllMonthsUpToNow -> R.string.month
-				Stakes -> R.string.blind
+				Blinds -> R.string.blind
 				TournamentFees -> R.string.entry_fees
 //                is ListCustomFields -> this.customField.resId
 //                is ValueCustomFields -> this.customField.resId
@@ -299,13 +284,13 @@ sealed class Criteria(override var uniqueIdentifier: Int) : IntIdentifiable, Row
 		inline fun <reified S : QueryCondition.QueryDataCondition<NameManageable>, reified T : NameManageable> compare(): List<Query> {
 			val objects = mutableListOf<S>()
 			val realm = Realm.getDefaultInstance()
-			realm.where<T>().sort("name").findAll().forEach {
+			realm.where<T>().findAll().forEach {
 				val condition = (QueryCondition.getInstance<T>() as S).apply {
 					setObject(it)
 				}
 				objects.add(condition)
 			}
-//			objects.sort()
+			objects.sorted()
 			realm.close()
 			return objects.map { Query(it) }
 		}
@@ -318,7 +303,7 @@ sealed class Criteria(override var uniqueIdentifier: Int) : IntIdentifiable, Row
 				}
 				objects.add(condition)
 			}
-			objects.sort()
+			objects.sorted()
 			return objects.map { Query(it) }
 		}
 
@@ -334,8 +319,7 @@ sealed class Criteria(override var uniqueIdentifier: Int) : IntIdentifiable, Row
 					TournamentFeatures, Limits, TableSizes, TournamentTypes,
 					MonthsOfYear, DaysOfWeek, SessionTypes,
 					BankrollTypes, DayPeriods, Years,
-					AllMonthsUpToNow,
+					AllMonthsUpToNow, Blinds, TournamentFees
-					Stakes, TournamentFees
 				)
 			}
 	}

app/src/main/java/net/pokeranalytics/android/model/LiveOnline.kt

@@ -1,38 +0,0 @@
-package net.pokeranalytics.android.model
-
-import net.pokeranalytics.android.R
-import net.pokeranalytics.android.model.realm.PerformanceKey
-import net.pokeranalytics.android.util.enumerations.IntIdentifiable
-import net.pokeranalytics.android.util.enumerations.IntSearchable
-
-enum class LiveOnline(override var uniqueIdentifier: Int) : PerformanceKey, IntIdentifiable {
-    LIVE(0),
-    ONLINE(1);
-
-    companion object : IntSearchable<LiveOnline> {
-
-        override fun valuesInternal(): Array<LiveOnline> {
-            return values()
-        }
-
-    }
-
-    override val resId: Int?
-        get() {
-            return when (this) {
-                LIVE -> R.string.live
-                ONLINE -> R.string.online
-            }
-        }
-
-    override val value: Int
-        get() {
-            return this.uniqueIdentifier
-        }
-
-    val isLive: Boolean
-        get() {
-            return (this == LIVE)
-        }
-
-}

app/src/main/java/net/pokeranalytics/android/model/Stakes.kt

@@ -1,13 +0,0 @@
-package net.pokeranalytics.android.model
-
-data class Stakes(var blinds: String?, var ante: Double?) {
-
-    companion object {
-
-    }
-
-
-
-
-
-}

app/src/main/java/net/pokeranalytics/android/model/blogpost/BlogPost.kt

@@ -1,13 +0,0 @@
-package net.pokeranalytics.android.model.blogpost
-
-import com.google.gson.annotations.SerializedName
-
-class BlogPost {
-
-	@SerializedName("id")
-	var id: Int = 0
-
-	@SerializedName("level")
-	var content: String = ""
-
-}

app/src/main/java/net/pokeranalytics/android/model/extensions/SessionExtensions.kt

@@ -2,10 +2,10 @@ package net.pokeranalytics.android.model.extensions
 
 import android.content.Context
 import androidx.work.Data
-import androidx.work.ExistingWorkPolicy
 import androidx.work.OneTimeWorkRequestBuilder
 import androidx.work.WorkManager
 import net.pokeranalytics.android.R
+import net.pokeranalytics.android.exceptions.PAIllegalStateException
 import net.pokeranalytics.android.model.TournamentType
 import net.pokeranalytics.android.model.realm.Session
 import net.pokeranalytics.android.util.NotificationSchedule
@@ -36,17 +36,17 @@ enum class SessionState {
 fun Session.getState(): SessionState {
 
 	val start = this.startDate
-	return if (start == null) {
+	if (start == null) {
-		SessionState.PENDING
+		return SessionState.PENDING
 	} else {
 		if (start > Date()) {
-			SessionState.PLANNED
+			return SessionState.PLANNED
 		} else if (this.endDate != null) {
-			SessionState.FINISHED
+			return SessionState.FINISHED
 		} else if (this.pauseDate != null) {
-			SessionState.PAUSED
+			return SessionState.PAUSED
 		} else {
-			SessionState.STARTED
+			return SessionState.STARTED
 		}
 	}
 }
@@ -76,8 +76,8 @@ fun Session.getFormattedGameType(context: Context): String {
 			parameters.add(context.getString(R.string.tournament).capitalize())
 		}
 	} else {
-		if (this.cgAnte != null || this.cgBlinds != null) {
+		if (cgSmallBlind != null && cgBigBlind != null) {
-			parameters.add(getFormattedStakes())
+			parameters.add(getFormattedBlinds())
 		}
 		game?.let {
 			parameters.add(getFormattedGame())
@@ -103,9 +103,7 @@ fun Session.cancelStopNotification(context: Context) {
 fun Session.scheduleStopNotification(context: Context, optimalDuration: Long) {
 
 	val timeDelay = optimalDuration - this.currentDuration()
-	if (timeDelay <= 0) {
+	if (timeDelay <= 0) throw PAIllegalStateException("A stop notif has been setup for the past: start=${this.startDate}, end=${this.endDate}, optimalDuration=$optimalDuration")
-		return
-	}
 
 	val title = context.getString(R.string.stop_notification_title)
 	val body = context.getString(R.string.stop_notification_body)
@@ -120,10 +118,11 @@ fun Session.scheduleStopNotification(context: Context, optimalDuration: Long) {
 		.addTag(this.id)
 		.build()
 
-	WorkManager.getInstance(context).enqueueUniqueWork(this.id, ExistingWorkPolicy.REPLACE, work)
+	WorkManager.getInstance(context).enqueue(work)
 
 }
 
+
 val AbstractList<Session>.hourlyDuration: Double
 	get() {
 		val intervals = mutableListOf<TimeInterval>()
@@ -131,7 +130,7 @@ val AbstractList<Session>.hourlyDuration: Double
 			val interval = TimeInterval(it.startDate!!, it.endDate!!, it.breakDuration)
 			intervals.update(interval)
 		}
-		return intervals.sumOf { it.hourlyDuration }
+		return intervals.sumByDouble { it.hourlyDuration }
 	}
 
 class TimeInterval(var start: Date, var end: Date, var breakDuration: Long) {

app/src/main/java/net/pokeranalytics/android/model/filter/Filterable.kt

@@ -4,7 +4,7 @@ import io.realm.RealmModel
 import io.realm.RealmResults
 import net.pokeranalytics.android.exceptions.PAIllegalStateException
 import net.pokeranalytics.android.model.realm.*
-import net.pokeranalytics.android.util.CrashLogging
+import net.pokeranalytics.android.model.utils.CrashLogging
 
 /**
  * We want to be able to store filters in the database:

app/src/main/java/net/pokeranalytics/android/model/filter/Query.kt

@@ -11,13 +11,9 @@ fun List<Query>.mapFirstCondition() : List<QueryCondition> {
 
 class Query {
 
-	constructor(query: Query) {
+	constructor(vararg elements: QueryCondition) {
-		this._conditions.addAll(query.conditions)
-	}
-
-	constructor(vararg elements: QueryCondition?) {
 		if (elements.isNotEmpty()) {
-			this.add(elements.filterNotNull())
+			this.add(elements.asList())
 		}
 	}
 
@@ -39,7 +35,7 @@ class Query {
 		return this
 	}
 
-	fun add(queryConditions: List<QueryCondition>): Query {
+	fun add(queryConditions: List<QueryCondition>): Query{
 		this._conditions.addAll(queryConditions)
 		return this
 	}
@@ -56,10 +52,10 @@ class Query {
             }
         }
 
-	fun getName(context: Context, separator: String = " + "): String {
+	fun getName(context: Context): String {
 		return when (this._conditions.size) {
 			0 -> context.getString(R.string.all_sessions) // @todo should be dependant of the underlying type, ie. Session, Transaction...
-			else -> this._conditions.joinToString(separator) { it.getDisplayNameWithValues(context) }
+			else -> this._conditions.joinToString(" + ") { it.getDisplayName(context) }
 		}
 	}
 
@@ -104,25 +100,4 @@ class Query {
 		return this
 	}
 
-	fun copy(): Query {
-		return Query(this)
-	}
-
-
-	/*
-	Returns the first object Id of any QueryCondition
-	 */
-	val objectId: String?
-		get() {
-			for (c in this._conditions) {
-				when (c) {
-					is QueryCondition.QueryDataCondition<*> -> {
-						c.objectId?.let { return it }
-					}
-					else -> {}
-				}
-			}
-			return null
-		}
-
 }

app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt

@@ -12,10 +12,8 @@ import net.pokeranalytics.android.exceptions.PokerAnalyticsException
 import net.pokeranalytics.android.model.Limit
 import net.pokeranalytics.android.model.TableSize
 import net.pokeranalytics.android.model.TournamentType
-import net.pokeranalytics.android.model.interfaces.CodedStake
 import net.pokeranalytics.android.model.interfaces.Identifiable
 import net.pokeranalytics.android.model.interfaces.NameManageable
-import net.pokeranalytics.android.model.interfaces.StakesHolder
 import net.pokeranalytics.android.model.realm.*
 import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetType
 import net.pokeranalytics.android.ui.view.RowRepresentable
@@ -23,7 +21,6 @@ import net.pokeranalytics.android.ui.view.RowViewType
 import net.pokeranalytics.android.util.NULL_TEXT
 import net.pokeranalytics.android.util.UserDefaults
 import net.pokeranalytics.android.util.extensions.*
-import timber.log.Timber
 import java.text.DateFormatSymbols
 import java.text.NumberFormat
 import java.util.*
@@ -56,24 +53,16 @@ sealed class QueryCondition : RowRepresentable {
 			}
 		}
 
-//		inline fun <reified T : QueryCondition> more(): T {
+		inline fun <reified T : QueryCondition> more(): T {
-//			return newInstance(T::class).apply { this.operator = Operator.MORE }
+			return newInstance(T::class).apply { this.operator = Operator.MORE }
-//		}
-//
-//		inline fun <reified T : QueryCondition> less(): T {
-//			return newInstance(T::class).apply { this.operator = Operator.LESS }
-//		}
-
-		inline fun <reified T : QueryCondition> moreOrEqual(): T {
-			return newInstance(T::class).apply { this.operator = Operator.MORE_OR_EQUAL }
 		}
 
-		inline fun <reified T : QueryCondition> lessOrEqual(): T {
+		inline fun <reified T : QueryCondition> less(): T {
-			return newInstance(T::class).apply { this.operator = Operator.LESS_OR_EQUAL }
+			return newInstance(T::class).apply { this.operator = Operator.LESS }
 		}
 
-		inline fun <reified T : QueryCondition> moreEqualOrLessEqual(): ArrayList<T> {
+		inline fun <reified T : QueryCondition> moreOrLess(): ArrayList<T> {
-			return arrayListOf(moreOrEqual(), lessOrEqual())
+			return arrayListOf(more(), less())
 		}
 
 		fun <T : QueryCondition> valueOf(name: String): T {
@@ -89,14 +78,13 @@ sealed class QueryCondition : RowRepresentable {
 				TransactionType::class.java -> AnyTransactionType()
 				TournamentName::class.java -> AnyTournamentName()
 				TournamentFeature::class.java -> AllTournamentFeature()
-				else -> throw PokerAnalyticsException.QueryTypeUnhandled((T::class.java).name)
+				else -> throw PokerAnalyticsException.QueryTypeUnhandled
 			}
 		}
 
 		inline fun <reified T : Filterable, reified S : QueryCondition, reified U : Comparable<U>> distinct(): RealmResults<T>? {
 			FilterHelper.fieldNameForQueryType<T>(S::class.java)?.let {
 				val realm = Realm.getDefaultInstance()
-				realm.refresh()
 
 				val distincts = when (T::class) {
 					String::class, Int::class -> realm.where<T>().distinct(it).findAll().sort(it, Sort.ASCENDING)
@@ -114,9 +102,7 @@ sealed class QueryCondition : RowRepresentable {
 		ANY,
 		ALL,
 		MORE,
-		MORE_OR_EQUAL,
 		LESS,
-		LESS_OR_EQUAL,
 		EQUALS,
 		TRUE,
 		NOTNULL
@@ -128,7 +114,7 @@ sealed class QueryCondition : RowRepresentable {
 	val groupId: String
 		get() {
 			return when (this.operator) {
-				Operator.MORE, Operator.LESS, Operator.MORE_OR_EQUAL, Operator.LESS_OR_EQUAL -> return "${this.operator.name.toLowerCase().capitalize()}$baseId"
+				Operator.MORE, Operator.LESS -> return "${this.operator.name.toLowerCase().capitalize()}$baseId"
 				else -> this.baseId
 			}
 		}
@@ -136,7 +122,7 @@ sealed class QueryCondition : RowRepresentable {
 	val id: List<String>
 		get() {
 			when (this.operator) {
-				Operator.MORE, Operator.LESS, Operator.MORE_OR_EQUAL, Operator.LESS_OR_EQUAL -> return listOf("$baseId+${this.operator.name}")
+				Operator.MORE, Operator.LESS -> return listOf("$baseId+${this.operator.name}")
 				else -> {}
 			}
 
@@ -154,17 +140,6 @@ sealed class QueryCondition : RowRepresentable {
 
 	abstract var operator: Operator
 
-	override fun getDisplayName(context: Context): String {
-		this.resId?.let {
-			return context.getString(it)
-		}
-		return baseId
-	}
-
-	open fun getDisplayNameWithValues(context: Context): String {
-		return getDisplayName(context)
-	}
-
 	abstract class ListOfValues<T> : QueryCondition(), Comparable<ListOfValues<T>> where T : Comparable<T> {
 
 		abstract var listOfValues: MutableList<T>
@@ -174,14 +149,6 @@ sealed class QueryCondition : RowRepresentable {
 			return getDisplayName(context)
 		}
 
-		override fun getDisplayNameWithValues(context: Context): String {
-			return this.getDisplayName(context, this.listOfValues)
-		}
-
-		override fun getDisplayName(context: Context): String {
-			return getDisplayName(context, this.listOfValues)
-		}
-
 		private fun getDisplayName(context: Context, values: List<T>): String {
 			val prefix = this.resId?.let {
 				context.getString(it) + " "
@@ -194,6 +161,10 @@ sealed class QueryCondition : RowRepresentable {
 			}
 		}
 
+		override fun getDisplayName(context: Context): String {
+			return getDisplayName(context, this.listOfValues)
+		}
+
 		override fun compareTo(other: ListOfValues<T>): Int {
 			return listOfValues.sorted().first().compareTo(other.listOfValues.sorted().first())
 		}
@@ -205,37 +176,28 @@ sealed class QueryCondition : RowRepresentable {
 	}
 
 	abstract class SingleValue<T>(value: T) : QueryCondition() where T : Comparable<T> {
-
+//		override var listOfValues = mutableListOf<T>()
 		var singleValue: T = value
 
 		abstract fun labelForValue(value: T, context: Context): String
 
 		override fun getDisplayName(context: Context): String {
-			return this.resId?.let {
+			return getDisplayName(context, singleValue)
-				context.getString(it)
-			} ?: ""
-//			return getDisplayName(context, this.singleValue)
-		}
-
-		override fun getDisplayNameWithValues(context: Context): String {
-			return this.getDisplayName(context, this.singleValue)
 		}
 
-		open fun getDisplayName(context: Context, value: T): String {
+		fun getDisplayName(context: Context, value: T): String {
 			val prefix = this.resId?.let {
-				context.getString(it)
+				context.getString(it) + " "
 			} ?: ""
-			return prefix + " " + labelForValue(value, context)
+			return prefix + labelForValue(value, context)
 		}
 
 	}
 
 	abstract class ListOfDouble : ListOfValues<Double>() {
-
 		open var sign: Int = 1
 		override var operator: Operator = Operator.ANY
 		override var listOfValues = mutableListOf<Double>()
-
 		override fun updateValueBy(filterCondition: FilterCondition) {
 			super.updateValueBy(filterCondition)
 			listOfValues = filterCondition.getValues()
@@ -262,7 +224,6 @@ sealed class QueryCondition : RowRepresentable {
 	abstract class ListOfString : ListOfValues<String>() {
 		override var operator: Operator = Operator.ANY
 		override var listOfValues = mutableListOf<String>()
-
 		override fun labelForValue(value: String, context: Context): String {
 			return value
 		}
@@ -288,7 +249,6 @@ sealed class QueryCondition : RowRepresentable {
 	}
 
 	abstract class SingleInt(value: Int) : SingleValue<Int>(value) {
-
 		override fun labelForValue(value: Int, context: Context): String {
 			return value.toString()
 		}
@@ -300,6 +260,13 @@ sealed class QueryCondition : RowRepresentable {
 
 	}
 
+	override fun getDisplayName(context: Context): String {
+		this.resId?.let {
+			return context.getString(it)
+		}
+		return baseId
+	}
+
 //	override var filterSectionRow: FilterSectionRow = FilterSectionRow.CashOrTournament
 
 	abstract class QueryDataCondition<T : NameManageable> : ListOfString() {
@@ -324,10 +291,6 @@ sealed class QueryCondition : RowRepresentable {
 			return completeLabel
 		}
 
-		override fun getDisplayNameWithValues(context: Context): String {
-			return this.getDisplayName(context)
-		}
-
         open fun entityName(realm: Realm, context: Context): String {
             return entityName(context)
         }
@@ -336,12 +299,6 @@ sealed class QueryCondition : RowRepresentable {
 			val query = realm.where(entity)
 			return query.equalTo("id", value).findFirst()?.name ?: NULL_TEXT
 		}
-
-		val objectId: String?
-			get() {
-				return this.listOfValues.firstOrNull()
-			}
-
 	}
 
 	interface DateTime {
@@ -478,20 +435,10 @@ sealed class QueryCondition : RowRepresentable {
         }
 	}
 
-	class AnyStake : ListOfString() {
+	class AnyBlind : ListOfString() {
-
-		override fun labelForValue(value: String, context: Context): String {
-			return StakesHolder.readableStakes(value)
-		}
-
         override fun entityName(context: Context): String {
-            return context.getString(R.string.stakes)
+            return context.getString(R.string.blinds)
-        }
-
-		override fun compareTo(other: ListOfValues<String>): Int {
-			return CodedStake(this.listOfValues.first()).compareTo(CodedStake(other.listOfValues.first()))
         }
-
     }
 
 	class NumberOfTable : ListOfInt() {
@@ -545,7 +492,7 @@ sealed class QueryCondition : RowRepresentable {
 
 	class TournamentNumberOfPlayer : ListOfInt() {
 		override fun labelForValue(value: Int, context: Context): String {
-			return value.toString() + " " + context.getString(R.string.players).toLowerCase()
+			return value.toString() + " " + context.getString(R.string.number_of_players)
 		}
 
 		override fun entityName(context: Context): String {
@@ -554,19 +501,19 @@ sealed class QueryCondition : RowRepresentable {
 	}
 
 	class StartedFromDate(date: Date) : DateQuery(date) {
-		override var operator = Operator.MORE_OR_EQUAL
+		override var operator = Operator.MORE
 	}
 
 	class StartedToDate(date: Date) : DateQuery(date) {
-		override var operator = Operator.LESS_OR_EQUAL
+		override var operator = Operator.LESS
 	}
 
 	class EndedFromDate(date: Date) : DateQuery(date) {
-		override var operator = Operator.MORE_OR_EQUAL
+		override var operator = Operator.MORE
 	}
 
 	class EndedToDate(date: Date) : DateQuery(date) {
-		override var operator = Operator.LESS_OR_EQUAL
+		override var operator = Operator.LESS
 	}
 
 	class AnyDayOfWeek : ListOfInt() {
@@ -614,9 +561,15 @@ sealed class QueryCondition : RowRepresentable {
 		override var operator = Operator.EQUALS
 		override val viewType: Int = RowViewType.TITLE_VALUE_CHECK.ordinal
 
-		override fun getDisplayNameWithValues(context: Context): String {
+		override fun labelForValue(value: Int, context: Context): String {
-			return context.getString(R.string.period_in_days_with_value, this.singleValue.toString())
+			return value.toString()
 		}
+
+//		override fun entityName(context: Context): String {
+//			return this.resId?.let {
+//				" " + context.getString(it)
+//			} ?: ""
+//		}
 	}
 
 	class Duration(value: Int) : SingleInt(value) {
@@ -645,14 +598,14 @@ sealed class QueryCondition : RowRepresentable {
 
 	object DateNotNull : NotNullQueryCondition()
 	object EndDateNotNull : NotNullQueryCondition()
-	object BiggestBetNotNull : NotNullQueryCondition()
+	object BigBlindNotNull : NotNullQueryCondition()
 
 	class StartedFromTime(date: Date) : TimeQuery(date) {
-		override var operator = Operator.MORE_OR_EQUAL
+		override var operator = Operator.MORE
 	}
 
 	class EndedToTime(date: Date) : TimeQuery(date) {
-		override var operator = Operator.LESS_OR_EQUAL
+		override var operator = Operator.LESS
 	}
 
 	interface CustomFieldRelated {
@@ -748,16 +701,9 @@ sealed class QueryCondition : RowRepresentable {
 	): RealmQuery<T> {
 
 		val fieldName = FilterHelper.fieldNameForQueryType<T>(this::class.java)
-//		if (BuildConfig.DEBUG) {
+		if (BuildConfig.DEBUG) {
-//			val className = T::class.java
+			fieldName ?: throw PokerAnalyticsException.QueryValueMapUnknown
-//			fieldName ?: throw PokerAnalyticsException.QueryValueMapUnknown("fieldName missing for $this, class = $className")
-//		}
-
-		if (fieldName == null) {
-			val className = T::class.java
-			Timber.w("Possible missing filter configuration for $this in class $className")
 		}
-
 		fieldName ?: return realmQuery
 
 		when (this) {
@@ -848,7 +794,6 @@ sealed class QueryCondition : RowRepresentable {
 				}
 				return realmQuery
 			}
-			else -> {}
 		}
 
 		if (this is CustomFieldRelated) {
@@ -877,22 +822,12 @@ sealed class QueryCondition : RowRepresentable {
 					else -> realmQuery
 				}
 			}
-			Operator.MORE_OR_EQUAL -> {
+			Operator.MORE -> {
 				when (this) {
 					is SingleDate -> realmQuery.greaterThanOrEqualTo(fieldName, singleValue.startOfDay())
+					is Duration -> realmQuery.greaterThan(fieldName, netDuration)
 					is TournamentFinalPosition -> realmQuery.greaterThanOrEqualTo(fieldName, listOfValues.first())
 					is TournamentNumberOfPlayer -> realmQuery.greaterThanOrEqualTo(fieldName, listOfValues.first())
-					is Duration -> realmQuery.greaterThanOrEqualTo(fieldName, netDuration)
-					is SingleInt -> realmQuery.greaterThanOrEqualTo(fieldName, singleValue)
-					is ListOfInt -> realmQuery.greaterThanOrEqualTo(fieldName, listOfValues.first())
-					is NetAmountLost -> realmQuery.greaterThanOrEqualTo(fieldName, listOfValues.first() * -1)
-					is ListOfDouble -> realmQuery.greaterThanOrEqualTo(fieldName, listOfValues.first() * sign)
-					else -> realmQuery
-				}
-			}
-			Operator.MORE -> {
-				when (this) {
-					is Duration -> realmQuery.greaterThan(fieldName, netDuration)
 					is SingleInt -> realmQuery.greaterThan(fieldName, singleValue)
 					is ListOfInt -> realmQuery.greaterThan(fieldName, listOfValues.first())
 					is NetAmountLost -> realmQuery.lessThan(fieldName, listOfValues.first() * -1)
@@ -900,30 +835,12 @@ sealed class QueryCondition : RowRepresentable {
 					else -> realmQuery
 				}
 			}
-			Operator.LESS_OR_EQUAL -> {
+			Operator.LESS -> {
 				when (this) {
 					is SingleDate -> realmQuery.lessThanOrEqualTo(fieldName, singleValue.endOfDay())
+					is Duration -> realmQuery.lessThan(fieldName, netDuration)
 					is TournamentFinalPosition -> realmQuery.lessThanOrEqualTo(fieldName, listOfValues.first())
 					is TournamentNumberOfPlayer -> realmQuery.lessThanOrEqualTo(fieldName, listOfValues.first())
-					is Duration -> realmQuery.lessThanOrEqualTo(fieldName, netDuration)
-					is SingleInt -> realmQuery.lessThanOrEqualTo(fieldName, singleValue)
-					is ListOfInt -> realmQuery.lessThanOrEqualTo(fieldName, listOfValues.first())
-					is NetAmountLost -> {
-						realmQuery.greaterThanOrEqualTo(fieldName, listOfValues.first() * -1)
-						realmQuery.lessThan(fieldName, 0.0)
-					}
-					is NetAmountWon -> {
-						realmQuery.lessThanOrEqualTo(fieldName, listOfValues.first())
-						realmQuery.greaterThan(fieldName, 0.0)
-					}
-					is ListOfDouble -> realmQuery.lessThanOrEqualTo(fieldName, listOfValues.first() * sign)
-
-					else -> realmQuery
-				}
-			}
-			Operator.LESS -> {
-				when (this) {
-					is Duration -> realmQuery.lessThan(fieldName, netDuration)
 					is SingleInt -> realmQuery.lessThan(fieldName, singleValue)
 					is ListOfInt -> realmQuery.lessThan(fieldName, listOfValues.first())
 					is NetAmountLost -> {
@@ -974,14 +891,15 @@ sealed class QueryCondition : RowRepresentable {
 		}
 	}
 
+
 	override val viewType: Int
 		get() {
 			return when (this) {
 				is PastDay -> RowViewType.TITLE_VALUE_CHECK.ordinal
 				else -> {
 					when (this.operator) {
-						Operator.MORE, Operator.MORE_OR_EQUAL -> RowViewType.TITLE_VALUE_CHECK.ordinal
+						Operator.MORE -> RowViewType.TITLE_VALUE_CHECK.ordinal
-						Operator.LESS, Operator.LESS_OR_EQUAL -> RowViewType.TITLE_VALUE_CHECK.ordinal
+						Operator.LESS -> RowViewType.TITLE_VALUE_CHECK.ordinal
 						else -> RowViewType.TITLE_CHECK.ordinal
 					}
 				}
@@ -994,8 +912,8 @@ sealed class QueryCondition : RowRepresentable {
 				is PastDay -> BottomSheetType.EDIT_TEXT
 				else -> {
 					when (this.operator) {
-						Operator.MORE, Operator.MORE_OR_EQUAL -> BottomSheetType.EDIT_TEXT
+						Operator.MORE -> BottomSheetType.EDIT_TEXT
-						Operator.LESS, Operator.LESS_OR_EQUAL -> BottomSheetType.EDIT_TEXT
+						Operator.LESS -> BottomSheetType.EDIT_TEXT
 						else -> BottomSheetType.NONE
 					}
 				}
@@ -1022,27 +940,27 @@ sealed class QueryCondition : RowRepresentable {
 				is IsWeekDay -> R.string.week_days
 				is IsWeekEnd -> R.string.weekend
 				is PastDay -> R.string.period_in_days
-//                is TournamentNumberOfPlayer -> {
+                is TournamentNumberOfPlayer -> {
-//					when (this.operator) {
+					when (this.operator) {
-//						Operator.MORE -> R.string.minimum
+						Operator.MORE -> R.string.minimum
-//						Operator.LESS -> R.string.maximum
+						Operator.LESS -> R.string.maximum
-//						else -> null
+						else -> null
-//					}
+					}
-//				}
+				}
-//				is NetAmountWon -> {
+				is NetAmountWon -> {
-//					when (this.operator) {
+					when (this.operator) {
-//						Operator.MORE -> R.string.won_amount_more_than
+						Operator.MORE -> R.string.won_amount_more_than
-//						Operator.LESS -> R.string.won_amount_less_than
+						Operator.LESS -> R.string.won_amount_less_than
-//						else -> null
+						else -> null
-//					}
+					}
-//				}
+				}
-//				is NetAmountLost -> {
+				is NetAmountLost -> {
-//					when (this.operator) {
+					when (this.operator) {
-//						Operator.MORE -> R.string.lost_amount_more_than
+						Operator.MORE -> R.string.lost_amount_more_than
-//						Operator.LESS -> R.string.lost_amount_less_than
+						Operator.LESS -> R.string.lost_amount_less_than
-//						else -> null
+						else -> null
-//					}
+					}
-//				}
+				}
 				is TournamentFinalPosition -> {
 					when (this.operator) {
 						Operator.MORE -> R.string.minimum
@@ -1052,10 +970,8 @@ sealed class QueryCondition : RowRepresentable {
 				}
 				else -> {
 					when (this.operator) {
-						Operator.MORE_OR_EQUAL -> R.string.more_or_equal_sign
+						Operator.MORE -> R.string.more_than
-						Operator.MORE -> R.string.more_sign
+						Operator.LESS -> R.string.less_than
-						Operator.LESS_OR_EQUAL -> R.string.less_or_equal_sign
-						Operator.LESS -> R.string.less_sign
 						else -> null
 					}
 				}

app/src/main/java/net/pokeranalytics/android/model/handhistory/BoardManager.kt

@@ -0,0 +1,80 @@
+package net.pokeranalytics.android.model.handhistory
+
+import net.pokeranalytics.android.exceptions.PAIllegalStateException
+import net.pokeranalytics.android.model.realm.handhistory.Card
+
+/***
+ * An interface used for board changes notifications
+ */
+interface BoardChangedListener {
+	fun boardChanged()
+}
+
+/***
+ * The BoardManager purpose is to manage the cards from a hand history board
+ * and notify its listener when a change occurs
+ */
+class BoardManager(cards: List<Card>, var listener: BoardChangedListener) {
+
+	/***
+	 * The sorted list of cards
+	 */
+	private var sortedBoardCards: MutableList<Card> = mutableListOf()
+
+	/***
+	 * All cards
+	 */
+	val allCards: List<Card>
+		get() {
+			return this.sortedBoardCards
+		}
+
+	init {
+		this.sortedBoardCards = cards.sortedBy { it.index }.toMutableList()
+	}
+
+	/***
+	 * Adds a card to the board, notifies the listener
+	 */
+	fun add(card: Card) {
+
+		this.sortedBoardCards.lastOrNull()?.let {
+			if (it.suit == null) {
+				it.suit = Card.Suit.UNDEFINED
+			}
+		}
+
+		if (this.sortedBoardCards.size == 5) {
+			throw PAIllegalStateException("Can't add anymore cards")
+		}
+
+		card.index = this.sortedBoardCards.size
+
+		this.sortedBoardCards.add(card)
+		this.listener.boardChanged()
+	}
+
+	/***
+	 * Clears the street's cards, notifies the listener
+	 */
+	fun clearStreet(street: Street) {
+		this.sortedBoardCards.removeAll { it.street == street }
+		this.listener.boardChanged()
+	}
+
+	/***
+	 * Returns the last card of a given [street]
+	 */
+	fun lastCard(street: Street) : Card? {
+		return this.sortedBoardCards.lastOrNull { it.street == street }
+	}
+
+	/***
+	 * Remove the given [card], notifies the listener
+	 */
+	fun remove(card: Card) {
+		this.sortedBoardCards.remove(card)
+		this.listener.boardChanged()
+	}
+
+}

app/src/main/java/net/pokeranalytics/android/model/handhistory/HandSetup.kt

@@ -6,6 +6,7 @@ import net.pokeranalytics.android.model.realm.Session
 import net.pokeranalytics.android.model.realm.handhistory.HandHistory
 import net.pokeranalytics.android.util.extensions.findById
 import timber.log.Timber
+import java.util.*
 
 class HandSetup {
 
@@ -35,31 +36,9 @@ class HandSetup {
 
 	}
 
-	var type: Session.Type? = null
-
-	var blinds: String? = null
-
-//	var bigBlind: Double? = null
-
-	var ante: Double? = null
-
-	var tableSize: Int? = null
-
-	var bigBlindAnte: Boolean = false
-
-	var game: Game? = null
-
-	var session: Session? = null
-
-	var straddlePositions: MutableList<Position> = mutableListOf()
-		private set
-
-	fun clearStraddles() {
-		this.straddlePositions.clear()
-	}
-
 	private fun configure(handHistory: HandHistory) {
-		this.blinds = handHistory.blinds
+		this.smallBlind = handHistory.smallBlind
+		this.bigBlind = handHistory.bigBlind
 		this.bigBlindAnte = handHistory.bigBlindAnte
 		this.ante = handHistory.ante
 		this.tableSize = handHistory.numberOfPlayers
@@ -77,15 +56,32 @@ class HandSetup {
 			this.game = session.game // we don't want to force the max number of cards if unsure
 		}
 		this.type = session.sessionType
-		this.blinds = session.cgBlinds
+		this.smallBlind = session.cgSmallBlind
-		this.ante = session.cgAnte
+		this.bigBlind = session.cgBigBlind
 		this.tableSize = session.tableSize
-
-		val blindValues = session.blindValues
-		if (blindValues.size > 2) {
-			this.straddlePositions = Position.positionsPerPlayers(10).drop(2).take(blindValues.size - 2).toMutableList()
 	}
 
+	var type: Session.Type? = null
+
+	var smallBlind: Double? = null
+
+	var bigBlind: Double? = null
+
+	var ante: Double? = null
+
+	var tableSize: Int? = null
+
+	var bigBlindAnte: Boolean = false
+
+	var game: Game? = null
+
+	var session: Session? = null
+
+	var straddlePositions: MutableList<Position> = mutableListOf()
+		private set
+
+	fun clearStraddles() {
+		this.straddlePositions.clear()
 	}
 
 	/***

app/src/main/java/net/pokeranalytics/android/model/interfaces/CountableUsage.kt

@@ -5,7 +5,7 @@ import io.realm.RealmModel
 /**
  * An interface to be able to track the usage of an object
  */
-interface UsageCountable : Identifiable {
+interface CountableUsage : Identifiable {
     var useCount: Int
         get() { return 0 }
         set(_) {}

app/src/main/java/net/pokeranalytics/android/model/interfaces/Manageable.kt

@@ -5,6 +5,7 @@ import io.realm.Realm
 import io.realm.RealmModel
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.exceptions.ModelException
+import net.pokeranalytics.android.ui.view.RowRepresentable
 
 enum class SaveValidityStatus {
 	VALID,
@@ -22,7 +23,7 @@ enum class DeleteValidityStatus {
 /**
  * An interface to group object which are managed by the database
  */
-interface Manageable : Savable, Deletable
+interface Manageable : Savable, Deletable, Editable
 
 interface NameManageable : Manageable {
 	var name: String
@@ -67,6 +68,17 @@ interface Identifiable : RealmModel {
 		}
 }
 
+/**
+ * An interface to update the fields of an object
+ */
+interface Editable : Identifiable {
+	/**
+	 * a method to handle the modification of the object.
+	 * Through [RowRepresentable] the object is able to update the right variable with the new value.
+	 */
+	fun updateValue(value: Any?, row: RowRepresentable)
+}
+
 /**
  * An interface to easily handle the validity of any object we want to save
  */

app/src/main/java/net/pokeranalytics/android/model/interfaces/StakesHolder.kt

@@ -1,189 +0,0 @@
-package net.pokeranalytics.android.model.interfaces
-
-import net.pokeranalytics.android.model.realm.Bankroll
-import net.pokeranalytics.android.util.BLIND_SEPARATOR
-import net.pokeranalytics.android.util.NULL_TEXT
-import net.pokeranalytics.android.util.UserDefaults
-import net.pokeranalytics.android.util.extensions.formatted
-import net.pokeranalytics.android.util.extensions.toCurrency
-import java.lang.Integer.min
-import java.text.NumberFormat
-import java.text.ParseException
-import java.util.*
-
-data class CodedStake(var stakes: String) : Comparable<CodedStake> {
-
-    var ante: Double? = null
-    var blinds: String? = null
-    var currency: Currency
-
-    init {
-
-        var currencyCode: String? = null
-
-        val parameters = this.stakes.split(StakesHolder.cbSeparator)
-        parameters.forEach { param ->
-            when {
-                param.contains(StakesHolder.cbAnte) -> ante = param.removePrefix(StakesHolder.cbAnte).let { NumberFormat.getInstance().parse(it)?.toDouble() }
-                param.contains(StakesHolder.cbBlinds) -> blinds = param.removePrefix(StakesHolder.cbBlinds)
-                param.contains(StakesHolder.cbCode) -> currencyCode = param.removePrefix(
-                    StakesHolder.cbCode
-                )
-            }
-        }
-
-        this.currency = currencyCode?.let { Currency.getInstance(it) }
-            ?: run { UserDefaults.currency }
-
-    }
-
-    override fun compareTo(other: CodedStake): Int {
-
-        if (this.currency == other.currency) {
-
-            this.blinds?.let { b1 ->
-                other.blinds?.let { b2 ->
-                    if (b1 == b2) {
-                        return this.compareAnte(other)
-                    } else {
-                        val bv1 = this.reversedBlindsArray(b1)
-                        val bv2 = this.reversedBlindsArray(b2)
-
-                        for (i in 0 until min(bv1.size, bv2.size)) {
-                            if (bv1[i] != bv2[i]) {
-                                return bv1[i].compareTo(bv2[i])
-                            } else {
-                                continue
-                            }
-                        }
-                        return bv1.size.compareTo(bv2.size)
-                    }
-                } ?: run {
-                    return 1
-                }
-
-            } ?: run {
-                return this.compareAnte(other)
-            }
-        } else {
-            return this.currency.currencyCode.compareTo(other.currency.currencyCode)
-        }
-
-    }
-
-    private fun compareAnte(other: CodedStake): Int {
-        this.ante?.let { a1 ->
-            other.ante?.let { a2 ->
-                return a1.compareTo(a2)
-            } ?: run {
-                return 1
-            }
-        } ?: run {
-            return -1
-        }
-    }
-
-    private fun reversedBlindsArray(blinds: String): List<Double> {
-        return blinds.split(BLIND_SEPARATOR).mapNotNull { NumberFormat.getInstance().parse(it)?.toDouble() }.reversed()
-    }
-
-    fun formattedStakes(): String {
-        val components = arrayListOf<String>()
-        this.formattedBlinds()?.let { components.add(it) }
-
-        if ((this.ante ?: -1.0) > 0.0) {
-            this.formattedAnte()?.let { components.add("($it)") }
-        }
-
-        return if (components.isNotEmpty()) {
-            components.joinToString(" ")
-        } else {
-            NULL_TEXT
-        }
-    }
-
-    private fun formattedBlinds(): String? {
-        this.blinds?.let {
-            val placeholder = 1.0
-            val regex = Regex("-?\\d+(\\.\\d+)?")
-            return placeholder.toCurrency(currency).replace(regex, it)
-        }
-        return null
-    }
-
-    private fun formattedAnte(): String? {
-        this.ante?.let {
-            return it.toCurrency(this.currency)
-        }
-        return null
-    }
-
-}
-
-
-interface StakesHolder {
-
-    companion object {
-
-        const val cbSeparator = ";"
-        const val cbAnte = "A="
-        const val cbBlinds = "B="
-        const val cbCode = "C="
-
-        fun readableStakes(value: String): String {
-            return CodedStake(value).formattedStakes()
-        }
-
-    }
-
-    val ante: Double?
-    val blinds: String?
-    val biggestBet: Double?
-    val stakes: String?
-
-    val bankroll: Bankroll?
-
-    fun setHolderStakes(stakes: String?)
-    fun setHolderBiggestBet(biggestBet: Double?)
-
-    val blindValues: List<Double>
-        get() {
-            this.blinds?.let { blinds ->
-                val blindsSplit = blinds.split(BLIND_SEPARATOR)
-                return blindsSplit.mapNotNull {
-                    try {
-                        NumberFormat.getInstance().parse(it)?.toDouble()
-                    } catch (e: ParseException) {
-                        null
-                    }
-                }
-            }
-            return listOf()
-        }
-
-    fun generateStakes() {
-
-        if (this.ante == null && this.blinds == null) {
-            setHolderStakes(null)
-            return
-        }
-
-        val components = arrayListOf<String>()
-
-        this.blinds?.let { components.add("${cbBlinds}${it}") }
-        this.ante?.let { components.add("${cbAnte}${it.formatted}") }
-
-        val code = this.bankroll?.currency?.code ?: UserDefaults.currency.currencyCode
-        components.add("${cbCode}${code}")
-
-        setHolderStakes(components.joinToString(cbSeparator))
-    }
-
-    fun defineHighestBet() {
-        val bets = arrayListOf<Double>()
-        this.ante?.let { bets.add(it) }
-        bets.addAll(this.blindValues)
-        setHolderBiggestBet(bets.maxOrNull())
-    }
-
-}

app/src/main/java/net/pokeranalytics/android/model/migrations/Patcher.kt

@@ -2,34 +2,22 @@ package net.pokeranalytics.android.model.migrations
 
 import android.content.Context
 import io.realm.Realm
-import io.realm.kotlin.where
-import net.pokeranalytics.android.PokerAnalyticsApplication
 import net.pokeranalytics.android.model.filter.Query
 import net.pokeranalytics.android.model.filter.QueryCondition
 import net.pokeranalytics.android.model.realm.*
-import net.pokeranalytics.android.model.realm.handhistory.HandHistory
 import net.pokeranalytics.android.model.utils.Seed
 import net.pokeranalytics.android.model.utils.SessionSetManager
-import net.pokeranalytics.android.util.BLIND_SEPARATOR
 import net.pokeranalytics.android.util.Preferences
-import java.text.NumberFormat
 
 class Patcher {
 
 	companion object {
 
-		fun patchAll(application: PokerAnalyticsApplication) {
+		fun patchAll(context: Context) {
-
-			val context = application.applicationContext
-
-			// NOTE: it's more than possible that at one point many patches become redundant
-			// with each other
-
 			patchMissingTransactionTypes(context)
 
-			Preferences.executeOnce(Preferences.Keys.PATCH_COMPUTABLE_RESULTS, context) {
+			patchSessionSet()
-				patchComputableResults()
+
-			}
 			Preferences.executeOnce(Preferences.Keys.PATCH_SESSION_SETS, context) {
 				patchSessionSet()
 			}
@@ -39,42 +27,51 @@ class Patcher {
 			Preferences.executeOnce(Preferences.Keys.PATCH_TRANSACTION_TYPES_NAMES, context) {
 				patchDefaultTransactionTypes(context)
 			}
-			Preferences.executeOnce(Preferences.Keys.PATCH_STAKES, context) {
+			Preferences.executeOnce(Preferences.Keys.PATCH_BLINDS_FORMAT, context) {
-				patchStakes()
+				patchBlindFormat()
-			}
-			Preferences.executeOnce(Preferences.Keys.PATCH_NEGATIVE_LIMITS, context) {
-				patchNegativeLimits()
-			}
-			Preferences.executeOnce(Preferences.Keys.CLEAN_BLINDS_FILTERS, context) {
-				cleanBlindsFilters()
 			}
 
+			val realm = Realm.getDefaultInstance()
+
+			val lockedTypes =
+				realm.where(TransactionType::class.java).equalTo("lock", true).findAll()
+			if (lockedTypes.size == 3) {
 				Preferences.executeOnce(Preferences.Keys.ADD_NEW_TRANSACTION_TYPES, context) {
-				patchMissingTransactionTypes(context)
+					val newTypes = arrayOf(
+						TransactionType.Value.STACKING_INCOMING,
+						TransactionType.Value.STACKING_OUTGOING
+					)
+					realm.executeTransaction {
+						Seed.createDefaultTransactionTypes(newTypes, context, realm)
 					}
-
-			Preferences.executeOnce(Preferences.Keys.PATCH_ZERO_TABLE, context) {
-				patchZeroTable()
 				}
-
-			Preferences.executeOnce(Preferences.Keys.PATCH_RATED_AMOUNT, context) {
-				patchRatedAmounts()
 			}
 
-			patchPerformances(application)
+			realm.close()
-
 		}
 
 		private fun patchMissingTransactionTypes(context: Context) {
 			val realm = Realm.getDefaultInstance()
 
-			val transactionTypes = TransactionType.Value.values()
+			val depositType = TransactionType.Value.DEPOSIT
-
+			val deposit = realm.where(TransactionType::class.java)
+				.equalTo("kind", depositType.uniqueIdentifier).findFirst()
+			if (deposit == null) {
 				realm.executeTransaction {
-				Seed.createDefaultTransactionTypes(transactionTypes, context, realm)
+					Seed.createDefaultTransactionTypes(arrayOf(depositType), context, realm)
+				}
 			}
 
+			val withdrawalType = TransactionType.Value.WITHDRAWAL
+			val withdrawal = realm.where(TransactionType::class.java)
+				.equalTo("kind", withdrawalType.uniqueIdentifier).findFirst()
+			if (withdrawal == null) {
+				realm.executeTransaction {
+					Seed.createDefaultTransactionTypes(arrayOf(withdrawalType), context, realm)
+				}
+			}
 			realm.close()
+
 		}
 
 		private fun patchBreaks() {
@@ -89,8 +86,7 @@ class Patcher {
 					it.computeStats()
 				}
 				sessions.forEach {
-					it.generateStakes()
+					it.formatBlinds()
-					it.defineHighestBet()
 				}
 				results.forEach {
 					it.computeNumberOfRebuy()
@@ -115,54 +111,17 @@ class Patcher {
 			realm.close()
 		}
 
-		private fun patchStakes() {
+		private fun patchBlindFormat() {
 			val realm = Realm.getDefaultInstance()
 			realm.executeTransaction {
 				val sessions = realm.where(Session::class.java).findAll()
 				sessions.forEach { session ->
-					val blinds = arrayListOf(session.cgOldSmallBlind, session.cgOldBigBlind).filterNotNull()
+					session.formatBlinds()
-					val blindsFormatted = blinds.map { NumberFormat.getInstance().format(it) }
-					session.cgAnte = null
-					if (blindsFormatted.isNotEmpty()) {
-						session.cgBlinds = blindsFormatted.joinToString(BLIND_SEPARATOR)
-					}
-				}
-
-				val handHistories = realm.where(HandHistory::class.java).findAll()
-				handHistories.forEach { hh ->
-					val blinds = arrayListOf(hh.oldSmallBlind, hh.oldBigBlind).filterNotNull()
-					val blindsFormatted = blinds.map { NumberFormat.getInstance().format(it) }
-					if (blindsFormatted.isNotEmpty()) {
-						hh.blinds = blindsFormatted.joinToString(BLIND_SEPARATOR)
-					}
-				}
-
-			}
-			realm.close()
-		}
-
-		private fun patchNegativeLimits() {
-			val realm = Realm.getDefaultInstance()
-			realm.executeTransaction {
-				val sessions = realm.where(Session::class.java).lessThan("limit", 0).findAll()
-				sessions.forEach { session ->
-					session.limit = null
 				}
 			}
 			realm.close()
 		}
 
-		private fun cleanBlindsFilters() {
-			val realm = Realm.getDefaultInstance()
-			realm.executeTransaction {
-				val blindFilterConditions = realm.where(FilterCondition::class.java).equalTo("filterName", "AnyBlind").findAll()
-				val filterIds = blindFilterConditions.mapNotNull { it.filters?.firstOrNull() }.map { it.id }
-				val filters = realm.where(Filter::class.java).`in`("id", filterIds.toTypedArray()).findAll()
-				filters.deleteAllFromRealm()
-			}
-			realm.close()
-		}
-
 		/*
 		02/09/19: A bug with the session set management made them kept instead of deleted,
 		thus making duration calculation wrong
@@ -180,55 +139,6 @@ class Patcher {
 			realm.close()
 		}
 
-		/*
-		15/04/21: Two needs:
-		 - To get better performance for ITM Ratio, a positive session is a net >= 0 for cash game, or a cashedOut > 0 for tournaments
-		 - The field "ratedTips" is added
-		 */
-		private fun patchComputableResults() {
-			val realm = Realm.getDefaultInstance()
-			realm.executeTransaction {
-				val crs = realm.where(ComputableResult::class.java).findAll()
-				crs.forEach { cr ->
-					cr.session?.let { cr.updateWith(it) }
-				}
-			}
-			realm.close()
-		}
-
-		private fun patchPerformances(application: PokerAnalyticsApplication) {
-			val realm = Realm.getDefaultInstance()
-			val sessionCount = realm.where<Session>().findAll().size
-			val performanceCount = realm.where<Performance>().findAll().size
-
-			if (sessionCount > 1 && performanceCount == 0) {
-				application.reportWhistleBlower?.requestReportLaunch()
-			}
-			realm.close()
-		}
-
-		private fun patchZeroTable() {
-			val realm = Realm.getDefaultInstance()
-			val zero = 0
-			val sessions = realm.where<Session>().equalTo("numberOfTables", zero).findAll()
-			realm.executeTransaction {
-				sessions.forEach { s ->
-					s.numberOfTables = 1
-				}
-			}
-			realm.close()
 	}
 
-		private fun patchRatedAmounts() {
-			val realm = Realm.getDefaultInstance()
-			val transactions = realm.where<Transaction>().findAll()
-			realm.executeTransaction {
-				transactions.forEach { t ->
-					t.computeRatedAmount()
-				}
-			}
-			realm.close()
-		}
-
-	}
 }

app/src/main/java/net/pokeranalytics/android/model/migrations/PokerAnalyticsMigration.kt

@@ -21,8 +21,7 @@ class PokerAnalyticsMigration : RealmMigration {
         if (currentVersion == 0) {
             Timber.d("*** Running migration 1")
 
-            schema.get("Filter")?.addField("entityType", Int::class.java)
+            schema.get("Filter")?.addField("entityType", Int::class.java)?.setNullable("entityType", true)
-                ?.setNullable("entityType", true)
             schema.get("FilterElement")?.let {
                 it.setNullable("filterName", true)
                 it.setNullable("sectionName", true)
@@ -84,8 +83,7 @@ class PokerAnalyticsMigration : RealmMigration {
         if (currentVersion == 3) {
             Timber.d("*** Running migration ${currentVersion + 1}")
 
-            schema.get("Result")?.addField("numberOfRebuy", Double::class.java)
+            schema.get("Result")?.addField("numberOfRebuy", Double::class.java)?.setNullable("numberOfRebuy", true)
-                ?.setNullable("numberOfRebuy", true)
             currentVersion++
         }
 
@@ -119,8 +117,7 @@ class PokerAnalyticsMigration : RealmMigration {
                 schema.get("CustomField")?.let {
                     it.addField("type", Integer::class.java).setNullable("type", false)
                     it.addField("duplicateValue", Boolean::class.java)
-                    it.addField("sortCondition", Integer::class.java)
+                    it.addField("sortCondition", Integer::class.java).setRequired("sortCondition", true)
-                        .setRequired("sortCondition", true)
                     it.addRealmListField("entries", customFieldEntrySchema)
                 }
 
@@ -137,8 +134,7 @@ class PokerAnalyticsMigration : RealmMigration {
             schema.get("ReportSetup")?.let {
                 it.addRealmListField("statIds", Int::class.java).setNullable("statIds", true)
                 it.addRealmListField("criteriaCustomFieldIds", String::class.java)
-                it.addRealmListField("criteriaIds", Int::class.java)
+                it.addRealmListField("criteriaIds", Int::class.java).setNullable("criteriaIds", true)
-                    .setNullable("criteriaIds", true)
                 it.removeField("filters")
                 schema.get("Filter")?.let { filterSchema ->
                     it.addRealmObjectField("filter", filterSchema)
@@ -199,8 +195,7 @@ class PokerAnalyticsMigration : RealmMigration {
 
                 val cardSchema = schema.create("Card")
                 cardSchema.addField("value", Int::class.java).setRequired("value", false)
-                cardSchema.addField("suitIdentifier", Int::class.java)
+                cardSchema.addField("suitIdentifier", Int::class.java).setRequired("suitIdentifier", false)
-                    .setRequired("suitIdentifier", false)
                 cardSchema.addField("index", Int::class.java)
                 hhSchema.addRealmListField("board", cardSchema)
 
@@ -208,12 +203,10 @@ class PokerAnalyticsMigration : RealmMigration {
                 actionSchema.addField("streetIdentifier", Int::class.java)
                 actionSchema.addField("index", Int::class.java)
                 actionSchema.addField("position", Int::class.java)
-                actionSchema.addField("typeIdentifier", Int::class.java)
+                actionSchema.addField("typeIdentifier", Int::class.java).setRequired("typeIdentifier", false)
-                    .setRequired("typeIdentifier", false)
                 actionSchema.addField("amount", Double::class.java).setRequired("amount", false)
                 actionSchema.addField("effectiveAmount", Double::class.java)
-                actionSchema.addField("positionRemainingStack", Double::class.java)
+                actionSchema.addField("positionRemainingStack", Double::class.java).setRequired("positionRemainingStack", false)
-                    .setRequired("positionRemainingStack", false)
                 hhSchema.addRealmListField("actions", actionSchema)
 
                 val playerSetupSchema = schema.create("PlayerSetup")
@@ -234,107 +227,6 @@ class PokerAnalyticsMigration : RealmMigration {
 
             currentVersion++
         }
-
-        // Migrate to version 10
-        if (currentVersion == 9) {
-            schema.get("Session")?.addField("handsCount", Int::class.java)
-                ?.setRequired("handsCount", false)
-
-            schema.get("Session")?.transform { obj -> // otherwise we get a 0 default value
-                obj.setNull("handsCount")
-            }
-
-            val configSchema = schema.create("UserConfig")
-            configSchema.addField("id", String::class.java).setRequired("id", true)
-            configSchema.addPrimaryKey("id")
-            configSchema.addField("liveDealtHandsPerHour", Int::class.java)
-            configSchema.addField("onlineDealtHandsPerHour", Int::class.java)
-
-            currentVersion++
-        }
-
-        // Migrate to version 11
-        if (currentVersion == 10) {
-            schema.get("ComputableResult")?.addField("ratedTips", Double::class.java)
-            currentVersion++
-        }
-
-        // Migrate to version 12
-        if (currentVersion == 11) {
-
-            schema.get("Session")?.let { ss ->
-
-                ss.addField("cgAnte", Double::class.java)
-                    ?.setNullable("cgAnte", true)
-                ss.addField("cgBiggestBet", Double::class.java)
-                    ?.setNullable("cgBiggestBet", true)
-                ss.addField("cgStakes", String::class.java)
-                ss.addField("cgBlinds", String::class.java)
-                ss.removeField("blinds")
-
-                ss.renameField("cgSmallBlind", "cgOldSmallBlind")
-                ss.renameField("cgBigBlind", "cgOldBigBlind")
-            }
-
-            schema.get("HandHistory")?.let { hs ->
-                hs.setNullable("ante", true)
-                hs.addField("stakes", String::class.java)
-                hs.addField("blinds", String::class.java)
-                hs.addField("biggestBet", Double::class.java)
-                    ?.setNullable("biggestBet", true)
-                hs.renameField("smallBlind", "oldSmallBlind")
-                hs.renameField("bigBlind", "oldBigBlind")
-            }
-
-            currentVersion++
-        }
-
-        // Migrate to version 13
-        if (currentVersion == 12) {
-            Timber.d("*** Running migration ${currentVersion + 1}")
-            schema.get("Transaction")?.let { ts ->
-                ts.addField("transferRate", Double::class.java)
-                    .setNullable("transferRate", true)
-                schema.get("Bankroll")?.let { bs ->
-                    ts.addRealmObjectField("destination", bs)
-                } ?: throw PAIllegalStateException("Bankroll schema not found")
-            }
-
-            schema.create("Performance")?.let { ps ->
-                ps.addField("id", String::class.java).setRequired("id", true)
-                ps.addPrimaryKey("id")
-                ps.addField("reportId", Int::class.java)
-                ps.addField("key", Int::class.java)
-                ps.addField("name", String::class.java)
-                ps.addField("objectId", String::class.java)//.setNullable("objectId", true)
-                ps.addField("customFieldId", String::class.java)//.setNullable("customFieldId", true)
-                ps.addField("value", Double::class.java).setRequired("value", false) //.setNullable("value", true)
-            }
-
-            currentVersion++
-        }
-
-        // Migrate to version 14
-        if (currentVersion == 13) {
-            Timber.d("*** Running migration ${currentVersion + 1}")
-            schema.get("Transaction")?.let { ts ->
-                ts.addField("ratedAmount", Double::class.java)
-            } ?: throw PAIllegalStateException("Transaction schema not found")
-
-            //transactionTypeIds
-            schema.get("UserConfig")?.let { ucs ->
-                ucs.addField("transactionTypeIds", String::class.java).setRequired("transactionTypeIds", true)
-            } ?: throw PAIllegalStateException("UserConfig schema not found")
-
-            schema.get("Performance")?.let { ps ->
-                if (!ps.isPrimaryKey("id")) {
-                    ps.addPrimaryKey("id")
-                }
-            }
-
-            currentVersion++
-        }
-
     }
 
 	override fun equals(other: Any?): Boolean {
@@ -344,5 +236,4 @@ class PokerAnalyticsMigration : RealmMigration {
 	override fun hashCode(): Int {
 		return RealmMigration::javaClass.hashCode()
 	}
-
 }

app/src/main/java/net/pokeranalytics/android/model/realm/Bankroll.kt

@@ -14,37 +14,32 @@ import net.pokeranalytics.android.model.interfaces.Identifiable
 import net.pokeranalytics.android.model.interfaces.NameManageable
 import net.pokeranalytics.android.model.interfaces.SaveValidityStatus
 import net.pokeranalytics.android.ui.view.RowRepresentable
-import net.pokeranalytics.android.ui.view.RowUpdatable
+import net.pokeranalytics.android.ui.view.rowrepresentable.BankrollRow
-import net.pokeranalytics.android.ui.view.rows.BankrollPropertiesRow
+import net.pokeranalytics.android.ui.view.rowrepresentable.SessionRow
-import net.pokeranalytics.android.ui.view.rows.SessionPropertiesRow
+import net.pokeranalytics.android.ui.view.rowrepresentable.SimpleRow
-import net.pokeranalytics.android.ui.view.rows.SimpleRow
 import net.pokeranalytics.android.util.Preferences
 import net.pokeranalytics.android.util.UserDefaults
 import java.util.*
 
 enum class ResultCaptureType {
-
+	BUYIN_CASHEDOUT,
-	BUYIN_CASHED_OUT,
 	NET_RESULT;
 
 	companion object {
-		val buyinCashedOutFields = listOf(
+		val buyinCashedOutFields = listOf(SessionRow.CASHED_OUT, SessionRow.BUY_IN, SessionRow.TIPS)
-			SessionPropertiesRow.CASHED_OUT,
+		val netResultFields = listOf(SessionRow.NET_RESULT)
-			SessionPropertiesRow.BUY_IN,
-			SessionPropertiesRow.TIPS)
-		val netResultFields = listOf(SessionPropertiesRow.NET_RESULT)
 	}
 
 	val rowRepresentables: List<RowRepresentable>
 		get() {
 			return when (this) {
-				BUYIN_CASHED_OUT -> buyinCashedOutFields
+				BUYIN_CASHEDOUT -> buyinCashedOutFields
 				NET_RESULT -> netResultFields
 			}
 		}
 }
 
-open class Bankroll : RealmObject(), NameManageable, RowUpdatable, RowRepresentable {
+open class Bankroll : RealmObject(), NameManageable, RowRepresentable {
 
 	@PrimaryKey
 	override var id = UUID.randomUUID().toString()
@@ -60,12 +55,6 @@ open class Bankroll : RealmObject(), NameManageable, RowUpdatable, RowRepresenta
 	@LinkingObjects("bankroll")
 	val transactions: RealmResults<Transaction>? = null
 
-	/**
-	 * The list of transactions where the bankroll is the destination
-	 */
-	@LinkingObjects("destination")
-	val destinationTransactions: RealmResults<Transaction>? = null
-
 	// The currency of the bankroll
 	var currency: Currency? = null
 
@@ -81,6 +70,25 @@ open class Bankroll : RealmObject(), NameManageable, RowUpdatable, RowRepresenta
 		return this.name
 	}
 
+	override fun updateValue(value: Any?, row: RowRepresentable) {
+		when (row) {
+			SimpleRow.NAME -> this.name = value as String? ?: ""
+			BankrollRow.ONLINE -> {
+				this.live = if (value is Boolean) !value else false
+			}
+			BankrollRow.INITIAL_VALUE -> {
+				this.initialValue = value as Double? ?: 0.0
+			}
+			BankrollRow.CURRENCY -> {
+				//TODO handle a use default currency option
+				this.currency?.code = value as String?
+			}
+			BankrollRow.RATE -> {
+				this.currency?.rate = value as Double?
+			}
+		}
+	}
+
 	override fun isValidForDelete(realm: Realm): Boolean {
 		return realm.where<Session>().equalTo("bankroll.id", id).findAll().isEmpty()
 				&& realm.where<Transaction>().equalTo("bankroll.id", id).findAll().isEmpty()
@@ -116,7 +124,7 @@ open class Bankroll : RealmObject(), NameManageable, RowUpdatable, RowRepresenta
 			return Preferences.getResultCaptureType(this, context)
 				?: run {
 					when (this.live) {
-					true -> ResultCaptureType.BUYIN_CASHED_OUT
+					true -> ResultCaptureType.BUYIN_CASHEDOUT
 					else -> ResultCaptureType.NET_RESULT
 				}
 			}
@@ -143,25 +151,6 @@ open class Bankroll : RealmObject(), NameManageable, RowUpdatable, RowRepresenta
 
 	}
 
-	override fun updateValue(value: Any?, row: RowRepresentable) {
-		when (row) {
-			SimpleRow.NAME -> this.name = value as String? ?: ""
-			BankrollPropertiesRow.ONLINE -> {
-				this.live = if (value is Boolean) !value else false
-			}
-			BankrollPropertiesRow.INITIAL_VALUE -> {
-				this.initialValue = value as Double? ?: 0.0
-			}
-			BankrollPropertiesRow.CURRENCY -> {
-				//TODO handle a use default currency option
-				this.currency?.code = value as String?
-			}
-			BankrollPropertiesRow.RATE -> {
-				this.currency?.rate = value as Double?
-			}
-		}
-	}
-
 	val utilCurrency: java.util.Currency
 		get() {
 			this.currency?.code?.let {

app/src/main/java/net/pokeranalytics/android/model/realm/Comment.kt

@@ -13,12 +13,11 @@ import net.pokeranalytics.android.model.interfaces.Manageable
 import net.pokeranalytics.android.model.interfaces.SaveValidityStatus
 import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetType
 import net.pokeranalytics.android.ui.view.RowRepresentable
-import net.pokeranalytics.android.ui.view.RowUpdatable
 import net.pokeranalytics.android.ui.view.RowViewType
 import net.pokeranalytics.android.util.NULL_TEXT
 import java.util.*
 
-open class Comment : RealmObject(), Manageable, RowRepresentable, RowUpdatable {
+open class Comment : RealmObject(), Manageable, RowRepresentable {
 
 	@PrimaryKey
 	override var id = UUID.randomUUID().toString()

app/src/main/java/net/pokeranalytics/android/model/realm/ComputableResult.kt

@@ -4,7 +4,7 @@ import io.realm.RealmObject
 import net.pokeranalytics.android.model.filter.Filterable
 import net.pokeranalytics.android.model.filter.QueryCondition
 
-open class ComputableResult : RealmObject(), Filterable {
+open class ComputableResult() : RealmObject(), Filterable {
 
 	var ratedNet: Double = 0.0
 
@@ -22,8 +22,6 @@ open class ComputableResult : RealmObject(), Filterable {
 
 	var session: Session? = null
 
-	var ratedTips: Double = 0.0
-
 	fun updateWith(session: Session) {
 
 		val rate = session.bankroll?.currency?.rate ?: 1.0
@@ -32,11 +30,10 @@ open class ComputableResult : RealmObject(), Filterable {
 			this.ratedNet = result.net * rate
 			this.isPositive = result.isPositive
 			this.ratedBuyin = (result.buyin ?: 0.0) * rate
-			this.ratedTips = (result.tips ?: 0.0) * rate
 		}
 
 		this.bbNet = session.bbNet
-		this.hasBigBlind = if (session.cgBiggestBet != null) 1 else 0
+		this.hasBigBlind = if (session.cgBigBlind != null) 1 else 0
 		this.estimatedHands = session.estimatedHands
 		this.bbPer100Hands =
 			session.bbNet / (session.numberOfHandsPerHour * session.hourlyDuration) * 100
@@ -50,7 +47,6 @@ open class ComputableResult : RealmObject(), Filterable {
 		IS_POSITIVE("isPositive"),
 		RATED_BUYIN("ratedBuyin"),
 		ESTIMATED_HANDS("estimatedHands"),
-		RATED_TIPS("ratedTips"),
 //		BB_PER100HANDS("bbPer100Hands")
 	}
 

app/src/main/java/net/pokeranalytics/android/model/realm/CustomField.kt

@@ -18,18 +18,17 @@ import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource
 import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetType
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor
-import net.pokeranalytics.android.ui.view.RowUpdatable
 import net.pokeranalytics.android.ui.view.RowViewType
-import net.pokeranalytics.android.ui.view.rows.CustomFieldPropertiesRow
+import net.pokeranalytics.android.ui.view.rowrepresentable.CustomFieldRow
-import net.pokeranalytics.android.ui.view.rows.CustomizableRowRepresentable
+import net.pokeranalytics.android.ui.view.rowrepresentable.CustomizableRowRepresentable
-import net.pokeranalytics.android.ui.view.rows.SimpleRow
+import net.pokeranalytics.android.ui.view.rowrepresentable.SimpleRow
 import net.pokeranalytics.android.util.enumerations.IntIdentifiable
 import timber.log.Timber
 import java.util.*
 import kotlin.collections.ArrayList
 
 
-open class CustomField : RealmObject(), RowRepresentable, RowUpdatable, NameManageable, StaticRowRepresentableDataSource {
+open class CustomField : RealmObject(), NameManageable, StaticRowRepresentableDataSource, RowRepresentable {
 
 	companion object {
 
@@ -112,9 +111,13 @@ open class CustomField : RealmObject(), RowRepresentable, RowUpdatable, NameMana
 	@Ignore
 	private var entriesToDelete: ArrayList<CustomFieldEntry> = ArrayList()
 
+	@Ignore
+	override var viewType: Int = RowViewType.TITLE_VALUE_ARROW.ordinal
+
 	@Ignore
 	private var rowRepresentation: List<RowRepresentable> = mutableListOf()
 
+
 	//helper
 
 	val isListType: Boolean
@@ -127,6 +130,14 @@ open class CustomField : RealmObject(), RowRepresentable, RowUpdatable, NameMana
 			return this.type == Type.AMOUNT.uniqueIdentifier
 		}
 
+	override fun localizedTitle(context: Context): String {
+		return this.name
+	}
+
+	override fun getDisplayName(context: Context): String {
+		return this.name
+	}
+
 	override fun adapterRows(): List<RowRepresentable>? {
 		return rowRepresentation
 	}
@@ -134,8 +145,8 @@ open class CustomField : RealmObject(), RowRepresentable, RowUpdatable, NameMana
 	override fun updateValue(value: Any?, row: RowRepresentable) {
 		when (row) {
 			SimpleRow.NAME -> this.name = value as String? ?: ""
-			CustomFieldPropertiesRow.TYPE -> this.type = (value as Type?)?.uniqueIdentifier ?: Type.LIST.uniqueIdentifier
+			CustomFieldRow.TYPE -> this.type = (value as Type?)?.uniqueIdentifier ?: Type.LIST.uniqueIdentifier
-			CustomFieldPropertiesRow.COPY_ON_DUPLICATE -> this.duplicateValue = value as Boolean? ?: false
+			CustomFieldRow.COPY_ON_DUPLICATE -> this.duplicateValue = value as Boolean? ?: false
 		}
 	}
 
@@ -167,6 +178,13 @@ open class CustomField : RealmObject(), RowRepresentable, RowUpdatable, NameMana
 		return R.string.cf_entry_delete_popup_message
 	}
 
+	override val bottomSheetType: BottomSheetType
+		get() {
+			return when (type) {
+				Type.LIST.uniqueIdentifier -> BottomSheetType.LIST_STATIC
+				else -> BottomSheetType.NUMERIC_TEXT
+			}
+		}
 
 	override fun deleteDependencies(realm: Realm) {
 		if (isValid) {
@@ -186,13 +204,35 @@ open class CustomField : RealmObject(), RowRepresentable, RowUpdatable, NameMana
 		}
 	}
 
+	override fun editingDescriptors(map: Map<String, Any?>): ArrayList<RowRepresentableEditDescriptor>? {
+		return when (type) {
+			Type.LIST.uniqueIdentifier -> {
+				val defaultValue: Any? by map
+				val data: RealmList<CustomFieldEntry>? by map
+				arrayListOf(
+					RowRepresentableEditDescriptor(defaultValue, staticData = data)
+				)
+			}
+			else -> {
+				val defaultValue: Double? by map
+				arrayListOf(
+					RowRepresentableEditDescriptor(
+						defaultValue, inputType = InputType.TYPE_CLASS_NUMBER
+								or InputType.TYPE_NUMBER_FLAG_DECIMAL
+								or InputType.TYPE_NUMBER_FLAG_SIGNED
+					)
+				)
+			}
+		}
+	}
+
 	/**
 	 * Update the row representation
 	 */
 	private fun updatedRowRepresentationForCurrentState(): List<RowRepresentable> {
 		val rows = ArrayList<RowRepresentable>()
 		rows.add(SimpleRow.NAME)
-		rows.add(CustomFieldPropertiesRow.TYPE)
+		rows.add(CustomFieldRow.TYPE)
 
 		if (type == Type.LIST.uniqueIdentifier && entries.size >= 0) {
 			if (entries.isNotEmpty()) {
@@ -303,45 +343,4 @@ open class CustomField : RealmObject(), RowRepresentable, RowUpdatable, NameMana
 			}
 		}
 
-	@Ignore
-	override var viewType: Int = RowViewType.TITLE_VALUE_ARROW.ordinal
-
-	override fun localizedTitle(context: Context): String {
-		return this.name
-	}
-
-	override fun getDisplayName(context: Context): String {
-		return this.name
-	}
-
-	override val bottomSheetType: BottomSheetType
-		get() {
-			return when (this.type) {
-				Type.LIST.uniqueIdentifier -> BottomSheetType.LIST_STATIC
-				else -> BottomSheetType.NUMERIC_TEXT
-			}
-		}
-
-	override fun editingDescriptors(map: Map<String, Any?>): ArrayList<RowRepresentableEditDescriptor> {
-		return when (this.type) {
-			Type.LIST.uniqueIdentifier -> {
-				val defaultValue: Any? by map
-				val data: RealmList<CustomFieldEntry>? by map
-				arrayListOf(
-					RowRepresentableEditDescriptor(defaultValue, staticData = data)
-				)
-			}
-			else -> {
-				val defaultValue: Double? by map
-				arrayListOf(
-					RowRepresentableEditDescriptor(
-						defaultValue, inputType = InputType.TYPE_CLASS_NUMBER
-								or InputType.TYPE_NUMBER_FLAG_DECIMAL
-								or InputType.TYPE_NUMBER_FLAG_SIGNED
-					)
-				)
-			}
-		}
-	}
-
 }

app/src/main/java/net/pokeranalytics/android/model/realm/CustomFieldEntry.kt

@@ -18,7 +18,6 @@ import net.pokeranalytics.android.model.interfaces.SaveValidityStatus
 import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetType
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor
-import net.pokeranalytics.android.ui.view.RowUpdatable
 import net.pokeranalytics.android.ui.view.RowViewType
 import net.pokeranalytics.android.util.NULL_TEXT
 import net.pokeranalytics.android.util.extensions.toCurrency
@@ -27,7 +26,7 @@ import java.util.*
 import java.util.Currency
 
 
-open class CustomFieldEntry : RealmObject(), NameManageable, RowRepresentable, RowUpdatable {
+open class CustomFieldEntry : RealmObject(), NameManageable, RowRepresentable {
 
 	@Ignore
 	override val realmObjectClass: Class<out Identifiable> = CustomFieldEntry::class.java

app/src/main/java/net/pokeranalytics/android/model/realm/Filter.kt

@@ -12,9 +12,12 @@ import net.pokeranalytics.android.model.filter.QueryCondition
 import net.pokeranalytics.android.model.interfaces.*
 import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetType
 import net.pokeranalytics.android.ui.modules.filter.FilterableType
-import net.pokeranalytics.android.ui.view.*
+import net.pokeranalytics.android.ui.view.ImageDecorator
-import net.pokeranalytics.android.ui.view.rows.FilterCategoryRow
+import net.pokeranalytics.android.ui.view.RowRepresentable
-import net.pokeranalytics.android.ui.view.rows.FilterItemRow
+import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor
+import net.pokeranalytics.android.ui.view.RowViewType
+import net.pokeranalytics.android.ui.view.rowrepresentable.FilterCategoryRow
+import net.pokeranalytics.android.ui.view.rowrepresentable.FilterItemRow
 import timber.log.Timber
 import java.util.*
 
@@ -23,7 +26,7 @@ import java.util.*
  * It contains a list of [FilterCondition] describing the complete query to launch
  * The [Filter] is working closely with a [Filterable] interface providing the entity we want the query being launched on
  */
-open class Filter : RealmObject(), RowRepresentable, RowUpdatable, Deletable, UsageCountable, ImageDecorator {
+open class Filter : RealmObject(), RowRepresentable, Editable, Deletable, CountableUsage, ImageDecorator {
 
 	@Ignore
 	override val realmObjectClass: Class<out Identifiable> = Filter::class.java

app/src/main/java/net/pokeranalytics/android/model/realm/FilterCondition.kt

@@ -2,12 +2,11 @@ package net.pokeranalytics.android.model.realm
 
 import io.realm.RealmList
 import io.realm.RealmObject
-import io.realm.RealmResults
-import io.realm.annotations.LinkingObjects
 import net.pokeranalytics.android.exceptions.PokerAnalyticsException
 import net.pokeranalytics.android.model.filter.QueryCondition
-import net.pokeranalytics.android.ui.view.rows.FilterSectionRow
+import net.pokeranalytics.android.ui.view.rowrepresentable.FilterSectionRow
 import java.util.*
+import kotlin.collections.ArrayList
 
 open class FilterCondition() : RealmObject() {
 
@@ -29,7 +28,6 @@ open class FilterCondition() : RealmObject() {
             is QueryCondition.ListOfDouble -> this.setValues(filterElementRows.flatMap { (it as QueryCondition.ListOfDouble).listOfValues })
             is QueryCondition.ListOfInt -> this.setValues(filterElementRows.flatMap { (it as QueryCondition.ListOfInt).listOfValues })
             is QueryCondition.ListOfString -> this.setValues(filterElementRows.flatMap { (it as QueryCondition.ListOfString).listOfValues })
-            else -> {}
         }
     }
 
@@ -51,9 +49,6 @@ open class FilterCondition() : RealmObject() {
     var stringValue: String? = null
     var operator: Int? = null
 
-    @LinkingObjects("filterConditions")
-    val filters: RealmResults<Filter>? = null
-
     inline fun <reified T> getValues(): ArrayList <T> {
         return when (T::class) {
             Int::class -> ArrayList<T>().apply { intValues?.map { add(it as T) } }

app/src/main/java/net/pokeranalytics/android/model/realm/Game.kt

@@ -8,21 +8,20 @@ import io.realm.annotations.Ignore
 import io.realm.annotations.PrimaryKey
 import io.realm.kotlin.where
 import net.pokeranalytics.android.R
-import net.pokeranalytics.android.model.interfaces.UsageCountable
+import net.pokeranalytics.android.model.interfaces.CountableUsage
 import net.pokeranalytics.android.model.interfaces.Identifiable
 import net.pokeranalytics.android.model.interfaces.NameManageable
 import net.pokeranalytics.android.model.interfaces.SaveValidityStatus
 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.RowUpdatable
+import net.pokeranalytics.android.ui.view.rowrepresentable.GameRow
-import net.pokeranalytics.android.ui.view.rows.GamePropertiesRow
+import net.pokeranalytics.android.ui.view.rowrepresentable.SimpleRow
-import net.pokeranalytics.android.ui.view.rows.SimpleRow
 import net.pokeranalytics.android.util.NULL_TEXT
 import java.util.*
 import kotlin.collections.ArrayList
 
-open class Game : RealmObject(), NameManageable, StaticRowRepresentableDataSource, RowRepresentable, RowUpdatable, UsageCountable {
+open class Game : RealmObject(), NameManageable, StaticRowRepresentableDataSource, RowRepresentable, CountableUsage {
 
 	@Ignore
 	override val realmObjectClass: Class<out Identifiable> = Game::class.java
@@ -72,7 +71,7 @@ open class Game : RealmObject(), NameManageable, StaticRowRepresentableDataSourc
 	): CharSequence {
 		return when (row) {
 			SimpleRow.NAME -> if (this.name.isNotEmpty()) this.name else NULL_TEXT
-			GamePropertiesRow.SHORT_NAME -> this.shortName ?: NULL_TEXT
+			GameRow.SHORT_NAME -> this.shortName ?: NULL_TEXT
 			else -> return super.charSequenceForRow(row, context, 0)
 		}
 	}
@@ -80,7 +79,7 @@ open class Game : RealmObject(), NameManageable, StaticRowRepresentableDataSourc
 	override fun editDescriptors(row: RowRepresentable): List<RowRepresentableEditDescriptor>? {
 		return when (row) {
 			SimpleRow.NAME -> row.editingDescriptors(mapOf("defaultValue" to this.name))
-			GamePropertiesRow.SHORT_NAME -> row.editingDescriptors(mapOf("defaultValue" to this.shortName))
+			GameRow.SHORT_NAME -> row.editingDescriptors(mapOf("defaultValue" to this.shortName))
 			else -> null
 		}
 	}
@@ -88,7 +87,7 @@ open class Game : RealmObject(), NameManageable, StaticRowRepresentableDataSourc
 	override fun updateValue(value: Any?, row: RowRepresentable) {
 		when (row) {
 			SimpleRow.NAME -> this.name = value as String? ?: ""
-			GamePropertiesRow.SHORT_NAME -> this.shortName = value as String? ?: ""
+			GameRow.SHORT_NAME -> this.shortName = value as String? ?: ""
 		}
 	}
 

app/src/main/java/net/pokeranalytics/android/model/realm/Location.kt

@@ -12,12 +12,11 @@ import net.pokeranalytics.android.model.interfaces.Identifiable
 import net.pokeranalytics.android.model.interfaces.NameManageable
 import net.pokeranalytics.android.model.interfaces.SaveValidityStatus
 import net.pokeranalytics.android.ui.view.RowRepresentable
-import net.pokeranalytics.android.ui.view.RowUpdatable
+import net.pokeranalytics.android.ui.view.rowrepresentable.SimpleRow
-import net.pokeranalytics.android.ui.view.rows.SimpleRow
 import java.util.*
 
 
-open class Location : RealmObject(), NameManageable, RowRepresentable, RowUpdatable {
+open class Location : RealmObject(), NameManageable, RowRepresentable {
 
 	@Ignore
 	override val realmObjectClass: Class<out Identifiable> = Location::class.java

app/src/main/java/net/pokeranalytics/android/model/realm/Performance.kt

@@ -1,72 +0,0 @@
-package net.pokeranalytics.android.model.realm
-
-import io.realm.Realm
-import io.realm.RealmObject
-import io.realm.annotations.PrimaryKey
-import net.pokeranalytics.android.calculus.Stat
-import net.pokeranalytics.android.model.LiveOnline
-import net.pokeranalytics.android.ui.view.rows.StaticReport
-import net.pokeranalytics.android.util.NULL_TEXT
-import net.pokeranalytics.android.util.extensions.lookupForNameInAllTablesById
-import java.util.*
-
-
-interface PerformanceKey {
-    val resId: Int?
-    val value: Int
-}
-
-open class Performance() : RealmObject() {
-
-    @PrimaryKey
-    var id: String = UUID.randomUUID().toString()
-
-    constructor(
-        report: StaticReport,
-        key: PerformanceKey,
-        name: String? = null,
-        objectId: String? = null,
-        customFieldId: String? = null,
-        value: Double? = null
-    ) : this() {
-
-        this.reportId = report.uniqueIdentifier
-        this.key = key.value
-        this.name = name
-        this.objectId = objectId
-        this.customFieldId = customFieldId
-        this.value = value
-
-    }
-
-    var reportId: Int = 0
-    var key: Int = 0
-    var name: String? = null
-    var objectId: String? = null
-    var customFieldId: String? = null
-    var value: Double? = null
-
-    fun toStaticReport(realm: Realm): StaticReport {
-        return StaticReport.newInstance(realm, this.reportId, this.customFieldId)
-    }
-
-    fun displayValue(realm: Realm): CharSequence {
-        this.name?.let { return it }
-        this.objectId?.let { realm.lookupForNameInAllTablesById(it) }
-        return NULL_TEXT
-    }
-
-    val stat: Stat
-        get() {
-            return Stat.valueByIdentifier(this.key.toInt())
-        }
-
-    val resId: Int?
-        get() {
-            return when (this.reportId) {
-                StaticReport.OptimalDuration.uniqueIdentifier -> LiveOnline.valueByIdentifier(this.key).resId
-                else -> stat.resId
-            }
-        }
-
-}

app/src/main/java/net/pokeranalytics/android/model/realm/Player.kt

@@ -4,20 +4,26 @@ import android.content.Context
 import io.realm.Realm
 import io.realm.RealmList
 import io.realm.RealmObject
-import io.realm.RealmResults
 import io.realm.annotations.Ignore
 import io.realm.annotations.PrimaryKey
+import io.realm.kotlin.where
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.model.interfaces.*
-import net.pokeranalytics.android.model.realm.handhistory.HandHistory
+import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource
 import net.pokeranalytics.android.ui.view.RowRepresentable
-import net.pokeranalytics.android.ui.view.RowUpdatable
+import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor
 import net.pokeranalytics.android.ui.view.RowViewType
-import net.pokeranalytics.android.ui.view.rows.PlayerPropertiesRow
+import net.pokeranalytics.android.ui.view.rowrepresentable.CustomizableRowRepresentable
+import net.pokeranalytics.android.ui.view.rowrepresentable.PlayerRow
+import net.pokeranalytics.android.ui.view.rowrepresentable.SeparatorRow
+import net.pokeranalytics.android.util.NULL_TEXT
 import net.pokeranalytics.android.util.RANDOM_PLAYER
+import net.pokeranalytics.android.util.extensions.isSameDay
+import net.pokeranalytics.android.util.extensions.mediumDate
 import java.util.*
+import kotlin.collections.ArrayList
 
-open class Player : RealmObject(), NameManageable, Savable, Deletable, RowRepresentable, RowUpdatable {
+open class Player : RealmObject(), NameManageable, Savable, Deletable, StaticRowRepresentableDataSource, RowRepresentable {
 
     @PrimaryKey
     override var id = UUID.randomUUID().toString()
@@ -37,6 +43,13 @@ open class Player : RealmObject(), NameManageable, Savable, Deletable, RowRepres
     @Ignore
     override val viewType: Int = RowViewType.ROW_PLAYER.ordinal
 
+    @Ignore
+    private var rowRepresentation: List<RowRepresentable> = mutableListOf()
+
+    @Ignore
+    private var commentsToDelete: ArrayList<Comment> = ArrayList()
+
+
     override fun isValidForDelete(realm: Realm): Boolean {
         //TODO
         return true
@@ -55,16 +68,70 @@ open class Player : RealmObject(), NameManageable, Savable, Deletable, RowRepres
         return R.string.relationship_error
     }
 
+    override fun adapterRows(): List<RowRepresentable>? {
+        return rowRepresentation
+    }
+
     override fun getDisplayName(context: Context): String {
         return this.name
     }
 
+    override fun charSequenceForRow(
+	    row: RowRepresentable,
+	    context: Context,
+	    tag: Int
+    ): CharSequence {
+        return when (row) {
+            PlayerRow.NAME -> if (this.name.isNotEmpty()) this.name else NULL_TEXT
+            else -> return super.charSequenceForRow(row, context, 0)
+        }
+    }
+
     override fun updateValue(value: Any?, row: RowRepresentable) {
         when (row) {
-            PlayerPropertiesRow.NAME -> this.name = value as String? ?: ""
+            PlayerRow.NAME -> this.name = value as String? ?: ""
-            PlayerPropertiesRow.SUMMARY -> this.summary = value as String? ?: ""
+            PlayerRow.SUMMARY -> this.summary = value as String? ?: ""
-            PlayerPropertiesRow.IMAGE -> this.picture = value as? String
+            PlayerRow.IMAGE -> this.picture = value as String? ?: ""
+        }
+    }
+
+    /**
+     * Update the row representation
+     */
+    private fun updatedRowRepresentationForCurrentState(): List<RowRepresentable> {
+        val rows = ArrayList<RowRepresentable>()
+        rows.add(PlayerRow.IMAGE)
+        rows.add(PlayerRow.NAME)
+        rows.add(PlayerRow.SUMMARY)
+
+        if (comments.size > 0) {
+            // Adds Comments section
+            rows.add(CustomizableRowRepresentable(RowViewType.HEADER_TITLE, R.string.comments))
+
+            val currentCommentCalendar = Calendar.getInstance()
+            val currentDateCalendar = Calendar.getInstance()
+
+            val commentsToDisplay = ArrayList<Comment>()
+            commentsToDisplay.addAll(comments)
+            commentsToDisplay.sortByDescending { it.date }
+
+            commentsToDisplay.forEachIndexed { index, comment ->
+                currentCommentCalendar.time = comment.date
+
+                if (!currentCommentCalendar.isSameDay(currentDateCalendar) || index == 0) {
+                    currentDateCalendar.time = currentCommentCalendar.time
+                    // Adds day sub section
+                    rows.add(CustomizableRowRepresentable(RowViewType.HEADER_SUBTITLE, title = currentDateCalendar.time.mediumDate()))
+                }
+
+                // Adds comment
+                rows.add(comment)
+            }
+
+            rows.add(SeparatorRow())
         }
+
+        return rows
     }
 
     /**
@@ -74,6 +141,57 @@ open class Player : RealmObject(), NameManageable, Savable, Deletable, RowRepres
         return picture != null && picture?.isNotEmpty() == true
     }
 
+    /**
+     * Update row representation
+     */
+    fun updateRowRepresentation() {
+        this.rowRepresentation = this.updatedRowRepresentationForCurrentState()
+    }
+
+
+    /**
+     * Add an entry
+     */
+    fun addComment(): Comment {
+        val entry = Comment()
+        this.comments.add(entry)
+        updateRowRepresentation()
+        return entry
+    }
+
+    /**
+     * Delete an entry
+     */
+    fun deleteComment(comment: Comment) {
+        commentsToDelete.add(comment)
+        this.comments.remove(comment)
+        updateRowRepresentation()
+    }
+
+    /**
+     * Clean up deleted entries
+     */
+    fun cleanupComments() { // called when saving the custom field
+        val realm = Realm.getDefaultInstance()
+        realm.executeTransaction {
+            this.commentsToDelete.forEach { // entries are out of realm
+                realm.where<Comment>().equalTo("id", it.id).findFirst()?.deleteFromRealm()
+            }
+        }
+        realm.close()
+        this.commentsToDelete.clear()
+    }
+
+    override fun editDescriptors(row: RowRepresentable): List<RowRepresentableEditDescriptor>? {
+
+        when (row) {
+            PlayerRow.NAME -> return row.editingDescriptors(mapOf("defaultValue" to this.name))
+            PlayerRow.SUMMARY -> return row.editingDescriptors(mapOf("defaultValue" to this.summary))
+        }
+
+        return null
+    }
+
     val initials: String
         get() {
             return if (this.name.isNotEmpty()) {
@@ -94,8 +212,4 @@ open class Player : RealmObject(), NameManageable, Savable, Deletable, RowRepres
             }
         }
 
-    fun hands(realm: Realm): RealmResults<HandHistory> {
-        return realm.where(HandHistory::class.java).equalTo("playerSetups.player.id", this.id).findAll()
-    }
-
 }

app/src/main/java/net/pokeranalytics/android/model/realm/ReportSetup.kt

@@ -6,7 +6,6 @@ import io.realm.RealmList
 import io.realm.RealmObject
 import io.realm.annotations.Ignore
 import io.realm.annotations.PrimaryKey
-import net.pokeranalytics.android.calculus.calcul.ReportDisplay
 import net.pokeranalytics.android.calculus.Calculator
 import net.pokeranalytics.android.calculus.Stat
 import net.pokeranalytics.android.model.Criteria
@@ -31,7 +30,7 @@ open class ReportSetup : RealmObject(), RowRepresentable, Deletable {
     var name: String = ""
 
     // The type of display of the report
-    var display: Int = ReportDisplay.TABLE.ordinal
+    var display: Int = Calculator.Options.Display.TABLE.ordinal
 
     /**
      * A list of statIds to compute
@@ -65,7 +64,7 @@ open class ReportSetup : RealmObject(), RowRepresentable, Deletable {
     /**
      * Returns the Options based on the ReportSetup parameters
      */
-    fun options(realm: Realm, reportDisplay: ReportDisplay): Calculator.Options {
+    fun options(realm: Realm): Calculator.Options {
 
             val stats = this.statIds.map { Stat.valueByIdentifier(it) }
 
@@ -81,8 +80,8 @@ open class ReportSetup : RealmObject(), RowRepresentable, Deletable {
             allCriteria.addAll(cfCriteria)
 
             return Calculator.Options(
+                display = Calculator.Options.Display.values()[this.display],
                 stats = stats,
-                progressValues = reportDisplay.progressValues,
                 criterias = allCriteria,
                 filter = this.filter,
                 userGenerated = true,

app/src/main/java/net/pokeranalytics/android/model/realm/Result.kt

@@ -75,10 +75,6 @@ open class Result : RealmObject(), Filterable {
 	 * Tips
  	 */
 	var tips: Double? = null
-		set(value) {
-			field = value
-			this.session?.computeStats()
-		}
 
 	// The transactions associated with the Result, impacting the result
     var transactions: RealmList<Transaction> = RealmList()
@@ -102,19 +98,13 @@ open class Result : RealmObject(), Filterable {
 	/**
 	 * Returns 1 if the session is positive
 	 */
-	val isPositive: Int
+	@Ignore
-		get() {
+	val isPositive: Int = if (this.net >= 0.0) 1 else 0
-			return if (session?.isTournament() == true) {
-				if ((this.cashout ?: -1.0) > 0.0) 1 else 0 // if cashout is null we want to count a negative session
-			} else {
-				if (this.net >= 0.0) 1 else 0
-			}
-		}
 
     // Computes the Net
     private fun computeNet(withBuyin: Boolean? = null) {
 
-        val transactionsSum = transactions.sumOf { it.amount }
+        val transactionsSum = transactions.sumByDouble { it.amount }
 
 	    // choose the method to compute the net
 	    var useBuyin = withBuyin ?: true
@@ -150,7 +140,7 @@ open class Result : RealmObject(), Filterable {
     fun computeNumberOfRebuy() {
         this.session?.let {
             if (it.isCashGame()) {
-                it.cgBiggestBet?.let { bb ->
+                it.cgBigBlind?.let { bb ->
                     if (bb > 0.0) {
                         this.numberOfRebuy = (this.buyin ?: 0.0) / (bb * 100.0)
                     } else {

app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt

@@ -16,7 +16,6 @@ import net.pokeranalytics.android.calculus.StatFormattingException
 import net.pokeranalytics.android.exceptions.ModelException
 import net.pokeranalytics.android.exceptions.PAIllegalStateException
 import net.pokeranalytics.android.model.Limit
-import net.pokeranalytics.android.model.Stakes
 import net.pokeranalytics.android.model.TableSize
 import net.pokeranalytics.android.model.TournamentType
 import net.pokeranalytics.android.model.extensions.SessionState
@@ -27,26 +26,25 @@ import net.pokeranalytics.android.model.filter.QueryCondition
 import net.pokeranalytics.android.model.filter.QueryCondition.*
 import net.pokeranalytics.android.model.interfaces.*
 import net.pokeranalytics.android.model.realm.handhistory.HandHistory
+import net.pokeranalytics.android.model.utils.CrashLogging
 import net.pokeranalytics.android.model.utils.SessionSetManager
 import net.pokeranalytics.android.ui.adapter.UnmanagedRowRepresentableException
+import net.pokeranalytics.android.ui.fragment.GraphFragment
 import net.pokeranalytics.android.ui.graph.Graph
 import net.pokeranalytics.android.ui.view.*
-import net.pokeranalytics.android.ui.view.rows.SessionPropertiesRow
+import net.pokeranalytics.android.ui.view.rowrepresentable.SessionRow
-import net.pokeranalytics.android.util.*
+import net.pokeranalytics.android.util.NULL_TEXT
-import net.pokeranalytics.android.util.extensions.hourMinute
+import net.pokeranalytics.android.util.TextFormat
-import net.pokeranalytics.android.util.extensions.shortDateTime
+import net.pokeranalytics.android.util.UserDefaults
-import net.pokeranalytics.android.util.extensions.toCurrency
+import net.pokeranalytics.android.util.extensions.*
-import net.pokeranalytics.android.util.extensions.toMinutes
 import java.text.DateFormat
-import java.text.NumberFormat
-import java.text.ParseException
 import java.util.*
 import java.util.Currency
 
 typealias BB = Double
 
-open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Timed,
+open class Session : RealmObject(), Savable, Editable, RowRepresentable, Timed,
-	TimeFilterable, Filterable, DatedBankrollGraphEntry, StakesHolder {
+	TimeFilterable, Filterable, DatedBankrollGraphEntry {
 
 	enum class Type(val value: String) {
 		CASH_GAME("Cash Game"),
@@ -77,9 +75,6 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 			}
 			session.type = if (isTournament) Type.TOURNAMENT.ordinal else Type.CASH_GAME.ordinal
 
-			session.limit = Limit.NO.ordinal
-			session.game = realm.where(Game::class.java).equalTo("shortName", "HE").findFirst()
-
 			return if (managed) {
 				realm.copyToRealm(session)
 			} else {
@@ -99,7 +94,7 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
                 AnyLimit::class.java -> "limit"
                 AnyTableSize::class.java -> "tableSize"
                 AnyTournamentType::class.java -> "tournamentType"
-                AnyStake::class.java -> "cgStakes"
+                AnyBlind::class.java -> "blinds"
                 NumberOfTable::class.java -> "numberOfTables"
                 NetAmountWon::class.java, NetAmountLost::class.java -> "computableResults.ratedNet"
                 NumberOfRebuy::class.java -> "result.numberOfRebuy"
@@ -110,9 +105,7 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
                 AnyDayOfWeek::class.java, IsWeekEnd::class.java, IsWeekDay::class.java -> "dayOfWeek"
                 AnyMonthOfYear::class.java -> "month"
                 AnyYear::class.java -> "year"
-				PastDay::class.java, IsToday::class.java, WasYesterday::class.java,
+				PastDay::class.java, IsToday::class.java, WasYesterday::class.java, WasTodayAndYesterday::class.java, DuringThisYear::class.java, DuringThisMonth::class.java, DuringThisWeek::class.java -> "startDate"
-				WasTodayAndYesterday::class.java, DuringThisYear::class.java,
-				DuringThisMonth::class.java, DuringThisWeek::class.java -> "startDate"
                 StartedFromTime::class.java -> "startDateHourMinuteComponent"
                 EndedToTime::class.java -> "endDateHourMinuteComponent"
                 Duration::class.java -> "netDuration"
@@ -121,7 +114,7 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
                 CustomFieldQuery::class.java -> "customFieldEntries.customFields.id"
 	            DateNotNull::class.java -> "startDate"
 	            EndDateNotNull::class.java -> "endDate"
-	            BiggestBetNotNull::class.java -> "cgBiggestBet"
+	            BigBlindNotNull::class.java -> "cgBigBlind"
                 else -> null
 			}
 		}
@@ -267,20 +260,12 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 	override var bankroll: Bankroll? = null
 		set(value) {
 			field = value
-            this.generateStakes()
+            this.formatBlinds()
-			this.computeStats()
 //			this.updateRowRepresentation()
 		}
 
 	// The limit type: NL, PL...
 	var limit: Int? = null
-		set(value) {
-			field = if (value != null && value >= 0) {
-				value
-			} else {
-				null
-			}
-		}
 
 	// The game played during the Session
 	var game: Game? = null
@@ -293,12 +278,6 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 
 	// The number of tables played at the same time
 	var numberOfTables: Int = 1
-		set(value) {
-			if (value > 0) {
-				field = value
-				this.computeStats()
-			}
-		}
 
 	// The hand histories of the session
 	@LinkingObjects("session")
@@ -313,43 +292,23 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 	// Cash Game
 
 	// The small blind value
-	var cgOldSmallBlind: Double? = null
+	var cgSmallBlind: Double? = null
 		set(value) {
 			field = value
+			formatBlinds()
 		}
 
 	// The big blind value
-	var cgOldBigBlind: Double? = null
+	var cgBigBlind: Double? = null
 		set(value) {
 			field = value
 			this.computeStats()
+			formatBlinds()
 			this.result?.computeNumberOfRebuy()
 		}
 
-//	var blinds: String? = null
+	var blinds: String? = null
-//		private set
+		private set
-
-	var cgAnte: Double? = null
-		set(value) {
-			field = value
-			this.generateStakes()
-			this.defineHighestBet()
-			this.computeStats()
-			this.result?.computeNumberOfRebuy()
-		}
-
-	var cgBlinds: String? = null
-		set(value) {
-			field = cleanupBlinds(value)
-			this.generateStakes()
-			this.defineHighestBet()
-			this.computeStats()
-			this.result?.computeNumberOfRebuy()
-		}
-
-	var cgBiggestBet: Double? = null
-
-	var cgStakes: String? = null
 
 	// Tournament
 
@@ -375,15 +334,8 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 	// The custom fields values
 	var customFieldEntries: RealmList<CustomFieldEntry> = RealmList()
 
-	// The number of hands played during the sessions
-	var handsCount: Int? = null
-		set(value) {
-			field = value
-			this.computeStats()
-		}
-
 	fun bankrollHasBeenUpdated() {
-		this.generateStakes()
+		formatBlinds()
 	}
 
 	/**
@@ -429,12 +381,17 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 
 	// Stats
 
+	@Ignore
+	val ONLINE_PLAYER_HANDS_PER_HOUR = 500.0
+	@Ignore
+	val LIVE_PLAYER_HANDS_PER_HOUR = 250.0
+
 	/**
 	 * The net result in big blinds
 	 */
 	val bbNet: BB
 		get() {
-			val bb = this.cgBiggestBet
+			val bb = this.cgBigBlind
 			val result = this.result
 			return if (bb != null && result != null) {
 				result.net / bb
@@ -449,14 +406,12 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 	@Ignore
 	var estimatedHands: Double = 0.0
 		get() {
-			this.handsCount?.let {
-				return it.toDouble()
-			}
 			val noh = this.numberOfHandsPerHour
 			val hd = this.hourlyDuration
 			return noh * hd
 		}
 
+
 	// DatedValue
 
 	@Ignore
@@ -501,9 +456,8 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 	val numberOfHandsPerHour: Double
 		get() {
 			val tableSize = this.tableSize ?: 9 // 9 is the default table size if null
-			val config = UserConfig.getConfiguration(this.realm)
+			val playerHandsPerHour = if (this.isLive) LIVE_PLAYER_HANDS_PER_HOUR else ONLINE_PLAYER_HANDS_PER_HOUR
-			val playerHandsPerHour = if (this.isLive) config.liveDealtHandsPerHour else config.onlineDealtHandsPerHour
+			return playerHandsPerHour / tableSize.toDouble()
-			return this.numberOfTables * playerHandsPerHour / tableSize.toDouble()
 		}
 
 	val hourlyRate: Double
@@ -675,8 +629,22 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 		return if (gameTitle.isNotBlank()) gameTitle else NULL_TEXT
 	}
 
-	fun getFormattedStakes(): String {
+	fun getFormattedBlinds(): String {
-		return this.cgStakes?.let { StakesHolder.readableStakes(it) } ?: run { NULL_TEXT }
+		return blinds ?: NULL_TEXT
+	}
+
+	fun formatBlinds() {
+		blinds = null
+		if (cgBigBlind == null) return
+		cgBigBlind?.let { bb ->
+			val sb = cgSmallBlind ?: bb / 2.0
+            val preFormattedBlinds = "${sb.formatted}/${bb.round()}"
+//            println("<<<<<< bb.toCurrency(currency) : ${bb.toCurrency(currency)}")
+//            println("<<<<<< preFormattedBlinds : $preFormattedBlinds")
+            val regex = Regex("-?\\d+(\\.\\d+)?")
+            blinds = bb.toCurrency(currency).replace(regex, preFormattedBlinds)
+//            println("<<<<<< blinds = $blinds")
+		}
 	}
 
 	// LifeCycle
@@ -686,8 +654,8 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 	 */
 	fun delete() {
 
+		CrashLogging.log("Deletes session. Id = ${this.id}")
 		if (isValid) {
-//			CrashLogging.log("Deletes session. Id = ${this.id}")
 			realm.executeTransaction {
 				cleanup()
 				deleteFromRealm()
@@ -712,15 +680,14 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 
 	}
 
-	fun duplicate(): Session {
+	fun duplicate() : Session {
 
 		val copy = newInstance(this.realm, this.isTournament(), this.bankroll)
 
 		copy.game = this.game
 		copy.limit = this.limit
-		copy.cgBlinds = this.cgBlinds
+		copy.cgSmallBlind = this.cgSmallBlind
-		copy.cgAnte = this.cgAnte
+		copy.cgBigBlind = this.cgBigBlind
-		copy.location = this.location
 		copy.tournamentEntryFee = this.tournamentEntryFee
 		copy.tournamentFeatures = this.tournamentFeatures
 		copy.tournamentName = this.tournamentName
@@ -741,38 +708,50 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 	override fun updateValue(value: Any?, row: RowRepresentable) {
 
 		when (row) {
-			SessionPropertiesRow.BANKROLL -> bankroll = value as Bankroll?
+			SessionRow.BANKROLL -> bankroll = value as Bankroll?
-			SessionPropertiesRow.STAKES -> if (value is Stakes) {
+			SessionRow.BLINDS -> if (value is ArrayList<*>) {
-				if (value.ante != null) {
+				cgSmallBlind = try {
-					this.cgAnte = value.ante
+					(value[0] as String? ?: "0").toDouble()
+				} catch (e: Exception) {
+					null
+				}
+
+				cgBigBlind = try {
+					(value[1] as String? ?: "0").toDouble()
+				} catch (e: Exception) {
+					null
+				}
+
+				cgBigBlind?.let {
+					if (cgSmallBlind == null || cgSmallBlind == 0.0) {
+						cgSmallBlind = it / 2.0
 					}
-				if (value.blinds != null) {
-					this.cgBlinds = value.blinds
 				}
 			} else if (value == null) {
-				this.cgBlinds = null
+				cgSmallBlind = null
-				this.cgAnte = null
+				cgBigBlind = null
 			}
-			SessionPropertiesRow.BREAK_TIME -> {
+			SessionRow.BREAK_TIME -> {
 				this.breakDuration = (value as Double? ?: 0.0).toLong() * 60 * 1000
 			}
-			SessionPropertiesRow.BUY_IN -> {
+			SessionRow.BUY_IN -> {
 				val localResult = getOrCreateResult()
 				localResult.buyin = value as Double?
+//				this.updateRowRepresentation()
 			}
-			SessionPropertiesRow.CASHED_OUT, SessionPropertiesRow.PRIZE -> {
+			SessionRow.CASHED_OUT, SessionRow.PRIZE -> {
 				val localResult = getOrCreateResult()
 				localResult.cashout = value as Double?
 			}
-			SessionPropertiesRow.NET_RESULT -> {
+			SessionRow.NET_RESULT -> {
 				val localResult = getOrCreateResult()
 				localResult.netResult = value as Double?
 			}
-			SessionPropertiesRow.COMMENT -> comment = value as String? ?: ""
+			SessionRow.COMMENT -> comment = value as String? ?: ""
-			SessionPropertiesRow.END_DATE -> if (value is Date?) {
+			SessionRow.END_DATE -> if (value is Date?) {
 				this.endDate = value
 			}
-			SessionPropertiesRow.GAME -> {
+			SessionRow.GAME -> {
 				if (value is ArrayList<*>) {
 					limit = try {
 						(value[0] as Int?)
@@ -791,18 +770,18 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 					game = null
 				}
 			}
-			SessionPropertiesRow.INITIAL_BUY_IN -> {
+			SessionRow.INITIAL_BUY_IN -> {
 				this.tournamentEntryFee = (value as Double?)
 			}
-			SessionPropertiesRow.LOCATION -> location = value as Location?
+			SessionRow.LOCATION -> location = value as Location?
-			SessionPropertiesRow.PLAYERS -> {
+			SessionRow.PLAYERS -> {
 				if (value is Double) {
 					this.tournamentNumberOfPlayers = value.toInt()
 				} else {
 					this.tournamentNumberOfPlayers = null
 				}
 			}
-			SessionPropertiesRow.POSITION -> {
+			SessionRow.POSITION -> {
 				val localResult = if (result != null) result as Result else realm.createObject(Result::class.java)
 				if (value is Double) {
 					localResult.tournamentFinalPosition = value.toInt()
@@ -811,17 +790,17 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 				}
 				result = localResult
 			}
-			SessionPropertiesRow.START_DATE -> if (value is Date) {
+			SessionRow.START_DATE -> if (value is Date) {
 				this.startDate = value
 			}
-			SessionPropertiesRow.TABLE_SIZE -> tableSize = value as Int?
+			SessionRow.TABLE_SIZE -> tableSize = value as Int?
-			SessionPropertiesRow.TIPS -> {
+			SessionRow.TIPS -> {
 				val localResult = getOrCreateResult()
 				localResult.tips = value as Double?
 			}
-			SessionPropertiesRow.TOURNAMENT_NAME -> tournamentName = value as TournamentName?
+			SessionRow.TOURNAMENT_NAME -> tournamentName = value as TournamentName?
-			SessionPropertiesRow.TOURNAMENT_TYPE -> tournamentType = (value as TournamentType?)?.ordinal
+			SessionRow.TOURNAMENT_TYPE -> tournamentType = (value as TournamentType?)?.ordinal
-			SessionPropertiesRow.TOURNAMENT_FEATURE -> {
+			SessionRow.TOURNAMENT_FEATURE -> {
 
 				value?.let {
 					tournamentFeatures = RealmList()
@@ -830,8 +809,6 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 					tournamentFeatures.removeAll(this.tournamentFeatures)
 				}
 			}
-			SessionPropertiesRow.HANDS_COUNT -> handsCount = (value as Double?)?.toInt()
-			SessionPropertiesRow.NUMBER_OF_TABLES -> this.numberOfTables = (value as Double?)?.toInt() ?: 1
 			is CustomField -> {
 				customFieldEntries.filter { it.customField?.id == row.id }.let {
 					customFieldEntries.removeAll(it)
@@ -897,7 +874,7 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 					this.bbNet,
 					this.estimatedHands
 				)
-				Stat.AVERAGE_NET_BB, Stat.BB_NET_RESULT -> this.bbNet
+				Stat.AVERAGE_NET_BB -> this.bbNet
 				Stat.HOURLY_DURATION, Stat.AVERAGE_HOURLY_DURATION -> this.netDuration.toDouble()
 				Stat.HOURLY_RATE, Stat.STANDARD_DEVIATION_HOURLY -> this.hourlyRate
 				Stat.HANDS_PLAYED -> this.estimatedHands
@@ -968,30 +945,30 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 	fun charSequenceForRow(row: RowRepresentable, context: Context): String {
 
 		return when (row) {
-			SessionPropertiesRow.BANKROLL -> bankroll?.name ?: NULL_TEXT
+			SessionRow.BANKROLL -> bankroll?.name ?: NULL_TEXT
-			SessionPropertiesRow.STAKES -> getFormattedStakes()
+			SessionRow.BLINDS -> getFormattedBlinds()
-			SessionPropertiesRow.BREAK_TIME -> if (this.breakDuration > 0.0) this.breakDuration.toMinutes() else NULL_TEXT
+			SessionRow.BREAK_TIME -> if (this.breakDuration > 0.0) this.breakDuration.toMinutes() else NULL_TEXT
-			SessionPropertiesRow.BUY_IN -> this.result?.buyin?.toCurrency(currency) ?: NULL_TEXT
+			SessionRow.BUY_IN -> this.result?.buyin?.toCurrency(currency) ?: NULL_TEXT
-			SessionPropertiesRow.CASHED_OUT, SessionPropertiesRow.PRIZE -> this.result?.cashout?.toCurrency(currency) ?: NULL_TEXT
+			SessionRow.CASHED_OUT, SessionRow.PRIZE -> this.result?.cashout?.toCurrency(currency) ?: NULL_TEXT
-			SessionPropertiesRow.NET_RESULT -> this.result?.netResult?.toCurrency(currency) ?: NULL_TEXT
+			SessionRow.NET_RESULT -> this.result?.netResult?.toCurrency(currency) ?: NULL_TEXT
-			SessionPropertiesRow.COMMENT -> if (this.comment.isNotEmpty()) this.comment else NULL_TEXT
+			SessionRow.COMMENT -> if (this.comment.isNotEmpty()) this.comment else NULL_TEXT
-			SessionPropertiesRow.END_DATE -> this.endDate?.shortDateTime() ?: NULL_TEXT
+			SessionRow.END_DATE -> this.endDate?.shortDateTime() ?: NULL_TEXT
-			SessionPropertiesRow.GAME -> getFormattedGame()
+			SessionRow.GAME -> getFormattedGame()
-			SessionPropertiesRow.INITIAL_BUY_IN -> tournamentEntryFee?.toCurrency(currency) ?: NULL_TEXT
+			SessionRow.INITIAL_BUY_IN -> tournamentEntryFee?.toCurrency(currency) ?: NULL_TEXT
-			SessionPropertiesRow.LOCATION -> location?.name ?: NULL_TEXT
+			SessionRow.LOCATION -> location?.name ?: NULL_TEXT
-			SessionPropertiesRow.PLAYERS -> tournamentNumberOfPlayers?.toString() ?: NULL_TEXT
+			SessionRow.PLAYERS -> tournamentNumberOfPlayers?.toString() ?: NULL_TEXT
-			SessionPropertiesRow.POSITION -> result?.tournamentFinalPosition?.toString() ?: NULL_TEXT
+			SessionRow.POSITION -> result?.tournamentFinalPosition?.toString() ?: NULL_TEXT
-			SessionPropertiesRow.START_DATE -> this.startDate?.shortDateTime() ?: NULL_TEXT
+			SessionRow.START_DATE -> this.startDate?.shortDateTime() ?: NULL_TEXT
-			SessionPropertiesRow.TABLE_SIZE -> this.tableSize?.let { TableSize(it).localizedTitle(context) } ?: NULL_TEXT
+			SessionRow.TABLE_SIZE -> this.tableSize?.let { TableSize(it).localizedTitle(context) } ?: NULL_TEXT
-			SessionPropertiesRow.TIPS -> result?.tips?.toCurrency(currency) ?: NULL_TEXT
+			SessionRow.TIPS -> result?.tips?.toCurrency(currency) ?: NULL_TEXT
-			SessionPropertiesRow.TOURNAMENT_TYPE -> {
+			SessionRow.TOURNAMENT_TYPE -> {
 				this.tournamentType?.let {
 					TournamentType.values()[it].localizedTitle(context)
 				} ?: run {
 					NULL_TEXT
 				}
 			}
-			SessionPropertiesRow.TOURNAMENT_FEATURE -> {
+			SessionRow.TOURNAMENT_FEATURE -> {
 				if (tournamentFeatures.size > 2) {
 					"${tournamentFeatures.subList(0, 2).joinToString {
 						it.name
@@ -1004,10 +981,8 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 					NULL_TEXT
 				}
 			}
-			SessionPropertiesRow.TOURNAMENT_NAME -> tournamentName?.name ?: NULL_TEXT
+			SessionRow.TOURNAMENT_NAME -> tournamentName?.name ?: NULL_TEXT
-			SessionPropertiesRow.HANDS -> this.handHistories?.size.toString()
+			SessionRow.HANDS -> this.handHistories?.size.toString()
-			SessionPropertiesRow.HANDS_COUNT -> this.handsCountFormatted(context)
-			SessionPropertiesRow.NUMBER_OF_TABLES -> this.numberOfTables.toString()
 			is CustomField -> {
 				customFieldEntries.find { it.customField?.id == row.id }?.let { customFieldEntry ->
 					return customFieldEntry.getFormattedValue(currency)
@@ -1018,11 +993,6 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 		}
 	}
 
-	private fun handsCountFormatted(context: Context): String {
-		return this.handsCount?.toString() ?:
-			"${estimatedHands.toInt()} (${context.getString(R.string.estimated)})"
-	}
-
 	fun clearBuyinCashedOut() {
 		this.result?.buyin = null
 		this.result?.cashout = null
@@ -1032,46 +1002,4 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 		this.result?.netResult = null
 	}
 
-	private fun cleanupBlinds(blinds: String?): String? {
-
-		if (blinds == null) {
-			return null
-		}
-
-		val blindValues = blinds.split(BLIND_SEPARATOR).mapNotNull {
-			try {
-				NumberFormat.getInstance().parse(it)
-			} catch (e: ParseException) {
-				null
-			}
-		}
-		return if (blindValues.isNotEmpty()) {
-			blindValues.joinToString(BLIND_SEPARATOR)
-		} else {
-			null
-		}
-	}
-
-	/// StakesHolder
-
-	override val ante: Double?
-		get() { return this.cgAnte }
-
-	override val blinds: String?
-		get() { return  this.cgBlinds }
-
-	override val biggestBet: Double?
-		get() { return this.cgBiggestBet }
-
-	override val stakes: String?
-		get() { return this.cgStakes }
-
-	override fun setHolderStakes(stakes: String?) {
-		this.cgStakes = stakes
-	}
-
-	override fun setHolderBiggestBet(biggestBet: Double?) {
-		this.cgBiggestBet = biggestBet
-	}
-
 }

app/src/main/java/net/pokeranalytics/android/model/realm/SessionSet.kt

@@ -61,9 +61,9 @@ open class SessionSet() : RealmObject(), Timed, Filterable {
     override var netDuration: Long = 0L
 
 	fun computeStats() {
-		this.ratedNet = this.sessions?.sumOf { it.computableResult?.ratedNet ?: 0.0 } ?: 0.0
+		this.ratedNet = this.sessions?.sumByDouble { it.computableResult?.ratedNet ?: 0.0 } ?: 0.0
-		this.estimatedHands = this.sessions?.sumOf { it.estimatedHands } ?: 0.0
+		this.estimatedHands = this.sessions?.sumByDouble { it.estimatedHands } ?: 0.0
-		this.bbNet = this.sessions?.sumOf { it.bbNet } ?: 0.0
+		this.bbNet = this.sessions?.sumByDouble { it.bbNet } ?: 0.0
 		this.breakDuration =  this.sessions?.max("breakDuration")?.toLong() ?: 0L
 	}
 

app/src/main/java/net/pokeranalytics/android/model/realm/TournamentFeature.kt

@@ -8,21 +8,21 @@ import io.realm.annotations.Ignore
 import io.realm.annotations.PrimaryKey
 import io.realm.kotlin.where
 import net.pokeranalytics.android.R
-import net.pokeranalytics.android.model.interfaces.UsageCountable
+import net.pokeranalytics.android.model.interfaces.CountableUsage
 import net.pokeranalytics.android.model.interfaces.Identifiable
 import net.pokeranalytics.android.model.interfaces.NameManageable
 import net.pokeranalytics.android.model.interfaces.SaveValidityStatus
 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.RowUpdatable
+import net.pokeranalytics.android.ui.view.rowrepresentable.SimpleRow
-import net.pokeranalytics.android.ui.view.rows.SimpleRow
+import net.pokeranalytics.android.ui.view.rowrepresentable.TournamentFeatureRow
-import net.pokeranalytics.android.ui.view.rows.TournamentFeatureRow
 import net.pokeranalytics.android.util.NULL_TEXT
 import java.util.*
 import kotlin.collections.ArrayList
 
-open class TournamentFeature : RealmObject(), RowRepresentable, RowUpdatable, NameManageable, StaticRowRepresentableDataSource, UsageCountable {
+open class TournamentFeature : RealmObject(), NameManageable, StaticRowRepresentableDataSource, RowRepresentable,
+    CountableUsage {
 
     companion object {
         val rowRepresentation : List<RowRepresentable> by lazy {

app/src/main/java/net/pokeranalytics/android/model/realm/TournamentName.kt

@@ -13,16 +13,14 @@ import net.pokeranalytics.android.model.interfaces.SaveValidityStatus
 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.RowUpdatable
+import net.pokeranalytics.android.ui.view.rowrepresentable.SimpleRow
-import net.pokeranalytics.android.ui.view.rows.SimpleRow
+import net.pokeranalytics.android.ui.view.rowrepresentable.TournamentNameRow
-import net.pokeranalytics.android.ui.view.rows.TournamentNameRow
 import net.pokeranalytics.android.util.NULL_TEXT
 import java.util.*
 import kotlin.collections.ArrayList
 
 
-open class TournamentName : RealmObject(), NameManageable, StaticRowRepresentableDataSource,
+open class TournamentName : RealmObject(), NameManageable, StaticRowRepresentableDataSource, RowRepresentable {
-	RowUpdatable, RowRepresentable {
 	companion object {
 		val rowRepresentation : List<RowRepresentable> by lazy {
 			val rows = ArrayList<RowRepresentable>()

app/src/main/java/net/pokeranalytics/android/model/realm/Transaction.kt

@@ -12,20 +12,24 @@ import net.pokeranalytics.android.model.filter.QueryCondition
 import net.pokeranalytics.android.model.interfaces.*
 import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource
 import net.pokeranalytics.android.ui.graph.Graph
-import net.pokeranalytics.android.ui.view.*
+import net.pokeranalytics.android.ui.view.DefaultLegendValues
-import net.pokeranalytics.android.ui.view.rows.TransactionPropertiesRow
+import net.pokeranalytics.android.ui.view.LegendContent
+import net.pokeranalytics.android.ui.view.RowRepresentable
+import net.pokeranalytics.android.ui.view.RowViewType
+import net.pokeranalytics.android.ui.view.rowrepresentable.TransactionRow
 import net.pokeranalytics.android.util.TextFormat
 import net.pokeranalytics.android.util.extensions.findById
 import java.text.DateFormat
 import java.util.*
-import kotlin.math.abs
+import kotlin.collections.ArrayList
 
-open class Transaction : RealmObject(), RowRepresentable, RowUpdatable, Manageable, StaticRowRepresentableDataSource, TimeFilterable,
+
+open class Transaction : RealmObject(), Manageable, StaticRowRepresentableDataSource, RowRepresentable, TimeFilterable,
 	Filterable, DatedBankrollGraphEntry {
 
 	companion object {
 
-		fun newInstance(realm: Realm, bankroll: Bankroll, date: Date? = null, type: TransactionType, amount: Double, comment: String? = null, destination: Bankroll? = null, transferRate: Double? = null): Transaction {
+		fun newInstance(realm: Realm, bankroll: Bankroll, date: Date? = null, type: TransactionType, amount: Double, comment: String? = null): Transaction {
 
 			val transaction = realm.copyToRealm(Transaction())
 			transaction.date = date ?: Date()
@@ -33,14 +37,14 @@ open class Transaction : RealmObject(), RowRepresentable, RowUpdatable, Manageab
 			transaction.type = type
 			transaction.bankroll = bankroll
 			transaction.comment = comment ?: ""
-			transaction.destination = destination
-			transaction.transferRate = transferRate
 
-			if (destination != null) { // we make sure transfers are negative
+			return transaction
-				transaction.amount = abs(amount) * -1
 		}
 
-			return transaction
+		val rowRepresentation: List<RowRepresentable> by lazy {
+			val rows = ArrayList<RowRepresentable>()
+			rows.addAll(TransactionRow.values())
+			rows
 		}
 
 		fun fieldNameForQueryType(queryCondition: Class<out QueryCondition>): String? {
@@ -73,13 +77,6 @@ open class Transaction : RealmObject(), RowRepresentable, RowUpdatable, Manageab
 
 	// The amount of the transaction
 	override var amount: Double = 0.0
-		set(value) {
-			field = value
-			computeRatedAmount()
-		}
-
-	// The amount of the transaction
-	var ratedAmount: Double = 0.0
 
 	// The date of the transaction
 	override var date: Date = Date()
@@ -94,12 +91,6 @@ open class Transaction : RealmObject(), RowRepresentable, RowUpdatable, Manageab
 	// A user comment
 	var comment: String = ""
 
-	// The destination Bankroll of a transfer
-	var destination: Bankroll? = null
-
-	// The rate of the transfer when bankrolls are in different currencies
-	var transferRate: Double? = null
-
 	// Timed interface
 	override var dayOfWeek: Int? = null
 	override var month: Int? = null
@@ -109,34 +100,18 @@ open class Transaction : RealmObject(), RowRepresentable, RowUpdatable, Manageab
 	@Ignore
 	override val viewType: Int = RowViewType.ROW_TRANSACTION.ordinal
 
-	enum class Field(val identifier: String) {
-		RATED_AMOUNT("ratedAmount")
-	}
-
-	fun computeRatedAmount() {
-		val rate = this.bankroll?.currency?.rate ?: 1.0
-		this.ratedAmount = rate * this.amount
-	}
-
-	val displayAmount: Double
-		get() { // for transfers we want to show a positive value (in the feed for instance)
-			return if (this.destination == null) { this.amount } else { abs(this.amount) }
-		}
-
 	override fun updateValue(value: Any?, row: RowRepresentable) {
 		when (row) {
-			TransactionPropertiesRow.BANKROLL -> bankroll = value as Bankroll?
+			TransactionRow.BANKROLL -> bankroll = value as Bankroll?
-			TransactionPropertiesRow.TYPE -> type = value as TransactionType?
+			TransactionRow.TYPE -> type = value as TransactionType?
-			TransactionPropertiesRow.AMOUNT -> amount = if (value == null) 0.0 else (value as String).toDouble()
+			TransactionRow.AMOUNT -> amount = if (value == null) 0.0 else (value as String).toDouble()
-			TransactionPropertiesRow.COMMENT -> comment = value as String? ?: ""
+			TransactionRow.COMMENT -> comment = value as String? ?: ""
-			TransactionPropertiesRow.DATE -> date = value as Date? ?: Date()
+			TransactionRow.DATE -> date = value as Date? ?: Date()
-			TransactionPropertiesRow.DESTINATION -> destination = value as? Bankroll
-			TransactionPropertiesRow.RATE -> transferRate = (value as String?)?.toDouble()
 		}
 	}
 
 	override fun adapterRows(): List<RowRepresentable>? {
-		return rowRepresentation()
+		return rowRepresentation
 	}
 
 	override fun isValidForSave(): Boolean {
@@ -172,24 +147,6 @@ open class Transaction : RealmObject(), RowRepresentable, RowUpdatable, Manageab
 		return SaveValidityStatus.VALID
 	}
 
-	fun rowRepresentation(): List<RowRepresentable> {
-		val rows = ArrayList<RowRepresentable>()
-		when (this.type?.kind) {
-			TransactionType.Value.TRANSFER.uniqueIdentifier -> {
-				if (this.bankroll != null && this.bankroll?.currency?.code != this.destination?.currency?.code) {
-					rows.addAll(TransactionPropertiesRow.transferRateRows)
-				} else {
-					rows.addAll(TransactionPropertiesRow.transferRows)
-				}
-			}
-			else -> {
-				rows.addAll(TransactionPropertiesRow.baseRows)
-			}
-		}
-
-		return rows
-	}
-
 	// GraphIdentifiableEntry
 
 	@Ignore

app/src/main/java/net/pokeranalytics/android/model/realm/TransactionType.kt

@@ -13,16 +13,16 @@ import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource
 import net.pokeranalytics.android.ui.view.Localizable
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor
-import net.pokeranalytics.android.ui.view.RowUpdatable
+import net.pokeranalytics.android.ui.view.rowrepresentable.SimpleRow
-import net.pokeranalytics.android.ui.view.rows.SimpleRow
+import net.pokeranalytics.android.ui.view.rowrepresentable.TransactionTypeRow
-import net.pokeranalytics.android.ui.view.rows.TransactionTypePropertiesRow
 import net.pokeranalytics.android.util.enumerations.IntIdentifiable
 import net.pokeranalytics.android.util.enumerations.IntSearchable
 import java.util.*
+import kotlin.collections.ArrayList
 
 
-open class TransactionType : RealmObject(), RowRepresentable, RowUpdatable, NameManageable, StaticRowRepresentableDataSource,
+open class TransactionType : RealmObject(), NameManageable, StaticRowRepresentableDataSource, RowRepresentable,
-	UsageCountable {
+	CountableUsage {
 
 	enum class Value(override var uniqueIdentifier: Int, val additive: Boolean) : IntIdentifiable, Localizable {
 
@@ -30,9 +30,7 @@ open class TransactionType : RealmObject(), RowRepresentable, RowUpdatable, Name
 		DEPOSIT(1, true),
 		BONUS(2, true),
 		STACKING_INCOMING(3, true),
-		STACKING_OUTGOING(4, false),
+		STACKING_OUTGOING(4, false);
-		TRANSFER(5, false),
-		EXPENSE(6, false); // not created by default, only used for poker base import atm
 
 		companion object : IntSearchable<Value> {
 
@@ -49,8 +47,6 @@ open class TransactionType : RealmObject(), RowRepresentable, RowUpdatable, Name
 					BONUS -> R.string.bonus
 					STACKING_INCOMING -> R.string.stacking_incoming
 					STACKING_OUTGOING -> R.string.stacking_outgoing
-					TRANSFER -> R.string.transfer
-					EXPENSE -> R.string.expense
 				}
 			}
 
@@ -60,7 +56,7 @@ open class TransactionType : RealmObject(), RowRepresentable, RowUpdatable, Name
 		val rowRepresentation: List<RowRepresentable> by lazy {
 			val rows = ArrayList<RowRepresentable>()
 			rows.add(SimpleRow.NAME)
-			rows.addAll(TransactionTypePropertiesRow.values())
+			rows.addAll(TransactionTypeRow.values())
 			rows
 		}
 
@@ -72,10 +68,6 @@ open class TransactionType : RealmObject(), RowRepresentable, RowUpdatable, Name
 			throw PAIllegalStateException("Transaction type ${value.name} should exist in database!")
 		}
 
-		fun getOrCreate(realm: Realm, value: Value, context: Context): TransactionType {
-			return getOrCreate(realm, value.localizedTitle(context), value.additive)
-		}
-
 		fun getOrCreate(realm: Realm, name: String, additive: Boolean): TransactionType {
 			val type = realm.where(TransactionType::class.java).equalTo("name", name).findFirst()
 			return if (type != null) {
@@ -139,7 +131,7 @@ open class TransactionType : RealmObject(), RowRepresentable, RowUpdatable, Name
 
 	override fun boolForRow(row: RowRepresentable): Boolean {
 		return when (row) {
-			TransactionTypePropertiesRow.TRANSACTION_ADDITIVE -> this.additive
+			TransactionTypeRow.TRANSACTION_ADDITIVE -> this.additive
 			else -> super.boolForRow(row)
 		}
 	}
@@ -151,7 +143,7 @@ open class TransactionType : RealmObject(), RowRepresentable, RowUpdatable, Name
 	override fun updateValue(value: Any?, row: RowRepresentable) {
 		when (row) {
 			SimpleRow.NAME -> this.name = value as String? ?: ""
-			TransactionTypePropertiesRow.TRANSACTION_ADDITIVE -> this.additive = value as Boolean? ?: false
+			TransactionTypeRow.TRANSACTION_ADDITIVE -> this.additive = value as Boolean? ?: false
 		}
 	}
 

app/src/main/java/net/pokeranalytics/android/model/realm/UserConfig.kt

@@ -1,41 +0,0 @@
-package net.pokeranalytics.android.model.realm
-
-import io.realm.Realm
-import io.realm.RealmObject
-import io.realm.annotations.PrimaryKey
-import net.pokeranalytics.android.util.UUID_SEPARATOR
-import net.pokeranalytics.android.util.extensions.findById
-import java.util.*
-
-open class UserConfig : RealmObject() {
-
-	companion object {
-
-		fun getConfiguration(realm: Realm): UserConfig {
-			realm.where(UserConfig::class.java).findFirst()?.let { config ->
-				return config
-			}
-			return UserConfig()
-		}
-
-	}
-
-	@PrimaryKey
-	var id = UUID.randomUUID().toString()
-
-	var liveDealtHandsPerHour: Int = 250
-
-	var onlineDealtHandsPerHour: Int = 500
-
-	var transactionTypeIds: String = ""
-
-	fun setTransactionTypeIds(transactionTypes: Set<TransactionType>) {
-		this.transactionTypeIds = transactionTypes.joinToString(UUID_SEPARATOR) { it.id }
-	}
-
-	fun transactionTypes(realm: Realm): List<TransactionType> {
-		val ids = this.transactionTypeIds.split(UUID_SEPARATOR)
-		return ids.mapNotNull { realm.findById(it) }
-	}
-
-}

app/src/main/java/net/pokeranalytics/android/model/realm/handhistory/Card.kt

@@ -14,7 +14,6 @@ import net.pokeranalytics.android.exceptions.PAIllegalStateException
 import net.pokeranalytics.android.model.handhistory.Street
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowViewType
-import timber.log.Timber
 
 interface CardProperty
 
@@ -25,10 +24,11 @@ fun List<Card>.formatted(context: Context) : CharSequence? {
 	var span: CharSequence? = null
 	this.forEach {
 		val formatted = it.formatted(context)
-		span = if (span == null) {
+		if (span == null) {
-			formatted
+			span = formatted
-		} else {
+		}
-			TextUtils.concat(span, formatted)
+		else {
+			span = TextUtils.concat(span, formatted)
 		}
 	}
 	return span
@@ -95,10 +95,6 @@ open class Card : RealmObject() {
 
 		companion object {
 
-			val baseSuits: List<Suit> by lazy {
-				listOf(SPADES, HEART, DIAMOND, CLOVER)
-			}
-
 			val displaySuits: List<Suit> by lazy {
 				listOf(SPADES, HEART, DIAMOND, CLOVER, UNDEFINED)
 			}
@@ -244,49 +240,9 @@ open class Card : RealmObject() {
 		}
 	}
 
-	fun copy(): Card {
-		val card = Card()
-		card.value = this.value
-		card.suit = this.suit
-		return card
-	}
-
 	val isWildCard: Boolean
 		get() {
-			return this.value == null || this.isSuitWildCard
+			return this.value == null || this.suit == null || this.suit == Suit.UNDEFINED
-		}
-
-	val isSuitWildCard: Boolean
-		get() {
-			return this.suit == null || this.suit == Suit.UNDEFINED
 		}
 
 }
-
-fun List<Card>.putSuits(usedCards: MutableList<Card>) : List<Card> {
-
-	fun getLeastUsedValidSuit(value: Int, usedCards: MutableList<Card>, addedCards: List<Card>): Card.Suit {
-		val availableSuits = Card.Suit.baseSuits.toMutableList()
-		usedCards.filter { it.value == value }.forEach { availableSuits.remove(it.suit) }
-
-		val currentCards = this.drop(addedCards.size) + addedCards
-		val cardsPerSuit = availableSuits.associateWith { suit ->
-			currentCards.filter { it.suit == suit }
-		}
-		return cardsPerSuit.minByOrNull { it.value.count() }!!.key
-	}
-
-	val list = mutableListOf<Card>()
-
-	this.forEach { cardToClone ->
-		val card = cardToClone.copy()
-		if (card.value != null && card.isSuitWildCard) {
-			card.suit = getLeastUsedValidSuit(card.value!!, usedCards, list)
-			usedCards.add(card)
-			Timber.d("Selected suit for wildcard: ${card.suit?.value}, value = ${card.value}")
-		}
-		list.add(card)
-	}
-	return list
-}
-

app/src/main/java/net/pokeranalytics/android/model/realm/handhistory/HandHistory.kt

@@ -15,8 +15,10 @@ import net.pokeranalytics.android.model.filter.Filterable
 import net.pokeranalytics.android.model.handhistory.HandSetup
 import net.pokeranalytics.android.model.handhistory.Position
 import net.pokeranalytics.android.model.handhistory.Street
-import net.pokeranalytics.android.model.interfaces.*
+import net.pokeranalytics.android.model.interfaces.Deletable
-import net.pokeranalytics.android.model.realm.Bankroll
+import net.pokeranalytics.android.model.interfaces.DeleteValidityStatus
+import net.pokeranalytics.android.model.interfaces.Identifiable
+import net.pokeranalytics.android.model.interfaces.TimeFilterable
 import net.pokeranalytics.android.model.realm.Session
 import net.pokeranalytics.android.ui.modules.handhistory.evaluator.EvaluatorBridge
 import net.pokeranalytics.android.ui.modules.handhistory.model.ActionReadRow
@@ -26,14 +28,13 @@ import net.pokeranalytics.android.ui.view.RowViewType
 import net.pokeranalytics.android.util.extensions.addLineReturn
 import net.pokeranalytics.android.util.extensions.formatted
 import net.pokeranalytics.android.util.extensions.fullDate
-import timber.log.Timber
 import java.util.*
 import kotlin.math.max
 
 data class PositionAmount(var position: Int, var amount: Double, var isAllin: Boolean)
 
 open class HandHistory : RealmObject(), Deletable, RowRepresentable, Filterable, TimeFilterable,
-	CardHolder, Comparator<PositionAmount>, StakesHolder {
+	CardHolder, Comparator<PositionAmount> {
 
 	@PrimaryKey
 	override var id = UUID.randomUUID().toString()
@@ -62,67 +63,34 @@ open class HandHistory : RealmObject(), Deletable, RowRepresentable, Filterable,
 	/***
 	 * The small blind
 	 */
-	var oldSmallBlind: Double? = null
+	var smallBlind: Double? = null
 		set(value) {
 			field = value
-//			if (this.bigBlind == null && value != null) {
+			if (this.bigBlind == null && value != null) {
-//				this.bigBlind = value * 2
+				this.bigBlind = value * 2
-//			}
+			}
 		}
 
 	/***
 	 * The big blind
 	 */
-	var oldBigBlind: Double? = null
+	var bigBlind: Double? = null
 		set(value) {
 			field = value
-//			if (this.smallBlind == null && value != null) {
+			if (this.smallBlind == null && value != null) {
-//				this.smallBlind = value / 2
+				this.smallBlind = value / 2
-//			}
 			}
-
-	/***
-	 * Big blind ante
-	 */
-	var bigBlindAnte: Boolean = false
-
-	/***
-	 * The ante
-	 */
-	override var ante: Double? = 0.0
-		set(value) {
-			field = value
-			this.generateStakes()
-			this.defineHighestBet()
 		}
 
 	/***
-	 * The blinds
+	 * The ante
 	 */
-	override var blinds: String? = null
+	var ante: Double = 0.0
-		set(value) {
-			field = value
-			this.generateStakes()
-			this.defineHighestBet()
-		}
-
-	override var biggestBet: Double? = null
 
 	/***
-	 * The coded stakes
+	 * Big blind ante
 	 */
-	override var stakes: String? = null
+	var bigBlindAnte: Boolean = false
-
-	override val bankroll: Bankroll?
-		get() { return this.session?.bankroll }
-
-	override fun setHolderStakes(stakes: String?) {
-		this.stakes = stakes
-	}
-
-	override fun setHolderBiggestBet(biggestBet: Double?) {
-		this.biggestBet = biggestBet
-	}
 
 	/***
 	 * Number of players in the hand
@@ -190,15 +158,13 @@ open class HandHistory : RealmObject(), Deletable, RowRepresentable, Filterable,
 	/***
 	 * Configures a hand history with a [handSetup]
 	 */
-	fun configure(handSetup: HandSetup, keepPlayers: Boolean = false) {
+	fun configure(handSetup: HandSetup) {
 
-		if (!keepPlayers) {
 		this.playerSetups.removeAll(this.playerSetups)
-		}
 
 		handSetup.tableSize?.let { this.numberOfPlayers = it }
-		handSetup.ante?.let { this.ante = it }
+		handSetup.smallBlind?.let { this.smallBlind = it }
-		handSetup.blinds?.let { this.blinds = it }
+		handSetup.bigBlind?.let { this.bigBlind = it }
 
 		this.session = handSetup.session
 		this.date = this.session?.handHistoryAutomaticDate ?: Date()
@@ -213,32 +179,18 @@ open class HandHistory : RealmObject(), Deletable, RowRepresentable, Filterable,
 
 		this.actions.clear()
 
-		var blindValues = this.blindValues
+		this.addAction(0, Action.Type.POST_SB, this.smallBlind)
-		if (blindValues.isNotEmpty()) {
+		this.addAction(1, Action.Type.POST_BB, this.bigBlind)
-			blindValues.forEachIndexed { index, blind ->
+
-				val action = when(index) {
+//		var lastStraddler: Int? = null
-					0 -> Action.Type.POST_SB
-					1 -> Action.Type.POST_BB
-					else -> null
-				}
-				action?.let { this.addAction(index, action, blind) }
-			}
-		} else {
-			this.addAction(0, Action.Type.POST_SB, this.oldSmallBlind)
-			this.addAction(1, Action.Type.POST_BB, this.oldBigBlind)
-		}
 
-		blindValues = blindValues.drop(2)
 		val positions = Position.positionsPerPlayers(this.numberOfPlayers)
-		handSetup.straddlePositions.forEachIndexed { index, position ->  // position are sorted here
+		handSetup.straddlePositions.forEach { position -> // position are sorted here
 			val positionIndex = positions.indexOf(position)
-			val amount = if (index < blindValues.size) { blindValues[index] } else null
+			this.addAction(positionIndex, Action.Type.STRADDLE)
-			this.addAction(positionIndex, Action.Type.STRADDLE, amount)
+//			lastStraddler = positionIndex
 		}
 
-//		var lastStraddler: Int? = null
-
-
 //		val totalActions = this.actions.size
 //		val startingPosition = lastStraddler?.let { it + 1 } ?: totalActions
 
@@ -284,9 +236,9 @@ open class HandHistory : RealmObject(), Deletable, RowRepresentable, Filterable,
 	val anteSum: Double
 		get() {
 			return if (bigBlindAnte) {
-				this.biggestBet ?: 0.0
+				this.bigBlind ?: 0.0
 			} else {
-				(this.ante ?: 0.0) * this.numberOfPlayers
+				this.ante * this.numberOfPlayers
 			}
 		}
 
@@ -334,7 +286,7 @@ open class HandHistory : RealmObject(), Deletable, RowRepresentable, Filterable,
 		val sortedActions = this.sortedActions
 		val firstIndexOfStreet = sortedActions.firstOrNull { it.street == street }?.index
 			?: sortedActions.size
-		return this.anteSum + sortedActions.take(firstIndexOfStreet).sumOf { it.effectiveAmount }
+		return this.anteSum + sortedActions.take(firstIndexOfStreet).sumByDouble { it.effectiveAmount }
 	}
 
 	@Ignore
@@ -350,20 +302,14 @@ open class HandHistory : RealmObject(), Deletable, RowRepresentable, Filterable,
 		val players = "${this.numberOfPlayers} ${context.getString(R.string.players)}"
 		val firstLineComponents = mutableListOf(this.date.fullDate(), players)
 
-		this.blinds?.let { firstLineComponents.add(it) }
+		this.smallBlind?.let { sb ->
-
+			this.bigBlind?.let { bb ->
-//		this.smallBlind?.let { sb ->
+				firstLineComponents.add("${sb.formatted}/${bb.formatted}")
-//			this.bigBlind?.let { bb ->
-//				firstLineComponents.add("${sb.formatted}/${bb.formatted}")
-//			}
-//		}
-
-		this.ante?.let {
-			if (it > 0.0) {
-				firstLineComponents.add("ante ${this.ante}")
 			}
 		}
-
+		if (this.ante > 0.0) {
+			firstLineComponents.add("ante ${this.ante}")
+		}
 		string = string.plus(firstLineComponents.joinToString(" - "))
 		string = string.addLineReturn(2)
 
@@ -382,26 +328,26 @@ open class HandHistory : RealmObject(), Deletable, RowRepresentable, Filterable,
 		// Actions per street
 		val sortedActions = this.actions.sortedBy { it.index }
 
-		// Remove SUMMARY
+//		val actionList = ActionList()
-		Street.values().dropLast(1).forEach { street ->
+//		actionList.load(this)
+
+		Street.values().forEach { street ->
 
 			string = string.addLineReturn(2)
 
 			val streetActions = sortedActions.filter { it.street == street }.compact(positions, this.heroIndex)
-
+			if (streetActions.isNotEmpty()) {
-			val streetCards = this.cardsForStreet(street)
-
-			// we want to show streets: with actions or when an allin is called
-			if (streetCards.size == street.totalBoardCards || streetActions.isNotEmpty()) {
 
 				val streetItems = mutableListOf<CharSequence>(context.getString(street.resId))
 
 				val potSize = this.potSizeForStreet(street)
 				if (potSize > 0) {
+//					streetItems.add(context.getString(R.string.pot_size))
 					streetItems.add("(" + potSize.formatted + ")")
 				}
 				string = string.plus(streetItems.joinToString(" "))
 
+				val streetCards = this.cardsForStreet(street)
 				if (streetCards.isNotEmpty()) {
 					string = string.addLineReturn()
 					string = string.plus(streetCards.formatted(context) ?: "")
@@ -415,7 +361,6 @@ open class HandHistory : RealmObject(), Deletable, RowRepresentable, Filterable,
 					string = string.plus(localizedAction(action, context))
 					string = string.addLineReturn()
 				}
-
 			}
 
 		}
@@ -426,12 +371,12 @@ open class HandHistory : RealmObject(), Deletable, RowRepresentable, Filterable,
 	fun anteForPosition(position: Position): Double {
 		return if (this.bigBlindAnte) {
 			if (position == Position.BB) {
-				this.biggestBet ?: 0.0
+				this.bigBlind ?: 0.0
 			} else {
 				0.0
 			}
 		} else {
-			this.ante ?: 0.0
+			this.ante
 		}
 	}
 
@@ -447,11 +392,7 @@ open class HandHistory : RealmObject(), Deletable, RowRepresentable, Filterable,
 			val heroString = context.getString(R.string.hero)
 			playerItems.add("- $heroString")
 		}
-
-		if (playerSetup.cards.isNotEmpty()) {
 		playerItems.add("[${playerSetup.cards.formatted(context)}]")
-		}
-
 		playerSetup.stack?.let { stack ->
 			playerItems.add("- $stack")
 		}
@@ -479,12 +420,7 @@ open class HandHistory : RealmObject(), Deletable, RowRepresentable, Filterable,
 	val heroWins: Boolean?
 		get() {
 			return this.heroIndex?.let { heroIndex ->
-				this.largestWonPot?.let { pot ->
+				this.winnerPots.any { it.position == heroIndex }
-					heroIndex == pot.position
-				} ?: run { null }
-
-//				heroIndex == this.largestWonPot?.position
-//				this.winnerPots.any { it.position == heroIndex }
 			} ?: run {
 				null
 			}
@@ -568,8 +504,6 @@ open class HandHistory : RealmObject(), Deletable, RowRepresentable, Filterable,
 
 		this.winnerPots.clear()
 		this.winnerPots.addAll(wonPots)
-
-		Timber.d("Pot won: ${this.winnerPots.size} for positions: ${this.winnerPots.map {it.position}} ")
 	}
 
 	/***
@@ -586,14 +520,14 @@ open class HandHistory : RealmObject(), Deletable, RowRepresentable, Filterable,
 			val allinPositions = streetActions.filter { it.type?.isAllin == true }.map { it.position }
 
 			if (allinPositions.isEmpty()) {
-				runningPotAmount += streetActions.sumOf { it.effectiveAmount }
+				runningPotAmount += streetActions.sumByDouble { it.effectiveAmount }
 			} else {
 				val amountsPerPosition = mutableListOf<PositionAmount>()
 
 				// get all committed amounts for the street by player, by allin
 				this.positionIndexes.map { position ->
 					val playerActions = streetActions.filter { it.position == position }
-					val sum = playerActions.sumOf { it.effectiveAmount }
+					val sum = playerActions.sumByDouble { it.effectiveAmount }
 					amountsPerPosition.add(PositionAmount(position, sum, allinPositions.contains(position)))
 				}
 				amountsPerPosition.sortWith(this) // sort by value, then allin. Allin must be first of equal values sequence
@@ -646,8 +580,6 @@ open class HandHistory : RealmObject(), Deletable, RowRepresentable, Filterable,
 
 		pots.forEach { pot ->
 
-			if (pot.positions.size > 1) { // we only consider contested pots
-
 			val winningPositions = compareHands(pot.positions.toList())
 
 			// Distributes the pot for each winners
@@ -663,7 +595,6 @@ open class HandHistory : RealmObject(), Deletable, RowRepresentable, Filterable,
 					wp.amount += share
 				}
 			}
-			}
 
 		}
 		return wonPots.values
@@ -675,32 +606,17 @@ open class HandHistory : RealmObject(), Deletable, RowRepresentable, Filterable,
 	 */
 	private fun compareHands(activePositions: List<Int>): List<Int> {
 
-		val usedFullCards = this.allFullCards.toMutableList()
-		val noWildCardBoard = this.board.putSuits(usedFullCards)
-		val noWildCardHands = activePositions.map {
-			this.playerSetupForPosition(it)?.cards?.putSuits(usedFullCards)
-		}
-
 		// Evaluate all hands
-		val results = noWildCardHands.map { cards ->
+		val results = activePositions.map {
-			cards?.let {  hand ->
+			this.playerSetupForPosition(it)?.cards?.let { hand ->
-				EvaluatorBridge.playerHand(hand, noWildCardBoard)
+				EvaluatorBridge.playerHand(hand, this.board)
 			} ?: run {
 				Int.MAX_VALUE
 			}
 		}
 
-		// Evaluate all hands
-//		val results = activePositions.map {
-//			this.playerSetupForPosition(it)?.cards?.let { hand ->
-//				EvaluatorBridge.playerHand(hand, this.board)
-//			} ?: run {
-//				Int.MAX_VALUE
-//			}
-//		}
-
 		// Check who has best score (EvaluatorBridge gives a lowest score for a better hand)
-		return results.minOrNull()?.let { best ->
+		return results.min()?.let { best ->
 			val winners = mutableListOf<Int>()
 			results.forEachIndexed { index, i ->
 				if (i == best && i != Int.MAX_VALUE) {
@@ -743,33 +659,4 @@ open class HandHistory : RealmObject(), Deletable, RowRepresentable, Filterable,
 			return boardHasWildCard || playerCardHasWildCard
 		}
 
-	private val allFullCards: List<Card>
-		get() {
-			val cards = mutableListOf<Card>()
-			cards.addAll(this.board)
-			this.playerSetups.forEach {
-				cards.addAll(it.cards)
-			}
-			return cards.filter { !it.isWildCard }
-		}
-
-	val allSuitWildCards: List<Card>
-		get() {
-			val cards = mutableListOf<Card>()
-			cards.addAll(this.board)
-			this.playerSetups.forEach {
-				cards.addAll(it.cards)
-			}
-			return cards.filter { it.isSuitWildCard }
-		}
-
-	private val largestWonPot: WonPot?
-		get() {
-			return if (this.winnerPots.isNotEmpty()) { // needed, otherwise maxBy crashes
-				this.winnerPots.maxBy { it.amount }
-			} else {
-				null
-			}
-		}
-
 }

app/src/main/java/net/pokeranalytics/android/model/realm/rows/BankrollRow.kt

@@ -1,14 +0,0 @@
-package net.pokeranalytics.android.model.realm.rows
-
-import android.content.Context
-import net.pokeranalytics.android.model.realm.Bankroll
-import net.pokeranalytics.android.ui.view.RowRepresentable
-
-class BankrollRow(var bankroll: Bankroll) : RowRepresentable {
-
-	override fun getDisplayName(context: Context): String {
-		return this.bankroll.name
-	}
-
-
-}

app/src/main/java/net/pokeranalytics/android/model/realm/rows/CustomFieldRow.kt

@@ -1,57 +0,0 @@
-package net.pokeranalytics.android.model.realm.rows
-
-import android.content.Context
-import android.text.InputType
-import io.realm.RealmList
-import io.realm.annotations.Ignore
-import net.pokeranalytics.android.model.realm.CustomField
-import net.pokeranalytics.android.model.realm.CustomFieldEntry
-import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetType
-import net.pokeranalytics.android.ui.view.RowRepresentable
-import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor
-import net.pokeranalytics.android.ui.view.RowViewType
-
-class CustomFieldRow(var customField: CustomField) : RowRepresentable {
-
-	@Ignore
-	override var viewType: Int = RowViewType.TITLE_VALUE_ARROW.ordinal
-
-	override fun localizedTitle(context: Context): String {
-		return this.customField.name
-	}
-
-	override fun getDisplayName(context: Context): String {
-		return this.customField.name
-	}
-
-	override val bottomSheetType: BottomSheetType
-		get() {
-			return when (this.customField.type) {
-				CustomField.Type.LIST.uniqueIdentifier -> BottomSheetType.LIST_STATIC
-				else -> BottomSheetType.NUMERIC_TEXT
-			}
-		}
-
-	override fun editingDescriptors(map: Map<String, Any?>): ArrayList<RowRepresentableEditDescriptor> {
-		return when (this.customField.type) {
-			CustomField.Type.LIST.uniqueIdentifier -> {
-				val defaultValue: Any? by map
-				val data: RealmList<CustomFieldEntry>? by map
-				arrayListOf(
-					RowRepresentableEditDescriptor(defaultValue, staticData = data)
-				)
-			}
-			else -> {
-				val defaultValue: Double? by map
-				arrayListOf(
-					RowRepresentableEditDescriptor(
-						defaultValue, inputType = InputType.TYPE_CLASS_NUMBER
-								or InputType.TYPE_NUMBER_FLAG_DECIMAL
-								or InputType.TYPE_NUMBER_FLAG_SIGNED
-					)
-				)
-			}
-		}
-	}
-
-}

app/src/main/java/net/pokeranalytics/android/model/retrofit/ConvertResult.kt

@@ -0,0 +1,11 @@
+package net.pokeranalytics.android.model.retrofit
+
+import com.google.gson.annotations.SerializedName
+
+/**
+ * CurrencyCode Converter mapping class
+ */
+class CurrencyConverterValue {
+	@SerializedName("val")
+	var value: Double? = 0.0
+}

app/src/main/java/net/pokeranalytics/android/model/utils/CrashLogging.kt

@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.util
+package net.pokeranalytics.android.model.utils
 
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 

app/src/main/java/net/pokeranalytics/android/model/utils/DataUtils.kt

@@ -11,18 +11,15 @@ class DataUtils {
 	companion object {
 
 		/**
-		 * Returns the number of sessions corresponding to the provided parameters
+		 * Returns true if the provided parameters doesn't correspond to an existing session
 		 */
-		fun sessionCount(realm: Realm, startDate: Date, endDate: Date?, net: Double): Int {
+		fun sessionCount(realm: Realm, startDate: Date, endDate: Date, net: Double): Int {
-			var sessionQuery = realm.where(Session::class.java)
+			val sessions = realm.where(Session::class.java)
 				.equalTo("startDate", startDate)
+				.equalTo("endDate", endDate)
 				.equalTo("result.net", net)
-
+				.findAll()
-			endDate?.let {
+			return sessions.size
-				sessionQuery = sessionQuery.equalTo("endDate", it)
-			}
-
-			return sessionQuery.findAll().size
 		}
 
 		/**

app/src/main/java/net/pokeranalytics/android/model/utils/FavoriteSessionFinder.kt

@@ -5,7 +5,7 @@ import io.realm.Realm
 import io.realm.Sort
 import net.pokeranalytics.android.model.realm.Location
 import net.pokeranalytics.android.model.realm.Session
-import net.pokeranalytics.android.ui.view.rows.SessionPropertiesRow
+import net.pokeranalytics.android.ui.view.rowrepresentable.SessionRow
 
 /**
  * Returns all significant parameters concatenated in a String
@@ -24,24 +24,24 @@ private fun Session.parameterRepresentation(context: Context): String {
 /**
  * Returns a list of fields used to determine which kind of session is favorite
  */
-private fun Session.significantFields(): List<SessionPropertiesRow> {
+private fun Session.significantFields(): List<SessionRow> {
 	when (this.type) {
 		Session.Type.TOURNAMENT.ordinal -> {
 			return listOf(
-				SessionPropertiesRow.GAME,
+				SessionRow.GAME,
-				SessionPropertiesRow.INITIAL_BUY_IN,
+				SessionRow.INITIAL_BUY_IN,
-				SessionPropertiesRow.BANKROLL,
+				SessionRow.BANKROLL,
-				SessionPropertiesRow.TABLE_SIZE,
+				SessionRow.TABLE_SIZE,
-				SessionPropertiesRow.TOURNAMENT_NAME,
+				SessionRow.TOURNAMENT_NAME,
-				SessionPropertiesRow.TOURNAMENT_TYPE
+				SessionRow.TOURNAMENT_TYPE
 			)
 		}
 		Session.Type.CASH_GAME.ordinal -> {
 			return listOf(
-				SessionPropertiesRow.GAME,
+				SessionRow.GAME,
-				SessionPropertiesRow.STAKES,
+				SessionRow.BLINDS,
-				SessionPropertiesRow.BANKROLL,
+				SessionRow.BANKROLL,
-				SessionPropertiesRow.TABLE_SIZE
+				SessionRow.TABLE_SIZE
 			)
 		}
 	}
@@ -75,7 +75,8 @@ class FavoriteSessionFinder {
 		 */
 		fun copyParametersFromFavoriteSession(session: Session, location: Location?, context: Context) {
 
-			val favoriteSession = favoriteSession(session.type, location, session.realm, context)
+			val favoriteSession =
+				favoriteSession(session.type, location, session.realm, context)
 
 			favoriteSession?.let { fav ->
 
@@ -86,8 +87,8 @@ class FavoriteSessionFinder {
 
 				when (session.type) {
 					Session.Type.CASH_GAME.ordinal -> {
-						session.cgAnte = fav.cgAnte
+						session.cgSmallBlind = fav.cgSmallBlind
-						session.cgBlinds = fav.cgBlinds
+						session.cgBigBlind = fav.cgBigBlind
 					}
 					Session.Type.TOURNAMENT.ordinal -> {
 						session.tournamentEntryFee = fav.tournamentEntryFee

app/src/main/java/net/pokeranalytics/android/model/utils/Seed.kt

@@ -17,8 +17,6 @@ class Seed(var context:Context) : Realm.Transaction {
         fun createDefaultTransactionTypes(values: Array<TransactionType.Value>, context: Context, realm: Realm) {
             values.forEach { value ->
 
-                if (value != TransactionType.Value.EXPENSE) {
-
                 val existing = realm.where(TransactionType::class.java).equalTo("kind", value.uniqueIdentifier).findAll()
                 if (existing.isEmpty()) {
                     val type = TransactionType()
@@ -29,8 +27,6 @@ class Seed(var context:Context) : Realm.Transaction {
                     realm.insertOrUpdate(type)
                 }
             }
-
-            }
         }
     }
 

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

@@ -1,99 +0,0 @@
-package net.pokeranalytics.android.ui.activity
-
-import android.Manifest
-import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import android.os.Bundle
-import androidx.fragment.app.FragmentActivity
-import io.realm.Realm
-import net.pokeranalytics.android.R
-import net.pokeranalytics.android.exceptions.PAIllegalStateException
-import net.pokeranalytics.android.ui.activity.components.BaseActivity
-import net.pokeranalytics.android.ui.activity.components.RequestCode
-import net.pokeranalytics.android.ui.activity.components.ResultCode
-import net.pokeranalytics.android.ui.extensions.showAlertDialog
-import net.pokeranalytics.android.ui.extensions.toast
-import net.pokeranalytics.android.util.copyStreamToFile
-import timber.log.Timber
-import java.io.File
-
-class DatabaseCopyActivity : BaseActivity() {
-
-    private lateinit var fileURI: Uri
-
-    enum class IntentKey(val keyName: String) {
-        URI("uri")
-    }
-
-    companion object {
-
-        /**
-         * Create a new instance for result
-         */
-        fun newInstanceForResult(context: FragmentActivity, uri: Uri) {
-            context.startActivityForResult(getIntent(context, uri), RequestCode.IMPORT.value)
-        }
-
-        private fun getIntent(context: Context, uri: Uri): Intent {
-            Timber.d("getIntent")
-            val intent = Intent(context, DatabaseCopyActivity::class.java)
-            intent.putExtra(IntentKey.URI.keyName, uri)
-            return intent
-        }
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        Timber.d("onCreate")
-
-        intent?.data?.let {
-            this.fileURI = it
-        } ?: run {
-            this.fileURI = intent.getParcelableExtra(IntentKey.URI.keyName) ?: throw PAIllegalStateException("Uri not found")
-        }
-
-//        setContentView(R.layout.activity_import)
-        requestImportConfirmation()
-    }
-
-    private fun initUI() {
-
-        askForPermission(arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), RequestCode.PERMISSION_WRITE_EXTERNAL_STORAGE.value) {
-            val path = Realm.getDefaultInstance().path
-            contentResolver.openInputStream(fileURI)?.let { inputStream ->
-                val destination = File(path)
-                inputStream.copyStreamToFile(destination)
-                toast("Please restart app")
-            }
-        }
-    }
-
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        super.onActivityResult(requestCode, resultCode, data)
-
-        when (requestCode) {
-            RequestCode.IMPORT.value -> {
-                if (resultCode == ResultCode.IMPORT_UNRECOGNIZED_FORMAT.value) {
-                    showAlertDialog(context = this, messageResId = R.string.unknown_import_format_popup_message, positiveAction = {
-                        finish()
-                    })
-                }
-            }
-        }
-    }
-
-    // Import
-
-    private fun requestImportConfirmation() {
-
-        showAlertDialog(context = this, title = R.string.import_confirmation, showCancelButton = true, positiveAction = {
-            initUI()
-        }, negativeAction = {
-            finish()
-        })
-
-    }
-
-}

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

@@ -24,11 +24,9 @@ class GraphActivity : BaseActivity(), ViewModelHolder {
 
 	companion object {
 
-		const val styleKey = "style"
-
 		private var lineDataSets: List<LineDataSet>? = null
 		private var barDataSets: List<BarDataSet>? = null
-//		private var style: Graph.Style? = null
+		private var style: Graph.Style? = null
 		private var activityTitle: String? = null
 
 		/***
@@ -36,11 +34,10 @@ class GraphActivity : BaseActivity(), ViewModelHolder {
 		 */
 		fun newLineInstance(context: Context, lineDataSets: List<LineDataSet>, title: String? = null) {
 			this.lineDataSets = lineDataSets
-//			this.style = Graph.Style.LINE
+			this.style = Graph.Style.LINE
 			this.activityTitle = title
 
 			val intent = Intent(context, GraphActivity::class.java)
-			intent.putExtra(styleKey, Graph.Style.LINE.ordinal)
 			context.startActivity(intent)
 		}
 
@@ -49,11 +46,10 @@ class GraphActivity : BaseActivity(), ViewModelHolder {
 		 */
 		fun newBarInstance(context: Context, barDataSets: List<BarDataSet>, title: String? = null) {
 			this.barDataSets = barDataSets
-//			this.style = Graph.Style.BAR
+			this.style = Graph.Style.BAR
 			this.activityTitle = title
 
 			val intent = Intent(context, GraphActivity::class.java)
-			intent.putExtra(styleKey, Graph.Style.BAR.ordinal)
 			context.startActivity(intent)
 		}
 
@@ -68,6 +64,7 @@ class GraphActivity : BaseActivity(), ViewModelHolder {
 		initUI()
 	}
 
+
 	/**
 	 * Init UI
 	 */
@@ -97,14 +94,11 @@ class GraphActivity : BaseActivity(), ViewModelHolder {
 			}
 		}
 
-		val styleIndex = this.intent.getIntExtra(styleKey, -1)
+		style?.let {
-		val style = Graph.Style.values()[styleIndex]
+			this.model.style = it
+		}
 
-//		style?.let {
+		val style = style ?: this.model.style ?: throw PAIllegalStateException("Graph style not defined")
-//			this.model.style = it
-//		}
-//
-//		val style = style ?: this.model.style ?: throw PAIllegalStateException("Graph style not defined")
 
 		val fragmentTransaction = supportFragmentManager.beginTransaction()
 		val graphFragment = GraphFragment.newInstance(style)

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

@@ -9,31 +9,14 @@ import com.google.android.material.bottomnavigation.BottomNavigationView
 import io.realm.RealmResults
 import net.pokeranalytics.android.BuildConfig
 import net.pokeranalytics.android.R
-import net.pokeranalytics.android.calculus.NewPerformanceListener
 import net.pokeranalytics.android.databinding.ActivityHomeBinding
-import net.pokeranalytics.android.model.filter.Query
-import net.pokeranalytics.android.model.filter.QueryCondition
 import net.pokeranalytics.android.model.realm.Currency
-import net.pokeranalytics.android.model.realm.Session
 import net.pokeranalytics.android.ui.activity.components.BaseActivity
 import net.pokeranalytics.android.ui.adapter.HomePagerAdapter
-import net.pokeranalytics.android.util.BackupTask
-import net.pokeranalytics.android.util.Preferences
 import net.pokeranalytics.android.util.billing.AppGuard
-import net.pokeranalytics.android.util.csv.DataType
-import net.pokeranalytics.android.util.extensions.findAll
-import net.pokeranalytics.android.util.extensions.isSameMonth
-import java.util.*
-
-enum class Tab(var identifier: Int) {
-	HISTORY(0),
-	STATS(1),
-	CALENDAR(2),
-	REPORTS(3),
-	SETTINGS(4)
-}
 
-class HomeActivity : BaseActivity(), NewPerformanceListener {
+
+class HomeActivity : BaseActivity() {
 
 	companion object {
 		fun newInstance(context: Context, id: Int) {
@@ -47,29 +30,23 @@ class HomeActivity : BaseActivity(), NewPerformanceListener {
 	private var homePagerAdapter: HomePagerAdapter? = null
 
 	private val mOnNavigationItemSelectedListener = BottomNavigationView.OnNavigationItemSelectedListener { item ->
-
-		if (binding.viewPager.currentItem == Tab.REPORTS.identifier) {
-			this.paApplication.reportWhistleBlower?.clearNotifications()
-		}
-
 		when (item.itemId) {
 			R.id.navigation_history -> {
-				displayFragment(Tab.HISTORY)
+				displayFragment(0)
 			}
 			R.id.navigation_stats -> {
-				displayFragment(Tab.STATS)
+				displayFragment(1)
 			}
 			R.id.navigation_calendar -> {
-				displayFragment(Tab.CALENDAR)
+				displayFragment(2)
 			}
 			R.id.navigation_reports -> {
-				displayFragment(Tab.REPORTS)
+				displayFragment(3)
 			}
 			R.id.navigation_settings -> {
-				displayFragment(Tab.SETTINGS)
+				displayFragment(4)
 			}
 		}
-		binding.navigation.getOrCreateBadge(item.itemId).isVisible = false
 		return@OnNavigationItemSelectedListener true
 	}
 
@@ -77,8 +54,6 @@ class HomeActivity : BaseActivity(), NewPerformanceListener {
 		super.onResume()
 		AppGuard.requestPurchasesUpdate()
 		this.homePagerAdapter?.activityResumed()
-		lookForCalendarBadge()
-		checkForFailedBackups()
 	}
 
 	private lateinit var binding: ActivityHomeBinding
@@ -86,9 +61,6 @@ class HomeActivity : BaseActivity(), NewPerformanceListener {
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
 
-		binding = ActivityHomeBinding.inflate(layoutInflater)
-		setContentView(binding.root)
-
 		if (BuildConfig.DEBUG) {
 			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
 				setShowWhenLocked(true)
@@ -98,18 +70,59 @@ class HomeActivity : BaseActivity(), NewPerformanceListener {
 			}
 		}
 
+		binding = ActivityHomeBinding.inflate(layoutInflater)
+		setContentView(binding.root)
+
 		observeRealmObjects()
 		initUI()
 		checkFirstLaunch()
 
-		this.paApplication.reportWhistleBlower?.addListener(this)
-
 	}
 
-	override fun onDestroy() {
+//	override fun onNewIntent(intent: Intent?) {
-		super.onDestroy()
+//		super.onNewIntent(intent)
-		this.paApplication.reportWhistleBlower?.removeListener(this)
+//
-	}
+//		setIntent(intent)
+//		intent?.let {
+//
+//			when (intent.action) {
+//				"android.intent.action.VIEW" -> { // import
+//					val data = it.data
+//					if (data != null) {
+//						this.requestImportConfirmation(data)
+//					} else {
+//						throw PAIllegalStateException("URI null on import")
+//					}
+//				}
+//				else -> {
+//					Timber.w("Intent ${intent.action} unmanaged")
+//				}
+//			}
+//		}
+//
+//	}
+
+//	override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+//		super.onActivityResult(requestCode, resultCode, data)
+//
+//		when (requestCode) {
+//			RequestCode.IMPORT.value -> {
+//				if (resultCode == ResultCode.IMPORT_UNRECOGNIZED_FORMAT.value) {
+//					showAlertDialog(context = this, message = R.string.unknown_import_format_popup_message)
+//				}
+//			}
+//		}
+//	}
+
+	// Import
+
+//	private fun requestImportConfirmation(uri: Uri) {
+//
+//		showAlertDialog(context = this, title = R.string.import_confirmation, showCancelButton = true, positiveAction = {
+//			ImportActivity.newInstanceForResult(this, uri)
+//		})
+//
+//	}
 
 	private fun observeRealmObjects() {
 
@@ -117,9 +130,9 @@ class HomeActivity : BaseActivity(), NewPerformanceListener {
 
 		// observe currency changes
 		this.currencies = realm.where(Currency::class.java).findAll()
-		this.currencies.addChangeListener { currencies, _ ->
+		this.currencies.addChangeListener { t, _ ->
 			realm.executeTransaction {
-				currencies.forEach {
+				t.forEach {
 					it.refreshRelatedRatedValues()
 				}
 			}
@@ -140,7 +153,6 @@ class HomeActivity : BaseActivity(), NewPerformanceListener {
 		viewPager.offscreenPageLimit = 5
 		viewPager.enablePaging = false
 		viewPager.adapter = homePagerAdapter
-
 	}
 
 	/**
@@ -160,70 +172,8 @@ class HomeActivity : BaseActivity(), NewPerformanceListener {
 	/**
 	 * Display a new fragment
 	 */
-	private fun displayFragment(tab: Tab) {
+	private fun displayFragment(index: Int) {
-		binding.viewPager.setCurrentItem(tab.identifier, false)
+		binding.viewPager.setCurrentItem(index, false)
-		this.homePagerAdapter?.tabSelected(tab)
-	}
-
-	override fun newBestPerformanceHandler() {
-
-		if (Preferences.showInAppBadges(this)) {
-			binding.navigation.getOrCreateBadge(R.id.navigation_reports).isVisible = true
-			binding.navigation.getOrCreateBadge(R.id.navigation_reports).number = 1
-		}
-
-	}
-
-	private fun lookForCalendarBadge() {
-
-		if (!Preferences.showInAppBadges(this)) {
-			return
-		}
-
-		val date = Preferences.lastCalendarBadgeDate(this)
-
-		val cal = Calendar.getInstance()
-		val lastCheck = Calendar.getInstance().apply { timeInMillis = date }
-
-		if (!cal.isSameMonth(lastCheck)) {
-			lookForSessionsLastMonth()
-		}
-	}
-
-	private fun lookForSessionsLastMonth() {
-
-		val cal = Calendar.getInstance()
-		cal.add(Calendar.MONTH, -1)
-
-		val month = QueryCondition.AnyMonthOfYear(cal.get(Calendar.MONTH))
-		val year = QueryCondition.AnyYear(cal.get(Calendar.YEAR))
-		val query = Query(month, year)
-
-		val sessions = getRealm().findAll<Session>(query)
-		if (sessions.isNotEmpty()) {
-			binding.navigation.getOrCreateBadge(R.id.navigation_calendar).isVisible = true
-			binding.navigation.getOrCreateBadge(R.id.navigation_calendar).number = 1
-			Preferences.setLastCalendarBadgeDate(this, Date().time)
-		}
-
-	}
-
-	private fun checkForFailedBackups() {
-
-		if (!Preferences.sessionsBackupSuccess(this)) {
-			Preferences.getBackupEmail(this)?.let { email ->
-				val task = BackupTask(DataType.SESSION, email, this)
-				task.start()
-			}
-		}
-
-		if (!Preferences.transactionsBackupSuccess(this)) {
-			Preferences.getBackupEmail(this)?.let { email ->
-				val task = BackupTask(DataType.TRANSACTION, email, this)
-				task.start()
-			}
-		}
-
 	}
 
 }

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

@@ -9,7 +9,6 @@ import android.widget.Toast
 import androidx.fragment.app.FragmentActivity
 import io.realm.Realm
 import net.pokeranalytics.android.R
-import net.pokeranalytics.android.exceptions.PAIllegalStateException
 import net.pokeranalytics.android.model.realm.Session
 import net.pokeranalytics.android.ui.activity.components.BaseActivity
 import net.pokeranalytics.android.ui.activity.components.RequestCode
@@ -18,6 +17,7 @@ import net.pokeranalytics.android.ui.extensions.showAlertDialog
 import net.pokeranalytics.android.ui.fragment.ImportFragment
 import net.pokeranalytics.android.util.billing.AppGuard
 import net.pokeranalytics.android.util.extensions.count
+import timber.log.Timber
 
 class ImportActivity : BaseActivity() {
 
@@ -49,7 +49,7 @@ class ImportActivity : BaseActivity() {
 		intent?.data?.let {
 			this.fileURI = it
 		} ?: run {
-			this.fileURI = intent.getParcelableExtra(IntentKey.URI.keyName) ?: throw PAIllegalStateException("Uri not found")
+			this.fileURI = intent.getParcelableExtra(IntentKey.URI.keyName) as Uri
 		}
 
 		setContentView(R.layout.activity_import)
@@ -63,13 +63,11 @@ class ImportActivity : BaseActivity() {
 			val fragmentTransaction = supportFragmentManager.beginTransaction()
 			val fragment = ImportFragment()
 
-			fragment.setData(fileURI)
+			val fis = contentResolver.openInputStream(fileURI)
-
+			Timber.d("Load fragment data with: $fis")
-//			val fis = contentResolver.openInputStream(fileURI)
+			fis?.let {
-//			Timber.d("Load fragment data with: $fis")
+				fragment.setData(it)
-//			fis?.let {
+			}
-//				fragment.setData(it)
-//			}
 
 			fragmentTransaction.add(R.id.container, fragment)
 			fragmentTransaction.commit()
@@ -84,7 +82,7 @@ class ImportActivity : BaseActivity() {
 		when (requestCode) {
 			RequestCode.IMPORT.value -> {
 				if (resultCode == ResultCode.IMPORT_UNRECOGNIZED_FORMAT.value) {
-					showAlertDialog(context = this, messageResId = R.string.unknown_import_format_popup_message, positiveAction = {
+					showAlertDialog(context = this, message = R.string.unknown_import_format_popup_message, positiveAction = {
 						finish()
 					})
 				}

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

@@ -4,7 +4,6 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import net.pokeranalytics.android.R
-import net.pokeranalytics.android.calculus.calcul.ReportDisplay
 import net.pokeranalytics.android.calculus.Report
 import net.pokeranalytics.android.calculus.Stat
 import net.pokeranalytics.android.ui.activity.components.ReportActivity
@@ -21,7 +20,7 @@ class ProgressReportActivity : ReportActivity() {
 		 */
 		fun newInstance(context: Context, report: Report, title: String, stat: Stat? = null, displayAggregationChoices: Boolean = true) {
 
-			val parameters = ReportParameters(report, ReportDisplay.PROGRESS, title, stat, showAggregationChoices = displayAggregationChoices)
+			val parameters = ReportParameters(report, title, stat, showAggregationChoices = displayAggregationChoices)
 			ReportViewModel.defineParameters(parameters)
 			val intent = Intent(context, ProgressReportActivity::class.java)
 			context.startActivity(intent)

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

@@ -5,7 +5,6 @@ import android.content.Intent
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import net.pokeranalytics.android.R
-import net.pokeranalytics.android.calculus.calcul.ReportDisplay
 import net.pokeranalytics.android.calculus.Calculator
 import net.pokeranalytics.android.ui.activity.components.BaseActivity
 import net.pokeranalytics.android.ui.activity.components.RequestCode
@@ -15,7 +14,6 @@ class ReportCreationActivity : BaseActivity() {
 	companion object {
 
 		var options: Calculator.Options? = null
-		var reportDisplay: ReportDisplay? = null
 
 		fun newInstanceForResult(fragment: Fragment, context: Context) {
 			val intent = Intent(context, ReportCreationActivity::class.java)

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

@@ -3,7 +3,6 @@ package net.pokeranalytics.android.ui.activity.components
 import android.Manifest.permission.ACCESS_FINE_LOCATION
 import android.content.pm.ActivityInfo
 import android.content.pm.PackageManager
-import android.os.Build
 import android.os.Bundle
 import android.os.PersistableBundle
 import android.view.MenuItem
@@ -14,16 +13,12 @@ import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import io.realm.Realm
-import net.pokeranalytics.android.PokerAnalyticsApplication
 import net.pokeranalytics.android.model.realm.Location
+import net.pokeranalytics.android.model.utils.CrashLogging
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
-import net.pokeranalytics.android.ui.helpers.AppReviewManager
 import net.pokeranalytics.android.ui.view.RowRepresentable
-import net.pokeranalytics.android.util.CrashLogging
 import net.pokeranalytics.android.util.LocationManager
 import net.pokeranalytics.android.util.PermissionRequest
-import net.pokeranalytics.android.util.Preferences
-import java.util.*
 
 class RootBottomSheetViewModel: ViewModel() {
 	var rowRepresentable: RowRepresentable? = null
@@ -41,13 +36,14 @@ abstract class BaseActivity : AppCompatActivity() {
 
 	private var permissionRequest: PermissionRequest? = null
 
-	val paApplication: PokerAnalyticsApplication
-		get() { return this.application as PokerAnalyticsApplication }
-
 	val bottomSheetViewModel: RootBottomSheetViewModel by lazy {
 		ViewModelProvider(this).get(RootBottomSheetViewModel::class.java)
 	}
 
+//	var bottomSheetRow: RowRepresentable?
+//		get() { return this.bottomSheetViewModel.rowRepresentable }
+//		set(value) { this.bottomSheetViewModel.rowRepresentable = value }
+
 	fun setBottomSheetParameters(rowRepresentable: RowRepresentable, delegate: RowRepresentableDelegate) {
 		this.bottomSheetViewModel.rowRepresentable = rowRepresentable
 		this.bottomSheetViewModel.delegate = delegate
@@ -58,14 +54,12 @@ abstract class BaseActivity : AppCompatActivity() {
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
 		CrashLogging.log("$this.localClassName onCreate, savedInstanceState=$savedInstanceState")
-		setLanguage()
 	}
 
 	override fun onCreate(savedInstanceState: Bundle?, persistentState: PersistableBundle?) {
 		super.onCreate(savedInstanceState, persistentState)
 		CrashLogging.log("$this.localClassName onCreate: bundle=$savedInstanceState, persistentState=$persistentState")
 		requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT // fixes crash
-		setLanguage()
 	}
 
 	override fun onResume() {
@@ -89,11 +83,6 @@ abstract class BaseActivity : AppCompatActivity() {
 		this.realm?.close()
 	}
 
-	override fun onBackPressed() {
-		super.onBackPressed()
-		AppReviewManager.showReviewManager(this)
-	}
-
 	override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
 		super.onRequestPermissionsResult(requestCode, permissions, grantResults)
 
@@ -134,27 +123,6 @@ abstract class BaseActivity : AppCompatActivity() {
 		fragmentTransaction.commit()
 	}
 
-	private fun setLanguage() {
-
-		Preferences.getLanguageCode(this)?.let { languageCode ->
-
-			val config = resources.configuration
-//			val lang = "de" // your language code
-			val locale = Locale(languageCode)
-			Locale.setDefault(locale)
-			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-				config.setLocale(locale)
-			} else {
-				config.locale = locale
-			}
-
-			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
-				createConfigurationContext(config)
-			resources.updateConfiguration(config, resources.displayMetrics)
-		}
-
-	}
-
 	/**
 	 * Return the realm instance
 	 */

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

@@ -1,187 +0,0 @@
-package net.pokeranalytics.android.ui.activity.components
-
-import android.Manifest
-import android.app.Activity
-import android.content.ContentValues
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.os.Build
-import android.os.Bundle
-import android.provider.MediaStore
-import android.widget.Toast
-import androidx.camera.core.CameraSelector
-import androidx.camera.core.ImageCapture
-import androidx.camera.core.ImageCaptureException
-import androidx.camera.core.Preview
-import androidx.camera.lifecycle.ProcessCameraProvider
-import androidx.core.app.ActivityCompat
-import androidx.core.content.ContextCompat
-import androidx.fragment.app.Fragment
-import net.pokeranalytics.android.databinding.ActivityCameraBinding
-import timber.log.Timber
-import java.text.SimpleDateFormat
-import java.util.*
-import java.util.concurrent.ExecutorService
-import java.util.concurrent.Executors
-
-class CameraActivity : BaseActivity() {
-
-    companion object {
-
-        const val IMAGE_URI = "image_uri"
-
-        fun newInstanceForResult(fragment: Fragment, code: RequestCode) {
-            val intent = Intent(fragment.requireContext(), CameraActivity::class.java)
-            fragment.startActivityForResult(intent, code.value)
-        }
-
-        private const val FILENAME_FORMAT = "yyyy-MM-dd-HH-mm-ss-SSS"
-        private const val REQUEST_CODE_PERMISSIONS = 10
-        private val REQUIRED_PERMISSIONS =
-            mutableListOf (
-                Manifest.permission.CAMERA
-            ).apply {
-                if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.P) {
-                    add(Manifest.permission.WRITE_EXTERNAL_STORAGE)
-                }
-            }.toTypedArray()
-
-    }
-
-    private lateinit var viewBinding: ActivityCameraBinding
-
-    private lateinit var cameraExecutor: ExecutorService
-    private var imageCapture: ImageCapture? = null
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        this.viewBinding = ActivityCameraBinding.inflate(layoutInflater)
-        setContentView(viewBinding.root)
-
-        if (allPermissionsGranted()) {
-            cameraExecutor = Executors.newSingleThreadExecutor()
-            startCamera()
-        } else {
-            ActivityCompat.requestPermissions(
-                this, REQUIRED_PERMISSIONS, REQUEST_CODE_PERMISSIONS)
-        }
-
-        viewBinding.imageCaptureButton.setOnClickListener { takePhoto() }
-        cameraExecutor = Executors.newSingleThreadExecutor()
-
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        this.cameraExecutor.shutdown()
-    }
-
-    override fun onRequestPermissionsResult(
-        requestCode: Int,
-        permissions: Array<out String>,
-        grantResults: IntArray
-    ) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-
-        if (requestCode == REQUEST_CODE_PERMISSIONS) {
-            if (allPermissionsGranted()) {
-                startCamera()
-            } else {
-                Toast.makeText(this,
-                    "Permissions not granted by the user.",
-                    Toast.LENGTH_SHORT).show()
-                finish()
-            }
-        }
-    }
-
-    private fun allPermissionsGranted() = REQUIRED_PERMISSIONS.all {
-        ContextCompat.checkSelfPermission(
-            baseContext, it) == PackageManager.PERMISSION_GRANTED
-    }
-
-    private fun startCamera() {
-        val cameraProviderFuture = ProcessCameraProvider.getInstance(this)
-
-        cameraProviderFuture.addListener({
-            // Used to bind the lifecycle of cameras to the lifecycle owner
-            val cameraProvider: ProcessCameraProvider = cameraProviderFuture.get()
-
-            // Preview
-            val preview = Preview.Builder()
-                .build()
-                .also {
-                    it.setSurfaceProvider(this.viewBinding.viewFinder.surfaceProvider)
-                }
-
-            imageCapture = ImageCapture.Builder().build()
-
-            // Select back camera as a default
-            val cameraSelector = CameraSelector.DEFAULT_BACK_CAMERA
-
-            try {
-                // Unbind use cases before rebinding
-                cameraProvider.unbindAll()
-
-                // Bind use cases to camera
-                cameraProvider.bindToLifecycle(
-                    this, cameraSelector, preview, imageCapture)
-
-            } catch(exc: Exception) {
-                Timber.e(exc)
-            }
-
-        }, ContextCompat.getMainExecutor(this))
-    }
-
-
-    private fun takePhoto() {
-        // Get a stable reference of the modifiable image capture use case
-        val imageCapture = imageCapture ?: return
-
-        // Create time stamped name and MediaStore entry.
-        val name = SimpleDateFormat(FILENAME_FORMAT, Locale.US)
-            .format(System.currentTimeMillis())
-        val contentValues = ContentValues().apply {
-            put(MediaStore.MediaColumns.DISPLAY_NAME, name)
-            put(MediaStore.MediaColumns.MIME_TYPE, "image/jpeg")
-            if(Build.VERSION.SDK_INT > Build.VERSION_CODES.P) {
-                put(MediaStore.Images.Media.RELATIVE_PATH, "Pictures/CameraX-Image")
-            }
-        }
-
-        // Create output options object which contains file + metadata
-        val outputOptions = ImageCapture.OutputFileOptions
-            .Builder(contentResolver,
-                MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
-                contentValues)
-            .build()
-
-        // Set up image capture listener, which is triggered after photo has
-        // been taken
-        imageCapture.takePicture(
-            outputOptions,
-            ContextCompat.getMainExecutor(this),
-            object : ImageCapture.OnImageSavedCallback {
-                override fun onError(e: ImageCaptureException) {
-                    Timber.e(e)
-                }
-
-                override fun onImageSaved(output: ImageCapture.OutputFileResults) {
-
-//                    val msg = "Photo capture succeeded: ${output.savedUri}"
-//                    Toast.makeText(baseContext, msg, Toast.LENGTH_SHORT).show()
-//                    Timber.d(msg)
-
-                    val intent = Intent()
-                    intent.putExtra(IMAGE_URI, output.savedUri.toString())
-                    setResult(Activity.RESULT_OK, intent)
-
-                    finish()
-                }
-            }
-        )
-    }
-
-}

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

@@ -16,8 +16,7 @@ enum class RequestCode(var value: Int) {
 	IMPORT(900),
 	SUBSCRIPTION(901),
 	CURRENCY(902),
-	PERMISSION_WRITE_EXTERNAL_STORAGE(1000),
+	PERMISSION_WRITE_EXTERNAL_STORAGE(1000)
-	CAMERA(1001)
 }
 
 enum class ResultCode(var value: Int) {

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

@@ -4,7 +4,6 @@ import android.Manifest
 import android.app.Activity
 import android.content.Intent
 import android.content.pm.PackageManager
-import android.os.Build
 import android.provider.MediaStore
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
@@ -137,7 +136,6 @@ open class MediaActivity : BaseActivity() {
 		selectedChoice = -1
 	}
 
-//	Build.VERSION.SDK_INT < Build.VERSION_CODES.R &&
 
 	/**
 	 * Open the Camera Intent
@@ -149,11 +147,16 @@ open class MediaActivity : BaseActivity() {
 		this.mCurrentPhotoPath = null
 		this.multiplePictures = multiplePictures
 
-		askForPermission(arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), 200) { granted ->
+		// Test if we have the permission
-			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R || granted) {
+		if (ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
+			selectedChoice = SELECTED_CHOICE_TAKE_PICTURE
+			askForStoragePermission()
+			return
+		}
 
 		val takePictureIntent = Intent(MediaStore.ACTION_IMAGE_CAPTURE)
-
+		// Ensure that there's a camera activity to handle the intent
+		if (takePictureIntent.resolveActivity(packageManager) != null) {
 			// Create the File where the photo should go
 			try {
 				tempFile = ImageUtils.createImageFile(this)
@@ -172,19 +175,9 @@ open class MediaActivity : BaseActivity() {
 				takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, photoURI)
 				startActivityForResult(takePictureIntent, REQUEST_CODE_TAKE_PICTURE)
 			}
-
 		}
 	}
 
-//		// Test if we have the permission
-//		if (ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
-//			selectedChoice = SELECTED_CHOICE_TAKE_PICTURE
-//			askForStoragePermission()
-//			return
-//		}
-
-	}
-
 
 	/**
 	 * Open the gallery intent
@@ -195,32 +188,20 @@ open class MediaActivity : BaseActivity() {
 
 		this.multiplePictures = multiplePictures
 
-		askForPermission(arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), 201) { granted ->
+		// Test if we have the permission
-			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R || granted) {
+		if (ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
+			selectedChoice = SELECTED_CHOICE_SELECT_PICTURE
+			askForStoragePermission()
+			return
+		}
+
+		this.multiplePictures = multiplePictures
+
 		val galleryIntent = Intent()
 		galleryIntent.type = "image/*"
 		galleryIntent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, multiplePictures)
 		galleryIntent.action = Intent.ACTION_GET_CONTENT
 		startActivityForResult(galleryIntent, REQUEST_CODE_SELECT_PICTURE)
-
-			}
-		}
-
-
-				// Test if we have the permission
-//		if (ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
-//			selectedChoice = SELECTED_CHOICE_SELECT_PICTURE
-//			askForStoragePermission()
-//			return
-//		}
-//
-//		this.multiplePictures = multiplePictures
-//
-//		val galleryIntent = Intent()
-//		galleryIntent.type = "image/*"
-//		galleryIntent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, multiplePictures)
-//		galleryIntent.action = Intent.ACTION_GET_CONTENT
-//		startActivityForResult(galleryIntent, REQUEST_CODE_SELECT_PICTURE)
 	}
 
 	/**
@@ -234,6 +215,43 @@ open class MediaActivity : BaseActivity() {
 		}
 	}
 
+//	/**
+//	 * Ask for the acmera permission
+//	 */
+//	private fun askForCameraPermission() {
+//		// Here, thisActivity is the current activity
+//		if (ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED) {
+//			ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.CAMERA),
+//				PERMISSION_REQUEST_CAMERA)
+//		}
+//	}
+
+//	/**
+//	 * Ask for camera and storage permission
+//	 */
+//	private fun askForCameraAndStoragePermissions() {
+//
+//		val permissions = ArrayList<String>()
+//		if (ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED) {
+//			permissions.add(Manifest.permission.CAMERA)
+//		}
+//
+//		if (ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
+//			permissions.add(Manifest.permission.WRITE_EXTERNAL_STORAGE)
+//		}
+//
+//		if (permissions.size > 0) {
+//			ActivityCompat.requestPermissions(this, permissions.toArray(arrayOfNulls<String>(permissions.size)), PERMISSION_REQUEST_CAMERA)
+//		}
+//	}
+//
+//	/**
+//	 * Called when a bitmap is return
+//	 *
+//	 * @param bitmap the bitmap returned
+//	 */
+//	open fun getBitmapImage(file: File?, bitmap: Bitmap?) {}
+
 
 	/**
 	 * Called when the user is adding new photos

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

@@ -5,13 +5,12 @@ import android.content.Intent
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
-import net.pokeranalytics.android.calculus.calcul.ReportDisplay
 import net.pokeranalytics.android.calculus.Report
 import net.pokeranalytics.android.calculus.Stat
 import net.pokeranalytics.android.ui.viewmodel.ReportViewModel
 import net.pokeranalytics.android.ui.viewmodel.ViewModelHolder
 
-class ReportParameters(var report: Report, var reportDisplay: ReportDisplay, var title: String, var stat: Stat? = null, var showAggregationChoices: Boolean = true)
+class ReportParameters(var report: Report, var title: String, var stat: Stat? = null, var showAggregationChoices: Boolean = true)
 
 abstract class ReportActivity : BaseActivity(), ViewModelHolder {
 
@@ -24,19 +23,19 @@ abstract class ReportActivity : BaseActivity(), ViewModelHolder {
 		/**
 		 * Default constructor
 		 */
-		fun newInstance(context: Context, report: Report, reportDisplay: ReportDisplay, reportTitle: String, stat: Stat? = null) {
+		fun newInstance(context: Context, report: Report, reportTitle: String, stat: Stat? = null) {
-//			val options = report.options
+			val options = report.options
-			val parameters = ReportParameters(report, reportDisplay, reportTitle, stat)
+			val parameters = ReportParameters(report, reportTitle, stat)
 			ReportViewModel.defineParameters(parameters)
-			val intent = Intent(context, reportDisplay.activityClass)
+			val intent = Intent(context, options.display.activityClass)
 			context.startActivity(intent)
 		}
 
-		fun newInstanceForResult(fragment: Fragment, report: Report, reportDisplay: ReportDisplay, reportTitle: String, stat: Stat? = null) {
+		fun newInstanceForResult(fragment: Fragment, report: Report, reportTitle: String, stat: Stat? = null) {
-//			val options = report.options
+			val options = report.options
-			val parameters = ReportParameters(report, reportDisplay, reportTitle, stat)
+			val parameters = ReportParameters(report, reportTitle, stat)
 			ReportViewModel.defineParameters(parameters)
-			val intent = Intent(fragment.requireContext(), reportDisplay.activityClass)
+			val intent = Intent(fragment.requireContext(), options.display.activityClass)
 			fragment.startActivityForResult(intent, RequestCode.DEFAULT.value)
 		}
 
@@ -51,7 +50,6 @@ abstract class ReportActivity : BaseActivity(), ViewModelHolder {
 
 		ReportViewModel.parameters?.let {
 			this.model.report = it.report
-			this.model.reportDisplay = it.reportDisplay
 			this.model.title = it.title
 			val stat = it.stat ?: it.report.options.stats.first()
 			this.model.stat = stat

app/src/main/java/net/pokeranalytics/android/ui/adapter/ComparisonChartPagerAdapter.kt

@@ -6,11 +6,11 @@ import android.view.ViewGroup
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentStatePagerAdapter
 import net.pokeranalytics.android.R
-import net.pokeranalytics.android.exceptions.PAIllegalStateException
+import net.pokeranalytics.android.ui.modules.calendar.CalendarFragment
+import net.pokeranalytics.android.ui.modules.feed.FeedFragment
 import net.pokeranalytics.android.ui.fragment.GraphFragment
 import net.pokeranalytics.android.ui.fragment.components.BaseFragment
 import net.pokeranalytics.android.ui.graph.Graph
-import net.pokeranalytics.android.ui.modules.calendar.CalendarFragment
 import java.lang.ref.WeakReference
 
 /**
@@ -25,7 +25,7 @@ class ComparisonChartPagerAdapter(val context: Context, fragmentManager: Fragmen
 			0 -> GraphFragment.newInstance(Graph.Style.BAR)
 			1 -> GraphFragment.newInstance(Graph.Style.MULTILINE)
 			2 -> CalendarFragment.newInstance()
-			else -> throw PAIllegalStateException("There should not be more than $count items, position = $position")
+			else -> FeedFragment.newInstance()
 		}
 	}
 

app/src/main/java/net/pokeranalytics/android/ui/adapter/HomePagerAdapter.kt

@@ -2,17 +2,14 @@ package net.pokeranalytics.android.ui.adapter
 
 import android.util.SparseArray
 import android.view.ViewGroup
-import androidx.core.util.forEach
-import androidx.core.util.size
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentStatePagerAdapter
 import net.pokeranalytics.android.exceptions.PAIllegalStateException
-import net.pokeranalytics.android.ui.activity.Tab
+import net.pokeranalytics.android.ui.modules.calendar.CalendarFragment
 import net.pokeranalytics.android.ui.fragment.ReportsFragment
 import net.pokeranalytics.android.ui.fragment.SettingsFragment
 import net.pokeranalytics.android.ui.fragment.StatisticsFragment
 import net.pokeranalytics.android.ui.fragment.components.BaseFragment
-import net.pokeranalytics.android.ui.modules.calendar.CalendarFragment
 import net.pokeranalytics.android.ui.modules.feed.FeedFragment
 import java.lang.ref.WeakReference
 
@@ -26,17 +23,17 @@ class HomePagerAdapter(fragmentManager: FragmentManager) :
 
 	override fun getItem(position: Int): BaseFragment {
 		return when (position) {
-			Tab.HISTORY.identifier -> FeedFragment.newInstance()
+			0 -> FeedFragment.newInstance()
-			Tab.STATS.identifier -> StatisticsFragment.newInstance()
+			1 -> StatisticsFragment.newInstance()
-			Tab.CALENDAR.identifier -> CalendarFragment.newInstance()
+			2 -> CalendarFragment.newInstance()
-			Tab.REPORTS.identifier -> ReportsFragment.newInstance()
+			3 -> ReportsFragment.newInstance()
-			Tab.SETTINGS.identifier -> SettingsFragment.newInstance()
+			4 -> SettingsFragment.newInstance()
-			else -> throw PAIllegalStateException("Should not happen, position = $position")
+			else -> throw PAIllegalStateException("Should not happen")
 		}
 	}
 
 	override fun getCount(): Int {
-		return Tab.values().size
+		return 5
 	}
 
 	override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) {
@@ -52,26 +49,19 @@ class HomePagerAdapter(fragmentManager: FragmentManager) :
 
 	override fun getItemPosition(obj: Any): Int {
 		return when (obj) {
-			is FeedFragment -> Tab.HISTORY.identifier
+			FeedFragment::class.java -> 0
-			is StatisticsFragment -> Tab.STATS.identifier
+			StatisticsFragment::class.java -> 1
-			is CalendarFragment -> Tab.CALENDAR.identifier
+			CalendarFragment::class.java -> 2
-			is ReportsFragment -> Tab.REPORTS.identifier
+			ReportsFragment::class.java -> 3
-			is SettingsFragment -> Tab.SETTINGS.identifier
+			SettingsFragment::class.java -> 4
-			else -> throw PAIllegalStateException("Should not happen for object $obj")
+			else -> throw PAIllegalStateException("Should not happen")
 		}
 	}
 
 	fun activityResumed() {
-
+		val ref = this.weakReferences.get(0)
-		this.weakReferences.forEach { _, value ->
+		ref?.get()?.let {
-			value.get()?.activityResumed()
+			(it as FeedFragment).activityResumed()
-		}
-
-	}
-
-	fun tabSelected(tab: Tab) {
-		if (this.weakReferences.size >= 5) {
-			this.weakReferences.get(tab.identifier).get()?.selectedTab()
 		}
 	}
 

app/src/main/java/net/pokeranalytics/android/ui/adapter/RowRepresentableAdapter.kt

@@ -1,5 +1,6 @@
 package net.pokeranalytics.android.ui.adapter
 
+import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
@@ -64,8 +65,4 @@ class RowRepresentableAdapter(
 		diffResult.dispatchUpdatesTo(this)
 	}
 
-	fun changeDataSource(dataSource: RowRepresentableDataSource) {
-		this.dataSource = dataSource
-	}
-
 }

app/src/main/java/net/pokeranalytics/android/ui/extensions/UIExtensions.kt

@@ -9,11 +9,13 @@ import android.graphics.Bitmap
 import android.graphics.Canvas
 import android.graphics.Color
 import android.net.Uri
-import android.text.SpannableStringBuilder
 import android.util.TypedValue
 import android.view.View
 import android.view.inputmethod.InputMethodManager
-import android.widget.*
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.TextView
+import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.widget.SearchView
 import androidx.core.content.ContextCompat
@@ -82,11 +84,7 @@ fun BaseActivity.openContactMail(subjectStringRes: Int, filePath: String? = null
 
 	filePath?.let {
 		val databaseFile = File(it)
-        val contentUri = FileProvider.getUriForFile(
+		val contentUri = FileProvider.getUriForFile(this, "net.pokeranalytics.android.fileprovider", databaseFile)
-            this,
-            "net.pokeranalytics.android.fileprovider",
-            databaseFile
-        )
 		if (contentUri != null) {
 			emailIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
 			emailIntent.setDataAndType(contentUri, contentResolver.getType(contentUri))
@@ -108,107 +106,31 @@ fun Context.openUrl(url: String) {
 	ContextCompat.startActivity(this, browserIntent, null)
 }
 
-// Open custom tab
-fun Context.areYouSure(
-    title: Int? = null,
-    message: Int? = null,
-    positiveTitle: Int? = null,
-    proceed: () -> Unit
-) {
-
-    val builder: android.app.AlertDialog.Builder = android.app.AlertDialog.Builder(this)
-
-    val messageResource = message ?: R.string.are_you_sure_you_want_to_do_this
-    builder.setMessage(messageResource)
-
-    title?.let { builder.setTitle(it) }
-
-    val positiveButtonTitle = positiveTitle ?: R.string.yes
-    builder.setPositiveButton(positiveButtonTitle) { _, _ ->
-        proceed()
-    }
-    builder.setNegativeButton(R.string.cancel) { _, _ ->
-        // nothing
-    }
-    builder.create().show()
-}
-
 // Display Alert Dialog
 fun Activity.showAlertDialog(title: Int? = null, message: Int? = null) {
 	showAlertDialog(this, title, message)
 }
 
-fun Fragment.showAlertDialog(
+fun Fragment.showAlertDialog(title: Int? = null, message: Int? = null) {
-    title: Int? = null,
-    messageResId: Int? = null,
-    message: String? = null
-) {
 	context?.let {
-        showAlertDialog(it, title, messageResId, message)
+		showAlertDialog(it, title, message)
 	}
 }
 
-fun showEditTextAlertDialog(
-    context: Context, inputType: Int, title: Int? = null, messageResId: Int? = null, message: String? = null,
-    editTextText: String? = null, positiveAction: ((String) -> Unit)? = null
-) {
-    val builder = AlertDialog.Builder(context)
-    title?.let {
-        builder.setTitle(title)
-    }
-    messageResId?.let {
-        builder.setMessage(messageResId)
-    }
-    message?.let {
-        builder.setMessage(it)
-    }
-
-    val layout = LinearLayout(context)
-    layout.orientation = LinearLayout.VERTICAL
-    val params = LinearLayout.LayoutParams(
-        LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT
-    )
-    params.setMargins(20, 0, 30, 0)
-
-    val editText = EditText(context)
-    editText.inputType = inputType
-
-    editTextText?.let {
-        editText.text = SpannableStringBuilder(it)
-    }
-    editText.setTextColor(ContextCompat.getColor(context, R.color.white))
-
-    layout.addView(editText, params)
-
-    builder.setView(layout)
-
-//    builder.setView(editText)
-
-    builder.setPositiveButton(net.pokeranalytics.android.R.string.ok) { _, _ ->
-        positiveAction?.invoke(editText.text.toString())
-    }
-    builder.show()
-}
-
 /**
  * Create and show an alert dialog
  */
 fun showAlertDialog(
-    context: Context, title: Int? = null, messageResId: Int? = null, message: String? = null,
+	context: Context, title: Int? = null, message: Int? = null, cancelButtonTitle: Int? = null, showCancelButton: Boolean = false,
-    cancelButtonTitle: Int? = null, showCancelButton: Boolean = false,
 	positiveAction: (() -> Unit)? = null, negativeAction: (() -> Unit)? = null
 ) {
 	val builder = AlertDialog.Builder(context)
 	title?.let {
 		builder.setTitle(title)
 	}
-    messageResId?.let {
-        builder.setMessage(messageResId)
-    }
 	message?.let {
-        builder.setMessage(it)
+		builder.setMessage(message)
 	}
-
 	builder.setPositiveButton(net.pokeranalytics.android.R.string.ok) { _, _ ->
 		positiveAction?.invoke()
 	}
@@ -255,7 +177,7 @@ fun SearchView.removeMargins() {
 	searchEditFrame?.layoutParams = layoutParams
 }
 
-fun View.toByteArray(): ByteArray {
+fun View.toByteArray() : ByteArray {
 	return this.convertToBitmap().toByteArray()
 }
 
@@ -272,11 +194,11 @@ fun View.convertToBitmap(): Bitmap {
 	return b
 }
 
-fun ImageView.toByteArray(): ByteArray {
+fun ImageView.toByteArray() : ByteArray {
 	return this.drawable.toBitmap().toByteArray()
 }
 
-fun Bitmap.toByteArray(): ByteArray {
+fun Bitmap.toByteArray() : ByteArray {
 	val baos = ByteArrayOutputStream()
 	this.compress(Bitmap.CompressFormat.PNG, 100, baos)
 	return baos.toByteArray()

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

@@ -12,7 +12,7 @@ import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource
 import net.pokeranalytics.android.ui.extensions.toast
 import net.pokeranalytics.android.ui.fragment.components.BaseFragment
 import net.pokeranalytics.android.ui.view.RowRepresentable
-import net.pokeranalytics.android.ui.view.rows.MoreTabRow
+import net.pokeranalytics.android.ui.view.rowrepresentable.MoreTabRow
 
 class ComparisonChartFragment : BaseFragment(), StaticRowRepresentableDataSource, RowRepresentableDelegate {
 
@@ -38,7 +38,6 @@ class ComparisonChartFragment : BaseFragment(), StaticRowRepresentableDataSource
 
 	private lateinit var viewPagerAdapter: ComparisonChartPagerAdapter
 	private var comparisonChartMenu: Menu? = null
-
     private var _binding: FragmentComparisonChartBinding? = null
     private val binding get() = _binding!!
 
@@ -49,7 +48,7 @@ class ComparisonChartFragment : BaseFragment(), StaticRowRepresentableDataSource
 
 	// Life Cycle
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         _binding = FragmentComparisonChartBinding.inflate(inflater, container, false)
         return binding.root
     }
@@ -75,7 +74,7 @@ class ComparisonChartFragment : BaseFragment(), StaticRowRepresentableDataSource
 	}
 
 	// Rows
-	override fun adapterRows(): List<RowRepresentable> {
+	override fun adapterRows(): List<RowRepresentable>? {
 		return rowRepresentation
 	}
 

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

@@ -16,7 +16,7 @@ import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource
 import net.pokeranalytics.android.ui.fragment.components.BaseFragment
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowViewType
-import net.pokeranalytics.android.ui.view.rows.SeparatorRow
+import net.pokeranalytics.android.ui.view.rowrepresentable.SeparatorRow
 import net.pokeranalytics.android.util.UserDefaults
 import java.util.*
 
@@ -39,53 +39,34 @@ class CurrenciesFragment : BaseFragment(), StaticRowRepresentableDataSource, Row
 
 		private val mostUsedCurrencies = this.mostUsedCurrencyCodes.map { code ->
 			CurrencyRow(
-					this.systemCurrencies.first {
+				this.systemCurrencies.filter {
 					it.currencyCode == code
-					}
+				}.first()
 			)
 		}
 
-		private val availableCurrencies =
+		private val availableCurrencies = this.systemCurrencies.filter {
-			Locale.getAvailableLocales()
+			!mostUsedCurrencyCodes.contains(it.currencyCode)
-				.mapNotNull {
+		}.filter {
-					try {
+			UserDefaults.availableCurrencyLocales.filter { currencyLocale ->
-						Currency.getInstance(it)
-					} catch (e: Exception) {
-						null
-					}
-				}.toSet()
-				.filter { !mostUsedCurrencyCodes.contains(it.currencyCode) }
-				.filter {
-					UserDefaults.availableCurrencyLocales.any { currencyLocale ->
                 Currency.getInstance(currencyLocale).currencyCode == it.currencyCode
+			}.isNotEmpty()
+		}.sortedBy {
+			it.displayName
+		}.map {
+			CurrencyRow(it)
 		}
 	}
-				.sortedBy { it.displayName }
-				.map {  CurrencyRow(it) }
-
-//		private val availableCurrencies = this.systemCurrencies.filter {
-//			!mostUsedCurrencyCodes.contains(it.currencyCode)
-//		}.filter {
-//			UserDefaults.availableCurrencyLocales.filter { currencyLocale ->
-//                Currency.getInstance(currencyLocale).currencyCode == it.currencyCode
-//			}.isNotEmpty()
-//		}.sortedBy {
-//			it.displayName
-//		}.map {
-//			CurrencyRow(it)
-//		}
-
-	}
 
 	private class CurrencyRow(var currency: Currency) : RowRepresentable {
 
 		override fun getDisplayName(context: Context): String {
-			return this.currency.getDisplayName(Locale.getDefault()).capitalize()
+			return currency.getDisplayName(Locale.getDefault()).capitalize()
 		}
 
-		var currencyCode: String = this.currency.currencyCode
+		var currencyCode: String = currency.currencyCode
-		var currencySymbol: String = this.currency.getSymbol(Locale.getDefault())
+		var currencySymbole: String = currency.getSymbol(Locale.getDefault())
-		var currencyCodeAndSymbol: String = "${this.currencyCode} (${this.currencySymbol})"
+		var currencyCodeAndSymbol: String = "${this.currencyCode} (${this.currencySymbole})"
 
 		override val viewType: Int = RowViewType.TITLE_VALUE.ordinal
 	}
@@ -95,7 +76,7 @@ class CurrenciesFragment : BaseFragment(), StaticRowRepresentableDataSource, Row
 
     // Life Cycle
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         _binding = FragmentCurrenciesBinding.inflate(inflater, container, false)
         return binding.root
     }
@@ -114,8 +95,8 @@ class CurrenciesFragment : BaseFragment(), StaticRowRepresentableDataSource, Row
 
 	// StaticRowRepresentableDataSource
 
-	override fun adapterRows(): List<RowRepresentable> {
+	override fun adapterRows(): List<RowRepresentable>? {
-		return rowRepresentation
+		return CurrenciesFragment.rowRepresentation
 
 	}
 

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

@@ -4,8 +4,6 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
 import com.github.mikephil.charting.charts.BarChart
 import com.github.mikephil.charting.charts.BarLineChartBase
 import com.github.mikephil.charting.charts.LineChart
@@ -33,23 +31,6 @@ import timber.log.Timber
 
 class GraphFragment : RealmFragment(), OnChartValueSelectedListener {
 
-	companion object {
-
-		fun newInstance(defaultStyle: Graph.Style? = null): GraphFragment {
-			val fragment = GraphFragment()
-			val bundle = Bundle()
-			defaultStyle?.let {
-				bundle.putInt(BundleKey.STYLE.value, defaultStyle.ordinal)
-			}
-			fragment.arguments = bundle
-			return fragment
-		}
-
-	}
-
-	/***
-	 * The view model
-	 */
 	private lateinit var graphDataProvider: GraphDataProvider
 
 	private val stat: Stat
@@ -57,27 +38,23 @@ class GraphFragment : RealmFragment(), OnChartValueSelectedListener {
 			return this.graphDataProvider.stat
 		}
 
-	/***
+	companion object {
-	 * Uses forced style first, or the style set
+
+		/**
+		 * Create new instance
 		 */
-	private val style: Graph.Style
+		fun newInstance(style: Graph.Style): GraphFragment {
-		get() {
+			val fragment = GraphFragment()
-			val style = this.graphDataProvider.style
+			val bundle = Bundle()
-			if (style != null) {
+			bundle.putSerializable(BundleKey.STYLE.value, style.ordinal)
-				return style
+			fragment.arguments = bundle
+			return fragment
 		}
 
-			this.arguments?.let { bundle ->
-				if (bundle.containsKey(BundleKey.STYLE.value)) {
-					val styleIndex = bundle.getInt(BundleKey.STYLE.value)
-					return Graph.Style.values()[styleIndex]
-				} else {
-					return Graph.Style.LINE
-//					throw PAIllegalStateException("Style not defined for $this")
-				}
-			} ?: throw PAIllegalStateException("Style and bundle not defined for $this")
 	}
 
+	private var style: Graph.Style = Graph.Style.LINE
+
 	private lateinit var legendView: LegendView
 
 	private var chartView: BarLineChartBase<*>? = null
@@ -103,10 +80,12 @@ class GraphFragment : RealmFragment(), OnChartValueSelectedListener {
 		initData()
 		initUI()
 		loadGraph()
-
 	}
 
 	private fun initData() {
+		val styleOrdinal = this.arguments?.getInt(BundleKey.STYLE.value) ?: throw PAIllegalStateException("Missing style key in bundle")
+		this.style = Graph.Style.values()[styleOrdinal]
+
 		this.graphDataProvider = (requireActivity() as ViewModelHolder).model as GraphDataProvider
 	}
 
@@ -123,8 +102,8 @@ class GraphFragment : RealmFragment(), OnChartValueSelectedListener {
 		this.binding.legendContainer.addView(this.legendView)
 	}
 
-	fun reload() {
+	fun reload(style: Graph.Style) {
-		Timber.d("isAdded = $isAdded, isDetached = $isDetached")
+		this.style = style
 		if (isAdded && !isDetached) {
 			loadGraph()
 		}

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

@@ -1,13 +1,11 @@
 package net.pokeranalytics.android.ui.fragment
 
-import android.net.Uri
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import com.google.android.material.snackbar.Snackbar
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.async
 import kotlinx.coroutines.launch
@@ -16,7 +14,6 @@ import net.pokeranalytics.android.databinding.FragmentImportBinding
 import net.pokeranalytics.android.ui.fragment.components.RealmFragment
 import net.pokeranalytics.android.util.csv.CSVImporter
 import net.pokeranalytics.android.util.csv.ImportDelegate
-import net.pokeranalytics.android.util.csv.ImportException
 import timber.log.Timber
 import java.io.InputStream
 import java.text.NumberFormat
@@ -24,19 +21,19 @@ import java.util.*
 
 class ImportFragment : RealmFragment(), ImportDelegate {
 
+//	val coroutineContext: CoroutineContext
+//		get() = Dispatchers.Main
+
 	private lateinit var filePath: String
 	private lateinit var inputStream: InputStream
-	private lateinit var uri: Uri
 	private lateinit var importer: CSVImporter
 
     private var _binding: FragmentImportBinding? = null
     private val binding get() = _binding!!
 
-	private val exceptions: MutableList<Exception> = mutableListOf()
-
     // Life Cycle
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         super.onCreateView(inflater, container, savedInstanceState)
         _binding = FragmentImportBinding.inflate(inflater, container, false)
         return binding.root
@@ -47,6 +44,7 @@ class ImportFragment : RealmFragment(), ImportDelegate {
         _binding = null
     }
 
+
     fun setData(path: String) {
 		this.filePath = path
 	}
@@ -55,10 +53,6 @@ class ImportFragment : RealmFragment(), ImportDelegate {
 		this.inputStream = inputStream
 	}
 
-	fun setData(uri: Uri) {
-		this.uri = uri
-	}
-
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
 
@@ -91,33 +85,34 @@ class ImportFragment : RealmFragment(), ImportDelegate {
 
 	private fun startImport() {
 
-		this.parentActivity?.paApplication?.reportWhistleBlower?.pause()
+//		var shouldDismissActivity = false
 
-		this.importer = CSVImporter(uri, requireContext())
+		this.importer = CSVImporter(inputStream)
 		this.importer.delegate = this
 
-		CoroutineScope(coroutineContext).launch {
+		var exception: Exception? = null
+
+		GlobalScope.launch(coroutineContext) {
 
-			val coroutine = GlobalScope.async {
+			val test = GlobalScope.async {
 				val s = Date()
 				Timber.d(">>> Start Import...")
 
 				try {
 					importer.start()
-				} catch (e: ImportException) {
+				} catch (e: Exception) {
-					exceptions.add(e)
+					exception = e
 				}
-
 				val e = Date()
 				val duration = (e.time - s.time) / 1000.0
 				Timber.d(">>> Import ended in $duration seconds")
 
 			}
-			coroutine.await()
+			test.await()
 
-			val exceptionMessage = exceptions.firstOrNull()?.message
+			val exceptionMessage = exception?.message
 			if (exceptionMessage != null && view != null) {
-				val message = "${exceptions.size} " + requireContext().getString(R.string.errors) + ":\n" + exceptionMessage + ".\n" + requireContext().getString(R.string.import_error)
+				val message = exceptionMessage + ". " + requireContext().getString(R.string.import_error)
 				val snackBar = Snackbar.make(view!!, message, Snackbar.LENGTH_INDEFINITE)
 				snackBar.setAction(R.string.ok) {
 					snackBar.dismiss()
@@ -127,6 +122,15 @@ class ImportFragment : RealmFragment(), ImportDelegate {
 				snackBar.show()
 			}
 
+//			if (shouldDismissActivity) {
+//
+//				activity?.let {
+//					it.setResult(ResultCode.IMPORT_UNRECOGNIZED_FORMAT.value)
+//					it.finish()
+//				}
+//
+//			} else {
+//			}
 			importDidFinish()
 
 		}
@@ -138,15 +142,16 @@ class ImportFragment : RealmFragment(), ImportDelegate {
 	}
 
 	private fun importDidFinish() {
+
 		binding.save.isEnabled = true
+
 	}
 
 	private fun end() {
-		this.parentActivity?.paApplication?.reportWhistleBlower?.resume()
 		activity?.finish()
 	}
 
-	private val numberFormatter = NumberFormat.getNumberInstance()
+	val numberFormatter = NumberFormat.getNumberInstance()
 
 	// ImportDelegate
 
@@ -155,8 +160,4 @@ class ImportFragment : RealmFragment(), ImportDelegate {
         binding.totalCounter.text = this.numberFormatter.format(totalCount)
 	}
 
-	override fun exceptionCaught(e: Exception) {
-		this.exceptions.add(e)
-	}
-
 }

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

@@ -7,7 +7,6 @@ import android.view.*
 import androidx.recyclerview.widget.LinearLayoutManager
 import io.realm.Realm
 import net.pokeranalytics.android.R
-import net.pokeranalytics.android.calculus.calcul.ReportDisplay
 import net.pokeranalytics.android.calculus.Calculator
 import net.pokeranalytics.android.calculus.Stat
 import net.pokeranalytics.android.databinding.FragmentReportCreationBinding
@@ -25,8 +24,8 @@ import net.pokeranalytics.android.ui.modules.filter.FilterActivityRequestCode
 import net.pokeranalytics.android.ui.modules.filter.FilterableType
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowViewType
-import net.pokeranalytics.android.ui.view.rows.CustomizableRowRepresentable
+import net.pokeranalytics.android.ui.view.rowrepresentable.CustomizableRowRepresentable
-import net.pokeranalytics.android.ui.view.rows.SeparatorRow
+import net.pokeranalytics.android.ui.view.rowrepresentable.SeparatorRow
 import net.pokeranalytics.android.util.extensions.sorted
 import timber.log.Timber
 
@@ -43,7 +42,7 @@ class ReportCreationFragment : RealmFragment(), RowRepresentableDataSource, RowR
 
     // Life Cycle
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         super.onCreateView(inflater, container, savedInstanceState)
         _binding = FragmentReportCreationBinding.inflate(inflater, container, false)
         return binding.root
@@ -124,7 +123,7 @@ class ReportCreationFragment : RealmFragment(), RowRepresentableDataSource, RowR
 //					}
 
 					// launch report
-					this.finishActivityWithOptions(this.assistant.options, this.assistant.reportDisplay)
+					this.finishActivityWithOptions(this.assistant.options)
 
 				} else {
 					this.updateUIWithCurrentStep()
@@ -159,9 +158,8 @@ class ReportCreationFragment : RealmFragment(), RowRepresentableDataSource, RowR
 	/**
 	 * Finish activity
 	 */
-	private fun finishActivityWithOptions(options: Calculator.Options, reportDisplay: ReportDisplay) {
+	private fun finishActivityWithOptions(options: Calculator.Options) {
 		ReportCreationActivity.options = options // temp object
-		ReportCreationActivity.reportDisplay = reportDisplay
 		val intent = Intent()
 		activity?.setResult(Activity.RESULT_OK, intent)
 		activity?.finish()
@@ -170,11 +168,11 @@ class ReportCreationFragment : RealmFragment(), RowRepresentableDataSource, RowR
 
 	// RowRepresentableDataSource
 
-	override fun adapterRows(): List<RowRepresentable> {
+	override fun adapterRows(): List<RowRepresentable>? {
 		return this.currentRows
 	}
 
-	override fun rowRepresentableForPosition(position: Int): RowRepresentable {
+	override fun rowRepresentableForPosition(position: Int): RowRepresentable? {
 		return this.currentRows[position]
 	}
 
@@ -222,10 +220,7 @@ class ReportCreationFragment : RealmFragment(), RowRepresentableDataSource, RowR
 class Assistant {
 
 	var step: Step = Step.TYPE
-
+	private var display: Calculator.Options.Display = Calculator.Options.Display.TABLE
-	var reportDisplay: ReportDisplay = ReportDisplay.TABLE
-		private set
-
 	private var stats = mutableListOf<Stat>()
 	private var comparators = mutableListOf<Criteria>()
 	private var useFilter: Boolean? = null
@@ -234,6 +229,7 @@ class Assistant {
 	val options: Calculator.Options
 		get() {
 			return Calculator.Options(
+				this.display,
 				stats = this.stats,
 				criterias = this.comparators,
 				filter = this.filter,
@@ -259,27 +255,17 @@ class Assistant {
 
 		when (this.step) {
 			Step.TYPE -> {
-				this.reportDisplay = this.dataSource[position] as ReportDisplay
+				this.display = this.dataSource[position] as Calculator.Options.Display
 				this.nextStep()
 			}
 			Step.STAT -> {
-
 				val stat = this.dataSource[position] as Stat
-				when (this.reportDisplay.multipleStatSelection) {
-					true -> {
 				if (this.stats.contains(stat)) {
 					this.stats.remove(stat)
 				} else {
 					this.stats.add(stat)
 				}
 			}
-					false -> {
-						this.stats.clear()
-						this.stats.add(stat)
-					}
-				}
-
-			}
 			Step.COMPARATOR -> {
 				val item = this.dataSource[position]
 
@@ -340,7 +326,7 @@ class Assistant {
 		get() {
 			return if (this.stats.isEmpty()) {
 				Step.STAT
-			} else if (this.reportDisplay == ReportDisplay.COMPARISON && this.comparators.isEmpty()) {
+			} else if (this.display == Calculator.Options.Display.COMPARISON && this.comparators.isEmpty()) {
 				Step.COMPARATOR
 			} else if (this.step == Step.FILTER) {
 				Step.FINALIZE
@@ -367,13 +353,13 @@ class Assistant {
 		get() {
 			return when (this.step) {
 				Step.TYPE -> listOf(
-					ReportDisplay.TABLE,
+					Calculator.Options.Display.TABLE,
-					ReportDisplay.PROGRESS,
+					Calculator.Options.Display.PROGRESS,
-					ReportDisplay.COMPARISON
+					Calculator.Options.Display.COMPARISON
 				)
 				Step.STAT -> {
-					when (this.reportDisplay) {
+					when (this.display) {
-						ReportDisplay.PROGRESS -> Stat.evolutionValuesList
+						Calculator.Options.Display.PROGRESS -> Stat.evolutionValuesList
 						else -> Stat.userSelectableList
 					}
 				}

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

@@ -1,37 +1,28 @@
 package net.pokeranalytics.android.ui.fragment
 
 import android.app.Activity
-import android.content.ClipData
-import android.content.ClipboardManager
-import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
-import androidx.core.view.isVisible
 import androidx.recyclerview.widget.LinearLayoutManager
 import io.realm.Realm
 import io.realm.RealmResults
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.calculus.Calculator
-import net.pokeranalytics.android.calculus.NewPerformanceListener
-import net.pokeranalytics.android.calculus.ReportTask
-import net.pokeranalytics.android.calculus.ReportWhistleBlower
 import net.pokeranalytics.android.calculus.Stat
-import net.pokeranalytics.android.calculus.calcul.ReportDisplay
 import net.pokeranalytics.android.databinding.FragmentReportsBinding
 import net.pokeranalytics.android.model.Criteria
 import net.pokeranalytics.android.model.combined
 import net.pokeranalytics.android.model.interfaces.Deletable
-import net.pokeranalytics.android.model.realm.Performance
 import net.pokeranalytics.android.model.realm.ReportSetup
-import net.pokeranalytics.android.model.realm.Result
+import net.pokeranalytics.android.ui.modules.datalist.DataListActivity
 import net.pokeranalytics.android.ui.activity.ReportCreationActivity
 import net.pokeranalytics.android.ui.activity.components.ReportActivity
 import net.pokeranalytics.android.ui.activity.components.RequestCode
@@ -39,44 +30,16 @@ 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.DeletableItemFragment
-import net.pokeranalytics.android.ui.modules.datalist.DataListActivity
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowViewType
-import net.pokeranalytics.android.ui.view.rows.CustomizableRowRepresentable
+import net.pokeranalytics.android.ui.view.rowrepresentable.CustomizableRowRepresentable
-import net.pokeranalytics.android.ui.view.rows.StaticReport
+import net.pokeranalytics.android.ui.view.rowrepresentable.ReportRow
-import net.pokeranalytics.android.util.NULL_TEXT
-import net.pokeranalytics.android.util.Preferences
 import timber.log.Timber
-import java.util.Date
+import java.util.*
-
-
-data class ReportSection(val report: StaticReport, var performances: MutableList<PerformanceRow>) {
-
-	fun getDisplayName(context: Context): String {
-		return when (report) {
-			is StaticReport.CustomFieldList -> {
-				report.customField.name
-			}
-			else -> {
-				this.report.resId?.let { context.getString(it) } ?: NULL_TEXT
-			}
-		}
-	}
-
-}
 
-data class PerformanceRow(val performance: Performance, val report: StaticReport): RowRepresentable {
+class ReportsFragment : DeletableItemFragment(), StaticRowRepresentableDataSource, RowRepresentableDelegate {
-
-
-	override val resId: Int? = this.performance.resId
-
-	override val viewType: Int = RowViewType.TITLE_BADGE_VALUE.identifier
-}
-
-class ReportsFragment : DeletableItemFragment(), StaticRowRepresentableDataSource, RowRepresentableDelegate, NewPerformanceListener {
 
 	private lateinit var reportSetups: RealmResults<ReportSetup>
-	private lateinit var performances: RealmResults<Performance>
 	private var adapterRows = mutableListOf<RowRepresentable>()
 
 	override fun deletableItems(): List<Deletable> {
@@ -101,7 +64,7 @@ class ReportsFragment : DeletableItemFragment(), StaticRowRepresentableDataSourc
 
     // Life Cycle
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         super.onCreateView(inflater, container, savedInstanceState)
         _binding = FragmentReportsBinding.inflate(inflater, container, false)
         return binding.root
@@ -123,35 +86,22 @@ class ReportsFragment : DeletableItemFragment(), StaticRowRepresentableDataSourc
 		super.onActivityResult(requestCode, resultCode, data)
 
 		if (requestCode == RequestCode.NEW_REPORT.value && resultCode == Activity.RESULT_OK) {
-
 			ReportCreationActivity.options?.let { options ->
-				ReportCreationActivity.reportDisplay?.let { display ->
+				this.launchReportWithOptions(options, options.getName(requireContext()))
-					options.progressValues = display.progressValues
+			}
-					this.launchReportWithOptions(options, display, options.getName(requireContext()))
-				} ?: run { Timber.d("no display to run the report") }
-			} ?: run { Timber.d("no options to run the report") }
-
 			ReportCreationActivity.options = null
-			ReportCreationActivity.reportDisplay = null
 		} else if (requestCode == RequestCode.DEFAULT.value && resultCode == Activity.RESULT_OK) {
 			val itemToDeleteId = data?.getStringExtra(DataListActivity.IntentKey.ITEM_DELETED.keyName)
 			itemToDeleteId?.let { id ->
-
+				GlobalScope.launch(Dispatchers.Main) {
-				CoroutineScope(coroutineContext).launch {
 					delay(300)
 					deleteItem(dataListAdapter, reportSetups, id)
 				}
-
 			}
 		}
 
 	}
 
-	override fun selectedTab() {
-//		this.updateRows()
-		this.dataListAdapter.notifyDataSetChanged()
-	}
-
 	// Business
 
 	/**
@@ -162,11 +112,6 @@ class ReportsFragment : DeletableItemFragment(), StaticRowRepresentableDataSourc
 		this.reportSetups.addChangeListener { _, _ ->
 			this.updateRows()
 		}
-
-		this.performances = getRealm().where(Performance::class.java).findAll()
-		this.performances.addChangeListener { _, _ ->
-			this.updateRows()
-		}
 	}
 
 	/**
@@ -192,116 +137,34 @@ class ReportsFragment : DeletableItemFragment(), StaticRowRepresentableDataSourc
 			ReportCreationActivity.newInstanceForResult(this, requireContext())
 		}
 
-		val sessionCount = getRealm().where(Result::class.java).count()
-		binding.computeButton.isVisible = adapterRows.isEmpty() && sessionCount > 5
-		binding.computeButton.setOnClickListener {
-
-			try {
-				forceReportWhistleBlowerStart()
-			} catch (e: Exception) {
-				e.message?.let {
-					this.showSnackBar(it)
-				}
-			}
-
-		}
-
-		this.paApplication?.reportWhistleBlower?.addListener(this)
-
-	}
-
-	override fun onDestroy() {
-		super.onDestroy()
-		this.paApplication?.reportWhistleBlower?.removeListener(this)
 	}
 
 	// Rows
 
 	private fun updateRows() {
 		this.adapterRows.clear()
-		if (this.reportSetups.isNotEmpty()) {
+		if (this.reportSetups.size > 0) {
 			adapterRows.add(CustomizableRowRepresentable(customViewType = RowViewType.HEADER_TITLE, resId = R.string.custom))
 			adapterRows.addAll(this.reportSetups)
 		}
-		this.addStaticReportRows()
+		adapterRows.addAll(ReportRow.getRows())
-
-		this.binding.emptyScreenText.visibility = if (adapterRows.isEmpty()) { View.VISIBLE } else { View.GONE }
-
 		this.dataListAdapter.notifyDataSetChanged()
 	}
 
-	private fun addStaticReportRows() {
+	override fun adapterRows(): List<RowRepresentable>? {
-
-		context?.let { context ->
-			val sections = buildReportSections()
-			for (section in sections) {
-
-				adapterRows.add(CustomizableRowRepresentable(customViewType = RowViewType.HEADER_TITLE, title = section.getDisplayName(context)))
-				for (performance in section.performances) {
-					adapterRows.add(performance)
-				}
-			}
-		}
-	}
-
-	private fun buildReportSections(): List<ReportSection> {
-
-		val sections = mutableListOf<ReportSection>()
-
-		val performances = getRealm().where(Performance::class.java).findAll()
-		for (performance in performances) {
-
-			val report = performance.toStaticReport(getRealm())
-
-			val reportRow = PerformanceRow(performance, report)
-
-			sections.firstOrNull { it.report == report }?.let { section ->
-				section.performances.add(reportRow)
-			} ?: run {
-				val section = ReportSection(report, mutableListOf(reportRow))
-				sections.add(section)
-			}
-		}
-
-		return sections
-	}
-
-	override fun adapterRows(): List<RowRepresentable> {
 		return this.adapterRows
 	}
 
-	override fun charSequenceForRow(row: RowRepresentable, context: Context): CharSequence {
-		return when (row) {
-			is PerformanceRow -> {
-				row.performance.displayValue(getRealm())
-			}
-			else -> NULL_TEXT
-		}
-	}
-
-	/**
-	 * Returns whether the row should display a badge
-	 */
-	override fun boolForRow(row: RowRepresentable): Boolean {
-		val reportRow = row as PerformanceRow
-		return Preferences.showInAppBadges(requireContext())
-				&& (this.paApplication?.reportWhistleBlower?.has(reportRow.performance.id) ?: false)
-	}
-
 	override fun onRowSelected(position: Int, row: RowRepresentable, tag: Int) {
 		super.onRowSelected(position, row, tag)
 
 		when (row) {
-			is PerformanceRow -> {
+			is ReportRow -> {
 				val reportName = row.localizedTitle(requireContext())
-				val report = row.report
+				launchComputation(row.criteria, reportName)
-				if (report.hasGraph) {
-					launchComputation(report.criteria, reportName, row.performance.stat)
-				}
 			}
 			is ReportSetup -> {
-				val display = ReportDisplay.values()[row.display]
+				launchReportWithOptions(row.options(getRealm()), row.name)
-				launchReportWithOptions(row.options(getRealm(), display), display, row.name)
 			}
 		}
 	}
@@ -309,31 +172,33 @@ class ReportsFragment : DeletableItemFragment(), StaticRowRepresentableDataSourc
 	/**
 	 * Launch computation
 	 */
-	private fun launchComputation(criteriaList: List<Criteria>, reportName: String, stat: Stat) {
+	private fun launchComputation(criteriaList: List<Criteria>, reportName: String) {
 
 		if (criteriaList.combined().size < 2) {
 			Toast.makeText(context, R.string.less_then_2_values_for_display, Toast.LENGTH_LONG).show()
 			return
 		}
 
+		val requiredStats: List<Stat> = listOf(Stat.NET_RESULT)
 		val options = Calculator.Options(
+			display = Calculator.Options.Display.COMPARISON,
 			progressValues = Calculator.Options.ProgressValues.STANDARD,
-			stats = listOf(stat),
+			stats = requiredStats,
 			criterias = criteriaList
 		)
 
-		this.launchReportWithOptions(options, ReportDisplay.COMPARISON, reportName)
+		this.launchReportWithOptions(options, reportName)
 
 	}
 
 	/**
 	 * Launch and display a report with some [options] and a [reportName]
 	 */
-	private fun launchReportWithOptions(options: Calculator.Options, reportDisplay: ReportDisplay, reportName: String) {
+	private fun launchReportWithOptions(options: Calculator.Options, reportName: String) {
 
 		showLoader()
 
-		CoroutineScope(coroutineContext).launch {
+		GlobalScope.launch {
 
 			val startDate = Date()
 			val realm = Realm.getDefaultInstance()
@@ -346,48 +211,11 @@ class ReportsFragment : DeletableItemFragment(), StaticRowRepresentableDataSourc
 			launch(Dispatchers.Main) {
 				if (!isDetached) {
 					hideLoader()
-					ReportActivity.newInstanceForResult(this@ReportsFragment, report, reportDisplay, reportName)
+					ReportActivity.newInstanceForResult(this@ReportsFragment, report, reportName)
 				}
 			}
 			realm.close()
 		}
 	}
 
-	override fun newBestPerformanceHandler() {
-		Timber.d("newBestPerformanceHandler called")
-
-		activity?.runOnUiThread {
-			this.dataListAdapter.notifyDataSetChanged()
-		}
-
-	}
-
-	private fun forceReportWhistleBlowerStart() {
-
-		val rwb = ReportWhistleBlower(requireContext())
-		val reportTask = ReportTask(rwb, requireContext())
-		reportTask.handler = {
-
-			Timber.d("test")
-
-			val paused = paApplication?.reportWhistleBlower?.paused
-			reportTask.messages.add(">>> main RWB paused = $paused")
-
-			val message = reportTask.messages.joinToString("\n")
-			CoroutineScope(coroutineContext).launch(Dispatchers.Main) {
-				Timber.d("test2")
-
-				copyToClipboard(requireContext(), message)
-			}
-		}
-
-		reportTask.start()
-
-	}
-
-	fun copyToClipboard(context: Context, text: String) {
-		val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
-		val clip = ClipData.newPlainText("label", text)
-		clipboard.setPrimaryClip(clip)
-	}
 }

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

@@ -6,51 +6,36 @@ import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
-import android.text.InputType
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
-import androidx.appcompat.app.AlertDialog
 import androidx.core.content.FileProvider
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.android.billingclient.api.Purchase
-import com.google.android.material.snackbar.Snackbar
-import com.google.android.play.core.review.ReviewException
 import com.google.android.play.core.review.ReviewManagerFactory
 import io.realm.Realm
 import net.pokeranalytics.android.BuildConfig
 import net.pokeranalytics.android.R
-import net.pokeranalytics.android.api.CurrencyConverterApi
 import net.pokeranalytics.android.databinding.FragmentSettingsBinding
 import net.pokeranalytics.android.exceptions.PAIllegalStateException
 import net.pokeranalytics.android.model.LiveData
 import net.pokeranalytics.android.model.realm.Currency
 import net.pokeranalytics.android.model.realm.Session
 import net.pokeranalytics.android.model.realm.Transaction
-import net.pokeranalytics.android.ui.activity.BillingActivity
+import net.pokeranalytics.android.ui.activity.*
-import net.pokeranalytics.android.ui.activity.CurrenciesActivity
-import net.pokeranalytics.android.ui.activity.GDPRActivity
-import net.pokeranalytics.android.ui.activity.Top10Activity
 import net.pokeranalytics.android.ui.activity.components.RequestCode
 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.openContactMail
 import net.pokeranalytics.android.ui.extensions.openUrl
-import net.pokeranalytics.android.ui.extensions.showEditTextAlertDialog
 import net.pokeranalytics.android.ui.fragment.components.RealmFragment
 import net.pokeranalytics.android.ui.modules.bankroll.BankrollActivity
 import net.pokeranalytics.android.ui.modules.datalist.DataListActivity
-import net.pokeranalytics.android.ui.modules.settings.DealtHandsPerHourActivity
 import net.pokeranalytics.android.ui.view.RowRepresentable
-import net.pokeranalytics.android.ui.view.rows.SettingsRow
+import net.pokeranalytics.android.ui.view.rowrepresentable.SettingRow
-import net.pokeranalytics.android.util.FileUtils
+import net.pokeranalytics.android.util.*
-import net.pokeranalytics.android.util.Language
-import net.pokeranalytics.android.util.Preferences
-import net.pokeranalytics.android.util.StopNotificationManager
-import net.pokeranalytics.android.util.URL
-import net.pokeranalytics.android.util.UserDefaults
 import net.pokeranalytics.android.util.billing.AppGuard
 import net.pokeranalytics.android.util.billing.IAPProducts
 import net.pokeranalytics.android.util.billing.PurchaseListener
@@ -59,7 +44,7 @@ import net.pokeranalytics.android.util.extensions.dateTimeFileFormatted
 import timber.log.Timber
 import java.io.File
 import java.io.IOException
-import java.util.Date
+import java.util.*
 
 
 class SettingsFragment : RealmFragment(), RowRepresentableDelegate, StaticRowRepresentableDataSource, PurchaseListener {
@@ -76,12 +61,11 @@ class SettingsFragment : RealmFragment(), RowRepresentableDelegate, StaticRowRep
 			return fragment
 		}
 
-//		fun rowRepresentation(context: Context): List<RowRepresentable> {
+		val rowRepresentation: List<RowRepresentable> by lazy {
-//			val rows = ArrayList<RowRepresentable>()
+			val rows = ArrayList<RowRepresentable>()
-//			val hasBackupEmail = Preferences.getBackupEmail(context)?.isNotBlank() ?: false
+			rows.addAll(SettingRow.getRows())
-//			rows.addAll(SettingsRow.getRows(hasBackupEmail))
+			rows
-//			return rows
+		}
-//		}
 
 	}
 
@@ -92,7 +76,7 @@ class SettingsFragment : RealmFragment(), RowRepresentableDelegate, StaticRowRep
 
     // Life Cycle
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         super.onCreateView(inflater, container, savedInstanceState)
         _binding = FragmentSettingsBinding.inflate(inflater, container, false)
         return binding.root
@@ -120,32 +104,6 @@ class SettingsFragment : RealmFragment(), RowRepresentableDelegate, StaticRowRep
 		initUI()
 	}
 
-	/**
-	 * Init UI
-	 */
-	private fun initUI() {
-
-		val viewManager = LinearLayoutManager(requireContext())
-		settingsAdapterRow = RowRepresentableAdapter(this, this)
-
-		binding.recyclerView.apply {
-			setHasFixedSize(true)
-			layoutManager = viewManager
-			adapter = settingsAdapterRow
-		}
-	}
-
-	/**
-	 * Init data
-	 */
-	private fun initData() {
-
-	}
-
-	override fun activityResumed() {
-		this.settingsAdapterRow.notifyDataSetChanged()
-	}
-
 	override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
 
 		when (requestCode) {
@@ -153,62 +111,30 @@ class SettingsFragment : RealmFragment(), RowRepresentableDelegate, StaticRowRep
 				if (resultCode == Activity.RESULT_OK) {
 					data?.let {
 						val currencyCode = data.getStringExtra(CurrenciesFragment.INTENT_CURRENCY_CODE) ?: throw PAIllegalStateException("Missing currency code")
-						updateMainCurrency(currencyCode)
-					}
-				}
-			}
-			RequestCode.SUBSCRIPTION.value -> {
-				settingsAdapterRow.refreshRow(SettingsRow.SUBSCRIPTION)
-			}
-		}
-	}
-
-	private fun updateMainCurrency(currencyCode: String) {
-
-		val mainCurrencyCode = UserDefaults.currency.currencyCode
-
-		if (mainCurrencyCode == currencyCode) {
-			return
-		}
-		showLoader(R.string.please_wait)
-
-		CurrencyConverterApi.currencyRate(mainCurrencyCode, currencyCode, requireContext()) { apiRate, _ ->
-			hideLoader()
-
-			val message = requireContext().getString(R.string.currency_rate_confirmation, mainCurrencyCode, currencyCode)
-
-			context?.let { context ->
-				showEditTextAlertDialog(context, InputType.TYPE_CLASS_NUMBER or InputType.TYPE_NUMBER_FLAG_DECIMAL,
-					message = message, editTextText = apiRate?.toString()) { value ->
-					value.toDoubleOrNull()?.let { rate ->
-						updateMainCurrency(currencyCode, rate)
-					}
-				}
-			}
-
-		}
-
-	}
-
-	private fun updateMainCurrency(currencyCode: String, rate: Double) {
-
 						Preferences.setCurrencyCode(currencyCode, requireContext())
 						val realm = Realm.getDefaultInstance()
 						realm.executeTransaction {
-			realm.where(Currency::class.java).findAll().forEach { currency ->
+                            realm.where(Currency::class.java).isNull("code").or().equalTo("code", UserDefaults.currency.currencyCode).findAll().forEach { currency ->
-				currency.rate = (currency.rate ?: 1.0) * rate
+                                currency.rate = Currency.DEFAULT_RATE
                             }
 
-			realm.where(Session::class.java).findAll().forEach { session ->
+                            realm.where(Session::class.java).isNull("bankroll.currency.code").findAll().forEach { session ->
 								session.bankrollHasBeenUpdated()
 							}
 						}
 						realm.close()
-		settingsAdapterRow.refreshRow(SettingsRow.CURRENCY)
+						settingsAdapterRow.refreshRow(SettingRow.CURRENCY)
+					}
+				}
+			}
+			RequestCode.SUBSCRIPTION.value -> {
+				settingsAdapterRow.refreshRow(SettingRow.SUBSCRIPTION)
+			}
+		}
 	}
 
-	override fun adapterRows(): List<RowRepresentable> {
+	override fun adapterRows(): List<RowRepresentable>? {
-		return SettingsRow.getRows()
+		return rowRepresentation
 	}
 
 	override fun charSequenceForRow(
@@ -217,46 +143,39 @@ class SettingsFragment : RealmFragment(), RowRepresentableDelegate, StaticRowRep
 		tag: Int
 	): CharSequence {
 		return when (row) {
-			SettingsRow.SUBSCRIPTION -> AppGuard.subscriptionStatus(requireContext())
+			SettingRow.SUBSCRIPTION -> AppGuard.subscriptionStatus(requireContext())
-			SettingsRow.VERSION -> BuildConfig.VERSION_NAME + if (BuildConfig.DEBUG) " (${BuildConfig.VERSION_CODE}) DEBUG" else ""
+			SettingRow.VERSION -> BuildConfig.VERSION_NAME + if (BuildConfig.DEBUG) " (${BuildConfig.VERSION_CODE}) DEBUG" else ""
-			SettingsRow.CURRENCY -> UserDefaults.currency.symbol
+			SettingRow.CURRENCY -> UserDefaults.currency.symbol
-			SettingsRow.BACKUP_EMAIL -> Preferences.getBackupEmail(requireContext()) ?: ""
 			else -> ""
 		}
 	}
 
 	override fun boolForRow(row: RowRepresentable): Boolean {
 		return when (row) {
-			SettingsRow.STOP_NOTIFICATION -> Preferences.showStopNotifications(requireContext())
+			SettingRow.STOP_NOTIFICATION -> Preferences.showStopNotifications(requireContext())
-			SettingsRow.SHOULD_SHOW_BLOG_TIPS -> Preferences.shouldShowBlogTips(requireContext())
-			SettingsRow.SHOW_INAPP_BADGES -> Preferences.showInAppBadges(requireContext())
-			SettingsRow.BACKUP_EMAIL -> !Preferences.hasBackupEmail(requireContext())
 			else -> false
 		}
 	}
 
 	override fun onRowSelected(position: Int, row: RowRepresentable, tag: Int) {
 		when (row) {
-			SettingsRow.BANKROLL_REPORT -> BankrollActivity.newInstance(requireContext())
+			SettingRow.BANKROLL_REPORT -> BankrollActivity.newInstance(requireContext())
-			SettingsRow.TOP_10 -> Top10Activity.newInstance(requireContext())
+			SettingRow.TOP_10 -> Top10Activity.newInstance(requireContext())
-			SettingsRow.PLAYERS -> DataListActivity.newInstance(requireContext(), LiveData.PLAYER.ordinal)
+			SettingRow.PLAYERS -> DataListActivity.newInstance(requireContext(), LiveData.PLAYER.ordinal)
-			SettingsRow.SUBSCRIPTION -> {
+			SettingRow.SUBSCRIPTION -> {
 				if (!AppGuard.isProUser) {
 					BillingActivity.newInstanceForResult(this, false)
 				} else {
 					this.openPlayStoreAccount()
 				}
 			}
-			SettingsRow.LANGUAGE -> this.showLanguagePopup()
+			SettingRow.RATE_APP -> showReviewManager()
-			SettingsRow.RATE_APP -> showReviewManager()
+			SettingRow.CONTACT_US -> parentActivity?.openContactMail(R.string.contact)
-			SettingsRow.CONTACT_US -> parentActivity?.openContactMail(R.string.contact)
+			SettingRow.BUG_REPORT -> parentActivity?.openContactMail(R.string.bug_report_subject, Realm.getDefaultInstance().path)
-			SettingsRow.BUG_REPORT -> parentActivity?.openContactMail(R.string.bug_report_subject, Realm.getDefaultInstance().path)
+			SettingRow.CURRENCY -> CurrenciesActivity.newInstanceForResult(this@SettingsFragment, RequestCode.CURRENCY.value)
-			SettingsRow.CURRENCY -> CurrenciesActivity.newInstanceForResult(this@SettingsFragment, RequestCode.CURRENCY.value)
+			SettingRow.EXPORT_CSV_SESSIONS -> this.sessionsCSVExport()
-			SettingsRow.DEALT_HANDS_PER_HOUR -> DealtHandsPerHourActivity.newInstance(requireContext())
+			SettingRow.EXPORT_CSV_TRANSACTIONS -> this.transactionsCSVExport()
-			SettingsRow.BACKUP_EMAIL -> this.editBackupEmail()
+			SettingRow.FOLLOW_US -> {
-			SettingsRow.EXPORT_CSV_SESSIONS -> this.sessionsCSVExport()
-			SettingsRow.EXPORT_CSV_TRANSACTIONS -> this.transactionsCSVExport()
-			SettingsRow.FOLLOW_US -> {
 				when (position) {
 					0 -> parentActivity?.openUrl(URL.BLOG.value)
 					1 -> parentActivity?.openUrl(URL.INSTAGRAM.value)
@@ -264,12 +183,11 @@ class SettingsFragment : RealmFragment(), RowRepresentableDelegate, StaticRowRep
 					3 -> parentActivity?.openUrl(URL.FACEBOOK.value)
 				}
 			}
-			SettingsRow.BLOG_TIPS -> parentActivity?.openUrl(URL.BLOG_TIPS.value)
+			SettingRow.POKER_RUMBLE -> parentActivity?.openUrl(URL.POKER_RUMBLE.value)
-			SettingsRow.POKER_RUMBLE -> parentActivity?.openUrl(URL.POKER_RUMBLE.value)
+			SettingRow.DISCORD -> parentActivity?.openUrl(URL.DISCORD.value)
-			SettingsRow.DISCORD -> parentActivity?.openUrl(URL.DISCORD.value)
+			SettingRow.PRIVACY_POLICY -> parentActivity?.openUrl(URL.PRIVACY_POLICY.value)
-			SettingsRow.PRIVACY_POLICY -> parentActivity?.openUrl(URL.PRIVACY_POLICY.value)
+			SettingRow.TERMS_OF_USE -> parentActivity?.openUrl(URL.TERMS.value)
-			SettingsRow.TERMS_OF_USE -> parentActivity?.openUrl(URL.TERMS.value)
+			SettingRow.GDPR -> openGDPRActivity()
-			SettingsRow.GDPR -> openGDPRActivity()
 		}
 
 		row.relatedResultsRepresentable?.let {
@@ -277,40 +195,6 @@ class SettingsFragment : RealmFragment(), RowRepresentableDelegate, StaticRowRep
 		}
 	}
 
-	private fun showLanguagePopup() {
-
-		context?.let { context ->
-
-			val languages = Language.values()
-			val labels = Language.values().map { it.dualNames }
-
-			val builder: AlertDialog.Builder = AlertDialog.Builder(context)
-			builder.setTitle(R.string.language_popup_message)
-			builder.setItems(labels.toTypedArray()) { _, which ->
-				// the user clicked on colors[which]
-				val locale = languages[which]
-				Preferences.setLanguageCode(locale.code, context)
-
-				this.view?.let { view ->
-					val snackBar = Snackbar.make(view, R.string.language_should_restart_app_popup_message, Snackbar.LENGTH_INDEFINITE)
-					snackBar.show()
-				}
-
-			}
-			builder.show()
-		}
-
-	}
-
-	private fun editBackupEmail() {
-		context?.let { context ->
-			showEditTextAlertDialog(context, InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS, messageResId = R.string.backup_email_title, editTextText = Preferences.getBackupEmail(context)) { value ->
-				Preferences.setBackupEmail(value, context)
-				this.settingsAdapterRow.notifyDataSetChanged()
-			}
-		}
-	}
-
 	private fun showReviewManager() {
 
 		val manager = ReviewManagerFactory.create(requireContext())
@@ -324,8 +208,6 @@ class SettingsFragment : RealmFragment(), RowRepresentableDelegate, StaticRowRep
 					// completed
 				}
 			} else {
-				val exception = (task.exception as ReviewException)
-				Timber.d("requestReviewFlow not successful = ${exception.message}")
 				// There was some problem, continue regardless of the result.
 			}
 		}
@@ -334,23 +216,41 @@ class SettingsFragment : RealmFragment(), RowRepresentableDelegate, StaticRowRep
 
 	override fun onRowValueChanged(value: Any?, row: RowRepresentable) {
 		when (row) {
-			SettingsRow.STOP_NOTIFICATION -> {
+			SettingRow.STOP_NOTIFICATION -> {
 				val show = value as Boolean
 				if (!show) {
 					StopNotificationManager.stopAllStopNotifications(requireContext())
 				}
 				Preferences.setShowStopNotifications(show, requireContext())
 			}
-			SettingsRow.SHOULD_SHOW_BLOG_TIPS -> {
+			else -> {}
-				val show = value as Boolean
-				Preferences.showBlogTips(show, requireContext())
 		}
-			SettingsRow.SHOW_INAPP_BADGES -> {
-				val show = value as Boolean
-				Preferences.setShowInAppBadges(requireContext(), show)
 	}
-			else -> {}
+
+	/**
+	 * Init UI
+	 */
+	private fun initUI() {
+
+//		setToolbarTitle(getString(R.string.more))
+
+//		setDisplayHomeAsUpEnabled(true)
+
+		val viewManager = LinearLayoutManager(requireContext())
+		settingsAdapterRow = RowRepresentableAdapter(this, this)
+
+		binding.recyclerView.apply {
+			setHasFixedSize(true)
+			layoutManager = viewManager
+			adapter = settingsAdapterRow
+		}
 	}
+
+	/**
+	 * Init data
+	 */
+	private fun initData() {
+
 	}
 
 	/**
@@ -384,7 +284,7 @@ class SettingsFragment : RealmFragment(), RowRepresentableDelegate, StaticRowRep
 
 	private fun sessionsCSVExport() {
 		val sessions = getRealm().where(Session::class.java).findAll().sort("startDate")
-		val csv = ProductCSVDescriptors.pokerAnalyticsAndroid6Sessions.toCSV(sessions)
+		val csv = ProductCSVDescriptors.pokerAnalyticsAndroid.toCSV(sessions)
 		this.shareCSV(csv, "Sessions")
 	}
 
@@ -422,7 +322,7 @@ class SettingsFragment : RealmFragment(), RowRepresentableDelegate, StaticRowRep
 	}
 
 	override fun purchaseDidSucceed(purchase: Purchase) {
-		this.settingsAdapterRow.refreshRow(SettingsRow.SUBSCRIPTION)
+		this.settingsAdapterRow.refreshRow(SettingRow.SUBSCRIPTION)
 	}
 
 	override fun noPurchaseRetrieved() {

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

@@ -2,13 +2,11 @@ package net.pokeranalytics.android.ui.fragment
 
 import android.app.Activity
 import android.content.Intent
-import android.content.res.ColorStateList
-import android.os.Build
 import android.os.Bundle
-import android.view.*
+import android.view.LayoutInflater
-import androidx.appcompat.widget.Toolbar
+import android.view.View
+import android.view.ViewGroup
 import io.realm.Realm
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.async
 import kotlinx.coroutines.launch
@@ -17,18 +15,19 @@ import net.pokeranalytics.android.calculus.Calculator
 import net.pokeranalytics.android.calculus.ComputableGroup
 import net.pokeranalytics.android.calculus.Report
 import net.pokeranalytics.android.calculus.Stat
+import net.pokeranalytics.android.databinding.FragmentGraphBinding
 import net.pokeranalytics.android.databinding.FragmentStatsBinding
 import net.pokeranalytics.android.exceptions.PAIllegalStateException
 import net.pokeranalytics.android.model.filter.Query
 import net.pokeranalytics.android.model.filter.QueryCondition
-import net.pokeranalytics.android.model.realm.*
+import net.pokeranalytics.android.model.realm.ComputableResult
+import net.pokeranalytics.android.model.realm.Filter
 import net.pokeranalytics.android.ui.fragment.components.FilterableFragment
 import net.pokeranalytics.android.ui.fragment.components.RealmAsyncListener
 import net.pokeranalytics.android.ui.fragment.report.ComposableTableReportFragment
 import net.pokeranalytics.android.ui.modules.filter.FilterActivityRequestCode
 import net.pokeranalytics.android.ui.modules.filter.FilterableType
 import net.pokeranalytics.android.ui.modules.filter.FiltersActivity
-import net.pokeranalytics.android.ui.modules.settings.TransactionFilterActivity
 import timber.log.Timber
 import java.util.*
 
@@ -36,8 +35,6 @@ class StatisticsFragment : FilterableFragment(), RealmAsyncListener {
 
 	private lateinit var tableReportFragment: ComposableTableReportFragment
 
-	private var transactionFilterMenuItem: MenuItem? = null
-
 	companion object {
 
 		/**
@@ -56,7 +53,7 @@ class StatisticsFragment : FilterableFragment(), RealmAsyncListener {
 
     // Life Cycle
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         super.onCreateView(inflater, container, savedInstanceState)
         _binding = FragmentStatsBinding.inflate(inflater, container, false)
         return binding.root
@@ -72,10 +69,7 @@ class StatisticsFragment : FilterableFragment(), RealmAsyncListener {
 	    initUI()
         this.currentFilterable = FilterableType.SESSION
 	    applyFilter()
-
+	    listenRealmChanges(this, ComputableResult::class.java)
-	    addRealmChangeListener(this, UserConfig::class.java)
-	    addRealmChangeListener(this, ComputableResult::class.java)
-	    addRealmChangeListener(this, Transaction::class.java)
     }
 
 	private fun initUI() {
@@ -86,41 +80,27 @@ class StatisticsFragment : FilterableFragment(), RealmAsyncListener {
 		this.tableReportFragment = fragment
 	}
 
-	override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+//	override val observedEntities: List<Class<out RealmModel>> = listOf(ComputableResult::class.java)
-		super.onCreateOptionsMenu(menu, inflater)
+
-		view?.findViewById<Toolbar>(R.id.toolbar)?.let { toolbar ->
+//	override fun entitiesChanged(clazz: Class<out RealmModel>, results: RealmResults<out RealmModel>) {
-			toolbar.menu.removeItem(R.id.menu_item_transaction_filter)
+//		Timber.d("Entities changes, launch stats computation, size = ${results.size}")
-			transactionFilterMenuItem = toolbar.menu?.add(0, R.id.menu_item_transaction_filter, 1, R.string.filter)
+//		val cr = results as RealmResults<ComputableResult>
-			transactionFilterMenuItem?.setIcon(R.drawable.baseline_payment_24)
+//		cr.forEach {
-			transactionFilterMenuItem?.setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_IF_ROOM)
+//			Timber.d("### buyin = ${it.ratedBuyin} ### net result = ${it.ratedNet}")
-			setTransactionFilterItemColor()
+//		}
-		}
+//		this.launchStatComputation()
-	}
+//	}
-
+
-	private fun setTransactionFilterItemColor() {
+//	override fun convertReportIntoRepresentables(report: Report): ArrayList<RowRepresentable> {
-		context?.let {
+//		val rows: ArrayList<RowRepresentable> = ArrayList()
-			val userConfig = UserConfig.getConfiguration(getRealm())
+//		report.results.forEach { result ->
-			val color = if (userConfig.transactionTypeIds.isNotEmpty()) R.color.red else R.color.white
+//			rows.add(CustomizableRowRepresentable(title = result.group.name))
-			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+//			result.group.stats?.forEach { stat ->
-				this.transactionFilterMenuItem?.iconTintList = ColorStateList.valueOf(it.getColor(color))
+//				rows.add(StatRow(stat, result.computedStat(stat), result.group.name))
-			}
+//			}
-		}
+//		}
-	}
+//		return rows
-
+//	}
-	override fun onOptionsItemSelected(item: MenuItem): Boolean {
-		when (item.itemId) {
-			R.id.menu_item_transaction_filter -> {
-				showTransactionFilter()
-			}
-		}
-		return super.onOptionsItemSelected(item)
-	}
-
-	private fun showTransactionFilter() {
-		context?.let {
-			TransactionFilterActivity.newInstance(it)
-		}
-	}
 
 	override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
 		super.onActivityResult(requestCode, resultCode, data)
@@ -147,10 +127,18 @@ class StatisticsFragment : FilterableFragment(), RealmAsyncListener {
 	// Business
 
 	override fun asyncListenedEntityChange(realm: Realm) {
+
 		if (isAdded) { // Fixes: java.lang.IllegalStateException Fragment StatisticsFragment{9d3e5ec} not attached to a context.
 			launchStatComputation()
-			setTransactionFilterItemColor()
 		}
+
+//		val report = createSessionGroupsAndStartCompute(realm)
+//		tableReportFragment.report = report
+//
+//		GlobalScope.launch(Dispatchers.Main) {
+//			tableReportFragment.showResults()
+//		}
+
 	}
 
 	/**
@@ -158,11 +146,11 @@ class StatisticsFragment : FilterableFragment(), RealmAsyncListener {
 	 */
 	private fun launchStatComputation() {
 
-		CoroutineScope(coroutineContext).launch {
+		GlobalScope.launch(coroutineContext) {
 
 			val async = GlobalScope.async {
 				val s = Date()
-//				Timber.d(">>> start...")
+				Timber.d(">>> start...")
 
 				val realm = Realm.getDefaultInstance()
 				realm.refresh()
@@ -174,12 +162,12 @@ class StatisticsFragment : FilterableFragment(), RealmAsyncListener {
 
 				val e = Date()
 				val duration = (e.time - s.time) / 1000.0
-//				Timber.d(">>> ended in $duration seconds")
+				Timber.d(">>> ended in $duration seconds")
 
 			}
 			async.await()
 
-			if (isAdded && !isDetached) {
+			if (!isDetached) {
 				tableReportFragment.showResults()
 			}
 		}
@@ -190,11 +178,8 @@ class StatisticsFragment : FilterableFragment(), RealmAsyncListener {
 	 */
 	private fun createSessionGroupsAndStartCompute(realm: Realm): Report {
 
-		var filter: Filter? = null
+		val filter: Filter? = this.currentFilter(this.requireContext(), realm)?.let {
-		context?.let { context ->
+			if (it.filterableType == currentFilterable) { it } else { null }
-			this.currentFilter(context, realm)?.let { current ->
-				if (current.filterableType == currentFilterable) { filter = current }
-			}
 		}
 
 		val allStats: List<Stat> = listOf(
@@ -203,14 +188,13 @@ class StatisticsFragment : FilterableFragment(), RealmAsyncListener {
 			Stat.AVERAGE,
 			Stat.NUMBER_OF_SETS,
 			Stat.AVERAGE_HOURLY_DURATION,
-			Stat.HOURLY_DURATION,
+			Stat.HOURLY_DURATION
-			Stat.HANDS_PLAYED
 		)
 
 		val query = filter?.query ?: Query()
 		val allSessionGroup = ComputableGroup(query, allStats)
 
-		val cgStats: MutableList<Stat> = mutableListOf(
+		val cgStats: List<Stat> = listOf(
 			Stat.NET_RESULT,
 			Stat.HOURLY_RATE,
 			Stat.NET_BB_PER_100_HANDS,
@@ -221,27 +205,19 @@ class StatisticsFragment : FilterableFragment(), RealmAsyncListener {
 			Stat.NUMBER_OF_GAMES,
 			Stat.AVERAGE_BUYIN
 		)
-
-		if (QueryCondition.IsCash.queryWith(realm.where(Result::class.java).isNotNull("tips")).count() >  0) {
-			cgStats.add(Stat.TOTAL_TIPS)
-		}
-
 		val cgSessionGroup = ComputableGroup(Query(QueryCondition.IsCash).merge(query), cgStats)
-		val tStats: MutableList<Stat> = mutableListOf(
+		val tStats: List<Stat> =
+			listOf(
 				Stat.NET_RESULT,
 				Stat.HOURLY_RATE,
 				Stat.ROI,
-				Stat.TOURNAMENT_ITM_RATIO,
+				Stat.WIN_RATIO,
 				Stat.NUMBER_OF_GAMES,
 				Stat.AVERAGE_BUYIN
 			)
-		if (QueryCondition.IsTournament.queryWith(realm.where(Result::class.java).isNotNull("tips")).count() >  0) {
-			tStats.add(Stat.TOTAL_TIPS)
-		}
-
 		val tSessionGroup = ComputableGroup(Query(QueryCondition.IsTournament).merge(query), tStats)
 
-//		Timber.d(">>>>> Start computations...")
+		Timber.d(">>>>> Start computations...")
 
 		val options = Calculator.Options()
 		val computedStats = mutableListOf<Stat>()
@@ -250,8 +226,6 @@ class StatisticsFragment : FilterableFragment(), RealmAsyncListener {
 		computedStats.addAll(tStats)
 		options.stats = computedStats
 
-		options.includedTransactions = UserConfig.getConfiguration(realm).transactionTypes(realm)
-
 		return Calculator.computeGroups(realm, listOf(allSessionGroup, cgSessionGroup, tSessionGroup), options)
 	}