diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt index 8be103ef..c7ab6d4f 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt +++ b/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()) - editText2.setText((data[1].defaultValue ?: "").toString()) + values[0] = (data[0].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 diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt index 2ce2f4b8..698b72e3 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt +++ b/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 } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListFragment.kt index 4ab59201..fa7145d1 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListFragment.kt +++ b/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()) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListGameFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListGameFragment.kt index 52707e9d..4f4c12f3 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListGameFragment.kt +++ b/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) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetStaticListFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetStaticListFragment.kt index 7967e274..8164a19e 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetStaticListFragment.kt +++ b/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()) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetTableSizeGridFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetTableSizeGridFragment.kt index bd2080f3..171390d8 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetTableSizeGridFragment.kt +++ b/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(), - StaticRowRepresentableDataSource, - RowRepresentableDelegate { +class BottomSheetTableSizeGridFragment : BottomSheetFragment(), 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) diff --git a/app/src/main/res/drawable/ic_outline_remove.xml b/app/src/main/res/drawable/ic_outline_remove.xml new file mode 100644 index 00000000..4f022563 --- /dev/null +++ b/app/src/main/res/drawable/ic_outline_remove.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/menu/bottom_sheet_menu.xml b/app/src/main/res/menu/bottom_sheet_menu.xml index b5839213..b9453f94 100644 --- a/app/src/main/res/menu/bottom_sheet_menu.xml +++ b/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" />