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

feature/top10
Aurelien Hubert 7 years ago
commit 67b86ab6ce
  1. 7
      app/src/main/java/net/pokeranalytics/android/ui/view/RowRepresentable.kt

@ -289,6 +289,7 @@ enum class TournamentFeatureRow : RowRepresentable {
}
enum class SettingRow : RowRepresentable {
GDPR,
BANKROLL,
GAME,
LOCATION,
@ -300,7 +301,10 @@ enum class SettingRow : RowRepresentable {
this.relatedResultsRepresentable?.let {
return it.resId
} ?: run {
return super.resId
return when (this) {
GDPR -> R.string.gdpr
else -> null
}
}
}
@ -314,6 +318,7 @@ enum class SettingRow : RowRepresentable {
LOCATION -> LiveData.LOCATION
TOURNAMENT_FEATURE -> LiveData.TOURNAMENT_FEATURE
TRANSACTION_TYPE -> LiveData.TRANSACTION_TYPE
else -> null
}
}

Loading…
Cancel
Save