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 624f8ce0..28ad02a8 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,6 +93,9 @@ class SessionFragment : PokerAnalyticsFragment(), RowRepresentableDelegate, Bott this, currentSession.timeFrame?.endDate ?: currentSession.timeFrame?.startDate ?: Date() ) + SessionRow.BANKROLL -> { + BottomSheetFragment.create(fragmentManager, row, this, data, false) + } else -> BottomSheetFragment.create(fragmentManager, row, this, data) } } 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 bbe8ef9d..3c84267f 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 @@ -46,6 +46,7 @@ open class BottomSheetFragment : BottomSheetDialogFragment() { lateinit var row: RowRepresentable lateinit var delegate: BottomSheetDelegate + private var isClearable: Boolean = true private var rowRepresentableEditDescriptors: ArrayList = ArrayList() companion object { @@ -56,7 +57,8 @@ open class BottomSheetFragment : BottomSheetDialogFragment() { fragmentManager: FragmentManager?, row: RowRepresentable, delegate: BottomSheetDelegate, - rowRepresentableEditDescriptors: ArrayList + rowRepresentableEditDescriptors: ArrayList, + isClearable: Boolean? = true ): BottomSheetFragment { val bottomSheetFragment = when (row.bottomSheetType) { @@ -75,6 +77,8 @@ open class BottomSheetFragment : BottomSheetDialogFragment() { bottomSheetFragment.row = row bottomSheetFragment.delegate = delegate bottomSheetFragment.rowRepresentableEditDescriptors = rowRepresentableEditDescriptors + bottomSheetFragment.isClearable = isClearable ?: true + return bottomSheetFragment } } @@ -118,7 +122,7 @@ open class BottomSheetFragment : BottomSheetDialogFragment() { row.let { bottomSheetToolbar.title = row.localizedTitle(requireContext()) - bottomSheetToolbar.inflateMenu(net.pokeranalytics.android.R.menu.bottom_sheet_menu) + bottomSheetToolbar.inflateMenu(R.menu.bottom_sheet_menu) bottomSheetToolbar.setOnMenuItemClickListener { false } @@ -154,6 +158,8 @@ open class BottomSheetFragment : BottomSheetDialogFragment() { dismiss() true } + + bottomSheetToolbar.menu.findItem(R.id.actionClear).isVisible = isClearable } } @@ -172,7 +178,9 @@ open class BottomSheetFragment : BottomSheetDialogFragment() { * Set clear button visibility */ fun setClearButtonVisibile(visible: Boolean) { - bottomSheetToolbar.menu.findItem(R.id.actionClear).isVisible = visible + bottomSheetToolbar?.let { + bottomSheetToolbar.menu.findItem(R.id.actionClear).isVisible = visible + } } /**