refactor: Remove unused values in SelectDateAndTimeForScheduledDraftD…

…ialog Simplify some of the logic by removing unnecessary logic
Infomaniak · Feb 18, 2025 · 71ec610 · 71ec610
1 parent 559956e
commit 71ec610
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 25 deletions.
diff --git a/...main/java/com/infomaniak/mail/ui/alertDialogs/SelectDateAndTimeForScheduledDraftDialog.kt b/...main/java/com/infomaniak/mail/ui/alertDialogs/SelectDateAndTimeForScheduledDraftDialog.kt
@@ -19,15 +19,13 @@ package com.infomaniak.mail.ui.alertDialogs
 
 import android.content.Context
 import android.text.format.DateFormat
-import androidx.annotation.StringRes
 import androidx.core.view.isVisible
 import com.google.android.material.datepicker.*
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.timepicker.MaterialTimePicker
 import com.google.android.material.timepicker.TimeFormat
 import com.infomaniak.lib.core.utils.*
 import com.infomaniak.mail.R
-import com.infomaniak.mail.data.LocalSettings
 import com.infomaniak.mail.databinding.DialogSelectDateAndTimeForScheduledDraftBinding
 import dagger.hilt.android.qualifiers.ActivityContext
 import dagger.hilt.android.scopes.ActivityScoped
@@ -53,9 +51,6 @@ open class SelectDateAndTimeForScheduledDraftDialog @Inject constructor(
 
     private lateinit var selectedDate: Date
 
-    @Inject
-    lateinit var localSettings: LocalSettings
-
     private fun initDialog() = with(binding) {
         MaterialAlertDialogBuilder(context)
             .setView(root)
@@ -69,11 +64,18 @@ open class SelectDateAndTimeForScheduledDraftDialog @Inject constructor(
         onAbort = null
     }
 
-    fun show(title: String, onSchedule: (Long) -> Unit, onAbort: (() -> Unit)? = null) {
-        showDialogWithBasicInfo(title, R.string.buttonScheduleTitle)
+    fun show(onSchedule: (Long) -> Unit, onAbort: (() -> Unit)? = null) {
+        showDialogWithBasicInfo()
         setupListeners(onSchedule, onAbort)
     }
 
+    private fun showDialogWithBasicInfo() {
+        alertDialog.show()
+
+        selectDate(Date().roundUpToNextTenMinutes())
+        positiveButton.setText(R.string.buttonScheduleTitle)
+    }
+
     private fun setupListeners(onSchedule: (Long) -> Unit, onAbort: (() -> Unit)?) = with(alertDialog) {
 
         binding.dateField.setOnClickListener {
@@ -169,21 +171,6 @@ open class SelectDateAndTimeForScheduledDraftDialog @Inject constructor(
         datePicker.show(super.activity.supportFragmentManager, null)
     }
 
-    private fun showDialogWithBasicInfo(
-        title: String? = null,
-        @StringRes positiveButtonText: Int? = null,
-        @StringRes negativeButtonText: Int? = null,
-    ) {
-        alertDialog.show()
-
-        selectDate(Date().roundUpToNextTenMinutes())
-
-        title?.let(binding.dialogTitle::setText)
-
-        positiveButtonText?.let(positiveButton::setText)
-        negativeButtonText?.let(negativeButton::setText)
-    }
-
     companion object {
         const val MIN_SCHEDULE_DELAY_MINUTES = 5
         const val MAX_SCHEDULE_DELAY_YEARS = 10

diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt
@@ -539,7 +539,6 @@ class ThreadFragment : Fragment() {
 
         getBackNavigationResult(OPEN_DATE_AND_TIME_SCHEDULE_DIALOG) { _: Boolean ->
             dateAndTimeScheduleDialog.show(
-                title = getString(R.string.datePickerTitle),
                 onSchedule = { timestamp ->
                     localSettings.lastSelectedScheduleEpoch = timestamp
                     mainViewModel.rescheduleDraft(Date(timestamp))

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -224,7 +224,6 @@ class NewMessageFragment : Fragment() {
 
         getBackNavigationResult(OPEN_DATE_AND_TIME_SCHEDULE_DIALOG) { _: Boolean ->
             dateAndTimeScheduleDialog.show(
-                title = getString(R.string.datePickerTitle),
                 onSchedule = { timestamp ->
                     localSettings.lastSelectedScheduleEpoch = timestamp
                     scheduleDraft(timestamp)

diff --git a/app/src/main/res/layout/dialog_select_date_and_time_for_scheduled_draft.xml b/app/src/main/res/layout/dialog_select_date_and_time_for_scheduled_draft.xml
@@ -30,7 +30,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/marginStandard"
-        tools:text="@string/datePickerTitle" />
+        android:text="@string/datePickerTitle" />
 
     <LinearLayout
         android:layout_width="match_parent"