Skip to content

Commit a285714

Browse files
committed
ux tweaks
1 parent 69b755d commit a285714

File tree

3 files changed

+15
-4
lines changed

3 files changed

+15
-4
lines changed

compose-ui/src/androidMain/kotlin/dev/dimension/flare/ui/component/VideoPlayer.kt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import androidx.compose.runtime.setValue
2424
import androidx.compose.ui.Alignment
2525
import androidx.compose.ui.Modifier
2626
import androidx.compose.ui.draw.clipToBounds
27+
import androidx.compose.ui.keepScreenOn
2728
import androidx.compose.ui.layout.ContentScale
2829
import androidx.media3.common.AudioAttributes
2930
import androidx.media3.common.C
@@ -160,6 +161,13 @@ public fun VideoPlayer(
160161
it
161162
}
162163
}.matchParentSize()
164+
.let {
165+
if (keepScreenOn) {
166+
it.keepScreenOn()
167+
} else {
168+
it
169+
}
170+
}
163171
if (isActive) {
164172
PlayerSurface(
165173
player = player,

compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/CommonStatusComponent.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ import compose.icons.fontawesomeicons.regular.Heart
5757
import compose.icons.fontawesomeicons.solid.At
5858
import compose.icons.fontawesomeicons.solid.Bookmark
5959
import compose.icons.fontawesomeicons.solid.CircleInfo
60-
import compose.icons.fontawesomeicons.solid.Comment
6160
import compose.icons.fontawesomeicons.solid.Ellipsis
6261
import compose.icons.fontawesomeicons.solid.Globe
6362
import compose.icons.fontawesomeicons.solid.Heart
@@ -1239,11 +1238,15 @@ private fun ExpandedCard(
12391238
Modifier
12401239
.padding(8.dp),
12411240
) {
1242-
PlatformText(text = card.title)
1241+
PlatformText(
1242+
text = card.title,
1243+
maxLines = 2,
1244+
)
12431245
card.description?.let {
12441246
PlatformText(
12451247
text = it,
12461248
style = PlatformTheme.typography.caption,
1249+
maxLines = 2,
12471250
modifier =
12481251
Modifier
12491252
.alpha(MediumAlpha),

compose-ui/src/iosMain/kotlin/dev/dimension/flare/ui/theme/PlatformColorScheme.ios.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ internal actual object PlatformColorScheme {
2727
get() = CupertinoTheme.colorScheme.tertiaryLabel
2828
actual val card: Color
2929
@Composable
30-
get() = CupertinoTheme.colorScheme.tertiarySystemBackground
30+
get() = CupertinoTheme.colorScheme.secondarySystemBackground
3131
actual val cardAlt: Color
3232
@Composable
33-
get() = CupertinoTheme.colorScheme.secondarySystemBackground
33+
get() = CupertinoTheme.colorScheme.tertiarySystemBackground
3434
actual val onCard: Color
3535
@Composable
3636
get() = CupertinoTheme.colorScheme.label

0 commit comments

Comments
 (0)