Remove unnecessary BottomSheetDelegate

feature/top10
Aurelien Hubert 7 years ago
parent a7e0ba7a8a
commit d0cd563189
  1. 7
      app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt
  2. 3
      app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt
  3. 13
      app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt

@ -21,12 +21,11 @@ import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
import net.pokeranalytics.android.ui.adapter.RowRepresentableDataSource
import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment
import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetDelegate
import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetFragment
import net.pokeranalytics.android.ui.view.RowRepresentable
open class EditableDataFragment : PokerAnalyticsFragment(), RowRepresentableDelegate, BottomSheetDelegate {
open class EditableDataFragment : PokerAnalyticsFragment(), RowRepresentableDelegate {
lateinit var parentActivity: PokerAnalyticsActivity
lateinit var item: RealmObject
@ -68,10 +67,6 @@ open class EditableDataFragment : PokerAnalyticsFragment(), RowRepresentableDele
BottomSheetFragment.create(fragmentManager, row, this, (this.item as RowRepresentableDataSource).editDescriptors(row))
}
override fun clickOnAdd(row: RowRepresentable) {
Toast.makeText(requireContext(), "Add new element: $row", Toast.LENGTH_SHORT).show()
}
override fun onRowValueChanged(value: Any?, row: RowRepresentable) {
this.getRealm().executeTransaction {
(this.item as Savable).updateValue(value, row)

@ -20,7 +20,6 @@ import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment
import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetDelegate
import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetFragment
import net.pokeranalytics.android.ui.helpers.DateTimePickerManager
import net.pokeranalytics.android.ui.view.RowRepresentable
@ -30,7 +29,7 @@ import net.pokeranalytics.android.ui.view.rowrepresentable.SessionRow
import java.util.*
class SessionFragment : PokerAnalyticsFragment(), RowRepresentableDelegate, BottomSheetDelegate {
class SessionFragment : PokerAnalyticsFragment(), RowRepresentableDelegate {
private lateinit var parentActivity: PokerAnalyticsActivity
private lateinit var currentSession: Session

@ -35,17 +35,10 @@ enum class BottomSheetType {
SUM
}
interface BottomSheetDelegate : RowRepresentableDelegate {
fun clickOnAdd(row: RowRepresentable) {}
fun clickOnClear(row: RowRepresentable) {
this.onRowValueChanged(null, row)
}
}
open class BottomSheetFragment : BottomSheetDialogFragment() {
lateinit var row: RowRepresentable
lateinit var delegate: BottomSheetDelegate
lateinit var delegate: RowRepresentableDelegate
private var isClearable: Boolean = true
private var rowRepresentableEditDescriptors: ArrayList<RowRepresentableEditDescriptor> = ArrayList()
@ -57,7 +50,7 @@ open class BottomSheetFragment : BottomSheetDialogFragment() {
fun create(
fragmentManager: FragmentManager?,
row: RowRepresentable,
delegate: BottomSheetDelegate,
delegate: RowRepresentableDelegate,
rowRepresentableEditDescriptors: ArrayList<RowRepresentableEditDescriptor>,
isClearable: Boolean? = true
): BottomSheetFragment {
@ -131,7 +124,7 @@ open class BottomSheetFragment : BottomSheetDialogFragment() {
// Menu
bottomSheetToolbar.menu.findItem(R.id.actionClear).setOnMenuItemClickListener {
this.delegate.clickOnClear(row)
delegate.onRowValueChanged(null, row)
dismiss()
true
}

Loading…
Cancel
Save