Add session as DisplayableData

dev_raz_wip
Aurelien Hubert 7 years ago
parent bb3d23f18d
commit 8d6f1a827b
  1. 5
      app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
  2. 1
      app/src/main/java/net/pokeranalytics/android/ui/adapter/components/DynamicRowInterface.kt
  3. 5
      app/src/main/java/net/pokeranalytics/android/ui/fragment/DataListFragment.kt
  4. 1
      app/src/main/res/values/strings.xml

@ -3,6 +3,7 @@ package net.pokeranalytics.android.model.realm
import io.realm.* import io.realm.*
import io.realm.annotations.Ignore import io.realm.annotations.Ignore
import io.realm.annotations.PrimaryKey import io.realm.annotations.PrimaryKey
import net.pokeranalytics.android.ui.adapter.components.DisplayableData
import net.pokeranalytics.android.ui.adapter.components.DynamicRowDelegate import net.pokeranalytics.android.ui.adapter.components.DynamicRowDelegate
import net.pokeranalytics.android.ui.adapter.components.DynamicRowInterface import net.pokeranalytics.android.ui.adapter.components.DynamicRowInterface
import net.pokeranalytics.android.ui.adapter.components.SessionRow import net.pokeranalytics.android.ui.adapter.components.SessionRow
@ -11,7 +12,7 @@ import java.util.*
import kotlin.collections.ArrayList import kotlin.collections.ArrayList
open class Session(comment: String = "") : RealmObject(), DynamicRowDelegate { open class Session(comment: String = "") : RealmObject(), DynamicRowDelegate, DisplayableData {
@PrimaryKey @PrimaryKey
var id = UUID.randomUUID().toString() var id = UUID.randomUUID().toString()
@ -140,6 +141,8 @@ open class Session(comment: String = "") : RealmObject(), DynamicRowDelegate {
else -> "--" else -> "--"
} }
} }
override var title: String = "Change that: $creationDate"
} }
enum class TournamentKind { enum class TournamentKind {

@ -66,6 +66,7 @@ enum class DataObjectRowType(val resId: Int) : DynamicRowInterface {
BANKROLL(R.string.bankroll), BANKROLL(R.string.bankroll),
GAME(R.string.game), GAME(R.string.game),
LOCATION(R.string.location), LOCATION(R.string.location),
SESSION(R.string.session),
TOURNAMENT_TYPE(R.string.tournament_type), TOURNAMENT_TYPE(R.string.tournament_type),
TRANSACTION_TYPE(R.string.transaction_type); TRANSACTION_TYPE(R.string.transaction_type);

@ -7,16 +7,12 @@ import android.view.ViewGroup
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import io.realm.Realm import io.realm.Realm
import io.realm.RealmObject import io.realm.RealmObject
import io.realm.RealmResults
import io.realm.Sort import io.realm.Sort
import kotlinx.android.synthetic.main.fragment_new_session.* import kotlinx.android.synthetic.main.fragment_new_session.*
import net.pokeranalytics.android.R import net.pokeranalytics.android.R
import net.pokeranalytics.android.model.realm.* import net.pokeranalytics.android.model.realm.*
import net.pokeranalytics.android.ui.adapter.components.* import net.pokeranalytics.android.ui.adapter.components.*
import net.pokeranalytics.android.util.PokerAnalyticsFragment import net.pokeranalytics.android.util.PokerAnalyticsFragment
import net.pokeranalytics.android.util.data.sessionDao
import java.util.*
import kotlin.collections.ArrayList
class DataListFragment : PokerAnalyticsFragment(), DataRowDelegate, DataRowCallback { class DataListFragment : PokerAnalyticsFragment(), DataRowDelegate, DataRowCallback {
@ -76,6 +72,7 @@ class DataListFragment : PokerAnalyticsFragment(), DataRowDelegate, DataRowCallb
DataObjectRowType.BANKROLL -> realm.where(Bankroll::class.java).findAll().sort("name", Sort.DESCENDING) DataObjectRowType.BANKROLL -> realm.where(Bankroll::class.java).findAll().sort("name", Sort.DESCENDING)
DataObjectRowType.GAME-> realm.where(Game::class.java).findAll().sort("name", Sort.DESCENDING) DataObjectRowType.GAME-> realm.where(Game::class.java).findAll().sort("name", Sort.DESCENDING)
DataObjectRowType.LOCATION -> realm.where(Location::class.java).findAll().sort("name", Sort.DESCENDING) DataObjectRowType.LOCATION -> realm.where(Location::class.java).findAll().sort("name", Sort.DESCENDING)
DataObjectRowType.SESSION -> realm.where(Session::class.java).findAll().sort("creationDate", Sort.DESCENDING)
DataObjectRowType.TOURNAMENT_TYPE -> realm.where(TournamentFeature::class.java).findAll().sort("name", Sort.DESCENDING) DataObjectRowType.TOURNAMENT_TYPE -> realm.where(TournamentFeature::class.java).findAll().sort("name", Sort.DESCENDING)
DataObjectRowType.TRANSACTION_TYPE -> realm.where(TransactionType::class.java).findAll().sort("name", Sort.DESCENDING) DataObjectRowType.TRANSACTION_TYPE -> realm.where(TransactionType::class.java).findAll().sort("name", Sort.DESCENDING)
}) })

@ -8,6 +8,7 @@
<string name="bankroll">Bankroll</string> <string name="bankroll">Bankroll</string>
<string name="game">Game</string> <string name="game">Game</string>
<string name="location">Location</string> <string name="location">Location</string>
<string name="session">Session</string>
<string name="tournament_type">Tournament Type</string> <string name="tournament_type">Tournament Type</string>
<string name="transaction_type">Transaction Type</string> <string name="transaction_type">Transaction Type</string>

Loading…
Cancel
Save