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 d7bf23db..31eeaeb4 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 @@ -11,6 +11,7 @@ import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor import net.pokeranalytics.android.ui.view.rowrepresentable.BankrollRow import net.pokeranalytics.android.ui.view.rowrepresentable.SimpleRow +import net.pokeranalytics.android.util.NULL_TEXT import java.util.* import kotlin.collections.ArrayList @@ -57,7 +58,7 @@ open class Bankroll(name: String = "") : RealmObject(), Manageable, override fun stringForRow(row: RowRepresentable): String { return when (row) { - SimpleRow.NAME -> this.name + SimpleRow.NAME -> if (this.name.isNotEmpty()) this.name else NULL_TEXT else -> return super.stringForRow(row) } } 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 cae77e5f..2406178f 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 @@ -10,6 +10,7 @@ import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor import net.pokeranalytics.android.ui.view.rowrepresentable.GameRow import net.pokeranalytics.android.ui.view.rowrepresentable.SimpleRow +import net.pokeranalytics.android.util.NULL_TEXT import java.util.* import kotlin.collections.ArrayList @@ -46,8 +47,8 @@ open class Game : RealmObject(), Manageable, StaticRowRepresentableDataSource, R override fun stringForRow(row: RowRepresentable): String { return when (row) { - SimpleRow.NAME -> this.name - GameRow.SHORT_NAME -> this.shortName ?: "" + SimpleRow.NAME -> if (this.name.isNotEmpty()) this.name else NULL_TEXT + GameRow.SHORT_NAME -> this.shortName ?: NULL_TEXT else -> return super.stringForRow(row) } } 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 bd45d77d..00ecf792 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 @@ -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.CountableUsage @@ -10,6 +9,7 @@ import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor import net.pokeranalytics.android.ui.view.rowrepresentable.SimpleRow import net.pokeranalytics.android.ui.view.rowrepresentable.TournamentFeatureRow +import net.pokeranalytics.android.util.NULL_TEXT import java.util.* import kotlin.collections.ArrayList @@ -44,7 +44,7 @@ open class TournamentFeature : RealmObject(), Manageable, StaticRowRepresentable override fun stringForRow(row: RowRepresentable): String { return when (row) { - SimpleRow.NAME -> this.name + SimpleRow.NAME -> if (this.name.isNotEmpty()) this.name else NULL_TEXT else -> return super.stringForRow(row) } } 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 3e3ca285..3d7a25e9 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 @@ -9,6 +9,7 @@ import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor import net.pokeranalytics.android.ui.view.rowrepresentable.SimpleRow import net.pokeranalytics.android.ui.view.rowrepresentable.TournamentNameRow +import net.pokeranalytics.android.util.NULL_TEXT import java.util.* import kotlin.collections.ArrayList @@ -45,7 +46,7 @@ open class TournamentName : RealmObject(), Manageable, StaticRowRepresentableDat override fun stringForRow(row: RowRepresentable): String { return when (row) { - SimpleRow.NAME -> this.name + SimpleRow.NAME -> if (this.name.isNotEmpty()) this.name else NULL_TEXT else -> return super.stringForRow(row) } }