diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt index 9e41130e..ae952946 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt @@ -139,9 +139,9 @@ open class Session : RealmObject(), SessionInterface, DynamicRowDelegate, Displa override fun stringForRow(row: DynamicRowInterface): String { return when (row) { - SessionRow.BLINDS -> "Blinds" - SessionRow.GAME -> "Game" - SessionRow.DATE -> "Date" + SessionRow.BLINDS -> if (cgSmallBlind != null && cgBigBlind != null) "$cgSmallBlind / $cgBigBlind" else "--" + SessionRow.GAME -> game?.title ?: "--" + SessionRow.DATE -> if (timeFrame != null) timeFrame?.startDate.toString() else "--" else -> "--" } } @@ -155,15 +155,15 @@ open class Session : RealmObject(), SessionInterface, DynamicRowDelegate, Displa // Todo: Localize & set real data when (row) { SessionRow.GAME -> { - data.add(BottomSheetData("Game", game, "", 0, arrayListOf(Game(), Game(), Game()))) + data.add(BottomSheetData(game, "", 0, arrayListOf(Game(), Game(), Game()))) } SessionRow.DATE -> { - data.add(BottomSheetData("Date", timeFrame?.startDate, "Start date")) - data.add(BottomSheetData("Date", timeFrame?.endDate, "End date")) + data.add(BottomSheetData(timeFrame?.startDate, "Start date")) + data.add(BottomSheetData(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)) + data.add(BottomSheetData(cgSmallBlind, "Small blind", InputType.TYPE_CLASS_NUMBER)) + data.add(BottomSheetData(cgBigBlind, "Big blind", InputType.TYPE_CLASS_NUMBER)) } } 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 1c3f1aa1..1dc41ce1 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 @@ -36,9 +36,9 @@ class SectionRow(stringRes: Int) : DynamicRowInterface { } enum class SessionRow(val resId: Int) : DynamicRowInterface { - BLINDS(R.string.app_name), - GAME(R.string.title_history), - DATE(R.string.title_settings); + BLINDS(R.string.blinds), + GAME(R.string.game), + DATE(R.string.date); override fun localizedTitle(context: Context): String { return context.getString(this.resId) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetData.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetData.kt index e73fccc8..a55494f0 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetData.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetData.kt @@ -4,7 +4,6 @@ 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, diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetDoubleEditTextFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetDoubleEditTextFragment.kt index bba204c5..c2af5fa6 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetDoubleEditTextFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetDoubleEditTextFragment.kt @@ -45,7 +45,6 @@ class BottomSheetDoubleEditTextFragment : BottomSheetFragment() { 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 diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetFragment.kt index 57d85fb2..b1b974dc 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/BottomSheetFragment.kt @@ -99,27 +99,30 @@ open class BottomSheetFragment : BottomSheetDialogFragment(), BottomSheetInterfa * Init UI */ private fun initUI() { + row.let { bottomSheetToolbar.title = row.localizedTitle(requireContext()) bottomSheetToolbar.inflateMenu(net.pokeranalytics.android.R.menu.bottom_sheet_menu) bottomSheetToolbar.setOnMenuItemClickListener { false } - } - // Menu - bottomSheetToolbar.menu.findItem(R.id.actionClear).setOnMenuItemClickListener { - clickOnClear() - true - } - bottomSheetToolbar.menu.findItem(R.id.actionAdd).setOnMenuItemClickListener { - clickOnAdd() - true - } - bottomSheetToolbar.menu.findItem(R.id.actionCheck).setOnMenuItemClickListener { - clickOnCheck() - true + // Menu + bottomSheetToolbar.menu.findItem(R.id.actionClear).setOnMenuItemClickListener { + clickOnClear() + true + } + bottomSheetToolbar.menu.findItem(R.id.actionAdd).setOnMenuItemClickListener { + clickOnAdd() + true + } + bottomSheetToolbar.menu.findItem(R.id.actionCheck).setOnMenuItemClickListener { + clickOnCheck() + true + } + } + } /** diff --git a/app/src/main/res/layout/bottom_sheet_double_edit_text.xml b/app/src/main/res/layout/bottom_sheet_double_edit_text.xml index e5a70e50..21005821 100644 --- a/app/src/main/res/layout/bottom_sheet_double_edit_text.xml +++ b/app/src/main/res/layout/bottom_sheet_double_edit_text.xml @@ -7,53 +7,41 @@ android:orientation="vertical" tools:background="@color/gray_darker"> - - - - + app:layout_constraintHorizontal_bias="0.5" + app:layout_constraintHorizontal_chainStyle="packed" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:text="10" /> + app:layout_constraintHorizontal_bias="0.5" + app:layout_constraintStart_toEndOf="@+id/editText1" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.0" + tools:text="20" /> \ No newline at end of file diff --git a/app/src/main/res/layout/bottom_sheet_edit_text.xml b/app/src/main/res/layout/bottom_sheet_edit_text.xml index a84fbe9e..108f9885 100644 --- a/app/src/main/res/layout/bottom_sheet_edit_text.xml +++ b/app/src/main/res/layout/bottom_sheet_edit_text.xml @@ -15,13 +15,13 @@ 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" /> + app:layout_constraintTop_toTopOf="parent" + tools:text="Blinds" /> + app:layout_constraintTop_toTopOf="parent" + tools:hint="Test" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_bottom_sheet.xml b/app/src/main/res/layout/fragment_bottom_sheet.xml index 5db274df..73b79a38 100644 --- a/app/src/main/res/layout/fragment_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_bottom_sheet.xml @@ -4,11 +4,12 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="#222222"> + android:background="@color/gray_dark"> \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 81e23bbd..388b4188 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -6,6 +6,7 @@ #000000 #FFFFFF + #30FFFFFF #6AFFFFFF #141414 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ba4cfea3..5ddb57d2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -6,7 +6,9 @@ Settings Bankroll + Blinds Game + Date Location Session Tournament Type @@ -16,5 +18,8 @@ Live Currency + Clear + Add + Done diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 94ee8611..e5a1711d 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -11,6 +11,7 @@ @style/PokerAnalyticsTheme.BottomNavigationView @style/PokerAnalyticsTheme.Toolbar + @style/PokerAnalyticsTheme.EditText @style/PokerAnalyticsTheme.TextView @@ -54,26 +55,35 @@ @font/roboto - - - + + +