From 5e1db40841ffab7944e1add5f4938016ff1de1d9 Mon Sep 17 00:00:00 2001 From: Razmig Sarkissian Date: Wed, 13 Mar 2019 17:14:20 +0100 Subject: [PATCH] update refactoring --- .../android/model/realm/Bankroll.kt | 11 +---- .../android/model/realm/TournamentFeature.kt | 14 +------ .../android/model/realm/TournamentName.kt | 11 +---- .../android/model/realm/TransactionType.kt | 13 +----- .../BottomSheetDoubleEditTextFragment.kt | 2 - .../BottomSheetEditTextFragment.kt | 1 - .../BottomSheetEditTextMultiLinesFragment.kt | 2 - .../bottomsheet/BottomSheetFragment.kt | 42 ++----------------- .../bottomsheet/BottomSheetListFragment.kt | 3 -- .../BottomSheetListGameFragment.kt | 3 -- .../BottomSheetMultiSelectionFragment.kt | 1 + .../BottomSheetStaticListFragment.kt | 5 --- .../bottomsheet/BottomSheetSumFragment.kt | 3 -- .../BottomSheetTableSizeGridFragment.kt | 4 -- .../components/bottomsheet/BottomSheetType.kt | 32 ++++++++++++++ .../android/ui/view/RowRepresentable.kt | 12 +++++- .../ui/view/rowrepresentable/BankrollRow.kt | 3 +- .../ui/view/rowrepresentable/GameRow.kt | 4 +- .../ui/view/rowrepresentable/LocationRow.kt | 1 + .../ui/view/rowrepresentable/SimpleRow.kt | 9 +--- .../rowrepresentable/TournamentFeatureRow.kt | 5 +-- .../rowrepresentable/TournamentNameRow.kt | 4 +- .../rowrepresentable/TransactionTypeRow.kt | 5 +-- 23 files changed, 66 insertions(+), 124 deletions(-) create mode 100644 app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetType.kt 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 39d2be16..d7bf23db 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 @@ -70,16 +70,7 @@ open class Bankroll(name: String = "") : RealmObject(), Manageable, } override fun editDescriptors(row: RowRepresentable): ArrayList? { - val data = java.util.ArrayList() - when (row) { - SimpleRow.NAME -> data.add( - RowRepresentableEditDescriptor( - this.name, - SimpleRow.NAME.resId - ) - ) - } - return data + return row.editingDescriptors(mapOf("defaultValue" to this.name)) } override fun updateValue(value: Any?, row: RowRepresentable) { diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/TournamentFeature.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/TournamentFeature.kt index 46f406e3..bd45d77d 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/TournamentFeature.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/TournamentFeature.kt @@ -49,19 +49,9 @@ open class TournamentFeature : RealmObject(), Manageable, StaticRowRepresentable } } - override fun editDescriptors(row: RowRepresentable): ArrayList? { - val data = java.util.ArrayList() - when (row) { - SimpleRow.NAME -> data.add( - RowRepresentableEditDescriptor( - this.name, - SimpleRow.NAME.resId, - InputType.TYPE_CLASS_TEXT - ) - ) - } - return data + return row.editingDescriptors(mapOf( + "defaultValue" to this.name)) } override fun updateValue(value: Any?, row: RowRepresentable) { diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/TournamentName.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/TournamentName.kt index b6f484f6..3e3ca285 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/TournamentName.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/TournamentName.kt @@ -51,16 +51,7 @@ open class TournamentName : RealmObject(), Manageable, StaticRowRepresentableDat } override fun editDescriptors(row: RowRepresentable): ArrayList? { - val data = java.util.ArrayList() - when (row) { - SimpleRow.NAME -> data.add( - RowRepresentableEditDescriptor( - this.name, - SimpleRow.NAME.resId - ) - ) - } - return data + return row.editingDescriptors(mapOf("defaultValue" to this.name)) } override fun isValidForSave(): Boolean { diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/TransactionType.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/TransactionType.kt index 971cce30..f5dd128d 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/TransactionType.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/TransactionType.kt @@ -1,6 +1,5 @@ package net.pokeranalytics.android.model.realm -import android.text.InputType import io.realm.RealmObject import io.realm.annotations.PrimaryKey import net.pokeranalytics.android.model.interfaces.Manageable @@ -54,17 +53,7 @@ open class TransactionType : RealmObject(), Manageable, StaticRowRepresentableDa } override fun editDescriptors(row: RowRepresentable): ArrayList? { - val data = java.util.ArrayList() - when (row) { - SimpleRow.NAME -> data.add( - RowRepresentableEditDescriptor( - this.name, - SimpleRow.NAME.resId, - InputType.TYPE_CLASS_TEXT - ) - ) - } - return data + return row.editingDescriptors(mapOf("defaultValue" to this.name)) } override fun updateValue(value: Any?, row: RowRepresentable) { 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 fe22230f..257c5166 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 @@ -55,8 +55,6 @@ class BottomSheetDoubleEditTextFragment : BottomSheetFragment() { throw RowRepresentableEditDescriptorException("RowRepresentableEditDescriptor inconsistency") } - setAddButtonVisible(false) - values.add(0, "") values.add(1, "") 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 7cfd287d..4e8933d0 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 @@ -46,7 +46,6 @@ class BottomSheetEditTextFragment : BottomSheetFragment() { throw RowRepresentableEditDescriptorException("RowRepresentableEditDescriptor inconsistency") } - setAddButtonVisible(false) LayoutInflater.from(requireContext()).inflate(R.layout.bottom_sheet_edit_text, view?.bottomSheetContainer, true) data[0].hint?.let { editText1.hint = getString(it) } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextMultiLinesFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextMultiLinesFragment.kt index 4014198d..ec05b20e 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextMultiLinesFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextMultiLinesFragment.kt @@ -45,8 +45,6 @@ class BottomSheetEditTextMultiLinesFragment : BottomSheetFragment() { throw RowRepresentableEditDescriptorException("RowRepresentableEditDescriptor inconsistency") } - setAddButtonVisible(false) - LayoutInflater.from(requireContext()).inflate(net.pokeranalytics.android.R.layout.bottom_sheet_edit_text_multi_lines, view?.bottomSheetContainer, true) data[0].hint?.let { editText1.hint = getString(it) } 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 675c21de..e1c15ae9 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 @@ -22,21 +22,6 @@ import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor import net.pokeranalytics.android.ui.view.rowrepresentable.SessionRow -enum class BottomSheetType { - NONE { override fun newInstance() = BottomSheetFragment()}, - LIST { override fun newInstance() = BottomSheetListFragment()}, - LIST_STATIC { override fun newInstance() = BottomSheetStaticListFragment()}, - LIST_GAME { override fun newInstance() = BottomSheetListGameFragment()}, - DOUBLE_LIST { override fun newInstance() = BottomSheetListGameFragment()}, - MULTI_SELECTION { override fun newInstance() = BottomSheetMultiSelectionFragment()}, - GRID { override fun newInstance() = BottomSheetTableSizeGridFragment()}, - EDIT_TEXT { override fun newInstance() = BottomSheetEditTextFragment()}, - EDIT_TEXT_MULTI_LINES { override fun newInstance() = BottomSheetEditTextMultiLinesFragment()}, - DOUBLE_EDIT_TEXT { override fun newInstance() = BottomSheetDoubleEditTextFragment()}, - SUM { override fun newInstance() = BottomSheetSumFragment()}; - abstract fun newInstance(): BottomSheetFragment -} - open class BottomSheetFragment : BottomSheetDialogFragment() { lateinit var row: RowRepresentable @@ -103,13 +88,15 @@ open class BottomSheetFragment : BottomSheetDialogFragment() { * Init UI */ private fun initUI() { - row.let { bottomSheetToolbar.title = row.localizedTitle(requireContext()) bottomSheetToolbar.inflateMenu(R.menu.bottom_sheet_menu) bottomSheetToolbar.setOnMenuItemClickListener { false } + bottomSheetToolbar.menu.findItem(R.id.actionCheck).isVisible = row.bottomSheetType.validationRequired + bottomSheetToolbar.menu.findItem(R.id.actionClear).isVisible = row.bottomSheetType.clearRequired + bottomSheetToolbar.menu.findItem(R.id.actionAdd).isVisible = row.bottomSheetType.addRequired // Menu bottomSheetToolbar.menu.findItem(R.id.actionClear).setOnMenuItemClickListener { @@ -168,27 +155,4 @@ open class BottomSheetFragment : BottomSheetDialogFragment() { return null } - /** - * Set clear button visibility - */ - fun setClearButtonVisible(visible: Boolean) { - bottomSheetToolbar?.let { - bottomSheetToolbar.menu.findItem(R.id.actionClear).isVisible = visible - } - } - - /** - * Set check button visibility - */ - fun setCheckButtonVisible(visible: Boolean) { - bottomSheetToolbar.menu.findItem(R.id.actionCheck).isVisible = visible - } - - /** - * Set add button visibility - */ - fun setAddButtonVisible(visible: Boolean) { - bottomSheetToolbar.menu.findItem(R.id.actionAdd).isVisible = visible - } - } \ No newline at end of file diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListFragment.kt index 409e5041..6eaee3b8 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListFragment.kt @@ -85,9 +85,6 @@ open class BottomSheetListFragment : BottomSheetFragment(), LiveRowRepresentable * Init UI */ open fun initUI() { - - setCheckButtonVisible(false) - LayoutInflater.from(requireContext()).inflate(R.layout.bottom_sheet_list, view?.bottomSheetContainer, true) val viewManager = LinearLayoutManager(requireContext()) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListGameFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListGameFragment.kt index acdeb87b..160e0cc1 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListGameFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListGameFragment.kt @@ -63,9 +63,6 @@ class BottomSheetListGameFragment : BottomSheetListFragment() { * Init UI */ override fun initUI() { - - setCheckButtonVisible(false) - LayoutInflater.from(requireContext()).inflate(R.layout.bottom_sheet_game_list, view?.bottomSheetContainer, true) values.add(0, limit) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetMultiSelectionFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetMultiSelectionFragment.kt index b9e08e4c..413d8f82 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetMultiSelectionFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetMultiSelectionFragment.kt @@ -67,6 +67,7 @@ open class BottomSheetMultiSelectionFragment : BottomSheetListFragment() { } override fun initData() { + super.initData() val bottomSheetData = getData()?:throw RowRepresentableEditDescriptorException("RowRepresentableEditDescriptor not found") if (bottomSheetData.size != 1) { throw RowRepresentableEditDescriptorException("RowRepresentableEditDescriptor inconsistency") diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetStaticListFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetStaticListFragment.kt index ca857d71..a60f51f0 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetStaticListFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetStaticListFragment.kt @@ -59,9 +59,6 @@ class BottomSheetStaticListFragment : BottomSheetFragment(), StaticRowRepresenta * Init UI */ private fun initUI() { - - setCheckButtonVisible(false) - LayoutInflater.from(requireContext()).inflate(R.layout.bottom_sheet_list, view?.bottomSheetContainer, true) val viewManager = LinearLayoutManager(requireContext()) @@ -72,8 +69,6 @@ class BottomSheetStaticListFragment : BottomSheetFragment(), StaticRowRepresenta layoutManager = viewManager adapter = dataAdapter } - - this.setAddButtonVisible(false) } } \ No newline at end of file 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 e9ff13fd..8153eb8f 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 @@ -52,9 +52,6 @@ class BottomSheetSumFragment : BottomSheetFragment() { if (data.size != 5) { throw RowRepresentableEditDescriptorException("RowRepresentableEditDescriptor inconsistency") } - - setAddButtonVisible(false) - LayoutInflater.from(requireContext()).inflate(R.layout.bottom_sheet_sum, view?.bottomSheetContainer, true) if (data.size == 5) { 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 f1b079d6..e2a7ac37 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 @@ -50,10 +50,6 @@ class BottomSheetTableSizeGridFragment : BottomSheetFragment(), StaticRowReprese * Init UI */ private fun initUI() { - - setAddButtonVisible(false) - setCheckButtonVisible(false) - LayoutInflater.from(requireContext()) .inflate(net.pokeranalytics.android.R.layout.bottom_sheet_grid, view?.bottomSheetContainer, true) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetType.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetType.kt new file mode 100644 index 00000000..8a678127 --- /dev/null +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetType.kt @@ -0,0 +1,32 @@ +package net.pokeranalytics.android.ui.fragment.components.bottomsheet + +enum class BottomSheetType { + NONE { override fun newInstance() = BottomSheetFragment()}, + LIST { override fun newInstance() = BottomSheetListFragment()}, + LIST_STATIC { override fun newInstance() = BottomSheetStaticListFragment()}, + LIST_GAME { override fun newInstance() = BottomSheetListGameFragment()}, + DOUBLE_LIST { override fun newInstance() = BottomSheetListGameFragment()}, + MULTI_SELECTION { override fun newInstance() = BottomSheetMultiSelectionFragment()}, + GRID { override fun newInstance() = BottomSheetTableSizeGridFragment()}, + EDIT_TEXT { override fun newInstance() = BottomSheetEditTextFragment()}, + EDIT_TEXT_MULTI_LINES { override fun newInstance() = BottomSheetEditTextMultiLinesFragment()}, + DOUBLE_EDIT_TEXT { override fun newInstance() = BottomSheetDoubleEditTextFragment()}, + SUM { override fun newInstance() = BottomSheetSumFragment()}; + + abstract fun newInstance(): BottomSheetFragment + + val validationRequired : Boolean + get() = when (this) { + LIST, LIST_GAME, LIST_STATIC, GRID, DOUBLE_LIST -> false + else -> true + } + + val clearRequired : Boolean + get() = true + + val addRequired : Boolean + get() = when (this) { + EDIT_TEXT, DOUBLE_EDIT_TEXT, EDIT_TEXT_MULTI_LINES, GRID, LIST_STATIC, SUM -> false + else -> true + } +} \ No newline at end of file diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/RowRepresentable.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/RowRepresentable.kt index 8437a1ed..6ce02b43 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/RowRepresentable.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/RowRepresentable.kt @@ -1,6 +1,7 @@ package net.pokeranalytics.android.ui.view import android.content.Context +import android.inputmethodservice.Keyboard import io.realm.RealmResults import net.pokeranalytics.android.model.LiveData import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetType @@ -9,17 +10,26 @@ import net.pokeranalytics.android.util.NULL_TEXT /** * An interface extending Displayable to add a way to represent an object as a String */ -interface RowRepresentable : Displayable { +interface RowRepresentable : Displayable, Editable { fun getDisplayName(): String { return NULL_TEXT } +} +interface Editable { fun editingDescriptors(map:Map): ArrayList? { return null } } +interface DefaultEditable : Editable, Localizable { + override fun editingDescriptors(map: Map): ArrayList? { + val defaultValue : String? by map + return arrayListOf(RowRepresentableEditDescriptor(defaultValue, this.resId)) + } +} + /** * An interface used so that enums values can be represented visually * as rows in RecyclerViews diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/BankrollRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/BankrollRow.kt index 851e6375..49117b49 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/BankrollRow.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/BankrollRow.kt @@ -2,11 +2,12 @@ package net.pokeranalytics.android.ui.view.rowrepresentable import net.pokeranalytics.android.R import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetType +import net.pokeranalytics.android.ui.view.DefaultEditable import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowViewType -enum class BankrollRow : RowRepresentable { +enum class BankrollRow : RowRepresentable, DefaultEditable { LIVE; override val resId: Int? diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/GameRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/GameRow.kt index 0c4234fc..9f4d9fa7 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/GameRow.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/GameRow.kt @@ -2,10 +2,12 @@ package net.pokeranalytics.android.ui.view.rowrepresentable import net.pokeranalytics.android.R import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetType +import net.pokeranalytics.android.ui.view.DefaultEditable import net.pokeranalytics.android.ui.view.RowRepresentable +import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor import net.pokeranalytics.android.ui.view.RowViewType -enum class GameRow : RowRepresentable { +enum class GameRow : RowRepresentable, DefaultEditable { SHORT_NAME; override val resId: Int? diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/LocationRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/LocationRow.kt index 6440e2f6..23090d46 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/LocationRow.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/LocationRow.kt @@ -3,6 +3,7 @@ package net.pokeranalytics.android.ui.view.rowrepresentable import net.pokeranalytics.android.R import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetType import net.pokeranalytics.android.ui.view.RowRepresentable +import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor import net.pokeranalytics.android.ui.view.RowViewType diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SimpleRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SimpleRow.kt index 6f8610d4..ac8c91b3 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SimpleRow.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SimpleRow.kt @@ -2,20 +2,15 @@ package net.pokeranalytics.android.ui.view.rowrepresentable import net.pokeranalytics.android.R import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetType +import net.pokeranalytics.android.ui.view.DefaultEditable import net.pokeranalytics.android.ui.view.RowRepresentable -import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor import net.pokeranalytics.android.ui.view.RowViewType -enum class SimpleRow : RowRepresentable { +enum class SimpleRow : RowRepresentable, DefaultEditable { NAME; override val resId: Int? = R.string.name override val viewType: Int = RowViewType.TITLE_VALUE.ordinal override val bottomSheetType: BottomSheetType = BottomSheetType.EDIT_TEXT - - override fun editingDescriptors(map: Map): ArrayList? { - val defaultValue by map - return arrayListOf(RowRepresentableEditDescriptor(defaultValue, this.resId)) - } } \ No newline at end of file diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/TournamentFeatureRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/TournamentFeatureRow.kt index 62d2dcfc..8a496c01 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/TournamentFeatureRow.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/TournamentFeatureRow.kt @@ -1,7 +1,6 @@ package net.pokeranalytics.android.ui.view.rowrepresentable +import net.pokeranalytics.android.ui.view.DefaultEditable import net.pokeranalytics.android.ui.view.RowRepresentable - -enum class TournamentFeatureRow : RowRepresentable { -} +enum class TournamentFeatureRow : RowRepresentable, DefaultEditable diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/TournamentNameRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/TournamentNameRow.kt index f4baf866..ca7f0c9f 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/TournamentNameRow.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/TournamentNameRow.kt @@ -1,6 +1,6 @@ package net.pokeranalytics.android.ui.view.rowrepresentable +import net.pokeranalytics.android.ui.view.DefaultEditable import net.pokeranalytics.android.ui.view.RowRepresentable -enum class TournamentNameRow : RowRepresentable { -} \ No newline at end of file +enum class TournamentNameRow : RowRepresentable, DefaultEditable \ No newline at end of file diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/TransactionTypeRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/TransactionTypeRow.kt index d1826f7a..3733abe2 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/TransactionTypeRow.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/TransactionTypeRow.kt @@ -1,7 +1,6 @@ package net.pokeranalytics.android.ui.view.rowrepresentable +import net.pokeranalytics.android.ui.view.DefaultEditable import net.pokeranalytics.android.ui.view.RowRepresentable - -enum class TransactionTypeRow : RowRepresentable { -} +enum class TransactionTypeRow : RowRepresentable, DefaultEditable