Jean-Luc Makiola
40d70d9f2b
Tapping a widget header now opens the app on a sensible top-level view, via a shared WidgetNavRequest.OpenView(view?) — a concrete view roots there over the default home, a null view resolves to the default home: - Month widget: the month/year title opens the month view (#18). Its "today" button now snaps the grid back to the current month in place (the reset that used to sit on the title), so paging + jump-to-today are both reachable and the title is free to open the app. - Agenda widget: the "Upcoming" title opens the default view (#20), so users whose home view is Week/Month can reach it in one tap instead of drilling through a day or event. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
44 lines
2.0 KiB
Kotlin
44 lines
2.0 KiB
Kotlin
package de.jeanlucmakiola.calendula.ui
|
|
|
|
import de.jeanlucmakiola.calendula.ui.common.CalendarView
|
|
|
|
/**
|
|
* A navigation a home-screen widget asked the app to perform when launched.
|
|
* Parsed from the launch intent in MainActivity and consumed once by
|
|
* [CalendarHost]. Every request carries the [source] view of the widget it came
|
|
* from (the agenda widget → [CalendarView.Agenda], the month widget →
|
|
* [CalendarView.Month]) so the in-app back stack roots itself in that view:
|
|
* backing out of the opened date/event returns to the widget's own view, not the
|
|
* default home. (Reminder notifications are not widgets — they keep the separate
|
|
* detail-key channel and leave the base view untouched.)
|
|
*/
|
|
sealed interface WidgetNavRequest {
|
|
/**
|
|
* Open the day view anchored on [dateIso] (an ISO `yyyy-MM-dd` date), over
|
|
* [source]. A null [source] means the request came from outside the app (a
|
|
* launcher/clock date tap, issue #9) rather than a widget, so it roots over
|
|
* the default home view instead of a widget's view.
|
|
*/
|
|
data class OpenDate(val dateIso: String, val source: CalendarView?) : WidgetNavRequest
|
|
|
|
/** Open one occurrence's detail (an agenda-widget event tap), over [source]. */
|
|
data class OpenEvent(
|
|
val eventId: Long,
|
|
val beginMillis: Long,
|
|
val endMillis: Long,
|
|
val source: CalendarView,
|
|
) : WidgetNavRequest
|
|
|
|
/** Open the create-event form prefilled for [dateIso] (today when null). */
|
|
data class Create(val dateIso: String?) : WidgetNavRequest
|
|
|
|
/**
|
|
* Open the app rooted on a top-level [view] with no date drill-in — a widget
|
|
* header tap. A null [view] means "the user's default home view" (the agenda
|
|
* widget's "Upcoming" title, issue #20); a concrete view roots there over the
|
|
* default home (the month widget's month/year title → [CalendarView.Month],
|
|
* issue #18), so backing out returns to the default view, then exits.
|
|
*/
|
|
data class OpenView(val view: CalendarView?) : WidgetNavRequest
|
|
}
|