Remove bankroll clearable choice

feature/top10
Aurelien Hubert 7 years ago
parent 1445bcc7c9
commit cef784eaa8
  1. 3
      app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt
  2. 12
      app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt

@ -93,6 +93,9 @@ class SessionFragment : PokerAnalyticsFragment(), RowRepresentableDelegate, Bott
this, this,
currentSession.timeFrame?.endDate ?: currentSession.timeFrame?.startDate ?: Date() currentSession.timeFrame?.endDate ?: currentSession.timeFrame?.startDate ?: Date()
) )
SessionRow.BANKROLL -> {
BottomSheetFragment.create(fragmentManager, row, this, data, false)
}
else -> BottomSheetFragment.create(fragmentManager, row, this, data) else -> BottomSheetFragment.create(fragmentManager, row, this, data)
} }
} }

@ -46,6 +46,7 @@ open class BottomSheetFragment : BottomSheetDialogFragment() {
lateinit var row: RowRepresentable lateinit var row: RowRepresentable
lateinit var delegate: BottomSheetDelegate lateinit var delegate: BottomSheetDelegate
private var isClearable: Boolean = true
private var rowRepresentableEditDescriptors: ArrayList<RowRepresentableEditDescriptor> = ArrayList() private var rowRepresentableEditDescriptors: ArrayList<RowRepresentableEditDescriptor> = ArrayList()
companion object { companion object {
@ -56,7 +57,8 @@ open class BottomSheetFragment : BottomSheetDialogFragment() {
fragmentManager: FragmentManager?, fragmentManager: FragmentManager?,
row: RowRepresentable, row: RowRepresentable,
delegate: BottomSheetDelegate, delegate: BottomSheetDelegate,
rowRepresentableEditDescriptors: ArrayList<RowRepresentableEditDescriptor> rowRepresentableEditDescriptors: ArrayList<RowRepresentableEditDescriptor>,
isClearable: Boolean? = true
): BottomSheetFragment { ): BottomSheetFragment {
val bottomSheetFragment = when (row.bottomSheetType) { val bottomSheetFragment = when (row.bottomSheetType) {
@ -75,6 +77,8 @@ open class BottomSheetFragment : BottomSheetDialogFragment() {
bottomSheetFragment.row = row bottomSheetFragment.row = row
bottomSheetFragment.delegate = delegate bottomSheetFragment.delegate = delegate
bottomSheetFragment.rowRepresentableEditDescriptors = rowRepresentableEditDescriptors bottomSheetFragment.rowRepresentableEditDescriptors = rowRepresentableEditDescriptors
bottomSheetFragment.isClearable = isClearable ?: true
return bottomSheetFragment return bottomSheetFragment
} }
} }
@ -118,7 +122,7 @@ open class BottomSheetFragment : BottomSheetDialogFragment() {
row.let { row.let {
bottomSheetToolbar.title = row.localizedTitle(requireContext()) bottomSheetToolbar.title = row.localizedTitle(requireContext())
bottomSheetToolbar.inflateMenu(net.pokeranalytics.android.R.menu.bottom_sheet_menu) bottomSheetToolbar.inflateMenu(R.menu.bottom_sheet_menu)
bottomSheetToolbar.setOnMenuItemClickListener { bottomSheetToolbar.setOnMenuItemClickListener {
false false
} }
@ -154,6 +158,8 @@ open class BottomSheetFragment : BottomSheetDialogFragment() {
dismiss() dismiss()
true true
} }
bottomSheetToolbar.menu.findItem(R.id.actionClear).isVisible = isClearable
} }
} }
@ -172,8 +178,10 @@ open class BottomSheetFragment : BottomSheetDialogFragment() {
* Set clear button visibility * Set clear button visibility
*/ */
fun setClearButtonVisibile(visible: Boolean) { fun setClearButtonVisibile(visible: Boolean) {
bottomSheetToolbar?.let {
bottomSheetToolbar.menu.findItem(R.id.actionClear).isVisible = visible bottomSheetToolbar.menu.findItem(R.id.actionClear).isVisible = visible
} }
}
/** /**
* Set check button visibility * Set check button visibility

Loading…
Cancel
Save