Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Mark as unread: add a feature flag, disabled on release build.

Browse source
This commit is contained in:
Benoit Marty 2024-02-08 11:49:14 +01:00
parent f6e4f073a3
commit dc65e60e66
7 changed files with 48 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

62
features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListContextMenu.kt
View file

@ -88,36 +88,38 @@ private fun RoomListModalBottomSheetContent(
) )
} }
) )
ListItem( if (contextMenu.markAsUnreadFeatureFlagEnabled) {
headlineContent = { ListItem(
Text( headlineContent = {
text = stringResource( Text(
id = if (contextMenu.hasNewContent) { text = stringResource(
R.string.screen_roomlist_mark_as_read id = if (contextMenu.hasNewContent) {
} else { R.string.screen_roomlist_mark_as_read
R.string.screen_roomlist_mark_as_unread } else {
} R.string.screen_roomlist_mark_as_unread
), }
style = MaterialTheme.typography.bodyLarge, ),
) style = MaterialTheme.typography.bodyLarge,
}, )
modifier = Modifier.clickable { },
if (contextMenu.hasNewContent) { modifier = Modifier.clickable {
onRoomMarkReadClicked() if (contextMenu.hasNewContent) {
} else { onRoomMarkReadClicked()
onRoomMarkUnreadClicked() } else {
} onRoomMarkUnreadClicked()
}, }
/* TODO Design },
leadingContent = ListItemContent.Icon( /* TODO Design
iconSource = IconSource.Vector( leadingContent = ListItemContent.Icon(
CompoundIcons.Settings, iconSource = IconSource.Vector(
contentDescription = stringResource(id = CommonStrings.common_settings) CompoundIcons.Settings,
) contentDescription = stringResource(id = CommonStrings.common_settings)
), )
*/ ),
style = ListItemStyle.Primary, */
) style = ListItemStyle.Primary,
)
}
ListItem( ListItem(
headlineContent = { headlineContent = {
Text( Text(

4
features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListPresenter.kt
View file

@ -111,6 +111,9 @@ class RoomListPresenter @Inject constructor(
} }
} }
val markAsUnreadFeatureFlagEnabled by featureFlagService.isFeatureEnabledFlow(FeatureFlags.MarkAsUnread)
.collectAsState(initial = null)
// Avatar indicator // Avatar indicator
val showAvatarIndicator by indicatorService.showRoomListTopBarIndicator() val showAvatarIndicator by indicatorService.showRoomListTopBarIndicator()
@ -135,6 +138,7 @@ class RoomListPresenter @Inject constructor(
roomId = event.roomListRoomSummary.roomId, roomId = event.roomListRoomSummary.roomId,
roomName = event.roomListRoomSummary.name, roomName = event.roomListRoomSummary.name,
isDm = event.roomListRoomSummary.isDm, isDm = event.roomListRoomSummary.isDm,
markAsUnreadFeatureFlagEnabled = markAsUnreadFeatureFlagEnabled == true,
hasNewContent = event.roomListRoomSummary.hasNewContent hasNewContent = event.roomListRoomSummary.hasNewContent
) )
} }

1
features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListState.kt
View file

@ -49,6 +49,7 @@ data class RoomListState(
val roomId: RoomId, val roomId: RoomId,
val roomName: String, val roomName: String,
val isDm: Boolean, val isDm: Boolean,
val markAsUnreadFeatureFlagEnabled: Boolean,
val hasNewContent: Boolean, val hasNewContent: Boolean,
) : ContextMenu ) : ContextMenu
} }

1
features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListStateProvider.kt
View file

@ -106,5 +106,6 @@ internal fun aContextMenuShown(
roomId = RoomId("!aRoom:aDomain"), roomId = RoomId("!aRoom:aDomain"),
roomName = roomName, roomName = roomName,
isDm = isDm, isDm = isDm,
markAsUnreadFeatureFlagEnabled = true,
hasNewContent = hasNewContent, hasNewContent = hasNewContent,
) )

2
features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTests.kt
View file

@ -356,6 +356,7 @@ class RoomListPresenterTests {
roomId = summary.roomId, roomId = summary.roomId,
roomName = summary.name, roomName = summary.name,
isDm = false, isDm = false,
markAsUnreadFeatureFlagEnabled = true,
hasNewContent = false, hasNewContent = false,
) )
) )
@ -382,6 +383,7 @@ class RoomListPresenterTests {
roomId = summary.roomId, roomId = summary.roomId,
roomName = summary.name, roomName = summary.name,
isDm = false, isDm = false,
markAsUnreadFeatureFlagEnabled = true,
hasNewContent = false, hasNewContent = false,
) )
) )

7
libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlags.kt
View file

@ -75,4 +75,11 @@ enum class FeatureFlags(
defaultValue = true, defaultValue = true,
isFinished = false, isFinished = false,
), ),
MarkAsUnread(
key = "feature.markAsUnread",
title = "Mark as unread",
description = "Allow user to mark a room as unread",
defaultValue = true,
isFinished = false,
),
} }

1
libraries/featureflag/impl/src/main/kotlin/io/element/android/libraries/featureflag/impl/StaticFeatureFlagProvider.kt
View file

@ -40,6 +40,7 @@ class StaticFeatureFlagProvider @Inject constructor() :
FeatureFlags.PinUnlock -> true FeatureFlags.PinUnlock -> true
FeatureFlags.Mentions -> true FeatureFlags.Mentions -> true
FeatureFlags.SecureStorage -> true FeatureFlags.SecureStorage -> true
FeatureFlags.MarkAsUnread -> false
} }
} else { } else {
false false