refactor: Rename dateAndTimeScheduleDialog related stuff

Infomaniak · Jan 30, 2025 · 5e24d75 · 5e24d75
1 parent f550fe9
commit 5e24d75
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 35 deletions.
diff --git a/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt
@@ -237,12 +237,10 @@ class MainViewModel @Inject constructor(
     val mergedContactsLive: LiveData<MergedContactDictionary> = avatarMergedContactData.mergedContactLiveData
     //endregion
 
-    //region Schedule draft
+    //region Scheduled Draft
     var draftResource: String? = null
-
-    val showOrCloseSelectDateAndTimeForScheduleDialog = SingleLiveEvent<Unit>()
-
-    fun showSelectDateAndTimeForScheduleDialog() = showOrCloseSelectDateAndTimeForScheduleDialog.postValue(Unit)
+    val dateAndTimeScheduledDialogTrigger = SingleLiveEvent<Unit>()
+    fun showDateAndTimeScheduleDialog() = dateAndTimeScheduledDialogTrigger.postValue(Unit)
     //endregion
 
     //region Share Thread URL
@@ -638,7 +636,7 @@ class MainViewModel @Inject constructor(
     }
     //endregion
 
-    //region Schedule draft
+    //region Scheduled Draft
     private fun getScheduleDraft(draftResource: String, onSuccess: () -> Unit) = viewModelScope.launch(ioCoroutineContext) {
         val apiResponse = ApiRepository.getDraft(draftResource)
 

diff --git a/app/src/main/java/com/infomaniak/mail/ui/bottomSheetDialogs/ScheduleSendBottomSheetDialog.kt b/app/src/main/java/com/infomaniak/mail/ui/bottomSheetDialogs/ScheduleSendBottomSheetDialog.kt
@@ -103,9 +103,9 @@ class ScheduleSendBottomSheetDialog @Inject constructor() : ActionsBottomSheetDi
         } else {
             customScheduleItem.setClosingOnClickListener {
                 if (navigationArgs.isAlreadyScheduled) {
-                    mainViewModel.showSelectDateAndTimeForScheduleDialog()
+                    mainViewModel.showDateAndTimeScheduleDialog()
                 } else {
-                    newMessageViewModel.showSelectDateAndTimeForScheduleDialog()
+                    newMessageViewModel.showDateAndTimeScheduleDialog()
                 }
             }
         }

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
@@ -125,7 +125,7 @@ class ThreadFragment : Fragment() {
     lateinit var snackbarManager: SnackbarManager
 
     @Inject
-    lateinit var selectDateAndTimeForScheduledDraftDialog: SelectDateAndTimeForScheduledDraftDialog
+    lateinit var dateAndTimeScheduleDialog: SelectDateAndTimeForScheduledDraftDialog
 
     @Inject
     lateinit var confirmScheduledDraftModificationDialog: ConfirmScheduledDraftModificationDialog
@@ -169,7 +169,7 @@ class ThreadFragment : Fragment() {
 
         observeMessageOfUserToBlock()
 
-        observeSelectDateAndTimeForScheduleDialogState()
+        observeDateAndTimeScheduleDialogState()
     }
 
     private fun observeReportDisplayProblemResult() {
@@ -188,12 +188,12 @@ class ThreadFragment : Fragment() {
         }
     }
 
-    private fun observeSelectDateAndTimeForScheduleDialogState() {
-        mainViewModel.showOrCloseSelectDateAndTimeForScheduleDialog.observe(viewLifecycleOwner) {
-            selectDateAndTimeForScheduledDraftDialog.show(
+    private fun observeDateAndTimeScheduleDialogState() {
+        mainViewModel.dateAndTimeScheduledDialogTrigger.observe(viewLifecycleOwner) {
+            dateAndTimeScheduleDialog.show(
                 title = getString(R.string.datePickerTitle),
                 onPositiveButtonClicked = {
-                    val scheduleDate = selectDateAndTimeForScheduledDraftDialog.selectedDate.time
+                    val scheduleDate = dateAndTimeScheduleDialog.selectedDate.time
                     localSettings.lastSelectedScheduleDate = scheduleDate
 
                     mainViewModel.draftResource?.let { draftResource ->

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
@@ -151,7 +151,7 @@ class NewMessageFragment : Fragment() {
     lateinit var snackbarManager: SnackbarManager
 
     @Inject
-    lateinit var selectDateAndTimeForScheduledDraftDialog: SelectDateAndTimeForScheduledDraftDialog
+    lateinit var dateAndTimeScheduleDialog: SelectDateAndTimeForScheduledDraftDialog
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         return FragmentNewMessageBinding.inflate(inflater, container, false).also { _binding = it }.root
@@ -218,23 +218,17 @@ class NewMessageFragment : Fragment() {
     }
 
     private fun observeSelectDateAndTimeForScheduleDialogState() {
-        newMessageViewModel.showOrCloseSelectDateAndTimeForScheduleDialog.observe(viewLifecycleOwner) { showDialog ->
-            if (showDialog) {
-                selectDateAndTimeForScheduledDraftDialog.show(
-                    title = getString(R.string.datePickerTitle),
-                    onPositiveButtonClicked = {
-                        val scheduleDate = selectDateAndTimeForScheduledDraftDialog.selectedDate.time
-                        localSettings.lastSelectedScheduleDate = scheduleDate
-
-                        newMessageViewModel.setScheduleDate(Date(scheduleDate))
-
-                        tryToSendEmail(scheduled = true)
-                    },
-                    onNegativeButtonClicked = { safeNavigate(resId = R.id.scheduleSendBottomSheetDialog) },
-                )
-            } else {
-                selectDateAndTimeForScheduledDraftDialog.resetLoadingAndDismiss()
-            }
+        newMessageViewModel.dateAndTimeScheduledDialogTrigger.observe(viewLifecycleOwner) {
+            dateAndTimeScheduleDialog.show(
+                title = getString(R.string.datePickerTitle),
+                onPositiveButtonClicked = {
+                    val scheduleDate = dateAndTimeScheduleDialog.selectedDate.time
+                    localSettings.lastSelectedScheduleDate = scheduleDate
+                    newMessageViewModel.setScheduleDate(Date(scheduleDate))
+                    tryToSendEmail(scheduled = true)
+                },
+                onNegativeButtonClicked = { safeNavigate(resId = R.id.scheduleSendBottomSheetDialog) },
+            )
         }
     }
 

diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageViewModel.kt
@@ -123,9 +123,10 @@ class NewMessageViewModel @Inject constructor(
 
     val editorBodyInitializer = SingleLiveEvent<BodyContentPayload>()
 
-    val showOrCloseSelectDateAndTimeForScheduleDialog = SingleLiveEvent<Boolean>()
-
-    fun showSelectDateAndTimeForScheduleDialog() = showOrCloseSelectDateAndTimeForScheduleDialog.postValue(true)
+    //region Scheduled Draft
+    val dateAndTimeScheduledDialogTrigger = SingleLiveEvent<Unit>()
+    fun showDateAndTimeScheduleDialog() = dateAndTimeScheduledDialogTrigger.postValue(Unit)
+    //endregion
 
     // 1. Navigating to AiPropositionFragment causes NewMessageFragment to export its body to `subjectAndBodyChannel`.
     // 2. Inserting the AI proposition navigates back to NewMessageFragment.