diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/Top10Fragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/Top10Fragment.kt index 9dfc8361..ca03dde0 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/Top10Fragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/Top10Fragment.kt @@ -12,7 +12,6 @@ import io.realm.kotlin.where import kotlinx.android.synthetic.main.fragment_feed.* import net.pokeranalytics.android.R import net.pokeranalytics.android.model.realm.Session -import net.pokeranalytics.android.model.realm.Transaction import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter import net.pokeranalytics.android.ui.adapter.RowRepresentableDataSource import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate @@ -44,7 +43,7 @@ class Top10Fragment : RealmFragment(), RowRepresentableDataSource, RowRepresenta private var currentTab: Tab = Tab.CASH_GAMES - override val observedEntities: List> = listOf(Session::class.java, Transaction::class.java) + override val observedEntities: List> = listOf(Session::class.java) override fun entitiesChanged(clazz: Class) { super.entitiesChanged(clazz) @@ -66,6 +65,29 @@ class Top10Fragment : RealmFragment(), RowRepresentableDataSource, RowRepresenta initData() } + /** + * Init data + */ + private fun initData() { + + this.realmCashGames = getRealm().where() + .equalTo("type", Session.Type.CASH_GAME.ordinal) + .greaterThanOrEqualTo("result.net", 0.0) + .sort("result.net", Sort.DESCENDING) + .limit(10) + .findAll() + + this.realmTournaments = getRealm().where() + .equalTo("type", Session.Type.TOURNAMENT.ordinal) + .greaterThanOrEqualTo("result.net", 0.0) + .sort("result.net", Sort.DESCENDING) + .limit(10) + .findAll() + + dataListAdapter = RowRepresentableAdapter(this, this) + recyclerView.adapter = dataListAdapter + } + override fun adapterRows(): List? { return when (currentTab) { Tab.CASH_GAMES -> realmCashGames @@ -128,27 +150,4 @@ class Top10Fragment : RealmFragment(), RowRepresentableDataSource, RowRepresenta } - /** - * Init data - */ - private fun initData() { - - this.realmCashGames = getRealm().where() - .equalTo("type", Session.Type.CASH_GAME.ordinal) - .greaterThanOrEqualTo("result.net", 0.0) - .sort("result.net", Sort.DESCENDING) - .limit(10) - .findAll() - - this.realmTournaments = getRealm().where() - .equalTo("type", Session.Type.TOURNAMENT.ordinal) - .greaterThanOrEqualTo("result.net", 0.0) - .sort("result.net", Sort.DESCENDING) - .limit(10) - .findAll() - - dataListAdapter = RowRepresentableAdapter(this, this) - recyclerView.adapter = dataListAdapter - } - } \ No newline at end of file diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt index 244e8674..a9120261 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt @@ -26,6 +26,7 @@ import net.pokeranalytics.android.R import net.pokeranalytics.android.calculus.ComputedStat import net.pokeranalytics.android.calculus.Stat import net.pokeranalytics.android.calculus.bankroll.BankrollReport +import net.pokeranalytics.android.model.TableSize import net.pokeranalytics.android.model.extensions.getFormattedGameType import net.pokeranalytics.android.model.realm.CustomField import net.pokeranalytics.android.model.realm.Session @@ -116,7 +117,6 @@ enum class RowViewType(private var layoutRes: Int) { // Row Transaction ROW_TOP_10 -> RowTop10ViewHolder(layout) - // Row Button ROW_BUTTON -> RowButtonViewHolder(layout) @@ -535,7 +535,7 @@ enum class RowViewType(private var layoutRes: Int) { gameResult.setTextFormat(formattedStat, itemView.context) } - itemView.findViewById(R.id.top10ResultPart1)?.let { part1 -> + itemView.findViewById(R.id.sessionGameType)?.let { part1 -> part1.text = row.getFormattedGameType(itemView.context) } @@ -559,8 +559,20 @@ enum class RowViewType(private var layoutRes: Int) { locationText?.isVisible = false } + // Table Size + val tableSizeIcon = itemView.findViewById(R.id.sessionInfoTableSizeIcon) + val tableSizeText = itemView.findViewById(R.id.sessionInfoTableSize) + + row.tableSize?.let { + tableSizeIcon?.isVisible = true + tableSizeText?.isVisible = true + tableSizeText?.text = TableSize(it).localizedTitle(itemView.context) + } ?: run { + tableSizeIcon?.isVisible = false + tableSizeText?.isVisible = false + } - itemView.findViewById(R.id.top10ResultPart3)?.let { part3 -> + itemView.findViewById(R.id.sessionDate)?.let { part3 -> part3.text = row.creationDate.longDate() } } diff --git a/app/src/main/res/layout/row_top_10.xml b/app/src/main/res/layout/row_top_10.xml index 157d62a2..88506205 100644 --- a/app/src/main/res/layout/row_top_10.xml +++ b/app/src/main/res/layout/row_top_10.xml @@ -21,121 +21,109 @@ tools:text="$ 1000" /> + + - + app:layout_constraintEnd_toEndOf="parent" + android:gravity="center"> - + - + + - + + - + - + \ No newline at end of file