Brings Agendula's screen transitions and settings in line with Calendula. **Motion** - Screens slide in on the M3 Expressive spring and leave through floret's `predictiveBackExit`, everywhere: main navigation and every settings sub-screen. - Settings sub-screens get Calendula's back-swipe preview (shrink, edge shift, rounded corners). The central settings BackHandler is gone; each screen handles its own back. - Main navigation keeps NavHost's own predictive back, which seeks the new exit over the previous screen. - `enableOnBackInvokedCallback` is set, so Android 14/15 show the preview too. **Settings** - Reminders → Notifications, Task form → New task form, with Calendula's subtitles and labels inside Notifications. - Export and import move out of Storage into a new Backup & restore section; Storage keeps only the task store. - The language row uses floret-kit's `LanguagePickerRow` with the translate header. **Deviations from the issue** - The main-navigation swipe preview scales and fades but doesn't shift or round its corners like Calendula's. Matching that exactly would mean replacing navigation-compose with Calendula-style overlays. Settings match exactly. - The AOSP/GrapheneOS Settings transition suggested in the issue isn't adopted; the family stays on its M3 Expressive motion. - Renamed labels keep their string keys, so existing translations stay until Weblate re-reviews them rather than falling back to English. Depends on jlmakiola/floret-kit#17 (the submodule points at it). Closes #66 Co-authored-by: Jean-Luc Makiola <business@jeanlucmakiola.de> Reviewed-on: https://codeberg.org/jlmakiola/agendula/pulls/69
This commit is contained in:
1 parent
9b7f7f60d2
commit
5004f5213c
18 files changed
+222
-144
No files matched your search
@@ -122,8 +122,8 @@
|
||||
<string name="reminder_unit_days">Days</string>
|
||||
<string name="reminder_unit_weeks">Weeks</string>
|
||||
<string name="settings_list_reminders_title">Per-list reminders</string>
|
||||
<string name="settings_list_reminders_hint">Override the default reminder for individual lists</string>
|
||||
<string name="settings_list_notifications">Notifications</string>
|
||||
<string name="settings_list_reminders_hint">Override the default per list — separately for timed and all-day tasks. A list can keep the default, drop it, or set its own.</string>
|
||||
<string name="settings_list_notifications">Sound & vibration</string>
|
||||
<string name="settings_list_notifications_hint">Sound, vibration and importance for this list’s reminders</string>
|
||||
<string name="settings_list_reminder_inherits">Default (%1$s)</string>
|
||||
|
||||
@@ -359,7 +359,7 @@
|
||||
|
||||
<!-- First run: backup -->
|
||||
<string name="onboarding_backup_title">Keep a copy</string>
|
||||
<string name="onboarding_backup_body_later">Without an account, your lists live only on this device. Save them as iCalendar files any other task or calendar app can read, any time from Settings → Storage → Export.</string>
|
||||
<string name="onboarding_backup_body_later">Without an account, your lists live only on this device. Save them as iCalendar files any other task or calendar app can read, any time from Settings → Backup & restore → Export.</string>
|
||||
<string name="onboarding_backup_continue">Continue</string>
|
||||
|
||||
<!-- First run: quick add bar -->
|
||||
@@ -394,10 +394,10 @@
|
||||
<!-- Group of reference links at the foot of the settings hub. -->
|
||||
<string name="settings_group_about">About</string>
|
||||
<string name="settings_section_appearance">Appearance</string>
|
||||
<string name="settings_appearance_subtitle">Theme, colour and time format</string>
|
||||
<string name="settings_section_task_form">Task form</string>
|
||||
<string name="settings_task_form_subtitle">Default fields, list and subtasks</string>
|
||||
<string name="settings_reminders_subtitle">Notifications for due tasks</string>
|
||||
<string name="settings_appearance_subtitle">Theme, colours, time format</string>
|
||||
<string name="settings_section_task_form">New task form</string>
|
||||
<string name="settings_task_form_subtitle">Default fields and behaviour</string>
|
||||
<string name="settings_reminders_subtitle">Reminders and delivery</string>
|
||||
<string name="settings_form_fields_hint">Fields shown by default on a new task. The rest sit behind \"More fields\".</string>
|
||||
<string name="settings_dynamic_color_unavailable">Available on Android 12 and later</string>
|
||||
<string name="settings_autofocus_title">Focus title on new task</string>
|
||||
@@ -442,13 +442,13 @@
|
||||
<string name="settings_theme_dark">Dark</string>
|
||||
<string name="settings_dynamic_color">Dynamic colour</string>
|
||||
<string name="settings_dynamic_color_hint">Use colours from your wallpaper</string>
|
||||
<string name="settings_section_reminders">Reminders</string>
|
||||
<string name="settings_reminders">Due reminders</string>
|
||||
<string name="settings_section_reminders">Notifications</string>
|
||||
<string name="settings_reminders">Task reminders</string>
|
||||
<string name="settings_reminders_hint">Notify me when a task is due</string>
|
||||
<string name="settings_notifications_blocked">Notifications are off</string>
|
||||
<string name="settings_notifications_blocked_hint">Reminders can\u2019t reach you. Tap to allow notifications for Agendula.</string>
|
||||
<string name="settings_default_reminder">When to remind</string>
|
||||
<string name="settings_allday_reminder_time">Time for all-day reminders</string>
|
||||
<string name="settings_default_reminder">Default reminder</string>
|
||||
<string name="settings_allday_reminder_time">All-day reminder time</string>
|
||||
<string name="settings_allday_reminder_time_summary">All-day tasks count back from %1$s</string>
|
||||
<string name="settings_default_reminder_allday">All-day tasks</string>
|
||||
<string name="settings_allday_reminder_fires_at">Notifies at %1$s</string>
|
||||
@@ -472,9 +472,11 @@
|
||||
|
||||
<!-- Storage and export -->
|
||||
<string name="settings_section_storage">Storage</string>
|
||||
<string name="settings_storage_subtitle">Where tasks are kept, and export</string>
|
||||
<string name="settings_storage_subtitle">Where your tasks are kept</string>
|
||||
<string name="settings_section_backup">Backup & restore</string>
|
||||
<string name="settings_backup_subtitle">Export and import</string>
|
||||
<string name="settings_task_store">Task store</string>
|
||||
<string name="settings_task_store_hint">Each store keeps its own tasks. Switching does not move them across — copy them over first, or export them.</string>
|
||||
<string name="settings_task_store_hint">Each store keeps its own tasks. Switching does not move them across — copy them over first, or export them from Backup & restore.</string>
|
||||
<string name="settings_store_own">On this device</string>
|
||||
<string name="settings_store_own_hint">Agendula\'s own storage. Nothing else to install.</string>
|
||||
<string name="settings_store_external">Another task app</string>
|
||||
|
||||
Reference in new issue
Block a user