Merge pull request #1792 from vitorpamplona/claude/add-calendar-event-rendering-HsY4W

Add support for rendering NIP-52 calendar events

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt

@@ -98,6 +98,8 @@ import com.vitorpamplona.amethyst.ui.note.types.PictureDisplay
 import com.vitorpamplona.amethyst.ui.note.types.RenderAppDefinition
 import com.vitorpamplona.amethyst.ui.note.types.RenderAudioHeader
 import com.vitorpamplona.amethyst.ui.note.types.RenderAudioTrack
+import com.vitorpamplona.amethyst.ui.note.types.RenderCalendarDateSlotEvent
+import com.vitorpamplona.amethyst.ui.note.types.RenderCalendarTimeSlotEvent
 import com.vitorpamplona.amethyst.ui.note.types.RenderBadgeAward
 import com.vitorpamplona.amethyst.ui.note.types.RenderChannelMessage
 import com.vitorpamplona.amethyst.ui.note.types.RenderChatMessage
@@ -209,6 +211,8 @@ import com.vitorpamplona.quartz.nip51Lists.relayLists.IndexerRelayListEvent
 import com.vitorpamplona.quartz.nip51Lists.relayLists.ProxyRelayListEvent
 import com.vitorpamplona.quartz.nip51Lists.relayLists.TrustedRelayListEvent
 import com.vitorpamplona.quartz.nip51Lists.relaySets.RelaySetEvent
+import com.vitorpamplona.quartz.nip52Calendar.appt.day.CalendarDateSlotEvent
+import com.vitorpamplona.quartz.nip52Calendar.appt.time.CalendarTimeSlotEvent
 import com.vitorpamplona.quartz.nip53LiveActivities.chat.LiveActivitiesChatMessageEvent
 import com.vitorpamplona.quartz.nip53LiveActivities.streaming.LiveActivitiesEvent
 import com.vitorpamplona.quartz.nip54Wiki.WikiNoteEvent
@@ -968,6 +972,14 @@ private fun RenderNoteRow(
             )
         }
 
+        is CalendarTimeSlotEvent -> {
+            RenderCalendarTimeSlotEvent(baseNote, accountViewModel, nav)
+        }
+
+        is CalendarDateSlotEvent -> {
+            RenderCalendarDateSlotEvent(baseNote, accountViewModel, nav)
+        }
+
         is HighlightEvent -> {
             RenderHighlight(
                 baseNote,

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/CalendarEvent.kt

@@ -0,0 +1,260 @@
+/*
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.ui.note.types
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.ui.components.MyAsyncImage
+import com.vitorpamplona.amethyst.ui.navigation.navs.INav
+import com.vitorpamplona.amethyst.ui.note.elements.DefaultImageHeader
+import com.vitorpamplona.amethyst.ui.note.elements.DefaultImageHeaderBackground
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.stringRes
+import com.vitorpamplona.amethyst.ui.theme.StdVertSpacer
+import com.vitorpamplona.amethyst.ui.theme.ThemeComparisonColumn
+import com.vitorpamplona.amethyst.ui.theme.replyModifier
+import com.vitorpamplona.quartz.nip52Calendar.appt.day.CalendarDateSlotEvent
+import com.vitorpamplona.quartz.nip52Calendar.appt.time.CalendarTimeSlotEvent
+import java.text.DateFormat
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+
+@Composable
+fun RenderCalendarTimeSlotEvent(
+    note: Note,
+    accountViewModel: AccountViewModel,
+    nav: INav,
+) {
+    val noteEvent = note.event as? CalendarTimeSlotEvent ?: return
+
+    val title = noteEvent.title()
+    val image = noteEvent.image()
+    val summary = remember(noteEvent) {
+        noteEvent.summary()?.ifBlank { null } ?: noteEvent.content.take(200).ifBlank { null }
+    }
+    val location = noteEvent.location()
+    val dateRange = remember(noteEvent) {
+        val start = noteEvent.start()
+        val end = noteEvent.end()
+        formatTimestampRange(start, end)
+    }
+
+    CalendarHeader(
+        title = title,
+        image = image,
+        summary = summary,
+        location = location,
+        dateRange = dateRange,
+        note = note,
+        accountViewModel = accountViewModel,
+    )
+}
+
+@Composable
+fun RenderCalendarDateSlotEvent(
+    note: Note,
+    accountViewModel: AccountViewModel,
+    nav: INav,
+) {
+    val noteEvent = note.event as? CalendarDateSlotEvent ?: return
+
+    val title = noteEvent.title()
+    val image = noteEvent.image()
+    val summary = remember(noteEvent) {
+        noteEvent.summary()?.ifBlank { null } ?: noteEvent.content.take(200).ifBlank { null }
+    }
+    val location = noteEvent.location()
+    val dateRange = remember(noteEvent) {
+        val start = noteEvent.start()
+        val end = noteEvent.end()
+        formatDateRange(start, end)
+    }
+
+    CalendarHeader(
+        title = title,
+        image = image,
+        summary = summary,
+        location = location,
+        dateRange = dateRange,
+        note = note,
+        accountViewModel = accountViewModel,
+    )
+}
+
+@Composable
+private fun CalendarHeader(
+    title: String?,
+    image: String?,
+    summary: String?,
+    location: String?,
+    dateRange: String?,
+    note: Note,
+    accountViewModel: AccountViewModel,
+) {
+    Column(MaterialTheme.colorScheme.replyModifier) {
+        image?.let {
+            MyAsyncImage(
+                imageUrl = it,
+                contentDescription = stringRes(R.string.preview_card_image_for, it),
+                contentScale = ContentScale.FillWidth,
+                mainImageModifier = Modifier.fillMaxWidth(),
+                loadedImageModifier = Modifier,
+                accountViewModel = accountViewModel,
+                onLoadingBackground = { DefaultImageHeaderBackground(note, accountViewModel) },
+                onError = { DefaultImageHeader(note, accountViewModel) },
+            )
+        } ?: run {
+            DefaultImageHeader(note, accountViewModel, Modifier.fillMaxWidth())
+        }
+
+        title?.let {
+            Text(
+                text = it,
+                style = MaterialTheme.typography.bodyLarge,
+                fontWeight = FontWeight.Bold,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(start = 10.dp, end = 10.dp, top = 10.dp),
+                maxLines = 2,
+                overflow = TextOverflow.Ellipsis,
+            )
+        }
+
+        dateRange?.let {
+            Row(
+                modifier = Modifier.padding(start = 10.dp, end = 10.dp, top = 4.dp),
+            ) {
+                Text(
+                    text = it,
+                    style = MaterialTheme.typography.bodySmall,
+                    color = MaterialTheme.colorScheme.primary,
+                    fontWeight = FontWeight.Bold,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                )
+            }
+        }
+
+        location?.let {
+            Row(
+                modifier = Modifier.padding(start = 10.dp, end = 10.dp, top = 2.dp),
+            ) {
+                Text(
+                    text = it,
+                    style = MaterialTheme.typography.bodySmall,
+                    color = Color.Gray,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                )
+            }
+        }
+
+        summary?.let {
+            Spacer(modifier = StdVertSpacer)
+            Text(
+                text = it,
+                style = MaterialTheme.typography.bodySmall,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(start = 10.dp, end = 10.dp, bottom = 10.dp),
+                color = Color.Gray,
+                maxLines = 3,
+                overflow = TextOverflow.Ellipsis,
+            )
+        }
+
+        if (summary == null) {
+            Spacer(modifier = StdVertSpacer)
+        }
+    }
+}
+
+private fun formatTimestampRange(
+    start: Long?,
+    end: Long?,
+): String? {
+    if (start == null) return null
+    val formatter = SimpleDateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.SHORT)
+    val startStr = formatter.format(Date(start * 1000))
+    return if (end != null && end != start) {
+        val endFormatter = SimpleDateFormat.getTimeInstance(DateFormat.SHORT)
+        "$startStr – ${endFormatter.format(Date(end * 1000))}"
+    } else {
+        startStr
+    }
+}
+
+private fun formatDateRange(
+    start: String?,
+    end: String?,
+): String? {
+    if (start == null) return null
+    return if (end != null && end != start) {
+        "$start – $end"
+    } else {
+        start
+    }
+}
+
+@Composable
+@Preview
+fun RenderCalendarTimeSlotEventPreview() {
+    ThemeComparisonColumn {
+        CalendarHeader(
+            title = "Nostr Developer Meetup",
+            image = null,
+            summary = "Join us for an evening of lightning talks and open discussion on the latest Nostr protocol developments.",
+            location = "Berlin, Germany",
+            dateRange = "Mar 15, 2025, 7:00 PM – 10:00 PM",
+        )
+    }
+}
+
+@Composable
+@Preview
+fun RenderCalendarDateSlotEventPreview() {
+    ThemeComparisonColumn {
+        CalendarHeader(
+            title = "Bitcoin Conference 2025",
+            image = null,
+            summary = null,
+            location = null,
+            dateRange = "2025-05-01 – 2025-05-03",
+        )
+    }
+}