Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Make Schedule choice bottom sheet generic to be shared with snooze #2194

Merged
merged 3 commits into from
Feb 21, 2025
Merged

feat: Make Schedule choice bottom sheet generic to be shared with snooze #2194

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9cd9af2
feat: Make Schedule choice bottom sheet generic to be shared with snooze
LunarX Feb 20, 2025
3780a50
feat: Make the schedule option bottom sheet title customizable
LunarX Feb 21, 2025
d4be4d9
chore: Remove wrong copyright date of new file
LunarX Feb 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
179 changes: 20 additions & 159 deletions app/src/main/java/com/infomaniak/mail/ui/bottomSheetDialogs/ScheduleSendBottomSheetDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,102 +17,46 @@
*/
package com.infomaniak.mail.ui.bottomSheetDialogs

import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.annotation.DrawableRes
import androidx.annotation.StringRes
import androidx.core.view.children
import androidx.core.view.isVisible
import androidx.navigation.fragment.navArgs
import com.google.android.material.bottomsheet.BottomSheetDialogFragment
import com.infomaniak.core.utils.*
import com.infomaniak.lib.core.utils.context
import com.infomaniak.lib.core.utils.safeBinding
import com.infomaniak.lib.core.utils.safeNavigate
import com.infomaniak.lib.core.utils.setBackNavigationResult
import com.infomaniak.mail.MatomoMail.trackScheduleSendEvent
import com.infomaniak.mail.R
import com.infomaniak.mail.databinding.BottomSheetScheduleSendBinding
import com.infomaniak.mail.ui.alertDialogs.SelectDateAndTimeDialog.Companion.MIN_SELECTABLE_DATE_MINUTES
import com.infomaniak.mail.ui.main.thread.actions.ActionItemView
import com.infomaniak.mail.utils.date.DateFormatUtils.dayOfWeekDateWithoutYear
import dagger.hilt.android.AndroidEntryPoint
import java.util.Date
import javax.inject.Inject


@AndroidEntryPoint
class ScheduleSendBottomSheetDialog @Inject constructor() : BottomSheetDialogFragment() {
class ScheduleSendBottomSheetDialog @Inject constructor() : SelectScheduleOptionBottomSheet() {

private val navigationArgs: ScheduleSendBottomSheetDialogArgs by navArgs()
private var binding: BottomSheetScheduleSendBinding by safeBinding()

private var lastSelectedScheduleEpoch: Long? = null
// Navigation args does not support nullable primitive types, so we use 0L
// as a replacement (corresponding to Thursday 1 January 1970 00:00:00 UT).
override val lastSelectedEpoch: Long? by lazy { navigationArgs.lastSelectedScheduleEpoch.takeIf { it != 0L } }

override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
return BottomSheetScheduleSendBinding.inflate(inflater, container, false).also { binding = it }.root
}

override fun onViewCreated(view: View, savedInstanceState: Bundle?): Unit = with(binding) {
super.onViewCreated(view, savedInstanceState)

// Navigation args does not support nullable primitive types, so we use 0L
// as a replacement (corresponding to Thursday 1 January 1970 00:00:00 UT).
lastSelectedScheduleEpoch = navigationArgs.lastSelectedScheduleEpoch.takeIf { it != 0L }
override val titleRes: Int = R.string.scheduleSendingTitle

computeLastScheduleItem()
setLastScheduleClickListener()
setCustomScheduleClickListener()

val timeToDisplay = TimeToDisplay.getTimeToDisplayFromDate()
Schedule.entries.filter { schedule -> timeToDisplay in schedule.timeToDisplay }.forEach { schedule ->
scheduleItems.addView(createScheduleItem(schedule))
override fun onLastScheduleOptionClicked() {
if (lastSelectedEpoch != null) {
trackScheduleSendEvent("lastSelectedSchedule")
setBackNavigationResult(SCHEDULE_DRAFT_RESULT, lastSelectedEpoch)
}

val shouldDisplayDivider = lastScheduleItem.isVisible
(scheduleItems.children.first() as ActionItemView).setDividerVisibility(shouldDisplayDivider)
}

private fun computeLastScheduleItem() = with(binding) {
val lastSelectedDate = lastSelectedScheduleEpoch?.let { Date(it) }

if (lastSelectedDate?.isAtLeastXMinutesInTheFuture(MIN_SELECTABLE_DATE_MINUTES) == true) {
lastScheduleItem.isVisible = true
lastScheduleItem.setDescription(context.dayOfWeekDateWithoutYear(date = lastSelectedDate))
}
override fun onScheduleOptionClicked(dateItem: ScheduleOption) {
trackScheduleSendEvent(dateItem.matomoValue)
setBackNavigationResult(SCHEDULE_DRAFT_RESULT, dateItem.date().time)
}

private fun setLastScheduleClickListener() {
binding.lastScheduleItem.setOnClickListener {
if (lastSelectedScheduleEpoch != null) {
trackScheduleSendEvent("lastSelectedSchedule")
setBackNavigationResult(SCHEDULE_DRAFT_RESULT, lastSelectedScheduleEpoch)
}
}
}

private fun setCustomScheduleClickListener() {
binding.customScheduleItem.setOnClickListener {
if (navigationArgs.isCurrentMailboxFree) {
safeNavigate(
resId = R.id.upgradeProductBottomSheetDialog,
currentClassName = ScheduleSendBottomSheetDialog::class.java.name,
)
} else {
setBackNavigationResult(OPEN_DATE_AND_TIME_SCHEDULE_DIALOG, true)
}
}
}

private fun createScheduleItem(schedule: Schedule): ActionItemView = ActionItemView(requireContext()).apply {
setTitle(schedule.scheduleTitleRes)
setDescription(context.dayOfWeekDateWithoutYear(date = schedule.date()))
setIconResource(schedule.scheduleIconRes)
setOnClickListener {
trackScheduleSendEvent(schedule.matomoValue)
setBackNavigationResult(SCHEDULE_DRAFT_RESULT, schedule.date().time)
override fun onCustomScheduleOptionClicked() {
if (navigationArgs.isCurrentMailboxFree) {
safeNavigate(
resId = R.id.upgradeProductBottomSheetDialog,
currentClassName = ScheduleSendBottomSheetDialog::class.java.name,
)
} else {
setBackNavigationResult(OPEN_DATE_AND_TIME_SCHEDULE_DIALOG, true)
}
}

Expand All @@ -121,86 +65,3 @@ class ScheduleSendBottomSheetDialog @Inject constructor() : BottomSheetDialogFra
const val OPEN_DATE_AND_TIME_SCHEDULE_DIALOG = "open_date_and_time_schedule_dialog"
}
}

enum class TimeToDisplay {
NIGHT,
MORNING,
AFTERNOON,
EVENING,
WEEKEND;

companion object {
fun getTimeToDisplayFromDate(): TimeToDisplay {
val now = Date()
val timeSlot = Date(now.time)
return if (now.isWeekend()) {
WEEKEND
} else {
when (now) {
in timeSlot.setHour(7).setMinute(55)..timeSlot.setHour(13).setMinute(54) -> MORNING
in timeSlot.setHour(13).setMinute(55)..timeSlot.setHour(17).setMinute(54) -> AFTERNOON
in timeSlot.setHour(17).setMinute(55)..timeSlot.setHour(23).setMinute(54) -> EVENING
else -> NIGHT // Between 23:55 and 7:54, inclusive
}
}
}
}
}

enum class Schedule(
@StringRes val scheduleTitleRes: Int,
@DrawableRes val scheduleIconRes: Int,
val date: () -> Date,
val timeToDisplay: List<TimeToDisplay>,
val matomoValue: String,
) {
LATER_THIS_MORNING(
R.string.laterThisMorning,
R.drawable.ic_morning_sunrise_schedule,
{ Date().getMorning() },
listOf(TimeToDisplay.NIGHT),
"laterThisMorning",
),
MONDAY_MORNING(
R.string.mondayMorning,
R.drawable.ic_morning_schedule,
{ Date().getNextMonday().getMorning() },
listOf(TimeToDisplay.WEEKEND),
"nextMondayMorning",
),
MONDAY_AFTERNOON(
R.string.mondayAfternoon,
R.drawable.ic_afternoon_schedule,
{ Date().getNextMonday().getAfternoon() },
listOf(TimeToDisplay.WEEKEND),
"nextMondayAfternoon",
),
THIS_AFTERNOON(
R.string.thisAfternoon,
R.drawable.ic_afternoon_schedule,
{ Date().getAfternoon() },
listOf(TimeToDisplay.MORNING),
"thisAfternoon",
),
THIS_EVENING(
R.string.thisEvening,
R.drawable.ic_evening_schedule,
{ Date().getEvening() },
listOf(TimeToDisplay.AFTERNOON),
"thisEvening",
),
TOMORROW_MORNING(
R.string.tomorrowMorning,
R.drawable.ic_morning_schedule,
{ Date().tomorrow().getMorning() },
listOf(TimeToDisplay.NIGHT, TimeToDisplay.MORNING, TimeToDisplay.AFTERNOON, TimeToDisplay.EVENING),
"tomorrowMorning",
),
NEXT_MONDAY(
R.string.nextMonday,
R.drawable.ic_arrow_return,
{ Date().getNextMonday().getMorning() },
listOf(TimeToDisplay.NIGHT, TimeToDisplay.MORNING, TimeToDisplay.AFTERNOON, TimeToDisplay.EVENING),
"nextMonday",
)
}
189 changes: 189 additions & 0 deletions ...rc/main/java/com/infomaniak/mail/ui/bottomSheetDialogs/SelectScheduleOptionBottomSheet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,189 @@
/*
* Infomaniak Mail - Android
* Copyright (C) 2024-2025 Infomaniak Network SA
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.infomaniak.mail.ui.bottomSheetDialogs

import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.annotation.DrawableRes
import androidx.annotation.StringRes
import androidx.core.view.children
import androidx.core.view.isVisible
import com.google.android.material.bottomsheet.BottomSheetDialogFragment
import com.infomaniak.core.utils.*
import com.infomaniak.lib.core.utils.context
import com.infomaniak.lib.core.utils.safeBinding
import com.infomaniak.mail.R
import com.infomaniak.mail.databinding.BottomSheetScheduleOptionsBinding
import com.infomaniak.mail.ui.alertDialogs.SelectDateAndTimeDialog.Companion.MIN_SELECTABLE_DATE_MINUTES
import com.infomaniak.mail.ui.main.thread.actions.ActionItemView
import com.infomaniak.mail.utils.date.DateFormatUtils.dayOfWeekDateWithoutYear
import java.util.Date


abstract class SelectScheduleOptionBottomSheet : BottomSheetDialogFragment() {

private var binding: BottomSheetScheduleOptionsBinding by safeBinding()

abstract val lastSelectedEpoch: Long?

@get:StringRes
abstract val titleRes: Int

abstract fun onLastScheduleOptionClicked()
abstract fun onScheduleOptionClicked(dateItem: ScheduleOption)
abstract fun onCustomScheduleOptionClicked()

override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
return BottomSheetScheduleOptionsBinding.inflate(inflater, container, false).also { binding = it }.root
}

override fun onViewCreated(view: View, savedInstanceState: Bundle?): Unit = with(binding) {
super.onViewCreated(view, savedInstanceState)

title.text = getString(titleRes)

computeLastScheduleOption()

setLastScheduleOptionClickListener()
createCommonScheduleOptions()
setCustomScheduleOptionClickListener()

val shouldDisplayDivider = lastScheduleOption.isVisible
(scheduleOptions.children.first() as ActionItemView).setDividerVisibility(shouldDisplayDivider)
}

private fun computeLastScheduleOption() = with(binding) {
val lastSelectedDate = lastSelectedEpoch?.let { Date(it) }

if (lastSelectedDate?.isAtLeastXMinutesInTheFuture(MIN_SELECTABLE_DATE_MINUTES) == true) {
lastScheduleOption.isVisible = true
lastScheduleOption.setDescription(context.dayOfWeekDateWithoutYear(date = lastSelectedDate))
}
}

private fun setLastScheduleOptionClickListener() {
binding.lastScheduleOption.setOnClickListener { onLastScheduleOptionClicked() }
}

private fun createCommonScheduleOptions() {
val currentTime = TimeToDisplay.getTimeToDisplayFromDate()
ScheduleOption.entries.forEach { scheduleOption ->
if (scheduleOption.canBeDisplayedAt(currentTime)) {
binding.scheduleOptions.addView(createScheduleOptionItem(scheduleOption))
}
}
}

private fun createScheduleOptionItem(scheduleOption: ScheduleOption): ActionItemView = ActionItemView(binding.context).apply {
setTitle(scheduleOption.titleRes)
setDescription(context.dayOfWeekDateWithoutYear(date = scheduleOption.date()))
setIconResource(scheduleOption.iconRes)
setOnClickListener { onScheduleOptionClicked(scheduleOption) }
}

private fun setCustomScheduleOptionClickListener() {
binding.customScheduleOption.setOnClickListener { onCustomScheduleOptionClicked() }
}
}

enum class TimeToDisplay {
NIGHT,
MORNING,
AFTERNOON,
EVENING,
WEEKEND;

companion object {
fun getTimeToDisplayFromDate(): TimeToDisplay {
val now = Date()
val timeSlot = Date(now.time)
return if (now.isWeekend()) {
WEEKEND
} else {
when (now) {
in timeSlot.setHour(7).setMinute(55)..timeSlot.setHour(13).setMinute(54) -> MORNING
in timeSlot.setHour(13).setMinute(55)..timeSlot.setHour(17).setMinute(54) -> AFTERNOON
in timeSlot.setHour(17).setMinute(55)..timeSlot.setHour(23).setMinute(54) -> EVENING
else -> NIGHT // Between 23:55 and 7:54, inclusive
}
}
}
}
}

enum class ScheduleOption(
@StringRes val titleRes: Int,
@DrawableRes val iconRes: Int,
val date: () -> Date,
private val timeToDisplay: List<TimeToDisplay>,
val matomoValue: String,
) {
LATER_THIS_MORNING(
R.string.laterThisMorning,
R.drawable.ic_morning_sunrise_schedule,
{ Date().getMorning() },
listOf(TimeToDisplay.NIGHT),
"laterThisMorning",
),
MONDAY_MORNING(
R.string.mondayMorning,
R.drawable.ic_morning_schedule,
{ Date().getNextMonday().getMorning() },
listOf(TimeToDisplay.WEEKEND),
"nextMondayMorning",
),
MONDAY_AFTERNOON(
R.string.mondayAfternoon,
R.drawable.ic_afternoon_schedule,
{ Date().getNextMonday().getAfternoon() },
listOf(TimeToDisplay.WEEKEND),
"nextMondayAfternoon",
),
THIS_AFTERNOON(
R.string.thisAfternoon,
R.drawable.ic_afternoon_schedule,
{ Date().getAfternoon() },
listOf(TimeToDisplay.MORNING),
"thisAfternoon",
),
THIS_EVENING(
R.string.thisEvening,
R.drawable.ic_evening_schedule,
{ Date().getEvening() },
listOf(TimeToDisplay.AFTERNOON),
"thisEvening",
),
TOMORROW_MORNING(
R.string.tomorrowMorning,
R.drawable.ic_morning_schedule,
{ Date().tomorrow().getMorning() },
listOf(TimeToDisplay.NIGHT, TimeToDisplay.MORNING, TimeToDisplay.AFTERNOON, TimeToDisplay.EVENING),
"tomorrowMorning",
),
NEXT_MONDAY(
R.string.nextMonday,
R.drawable.ic_arrow_return,
{ Date().getNextMonday().getMorning() },
listOf(TimeToDisplay.NIGHT, TimeToDisplay.MORNING, TimeToDisplay.AFTERNOON, TimeToDisplay.EVENING),
"nextMonday",
);

fun canBeDisplayedAt(timeToDisplay: TimeToDisplay): Boolean = timeToDisplay in this.timeToDisplay
}
Loading
Loading