diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt index 7f328946..b0b405c0 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt @@ -293,7 +293,7 @@ open class Session : RealmObject(), SessionInterface, RowRepresentableDataSource data.add(BottomSheetData("", inputType = InputType.TYPE_CLASS_NUMBER)) data.add(BottomSheetData("", inputType = InputType.TYPE_CLASS_NUMBER)) } - SessionRow.TABLE_SIZE -> {} + SessionRow.TABLE_SIZE -> {data.add(BottomSheetData(tableSize))} SessionRow.GAME -> { // Add current game & games list data.add(BottomSheetData(game, data = LiveData.GAME.items(realm))) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt index 97bc80e7..5580934e 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt @@ -55,7 +55,7 @@ class EditableDataFragment : PokerAnalyticsFragment(), RowRepresentableDelegate, rowRepresentableAdapter.refreshRow(row) } - override fun setValue(value: Any, row: RowRepresentable) { + override fun setValue(value: Any?, row: RowRepresentable) { (this.item as RowEditable).updateValue(value, row) this.getRealm().executeTransaction { it.copyToRealmOrUpdate(this.item) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt index a71988a4..da726c7a 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt @@ -93,7 +93,7 @@ class SessionFragment : PokerAnalyticsFragment(), RowRepresentableDelegate, Bott sessionAdapter.refreshRow(row) } - override fun setValue(value: Any, row: RowRepresentable) { + override fun setValue(value: Any?, row: RowRepresentable) { currentSession.updateValue(value, row) sessionAdapter.refreshRow(row) } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt index 13f12ff3..066693d8 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt @@ -26,7 +26,7 @@ class BottomSheetDoubleEditTextFragment : BottomSheetFragment() { editText1.requestFocus() } - override fun getValue(): Any { + override fun getValue(): Any? { return values } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextFragment.kt index 0420957c..b9fdb024 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextFragment.kt @@ -26,7 +26,7 @@ class BottomSheetEditTextFragment : BottomSheetFragment() { editText1.requestFocus() } - override fun getValue(): Any { + override fun getValue(): Any? { return value } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt index bf079696..b529e346 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt @@ -24,7 +24,7 @@ enum class BottomSheetType { interface BottomSheetDelegate { fun clickOnAdd(row: RowRepresentable) fun clickOnClear(row: RowRepresentable) - fun setValue(value: Any, row: RowRepresentable) + fun setValue(value: Any?, row: RowRepresentable) } @@ -37,10 +37,10 @@ open class BottomSheetFragment : BottomSheetDialogFragment() { companion object { fun create( - fragmentManager: FragmentManager?, - row: RowRepresentable, - bottomSheetDelegate: BottomSheetDelegate, - data: ArrayList + fragmentManager: FragmentManager?, + row: RowRepresentable, + bottomSheetDelegate: BottomSheetDelegate, + data: ArrayList ): BottomSheetFragment { val bottomSheetFragment = when (row.bottomSheetType) { @@ -62,7 +62,7 @@ open class BottomSheetFragment : BottomSheetDialogFragment() { } override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { - return inflater.inflate(R.layout.fragment_bottom_sheet,container,false) + return inflater.inflate(R.layout.fragment_bottom_sheet, container, false) } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { @@ -114,8 +114,8 @@ open class BottomSheetFragment : BottomSheetDialogFragment() { return data } - open fun getValue(): Any { - return Any() + open fun getValue(): Any? { + return null } /** diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetSumFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetSumFragment.kt index a4ed4188..b1e5ca3e 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetSumFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetSumFragment.kt @@ -28,7 +28,7 @@ class BottomSheetSumFragment : BottomSheetFragment() { editText1.requestFocus() } - override fun getValue(): Any { + override fun getValue(): Any? { return value } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetTableSizeGridFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetTableSizeGridFragment.kt index 33b6c63e..868d17e7 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetTableSizeGridFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetTableSizeGridFragment.kt @@ -15,6 +15,7 @@ class BottomSheetTableSizeGridFragment : BottomSheetFragment() { private var dataList: ArrayList = ArrayList() private lateinit var dataAdapter: TableSizeGridAdapter + private var defaultSize: Int? = null override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) @@ -27,11 +28,20 @@ class BottomSheetTableSizeGridFragment : BottomSheetFragment() { dataAdapter.notifyDataSetChanged() } + override fun getValue(): Any? { + return defaultSize + } + /** * Init data */ private fun initData() { + val bottomSheetData = getData() + if (bottomSheetData.isNotEmpty() && bottomSheetData.first().defaultValue != null) { + defaultSize = bottomSheetData.first().defaultValue as Int? + } + dataList.add(getString(net.pokeranalytics.android.R.string.heads_up)) for (i in 3..10) { dataList.add("$i-max")