The datepicker shows the last selected date

m-i-n-a-r · Oct 3, 2020 · 8895561 · 8895561
1 parent 1fce4e5
commit 8895561
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/app/src/main/java/com/minar/birday/activities/MainActivity.kt b/app/src/main/java/com/minar/birday/activities/MainActivity.kt
@@ -157,8 +157,12 @@ class MainActivity : AppCompatActivity() {
             val eventDate = customView.findViewById<TextView>(R.id.dateEvent)
             val countYear = customView.findViewById<CheckBox>(R.id.countYearCheckbox)
             val endDate = Calendar.getInstance()
+            val formatter: DateTimeFormatter = DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM)
             var dateDialog: MaterialDialog? = null
 
+            // To automatically show the last selected date, parse it to another Calendar object
+            val lastDate = Calendar.getInstance()
+
             // Update the boolean value on each click
             countYear.setOnCheckedChangeListener { _, isChecked ->
                 countYearValue = isChecked
@@ -170,14 +174,14 @@ class MainActivity : AppCompatActivity() {
                     dateDialog = MaterialDialog(this).show {
                         cancelable(false)
                         cancelOnTouchOutside(false)
-                        datePicker(maxDate = endDate) { _, date ->
+                        datePicker(maxDate = endDate, currentDate = lastDate) { _, date ->
                             val year = date.get(Calendar.YEAR)
                             val month = date.get(Calendar.MONTH) + 1
                             val day = date.get(Calendar.DAY_OF_MONTH)
                             eventDateValue = LocalDate.of(year, month, day)
-                            val formatter: DateTimeFormatter =
-                                DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM)
                             eventDate.text = eventDateValue.format(formatter)
+                            // If ok is pressed, the last selected date is saved if the dialog is reopened
+                            lastDate.set(year, month - 1, day)
                         }
                     }
                     Handler(Looper.getMainLooper()).postDelayed({ dateDialog = null }, 750)

diff --git a/app/src/main/java/com/minar/birday/adapters/EventAdapter.kt b/app/src/main/java/com/minar/birday/adapters/EventAdapter.kt
@@ -12,7 +12,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.minar.birday.fragments.HomeFragment
 import com.minar.birday.R
 import com.minar.birday.model.EventResult
-import com.minar.birday.utilities.OnItemClickListener
+import com.minar.birday.listeners.OnItemClickListener
 import kotlinx.android.synthetic.main.event_row.view.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers

diff --git a/app/src/main/java/com/minar/birday/fragments/HomeFragment.kt b/app/src/main/java/com/minar/birday/fragments/HomeFragment.kt
@@ -41,6 +41,7 @@ import com.minar.birday.R
 import com.minar.birday.activities.MainActivity
 import com.minar.birday.activities.SplashActivity
 import com.minar.birday.adapters.EventAdapter
+import com.minar.birday.listeners.OnItemClickListener
 import com.minar.birday.model.Event
 import com.minar.birday.model.EventResult
 import com.minar.birday.utilities.*
@@ -447,17 +448,18 @@ class HomeFragment : Fragment() {
         val endDate = Calendar.getInstance()
         var dateDialog: MaterialDialog? = null
 
+        // To automatically show the last selected date, parse it to another Calendar object
+        val lastDate = Calendar.getInstance()
+        lastDate.set(eventDateValue.year, eventDateValue.monthValue - 1, eventDateValue.dayOfMonth)
+
         // Update the boolean value on each click
         countYear.setOnCheckedChangeListener { _, isChecked ->
             countYearValue = isChecked
         }
 
         eventDate.setOnClickListener {
             // Prevent double dialogs on fast click
-            if(dateDialog == null) {
-                // To automatically show the last selected date, parse it to another Calendar object
-                val lastDate = Calendar.getInstance()
-                lastDate.set(eventDateValue.year, eventDateValue.monthValue - 1, eventDateValue.dayOfMonth)
+            if (dateDialog == null) {
                 dateDialog = MaterialDialog(act).show {
                     cancelable(false)
                     cancelOnTouchOutside(false)
@@ -467,6 +469,8 @@ class HomeFragment : Fragment() {
                         val day = date.get(Calendar.DAY_OF_MONTH)
                         eventDateValue = LocalDate.of(year, month, day)
                         eventDate.text = eventDateValue.format(formatter)
+                        // If ok is pressed, the last selected date is saved if the dialog is reopened
+                        lastDate.set(year, month - 1, day)
                     }
                 }
                 Handler(Looper.getMainLooper()).postDelayed({ dateDialog = null }, 750)

diff --git a/...r/birday/utilities/OnItemClickListener.kt → ...r/birday/listeners/OnItemClickListener.kt b/...r/birday/utilities/OnItemClickListener.kt → ...r/birday/listeners/OnItemClickListener.kt
@@ -1,4 +1,4 @@
-package com.minar.birday.utilities
+package com.minar.birday.listeners
 
 import android.view.View