Don't open chat for future streams

LiveTL · May 19, 2024 · d34d552 · d34d552
1 parent 231a5b4
commit d34d552
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 37 deletions.
diff --git a/app/src/main/kotlin/com/livetl/android/ui/screen/home/composable/Stream.kt b/app/src/main/kotlin/com/livetl/android/ui/screen/home/composable/Stream.kt
@@ -49,38 +49,34 @@ fun Stream(
     stream: Stream,
     @StringRes timestampFormatStringRes: Int?,
     timestampSupplier: (Stream) -> String?,
-    openPlayer: (Stream) -> Unit,
-    openStreamInfo: (Stream) -> Unit,
+    onClick: (Stream) -> Unit,
+    onClickDetails: (Stream) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Box(
-        modifier =
-        Modifier
+        modifier = Modifier
             .fillMaxWidth()
             .height(IntrinsicSize.Min),
     ) {
         AsyncImage(
-            model =
-            ImageRequest.Builder(LocalContext.current)
+            model = ImageRequest.Builder(LocalContext.current)
                 .data(stream.thumbnail)
                 .transformations()
                 .crossfade(true)
                 .build(),
             contentDescription = null,
-            modifier =
-            Modifier
+            modifier = Modifier
                 .matchParentSize()
                 .alpha(0.1f)
                 .blur(5.dp),
             contentScale = ContentScale.Crop,
         )
 
         Row(
-            modifier =
-            modifier
+            modifier = modifier
                 .combinedClickable(
-                    onClick = { openPlayer(stream) },
-                    onLongClick = { openStreamInfo(stream) },
+                    onClick = { onClick(stream) },
+                    onLongClick = { onClickDetails(stream) },
                 )
                 .fillMaxWidth()
                 .padding(start = 16.dp, top = 8.dp, end = 0.dp, bottom = 8.dp)
@@ -89,8 +85,7 @@ fun Stream(
             AsyncImage(
                 model = stream.channel.photo,
                 contentDescription = null,
-                modifier =
-                Modifier
+                modifier = Modifier
                     .fillMaxHeight()
                     .aspectRatio(1f)
                     .clip(CircleShape),
@@ -111,8 +106,7 @@ fun Stream(
                     CompositionLocalProvider(LocalTextStyle provides MaterialTheme.typography.labelSmall) {
                         Text(
                             stream.channel.name,
-                            modifier =
-                            Modifier
+                            modifier = Modifier
                                 .padding(start = 8.dp, end = 8.dp)
                                 .weight(1f),
                             color = LocalContentColor.current.copy(alpha = ContentAlpha.medium),
@@ -122,13 +116,11 @@ fun Stream(
 
                         timestampSupplier(stream)?.let {
                             val relativeDateString = it.toDate().toRelativeString()
-                            val timestampFormatString =
-                                timestampFormatStringRes?.let { res -> stringResource(res) }
-                            val timestampString =
-                                timestampFormatString?.format(relativeDateString)
-                                    ?: relativeDateString
+                            val timestampFormatString = timestampFormatStringRes?.let { res -> stringResource(res) }
+                            val timestampString = timestampFormatString?.format(relativeDateString)
+                                ?: relativeDateString
                             Text(
-                                timestampString,
+                                text = timestampString,
                                 color = LocalContentColor.current.copy(alpha = ContentAlpha.medium),
                             )
                         }
@@ -138,7 +130,7 @@ fun Stream(
 
             IconButton(
                 modifier = Modifier.alpha(0.5f),
-                onClick = { openStreamInfo(stream) },
+                onClick = { onClickDetails(stream) },
             ) {
                 Icon(
                     imageVector = Icons.Default.MoreVert,
@@ -154,45 +146,41 @@ fun Stream(
 private fun StreamPreview() {
     Column {
         Stream(
-            stream =
-            Stream(
+            stream = Stream(
                 id = "123",
                 title = "Some very, extremely, quite long long long title for testing wow",
                 description = "",
                 status = "past",
                 start_scheduled = "2020-01-01T00:00:00.000Z",
                 start_actual = "2020-01-01T00:01:12.000Z",
-                channel =
-                Channel(
+                channel = Channel(
                     name = "Wow Such YouTube Channel",
                     org = "Hololive",
                     photo = "",
                 ),
             ),
             timestampFormatStringRes = R.string.started_streaming,
             timestampSupplier = { "2020-01-01T00:01:12.000Z" },
-            openPlayer = {},
-            openStreamInfo = {},
+            onClick = {},
+            onClickDetails = {},
         )
         Stream(
-            stream =
-            Stream(
+            stream = Stream(
                 id = "123",
                 title = "Short title",
                 description = "",
                 status = "upcoming",
                 start_scheduled = "2030-01-01T00:01:12.000Z",
-                channel =
-                Channel(
+                channel = Channel(
                     name = "Smol Ch",
                     org = "Hololive",
                     photo = "",
                 ),
             ),
             timestampFormatStringRes = null,
             timestampSupplier = { "2030-01-01T00:01:12.000Z" },
-            openPlayer = {},
-            openStreamInfo = {},
+            onClick = {},
+            onClickDetails = {},
         )
     }
 }
diff --git a/app/src/main/kotlin/com/livetl/android/ui/screen/home/tab/StreamsTab.kt b/app/src/main/kotlin/com/livetl/android/ui/screen/home/tab/StreamsTab.kt
@@ -85,8 +85,8 @@ fun StreamsTab(
                     stream = stream,
                     timestampFormatStringRes = status.timestampFormatStringRes,
                     timestampSupplier = status.timestampSupplier,
-                    openPlayer = navigateToStream,
-                    openStreamInfo = peekStream,
+                    onClick = if (status != StreamStatus.UPCOMING) navigateToStream else peekStream,
+                    onClickDetails = peekStream,
                 )
             }