improve consistency for manageable interface, add missing loc

feature/top10
Razmig Sarkissian 7 years ago
parent 905b888c04
commit 5661ef2742
  1. 9
      app/src/main/java/net/pokeranalytics/android/model/interfaces/Manageable.kt
  2. 2
      app/src/main/java/net/pokeranalytics/android/model/realm/Bankroll.kt
  3. 5
      app/src/main/java/net/pokeranalytics/android/model/realm/Game.kt
  4. 6
      app/src/main/java/net/pokeranalytics/android/model/realm/Location.kt
  5. 12
      app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
  6. 9
      app/src/main/java/net/pokeranalytics/android/model/realm/TournamentFeature.kt
  7. 9
      app/src/main/java/net/pokeranalytics/android/model/realm/TournamentName.kt
  8. 4
      app/src/main/res/values/strings.xml

@ -4,6 +4,7 @@ import io.realm.RealmModel
import io.realm.RealmObject import io.realm.RealmObject
import net.pokeranalytics.android.R import net.pokeranalytics.android.R
import net.pokeranalytics.android.exceptions.ModelException import net.pokeranalytics.android.exceptions.ModelException
import net.pokeranalytics.android.model.realm.Bankroll
import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowRepresentable
enum class ManageableStatus { enum class ManageableStatus {
@ -32,11 +33,11 @@ interface NameManageable: Manageable {
} }
override fun getFailedSaveMessage(status: ManageableStatus): Int { override fun getFailedSaveMessage(status: ManageableStatus): Int {
return when (status) { throw ModelException("${this::class.java} getFailedSaveMessage for $status not handled")
ManageableStatus.ALREADY_EXISTS -> R.string.duplicate_bankroll_name_error
ManageableStatus.DATA_INVALID -> R.string.empty_name_for_br_error
else -> throw ModelException("object should be savable")
} }
override fun getFailedDeleteMessage(): Int {
return R.string.relationship_error
} }
} }

@ -96,7 +96,7 @@ open class Bankroll() : RealmObject(), NameManageable, StaticRowRepresentableDat
} }
override fun getFailedDeleteMessage(): Int { override fun getFailedDeleteMessage(): Int {
TODO("not implemented") //To change body of created functions use File | Settings | File Templates. return R.string.bankroll_relationship_error
} }
override fun getFailedSaveMessage(status: ManageableStatus): Int { override fun getFailedSaveMessage(status: ManageableStatus): Int {

@ -89,9 +89,4 @@ open class Game : RealmObject(), NameManageable, StaticRowRepresentableDataSourc
override fun isValidForDelete(): Boolean { override fun isValidForDelete(): Boolean {
return this.realm.where<Session>().equalTo("game.id", id).findAll().isEmpty() return this.realm.where<Session>().equalTo("game.id", id).findAll().isEmpty()
} }
override fun getFailedDeleteMessage(): Int {
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
}
} }

@ -21,7 +21,7 @@ open class Location : RealmObject(), NameManageable, RowRepresentable {
override var name: String = "" override var name: String = ""
// The readable address of the location // The readable address of the location
private var address: String = "" private var address: String? = null
// the longitude of the location // the longitude of the location
var longitude: Double? = null var longitude: Double? = null
@ -58,8 +58,4 @@ open class Location : RealmObject(), NameManageable, RowRepresentable {
override fun isValidForDelete(): Boolean { override fun isValidForDelete(): Boolean {
return this.realm.where<Session>().equalTo("location.id", id).findAll().isEmpty() return this.realm.where<Session>().equalTo("location.id", id).findAll().isEmpty()
} }
override fun getFailedDeleteMessage(): Int {
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
}
} }

@ -40,7 +40,7 @@ import java.util.*
import java.util.Currency import java.util.Currency
import kotlin.collections.ArrayList import kotlin.collections.ArrayList
open class Session : RealmObject(), Identifiable, Manageable, StaticRowRepresentableDataSource, RowRepresentable, Timed, open class Session : RealmObject(), Savable, Editable, StaticRowRepresentableDataSource, RowRepresentable, Timed,
TimeFilterable { TimeFilterable {
enum class Type { enum class Type {
@ -377,15 +377,7 @@ open class Session : RealmObject(), Identifiable, Manageable, StaticRowRepresent
} }
override fun getFailedSaveMessage(status: ManageableStatus): Int { override fun getFailedSaveMessage(status: ManageableStatus): Int {
return 0 // @todo return R.string.no_br_popup_message
}
override fun isValidForDelete(): Boolean {
return true
}
override fun getFailedDeleteMessage(): Int {
return 0 // @todo
} }
// States // States

@ -3,6 +3,7 @@ package net.pokeranalytics.android.model.realm
import io.realm.RealmObject import io.realm.RealmObject
import io.realm.annotations.PrimaryKey import io.realm.annotations.PrimaryKey
import io.realm.kotlin.where import io.realm.kotlin.where
import net.pokeranalytics.android.R
import net.pokeranalytics.android.model.interfaces.CountableUsage import net.pokeranalytics.android.model.interfaces.CountableUsage
import net.pokeranalytics.android.model.interfaces.ManageableStatus import net.pokeranalytics.android.model.interfaces.ManageableStatus
import net.pokeranalytics.android.model.interfaces.NameManageable import net.pokeranalytics.android.model.interfaces.NameManageable
@ -63,16 +64,12 @@ open class TournamentFeature : RealmObject(), NameManageable, StaticRowRepresent
} }
override fun getFailedSaveMessage(status: ManageableStatus): Int { override fun getFailedSaveMessage(status: ManageableStatus): Int {
//TODO if (status == ManageableStatus.DATA_INVALID) R.string.tournament_feature_empty_field_error if (status == ManageableStatus.DATA_INVALID) R.string.tournament_feature_empty_field_error
//TODO else if (status == ManageableStatus.ALREADY_EXISTS) R.string.duplicate_tournament_feature_error else if (status == ManageableStatus.ALREADY_EXISTS) R.string.duplicate_tournament_feature_error
return super.getFailedSaveMessage(status) return super.getFailedSaveMessage(status)
} }
override fun isValidForDelete(): Boolean { override fun isValidForDelete(): Boolean {
return this.realm.where<Session>().equalTo("tournamentFeatures.id", id).findAll().isEmpty() return this.realm.where<Session>().equalTo("tournamentFeatures.id", id).findAll().isEmpty()
} }
override fun getFailedDeleteMessage(): Int {
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
}
} }

@ -3,6 +3,7 @@ package net.pokeranalytics.android.model.realm
import io.realm.RealmObject import io.realm.RealmObject
import io.realm.annotations.PrimaryKey import io.realm.annotations.PrimaryKey
import io.realm.kotlin.where import io.realm.kotlin.where
import net.pokeranalytics.android.R
import net.pokeranalytics.android.model.interfaces.ManageableStatus import net.pokeranalytics.android.model.interfaces.ManageableStatus
import net.pokeranalytics.android.model.interfaces.NameManageable import net.pokeranalytics.android.model.interfaces.NameManageable
import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource
@ -57,16 +58,12 @@ open class TournamentName : RealmObject(), NameManageable, StaticRowRepresentabl
} }
override fun getFailedSaveMessage(status: ManageableStatus): Int { override fun getFailedSaveMessage(status: ManageableStatus): Int {
//TODO if (status == ManageableStatus.DATA_INVALID) R.string.tournament_name_empty_field_error if (status == ManageableStatus.DATA_INVALID) R.string.tournament_name_empty_field_error
//TODO else if (status == ManageableStatus.ALREADY_EXISTS) R.string.duplicate_tournament_name_error else if (status == ManageableStatus.ALREADY_EXISTS) R.string.duplicate_tournament_name_error
return super.getFailedSaveMessage(status) return super.getFailedSaveMessage(status)
} }
override fun isValidForDelete(): Boolean { override fun isValidForDelete(): Boolean {
return this.realm.where<Session>().equalTo("tournamentName.id", id).findAll().isEmpty() return this.realm.where<Session>().equalTo("tournamentName.id", id).findAll().isEmpty()
} }
override fun getFailedDeleteMessage(): Int {
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
}
} }

@ -10,6 +10,10 @@
<string name="tournament_name">Tournament Name</string> <string name="tournament_name">Tournament Name</string>
<string name="tournament_feature">Tournament Feature</string> <string name="tournament_feature">Tournament Feature</string>
<string name="pending">Pending</string> <string name="pending">Pending</string>
<string name="tournament_feature_empty_field_error">You need to give a name to this tournament feature</string>
<string name="duplicate_tournament_feature_error">A tournament feature with the same name already exists.</string>
<string name="tournament_name_empty_field_error">A tournament name can not be empty.</string>
<string name="duplicate_tournament_name_error">This name already exists.</string>
<!-- Translated --> <!-- Translated -->

Loading…
Cancel
Save