fix issue with localisation of query condition

csv
Razmig Sarkissian 6 years ago
parent 05afd66d73
commit 2a95f0ac86
  1. 74
      app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt

@ -89,7 +89,7 @@ sealed class QueryCondition : FilterElementRow {
EQUALS, EQUALS,
TRUE, TRUE,
; ;
} }
val baseId = this::class.simpleName ?: throw PokerAnalyticsException.FilterElementUnknownName val baseId = this::class.simpleName ?: throw PokerAnalyticsException.FilterElementUnknownName
@ -257,7 +257,7 @@ sealed class QueryCondition : FilterElementRow {
override fun getDisplayName(context: Context): String { override fun getDisplayName(context: Context): String {
val realm = Realm.getDefaultInstance() val realm = Realm.getDefaultInstance()
val entityName = entityName(realm) val entityName = entityName(realm, context)
val completeLabel = when (listOfValues.size) { val completeLabel = when (listOfValues.size) {
0 -> NULL_TEXT 0 -> NULL_TEXT
1, 2 -> { 1, 2 -> {
@ -269,9 +269,9 @@ sealed class QueryCondition : FilterElementRow {
return completeLabel return completeLabel
} }
open fun entityName(realm: Realm): String { open fun entityName(realm: Realm, context: Context): String {
return baseId return entityName(context)
} }
private fun labelForValue(realm: Realm, value: String): String { private fun labelForValue(realm: Realm, value: String): String {
val query = realm.where(entity) val query = realm.where(entity)
@ -320,7 +320,11 @@ sealed class QueryCondition : FilterElementRow {
constructor(bankroll: Bankroll) : this() { constructor(bankroll: Bankroll) : this() {
this.setObject(bankroll) this.setObject(bankroll)
} }
}
override fun entityName(context: Context): String {
return context.getString(R.string.bankrolls)
}
}
class AnyGame() : QueryDataCondition<Game>() { class AnyGame() : QueryDataCondition<Game>() {
override val entity: Class<Game> = Game::class.java override val entity: Class<Game> = Game::class.java
@ -328,7 +332,11 @@ sealed class QueryCondition : FilterElementRow {
constructor(game: Game) : this() { constructor(game: Game) : this() {
this.setObject(game) this.setObject(game)
} }
}
override fun entityName(context: Context): String {
return context.getString(R.string.games)
}
}
class AnyTournamentName() : QueryDataCondition<TournamentName>() { class AnyTournamentName() : QueryDataCondition<TournamentName>() {
override val entity: Class<TournamentName> = TournamentName::class.java override val entity: Class<TournamentName> = TournamentName::class.java
@ -336,7 +344,11 @@ sealed class QueryCondition : FilterElementRow {
constructor(tournamentName: TournamentName) : this() { constructor(tournamentName: TournamentName) : this() {
this.setObject(tournamentName) this.setObject(tournamentName)
} }
}
override fun entityName(context: Context): String {
return context.getString(R.string.tournament_names)
}
}
class AnyTournamentFeature() : QueryDataCondition<TournamentFeature>() { class AnyTournamentFeature() : QueryDataCondition<TournamentFeature>() {
override val entity: Class<TournamentFeature> = TournamentFeature::class.java override val entity: Class<TournamentFeature> = TournamentFeature::class.java
@ -344,7 +356,11 @@ sealed class QueryCondition : FilterElementRow {
constructor(tournamentFeature: TournamentFeature) : this() { constructor(tournamentFeature: TournamentFeature) : this() {
this.setObject(tournamentFeature) this.setObject(tournamentFeature)
} }
}
override fun entityName(context: Context): String {
return context.getString(R.string.tournament_features)
}
}
class AllTournamentFeature() : QueryDataCondition<TournamentFeature>() { class AllTournamentFeature() : QueryDataCondition<TournamentFeature>() {
override var operator = Operator.ALL override var operator = Operator.ALL
@ -353,7 +369,11 @@ sealed class QueryCondition : FilterElementRow {
constructor(tournamentFeature: TournamentFeature) : this() { constructor(tournamentFeature: TournamentFeature) : this() {
this.setObject(tournamentFeature) this.setObject(tournamentFeature)
} }
}
override fun entityName(context: Context): String {
return context.getString(R.string.tournament_features)
}
}
class AnyLocation() : QueryDataCondition<Location>() { class AnyLocation() : QueryDataCondition<Location>() {
override val entity: Class<Location> = Location::class.java override val entity: Class<Location> = Location::class.java
@ -361,7 +381,11 @@ sealed class QueryCondition : FilterElementRow {
constructor(location: Location) : this() { constructor(location: Location) : this() {
this.setObject(location) this.setObject(location)
} }
}
override fun entityName(context: Context): String {
return context.getString(R.string.locations)
}
}
class AnyTransactionType() : QueryDataCondition<TransactionType>() { class AnyTransactionType() : QueryDataCondition<TransactionType>() {
override val entity: Class<TransactionType> = TransactionType::class.java override val entity: Class<TransactionType> = TransactionType::class.java
@ -369,27 +393,47 @@ sealed class QueryCondition : FilterElementRow {
constructor(transactionType: TransactionType) : this() { constructor(transactionType: TransactionType) : this() {
this.setObject(transactionType) this.setObject(transactionType)
} }
}
override fun entityName(context: Context): String {
return context.getString(R.string.operation_types)
}
}
class AnyLimit : ListOfInt() { class AnyLimit : ListOfInt() {
override fun labelForValue(value: Int, context: Context): String { override fun labelForValue(value: Int, context: Context): String {
return Limit.values()[value].getDisplayName(context) return Limit.values()[value].getDisplayName(context)
} }
override fun entityName(context: Context): String {
return context.getString(R.string.limits)
}
} }
class AnyTableSize : ListOfInt() { class AnyTableSize : ListOfInt() {
override fun labelForValue(value: Int, context: Context): String { override fun labelForValue(value: Int, context: Context): String {
return TableSize(value).getDisplayName(context) return TableSize(value).getDisplayName(context)
} }
override fun entityName(context: Context): String {
return context.getString(R.string.table_sizes)
}
} }
class AnyTournamentType : ListOfInt() { class AnyTournamentType : ListOfInt() {
override fun labelForValue(value: Int, context: Context): String { override fun labelForValue(value: Int, context: Context): String {
return TournamentType.values()[value].getDisplayName(context) return TournamentType.values()[value].getDisplayName(context)
} }
override fun entityName(context: Context): String {
return context.getString(R.string.tournament_types)
}
} }
class AnyBlind : ListOfString() class AnyBlind : ListOfString() {
override fun entityName(context: Context): String {
return context.getString(R.string.blinds)
}
}
object Last : SingleInt() { object Last : SingleInt() {
override var operator = Operator.EQUALS override var operator = Operator.EQUALS
@ -649,7 +693,7 @@ sealed class QueryCondition : FilterElementRow {
?: throw PokerAnalyticsException.QueryValueMapUnexpectedValue ?: throw PokerAnalyticsException.QueryValueMapUnexpectedValue
} }
override fun entityName(realm: Realm): String { override fun entityName(realm: Realm, context: Context): String {
return customFieldName(realm) return customFieldName(realm)
} }
@ -940,7 +984,7 @@ sealed class QueryCondition : FilterElementRow {
is IsWeekDay -> R.string.week_days is IsWeekDay -> R.string.week_days
is IsWeekEnd -> R.string.weekend is IsWeekEnd -> R.string.weekend
is PastDay -> R.string.period_in_days is PastDay -> R.string.period_in_days
is TournamentNumberOfPlayer -> { is TournamentNumberOfPlayer -> {
when (this.operator) { when (this.operator) {
Operator.MORE -> R.string.minimum Operator.MORE -> R.string.minimum
Operator.LESS -> R.string.maximum Operator.LESS -> R.string.maximum

Loading…
Cancel
Save