From c54412cbc82f13aa53142aeb939eebf0bb4dcb1e Mon Sep 17 00:00:00 2001 From: Aurelien Hubert Date: Tue, 19 Feb 2019 15:32:41 +0100 Subject: [PATCH] Update DateTimePicker --- .../android/ui/fragment/NewSessionFragment.kt | 2 ++ .../ui/fragment/components/DateTimePickerManager.kt | 11 ++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/NewSessionFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/NewSessionFragment.kt index 0ed7dbbb..9dd1b99e 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/NewSessionFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/NewSessionFragment.kt @@ -68,6 +68,8 @@ class NewSessionFragment : PokerAnalyticsFragment(), DynamicRowCallback, BottomS currentSession.cgBigBlind = null } SessionRow.COMMENT -> currentSession.comment = "" + SessionRow.START_DATE -> currentSession.timeFrame?.setDate(Date(), null) + SessionRow.END_DATE -> currentSession.timeFrame?.setDate(Date(), null) } sessionAdapter.notifyItemChanged(SessionRow.values().indexOf(row)) } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/DateTimePickerManager.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/DateTimePickerManager.kt index b4c7326c..2f6e9a91 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/DateTimePickerManager.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/DateTimePickerManager.kt @@ -3,9 +3,11 @@ package net.pokeranalytics.android.ui.fragment.components import android.app.DatePickerDialog import android.app.TimePickerDialog import android.content.Context +import android.content.DialogInterface import android.text.format.DateFormat import android.widget.DatePicker import android.widget.TimePicker +import net.pokeranalytics.android.R import net.pokeranalytics.android.ui.adapter.components.DynamicRowInterface import java.util.* @@ -41,7 +43,6 @@ class DateTimePickerManager : DatePickerDialog.OnDateSetListener, } } - override fun onDateSet(view: DatePicker?, year: Int, month: Int, dayOfMonth: Int) { calendar.set(Calendar.YEAR, year) calendar.set(Calendar.MONTH, month) @@ -64,6 +65,10 @@ class DateTimePickerManager : DatePickerDialog.OnDateSetListener, val day = calendar.get(Calendar.DAY_OF_MONTH) context?.let { val datePickerDialog = DatePickerDialog(it, this, year, month, day) + datePickerDialog.setButton(DialogInterface.BUTTON_NEGATIVE, it.getString(R.string.clear)) { dialog, _ -> + bottomSheetDelegate.clickOnClear(row) + dialog.dismiss() + } datePickerDialog.show() } } @@ -76,6 +81,10 @@ class DateTimePickerManager : DatePickerDialog.OnDateSetListener, val minute = calendar.get(Calendar.MINUTE) context?.let { val timePickerDialog = TimePickerDialog(context, this, hour, minute, DateFormat.is24HourFormat(context)) + timePickerDialog.setButton(DialogInterface.BUTTON_NEGATIVE, it.getString(R.string.clear)) { dialog, _ -> + bottomSheetDelegate.clickOnClear(row) + dialog.dismiss() + } timePickerDialog.show() } }