Working on bottom sheet management

app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt

@@ -1,19 +1,18 @@
 package net.pokeranalytics.android.model.realm
 
+import android.text.InputType
 import io.realm.*
 import io.realm.annotations.Ignore
 import io.realm.annotations.PrimaryKey
 import net.pokeranalytics.android.calculus.SessionInterface
-import net.pokeranalytics.android.ui.adapter.components.DisplayableDataSource
+import net.pokeranalytics.android.ui.adapter.components.*
-import net.pokeranalytics.android.ui.adapter.components.DynamicRowDelegate
+import net.pokeranalytics.android.ui.fragment.components.BottomSheetData
-import net.pokeranalytics.android.ui.adapter.components.DynamicRowInterface
-import net.pokeranalytics.android.ui.adapter.components.SessionRow
 import net.pokeranalytics.android.util.data.sessionDao
 import java.util.*
 import kotlin.collections.ArrayList
 
 
-open class Session : RealmObject(), SessionInterface, DynamicRowDelegate, DisplayableDataSource {
+open class Session : RealmObject(), SessionInterface, DynamicRowDelegate, DisplayableDataSource, EditableDataSource {
 
 	@PrimaryKey
 	var id = UUID.randomUUID().toString()
@@ -148,6 +147,28 @@ open class Session : RealmObject(), SessionInterface, DynamicRowDelegate, Displa
 	}
 
 	override var title: String = "Change that: $creationDate"
+
+	override fun getBottomSheetData(row: DynamicRowInterface): ArrayList<BottomSheetData> {
+
+		val data = ArrayList<BottomSheetData>()
+
+		// Todo: Localize & set real data
+		when (row) {
+			SessionRow.GAME -> {
+				data.add(BottomSheetData("Game", game, "", 0, arrayListOf(Game(), Game(), Game())))
+			}
+			SessionRow.DATE -> {
+				data.add(BottomSheetData("Date", timeFrame?.startDate, "Start date"))
+				data.add(BottomSheetData("Date", timeFrame?.endDate, "End date"))
+			}
+			SessionRow.BLINDS -> {
+				data.add(BottomSheetData("Blind", cgSmallBlind, "Small blind", InputType.TYPE_CLASS_NUMBER))
+				data.add(BottomSheetData("Blind", cgBigBlind, "Big blind", InputType.TYPE_CLASS_NUMBER))
+			}
+		}
+
+		return data
+	}
 }
 
 enum class TournamentKind {

app/src/main/java/net/pokeranalytics/android/ui/adapter/components/DataListAdapter.kt

@@ -7,6 +7,7 @@ import androidx.appcompat.widget.AppCompatTextView
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.RecyclerView
 import net.pokeranalytics.android.R
+import net.pokeranalytics.android.ui.fragment.components.BottomSheetData
 
 interface DisplayableDelegate {
     fun data(position: Int) : DisplayableDataSource
@@ -18,6 +19,10 @@ interface DisplayableDataSource {
     var title: String
 }
 
+interface EditableDataSource {
+	fun getBottomSheetData(row: DynamicRowInterface): ArrayList<BottomSheetData>
+}
+
 class DataListAdapter(var delegate: DisplayableDelegate, var layout: Int? = null) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
     inner class DataViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {

app/src/main/java/net/pokeranalytics/android/ui/adapter/components/DynamicRowInterface.kt

@@ -59,6 +59,7 @@ enum class SessionRow(val resId: Int) : DynamicRowInterface {
 				DATE -> BottomSheetType.DATE
 			}
 		}
+
 }
 
 enum class BankrollRow(val resId: Int) : DynamicRowInterface {

app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt

@@ -36,7 +36,7 @@ class EditableDataFragment : PokerAnalyticsFragment(), DynamicRowCallback, Botto
 
 	override fun onRowSelected(row: DynamicRowInterface) {
 		val data = item
-		BottomSheetFragment.create(fragmentManager, row, this, data)
+		BottomSheetFragment.create(fragmentManager, row, this, ArrayList())
 	}
 
 	override fun setValue(value: Any, row: DynamicRowInterface) {

app/src/main/java/net/pokeranalytics/android/ui/fragment/NewSessionFragment.kt

@@ -32,16 +32,16 @@ class NewSessionFragment : PokerAnalyticsFragment(), DynamicRowCallback, BottomS
 	}
 
 	override fun onRowSelected(row: DynamicRowInterface) {
-
-		val data = when (row.bottomSheetType) {
 		/*
+		val data = when (row.bottomSheetType) {
 			BottomSheetType.BLINDS -> newSession
 			BottomSheetType.DATE -> newSession.timeFrame
 			BottomSheetType.GAME -> newSession.game
-			*/
 			else -> Any()
 		}
+		*/
 
+		val data = newSession.getBottomSheetData(row)
 		BottomSheetFragment.create(fragmentManager, row, this, data)
 	}
 

app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetData.kt

@@ -0,0 +1,12 @@
+package net.pokeranalytics.android.ui.fragment.components
+
+import android.text.InputType
+import net.pokeranalytics.android.ui.adapter.components.DisplayableDataSource
+
+class BottomSheetData(
+	var title: String? = "",
+	var defaultValue: Any? = null,
+	var hint: String? = "",
+	var inputType: Int? = InputType.TYPE_CLASS_TEXT,
+	var data: ArrayList<DisplayableDataSource>? = ArrayList()
+)

app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetDoubleEditTextFragment.kt

@@ -1,17 +1,15 @@
 package net.pokeranalytics.android.ui.fragment.components
 
 import android.os.Bundle
+import android.text.InputType
 import android.view.LayoutInflater
 import android.view.View
 import kotlinx.android.synthetic.main.bottom_sheet_double_edit_text.*
 import kotlinx.android.synthetic.main.fragment_bottom_sheet.view.*
 import net.pokeranalytics.android.R
-import net.pokeranalytics.android.model.realm.Game
-import net.pokeranalytics.android.ui.adapter.components.DisplayableDataSource
-import net.pokeranalytics.android.ui.adapter.components.DisplayableDelegate
 
 
-class BottomSheetDoubleEditTextFragment : BottomSheetFragment(), DisplayableDelegate {
+class BottomSheetDoubleEditTextFragment : BottomSheetFragment() {
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
@@ -27,25 +25,13 @@ class BottomSheetDoubleEditTextFragment : BottomSheetFragment(), DisplayableDele
 
 	override fun onStart() {
 		super.onStart()
-		smallBlind.requestFocus()
+		editText1.requestFocus()
-	}
-
-	override fun data(position: Int): DisplayableDataSource {
-		return Game()
-	}
-
-	override fun onRowSelected(position: Int) {
-	}
-
-	override fun size(): Int {
-		return 0
 	}
 
 	/**
 	 * Init data
 	 */
 	private fun initData() {
-		val data = getData()
 	}
 
 	/**
@@ -53,8 +39,24 @@ class BottomSheetDoubleEditTextFragment : BottomSheetFragment(), DisplayableDele
 	 */
 	private fun initUI() {
 
+		val data = getData()
+
 		LayoutInflater.from(requireContext()).inflate(R.layout.bottom_sheet_double_edit_text, view?.bottomSheetContainer, true)
 
+		if (data.size == 2) {
+
+			title.text = data[0].title
+			editText1.hint = data[0].hint
+			editText1.setText((data[0].defaultValue ?: "").toString())
+			editText1.inputType = data[0].inputType ?: InputType.TYPE_CLASS_TEXT
+
+			editText2.hint = data[1].hint
+			editText2.setText((data[1].defaultValue ?: "").toString())
+			editText2.inputType = data[1].inputType ?: InputType.TYPE_CLASS_TEXT
+		}
+
+
+
 	}
 
 }

app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetEditTextFragment.kt

@@ -0,0 +1,48 @@
+package net.pokeranalytics.android.ui.fragment.components
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import kotlinx.android.synthetic.main.bottom_sheet_edit_text.*
+import kotlinx.android.synthetic.main.fragment_bottom_sheet.view.*
+import net.pokeranalytics.android.R
+
+
+class BottomSheetEditTextFragment : BottomSheetFragment() {
+
+	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+		super.onViewCreated(view, savedInstanceState)
+		initData()
+		initUI()
+	}
+
+	override fun clickOnCheck() {
+		super.clickOnCheck()
+		valueDelegate.setValue("", row)
+		dismiss()
+	}
+
+	override fun onStart() {
+		super.onStart()
+		editText1.requestFocus()
+	}
+
+	/**
+	 * Init data
+	 */
+	private fun initData() {
+		val data = getData()
+	}
+
+	/**
+	 * Init UI
+	 */
+	private fun initUI() {
+
+		LayoutInflater.from(requireContext()).inflate(R.layout.bottom_sheet_edit_text, view?.bottomSheetContainer, true)
+
+
+
+	}
+
+}

app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetFragment.kt

@@ -38,14 +38,14 @@ open class BottomSheetFragment : BottomSheetDialogFragment(), BottomSheetInterfa
 	lateinit var row: DynamicRowInterface
 	lateinit var valueDelegate: BottomSheetDelegate
 
-	private var data: Any? = null
+	private var data: ArrayList<BottomSheetData> = ArrayList()
 
 	companion object {
 		fun create(
 			fragmentManager: FragmentManager?,
 			row: DynamicRowInterface,
 			valueDelegate: BottomSheetDelegate,
-			data: Any?
+			data: ArrayList<BottomSheetData>
 		): BottomSheetFragment {
 
 			val bottomSheetFragment = when (row.bottomSheetType) {
@@ -123,9 +123,9 @@ open class BottomSheetFragment : BottomSheetDialogFragment(), BottomSheetInterfa
 	}
 
 	/**
-	 * Return the data object
+	 * Return the data list
 	 */
-	fun getData(): Any? {
+	fun getData(): ArrayList<BottomSheetData> {
 		return data
 	}
 

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

@@ -8,23 +8,23 @@
 	tools:background="@color/gray_darker">
 
 	<androidx.appcompat.widget.AppCompatTextView
-		android:id="@+id/appCompatTextView"
+		android:id="@+id/title"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:layout_marginStart="16dp"
 		android:layout_marginTop="16dp"
 		android:layout_marginEnd="8dp"
 		android:layout_marginBottom="16dp"
-		android:text="Blinds"
 		android:textColor="@color/white"
 		android:textSize="16sp"
 		app:layout_constraintBottom_toBottomOf="parent"
-		app:layout_constraintEnd_toStartOf="@+id/smallBlind"
+		app:layout_constraintEnd_toStartOf="@+id/editText1"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toTopOf="parent" />
+		app:layout_constraintTop_toTopOf="parent"
+		tools:text="Blinds" />
 
 	<androidx.appcompat.widget.AppCompatEditText
-		android:id="@+id/smallBlind"
+		android:id="@+id/editText1"
 		android:layout_width="96dp"
 		android:layout_height="wrap_content"
 		android:layout_marginTop="8dp"
@@ -36,12 +36,12 @@
 		android:lines="1"
 		android:textColor="@color/white"
 		app:layout_constraintBottom_toBottomOf="parent"
-		app:layout_constraintEnd_toStartOf="@+id/bigBlind"
+		app:layout_constraintEnd_toStartOf="@+id/editText2"
 		app:layout_constraintTop_toTopOf="parent" />
 
 
 	<androidx.appcompat.widget.AppCompatEditText
-		android:id="@+id/bigBlind"
+		android:id="@+id/editText2"
 		android:layout_width="96dp"
 		android:layout_height="wrap_content"
 		android:layout_marginTop="8dp"

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

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:orientation="vertical"
+	tools:background="@color/gray_darker">
+
+	<androidx.appcompat.widget.AppCompatTextView
+		android:id="@+id/title"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="16dp"
+		android:layout_marginTop="16dp"
+		android:layout_marginEnd="8dp"
+		android:layout_marginBottom="16dp"
+		tools:text="Blinds"
+		android:textColor="@color/white"
+		android:textSize="16sp"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toStartOf="@+id/editText1"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent" />
+
+	<androidx.appcompat.widget.AppCompatEditText
+		android:id="@+id/editText1"
+		android:layout_width="96dp"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="8dp"
+		android:layout_marginEnd="8dp"
+		android:layout_marginBottom="8dp"
+		android:gravity="end|center_vertical"
+		android:imeOptions="actionDone"
+		android:inputType="numberDecimal"
+		android:lines="1"
+		android:textColor="@color/white"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>