Add ReportRow and refactor MoreTabRow

feature/top10
Aurelien Hubert 7 years ago
parent b539a23f3d
commit 4b666468c8
  1. 8
      app/src/main/java/net/pokeranalytics/android/ui/fragment/MoreFragment.kt
  2. 4
      app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/MoreTabRow.kt
  3. 35
      app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/ReportRow.kt
  4. 1
      app/src/main/res/values/strings.xml

@ -7,7 +7,7 @@ import android.view.ViewGroup
import androidx.recyclerview.widget.LinearLayoutManager
import kotlinx.android.synthetic.main.fragment_stats.*
import net.pokeranalytics.android.R
import net.pokeranalytics.android.model.MoreTabRepresentable
import net.pokeranalytics.android.ui.view.rowrepresentable.MoreTabRow
import net.pokeranalytics.android.ui.activity.BankrollActivity
import net.pokeranalytics.android.ui.activity.SettingsActivity
import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
@ -56,8 +56,8 @@ class MoreFragment : PokerAnalyticsFragment(), StaticRowRepresentableDataSource,
override fun onRowSelected(position: Int, row: RowRepresentable, fromAction: Boolean) {
super.onRowSelected(position, row, fromAction)
when(row) {
MoreTabRepresentable.BANKROLL -> BankrollActivity.newInstance(requireContext())
MoreTabRepresentable.SETTINGS -> SettingsActivity.newInstance(requireContext())
MoreTabRow.BANKROLL -> BankrollActivity.newInstance(requireContext())
MoreTabRow.SETTINGS -> SettingsActivity.newInstance(requireContext())
}
}
@ -67,7 +67,7 @@ class MoreFragment : PokerAnalyticsFragment(), StaticRowRepresentableDataSource,
* Init data
*/
private fun initData() {
rowRepresentables.addAll(MoreTabRepresentable.values())
rowRepresentables.addAll(MoreTabRow.values())
moreAdapter = RowRepresentableAdapter(this, this)
}

@ -1,4 +1,4 @@
package net.pokeranalytics.android.model
package net.pokeranalytics.android.ui.view.rowrepresentable
import net.pokeranalytics.android.R
import net.pokeranalytics.android.ui.view.RowRepresentable
@ -7,7 +7,7 @@ import net.pokeranalytics.android.ui.view.RowViewType
/**
* An enum managing the rows in the more tabs
*/
enum class MoreTabRepresentable : RowRepresentable {
enum class MoreTabRow : RowRepresentable {
BANKROLL,
SETTINGS;

@ -0,0 +1,35 @@
package net.pokeranalytics.android.ui.view.rowrepresentable
import net.pokeranalytics.android.R
import net.pokeranalytics.android.ui.view.RowRepresentable
import net.pokeranalytics.android.ui.view.RowViewType
/**
* An enum managing the report rows
*/
enum class ReportRow : RowRepresentable {
BLINDS,
BUY_IN,
DAY_OF_WEEKS,
GENERAL,
LOCATIONS,
NUMBER_OF_TABLES,
TOURNAMENT_TYPES,
VARIANT;
override val resId: Int?
get() {
return when(this) {
BLINDS -> R.string.blinds
BUY_IN -> R.string.buyin
DAY_OF_WEEKS -> R.string.day_of_the_week
GENERAL -> R.string.general
LOCATIONS -> R.string.locations
NUMBER_OF_TABLES -> R.string.number_of_tables
TOURNAMENT_TYPES -> R.string.tournament_type_complete
VARIANT -> R.string.variant_
}
}
override val viewType: Int = RowViewType.TITLE_ARROW.ordinal
}

@ -6,6 +6,7 @@
<string name="hour">Hour</string>
<string name="minute">Minute</string>
<string name="more">More</string>
<string name="variant">Variant</string>
<!--<string name="session_missing_end_date">Please set the end date for the session</string>-->
<!--<string name="default_error_message">Sorry, something went wrong...please contact us!</string>-->

Loading…
Cancel
Save