diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 123374011..c19fca14a 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -4,7 +4,7 @@ default_platform :android platform :android do - androidVersionNum = 258 + androidVersionNum = 259 wearVersionNum = 332 before_all do diff --git a/shared/src/commonMain/kotlin/dev/johnoreilly/confetti/ui/sessions/SessionDetailsViewShared.kt b/shared/src/commonMain/kotlin/dev/johnoreilly/confetti/ui/sessions/SessionDetailsViewShared.kt index 696a9047e..9a62154ac 100644 --- a/shared/src/commonMain/kotlin/dev/johnoreilly/confetti/ui/sessions/SessionDetailsViewShared.kt +++ b/shared/src/commonMain/kotlin/dev/johnoreilly/confetti/ui/sessions/SessionDetailsViewShared.kt @@ -19,6 +19,8 @@ import androidx.compose.foundation.text.selection.SelectionContainer import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Person +import androidx.compose.material.icons.filled.PlayCircle +import androidx.compose.material3.Button import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.Icon import androidx.compose.material3.IconButton @@ -31,6 +33,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.platform.LocalUriHandler import androidx.compose.ui.semantics.Role import androidx.compose.ui.text.font.FontStyle import androidx.compose.ui.text.font.FontWeight @@ -134,6 +137,25 @@ fun SessionDetailViewShared( Spacer(modifier = Modifier.size(16.dp)) } + + session.recordingUrl?.let { recordingUrl -> + val uriHandler = LocalUriHandler.current + + ConfettiHeader( + text = "Recording", + icon = Icons.Filled.PlayCircle, + ) + + Spacer(modifier = Modifier.size(16.dp)) + + Column(modifier = Modifier.padding(contentPadding)) { + Button(onClick = { uriHandler.openUri(recordingUrl)}) { + Text("Watch Recording") + } + } + + Spacer(modifier = Modifier.size(16.dp)) + } } } } diff --git a/wearApp/src/main/java/dev/johnoreilly/confetti/wear/preview/TestFixtures.kt b/wearApp/src/main/java/dev/johnoreilly/confetti/wear/preview/TestFixtures.kt index 05d3e4e69..e05566fab 100644 --- a/wearApp/src/main/java/dev/johnoreilly/confetti/wear/preview/TestFixtures.kt +++ b/wearApp/src/main/java/dev/johnoreilly/confetti/wear/preview/TestFixtures.kt @@ -144,6 +144,7 @@ The talk will cover ), room = SessionDetails.Room(name = "Effectenbeurszaal", id = "1", __typename = "Room"), tags = listOf(), - __typename = "Session" + __typename = "Session", + recordingUrl = null, ) } \ No newline at end of file