Skip to content

Commit 71ec610

Browse files
committed
refactor: Remove unused values in SelectDateAndTimeForScheduledDraftDialog
Simplify some of the logic by removing unnecessary logic
1 parent 559956e commit 71ec610

File tree

4 files changed

+10
-25
lines changed

4 files changed

+10
-25
lines changed

app/src/main/java/com/infomaniak/mail/ui/alertDialogs/SelectDateAndTimeForScheduledDraftDialog.kt

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,13 @@ package com.infomaniak.mail.ui.alertDialogs
1919

2020
import android.content.Context
2121
import android.text.format.DateFormat
22-
import androidx.annotation.StringRes
2322
import androidx.core.view.isVisible
2423
import com.google.android.material.datepicker.*
2524
import com.google.android.material.dialog.MaterialAlertDialogBuilder
2625
import com.google.android.material.timepicker.MaterialTimePicker
2726
import com.google.android.material.timepicker.TimeFormat
2827
import com.infomaniak.lib.core.utils.*
2928
import com.infomaniak.mail.R
30-
import com.infomaniak.mail.data.LocalSettings
3129
import com.infomaniak.mail.databinding.DialogSelectDateAndTimeForScheduledDraftBinding
3230
import dagger.hilt.android.qualifiers.ActivityContext
3331
import dagger.hilt.android.scopes.ActivityScoped
@@ -53,9 +51,6 @@ open class SelectDateAndTimeForScheduledDraftDialog @Inject constructor(
5351

5452
private lateinit var selectedDate: Date
5553

56-
@Inject
57-
lateinit var localSettings: LocalSettings
58-
5954
private fun initDialog() = with(binding) {
6055
MaterialAlertDialogBuilder(context)
6156
.setView(root)
@@ -69,11 +64,18 @@ open class SelectDateAndTimeForScheduledDraftDialog @Inject constructor(
6964
onAbort = null
7065
}
7166

72-
fun show(title: String, onSchedule: (Long) -> Unit, onAbort: (() -> Unit)? = null) {
73-
showDialogWithBasicInfo(title, R.string.buttonScheduleTitle)
67+
fun show(onSchedule: (Long) -> Unit, onAbort: (() -> Unit)? = null) {
68+
showDialogWithBasicInfo()
7469
setupListeners(onSchedule, onAbort)
7570
}
7671

72+
private fun showDialogWithBasicInfo() {
73+
alertDialog.show()
74+
75+
selectDate(Date().roundUpToNextTenMinutes())
76+
positiveButton.setText(R.string.buttonScheduleTitle)
77+
}
78+
7779
private fun setupListeners(onSchedule: (Long) -> Unit, onAbort: (() -> Unit)?) = with(alertDialog) {
7880

7981
binding.dateField.setOnClickListener {
@@ -169,21 +171,6 @@ open class SelectDateAndTimeForScheduledDraftDialog @Inject constructor(
169171
datePicker.show(super.activity.supportFragmentManager, null)
170172
}
171173

172-
private fun showDialogWithBasicInfo(
173-
title: String? = null,
174-
@StringRes positiveButtonText: Int? = null,
175-
@StringRes negativeButtonText: Int? = null,
176-
) {
177-
alertDialog.show()
178-
179-
selectDate(Date().roundUpToNextTenMinutes())
180-
181-
title?.let(binding.dialogTitle::setText)
182-
183-
positiveButtonText?.let(positiveButton::setText)
184-
negativeButtonText?.let(negativeButton::setText)
185-
}
186-
187174
companion object {
188175
const val MIN_SCHEDULE_DELAY_MINUTES = 5
189176
const val MAX_SCHEDULE_DELAY_YEARS = 10

app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,6 @@ class ThreadFragment : Fragment() {
539539

540540
getBackNavigationResult(OPEN_DATE_AND_TIME_SCHEDULE_DIALOG) { _: Boolean ->
541541
dateAndTimeScheduleDialog.show(
542-
title = getString(R.string.datePickerTitle),
543542
onSchedule = { timestamp ->
544543
localSettings.lastSelectedScheduleEpoch = timestamp
545544
mainViewModel.rescheduleDraft(Date(timestamp))

app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,6 @@ class NewMessageFragment : Fragment() {
224224

225225
getBackNavigationResult(OPEN_DATE_AND_TIME_SCHEDULE_DIALOG) { _: Boolean ->
226226
dateAndTimeScheduleDialog.show(
227-
title = getString(R.string.datePickerTitle),
228227
onSchedule = { timestamp ->
229228
localSettings.lastSelectedScheduleEpoch = timestamp
230229
scheduleDraft(timestamp)

app/src/main/res/layout/dialog_select_date_and_time_for_scheduled_draft.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
android:layout_width="match_parent"
3131
android:layout_height="wrap_content"
3232
android:layout_marginTop="@dimen/marginStandard"
33-
tools:text="@string/datePickerTitle" />
33+
android:text="@string/datePickerTitle" />
3434

3535
<LinearLayout
3636
android:layout_width="match_parent"

0 commit comments

Comments
 (0)