Skip to content

Commit d273dd0

Browse files
committed
Media: Clean after pr reviews
1 parent 84500d4 commit d273dd0

File tree

6 files changed

+17
-31
lines changed

6 files changed

+17
-31
lines changed

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListView.kt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,6 @@ private fun MessageSummary(event: TimelineItem.Event, modifier: Modifier = Modif
247247
info = AttachmentThumbnailInfo(
248248
type = AttachmentThumbnailType.Location,
249249
textContent = stringResource(CommonStrings.common_shared_location),
250-
thumbnailSource = null,
251-
blurHash = null,
252250
)
253251
)
254252
}
@@ -261,7 +259,7 @@ private fun MessageSummary(event: TimelineItem.Event, modifier: Modifier = Modif
261259
info = AttachmentThumbnailInfo(
262260
thumbnailSource = event.content.mediaSource,
263261
textContent = textContent,
264-
type = AttachmentThumbnailType.File,
262+
type = AttachmentThumbnailType.Image,
265263
blurHash = event.content.blurhash,
266264
)
267265
)
@@ -290,7 +288,6 @@ private fun MessageSummary(event: TimelineItem.Event, modifier: Modifier = Modif
290288
thumbnailSource = event.content.thumbnailSource,
291289
textContent = textContent,
292290
type = AttachmentThumbnailType.File,
293-
blurHash = null
294291
)
295292
)
296293
}

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemAudioView.kt

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,19 @@ import androidx.compose.foundation.layout.size
2525
import androidx.compose.foundation.layout.width
2626
import androidx.compose.foundation.shape.CircleShape
2727
import androidx.compose.material.icons.Icons
28-
import androidx.compose.material.icons.outlined.Attachment
2928
import androidx.compose.material.icons.outlined.GraphicEq
3029
import androidx.compose.runtime.Composable
3130
import androidx.compose.ui.Alignment
3231
import androidx.compose.ui.Modifier
3332
import androidx.compose.ui.draw.clip
34-
import androidx.compose.ui.draw.rotate
3533
import androidx.compose.ui.text.style.TextOverflow
36-
import androidx.compose.ui.tooling.preview.Preview
3734
import androidx.compose.ui.tooling.preview.PreviewParameter
3835
import androidx.compose.ui.unit.dp
3936
import androidx.compose.ui.unit.sp
4037
import io.element.android.features.messages.impl.timeline.model.event.TimelineItemAudioContent
4138
import io.element.android.features.messages.impl.timeline.model.event.TimelineItemAudioContentProvider
42-
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
43-
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
39+
import io.element.android.libraries.designsystem.preview.DayNightPreviews
40+
import io.element.android.libraries.designsystem.preview.ElementPreview
4441
import io.element.android.libraries.designsystem.theme.components.Icon
4542
import io.element.android.libraries.designsystem.theme.components.Text
4643
import io.element.android.libraries.theme.ElementTheme
@@ -89,20 +86,12 @@ fun TimelineItemAudioView(
8986
}
9087
}
9188

92-
@Preview
89+
@DayNightPreviews
9390
@Composable
94-
internal fun TimelineItemAudioViewLightPreview(@PreviewParameter(TimelineItemAudioContentProvider::class) content: TimelineItemAudioContent) =
95-
ElementPreviewLight { ContentToPreview(content) }
96-
97-
@Preview
98-
@Composable
99-
internal fun TimelineItemAudioViewDarkPreview(@PreviewParameter(TimelineItemAudioContentProvider::class) content: TimelineItemAudioContent) =
100-
ElementPreviewDark { ContentToPreview(content) }
101-
102-
@Composable
103-
private fun ContentToPreview(content: TimelineItemAudioContent) {
104-
TimelineItemAudioView(
105-
content,
106-
extraPadding = noExtraPadding,
107-
)
108-
}
91+
internal fun TimelineItemAudioViewPreview(@PreviewParameter(TimelineItemAudioContentProvider::class) content: TimelineItemAudioContent) =
92+
ElementPreview {
93+
TimelineItemAudioView(
94+
content,
95+
extraPadding = noExtraPadding,
96+
)
97+
}

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemEventContentProvider.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class TimelineItemEventContentProvider : PreviewParameterProvider<TimelineItemEv
2626
aTimelineItemEncryptedContent(),
2727
aTimelineItemImageContent(),
2828
aTimelineItemVideoContent(),
29-
aTimelineItemFileContent("A file.pdf"),
29+
aTimelineItemFileContent(),
3030
aTimelineItemFileContent("A bigger file name which doesn't fit.pdf"),
3131
aTimelineItemLocationContent(),
3232
aTimelineItemLocationContent("Location description"),

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemFileContentProvider.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ import io.element.android.libraries.matrix.api.media.MediaSource
2323
open class TimelineItemFileContentProvider : PreviewParameterProvider<TimelineItemFileContent> {
2424
override val values: Sequence<TimelineItemFileContent>
2525
get() = sequenceOf(
26-
aTimelineItemFileContent("A file.pdf"),
26+
aTimelineItemFileContent(),
2727
aTimelineItemFileContent("A bigger name file.pdf"),
2828
aTimelineItemFileContent("An even bigger bigger bigger bigger bigger bigger bigger file name which doesn't fit .pdf"),
2929
)
3030
}
3131

3232
fun aTimelineItemFileContent(fileName: String = "A file.pdf") = TimelineItemFileContent(
3333
body = fileName,
34-
thumbnailSource = MediaSource(url = ""),
34+
thumbnailSource = null,
3535
fileSource = MediaSource(url = ""),
3636
mimeType = MimeTypes.Pdf,
3737
formattedFileSize = "100kB",

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemVideoContentProvider.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ open class TimelineItemVideoContentProvider : PreviewParameterProvider<TimelineI
3131

3232
fun aTimelineItemVideoContent() = TimelineItemVideoContent(
3333
body = "Video.mp4",
34-
thumbnailSource = MediaSource(url = ""),
34+
thumbnailSource = null,
3535
blurHash = "TQF5:I_NtRE4kXt7Z#MwkCIARPjr",
3636
aspectRatio = 0.5f,
3737
duration = 100,

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/ProgressDialog.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ sealed interface ProgressDialogType {
9595
private fun ProgressDialogContent(
9696
modifier: Modifier = Modifier,
9797
text: String? = null,
98-
isCancellable: Boolean = true,
98+
isCancellable: Boolean = false,
9999
onCancelClicked: () -> Unit = {},
100100
progressIndicator: @Composable () -> Unit = {
101101
CircularProgressIndicator(
@@ -145,6 +145,6 @@ internal fun ProgressDialogPreview() = ElementThemedPreview { ContentToPreview()
145145
@Composable
146146
private fun ContentToPreview() {
147147
DialogPreview {
148-
ProgressDialogContent(text = "test dialog content")
148+
ProgressDialogContent(text = "test dialog content", isCancellable = true)
149149
}
150150
}

0 commit comments

Comments
 (0)