mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-03 16:10:00 +00:00
Remove the FloatingDateBadge feature flag (#6950)
* Remove the `FloatingDateBadge` feature. This is now always enabled. * Update screenshots --------- Co-authored-by: ElementBot <android@element.io>
This commit is contained in:
committed by
GitHub
parent
4812cf9070
commit
2ab780576a
-4
@@ -148,9 +148,6 @@ class TimelinePresenter(
|
|||||||
val displayThreadSummaries by produceState(false) {
|
val displayThreadSummaries by produceState(false) {
|
||||||
value = featureFlagService.isFeatureEnabled(FeatureFlags.Threads)
|
value = featureFlagService.isFeatureEnabled(FeatureFlags.Threads)
|
||||||
}
|
}
|
||||||
val displayFloatingDateBadge by produceState(false) {
|
|
||||||
value = featureFlagService.isFeatureEnabled(FeatureFlags.FloatingDateBadge)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun handleEvent(event: TimelineEvent) {
|
fun handleEvent(event: TimelineEvent) {
|
||||||
when (event) {
|
when (event) {
|
||||||
@@ -323,7 +320,6 @@ class TimelinePresenter(
|
|||||||
messageShieldDialogData = messageShieldDialogData.value,
|
messageShieldDialogData = messageShieldDialogData.value,
|
||||||
resolveVerifiedUserSendFailureState = resolveVerifiedUserSendFailureState,
|
resolveVerifiedUserSendFailureState = resolveVerifiedUserSendFailureState,
|
||||||
displayThreadSummaries = displayThreadSummaries,
|
displayThreadSummaries = displayThreadSummaries,
|
||||||
displayFloatingDateBadge = displayFloatingDateBadge,
|
|
||||||
eventSink = ::handleEvent,
|
eventSink = ::handleEvent,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
-1
@@ -34,7 +34,6 @@ data class TimelineState(
|
|||||||
val messageShieldDialogData: MessageShieldData?,
|
val messageShieldDialogData: MessageShieldData?,
|
||||||
val resolveVerifiedUserSendFailureState: ResolveVerifiedUserSendFailureState,
|
val resolveVerifiedUserSendFailureState: ResolveVerifiedUserSendFailureState,
|
||||||
val displayThreadSummaries: Boolean,
|
val displayThreadSummaries: Boolean,
|
||||||
val displayFloatingDateBadge: Boolean,
|
|
||||||
val eventSink: (TimelineEvent) -> Unit,
|
val eventSink: (TimelineEvent) -> Unit,
|
||||||
) {
|
) {
|
||||||
private val lastTimelineEvent = timelineItems.firstOrNull { it is TimelineItem.Event } as? TimelineItem.Event
|
private val lastTimelineEvent = timelineItems.firstOrNull { it is TimelineItem.Event } as? TimelineItem.Event
|
||||||
|
|||||||
-2
@@ -58,7 +58,6 @@ fun aTimelineState(
|
|||||||
messageShield: MessageShield? = null,
|
messageShield: MessageShield? = null,
|
||||||
resolveVerifiedUserSendFailureState: ResolveVerifiedUserSendFailureState = aResolveVerifiedUserSendFailureState(),
|
resolveVerifiedUserSendFailureState: ResolveVerifiedUserSendFailureState = aResolveVerifiedUserSendFailureState(),
|
||||||
displayThreadSummaries: Boolean = false,
|
displayThreadSummaries: Boolean = false,
|
||||||
displayFloatingDateBadge: Boolean = false,
|
|
||||||
eventSink: (TimelineEvent) -> Unit = {},
|
eventSink: (TimelineEvent) -> Unit = {},
|
||||||
): TimelineState {
|
): TimelineState {
|
||||||
val focusedEventId = timelineItems.filterIsInstance<TimelineItem.Event>().getOrNull(focusedEventIndex)?.eventId
|
val focusedEventId = timelineItems.filterIsInstance<TimelineItem.Event>().getOrNull(focusedEventIndex)?.eventId
|
||||||
@@ -78,7 +77,6 @@ fun aTimelineState(
|
|||||||
messageShieldDialogData = messageShield?.let { MessageShieldData(it) },
|
messageShieldDialogData = messageShield?.let { MessageShieldData(it) },
|
||||||
resolveVerifiedUserSendFailureState = resolveVerifiedUserSendFailureState,
|
resolveVerifiedUserSendFailureState = resolveVerifiedUserSendFailureState,
|
||||||
displayThreadSummaries = displayThreadSummaries,
|
displayThreadSummaries = displayThreadSummaries,
|
||||||
displayFloatingDateBadge = displayFloatingDateBadge,
|
|
||||||
eventSink = eventSink,
|
eventSink = eventSink,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -213,7 +213,7 @@ fun TimelineView(
|
|||||||
onFocusEventRender = ::onFocusEventRender,
|
onFocusEventRender = ::onFocusEventRender,
|
||||||
)
|
)
|
||||||
|
|
||||||
if (state.displayFloatingDateBadge && useReverseLayout) {
|
if (useReverseLayout) {
|
||||||
FloatingDateBadgeOverlay(
|
FloatingDateBadgeOverlay(
|
||||||
lazyListState = lazyListState,
|
lazyListState = lazyListState,
|
||||||
timelineItems = state.timelineItems,
|
timelineItems = state.timelineItems,
|
||||||
|
|||||||
-7
@@ -108,13 +108,6 @@ enum class FeatureFlags(
|
|||||||
defaultValue = { true },
|
defaultValue = { true },
|
||||||
isFinished = false,
|
isFinished = false,
|
||||||
),
|
),
|
||||||
FloatingDateBadge(
|
|
||||||
key = "feature.floating_date_badge",
|
|
||||||
title = "Display sticky date headers in the timeline",
|
|
||||||
description = "When scrolling, a sticky date badge will be displayed so you can easily know on which date the messages you're seeing were sent.",
|
|
||||||
defaultValue = { false },
|
|
||||||
isFinished = false,
|
|
||||||
),
|
|
||||||
SlashCommand(
|
SlashCommand(
|
||||||
key = "feature.slash_command",
|
key = "feature.slash_command",
|
||||||
title = "Parse slash commands in the message composer",
|
title = "Parse slash commands in the message composer",
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:fbd5652457d495c3c6692c151be27c985cf47e95c8b89af9b6edc8c1b734acc8
|
oid sha256:f90a31ccde2880e01393be2bd36e9554d8087aa52bfe36e29b8514a32fea3dcd
|
||||||
size 371265
|
size 752143
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:75ace43e27a0c8f9786b0494931c3ef5e12d903e7417dddecfb34c9526e74f3c
|
oid sha256:a853885aac641afe3fb28f3a1d9ebf6744862f153ea22bc2d511ff957b814a19
|
||||||
size 149314
|
size 747294
|
||||||
|
|||||||
Reference in New Issue
Block a user