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

app/src/main/java/net/pokeranalytics/android/model/TableSize.kt

@@ -7,7 +7,7 @@ import net.pokeranalytics.android.ui.view.RowViewType
 
 class TableSize(var numberOfPlayer: Int) : RowRepresentable {
 	companion object {
-        val all = Array(8, init =
+		val all = Array(9, init =
 		{ index -> TableSize(index + 2) })
 	}
 
@@ -25,7 +25,7 @@ class TableSize(var numberOfPlayer:Int): RowRepresentable {
 			return if (this.numberOfPlayer == 2) {
 				context.getString(it)
 			} else {
-                "$this.numberOfPlayer$context.getString(it)"
+				"${this.numberOfPlayer}-${context.getString(it)}"
 			}
 		}
 		return super.localizedTitle(context)

app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt

@@ -3,10 +3,9 @@ package net.pokeranalytics.android.ui.view
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.appcompat.widget.AppCompatTextView
-import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.RecyclerView
 import kotlinx.android.synthetic.main.row_bottom_sheet_grid_title.view.*
+import kotlinx.android.synthetic.main.row_bottom_sheet_title.view.*
 import kotlinx.android.synthetic.main.row_header_title_value.view.*
 import kotlinx.android.synthetic.main.row_history_session.view.*
 import kotlinx.android.synthetic.main.row_title.view.*
@@ -60,15 +59,15 @@ enum class RowViewType {
 
 	inner class DataViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), BindableHolder {
 		override fun bind(row: RowRepresentable, rowRepresentableDataSource: RowRepresentableDataSource?, listener: View.OnClickListener, actionListener: View.OnClickListener?) {
-			itemView.findViewById<AppCompatTextView>(R.id.rowTitle_title).text = row.getDisplayName()
-			itemView.findViewById<ConstraintLayout>(R.id.rowTitle_container).setOnClickListener(listener)
+			itemView.rowTitle_title.text = row.getDisplayName()
+			itemView.rowTitle_container.setOnClickListener(listener)
 		}
 	}
 
 	inner class BottomSheetDataViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), BindableHolder {
 		override fun bind(row: RowRepresentable, rowRepresentableDataSource: RowRepresentableDataSource?, listener: View.OnClickListener, actionListener: View.OnClickListener?) {
-			itemView.findViewById<AppCompatTextView>(R.id.title).text = row.getDisplayName()
-			itemView.findViewById<ConstraintLayout>(R.id.container).setOnClickListener(listener)
+			itemView.rowBottomSheet_title.text = row.getDisplayName()
+			itemView.rowBottomSheet_container.setOnClickListener(listener)
 		}
 	}
 

app/src/main/res/layout/row_bottom_sheet_title.xml

@@ -2,7 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
-	android:id="@+id/container"
+	android:id="@+id/rowBottomSheet_container"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:background="@color/kaki_light"
@@ -10,7 +10,7 @@
 	android:padding="8dp">
 
 	<androidx.appcompat.widget.AppCompatTextView
-		android:id="@+id/title"
+		android:id="@+id/rowBottomSheet_title"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:layout_marginStart="8dp"