Merge branch 'master' of gitlab.com:stax-river/poker-analytics

feature/top10
Aurelien Hubert 7 years ago
commit 98015a4adc
  1. 2
      app/src/main/java/net/pokeranalytics/android/model/realm/Bankroll.kt
  2. 2
      app/src/main/java/net/pokeranalytics/android/model/realm/Game.kt
  3. 2
      app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
  4. 2
      app/src/main/java/net/pokeranalytics/android/model/realm/TournamentFeature.kt
  5. 2
      app/src/main/java/net/pokeranalytics/android/model/realm/TransactionType.kt
  6. 5
      app/src/main/java/net/pokeranalytics/android/ui/adapter/RowRepresentableDataSource.kt
  7. 2
      app/src/main/java/net/pokeranalytics/android/ui/fragment/StatsFragment.kt
  8. 2
      app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetTableSizeGridFragment.kt

@ -49,7 +49,7 @@ open class Bankroll(name: String = "") : RealmObject(), Savable,
// Row Representable Datasource
override fun adapterRows(): List<out RowRepresentable>? {
override fun adapterRows(): List<RowRepresentable>? {
val rows = ArrayList<RowRepresentable>()
rows.add(SimpleRow.NAME)
rows.addAll(BankrollRow.values())

@ -31,7 +31,7 @@ open class Game : RealmObject(), Savable, StaticRowRepresentableDataSource,
return this.id
}
override fun adapterRows(): List<out RowRepresentable>? {
override fun adapterRows(): List<RowRepresentable>? {
val rows = ArrayList<RowRepresentable>()
rows.add(SimpleRow.NAME)
rows.addAll(GameRow.values())

@ -311,7 +311,7 @@ open class Session : RealmObject(), SessionInterface, Savable,
return "Session ${this.creationDate}"
}
override fun adapterRows(): List<out RowRepresentable>? {
override fun adapterRows(): List<RowRepresentable>? {
val rows = ArrayList<RowRepresentable>()
// Headers

@ -28,7 +28,7 @@ open class TournamentFeature : RealmObject(), Savable, StaticRowRepresentableDat
return this.id
}
override fun adapterRows(): List<out RowRepresentable>? {
override fun adapterRows(): List<RowRepresentable>? {
val rows = ArrayList<RowRepresentable>()
rows.add(SimpleRow.NAME)
rows.addAll(TournamentFeatureRow.values())

@ -38,7 +38,7 @@ open class TransactionType : RealmObject(), Savable, StaticRowRepresentableDataS
return this.id
}
override fun adapterRows(): List<out RowRepresentable>? {
override fun adapterRows(): List<RowRepresentable>? {
val rows = ArrayList<RowRepresentable>()
rows.add(SimpleRow.NAME)
rows.addAll(TransactionTypeRow.values())

@ -4,7 +4,6 @@ import android.content.Context
import net.pokeranalytics.android.calculus.TextFormat
import net.pokeranalytics.android.ui.view.RowRepresentable
import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor
import org.w3c.dom.Text
/**
* Base Interface to provide the RowRepresentable to the adapter
@ -14,7 +13,7 @@ interface RowRepresentableDataSource: EditableDataSource, DisplayableDataSource
/**
* Returns a prebuild list of rows
*/
fun adapterRows(): List<out RowRepresentable>?
fun adapterRows(): List<RowRepresentable>?
/**
* Returns a [RowRepresentable] at position [Int]
@ -74,7 +73,7 @@ interface StaticRowRepresentableDataSource: RowRepresentableDataSource {
* To do that, this interface overrides and provides a default implementation to specific methods of [RowRepresentableDataSource]
*/
interface LiveRowRepresentableDataSource: RowRepresentableDataSource {
override fun adapterRows(): List<out RowRepresentable>? {
override fun adapterRows(): List<RowRepresentable>? {
return null
}
}

@ -52,7 +52,7 @@ class StatsFragment : SessionObserverFragment(), StaticRowRepresentableDataSourc
// Row Representable DS
override fun adapterRows(): List<out RowRepresentable>? {
override fun adapterRows(): List<RowRepresentable>? {
return this.rowRepresentables
}

@ -72,7 +72,7 @@ class BottomSheetTableSizeGridFragment : BottomSheetFragment(),
}
}
override fun adapterRows(): List<out RowRepresentable>? {
override fun adapterRows(): List<RowRepresentable>? {
return TableSize.all
}

Loading…
Cancel
Save