feat: pre-select the date for date pickers

BatLeDev · Jun 8, 2024 · c10a955 · c10a955
1 parent 08aef13
commit c10a955
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/app/src/main/java/com/batledev/bluetask/CreateTaskActivity.kt b/app/src/main/java/com/batledev/bluetask/CreateTaskActivity.kt
@@ -75,12 +75,12 @@ class CreateTaskActivity : AppCompatActivity() {
             }
         }
         buttonStartDatePicker.setOnClickListener {
-            TaskUtils.showStartDatePicker(this, buttonStartDatePicker, endDate) { date ->
+            TaskUtils.showStartDatePicker(this, buttonStartDatePicker, startDate, endDate) { date ->
                 startDate = date
             }
         }
         buttonEndDatePicker.setOnClickListener {
-            TaskUtils.showEndDatePicker(this, buttonEndDatePicker, startDate) { date ->
+            TaskUtils.showEndDatePicker(this, buttonEndDatePicker, endDate, startDate) { date ->
                 endDate = date
             }
         }

diff --git a/app/src/main/java/com/batledev/bluetask/TaskUtils.kt b/app/src/main/java/com/batledev/bluetask/TaskUtils.kt
@@ -120,8 +120,9 @@ object TaskUtils {
      * @param endDate The end date of the task.
      * @param onDateSet The function to call when a date is selected.
      */
-    fun showStartDatePicker(context: Context, button: Button, endDate: Date?, onDateSet: (Date) -> Unit) {
+    fun showStartDatePicker(context: Context, button: Button, initialDate: Date?, endDate: Date?, onDateSet: (Date) -> Unit) {
         val calendar = Calendar.getInstance()
+        initialDate?.let { calendar.time = it }
         val datePickerDialog = DatePickerDialog(
             context,
             { _, year, monthOfYear, dayOfMonth ->
@@ -147,8 +148,9 @@ object TaskUtils {
      * @param startDate The start date of the task.
      * @param onDateSet The function to call when a date is selected.
      */
-    fun showEndDatePicker(context: Context, button: Button, startDate: Date?, onDateSet: (Date) -> Unit) {
+    fun showEndDatePicker(context: Context, button: Button, initialDate: Date?, startDate: Date?, onDateSet: (Date) -> Unit) {
         val calendar = Calendar.getInstance()
+        initialDate?.let { calendar.time = it }
         val datePickerDialog = DatePickerDialog(
             context,
             { _, year, monthOfYear, dayOfMonth ->

diff --git a/app/src/main/java/com/batledev/bluetask/UpdateTaskActivity.kt b/app/src/main/java/com/batledev/bluetask/UpdateTaskActivity.kt
@@ -86,12 +86,12 @@ class UpdateTaskActivity : AppCompatActivity() {
             }
         }
         buttonStartDatePicker.setOnClickListener {
-            TaskUtils.showStartDatePicker(this, buttonStartDatePicker, endDate) { date ->
+            TaskUtils.showStartDatePicker(this, buttonStartDatePicker, startDate, endDate) { date ->
                 startDate = date
             }
         }
         buttonEndDatePicker.setOnClickListener {
-            TaskUtils.showEndDatePicker(this, buttonEndDatePicker, startDate) { date ->
+            TaskUtils.showEndDatePicker(this, buttonEndDatePicker, endDate, startDate) { date ->
                 endDate = date
             }
         }