Merge pull request #1238 from joreilly/kmmbridge

initial changes for service type...and avoiding showing as lightning talk
joreilly · Apr 5, 2024 · ad597f1 · ad597f1
2 parents 44e90b6 + 85eead1
commit ad597f1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/androidApp/src/main/java/dev/johnoreilly/confetti/sessions/SessionListView.kt b/androidApp/src/main/java/dev/johnoreilly/confetti/sessions/SessionListView.kt
@@ -3,6 +3,7 @@
 package dev.johnoreilly.confetti.sessions
 
 import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -46,6 +47,7 @@ import dev.johnoreilly.confetti.decompose.SessionsUiState
 import dev.johnoreilly.confetti.fragment.SessionDetails
 import dev.johnoreilly.confetti.isBreak
 import dev.johnoreilly.confetti.isLightning
+import dev.johnoreilly.confetti.isService
 import dev.johnoreilly.confetti.sessionSpeakers
 import dev.johnoreilly.confetti.ui.Bookmark
 import dev.johnoreilly.confetti.ui.ErrorView
@@ -215,6 +217,11 @@ fun SessionItemView(
             sessionSelected(session.id)
         })
     }
+
+    if (session.isService()) {
+        modifier = modifier.background(Color.White)
+    }
+
     Row(modifier.padding(horizontal = 16.dp, vertical = 8.dp)) {
         Column(modifier = Modifier.weight(1f)) {
             Row(verticalAlignment = Alignment.CenterVertically) {

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -4,7 +4,7 @@ default_platform :android
 
 platform :android do
 
-    androidVersionNum = 230
+    androidVersionNum = 232
     wearVersionNum = 325
 
     before_all do

diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
@@ -222,7 +222,6 @@ version = "0.9"
 kmmbridge {
     frameworkName.set("ConfettiKit")
     addGithubPackagesRepository()
-    mavenPublishArtifacts()
     spm()
     timestampVersions()
 }

diff --git a/shared/src/commonMain/kotlin/dev/johnoreilly/confetti/Model.kt b/shared/src/commonMain/kotlin/dev/johnoreilly/confetti/Model.kt
@@ -6,8 +6,10 @@ import kotlinx.datetime.TimeZone
 import kotlinx.datetime.toInstant
 
 fun SessionDetails.isBreak() = this.type == "break"
+fun SessionDetails.isService() = this.type == "service"
 
-fun SessionDetails.isLightning() = endsAt.toInstant(TimeZone.UTC)
+fun SessionDetails.isLightning() = !isService() &&
+    endsAt.toInstant(TimeZone.UTC)
     .minus(startsAt.toInstant(TimeZone.UTC))
     .inWholeMinutes <= 15