Benoit Marty
1 year ago
committed by
Benoit Marty
12 changed files with 266 additions and 33 deletions
@ -0,0 +1,99 @@
@@ -0,0 +1,99 @@
|
||||
/* |
||||
* 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 |
||||
|
||||
import androidx.compose.foundation.ExperimentalFoundationApi |
||||
import androidx.compose.foundation.combinedClickable |
||||
import androidx.compose.foundation.interaction.MutableInteractionSource |
||||
import androidx.compose.foundation.layout.Column |
||||
import androidx.compose.foundation.layout.Spacer |
||||
import androidx.compose.foundation.layout.size |
||||
import androidx.compose.foundation.layout.widthIn |
||||
import androidx.compose.foundation.shape.RoundedCornerShape |
||||
import androidx.compose.material.ripple.rememberRipple |
||||
import androidx.compose.runtime.Composable |
||||
import androidx.compose.ui.Modifier |
||||
import androidx.compose.ui.draw.clip |
||||
import androidx.compose.ui.graphics.Color |
||||
import androidx.compose.ui.tooling.preview.Preview |
||||
import androidx.compose.ui.unit.dp |
||||
import io.element.android.libraries.designsystem.preview.ElementPreviewDark |
||||
import io.element.android.libraries.designsystem.preview.ElementPreviewLight |
||||
import io.element.android.libraries.designsystem.theme.ElementTheme |
||||
import io.element.android.libraries.designsystem.theme.components.Surface |
||||
|
||||
private val CORNER_RADIUS = 8.dp |
||||
|
||||
@OptIn(ExperimentalFoundationApi::class) |
||||
@Composable |
||||
fun MessageStateEventContainer( |
||||
isHighlighted: Boolean, |
||||
interactionSource: MutableInteractionSource, |
||||
modifier: Modifier = Modifier, |
||||
onClick: () -> Unit = {}, |
||||
onLongClick: () -> Unit = {}, |
||||
content: @Composable () -> Unit = {}, |
||||
) { |
||||
val backgroundColor = if (isHighlighted) { |
||||
ElementTheme.colors.messageHighlightedBackground |
||||
} else { |
||||
Color.Companion.Transparent |
||||
} |
||||
val shape = RoundedCornerShape(CORNER_RADIUS) |
||||
Surface( |
||||
modifier = modifier |
||||
.widthIn(min = 80.dp) |
||||
.clip(shape) |
||||
.combinedClickable( |
||||
onClick = onClick, |
||||
onLongClick = onLongClick, |
||||
indication = rememberRipple(), |
||||
interactionSource = interactionSource |
||||
), |
||||
color = backgroundColor, |
||||
shape = shape, |
||||
content = content |
||||
) |
||||
} |
||||
|
||||
@Preview |
||||
@Composable |
||||
internal fun MessageStateEventContainerLightPreview() = |
||||
ElementPreviewLight { ContentToPreview() } |
||||
|
||||
@Preview |
||||
@Composable |
||||
internal fun MessageStateEventContainerDarkPreview() = |
||||
ElementPreviewDark { ContentToPreview() } |
||||
|
||||
@Composable |
||||
private fun ContentToPreview() { |
||||
Column { |
||||
MessageStateEventContainer( |
||||
isHighlighted = false, |
||||
interactionSource = MutableInteractionSource(), |
||||
) { |
||||
Spacer(modifier = Modifier.size(width = 120.dp, height = 32.dp)) |
||||
} |
||||
MessageStateEventContainer( |
||||
isHighlighted = true, |
||||
interactionSource = MutableInteractionSource(), |
||||
) { |
||||
Spacer(modifier = Modifier.size(width = 120.dp, height = 32.dp)) |
||||
} |
||||
} |
||||
} |
||||
@ -0,0 +1,58 @@
@@ -0,0 +1,58 @@
|
||||
/* |
||||
* 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.material3.MaterialTheme |
||||
import androidx.compose.runtime.Composable |
||||
import androidx.compose.ui.Modifier |
||||
import androidx.compose.ui.text.style.TextAlign |
||||
import androidx.compose.ui.tooling.preview.Preview |
||||
import androidx.compose.ui.unit.sp |
||||
import io.element.android.features.messages.impl.timeline.model.event.TimelineItemStateContent |
||||
import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemStateEventContent |
||||
import io.element.android.libraries.designsystem.preview.ElementPreviewDark |
||||
import io.element.android.libraries.designsystem.preview.ElementPreviewLight |
||||
import io.element.android.libraries.designsystem.theme.components.Text |
||||
|
||||
@Composable |
||||
fun TimelineItemStateView( |
||||
content: TimelineItemStateContent, |
||||
modifier: Modifier = Modifier |
||||
) { |
||||
Text( |
||||
modifier = modifier, |
||||
color = MaterialTheme.colorScheme.secondary, |
||||
fontSize = 13.sp, |
||||
text = content.body, |
||||
textAlign = TextAlign.Center, |
||||
) |
||||
} |
||||
|
||||
@Preview |
||||
@Composable |
||||
internal fun TimelineItemStateViewLightPreview() = ElementPreviewLight { ContentToPreview() } |
||||
|
||||
@Preview |
||||
@Composable |
||||
internal fun TimelineItemStateViewDarkPreview() = ElementPreviewDark { ContentToPreview() } |
||||
|
||||
@Composable |
||||
private fun ContentToPreview() { |
||||
TimelineItemStateView( |
||||
content = aTimelineItemStateEventContent(), |
||||
) |
||||
} |
||||
@ -0,0 +1,21 @@
@@ -0,0 +1,21 @@
|
||||
/* |
||||
* 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 |
||||
|
||||
sealed interface TimelineItemStateContent : TimelineItemEventContent { |
||||
val body: String |
||||
} |
||||
Loading…
Reference in new issue