Skip to content

Commit b889e86

Browse files
bmartybmarty
committed
Rename hideContent to hideMediaContent 
1 parent fafd5d4 commit b889e86

File tree

14 files changed

+42
-42
lines changed

14 files changed

+42
-42
lines changed

‎features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ class MessagesPresenter @AssistedInject constructor(
402402
val replyToDetails = loadReplyDetails(targetEvent.eventId).map(permalinkParser)
403403
val composerMode = MessageComposerMode.Reply(
404404
replyToDetails = replyToDetails,
405-
hideImage = timelineProtectionState.hideContent(targetEvent.eventId),
405+
hideImage = timelineProtectionState.hideMediaContent(targetEvent.eventId),
406406
)
407407
composerState.eventSink(
408408
MessageComposerEvents.SetMode(composerMode)

‎features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListView.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ private fun TimelineItemEventContentViewWrapper(
256256
} else {
257257
TimelineItemEventContentView(
258258
content = event.content,
259-
hideContent = timelineProtectionState.hideContent(event.eventId),
259+
hideMediaContent = timelineProtectionState.hideMediaContent(event.eventId),
260260
onShowClick = { timelineProtectionState.eventSink(TimelineProtectionEvent.ShowContent(event.eventId)) },
261261
onLinkClick = onLinkClick,
262262
eventSink = { },

‎features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ fun TimelineItemEventRow(
129129
eventContentView: @Composable (Modifier, (ContentAvoidingLayoutData) -> Unit) -> Unit = { contentModifier, onContentLayoutChange ->
130130
TimelineItemEventContentView(
131131
content = event.content,
132-
hideContent = timelineProtectionState.hideContent(event.eventId),
132+
hideMediaContent = timelineProtectionState.hideMediaContent(event.eventId),
133133
onShowClick = { timelineProtectionState.eventSink(TimelineProtectionEvent.ShowContent(event.eventId)) },
134134
onLinkClick = onLinkClick,
135135
eventSink = eventSink,
@@ -572,7 +572,7 @@ private fun MessageEventBubbleContent(
572572
.clickable(onClick = inReplyToClick)
573573
InReplyToView(
574574
inReplyTo = inReplyTo,
575-
hideImage = timelineProtectionState.hideContent(inReplyTo.eventId()),
575+
hideImage = timelineProtectionState.hideMediaContent(inReplyTo.eventId()),
576576
modifier = inReplyToModifier,
577577
)
578578
}

‎features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemGroupedEventsRow.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ fun TimelineItemGroupedEventsRow(
5656
{ event, contentModifier, onContentLayoutChange ->
5757
TimelineItemEventContentView(
5858
content = event.content,
59-
hideContent = timelineProtectionState.hideContent(event.eventId),
59+
hideMediaContent = timelineProtectionState.hideMediaContent(event.eventId),
6060
onShowClick = { timelineProtectionState.eventSink(TimelineProtectionEvent.ShowContent(event.eventId)) },
6161
onLinkClick = onLinkClick,
6262
eventSink = eventSink,
@@ -120,7 +120,7 @@ private fun TimelineItemGroupedEventsRowContent(
120120
{ event, contentModifier, onContentLayoutChange ->
121121
TimelineItemEventContentView(
122122
content = event.content,
123-
hideContent = timelineProtectionState.hideContent(event.eventId),
123+
hideMediaContent = timelineProtectionState.hideMediaContent(event.eventId),
124124
onShowClick = { timelineProtectionState.eventSink(TimelineProtectionEvent.ShowContent(event.eventId)) },
125125
onLinkClick = onLinkClick,
126126
eventSink = eventSink,

‎features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemRow.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ internal fun TimelineItemRow(
5959
{ event, contentModifier, onContentLayoutChange ->
6060
TimelineItemEventContentView(
6161
content = event.content,
62-
hideContent = timelineProtectionState.hideContent(event.eventId),
62+
hideMediaContent = timelineProtectionState.hideMediaContent(event.eventId),
6363
onShowClick = { timelineProtectionState.eventSink(TimelineProtectionEvent.ShowContent(event.eventId)) },
6464
onLinkClick = onLinkClick,
6565
eventSink = eventSink,
@@ -118,7 +118,7 @@ internal fun TimelineItemRow(
118118
timelineProtectionState = timelineProtectionState,
119119
isLastOutgoingMessage = isLastOutgoingMessage,
120120
isHighlighted = timelineItem.isEvent(focusedEventId),
121-
onClick = if (timelineProtectionState.hideContent(timelineItem.eventId) && timelineItem.mustBeProtected()) {
121+
onClick = if (timelineProtectionState.hideMediaContent(timelineItem.eventId) && timelineItem.mustBeProtected()) {
122122
{}
123123
} else {
124124
{ onClick(timelineItem) }

‎features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemStateEventRow.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ fun TimelineItemStateEventRow(
7171
TimelineItemEventContentView(
7272
content = event.content,
7373
onLinkClick = {},
74-
hideContent = false,
74+
hideMediaContent = false,
7575
onShowClick = {},
7676
eventSink = eventSink,
7777
modifier = Modifier.defaultTimelineContentPadding()

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import io.element.android.libraries.architecture.Presenter
3535
@Composable
3636
fun TimelineItemEventContentView(
3737
content: TimelineItemEventContent,
38-
hideContent: Boolean,
38+
hideMediaContent: Boolean,
3939
onShowClick: () -> Unit,
4040
onLinkClick: (url: String) -> Unit,
4141
eventSink: (TimelineEvents.EventFromTimelineItem) -> Unit,
@@ -71,20 +71,20 @@ fun TimelineItemEventContentView(
7171
)
7272
is TimelineItemImageContent -> TimelineItemImageView(
7373
content = content,
74-
hideContent = hideContent,
74+
hideMediaContent = hideMediaContent,
7575
onShowClick = onShowClick,
7676
onContentLayoutChange = onContentLayoutChange,
7777
modifier = modifier,
7878
)
7979
is TimelineItemStickerContent -> TimelineItemStickerView(
8080
content = content,
81-
hideContent = hideContent,
81+
hideMediaContent = hideMediaContent,
8282
onShowClick = onShowClick,
8383
modifier = modifier,
8484
)
8585
is TimelineItemVideoContent -> TimelineItemVideoView(
8686
content = content,
87-
hideContent = hideContent,
87+
hideMediaContent = hideMediaContent,
8888
onShowClick = onShowClick,
8989
onContentLayoutChange = onContentLayoutChange,
9090
modifier = modifier

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ import io.element.android.wysiwyg.compose.EditorStyledText
5959
@Composable
6060
fun TimelineItemImageView(
6161
content: TimelineItemImageContent,
62-
hideContent: Boolean,
62+
hideMediaContent: Boolean,
6363
onShowClick: () -> Unit,
6464
onContentLayoutChange: (ContentAvoidingLayoutData) -> Unit,
6565
modifier: Modifier = Modifier,
@@ -80,7 +80,7 @@ fun TimelineItemImageView(
8080
aspectRatio = content.aspectRatio,
8181
) {
8282
ProtectedView(
83-
hideContent = hideContent,
83+
hideContent = hideMediaContent,
8484
onShowClick = onShowClick,
8585
) {
8686
var isLoaded by remember { mutableStateOf(false) }
@@ -133,18 +133,18 @@ fun TimelineItemImageView(
133133
internal fun TimelineItemImageViewPreview(@PreviewParameter(TimelineItemImageContentProvider::class) content: TimelineItemImageContent) = ElementPreview {
134134
TimelineItemImageView(
135135
content = content,
136-
hideContent = false,
136+
hideMediaContent = false,
137137
onShowClick = {},
138138
onContentLayoutChange = {},
139139
)
140140
}
141141

142142
@PreviewsDayNight
143143
@Composable
144-
internal fun TimelineItemImageViewHideContentPreview() = ElementPreview {
144+
internal fun TimelineItemImageViewHideMediaContentPreview() = ElementPreview {
145145
TimelineItemImageView(
146146
content = aTimelineItemImageContent(),
147-
hideContent = true,
147+
hideMediaContent = true,
148148
onShowClick = {},
149149
onContentLayoutChange = {},
150150
)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ private const val STICKER_SIZE_IN_DP = 128
3939
@Composable
4040
fun TimelineItemStickerView(
4141
content: TimelineItemStickerContent,
42-
hideContent: Boolean,
42+
hideMediaContent: Boolean,
4343
onShowClick: () -> Unit,
4444
modifier: Modifier = Modifier,
4545
) {
@@ -54,7 +54,7 @@ fun TimelineItemStickerView(
5454
maxHeight = STICKER_SIZE_IN_DP,
5555
) {
5656
ProtectedView(
57-
hideContent = hideContent,
57+
hideContent = hideMediaContent,
5858
onShowClick = onShowClick,
5959
) {
6060
var isLoaded by remember { mutableStateOf(false) }
@@ -84,7 +84,7 @@ fun TimelineItemStickerView(
8484
internal fun TimelineItemStickerViewPreview(@PreviewParameter(TimelineItemStickerContentProvider::class) content: TimelineItemStickerContent) = ElementPreview {
8585
TimelineItemStickerView(
8686
content = content,
87-
hideContent = false,
87+
hideMediaContent = false,
8888
onShowClick = {},
8989
)
9090
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ import io.element.android.wysiwyg.compose.EditorStyledText
6565
@Composable
6666
fun TimelineItemVideoView(
6767
content: TimelineItemVideoContent,
68-
hideContent: Boolean,
68+
hideMediaContent: Boolean,
6969
onShowClick: () -> Unit,
7070
onContentLayoutChange: (ContentAvoidingLayoutData) -> Unit,
7171
modifier: Modifier = Modifier,
@@ -87,7 +87,7 @@ fun TimelineItemVideoView(
8787
contentAlignment = Alignment.Center,
8888
) {
8989
ProtectedView(
90-
hideContent = hideContent,
90+
hideContent = hideMediaContent,
9191
onShowClick = onShowClick,
9292
) {
9393
var isLoaded by remember { mutableStateOf(false) }
@@ -151,18 +151,18 @@ fun TimelineItemVideoView(
151151
internal fun TimelineItemVideoViewPreview(@PreviewParameter(TimelineItemVideoContentProvider::class) content: TimelineItemVideoContent) = ElementPreview {
152152
TimelineItemVideoView(
153153
content = content,
154-
hideContent = false,
154+
hideMediaContent = false,
155155
onShowClick = {},
156156
onContentLayoutChange = {},
157157
)
158158
}
159159

160160
@PreviewsDayNight
161161
@Composable
162-
internal fun TimelineItemVideoViewHideContentPreview() = ElementPreview {
162+
internal fun TimelineItemVideoViewHideMediaContentPreview() = ElementPreview {
163163
TimelineItemVideoView(
164164
content = aTimelineItemVideoContent(),
165-
hideContent = true,
165+
hideMediaContent = true,
166166
onShowClick = {},
167167
onContentLayoutChange = {},
168168
)

0 commit comments

Comments
 (0)