|
|
@ -72,7 +72,9 @@ fun TimelineItemVideoView( |
|
|
|
modifier = modifier.semantics { contentDescription = description } |
|
|
|
modifier = modifier.semantics { contentDescription = description } |
|
|
|
) { |
|
|
|
) { |
|
|
|
val containerModifier = if (content.showCaption) { |
|
|
|
val containerModifier = if (content.showCaption) { |
|
|
|
Modifier.padding(top = 6.dp).clip(RoundedCornerShape(6.dp)) |
|
|
|
Modifier |
|
|
|
|
|
|
|
.padding(top = 6.dp) |
|
|
|
|
|
|
|
.clip(RoundedCornerShape(6.dp)) |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
Modifier |
|
|
|
Modifier |
|
|
|
} |
|
|
|
} |
|
|
@ -116,9 +118,10 @@ fun TimelineItemVideoView( |
|
|
|
LocalContentColor provides ElementTheme.colors.textPrimary, |
|
|
|
LocalContentColor provides ElementTheme.colors.textPrimary, |
|
|
|
LocalTextStyle provides ElementTheme.typography.fontBodyLgRegular, |
|
|
|
LocalTextStyle provides ElementTheme.typography.fontBodyLgRegular, |
|
|
|
) { |
|
|
|
) { |
|
|
|
|
|
|
|
val aspectRatio = content.aspectRatio ?: DEFAULT_ASPECT_RATIO |
|
|
|
EditorStyledText( |
|
|
|
EditorStyledText( |
|
|
|
modifier = Modifier |
|
|
|
modifier = Modifier |
|
|
|
.widthIn(min = MIN_HEIGHT_IN_DP.dp * content.aspectRatio!!, max = MAX_HEIGHT_IN_DP.dp * content.aspectRatio), |
|
|
|
.widthIn(min = MIN_HEIGHT_IN_DP.dp * aspectRatio, max = MAX_HEIGHT_IN_DP.dp * aspectRatio), |
|
|
|
text = caption, |
|
|
|
text = caption, |
|
|
|
style = ElementRichTextEditorStyle.textStyle(), |
|
|
|
style = ElementRichTextEditorStyle.textStyle(), |
|
|
|
releaseOnDetach = false, |
|
|
|
releaseOnDetach = false, |
|
|
@ -152,5 +155,16 @@ internal fun TimelineVideoWithCaptionRowPreview() = ElementPreview { |
|
|
|
), |
|
|
|
), |
|
|
|
) |
|
|
|
) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
ATimelineItemEventRow( |
|
|
|
|
|
|
|
event = aTimelineItemEvent( |
|
|
|
|
|
|
|
isMine = false, |
|
|
|
|
|
|
|
content = aTimelineItemVideoContent().copy( |
|
|
|
|
|
|
|
filename = "video.mp4", |
|
|
|
|
|
|
|
body = "Video with null aspect ratio", |
|
|
|
|
|
|
|
aspectRatio = null, |
|
|
|
|
|
|
|
), |
|
|
|
|
|
|
|
groupPosition = TimelineItemGroupPosition.Last, |
|
|
|
|
|
|
|
), |
|
|
|
|
|
|
|
) |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|