fix date and time selection on api 21

Author: Razeeman

feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/dateTime/DateDialogFragment.kt

@@ -49,6 +49,10 @@ class DateDialogFragment : Fragment() {
         }
     }
 
+    fun getSelectedDate(): Triple<Int, Int, Int> {
+        return Triple(datePicker.year, datePicker.month, datePicker.dayOfMonth)
+    }
+
     companion object {
         private const val ARGS_TIMESTAMP = "args_timestamp"
 

feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/dateTime/DateTimeDialogFragment.kt

@@ -23,6 +23,8 @@ class DateTimeDialogFragment : AppCompatDialogFragment(),
     DateDialogFragment.OnDateSetListener,
     TimeDialogFragment.OnTimeSetListener {
 
+    private var timeDialogFragment: TimeDialogFragment? = null
+    private var dateDialogFragment: DateDialogFragment? = null
     private var dateTimeDialogListeners: MutableList<DateTimeDialogListener> = mutableListOf()
     private val dialogTag: String? by lazy {
         arguments?.getString(ARGS_TAG)
@@ -68,6 +70,12 @@ class DateTimeDialogFragment : AppCompatDialogFragment(),
         initTabs()
 
         btnDateTimeDialogPositive.setOnClickListener {
+            timeDialogFragment?.getSelectedTime()?.let { (hour, minute) ->
+                onTimeSet(hour, minute)
+            }
+            dateDialogFragment?.getSelectedDate()?.let { (year, month, day) ->
+                onDateSet(year, month, day)
+            }
             dateTimeDialogListeners.forEach { it.onDateTimeSet(newTimestamp, dialogTag) }
             dismiss()
         }
@@ -98,6 +106,7 @@ class DateTimeDialogFragment : AppCompatDialogFragment(),
                 R.id.datePickerContainer,
                 DateDialogFragment.newInstance(timestamp)
                     .apply { listener = this@DateTimeDialogFragment }
+                    .also { dateDialogFragment = it }
             )
         }
 
@@ -107,6 +116,7 @@ class DateTimeDialogFragment : AppCompatDialogFragment(),
                     R.id.timePickerContainer,
                     TimeDialogFragment.newInstance(timestamp)
                         .apply { listener = this@DateTimeDialogFragment }
+                        .also { timeDialogFragment = it }
                 )
             }
         }

feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/dateTime/TimeDialogFragment.kt

@@ -50,6 +50,10 @@ class TimeDialogFragment : Fragment() {
         }
     }
 
+    fun getSelectedTime(): Pair<Int, Int> {
+        return timePicker.currentHour to timePicker.currentMinute
+    }
+
     companion object {
         private const val ARGS_TIMESTAMP = "args_timestamp"