Merge isFinished/isLive/isUpcoming into an enum

zsmb13 · zsmb13 · commit f94c932af80c · 2025-02-11T10:01:29.000+01:00
diff --git a/shared/src/commonMain/kotlin/org/jetbrains/kotlinconf/ConferenceService.kt b/shared/src/commonMain/kotlin/org/jetbrains/kotlinconf/ConferenceService.kt
@@ -24,15 +24,13 @@ val UNKNOWN_SESSION_CARD: SessionCardView = SessionCardView(
     locationLine = "unknown",
     startsAt = GMTDate.START,
     endsAt = GMTDate.START,
-    isLive = false,
     speakerIds = emptyList(),
-    isFinished = false,
     isFavorite = false,
-    isUpcoming = false,
     description = "unknown",
     vote = null,
     tags = emptyList(),
-    startsInMinutes = null
+    startsInMinutes = null,
+    state = SessionState.Upcoming,
 )
 
 val UNKNOWN_SPEAKER: Speaker = Speaker(
diff --git a/shared/src/commonMain/kotlin/org/jetbrains/kotlinconf/SessionCardView.kt b/shared/src/commonMain/kotlin/org/jetbrains/kotlinconf/SessionCardView.kt
@@ -1,7 +1,8 @@
 package org.jetbrains.kotlinconf
 
-import io.ktor.util.date.*
-import org.jetbrains.kotlinconf.utils.*
+import io.ktor.util.date.GMTDate
+import org.jetbrains.kotlinconf.utils.dayAndMonth
+import org.jetbrains.kotlinconf.utils.time
 
 data class SessionCardView(
     val id: SessionId,
@@ -10,7 +11,7 @@ data class SessionCardView(
     val locationLine: String,
     val startsAt: GMTDate,
     val endsAt: GMTDate,
-    val isLive: Boolean,
+    val state: SessionState,
     val speakerIds: List<SpeakerId>,
     val vote: Score?,
     val timeLine: String = buildString {
@@ -21,8 +22,6 @@ data class SessionCardView(
         append(endsAt.time())
     },
     val isFavorite: Boolean,
-    val isFinished: Boolean,
-    val isUpcoming: Boolean,
     val description: String,
     val tags: List<String>,
     val badgeTimeLine: String = buildString {
@@ -34,4 +33,8 @@ data class SessionCardView(
     val startsInMinutes: Int?,
 )
 
+val SessionCardView.isLive get() = state == SessionState.Live
+val SessionCardView.isUpcoming get() = state == SessionState.Upcoming
+val SessionCardView.isPast get() = state == SessionState.Past
+
 val Session.isLightning: Boolean get() = endsAt.timestamp - startsAt.timestamp <= 15 * 60 * 1000
diff --git a/shared/src/commonMain/kotlin/org/jetbrains/kotlinconf/SessionState.kt b/shared/src/commonMain/kotlin/org/jetbrains/kotlinconf/SessionState.kt
@@ -0,0 +1,18 @@
+package org.jetbrains.kotlinconf
+
+import io.ktor.util.date.GMTDate
+
+enum class SessionState {
+    Live,
+    Past,
+    Upcoming,
+    ;
+
+    companion object {
+        fun from(startsAt: GMTDate, endsAt: GMTDate, now: GMTDate): SessionState = when {
+            startsAt <= now && now < endsAt -> Live
+            endsAt <= now -> Past
+            else -> Upcoming
+        }
+    }
+}
diff --git a/shared/src/commonMain/kotlin/org/jetbrains/kotlinconf/View.kt b/shared/src/commonMain/kotlin/org/jetbrains/kotlinconf/View.kt
@@ -43,13 +43,15 @@ data class Day(
 data class TimeSlot(
     val startsAt: GMTDate,
     val endsAt: GMTDate,
-    val isLive: Boolean,
-    val isFinished: Boolean,
-    val isUpcoming: Boolean,
+    val state: SessionState,
     val sessions: List<SessionCardView>,
     val title: String = "${startsAt.time()}-${endsAt.time()}",
 )
 
+val TimeSlot.isLive get() = state == SessionState.Live
+val TimeSlot.isUpcoming get() = state == SessionState.Upcoming
+val TimeSlot.isPast get() = state == SessionState.Past
+
 fun Conference.buildAgenda(
     favorites: Set<SessionId>,
     votes: List<VoteInfo>,
@@ -90,16 +92,10 @@ fun List<Session>.groupByTime(
                 it.asSessionCard(conference, now, favorites, votes)
             }
 
-        val isLive = start <= now && now < end
-        val isFinished = end <= now
-        val isUpcoming = start > now
-
         TimeSlot(
             startsAt = start,
             endsAt = end,
-            isLive = isLive,
-            isFinished = isFinished,
-            isUpcoming = isUpcoming,
+            state = SessionState.from(start, end, now),
             sessions = cards,
         )
     }
@@ -119,10 +115,8 @@ fun Session.asSessionCard(
         isFavorite = id in favorites,
         startsAt = startsAt,
         endsAt = endsAt,
-        isLive = startsAt <= now && now < endsAt,
+        state = SessionState.from(startsAt, endsAt, now),
         speakerIds = speakerIds,
-        isFinished = endsAt <= now,
-        isUpcoming = startsAt > now,
         vote = votes.find { it.sessionId == id }?.score,
         description = description,
         tags = tags ?: emptyList(),
@@ -155,6 +149,6 @@ data class ServiceEvent(
     val title: String,
     val startsAt: GMTDate,
     val endsAt: GMTDate,
-    val isLive: Boolean,
+    val state: SessionState,
     val startsInMinutes: Int?,
 )
diff --git a/shared/src/commonMain/kotlin/org/jetbrains/kotlinconf/screens/ScheduleScreen.kt b/shared/src/commonMain/kotlin/org/jetbrains/kotlinconf/screens/ScheduleScreen.kt
@@ -41,6 +41,7 @@ import kotlinx.coroutines.launch
 import org.jetbrains.compose.resources.stringResource
 import org.jetbrains.kotlinconf.SessionCardView
 import org.jetbrains.kotlinconf.SessionId
+import org.jetbrains.kotlinconf.SessionState
 import org.jetbrains.kotlinconf.ui.components.DayHeader
 import org.jetbrains.kotlinconf.ui.components.Divider
 import org.jetbrains.kotlinconf.ui.components.Emotion
@@ -401,11 +402,10 @@ private fun SessionCard(
         timeNote = session.startsInMinutes?.let { count ->
             stringResource(Res.string.schedule_in_x_minutes, count)
         },
-        status = when {
-            session.isFinished -> TalkStatus.Past
-            session.isLive -> TalkStatus.Now
-            session.isUpcoming -> TalkStatus.Upcoming
-            else -> TalkStatus.Upcoming // Shouldn't happen
+        status = when (session.state) {
+            SessionState.Live -> TalkStatus.Live
+            SessionState.Past -> TalkStatus.Past
+            SessionState.Upcoming -> TalkStatus.Upcoming
         },
         onSubmitFeedback = { emotion ->
             onSubmitFeedback(session.id, emotion)
diff --git a/shared/src/commonMain/kotlin/org/jetbrains/kotlinconf/screens/ScheduleViewModel.kt b/shared/src/commonMain/kotlin/org/jetbrains/kotlinconf/screens/ScheduleViewModel.kt
@@ -19,6 +19,8 @@ import org.jetbrains.kotlinconf.Score
 import org.jetbrains.kotlinconf.SessionCardView
 import org.jetbrains.kotlinconf.SessionId
 import org.jetbrains.kotlinconf.TimeSlot
+import org.jetbrains.kotlinconf.isLive
+import org.jetbrains.kotlinconf.isUpcoming
 import org.jetbrains.kotlinconf.ui.components.Emotion
 import org.jetbrains.kotlinconf.ui.components.FilterItem
 import org.jetbrains.kotlinconf.ui.components.FilterItemType
diff --git a/shared/src/commonMain/kotlin/org/jetbrains/kotlinconf/screens/SessionScreen.kt b/shared/src/commonMain/kotlin/org/jetbrains/kotlinconf/screens/SessionScreen.kt
@@ -45,6 +45,7 @@ import kotlinconfapp.shared.generated.resources.session_your_feedback
 import kotlinconfapp.shared.generated.resources.up_24
 import org.jetbrains.compose.resources.stringResource
 import org.jetbrains.kotlinconf.SessionId
+import org.jetbrains.kotlinconf.SessionState
 import org.jetbrains.kotlinconf.ui.components.Action
 import org.jetbrains.kotlinconf.ui.components.ActionSize
 import org.jetbrains.kotlinconf.ui.components.Divider
@@ -111,7 +112,7 @@ fun SessionScreen(
                 modifier = Modifier.padding(vertical = 24.dp),
             )
 
-            if (session.isFinished || session.isLive) {
+            if (session.state != SessionState.Upcoming) {
                 FeedbackPanel(
                     onFeedback = { emotion ->
                         viewModel.submitFeedback(emotion)
diff --git a/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/TalkCard.kt b/ui-components/src/commonMain/kotlin/org/jetbrains/kotlinconf/ui/components/TalkCard.kt
@@ -81,7 +81,7 @@ private fun buildHighlightedString(
 }
 
 enum class TalkStatus {
-    Past, Now, Upcoming,
+    Past, Live, Upcoming,
 }
 
 private val CardTalkShape = RoundedCornerShape(8.dp)
@@ -263,7 +263,7 @@ private fun TimeBlock(
             )
         }
 
-        if (status == TalkStatus.Now) {
+        if (status == TalkStatus.Live) {
             NowLabel()
         }
 
@@ -391,7 +391,7 @@ internal fun TalkCardPreview() {
                 lightning = true,
                 time = "9:00 – 10:00",
                 timeNote = null,
-                status = TalkStatus.Now,
+                status = TalkStatus.Live,
                 onSubmitFeedbackWithComment = { e, s -> println("Feedback, emotion + comment: $e, $s") },
                 onSubmitFeedback = { e -> println("Feedback, emotion only: $e") },
                 onClick = { "Clicked session" },

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ private fun buildHighlightedString(`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`enum class TalkStatus {`
`84`		`- Past, Now, Upcoming,`
	`84`	`+ Past, Live, Upcoming,`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`private val CardTalkShape = RoundedCornerShape(8.dp)`
`@@ -263,7 +263,7 @@ private fun TimeBlock(`
`263`	`263`	`)`
`264`	`264`	`}`
`265`	`265`
`266`		`- if (status == TalkStatus.Now) {`
	`266`	`+ if (status == TalkStatus.Live) {`
`267`	`267`	`NowLabel()`
`268`	`268`	`}`
`269`	`269`
`@@ -391,7 +391,7 @@ internal fun TalkCardPreview() {`
`391`	`391`	`lightning = true,`
`392`	`392`	`time = "9:00 – 10:00",`
`393`	`393`	`timeNote = null,`
`394`		`- status = TalkStatus.Now,`
	`394`	`+ status = TalkStatus.Live,`
`395`	`395`	`onSubmitFeedbackWithComment = { e, s -> println("Feedback, emotion + comment: $e, $s") },`
`396`	`396`	`onSubmitFeedback = { e -> println("Feedback, emotion only: $e") },`
`397`	`397`	`onClick = { "Clicked session" },`