ganfra
1 year ago
committed by
GitHub
47 changed files with 402 additions and 77 deletions
@ -0,0 +1,97 @@ |
|||||||
|
/* |
||||||
|
* Copyright (c) 2023 New Vector Ltd |
||||||
|
* |
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||||
|
* you may not use this file except in compliance with the License. |
||||||
|
* You may obtain a copy of the License at |
||||||
|
* |
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0 |
||||||
|
* |
||||||
|
* Unless required by applicable law or agreed to in writing, software |
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS, |
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||||
|
* See the License for the specific language governing permissions and |
||||||
|
* limitations under the License. |
||||||
|
*/ |
||||||
|
|
||||||
|
package io.element.android.features.messages.impl.timeline.components.event |
||||||
|
|
||||||
|
import androidx.compose.foundation.background |
||||||
|
import androidx.compose.foundation.layout.Box |
||||||
|
import androidx.compose.foundation.layout.Column |
||||||
|
import androidx.compose.foundation.layout.Row |
||||||
|
import androidx.compose.foundation.layout.Spacer |
||||||
|
import androidx.compose.foundation.layout.size |
||||||
|
import androidx.compose.foundation.layout.width |
||||||
|
import androidx.compose.foundation.shape.CircleShape |
||||||
|
import androidx.compose.material.icons.Icons |
||||||
|
import androidx.compose.material.icons.outlined.GraphicEq |
||||||
|
import androidx.compose.runtime.Composable |
||||||
|
import androidx.compose.ui.Alignment |
||||||
|
import androidx.compose.ui.Modifier |
||||||
|
import androidx.compose.ui.draw.clip |
||||||
|
import androidx.compose.ui.text.style.TextOverflow |
||||||
|
import androidx.compose.ui.tooling.preview.PreviewParameter |
||||||
|
import androidx.compose.ui.unit.dp |
||||||
|
import androidx.compose.ui.unit.sp |
||||||
|
import io.element.android.features.messages.impl.timeline.model.event.TimelineItemAudioContent |
||||||
|
import io.element.android.features.messages.impl.timeline.model.event.TimelineItemAudioContentProvider |
||||||
|
import io.element.android.libraries.designsystem.preview.DayNightPreviews |
||||||
|
import io.element.android.libraries.designsystem.preview.ElementPreview |
||||||
|
import io.element.android.libraries.designsystem.theme.components.Icon |
||||||
|
import io.element.android.libraries.designsystem.theme.components.Text |
||||||
|
import io.element.android.libraries.theme.ElementTheme |
||||||
|
|
||||||
|
@Composable |
||||||
|
fun TimelineItemAudioView( |
||||||
|
content: TimelineItemAudioContent, |
||||||
|
extraPadding: ExtraPadding, |
||||||
|
modifier: Modifier = Modifier, |
||||||
|
) { |
||||||
|
Row( |
||||||
|
modifier = modifier, |
||||||
|
) { |
||||||
|
Box( |
||||||
|
modifier = Modifier |
||||||
|
.size(32.dp) |
||||||
|
.clip(CircleShape) |
||||||
|
.background(ElementTheme.materialColors.background), |
||||||
|
contentAlignment = Alignment.Center, |
||||||
|
) { |
||||||
|
Icon( |
||||||
|
imageVector = Icons.Outlined.GraphicEq, |
||||||
|
contentDescription = null, |
||||||
|
tint = ElementTheme.materialColors.primary, |
||||||
|
modifier = Modifier |
||||||
|
.size(16.dp), |
||||||
|
) |
||||||
|
} |
||||||
|
Spacer(Modifier.width(8.dp)) |
||||||
|
Column { |
||||||
|
Text( |
||||||
|
text = content.body, |
||||||
|
color = ElementTheme.materialColors.primary, |
||||||
|
maxLines = 2, |
||||||
|
style = ElementTheme.typography.fontBodyLgRegular, |
||||||
|
overflow = TextOverflow.Ellipsis |
||||||
|
) |
||||||
|
Text( |
||||||
|
text = content.fileExtensionAndSize + extraPadding.getStr(12.sp), |
||||||
|
color = ElementTheme.materialColors.secondary, |
||||||
|
style = ElementTheme.typography.fontBodySmRegular, |
||||||
|
maxLines = 1, |
||||||
|
overflow = TextOverflow.Ellipsis, |
||||||
|
) |
||||||
|
} |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
@DayNightPreviews |
||||||
|
@Composable |
||||||
|
internal fun TimelineItemAudioViewPreview(@PreviewParameter(TimelineItemAudioContentProvider::class) content: TimelineItemAudioContent) = |
||||||
|
ElementPreview { |
||||||
|
TimelineItemAudioView( |
||||||
|
content, |
||||||
|
extraPadding = noExtraPadding, |
||||||
|
) |
||||||
|
} |
||||||
@ -0,0 +1,33 @@ |
|||||||
|
/* |
||||||
|
* Copyright (c) 2022 New Vector Ltd |
||||||
|
* |
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||||
|
* you may not use this file except in compliance with the License. |
||||||
|
* You may obtain a copy of the License at |
||||||
|
* |
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0 |
||||||
|
* |
||||||
|
* Unless required by applicable law or agreed to in writing, software |
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS, |
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||||
|
* See the License for the specific language governing permissions and |
||||||
|
* limitations under the License. |
||||||
|
*/ |
||||||
|
|
||||||
|
package io.element.android.features.messages.impl.timeline.model.event |
||||||
|
|
||||||
|
import io.element.android.features.messages.impl.media.helper.formatFileExtensionAndSize |
||||||
|
import io.element.android.libraries.matrix.api.media.MediaSource |
||||||
|
|
||||||
|
data class TimelineItemAudioContent( |
||||||
|
val body: String, |
||||||
|
val duration: Long, |
||||||
|
val audioSource: MediaSource, |
||||||
|
val mimeType: String, |
||||||
|
val formattedFileSize: String, |
||||||
|
val fileExtension: String, |
||||||
|
) : TimelineItemEventContent { |
||||||
|
|
||||||
|
val fileExtensionAndSize = formatFileExtensionAndSize(fileExtension, formattedFileSize) |
||||||
|
override val type: String = "TimelineItemAudioContent" |
||||||
|
} |
||||||
@ -0,0 +1,39 @@ |
|||||||
|
/* |
||||||
|
* Copyright (c) 2023 New Vector Ltd |
||||||
|
* |
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||||
|
* you may not use this file except in compliance with the License. |
||||||
|
* You may obtain a copy of the License at |
||||||
|
* |
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0 |
||||||
|
* |
||||||
|
* Unless required by applicable law or agreed to in writing, software |
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS, |
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||||
|
* See the License for the specific language governing permissions and |
||||||
|
* limitations under the License. |
||||||
|
*/ |
||||||
|
|
||||||
|
package io.element.android.features.messages.impl.timeline.model.event |
||||||
|
|
||||||
|
import androidx.compose.ui.tooling.preview.PreviewParameterProvider |
||||||
|
import io.element.android.libraries.core.mimetype.MimeTypes |
||||||
|
import io.element.android.libraries.matrix.api.media.MediaSource |
||||||
|
|
||||||
|
open class TimelineItemAudioContentProvider : PreviewParameterProvider<TimelineItemAudioContent> { |
||||||
|
override val values: Sequence<TimelineItemAudioContent> |
||||||
|
get() = sequenceOf( |
||||||
|
aTimelineItemAudioContent("A sound.mp3"), |
||||||
|
aTimelineItemAudioContent("A bigger name sound.mp3"), |
||||||
|
aTimelineItemAudioContent("An even bigger bigger bigger bigger bigger bigger bigger sound name which doesn't fit .mp3"), |
||||||
|
) |
||||||
|
} |
||||||
|
|
||||||
|
fun aTimelineItemAudioContent(fileName: String = "A sound.mp3") = TimelineItemAudioContent( |
||||||
|
body = fileName, |
||||||
|
mimeType = MimeTypes.Pdf, |
||||||
|
formattedFileSize = "100kB", |
||||||
|
fileExtension = "mp3", |
||||||
|
duration = 100, |
||||||
|
audioSource = MediaSource(""), |
||||||
|
) |
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in new issue