Merge

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

@@ -3,11 +3,14 @@ package net.pokeranalytics.android.model.realm
 import android.text.InputType
 import io.realm.RealmList
 import io.realm.RealmObject
+import io.realm.annotations.Ignore
 import io.realm.annotations.PrimaryKey
 import net.pokeranalytics.android.model.interfaces.Savable
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDataSource
+import net.pokeranalytics.android.ui.view.BankrollRow
+import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor
-import net.pokeranalytics.android.ui.view.*
+import net.pokeranalytics.android.ui.view.SimpleRow
 import java.util.*
 import kotlin.collections.ArrayList
 

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

@@ -14,12 +14,12 @@ import net.pokeranalytics.android.model.extensions.SessionState
 import net.pokeranalytics.android.model.extensions.getState
 import net.pokeranalytics.android.model.interfaces.Savable
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDataSource
-import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor
 import net.pokeranalytics.android.ui.view.RowRepresentable
+import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor
 import net.pokeranalytics.android.ui.view.SessionRow
 import net.pokeranalytics.android.util.getDuration
 import net.pokeranalytics.android.util.round
-import net.pokeranalytics.android.util.short
+import net.pokeranalytics.android.util.shortDateTime
 import net.pokeranalytics.android.util.toCurrency
 import timber.log.Timber
 import java.util.*