-
Notifications
You must be signed in to change notification settings - Fork 155
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3240 from element-hq/feature/valere/message_shields
Timeline UI | MessageShield Support
- Loading branch information
Showing
48 changed files
with
689 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
62 changes: 62 additions & 0 deletions
62
...in/io/element/android/features/messages/impl/timeline/TimelineViewMessageShieldPreview.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| /* | ||
| * Copyright (c) 2024 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 | ||
|
|
||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.CompositionLocalProvider | ||
| import io.element.android.features.messages.impl.timeline.components.aCriticalShield | ||
| import io.element.android.features.messages.impl.timeline.di.LocalTimelineItemPresenterFactories | ||
| import io.element.android.features.messages.impl.timeline.di.aFakeTimelineItemPresenterFactories | ||
| import io.element.android.features.messages.impl.timeline.model.TimelineItem | ||
| import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemTextContent | ||
| import io.element.android.features.messages.impl.typing.aTypingNotificationState | ||
| import io.element.android.libraries.designsystem.preview.ElementPreview | ||
| import io.element.android.libraries.designsystem.preview.PreviewsDayNight | ||
| import kotlinx.collections.immutable.toImmutableList | ||
|
|
||
| @PreviewsDayNight | ||
| @Composable | ||
| internal fun TimelineViewMessageShieldPreview() = ElementPreview { | ||
| val timelineItems = aTimelineItemList(aTimelineItemTextContent()) | ||
| // For consistency, ensure that there is a message in the timeline (the last one) with an error. | ||
| val messageShield = aCriticalShield() | ||
| val items = listOf( | ||
| (timelineItems.first() as TimelineItem.Event).copy(messageShield = messageShield) | ||
| ) + timelineItems.drop(1) | ||
| CompositionLocalProvider( | ||
| LocalTimelineItemPresenterFactories provides aFakeTimelineItemPresenterFactories(), | ||
| ) { | ||
| TimelineView( | ||
| state = aTimelineState( | ||
| timelineItems = items.toImmutableList(), | ||
| messageShield = messageShield, | ||
| ), | ||
| typingNotificationState = aTypingNotificationState(), | ||
| onUserDataClick = {}, | ||
| onLinkClick = {}, | ||
| onMessageClick = {}, | ||
| onMessageLongClick = {}, | ||
| onSwipeToReply = {}, | ||
| onReactionClick = { _, _ -> }, | ||
| onReactionLongClick = { _, _ -> }, | ||
| onMoreReactionsClick = {}, | ||
| onReadReceiptClick = {}, | ||
| onJoinCallClick = {}, | ||
| forceJumpToBottomVisibility = true, | ||
| ) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.