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 09d24426..477281d5 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 @@ -64,15 +64,15 @@ open class Game : RealmObject(), NameManageable, StaticRowRepresentableDataSourc return rowRepresentation } - override fun stringForRow( + override fun charSequenceForRow( row: RowRepresentable, context: Context, tag: Int - ): String { + ): CharSequence { return when (row) { SimpleRow.NAME -> if (this.name.isNotEmpty()) this.name else NULL_TEXT GameRow.SHORT_NAME -> this.shortName ?: NULL_TEXT - else -> return super.stringForRow(row, context, 0) + else -> return super.charSequenceForRow(row, context, 0) } } 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 42e46d41..f9dcc266 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 @@ -75,14 +75,14 @@ open class Player : RealmObject(), NameManageable, Deletable, StaticRowRepresent return this.name } - override fun stringForRow( + override fun charSequenceForRow( row: RowRepresentable, context: Context, tag: Int - ): String { + ): CharSequence { return when (row) { PlayerRow.NAME -> if (this.name.isNotEmpty()) this.name else NULL_TEXT - else -> return super.stringForRow(row, context, 0) + else -> return super.charSequenceForRow(row, context, 0) } } @@ -94,7 +94,6 @@ open class Player : RealmObject(), NameManageable, Deletable, StaticRowRepresent } } - /** * Update the row representation */ 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 d342387a..6b5d587c 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 @@ -778,7 +778,7 @@ open class Session : RealmObject(), Savable, Editable, StaticRowRepresentableDat return false } - override fun stringForRow(row: RowRepresentable, context: Context): String { + override fun charSequenceForRow(row: RowRepresentable, context: Context): String { return when (row) { SessionRow.BANKROLL -> bankroll?.name ?: NULL_TEXT SessionRow.BLINDS -> getFormattedBlinds() 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 f6d4b4f6..e0a153e4 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 @@ -56,14 +56,14 @@ open class TournamentFeature : RealmObject(), NameManageable, StaticRowRepresent return TournamentFeature.rowRepresentation } - override fun stringForRow( + override fun charSequenceForRow( row: RowRepresentable, context: Context, tag: Int - ): String { + ): CharSequence { return when (row) { SimpleRow.NAME -> if (this.name.isNotEmpty()) this.name else NULL_TEXT - else -> return super.stringForRow(row, context, 0) + else -> return super.charSequenceForRow(row, context, 0) } } 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 bc0aca84..fd55b11b 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 @@ -50,17 +50,17 @@ open class TournamentName : RealmObject(), NameManageable, StaticRowRepresentabl } override fun adapterRows(): List? { - return TournamentName.rowRepresentation + return rowRepresentation } - override fun stringForRow( + override fun charSequenceForRow( row: RowRepresentable, context: Context, tag: Int - ): String { + ): CharSequence { return when (row) { SimpleRow.NAME -> if (this.name.isNotEmpty()) this.name else NULL_TEXT - else -> return super.stringForRow(row, context, 0) + else -> return super.charSequenceForRow(row, context,0) } } 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 0655d634..2692ce98 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 @@ -106,14 +106,14 @@ open class TransactionType : RealmObject(), NameManageable, StaticRowRepresentab return rowRepresentation } - override fun stringForRow( + override fun charSequenceForRow( row: RowRepresentable, context: Context, tag: Int - ): String { + ): CharSequence { return when (row) { SimpleRow.NAME -> this.name - else -> return super.stringForRow(row, context, 0) + else -> return super.charSequenceForRow(row, context, 0) } } diff --git a/app/src/main/java/net/pokeranalytics/android/model/utils/FavoriteSessionFinder.kt b/app/src/main/java/net/pokeranalytics/android/model/utils/FavoriteSessionFinder.kt index b33cae35..e0353f3d 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/utils/FavoriteSessionFinder.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/utils/FavoriteSessionFinder.kt @@ -15,7 +15,7 @@ private fun Session.parameterRepresentation(context: Context): String { var representation = "" this.significantFields().forEach { - representation += this.stringForRow(it, context) + representation += this.charSequenceForRow(it, context) } return representation 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 3b033bad..2fc06703 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 @@ -122,14 +122,22 @@ interface DisplayableDataSource { /** * Returns a localized string for a specific row */ - fun stringForRow(row: RowRepresentable, context: Context): String { - return stringForRow(row, context, 0) - } - - /** - * Returns a string for a specific row - */ - fun stringForRow(row: RowRepresentable, context: Context, tag: Int = 0): String { +// 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 "" +// } + + fun charSequenceForRow(row: RowRepresentable, context: Context): CharSequence { + return charSequenceForRow(row, context, 0) + } + + fun charSequenceForRow(row: RowRepresentable, context: Context, tag: Int = 0): CharSequence { return "" } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/CurrenciesFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/CurrenciesFragment.kt index ab7554cf..a0f6d88e 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/CurrenciesFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/CurrenciesFragment.kt @@ -90,11 +90,11 @@ class CurrenciesFragment : BaseFragment(), StaticRowRepresentableDataSource, Row } - override fun stringForRow( + override fun charSequenceForRow( row: RowRepresentable, context: Context, tag: Int - ): String { + ): CharSequence { return (row as CurrencyRow).currencyCodeAndSymbol } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/FilterDetailsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/FilterDetailsFragment.kt index b289f2ba..7582c738 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/FilterDetailsFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/FilterDetailsFragment.kt @@ -96,10 +96,10 @@ open class FilterDetailsFragment : RealmFragment(), StaticRowRepresentableDataSo } } - override fun stringForRow(row: RowRepresentable, context: Context): String { + override fun charSequenceForRow(row: RowRepresentable, context: Context): CharSequence { return when (row) { is QueryCondition.ListOfValues<*> -> row.firstValue(context) - else -> super.stringForRow(row, context, 0) + else -> super.charSequenceForRow(row, context, 0) } ?: NULL_TEXT } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/FiltersFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/FiltersFragment.kt index 8127ba54..901ad81d 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/FiltersFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/FiltersFragment.kt @@ -132,11 +132,11 @@ open class FiltersFragment : RealmFragment(), StaticRowRepresentableDataSource, return rows } - override fun stringForRow( + override fun charSequenceForRow( row: RowRepresentable, context: Context, tag: Int - ): String { + ): CharSequence { // Return the number of selected filters for this category var selectedFilters = "" if (row is FilterCategoryRow) { diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt index ba9bd525..c89cd8e3 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt @@ -104,11 +104,11 @@ class SettingsFragment : BaseFragment(), RowRepresentableDelegate, StaticRowRepr return rowRepresentation } - override fun stringForRow( + override fun charSequenceForRow( row: RowRepresentable, context: Context, tag: Int - ): String { + ): CharSequence { return when (row) { SettingRow.SUBSCRIPTION -> AppGuard.subscriptionStatus(requireContext()) SettingRow.VERSION -> BuildConfig.VERSION_NAME + if (BuildConfig.DEBUG) " (${BuildConfig.VERSION_CODE}) DEBUG" else "" 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 98881ef1..c796c434 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 @@ -63,7 +63,7 @@ class BottomSheetTableSizeGridFragment : BottomSheetFragment(), StaticRowReprese dismiss() } -// override fun stringForRow(row: RowRepresentable, context: Context, tag: Int): String { +// override fun charSequenceForRow(row: RowRepresentable, context: Context, tag: Int): String { // // if (this.viewModel.alternativeLabels) { // return (row as TableSize).numberOfPlayer.toString() 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 083fefb1..4a479af4 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 @@ -84,11 +84,11 @@ class BankrollDataFragment : EditableDataFragment(), StaticRowRepresentableDataS return rows } - override fun stringForRow( + override fun charSequenceForRow( row: RowRepresentable, context: Context, tag: Int - ): String { + ): CharSequence { return when (row) { SimpleRow.NAME -> if (bankroll.name.isNotEmpty()) bankroll.name else NULL_TEXT BankrollRow.CURRENCY -> { @@ -109,7 +109,7 @@ class BankrollDataFragment : EditableDataFragment(), StaticRowRepresentableDataS val rate = this.bankroll.currency?.rate ?: 1.0 rate.toRate() } - else -> super.stringForRow(row, context, 0) + else -> super.charSequenceForRow(row, context, 0) } } 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 5d68a729..0d67cb2b 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 @@ -121,14 +121,14 @@ class CustomFieldDataFragment : EditableDataFragment(), StaticRowRepresentableDa return customField.adapterRows() } - override fun stringForRow( + override fun charSequenceForRow( row: RowRepresentable, context: Context, tag: Int - ): String { + ): CharSequence { return when (row) { SimpleRow.NAME -> if (customField.name.isNotEmpty()) customField.name else NULL_TEXT - else -> super.stringForRow(row, context, 0) + else -> super.charSequenceForRow(row, context, 0) } } 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 ff469f29..533cf269 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 @@ -65,14 +65,14 @@ class LocationDataFragment : EditableDataFragment(), StaticRowRepresentableDataS return rows } - override fun stringForRow( + override fun charSequenceForRow( row: RowRepresentable, context: Context, tag: Int - ): String { + ): CharSequence { return when (row) { SimpleRow.NAME -> if (location.name.isNotEmpty())location.name else NULL_TEXT - else -> return super.stringForRow(row, context, 0) + else -> return super.charSequenceForRow(row, context, 0) } } 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 a0f832f9..6e085d32 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 @@ -117,15 +117,15 @@ class PlayerDataFragment : EditableDataFragment(), StaticRowRepresentableDataSou } } - override fun stringForRow( + override fun charSequenceForRow( row: RowRepresentable, context: Context, tag: Int - ): String { + ): CharSequence { return when (row) { PlayerRow.NAME -> if (player.name.isNotEmpty()) player.name else NULL_TEXT PlayerRow.SUMMARY -> if (player.summary.isNotEmpty()) player.summary else NULL_TEXT - else -> super.stringForRow(row, context, 0) + else -> super.charSequenceForRow(row, context, 0) } } 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 4f64ca9f..9c50f4ef 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 @@ -47,18 +47,18 @@ class TransactionDataFragment : EditableDataFragment(), StaticRowRepresentableDa return transaction.adapterRows() } - override fun stringForRow( + override fun charSequenceForRow( row: RowRepresentable, context: Context, tag: Int - ): String { + ): CharSequence { return when (row) { TransactionRow.BANKROLL -> this.transaction.bankroll?.name ?: NULL_TEXT TransactionRow.TYPE -> this.transaction.type?.name ?: NULL_TEXT TransactionRow.AMOUNT -> if (this.transaction.amount != 0.0) this.transaction.amount.round() else NULL_TEXT TransactionRow.COMMENT -> if (this.transaction.comment.isNotEmpty()) this.transaction.comment else NULL_TEXT TransactionRow.DATE -> this.transaction.date.shortDate() - else -> super.stringForRow(row, context, 0) + else -> super.charSequenceForRow(row, context, 0) } } 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 0e08c8ad..13f0a709 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 @@ -34,14 +34,14 @@ class TransactionTypeDataFragment : EditableDataFragment(), RowRepresentableData return this.transactionType.viewTypeForPosition(position) } - override fun stringForRow( + override fun charSequenceForRow( row: RowRepresentable, context: Context, tag: Int - ): String { + ): CharSequence { return when (row) { SimpleRow.NAME -> this.transactionType.name - else -> return super.stringForRow(row, context, 0) + else -> return super.charSequenceForRow(row, context, 0) } } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryAdapter.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryAdapter.kt index fbc41117..c54688e5 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryAdapter.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryAdapter.kt @@ -197,7 +197,7 @@ class HandHistoryAdapter( protected fun configureEditTexts(range: IntRange, position: Int, row: RowRepresentable, adapter: RecyclerAdapter) { range.forEach { tag -> - val string = adapter.dataSource.stringForRow(row, itemView.context, tag) + val string = adapter.dataSource.charSequenceForRow(row, itemView.context, tag) // Text val editText = itemView.findViewWithTag(tag) ?: throw PAIllegalStateException("Edit Text not found for tag: $tag, class: $this") @@ -243,9 +243,9 @@ class HandHistoryAdapter( configureEditTexts(0..2, position, row, adapter) -// itemView.smallBlindEditText.setText(adapter.dataSource.stringForRow(row, itemView.context, 0)) -// itemView.bigBlindEditText.setText(adapter.dataSource.stringForRow(row, itemView.context, 1)) -// itemView.anteEditText.setText(adapter.dataSource.stringForRow(row, itemView.context, 2)) +// itemView.smallBlindEditText.setText(adapter.dataSource.charSequenceForRow(row, itemView.context, 0)) +// itemView.bigBlindEditText.setText(adapter.dataSource.charSequenceForRow(row, itemView.context, 1)) +// itemView.anteEditText.setText(adapter.dataSource.charSequenceForRow(row, itemView.context, 2)) // itemView.bbAnteSwitch.isChecked = adapter.dataSource.isSelected(position, row, 0) // // val sbSelected = adapter.dataSource.isSelected(position, row, 0) @@ -640,8 +640,8 @@ class HandHistoryAdapter( // toggleFocus(itemView.stackEditText, stackSelected) -// itemView.handEditText.setText(adapter.dataSource.stringForRow(row, itemView.context, 0)) -// itemView.stackEditText.setText(adapter.dataSource.stringForRow(row, itemView.context, 1)) +// itemView.handEditText.setText(adapter.dataSource.charSequenceForRow(row, itemView.context, 0)) +// itemView.stackEditText.setText(adapter.dataSource.charSequenceForRow(row, itemView.context, 1)) } 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 10767c37..a55d2dc0 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 @@ -542,7 +542,7 @@ class HandHistoryViewModel : ViewModel(), RowRepresentableDataSource, CardCentra this.cardSelectionEnded(this.currentSelection.index) } - override fun stringForRow(row: RowRepresentable, context: Context, tag: Int): String { + override fun charSequenceForRow(row: RowRepresentable, context: Context, tag: Int): CharSequence { val string = when (row) { HandRowType.PLAYER_NUMBER -> this.handHistory.numberOfPlayers.toString() @@ -568,7 +568,7 @@ class HandHistoryViewModel : ViewModel(), RowRepresentableDataSource, CardCentra else -> throw PAIllegalStateException("Unmanaged case with $row, tag = $tag") } - return string?.let { it.toString() } ?: "" // we don't want "null" so we keep the let + return string?.let { it } ?: "" // we don't want "null" so we keep the let } override fun contentForRow(row: RowRepresentable, context: Context, clazz: KClass) : List { diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardActionView.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardActionView.kt index bdeffffe..59505b7e 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardActionView.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardActionView.kt @@ -91,7 +91,7 @@ class KeyboardActionView(context: Context) : AbstractKeyboardView(context), this.dataAdapter.notifyDataSetChanged() } -// override fun stringForRow(row: RowRepresentable): String { +// override fun charSequenceForRow(row: RowRepresentable): String { // this.context?.let { // return row.localizedTitle(it) // } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/holder/RowViewHolder.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/holder/RowViewHolder.kt index 124e0dff..f77c8f9a 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/holder/RowViewHolder.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/holder/RowViewHolder.kt @@ -122,7 +122,7 @@ class RowViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), Bindabl // Value itemView.findViewById(R.id.value)?.let { - it.text = adapter.dataSource.stringForRow(row, itemView.context) + it.text = adapter.dataSource.charSequenceForRow(row, itemView.context) } // Icon