From 325e622d94f7a912df0ba6747738f18ba1c543ec Mon Sep 17 00:00:00 2001 From: Laurent Date: Wed, 13 Feb 2019 15:24:56 +0100 Subject: [PATCH] Refactor RowGroup into SectionRow --- .../adapter/components/DynamicRowInterface.kt | 23 ++++++------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/adapter/components/DynamicRowInterface.kt b/app/src/main/java/net/pokeranalytics/android/ui/adapter/components/DynamicRowInterface.kt index f7d978f5..4543a590 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/adapter/components/DynamicRowInterface.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/adapter/components/DynamicRowInterface.kt @@ -4,21 +4,12 @@ import android.content.Context import net.pokeranalytics.android.R -class RowGroup(stringRes: Int?, rows: ArrayList) : DynamicRowInterface { +class SectionRow(stringRes: Int) : DynamicRowInterface { - var stringRes: Int? = stringRes - var rows: ArrayList = rows + var stringRes: Int = stringRes - var size: Int = 0 - get() { - return this.rows.size - } - - override fun localizedTitle(context: Context): String? { - stringRes?.let { - return context.getString(it) - } - return null + override fun localizedTitle(context: Context): String { + return context.getString(this.stringRes) } override var viewType: Int = 0 @@ -27,7 +18,7 @@ class RowGroup(stringRes: Int?, rows: ArrayList) : DynamicR interface DynamicRowInterface { - fun localizedTitle(context: Context): String? + fun localizedTitle(context: Context): String var viewType: Int } @@ -37,7 +28,7 @@ enum class SessionRow(val resId: Int) : DynamicRowInterface { GAME(R.string.app_name), DATE(R.string.app_name); - override fun localizedTitle(context: Context): String? { + override fun localizedTitle(context: Context): String { return context.getString(this.resId) } @@ -57,7 +48,7 @@ enum class BankrollRow(val resId: Int) : DynamicRowInterface { LIVE(R.string.app_name), CURRENCY(R.string.app_name); - override fun localizedTitle(context: Context): String? { + override fun localizedTitle(context: Context): String { return context.getString(this.resId) }