diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Bankroll.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Bankroll.kt index 0dfe3a0d..56b403ec 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/Bankroll.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Bankroll.kt @@ -6,10 +6,11 @@ import io.realm.RealmObject import io.realm.annotations.PrimaryKey import net.pokeranalytics.android.ui.adapter.components.DynamicRowInterface import net.pokeranalytics.android.ui.adapter.components.RowViewType +import net.pokeranalytics.android.ui.fragment.components.BottomSheetType import java.util.* -open class Bankroll(name: String = "") : RealmObject(), DynamicRowInterface { +open class Bankroll(name: String = "") : RealmObject() { @PrimaryKey var id = UUID.randomUUID().toString() @@ -27,10 +28,4 @@ open class Bankroll(name: String = "") : RealmObject(), DynamicRowInterface { var currency: Currency? = null // @todo rate management - - override fun localizedTitle(context: Context): String { - return name - } - - override var viewType: Int = RowViewType.TITLE.ordinal } \ No newline at end of file diff --git a/app/src/main/java/net/pokeranalytics/android/ui/adapter/components/DynamicRowInterface.kt b/app/src/main/java/net/pokeranalytics/android/ui/adapter/components/DynamicRowInterface.kt index 8919f288..5f00701b 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/adapter/components/DynamicRowInterface.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/adapter/components/DynamicRowInterface.kt @@ -2,8 +2,15 @@ package net.pokeranalytics.android.ui.adapter.components import android.content.Context import net.pokeranalytics.android.R +import net.pokeranalytics.android.ui.fragment.components.BottomSheetType +interface DynamicRowInterface { + fun localizedTitle(context: Context): String + var viewType: Int + var bottomSheetType: BottomSheetType +} + class SectionRow(stringRes: Int) : DynamicRowInterface { var stringRes: Int = stringRes @@ -13,14 +20,7 @@ class SectionRow(stringRes: Int) : DynamicRowInterface { } override var viewType: Int = 0 - -} - -interface DynamicRowInterface { - - fun localizedTitle(context: Context): String - var viewType: Int - + override var bottomSheetType: BottomSheetType = BottomSheetType.NONE } enum class SessionRow(val resId: Int) : DynamicRowInterface { @@ -39,6 +39,14 @@ enum class SessionRow(val resId: Int) : DynamicRowInterface { } } + override var bottomSheetType: BottomSheetType = BottomSheetType.NONE + get() { + return when (this) { + BLINDS -> BottomSheetType.BLINDS + GAME -> BottomSheetType.GAME + DATE -> BottomSheetType.DATE + } + } } enum class BankrollRow(val resId: Int) : DynamicRowInterface { @@ -51,7 +59,7 @@ enum class BankrollRow(val resId: Int) : DynamicRowInterface { } override var viewType: Int = 1 - + override var bottomSheetType: BottomSheetType = BottomSheetType.NONE } enum class DataObjectRowType(val resId: Int) : DynamicRowInterface { @@ -66,4 +74,5 @@ enum class DataObjectRowType(val resId: Int) : DynamicRowInterface { } override var viewType: Int = RowViewType.TITLE.ordinal -} \ No newline at end of file + override var bottomSheetType: BottomSheetType = BottomSheetType.NONE +} diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt index 499a5ad6..dd55a229 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt @@ -40,12 +40,12 @@ class SettingsFragment : PokerAnalyticsFragment(), DynamicRowDelegate, DynamicRo override fun adapterRows(): ArrayList { val rows = ArrayList() - rows.addAll(BusinessObjectRowType.values()) + rows.addAll(DataObjectRowType.values()) return rows } override fun onRowSelected(row: DynamicRowInterface) { - val bottomSheetFragment = openBottomSheet(row) + //val bottomSheetFragment = openBottomSheet(row) } /**