diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/CustomField.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/CustomField.kt index 98266561..6ea9eb03 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/CustomField.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/CustomField.kt @@ -176,7 +176,7 @@ open class CustomField : RealmObject(), NameManageable, StaticRowRepresentableDa } } - override fun editDescriptors(row: RowRepresentable): ArrayList? { + override fun editDescriptors(row: RowRepresentable): List? { return when (row) { is CustomFieldEntry -> row.editingDescriptors( mapOf( diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Game.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Game.kt index 477281d5..0a6df1f3 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/Game.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Game.kt @@ -76,7 +76,7 @@ open class Game : RealmObject(), NameManageable, StaticRowRepresentableDataSourc } } - override fun editDescriptors(row: RowRepresentable): ArrayList? { + override fun editDescriptors(row: RowRepresentable): List? { return when (row) { SimpleRow.NAME -> row.editingDescriptors(mapOf("defaultValue" to this.name)) GameRow.SHORT_NAME -> row.editingDescriptors(mapOf("defaultValue" to this.shortName)) diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Player.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Player.kt index f9dcc266..4b71c5bd 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/Player.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Player.kt @@ -181,7 +181,7 @@ open class Player : RealmObject(), NameManageable, Deletable, StaticRowRepresent this.commentsToDelete.clear() } - override fun editDescriptors(row: RowRepresentable): ArrayList? { + override fun editDescriptors(row: RowRepresentable): List? { when (row) { PlayerRow.NAME -> return row.editingDescriptors(mapOf("defaultValue" to this.name)) 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 6b5d587c..bbdeed0f 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 @@ -836,7 +836,7 @@ open class Session : RealmObject(), Savable, Editable, StaticRowRepresentableDat } } - override fun editDescriptors(row: RowRepresentable): ArrayList? { + override fun editDescriptors(row: RowRepresentable): List? { return when (row) { SessionRow.BANKROLL -> row.editingDescriptors( mapOf( 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 e0a153e4..cafa780e 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 @@ -67,7 +67,7 @@ open class TournamentFeature : RealmObject(), NameManageable, StaticRowRepresent } } - override fun editDescriptors(row: RowRepresentable): ArrayList? { + override fun editDescriptors(row: RowRepresentable): List? { return row.editingDescriptors(mapOf( "defaultValue" to this.name)) } 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 fd55b11b..fb703d04 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 @@ -64,7 +64,7 @@ open class TournamentName : RealmObject(), NameManageable, StaticRowRepresentabl } } - override fun editDescriptors(row: RowRepresentable): ArrayList? { + override fun editDescriptors(row: RowRepresentable): List? { return row.editingDescriptors(mapOf("defaultValue" to this.name)) } 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 2692ce98..f557add5 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 @@ -124,7 +124,7 @@ open class TransactionType : RealmObject(), NameManageable, StaticRowRepresentab } } - override fun editDescriptors(row: RowRepresentable): ArrayList? { + override fun editDescriptors(row: RowRepresentable): List? { return row.editingDescriptors(mapOf("defaultValue" to this.name)) } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/adapter/RowRepresentableDataSource.kt b/app/src/main/java/net/pokeranalytics/android/ui/adapter/RowRepresentableDataSource.kt index 6d4f1f0f..5c4ceec5 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/adapter/RowRepresentableDataSource.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/adapter/RowRepresentableDataSource.kt @@ -93,11 +93,8 @@ class UnmanagedRowRepresentableException(message: String) : Exception(message) { /** * An interface used to provide RowRepresentableAdapter content and value in the form of rows * - * Also returns the appropriate value for any RowRepresentable in the form of : - * - string - * - booleans - * - actionIcon - * to display the appropriate numericValues in graphical filterConditions, such as labels, textfields, switchs... + * Returns values for any RowRepresentable in various forms to display + * the appropriate numericValues in graphical filterConditions, such as labels, textfields, switchs... */ interface DisplayableDataSource { @@ -119,20 +116,6 @@ interface DisplayableDataSource { return -1 } - /** - * Returns a localized string for a specific row - */ -// fun charSequenceForRow(row: RowRepresentable, context: Context): String { -// return charSequenceForRow(row, context, 0) -// } -// -// /** -// * Returns a string for a specific row -// */ -// fun charSequenceForRow(row: RowRepresentable, context: Context, tag: Int = 0): String { -// return "" -// } - /*** * Returns a CharSequence representation of the [row] */ @@ -195,12 +178,14 @@ interface DisplayableDataSource { * An interface providing a way to describe how the edition of a [RowRepresentable] will be displayed */ interface EditableDataSource { + /** * A list of [RowRepresentableEditDescriptor] object specifying the way the edition will be handled */ - fun editDescriptors(row: RowRepresentable): ArrayList? { + fun editDescriptors(row: RowRepresentable): List? { return null } + } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/FiltersListFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/FiltersListFragment.kt index a41ade3a..1357dba4 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/FiltersListFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/FiltersListFragment.kt @@ -55,7 +55,7 @@ open class FiltersListFragment : DataListFragment() { return if (viewType != -1) viewType else RowViewType.DATA.ordinal } - override fun editDescriptors(row: RowRepresentable): ArrayList? { + override fun editDescriptors(row: RowRepresentable): List? { return when (row) { is Filter -> row.editingDescriptors(mapOf("defaultValue" to row.name)) else -> super.editDescriptors(row) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/BankrollDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/BankrollDataFragment.kt index 4a479af4..ca4921af 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/BankrollDataFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/BankrollDataFragment.kt @@ -121,7 +121,7 @@ class BankrollDataFragment : EditableDataFragment(), StaticRowRepresentableDataS } } - override fun editDescriptors(row: RowRepresentable): ArrayList? { + override fun editDescriptors(row: RowRepresentable): List? { return when (row) { SimpleRow.NAME -> row.editingDescriptors(mapOf("defaultValue" to this.bankroll.name)) BankrollRow.INITIAL_VALUE -> { diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/CustomFieldDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/CustomFieldDataFragment.kt index 0d67cb2b..4cf80271 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/CustomFieldDataFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/CustomFieldDataFragment.kt @@ -147,7 +147,7 @@ class CustomFieldDataFragment : EditableDataFragment(), StaticRowRepresentableDa } } - override fun editDescriptors(row: RowRepresentable): ArrayList? { + override fun editDescriptors(row: RowRepresentable): List? { return when (row) { SimpleRow.NAME -> row.editingDescriptors(mapOf("defaultValue" to this.customField.name)) is CustomFieldEntry -> row.editingDescriptors(mapOf("defaultValue" to row.value)) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/LocationDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/LocationDataFragment.kt index 533cf269..c93a9690 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/LocationDataFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/LocationDataFragment.kt @@ -83,7 +83,7 @@ class LocationDataFragment : EditableDataFragment(), StaticRowRepresentableDataS } } - override fun editDescriptors(row: RowRepresentable): ArrayList? { + override fun editDescriptors(row: RowRepresentable): List? { return when (row) { SimpleRow.NAME -> row.editingDescriptors(mapOf("defaultValue" to this.location.name)) else -> null diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/PlayerDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/PlayerDataFragment.kt index 6e085d32..94ae0cf6 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/PlayerDataFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/PlayerDataFragment.kt @@ -212,7 +212,7 @@ class PlayerDataFragment : EditableDataFragment(), StaticRowRepresentableDataSou player.cleanupComments() } - override fun editDescriptors(row: RowRepresentable): ArrayList? { + override fun editDescriptors(row: RowRepresentable): List? { when (row) { PlayerRow.NAME -> return arrayListOf(RowRepresentableEditDescriptor(this.player.name, R.string.name)) PlayerRow.SUMMARY -> return arrayListOf(RowRepresentableEditDescriptor(this.player.summary, R.string.summary)) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/TransactionDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/TransactionDataFragment.kt index 9c50f4ef..84178f4e 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/TransactionDataFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/TransactionDataFragment.kt @@ -21,7 +21,6 @@ import net.pokeranalytics.android.util.NULL_TEXT import net.pokeranalytics.android.util.extensions.round import net.pokeranalytics.android.util.extensions.shortDate import net.pokeranalytics.android.util.extensions.sorted -import java.util.* /** * Custom EditableDataFragment to manage the Transaction data @@ -62,7 +61,7 @@ class TransactionDataFragment : EditableDataFragment(), StaticRowRepresentableDa } } - override fun editDescriptors(row: RowRepresentable): ArrayList? { + override fun editDescriptors(row: RowRepresentable): List? { return when (row) { TransactionRow.BANKROLL -> row.editingDescriptors( mapOf( diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/TransactionTypeDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/TransactionTypeDataFragment.kt index 13f0a709..abe80355 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/TransactionTypeDataFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/TransactionTypeDataFragment.kt @@ -52,7 +52,7 @@ class TransactionTypeDataFragment : EditableDataFragment(), RowRepresentableData } } - override fun editDescriptors(row: RowRepresentable): ArrayList? { + override fun editDescriptors(row: RowRepresentable): List? { return row.editingDescriptors(mapOf("defaultValue" to this.transactionType.name)) } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/HandHistoryViewModel.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/HandHistoryViewModel.kt index 7d4ee75e..79e4b677 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/HandHistoryViewModel.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/HandHistoryViewModel.kt @@ -715,9 +715,9 @@ class HandHistoryViewModel : ViewModel(), RowRepresentableDataSource, CardCentra } } - override fun editDescriptors(row: RowRepresentable): ArrayList? { + override fun editDescriptors(row: RowRepresentable): List? { return when (row) { - HandRowType.ANTE -> arrayListOf(RowRepresentableEditDescriptor(defaultValue = this.handHistory.ante, inputType = InputType.TYPE_CLASS_NUMBER or InputType.TYPE_NUMBER_FLAG_DECIMAL)) + HandRowType.ANTE -> listOf(RowRepresentableEditDescriptor(defaultValue = this.handHistory.ante, inputType = InputType.TYPE_CLASS_NUMBER or InputType.TYPE_NUMBER_FLAG_DECIMAL)) else -> null } }