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

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

@@ -62,8 +62,11 @@ class BottomSheetDoubleEditTextFragment : BottomSheetFragment() {
 
 		if (data.size == 2) {
 
-			editText1.setText((data[0].defaultValue ?: "").toString())
+			values[0] = (data[0].defaultValue ?: "").toString()
-			editText2.setText((data[1].defaultValue ?: "").toString())
+			values[1] = (data[1].defaultValue ?: "").toString()
+
+			editText1.setText(values[0])
+			editText2.setText(values[1])
 
 			data[0].hint?.let { editText1.hint = getString(it) }
 			editText1.inputType = data[0].inputType ?: InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_CAP_SENTENCES

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

@@ -184,7 +184,7 @@ open class BottomSheetFragment : BottomSheetDialogFragment() {
 	/**
 	 * Set clear button visibility
 	 */
-	fun setClearButtonVisibile(visible: Boolean) {
+	fun setClearButtonVisible(visible: Boolean) {
 		bottomSheetToolbar?.let {
 			bottomSheetToolbar.menu.findItem(R.id.actionClear).isVisible = visible
 		}
@@ -193,7 +193,7 @@ open class BottomSheetFragment : BottomSheetDialogFragment() {
 	/**
 	 * Set check button visibility
 	 */
-	fun setCheckButtonVisibile(visible: Boolean) {
+	fun setCheckButtonVisible(visible: Boolean) {
 		bottomSheetToolbar.menu.findItem(R.id.actionCheck).isVisible = visible
 	}
 

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

@@ -81,6 +81,8 @@ open class BottomSheetListFragment : BottomSheetFragment(), LiveRowRepresentable
 	 */
 	open fun initUI() {
 
+		setCheckButtonVisible(false)
+
 		LayoutInflater.from(requireContext()).inflate(R.layout.bottom_sheet_list, view?.bottomSheetContainer, true)
 
 		val viewManager = LinearLayoutManager(requireContext())

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

@@ -59,6 +59,8 @@ class BottomSheetListGameFragment : BottomSheetListFragment() {
 	 */
 	override fun initUI() {
 
+		setCheckButtonVisible(false)
+
 		LayoutInflater.from(requireContext()).inflate(R.layout.bottom_sheet_game_list, view?.bottomSheetContainer, true)
 
 		values.add(0, limit)

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

@@ -55,6 +55,8 @@ class BottomSheetStaticListFragment : BottomSheetFragment(), StaticRowRepresenta
 	 */
 	private fun initUI() {
 
+		setCheckButtonVisible(false)
+
 		LayoutInflater.from(requireContext()).inflate(R.layout.bottom_sheet_list, view?.bottomSheetContainer, true)
 
 		val viewManager = LinearLayoutManager(requireContext())

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

@@ -14,9 +14,7 @@ import net.pokeranalytics.android.ui.view.GridSpacingItemDecoration
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.util.extensions.px
 
-class BottomSheetTableSizeGridFragment : BottomSheetFragment(),
+class BottomSheetTableSizeGridFragment : BottomSheetFragment(), StaticRowRepresentableDataSource, RowRepresentableDelegate {
-	StaticRowRepresentableDataSource,
-    RowRepresentableDelegate {
 
 	private lateinit var dataAdapter: RowRepresentableAdapter
 	private var defaultSize: Int? = null
@@ -53,6 +51,7 @@ class BottomSheetTableSizeGridFragment : BottomSheetFragment(),
 	private fun initUI() {
 
 		setAddButtonVisible(false)
+		setCheckButtonVisible(false)
 
 		LayoutInflater.from(requireContext())
 			.inflate(net.pokeranalytics.android.R.layout.bottom_sheet_grid, view?.bottomSheetContainer, true)

app/src/main/res/drawable/ic_outline_remove.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M7,11v2h10v-2L7,11zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"/>
+</vector>

app/src/main/res/menu/bottom_sheet_menu.xml

@@ -6,7 +6,7 @@
 		android:id="@+id/actionClear"
 		android:orderInCategory="100"
 		android:title="@string/clear"
-		android:icon="@drawable/ic_close"
+		android:icon="@drawable/ic_outline_remove"
 		app:showAsAction="always" />
 	<item
 		android:id="@+id/actionAdd"