Skip to content

3689: Adjust display of date for recurring events - #4290

Open
bahaaTuffaha wants to merge 9 commits into
mainfrom
3689-Adjust-display-of-date-for-recurring-events
Open

3689: Adjust display of date for recurring events#4290
bahaaTuffaha wants to merge 9 commits into
mainfrom
3689-Adjust-display-of-date-for-recurring-events

Conversation

@bahaaTuffaha

Copy link
Copy Markdown
Contributor

Short Description

Display a collapsible "Weitere Termine" section for recurring events directly in the event list.

The section should show the next 5 upcoming occurrences. If more future occurrences exist, display (...) after the last visible date. Design here

Proposed Changes

  • Added a shortFormat parameter to formatMonthlyOrYearlyRecurrence, defaulting to false; when true, it uses dateFormatShort instead of dateFormatWithWeekday.

Web:

  • Added a new component EventFurtherDates that renders the upcoming recurrence dates.
  • Used the existing Accordion component for EventFurtherDates.tsx.
  • Showed up to MAX_FURTHER_DATES (6) recurrences via date.recurrences(), then dropped the first one with .slice(1) since it's already shown in the eventList Item.
  • Used preventDefault/stopPropagation on the wrapper's click handler so toggling the accordion doesn't trigger the parent list item's navigation link.
  • Added a new icons EventNoteIcon, LocationOnOutlinedIcon for the date and location at EventListItem.tsx.

Native:

  • Built the toggle with a TouchableRipple instead of using the accordion because it needs alot of changes to match the design.
  • Used the same hasMoreRecurrencesThan logic like web.
  • Imported and rendered EventFurtherDates directly below the event's date line.
  • New Icons like web: calendar-text-outline, map-marker-outline for location and date.

  • Added a furtherDates translation key.
  • Create new tests for web and native:EventFurtherDates.spec.tsx

Side Effects

N/A

Checklist

Testing

  • Launch integreat.
  • Go to Events list and check the ones that has the recurrence date icon.
  • Check web and native.
  • Check contrast and RTL languages alignment.

Resolved Issues

Fixes: #3689


Comment thread web/src/components/EventListItem.tsx Outdated
Comment thread web/src/components/EventListItem.tsx
Comment thread web/src/components/EventListItem.tsx Outdated
Comment thread web/src/components/EventFurtherDates.tsx Outdated
Comment thread web/src/components/EventFurtherDates.tsx Outdated
Comment thread native/src/components/EventFurtherDates.tsx Outdated
Comment thread native/src/components/EventFurtherDates.tsx Outdated

@lunars97 lunars97 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Almost perfect! Tested with real android device and Chrome. I found one issue, please see my comment 👍

Comment thread web/src/components/EventFurtherDates.tsx
@bahaaTuffaha
bahaaTuffaha requested a review from lunars97 August 4, 2026 16:20
@bahaaTuffaha

Copy link
Copy Markdown
Contributor Author

@ulyanahoy-cloud
For German it looks great but in english it looks like this:

Screenshot 2026-08-04 at 7 23 01 PM Screenshot 2026-08-04 at 7 23 14 PM

Is this ok?

@ulyanahoy-cloud

Copy link
Copy Markdown

What if we only show the date on mobile if the time stays the same, and limit the list to the next 3 occurrences? This would keep the card much more compact.
I would also slightly increase the spacing between the event title and the date.

image

@bahaaTuffaha

bahaaTuffaha commented Aug 5, 2026

Copy link
Copy Markdown
Contributor Author

What if we only show the date on mobile if the time stays the same, and limit the list to the next 3 occurrences? This would keep the card much more compact. I would also slightly increase the spacing between the event title and the date.

How about this for mobile and one line for desktop:
Screenshot 2026-08-05 at 12 34 39 PM

@ulyanahoy-cloud

Copy link
Copy Markdown

If the recurring event always has the same time, I'd still prefer showing only the dates on mobile. It keeps the card much more compact and avoids repeating the same information.

If the time differs between occurrences, then this two-line layout works well.

@bahaaTuffaha

Copy link
Copy Markdown
Contributor Author

If the recurring event always has the same time, I'd still prefer showing only the dates on mobile. It keeps the card much more compact and avoids repeating the same information.

If the time differs between occurrences, then this two-line layout works well.

Ok and for the occurrences keep them 5 or 3 just for mobile?

@ulyanahoy-cloud

Copy link
Copy Markdown

for mobile 3

Comment thread web/src/components/EventFurtherDates.tsx Outdated

@lunars97 lunars97 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not tested again. LGTM 👍

@bahaaTuffaha
bahaaTuffaha force-pushed the 3689-Adjust-display-of-date-for-recurring-events branch from dd9aa0b to f53782a Compare August 10, 2026 08:24
@bahaaTuffaha
bahaaTuffaha force-pushed the 3689-Adjust-display-of-date-for-recurring-events branch from cb1a81d to 8636527 Compare August 10, 2026 14:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Adjust display of date for recurring events

4 participants