Merge branch 'develop' into feature/fga/safer_callback_flows

This commit is contained in:
ganfra 2023-07-31 11:36:59 +02:00
commit 1bdb67e4e3
122 changed files with 682 additions and 267 deletions

View file

@ -28,7 +28,7 @@ import io.element.android.x.R
@Preview @Preview
@Composable @Composable
fun IconPreview( internal fun IconPreview(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
) { ) {
Box(modifier = modifier) { Box(modifier = modifier) {
@ -39,7 +39,7 @@ fun IconPreview(
@Preview @Preview
@Composable @Composable
fun RoundIconPreview( internal fun RoundIconPreview(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
) { ) {
Box(modifier = modifier.clip(shape = CircleShape)) { Box(modifier = modifier.clip(shape = CircleShape)) {

View file

@ -58,7 +58,8 @@ class LoggedInEventProcessor @Inject constructor(
.filter { it } .filter { it }
.onEach { .onEach {
displayMessage(CommonStrings.common_verification_complete) displayMessage(CommonStrings.common_verification_complete)
}.launchIn(this) }
.launchIn(this)
} }
} }

View file

@ -44,14 +44,14 @@ import io.element.android.appnav.loggedin.LoggedInNode
import io.element.android.appnav.room.RoomFlowNode import io.element.android.appnav.room.RoomFlowNode
import io.element.android.appnav.room.RoomLoadedFlowNode import io.element.android.appnav.room.RoomLoadedFlowNode
import io.element.android.features.createroom.api.CreateRoomEntryPoint import io.element.android.features.createroom.api.CreateRoomEntryPoint
import io.element.android.features.ftue.api.FtueEntryPoint
import io.element.android.features.ftue.api.state.FtueState
import io.element.android.features.invitelist.api.InviteListEntryPoint import io.element.android.features.invitelist.api.InviteListEntryPoint
import io.element.android.features.networkmonitor.api.NetworkMonitor import io.element.android.features.networkmonitor.api.NetworkMonitor
import io.element.android.features.networkmonitor.api.NetworkStatus import io.element.android.features.networkmonitor.api.NetworkStatus
import io.element.android.features.preferences.api.PreferencesEntryPoint import io.element.android.features.preferences.api.PreferencesEntryPoint
import io.element.android.features.roomlist.api.RoomListEntryPoint import io.element.android.features.roomlist.api.RoomListEntryPoint
import io.element.android.features.verifysession.api.VerifySessionEntryPoint import io.element.android.features.verifysession.api.VerifySessionEntryPoint
import io.element.android.features.ftue.api.FtueEntryPoint
import io.element.android.features.ftue.api.state.FtueState
import io.element.android.libraries.architecture.BackstackNode import io.element.android.libraries.architecture.BackstackNode
import io.element.android.libraries.architecture.NodeInputs import io.element.android.libraries.architecture.NodeInputs
import io.element.android.libraries.architecture.animation.rememberDefaultTransitionHandler import io.element.android.libraries.architecture.animation.rememberDefaultTransitionHandler
@ -100,13 +100,13 @@ class LoggedInFlowNode @AssistedInject constructor(
) { ) {
interface Callback : Plugin { interface Callback : Plugin {
fun onOpenBugReport() = Unit fun onOpenBugReport()
} }
interface LifecycleCallback : NodeLifecycleCallback { interface LifecycleCallback : NodeLifecycleCallback {
fun onFlowCreated(identifier: String, client: MatrixClient) = Unit fun onFlowCreated(identifier: String, client: MatrixClient)
fun onFlowReleased(identifier: String, client: MatrixClient) = Unit fun onFlowReleased(identifier: String, client: MatrixClient)
} }
data class Inputs( data class Inputs(
@ -305,7 +305,8 @@ class LoggedInFlowNode @AssistedInject constructor(
override fun onFtueFlowFinished() { override fun onFtueFlowFinished() {
backstack.pop() backstack.pop()
} }
}).build() })
.build()
} }
} }
} }

View file

@ -58,7 +58,7 @@ fun LoggedInView(
@DayNightPreviews @DayNightPreviews
@Composable @Composable
fun LoggedInViewPreview(@PreviewParameter(LoggedInStateProvider::class) state: LoggedInState) = ElementPreview { internal fun LoggedInViewPreview(@PreviewParameter(LoggedInStateProvider::class) state: LoggedInState) = ElementPreview {
LoggedInView( LoggedInView(
state = state state = state
) )

View file

@ -91,7 +91,7 @@ private fun SyncState.mustBeVisible() = when (this) {
@DayNightPreviews @DayNightPreviews
@Composable @Composable
fun SyncStateViewPreview() = ElementPreview { internal fun SyncStateViewPreview() = ElementPreview {
// Add a box to see the shadow // Add a box to see the shadow
Box(modifier = Modifier.padding(24.dp)) { Box(modifier = Modifier.padding(24.dp)) {
SyncStateView( SyncStateView(

View file

@ -103,12 +103,12 @@ private fun LoadingRoomTopBar(
@Preview @Preview
@Composable @Composable
fun LoadingRoomNodeViewLightPreview(@PreviewParameter(LoadingRoomStateProvider::class) state: LoadingRoomState) = internal fun LoadingRoomNodeViewLightPreview(@PreviewParameter(LoadingRoomStateProvider::class) state: LoadingRoomState) =
ElementPreviewLight { ContentToPreview(state) } ElementPreviewLight { ContentToPreview(state) }
@Preview @Preview
@Composable @Composable
fun LoadingRoomNodeViewDarkPreview(@PreviewParameter(LoadingRoomStateProvider::class) state: LoadingRoomState) = internal fun LoadingRoomNodeViewDarkPreview(@PreviewParameter(LoadingRoomStateProvider::class) state: LoadingRoomState) =
ElementPreviewDark { ContentToPreview(state) } ElementPreviewDark { ContentToPreview(state) }
@Composable @Composable

View file

@ -96,7 +96,8 @@ class RoomFlowNode @AssistedInject constructor(
} else { } else {
backstack.newRoot(NavTarget.Loading) backstack.newRoot(NavTarget.Loading)
} }
}.launchIn(lifecycleScope) }
.launchIn(lifecycleScope)
} }
override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node { override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {

View file

@ -75,8 +75,8 @@ class RoomLoadedFlowNode @AssistedInject constructor(
} }
interface LifecycleCallback : NodeLifecycleCallback { interface LifecycleCallback : NodeLifecycleCallback {
fun onFlowCreated(identifier: String, room: MatrixRoom) = Unit fun onFlowCreated(identifier: String, room: MatrixRoom)
fun onFlowReleased(identifier: String, room: MatrixRoom) = Unit fun onFlowReleased(identifier: String, room: MatrixRoom)
} }
data class Inputs( data class Inputs(
@ -115,7 +115,8 @@ class RoomLoadedFlowNode @AssistedInject constructor(
room.updateMembers() room.updateMembers()
.onFailure { .onFailure {
Timber.e(it, "Fail to fetch members for room ${room.roomId}") Timber.e(it, "Fail to fetch members for room ${room.roomId}")
}.onSuccess { }
.onSuccess {
Timber.v("Success fetching members for room ${room.roomId}") Timber.v("Success fetching members for room ${room.roomId}")
} }
} }

View file

@ -56,7 +56,7 @@ allprojects {
// activate all available (even unstable) rules. // activate all available (even unstable) rules.
allRules = true allRules = true
// point to your custom config defining rules to run, overwriting default behavior // point to your custom config defining rules to run, overwriting default behavior
config = files("$rootDir/tools/detekt/detekt.yml") config.from(files("$rootDir/tools/detekt/detekt.yml"))
} }
dependencies { dependencies {
detektPlugins("io.nlopez.compose.rules:detekt:0.1.12") detektPlugins("io.nlopez.compose.rules:detekt:0.1.12")

View file

@ -81,12 +81,12 @@ fun buildAnnotatedStringWithColoredPart(
@Preview @Preview
@Composable @Composable
fun AnalyticsPreferencesViewLightPreview(@PreviewParameter(AnalyticsPreferencesStateProvider::class) state: AnalyticsPreferencesState) = internal fun AnalyticsPreferencesViewLightPreview(@PreviewParameter(AnalyticsPreferencesStateProvider::class) state: AnalyticsPreferencesState) =
ElementPreviewLight { ContentToPreview(state) } ElementPreviewLight { ContentToPreview(state) }
@Preview @Preview
@Composable @Composable
fun AnalyticsPreferencesViewDarkPreview(@PreviewParameter(AnalyticsPreferencesStateProvider::class) state: AnalyticsPreferencesState) = internal fun AnalyticsPreferencesViewDarkPreview(@PreviewParameter(AnalyticsPreferencesStateProvider::class) state: AnalyticsPreferencesState) =
ElementPreviewDark { ContentToPreview(state) } ElementPreviewDark { ContentToPreview(state) }
@Composable @Composable

View file

@ -204,13 +204,13 @@ private fun AnalyticsOptInFooter(
@Preview @Preview
@Composable @Composable
fun AnalyticsOptInViewLightPreview(@PreviewParameter(AnalyticsOptInStateProvider::class) state: AnalyticsOptInState) = ElementPreviewLight { internal fun AnalyticsOptInViewLightPreview(@PreviewParameter(AnalyticsOptInStateProvider::class) state: AnalyticsOptInState) = ElementPreviewLight {
ContentToPreview(state) ContentToPreview(state)
} }
@Preview @Preview
@Composable @Composable
fun AnalyticsOptInViewDarkPreview(@PreviewParameter(AnalyticsOptInStateProvider::class) state: AnalyticsOptInState) = ElementPreviewDark { internal fun AnalyticsOptInViewDarkPreview(@PreviewParameter(AnalyticsOptInStateProvider::class) state: AnalyticsOptInState) = ElementPreviewDark {
ContentToPreview(state) ContentToPreview(state)
} }

View file

@ -93,11 +93,11 @@ fun RoomPrivacyOption(
@Preview @Preview
@Composable @Composable
fun RoomPrivacyOptionLightPreview() = ElementPreviewLight { ContentToPreview() } internal fun RoomPrivacyOptionLightPreview() = ElementPreviewLight { ContentToPreview() }
@Preview @Preview
@Composable @Composable
fun RoomPrivacyOptionDarkPreview() = ElementPreviewDark { ContentToPreview() } internal fun RoomPrivacyOptionDarkPreview() = ElementPreviewDark { ContentToPreview() }
@Composable @Composable
private fun ContentToPreview() { private fun ContentToPreview() {

View file

@ -282,12 +282,12 @@ private fun Modifier.clearFocusOnTap(focusManager: FocusManager): Modifier =
@Preview @Preview
@Composable @Composable
fun ConfigureRoomViewLightPreview(@PreviewParameter(ConfigureRoomStateProvider::class) state: ConfigureRoomState) = internal fun ConfigureRoomViewLightPreview(@PreviewParameter(ConfigureRoomStateProvider::class) state: ConfigureRoomState) =
ElementPreviewLight { ContentToPreview(state) } ElementPreviewLight { ContentToPreview(state) }
@Preview @Preview
@Composable @Composable
fun ConfigureRoomViewDarkPreview(@PreviewParameter(ConfigureRoomStateProvider::class) state: ConfigureRoomState) = internal fun ConfigureRoomViewDarkPreview(@PreviewParameter(ConfigureRoomStateProvider::class) state: ConfigureRoomState) =
ElementPreviewDark { ContentToPreview(state) } ElementPreviewDark { ContentToPreview(state) }
@Composable @Composable

View file

@ -41,7 +41,7 @@ open class CreateRoomRootStateProvider : PreviewParameterProvider<CreateRoomRoot
} }
), ),
aCreateRoomRootState().copy( aCreateRoomRootState().copy(
startDmAction = Async.Failure(Throwable()), startDmAction = Async.Failure(Throwable("error")),
userListState = aMatrixUser().let { userListState = aMatrixUser().let {
aUserListState().copy( aUserListState().copy(
searchQuery = it.userId.value, searchQuery = it.userId.value,

View file

@ -205,12 +205,12 @@ fun CreateRoomActionButton(
@Preview @Preview
@Composable @Composable
fun CreateRoomRootViewLightPreview(@PreviewParameter(CreateRoomRootStateProvider::class) state: CreateRoomRootState) = internal fun CreateRoomRootViewLightPreview(@PreviewParameter(CreateRoomRootStateProvider::class) state: CreateRoomRootState) =
ElementPreviewLight { ContentToPreview(state) } ElementPreviewLight { ContentToPreview(state) }
@Preview @Preview
@Composable @Composable
fun CreateRoomRootViewDarkPreview(@PreviewParameter(CreateRoomRootStateProvider::class) state: CreateRoomRootState) = internal fun CreateRoomRootViewDarkPreview(@PreviewParameter(CreateRoomRootStateProvider::class) state: CreateRoomRootState) =
ElementPreviewDark { ContentToPreview(state) } ElementPreviewDark { ContentToPreview(state) }
@Composable @Composable

View file

@ -152,8 +152,7 @@ class InviteListPresenter @Inject constructor(
client.getRoom(roomId)?.use { client.getRoom(roomId)?.use {
it.leave().getOrThrow() it.leave().getOrThrow()
notificationDrawerManager.clearMembershipNotificationForRoom(client.sessionId, roomId) notificationDrawerManager.clearMembershipNotificationForRoom(client.sessionId, roomId)
} }.let { }
Unit
}.runCatchingUpdatingState(declinedAction) }.runCatchingUpdatingState(declinedAction)
} }

View file

@ -120,7 +120,7 @@ fun StaticMapView(
@DayNightPreviews @DayNightPreviews
@Composable @Composable
fun StaticMapViewPreview() = ElementPreview { internal fun StaticMapViewPreview() = ElementPreview {
StaticMapView( StaticMapView(
lat = 0.0, lat = 0.0,
lon = 0.0, lon = 0.0,

View file

@ -79,7 +79,7 @@ internal fun StaticMapPlaceholder(
@DayNightPreviews @DayNightPreviews
@Composable @Composable
fun StaticMapPlaceholderPreview( internal fun StaticMapPlaceholderPreview(
@PreviewParameter(BooleanParameterProvider::class) values: Boolean @PreviewParameter(BooleanParameterProvider::class) values: Boolean
) = ElementPreview { ) = ElementPreview {
StaticMapPlaceholder( StaticMapPlaceholder(

View file

@ -224,7 +224,7 @@ fun SendLocationView(
@DayNightPreviews @DayNightPreviews
@Composable @Composable
fun SendLocationViewPreview( internal fun SendLocationViewPreview(
@PreviewParameter(SendLocationStateProvider::class) state: SendLocationState @PreviewParameter(SendLocationStateProvider::class) state: SendLocationState
) = ElementPreview { ) = ElementPreview {
SendLocationView( SendLocationView(

View file

@ -114,12 +114,12 @@ fun AccountProviderView(
@Preview @Preview
@Composable @Composable
fun AccountProviderViewLightPreview(@PreviewParameter(AccountProviderProvider::class) item: AccountProvider) = internal fun AccountProviderViewLightPreview(@PreviewParameter(AccountProviderProvider::class) item: AccountProvider) =
ElementPreviewLight { ContentToPreview(item) } ElementPreviewLight { ContentToPreview(item) }
@Preview @Preview
@Composable @Composable
fun AccountProviderViewDarkPreview(@PreviewParameter(AccountProviderProvider::class) item: AccountProvider) = internal fun AccountProviderViewDarkPreview(@PreviewParameter(AccountProviderProvider::class) item: AccountProvider) =
ElementPreviewDark { ContentToPreview(item) } ElementPreviewDark { ContentToPreview(item) }
@Composable @Composable

View file

@ -71,12 +71,12 @@ fun ChangeServerView(
@Preview @Preview
@Composable @Composable
fun ChangeServerViewLightPreview(@PreviewParameter(ChangeServerStateProvider::class) state: ChangeServerState) = internal fun ChangeServerViewLightPreview(@PreviewParameter(ChangeServerStateProvider::class) state: ChangeServerState) =
ElementPreviewLight { ContentToPreview(state) } ElementPreviewLight { ContentToPreview(state) }
@Preview @Preview
@Composable @Composable
fun ChangeServerViewDarkPreview(@PreviewParameter(ChangeServerStateProvider::class) state: ChangeServerState) = internal fun ChangeServerViewDarkPreview(@PreviewParameter(ChangeServerStateProvider::class) state: ChangeServerState) =
ElementPreviewDark { ContentToPreview(state) } ElementPreviewDark { ContentToPreview(state) }
@Composable @Composable

View file

@ -41,8 +41,7 @@ class CustomTabHandler @Inject constructor(
if (packageName != null) { if (packageName != null) {
customTabsServiceConnection = object : CustomTabsServiceConnection() { customTabsServiceConnection = object : CustomTabsServiceConnection() {
override fun onCustomTabsServiceConnected(name: ComponentName, client: CustomTabsClient) { override fun onCustomTabsServiceConnected(name: ComponentName, client: CustomTabsClient) {
customTabsClient = client customTabsClient = client.apply { warmup(0L) }
.also { it.warmup(0L) }
prefetchUrl(url) prefetchUrl(url)
} }

View file

@ -100,12 +100,12 @@ fun OidcView(
@Preview @Preview
@Composable @Composable
fun OidcViewLightPreview(@PreviewParameter(OidcStateProvider::class) state: OidcState) = internal fun OidcViewLightPreview(@PreviewParameter(OidcStateProvider::class) state: OidcState) =
ElementPreviewLight { ContentToPreview(state) } ElementPreviewLight { ContentToPreview(state) }
@Preview @Preview
@Composable @Composable
fun OidcViewDarkPreview(@PreviewParameter(OidcStateProvider::class) state: OidcState) = internal fun OidcViewDarkPreview(@PreviewParameter(OidcStateProvider::class) state: OidcState) =
ElementPreviewDark { ContentToPreview(state) } ElementPreviewDark { ContentToPreview(state) }
@Composable @Composable

View file

@ -127,12 +127,12 @@ fun ChangeAccountProviderView(
@Preview @Preview
@Composable @Composable
fun ChangeAccountProviderViewLightPreview(@PreviewParameter(ChangeAccountProviderStateProvider::class) state: ChangeAccountProviderState) = internal fun ChangeAccountProviderViewLightPreview(@PreviewParameter(ChangeAccountProviderStateProvider::class) state: ChangeAccountProviderState) =
ElementPreviewLight { ContentToPreview(state) } ElementPreviewLight { ContentToPreview(state) }
@Preview @Preview
@Composable @Composable
fun ChangeAccountProviderViewDarkPreview(@PreviewParameter(ChangeAccountProviderStateProvider::class) state: ChangeAccountProviderState) = internal fun ChangeAccountProviderViewDarkPreview(@PreviewParameter(ChangeAccountProviderStateProvider::class) state: ChangeAccountProviderState) =
ElementPreviewDark { ContentToPreview(state) } ElementPreviewDark { ContentToPreview(state) }
@Composable @Composable

View file

@ -92,7 +92,7 @@ class ConfirmAccountProviderPresenter @AssistedInject constructor(
} else if (matrixHomeServerDetails.supportsPasswordLogin) { } else if (matrixHomeServerDetails.supportsPasswordLogin) {
LoginFlow.PasswordLogin LoginFlow.PasswordLogin
} else { } else {
throw IllegalStateException("Unsupported login flow") error("Unsupported login flow")
} }
}.getOrThrow() }.getOrThrow()
}.runCatchingUpdatingState(loginFlowAction, errorTransform = ChangeServerError::from) }.runCatchingUpdatingState(loginFlowAction, errorTransform = ChangeServerError::from)

View file

@ -143,12 +143,12 @@ fun ConfirmAccountProviderView(
@Preview @Preview
@Composable @Composable
fun ConfirmAccountProviderViewLightPreview(@PreviewParameter(ConfirmAccountProviderStateProvider::class) state: ConfirmAccountProviderState) = internal fun ConfirmAccountProviderViewLightPreview(@PreviewParameter(ConfirmAccountProviderStateProvider::class) state: ConfirmAccountProviderState) =
ElementPreviewLight { ContentToPreview(state) } ElementPreviewLight { ContentToPreview(state) }
@Preview @Preview
@Composable @Composable
fun ConfirmAccountProviderViewDarkPreview(@PreviewParameter(ConfirmAccountProviderStateProvider::class) state: ConfirmAccountProviderState) = internal fun ConfirmAccountProviderViewDarkPreview(@PreviewParameter(ConfirmAccountProviderStateProvider::class) state: ConfirmAccountProviderState) =
ElementPreviewDark { ContentToPreview(state) } ElementPreviewDark { ContentToPreview(state) }
@Composable @Composable

View file

@ -211,12 +211,12 @@ private fun HomeserverData.toAccountProvider(): AccountProvider {
@Preview @Preview
@Composable @Composable
fun SearchAccountProviderViewLightPreview(@PreviewParameter(SearchAccountProviderStateProvider::class) state: SearchAccountProviderState) = internal fun SearchAccountProviderViewLightPreview(@PreviewParameter(SearchAccountProviderStateProvider::class) state: SearchAccountProviderState) =
ElementPreviewLight { ContentToPreview(state) } ElementPreviewLight { ContentToPreview(state) }
@Preview @Preview
@Composable @Composable
fun SearchAccountProviderViewDarkPreview(@PreviewParameter(SearchAccountProviderStateProvider::class) state: SearchAccountProviderState) = internal fun SearchAccountProviderViewDarkPreview(@PreviewParameter(SearchAccountProviderStateProvider::class) state: SearchAccountProviderState) =
ElementPreviewDark { ContentToPreview(state) } ElementPreviewDark { ContentToPreview(state) }
@Composable @Composable

View file

@ -25,7 +25,7 @@ open class WaitListStateProvider : PreviewParameterProvider<WaitListState> {
get() = sequenceOf( get() = sequenceOf(
aWaitListState(loginAction = Async.Uninitialized), aWaitListState(loginAction = Async.Uninitialized),
aWaitListState(loginAction = Async.Loading()), aWaitListState(loginAction = Async.Loading()),
aWaitListState(loginAction = Async.Failure(Throwable())), aWaitListState(loginAction = Async.Failure(Throwable("error"))),
aWaitListState(loginAction = Async.Failure(Throwable(message = "IO_ELEMENT_X_WAIT_LIST"))), aWaitListState(loginAction = Async.Failure(Throwable(message = "IO_ELEMENT_X_WAIT_LIST"))),
aWaitListState(loginAction = Async.Success(SessionId("@alice:element.io"))), aWaitListState(loginAction = Async.Success(SessionId("@alice:element.io"))),
// Add other state here // Add other state here

View file

@ -71,6 +71,7 @@ import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState
import io.element.android.libraries.matrix.api.room.MessageEventType import io.element.android.libraries.matrix.api.room.MessageEventType
import io.element.android.libraries.matrix.ui.components.AttachmentThumbnailInfo import io.element.android.libraries.matrix.ui.components.AttachmentThumbnailInfo
import io.element.android.libraries.matrix.ui.components.AttachmentThumbnailType import io.element.android.libraries.matrix.ui.components.AttachmentThumbnailType
import io.element.android.libraries.matrix.ui.room.canRedactAsState
import io.element.android.libraries.matrix.ui.room.canSendMessageAsState import io.element.android.libraries.matrix.ui.room.canSendMessageAsState
import io.element.android.libraries.textcomposer.MessageComposerMode import io.element.android.libraries.textcomposer.MessageComposerMode
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
@ -109,6 +110,7 @@ class MessagesPresenter @AssistedInject constructor(
val syncUpdateFlow = room.syncUpdateFlow.collectAsState() val syncUpdateFlow = room.syncUpdateFlow.collectAsState()
val userHasPermissionToSendMessage by room.canSendMessageAsState(type = MessageEventType.ROOM_MESSAGE, updateKey = syncUpdateFlow.value) val userHasPermissionToSendMessage by room.canSendMessageAsState(type = MessageEventType.ROOM_MESSAGE, updateKey = syncUpdateFlow.value)
val userHasPermissionToRedact by room.canRedactAsState(updateKey = syncUpdateFlow.value)
var roomName: Async<String> by remember { mutableStateOf(Async.Uninitialized) } var roomName: Async<String> by remember { mutableStateOf(Async.Uninitialized) }
var roomAvatar: Async<AvatarData> by remember { mutableStateOf(Async.Uninitialized) } var roomAvatar: Async<AvatarData> by remember { mutableStateOf(Async.Uninitialized) }
LaunchedEffect(syncUpdateFlow.value) { LaunchedEffect(syncUpdateFlow.value) {
@ -165,6 +167,7 @@ class MessagesPresenter @AssistedInject constructor(
roomName = roomName, roomName = roomName,
roomAvatar = roomAvatar, roomAvatar = roomAvatar,
userHasPermissionToSendMessage = userHasPermissionToSendMessage, userHasPermissionToSendMessage = userHasPermissionToSendMessage,
userHasPermissionToRedact = userHasPermissionToRedact,
composerState = composerState, composerState = composerState,
timelineState = timelineState, timelineState = timelineState,
actionListState = actionListState, actionListState = actionListState,

View file

@ -33,6 +33,7 @@ data class MessagesState(
val roomName: Async<String>, val roomName: Async<String>,
val roomAvatar: Async<AvatarData>, val roomAvatar: Async<AvatarData>,
val userHasPermissionToSendMessage: Boolean, val userHasPermissionToSendMessage: Boolean,
val userHasPermissionToRedact: Boolean,
val composerState: MessageComposerState, val composerState: MessageComposerState,
val timelineState: TimelineState, val timelineState: TimelineState,
val actionListState: ActionListState, val actionListState: ActionListState,

View file

@ -50,6 +50,7 @@ fun aMessagesState() = MessagesState(
roomName = Async.Success("Room name"), roomName = Async.Success("Room name"),
roomAvatar = Async.Success(AvatarData("!id:domain", "Room name", size = AvatarSize.TimelineRoom)), roomAvatar = Async.Success(AvatarData("!id:domain", "Room name", size = AvatarSize.TimelineRoom)),
userHasPermissionToSendMessage = true, userHasPermissionToSendMessage = true,
userHasPermissionToRedact = false,
composerState = aMessageComposerState().copy( composerState = aMessageComposerState().copy(
text = "Hello", text = "Hello",
isFullScreen = false, isFullScreen = false,

View file

@ -115,7 +115,7 @@ fun MessagesView(
fun onMessageLongClicked(event: TimelineItem.Event) { fun onMessageLongClicked(event: TimelineItem.Event) {
Timber.v("OnMessageLongClicked= ${event.id}") Timber.v("OnMessageLongClicked= ${event.id}")
localView.hideKeyboard() localView.hideKeyboard()
state.actionListState.eventSink(ActionListEvents.ComputeForMessage(event)) state.actionListState.eventSink(ActionListEvents.ComputeForMessage(event, state.userHasPermissionToRedact))
} }
fun onActionSelected(action: TimelineItemAction, event: TimelineItem.Event) { fun onActionSelected(action: TimelineItemAction, event: TimelineItem.Event) {
@ -127,8 +127,9 @@ fun MessagesView(
state.eventSink(MessagesEvents.ToggleReaction(emoji, event.eventId)) state.eventSink(MessagesEvents.ToggleReaction(emoji, event.eventId))
} }
fun onMoreReactionsClicked(event: TimelineItem.Event): Unit = fun onMoreReactionsClicked(event: TimelineItem.Event) {
state.customReactionState.eventSink(CustomReactionEvents.UpdateSelectedEvent(event.eventId)) state.customReactionState.eventSink(CustomReactionEvents.UpdateSelectedEvent(event.eventId))
}
Scaffold( Scaffold(
modifier = modifier, modifier = modifier,

View file

@ -20,5 +20,5 @@ import io.element.android.features.messages.impl.timeline.model.TimelineItem
sealed interface ActionListEvents { sealed interface ActionListEvents {
object Clear : ActionListEvents object Clear : ActionListEvents
data class ComputeForMessage(val event: TimelineItem.Event) : ActionListEvents data class ComputeForMessage(val event: TimelineItem.Event, val canRedact: Boolean) : ActionListEvents
} }

View file

@ -28,6 +28,7 @@ import io.element.android.features.messages.impl.timeline.model.TimelineItem
import io.element.android.features.messages.impl.timeline.model.event.TimelineItemRedactedContent import io.element.android.features.messages.impl.timeline.model.event.TimelineItemRedactedContent
import io.element.android.features.messages.impl.timeline.model.event.TimelineItemStateContent import io.element.android.features.messages.impl.timeline.model.event.TimelineItemStateContent
import io.element.android.features.messages.impl.timeline.model.event.canBeCopied import io.element.android.features.messages.impl.timeline.model.event.canBeCopied
import io.element.android.features.messages.impl.timeline.model.event.canReact
import io.element.android.libraries.architecture.Presenter import io.element.android.libraries.architecture.Presenter
import io.element.android.libraries.core.meta.BuildMeta import io.element.android.libraries.core.meta.BuildMeta
import kotlinx.collections.immutable.toImmutableList import kotlinx.collections.immutable.toImmutableList
@ -48,13 +49,20 @@ class ActionListPresenter @Inject constructor(
} }
val displayEmojiReactions by remember { val displayEmojiReactions by remember {
derivedStateOf { (target.value as? ActionListState.Target.Success)?.event?.isRemote == true } derivedStateOf {
val event = (target.value as? ActionListState.Target.Success)?.event
event?.isRemote == true && event.content.canReact()
}
} }
fun handleEvents(event: ActionListEvents) { fun handleEvents(event: ActionListEvents) {
when (event) { when (event) {
ActionListEvents.Clear -> target.value = ActionListState.Target.None ActionListEvents.Clear -> target.value = ActionListState.Target.None
is ActionListEvents.ComputeForMessage -> localCoroutineScope.computeForMessage(event.event, target) is ActionListEvents.ComputeForMessage -> localCoroutineScope.computeForMessage(
timelineItem = event.event,
userCanRedact = event.canRedact,
target = target,
)
} }
} }
@ -65,7 +73,11 @@ class ActionListPresenter @Inject constructor(
) )
} }
private fun CoroutineScope.computeForMessage(timelineItem: TimelineItem.Event, target: MutableState<ActionListState.Target>) = launch { private fun CoroutineScope.computeForMessage(
timelineItem: TimelineItem.Event,
userCanRedact: Boolean,
target: MutableState<ActionListState.Target>
) = launch {
target.value = ActionListState.Target.Loading(timelineItem) target.value = ActionListState.Target.Loading(timelineItem)
val actions = val actions =
when (timelineItem.content) { when (timelineItem.content) {
@ -102,7 +114,7 @@ class ActionListPresenter @Inject constructor(
if (!timelineItem.isMine) { if (!timelineItem.isMine) {
add(TimelineItemAction.ReportContent) add(TimelineItemAction.ReportContent)
} }
if (timelineItem.isMine) { if (timelineItem.isMine || userCanRedact) {
add(TimelineItemAction.Redact) add(TimelineItemAction.Redact)
} }
} }

View file

@ -405,7 +405,7 @@ private fun EmojiButton(
@DayNightPreviews @DayNightPreviews
@Composable @Composable
fun SheetContentPreview( internal fun SheetContentPreview(
@PreviewParameter(ActionListStateProvider::class) state: ActionListState @PreviewParameter(ActionListStateProvider::class) state: ActionListState
) = ElementPreview { ) = ElementPreview {
SheetContent( SheetContent(

View file

@ -30,7 +30,7 @@ open class AttachmentsPreviewStateProvider : PreviewParameterProvider<Attachment
anAttachmentsPreviewState(), anAttachmentsPreviewState(),
anAttachmentsPreviewState(mediaInfo = aFileInfo()), anAttachmentsPreviewState(mediaInfo = aFileInfo()),
anAttachmentsPreviewState(sendActionState = SendActionState.Sending.Uploading(0.5f)), anAttachmentsPreviewState(sendActionState = SendActionState.Sending.Uploading(0.5f)),
anAttachmentsPreviewState(sendActionState = SendActionState.Failure(RuntimeException())), anAttachmentsPreviewState(sendActionState = SendActionState.Failure(RuntimeException("error"))),
) )
} }

View file

@ -166,7 +166,7 @@ private fun AttachmentsPreviewBottomActions(
@Preview @Preview
@Composable @Composable
fun AttachmentsPreviewViewDarkPreview(@PreviewParameter(AttachmentsPreviewStateProvider::class) state: AttachmentsPreviewState) = internal fun AttachmentsPreviewViewDarkPreview(@PreviewParameter(AttachmentsPreviewStateProvider::class) state: AttachmentsPreviewState) =
ElementPreviewDark { ContentToPreview(state) } ElementPreviewDark { ContentToPreview(state) }
@Composable @Composable

View file

@ -283,12 +283,12 @@ private fun ForwardingErrorDialog(onDismiss: () -> Unit, modifier: Modifier = Mo
@Preview @Preview
@Composable @Composable
fun ForwardMessagesViewLightPreview(@PreviewParameter(ForwardMessagesStateProvider::class) state: ForwardMessagesState) = internal fun ForwardMessagesViewLightPreview(@PreviewParameter(ForwardMessagesStateProvider::class) state: ForwardMessagesState) =
ElementPreviewLight { ContentToPreview(state) } ElementPreviewLight { ContentToPreview(state) }
@Preview @Preview
@Composable @Composable
fun ForwardMessagesViewDarkPreview(@PreviewParameter(ForwardMessagesStateProvider::class) state: ForwardMessagesState) = internal fun ForwardMessagesViewDarkPreview(@PreviewParameter(ForwardMessagesStateProvider::class) state: ForwardMessagesState) =
ElementPreviewDark { ContentToPreview(state) } ElementPreviewDark { ContentToPreview(state) }
@Composable @Composable

View file

@ -103,14 +103,17 @@ class MediaViewerPresenter @AssistedInject constructor(
) )
.onSuccess { .onSuccess {
mediaFile.value = it mediaFile.value = it
}.mapCatching { mediaFile -> }
.mapCatching { mediaFile ->
localMediaFactory.createFromMediaFile( localMediaFactory.createFromMediaFile(
mediaFile = mediaFile, mediaFile = mediaFile,
mediaInfo = inputs.mediaInfo mediaInfo = inputs.mediaInfo
) )
}.onSuccess { }
.onSuccess {
localMedia.value = Async.Success(it) localMedia.value = Async.Success(it)
}.onFailure { }
.onFailure {
localMedia.value = Async.Failure(it) localMedia.value = Async.Failure(it)
} }
} }

View file

@ -32,7 +32,7 @@ open class MediaViewerStateProvider : PreviewParameterProvider<MediaViewerState>
get() = sequenceOf( get() = sequenceOf(
aMediaViewerState(), aMediaViewerState(),
aMediaViewerState(Async.Loading()), aMediaViewerState(Async.Loading()),
aMediaViewerState(Async.Failure(IllegalStateException())), aMediaViewerState(Async.Failure(IllegalStateException("error"))),
aMediaViewerState( aMediaViewerState(
Async.Success( Async.Success(
LocalMedia(Uri.EMPTY, anImageInfo()) LocalMedia(Uri.EMPTY, anImageInfo())

View file

@ -255,7 +255,7 @@ private fun ErrorView(
@Preview @Preview
@Composable @Composable
fun MediaViewerViewDarkPreview(@PreviewParameter(MediaViewerStateProvider::class) state: MediaViewerState) = internal fun MediaViewerViewDarkPreview(@PreviewParameter(MediaViewerStateProvider::class) state: MediaViewerState) =
ElementPreviewDark { ContentToPreview(state) } ElementPreviewDark { ContentToPreview(state) }
@Composable @Composable

View file

@ -268,7 +268,8 @@ class MessageComposerPresenter @Inject constructor(
mediaSender.sendMedia(uri, mimeType, compressIfPossible = false, progressCallback) mediaSender.sendMedia(uri, mimeType, compressIfPossible = false, progressCallback)
.onSuccess { .onSuccess {
attachmentState.value = AttachmentsState.None attachmentState.value = AttachmentsState.None
}.onFailure { }
.onFailure {
val snackbarMessage = SnackbarMessage(sendAttachmentError(it)) val snackbarMessage = SnackbarMessage(sendAttachmentError(it))
snackbarDispatcher.post(snackbarMessage) snackbarDispatcher.post(snackbarMessage)
attachmentState.value = AttachmentsState.None attachmentState.value = AttachmentsState.None

View file

@ -26,7 +26,7 @@ open class ReportMessageStateProvider : PreviewParameterProvider<ReportMessageSt
aReportMessageState(reason = "This user is making the chat very toxic."), aReportMessageState(reason = "This user is making the chat very toxic."),
aReportMessageState(reason = "This user is making the chat very toxic.", blockUser = true), aReportMessageState(reason = "This user is making the chat very toxic.", blockUser = true),
aReportMessageState(reason = "This user is making the chat very toxic.", blockUser = true, result = Async.Loading()), aReportMessageState(reason = "This user is making the chat very toxic.", blockUser = true, result = Async.Loading()),
aReportMessageState(reason = "This user is making the chat very toxic.", blockUser = true, result = Async.Failure(Throwable())), aReportMessageState(reason = "This user is making the chat very toxic.", blockUser = true, result = Async.Failure(Throwable("error"))),
aReportMessageState(reason = "This user is making the chat very toxic.", blockUser = true, result = Async.Success(Unit)), aReportMessageState(reason = "This user is making the chat very toxic.", blockUser = true, result = Async.Success(Unit)),
// Add other states here // Add other states here
) )

View file

@ -168,12 +168,12 @@ fun ReportMessageView(
@Preview @Preview
@Composable @Composable
fun ReportMessageViewLightPreview(@PreviewParameter(ReportMessageStateProvider::class) state: ReportMessageState) = internal fun ReportMessageViewLightPreview(@PreviewParameter(ReportMessageStateProvider::class) state: ReportMessageState) =
ElementPreviewLight { ContentToPreview(state) } ElementPreviewLight { ContentToPreview(state) }
@Preview @Preview
@Composable @Composable
fun ReportMessageViewDarkPreview(@PreviewParameter(ReportMessageStateProvider::class) state: ReportMessageState) = internal fun ReportMessageViewDarkPreview(@PreviewParameter(ReportMessageStateProvider::class) state: ReportMessageState) =
ElementPreviewDark { ContentToPreview(state) } ElementPreviewDark { ContentToPreview(state) }
@Composable @Composable

View file

@ -310,7 +310,7 @@ private fun JumpToBottomButton(
@DayNightPreviews @DayNightPreviews
@Composable @Composable
fun TimelineViewPreview( internal fun TimelineViewPreview(
@PreviewParameter(TimelineItemEventContentProvider::class) content: TimelineItemEventContent @PreviewParameter(TimelineItemEventContentProvider::class) content: TimelineItemEventContent
) = ElementPreview { ) = ElementPreview {
val timelineItems = aTimelineItemList(content) val timelineItems = aTimelineItemList(content)

View file

@ -106,7 +106,7 @@ private fun TimelineItemReactionsView(
@DayNightPreviews @DayNightPreviews
@Composable @Composable
fun TimelineItemReactionsViewPreview() = ElementPreview { internal fun TimelineItemReactionsViewPreview() = ElementPreview {
ContentToPreview( ContentToPreview(
reactions = aTimelineItemReactions(count = 1).reactions reactions = aTimelineItemReactions(count = 1).reactions
) )
@ -114,7 +114,7 @@ fun TimelineItemReactionsViewPreview() = ElementPreview {
@DayNightPreviews @DayNightPreviews
@Composable @Composable
fun TimelineItemReactionsViewFewPreview() = ElementPreview { internal fun TimelineItemReactionsViewFewPreview() = ElementPreview {
ContentToPreview( ContentToPreview(
reactions = aTimelineItemReactions(count = 3).reactions reactions = aTimelineItemReactions(count = 3).reactions
) )
@ -122,7 +122,7 @@ fun TimelineItemReactionsViewFewPreview() = ElementPreview {
@DayNightPreviews @DayNightPreviews
@Composable @Composable
fun TimelineItemReactionsViewIncomingPreview() = ElementPreview { internal fun TimelineItemReactionsViewIncomingPreview() = ElementPreview {
ContentToPreview( ContentToPreview(
reactions = aTimelineItemReactions(count = 18).reactions reactions = aTimelineItemReactions(count = 18).reactions
) )
@ -130,7 +130,7 @@ fun TimelineItemReactionsViewIncomingPreview() = ElementPreview {
@DayNightPreviews @DayNightPreviews
@Composable @Composable
fun TimelineItemReactionsViewOutgoingPreview() = ElementPreview { internal fun TimelineItemReactionsViewOutgoingPreview() = ElementPreview {
ContentToPreview( ContentToPreview(
reactions = aTimelineItemReactions(count = 18).reactions, reactions = aTimelineItemReactions(count = 18).reactions,
isOutgoing = true isOutgoing = true

View file

@ -91,12 +91,12 @@ fun GroupHeaderView(
@Preview @Preview
@Composable @Composable
fun GroupHeaderViewLightPreview() = internal fun GroupHeaderViewLightPreview() =
ElementPreviewLight { ContentToPreview() } ElementPreviewLight { ContentToPreview() }
@Preview @Preview
@Composable @Composable
fun GroupHeaderViewDarkPreview() = internal fun GroupHeaderViewDarkPreview() =
ElementPreviewDark { ContentToPreview() } ElementPreviewDark { ContentToPreview() }
@Composable @Composable

View file

@ -33,3 +33,20 @@ fun TimelineItemEventContent.canBeCopied(): Boolean =
is TimelineItemRedactedContent -> true is TimelineItemRedactedContent -> true
else -> false else -> false
} }
/**
* Return true if user can react (i.e. send a reaction) on the event content.
*/
fun TimelineItemEventContent.canReact(): Boolean =
when (this) {
is TimelineItemTextBasedContent,
is TimelineItemAudioContent,
is TimelineItemEncryptedContent,
is TimelineItemFileContent,
is TimelineItemImageContent,
is TimelineItemLocationContent,
is TimelineItemVideoContent -> true
is TimelineItemStateContent,
is TimelineItemRedactedContent,
TimelineItemUnknownContent -> false
}

View file

@ -44,8 +44,11 @@ import io.element.android.features.messages.media.FakeLocalMediaFactory
import io.element.android.features.messages.utils.messagesummary.FakeMessageSummaryFormatter import io.element.android.features.messages.utils.messagesummary.FakeMessageSummaryFormatter
import io.element.android.features.networkmonitor.test.FakeNetworkMonitor import io.element.android.features.networkmonitor.test.FakeNetworkMonitor
import io.element.android.libraries.androidutils.clipboard.FakeClipboardHelper import io.element.android.libraries.androidutils.clipboard.FakeClipboardHelper
import io.element.android.libraries.architecture.Async
import io.element.android.libraries.core.coroutine.CoroutineDispatchers import io.element.android.libraries.core.coroutine.CoroutineDispatchers
import io.element.android.libraries.core.mimetype.MimeTypes import io.element.android.libraries.core.mimetype.MimeTypes
import io.element.android.libraries.designsystem.components.avatar.AvatarData
import io.element.android.libraries.designsystem.components.avatar.AvatarSize
import io.element.android.libraries.designsystem.utils.SnackbarDispatcher import io.element.android.libraries.designsystem.utils.SnackbarDispatcher
import io.element.android.libraries.featureflag.test.FakeFeatureFlagService import io.element.android.libraries.featureflag.test.FakeFeatureFlagService
import io.element.android.libraries.matrix.api.media.MediaSource import io.element.android.libraries.matrix.api.media.MediaSource
@ -83,9 +86,16 @@ class MessagesPresenterTest {
moleculeFlow(RecompositionMode.Immediate) { moleculeFlow(RecompositionMode.Immediate) {
presenter.present() presenter.present()
}.test { }.test {
skipItems(1) val initialState = consumeItemsUntilTimeout().last()
val initialState = awaitItem()
assertThat(initialState.roomId).isEqualTo(A_ROOM_ID) assertThat(initialState.roomId).isEqualTo(A_ROOM_ID)
assertThat(initialState.roomName).isEqualTo(Async.Success(""))
assertThat(initialState.roomAvatar).isEqualTo(Async.Success(AvatarData(id = A_ROOM_ID.value, name = "", size = AvatarSize.TimelineRoom)))
assertThat(initialState.userHasPermissionToSendMessage).isTrue()
assertThat(initialState.userHasPermissionToRedact).isFalse()
assertThat(initialState.hasNetworkConnection).isTrue()
assertThat(initialState.snackbarMessage).isNull()
assertThat(initialState.inviteProgress).isEqualTo(Async.Uninitialized)
assertThat(initialState.showReinvitePrompt).isFalse()
} }
} }
@ -531,6 +541,19 @@ class MessagesPresenterTest {
} }
} }
@Test
fun `present - permission to redact`() = runTest {
val matrixRoom = FakeMatrixRoom(canRedact = true)
val presenter = createMessagePresenter(matrixRoom = matrixRoom)
moleculeFlow(RecompositionMode.Immediate) {
presenter.present()
}.test {
val initialState = consumeItemsUntilPredicate { it.userHasPermissionToRedact }.last()
assertThat(initialState.userHasPermissionToRedact).isTrue()
cancelAndIgnoreRemainingEvents()
}
}
private fun TestScope.createMessagePresenter( private fun TestScope.createMessagePresenter(
coroutineDispatchers: CoroutineDispatchers = testCoroutineDispatchers(), coroutineDispatchers: CoroutineDispatchers = testCoroutineDispatchers(),
matrixRoom: MatrixRoom = FakeMatrixRoom(), matrixRoom: MatrixRoom = FakeMatrixRoom(),

View file

@ -56,7 +56,7 @@ class ActionListPresenterTest {
}.test { }.test {
val initialState = awaitItem() val initialState = awaitItem()
val messageEvent = aMessageEvent(isMine = true, content = TimelineItemRedactedContent) val messageEvent = aMessageEvent(isMine = true, content = TimelineItemRedactedContent)
initialState.eventSink.invoke(ActionListEvents.ComputeForMessage(messageEvent)) initialState.eventSink.invoke(ActionListEvents.ComputeForMessage(messageEvent, false))
// val loadingState = awaitItem() // val loadingState = awaitItem()
// assertThat(loadingState.target).isEqualTo(ActionListState.Target.Loading(messageEvent)) // assertThat(loadingState.target).isEqualTo(ActionListState.Target.Loading(messageEvent))
val successState = awaitItem() val successState = awaitItem()
@ -81,7 +81,7 @@ class ActionListPresenterTest {
}.test { }.test {
val initialState = awaitItem() val initialState = awaitItem()
val messageEvent = aMessageEvent(isMine = false, content = TimelineItemRedactedContent) val messageEvent = aMessageEvent(isMine = false, content = TimelineItemRedactedContent)
initialState.eventSink.invoke(ActionListEvents.ComputeForMessage(messageEvent)) initialState.eventSink.invoke(ActionListEvents.ComputeForMessage(messageEvent, false))
// val loadingState = awaitItem() // val loadingState = awaitItem()
// assertThat(loadingState.target).isEqualTo(ActionListState.Target.Loading(messageEvent)) // assertThat(loadingState.target).isEqualTo(ActionListState.Target.Loading(messageEvent))
val successState = awaitItem() val successState = awaitItem()
@ -109,7 +109,7 @@ class ActionListPresenterTest {
isMine = false, isMine = false,
content = TimelineItemTextContent(body = A_MESSAGE, htmlDocument = null, isEdited = false) content = TimelineItemTextContent(body = A_MESSAGE, htmlDocument = null, isEdited = false)
) )
initialState.eventSink.invoke(ActionListEvents.ComputeForMessage(messageEvent)) initialState.eventSink.invoke(ActionListEvents.ComputeForMessage(messageEvent, false))
// val loadingState = awaitItem() // val loadingState = awaitItem()
// assertThat(loadingState.target).isEqualTo(ActionListState.Target.Loading(messageEvent)) // assertThat(loadingState.target).isEqualTo(ActionListState.Target.Loading(messageEvent))
val successState = awaitItem() val successState = awaitItem()
@ -130,6 +130,37 @@ class ActionListPresenterTest {
} }
} }
@Test
fun `present - compute for others message and can redact`() = runTest {
val presenter = anActionListPresenter(isBuildDebuggable = true)
moleculeFlow(RecompositionMode.Immediate) {
presenter.present()
}.test {
val initialState = awaitItem()
val messageEvent = aMessageEvent(
isMine = false,
content = TimelineItemTextContent(body = A_MESSAGE, htmlDocument = null, isEdited = false)
)
initialState.eventSink.invoke(ActionListEvents.ComputeForMessage(messageEvent, true))
val successState = awaitItem()
assertThat(successState.target).isEqualTo(
ActionListState.Target.Success(
messageEvent,
persistentListOf(
TimelineItemAction.Reply,
TimelineItemAction.Forward,
TimelineItemAction.Copy,
TimelineItemAction.Developer,
TimelineItemAction.ReportContent,
TimelineItemAction.Redact,
)
)
)
initialState.eventSink.invoke(ActionListEvents.Clear)
assertThat(awaitItem().target).isEqualTo(ActionListState.Target.None)
}
}
@Test @Test
fun `present - compute for my message`() = runTest { fun `present - compute for my message`() = runTest {
val presenter = anActionListPresenter(isBuildDebuggable = true) val presenter = anActionListPresenter(isBuildDebuggable = true)
@ -141,7 +172,7 @@ class ActionListPresenterTest {
isMine = true, isMine = true,
content = TimelineItemTextContent(body = A_MESSAGE, htmlDocument = null, isEdited = false) content = TimelineItemTextContent(body = A_MESSAGE, htmlDocument = null, isEdited = false)
) )
initialState.eventSink.invoke(ActionListEvents.ComputeForMessage(messageEvent)) initialState.eventSink.invoke(ActionListEvents.ComputeForMessage(messageEvent, false))
// val loadingState = awaitItem() // val loadingState = awaitItem()
// assertThat(loadingState.target).isEqualTo(ActionListState.Target.Loading(messageEvent)) // assertThat(loadingState.target).isEqualTo(ActionListState.Target.Loading(messageEvent))
val successState = awaitItem() val successState = awaitItem()
@ -174,7 +205,7 @@ class ActionListPresenterTest {
isMine = true, isMine = true,
content = aTimelineItemImageContent(), content = aTimelineItemImageContent(),
) )
initialState.eventSink.invoke(ActionListEvents.ComputeForMessage(messageEvent)) initialState.eventSink.invoke(ActionListEvents.ComputeForMessage(messageEvent, false))
// val loadingState = awaitItem() // val loadingState = awaitItem()
// assertThat(loadingState.target).isEqualTo(ActionListState.Target.Loading(messageEvent)) // assertThat(loadingState.target).isEqualTo(ActionListState.Target.Loading(messageEvent))
val successState = awaitItem() val successState = awaitItem()
@ -205,7 +236,7 @@ class ActionListPresenterTest {
isMine = true, isMine = true,
content = aTimelineItemStateEventContent(), content = aTimelineItemStateEventContent(),
) )
initialState.eventSink.invoke(ActionListEvents.ComputeForMessage(stateEvent)) initialState.eventSink.invoke(ActionListEvents.ComputeForMessage(stateEvent, false))
// val loadingState = awaitItem() // val loadingState = awaitItem()
// assertThat(loadingState.target).isEqualTo(ActionListState.Target.Loading(messageEvent)) // assertThat(loadingState.target).isEqualTo(ActionListState.Target.Loading(messageEvent))
val successState = awaitItem() val successState = awaitItem()
@ -234,7 +265,7 @@ class ActionListPresenterTest {
isMine = true, isMine = true,
content = aTimelineItemStateEventContent(), content = aTimelineItemStateEventContent(),
) )
initialState.eventSink.invoke(ActionListEvents.ComputeForMessage(stateEvent)) initialState.eventSink.invoke(ActionListEvents.ComputeForMessage(stateEvent, false))
// val loadingState = awaitItem() // val loadingState = awaitItem()
// assertThat(loadingState.target).isEqualTo(ActionListState.Target.Loading(messageEvent)) // assertThat(loadingState.target).isEqualTo(ActionListState.Target.Loading(messageEvent))
val successState = awaitItem() val successState = awaitItem()
@ -262,7 +293,7 @@ class ActionListPresenterTest {
isMine = true, isMine = true,
content = TimelineItemTextContent(body = A_MESSAGE, htmlDocument = null, isEdited = false) content = TimelineItemTextContent(body = A_MESSAGE, htmlDocument = null, isEdited = false)
) )
initialState.eventSink.invoke(ActionListEvents.ComputeForMessage(messageEvent)) initialState.eventSink.invoke(ActionListEvents.ComputeForMessage(messageEvent, false))
// val loadingState = awaitItem() // val loadingState = awaitItem()
// assertThat(loadingState.target).isEqualTo(ActionListState.Target.Loading(messageEvent)) // assertThat(loadingState.target).isEqualTo(ActionListState.Target.Loading(messageEvent))
val successState = awaitItem() val successState = awaitItem()
@ -299,10 +330,10 @@ class ActionListPresenterTest {
content = TimelineItemRedactedContent, content = TimelineItemRedactedContent,
) )
initialState.eventSink.invoke(ActionListEvents.ComputeForMessage(messageEvent)) initialState.eventSink.invoke(ActionListEvents.ComputeForMessage(messageEvent, false))
assertThat(awaitItem().target).isInstanceOf(ActionListState.Target.Success::class.java) assertThat(awaitItem().target).isInstanceOf(ActionListState.Target.Success::class.java)
initialState.eventSink.invoke(ActionListEvents.ComputeForMessage(redactedEvent)) initialState.eventSink.invoke(ActionListEvents.ComputeForMessage(redactedEvent, false))
awaitItem().run { awaitItem().run {
assertThat(target).isEqualTo(ActionListState.Target.None) assertThat(target).isEqualTo(ActionListState.Target.None)
assertThat(displayEmojiReactions).isFalse() assertThat(displayEmojiReactions).isFalse()
@ -323,7 +354,7 @@ class ActionListPresenterTest {
content = TimelineItemTextContent(body = A_MESSAGE, htmlDocument = null, isEdited = false), content = TimelineItemTextContent(body = A_MESSAGE, htmlDocument = null, isEdited = false),
) )
initialState.eventSink.invoke(ActionListEvents.ComputeForMessage(messageEvent)) initialState.eventSink.invoke(ActionListEvents.ComputeForMessage(messageEvent, false))
val successState = awaitItem() val successState = awaitItem()
assertThat(successState.target).isEqualTo( assertThat(successState.target).isEqualTo(
ActionListState.Target.Success( ActionListState.Target.Success(

View file

@ -44,8 +44,10 @@ import androidx.compose.ui.graphics.ColorFilter
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import io.element.android.libraries.designsystem.preview.ElementPreviewDark import io.element.android.libraries.designsystem.preview.ElementPreviewDark
import io.element.android.libraries.designsystem.preview.ElementPreviewLight import io.element.android.libraries.designsystem.preview.ElementPreviewLight
import io.element.android.libraries.designsystem.text.toDp
import io.element.android.libraries.theme.ElementTheme import io.element.android.libraries.theme.ElementTheme
import io.element.android.libraries.ui.strings.CommonStrings import io.element.android.libraries.ui.strings.CommonStrings
@ -85,14 +87,14 @@ private fun Indicator(modifier: Modifier = Modifier) {
.statusBarsPadding() .statusBarsPadding()
.padding(vertical = 6.dp), .padding(vertical = 6.dp),
horizontalArrangement = Arrangement.Center, horizontalArrangement = Arrangement.Center,
verticalAlignment = Alignment.Bottom, verticalAlignment = Alignment.CenterVertically,
) { ) {
val tint = MaterialTheme.colorScheme.primary val tint = MaterialTheme.colorScheme.primary
Image( Image(
imageVector = Icons.Outlined.WifiOff, imageVector = Icons.Outlined.WifiOff,
contentDescription = null, contentDescription = null,
colorFilter = ColorFilter.tint(tint), colorFilter = ColorFilter.tint(tint),
modifier = Modifier.size(16.dp), modifier = Modifier.size(16.sp.toDp()),
) )
Spacer(modifier = Modifier.width(8.dp)) Spacer(modifier = Modifier.width(8.dp))
Text( Text(

View file

@ -50,12 +50,12 @@ fun AboutView(
@Preview @Preview
@Composable @Composable
fun AboutViewLightPreview(@PreviewParameter(AboutStateProvider::class) state: AboutState) = internal fun AboutViewLightPreview(@PreviewParameter(AboutStateProvider::class) state: AboutState) =
ElementPreviewLight { ContentToPreview(state) } ElementPreviewLight { ContentToPreview(state) }
@Preview @Preview
@Composable @Composable
fun AboutViewDarkPreview(@PreviewParameter(AboutStateProvider::class) state: AboutState) = internal fun AboutViewDarkPreview(@PreviewParameter(AboutStateProvider::class) state: AboutState) =
ElementPreviewDark { ContentToPreview(state) } ElementPreviewDark { ContentToPreview(state) }
@Composable @Composable

View file

@ -46,12 +46,12 @@ fun AnalyticsSettingsView(
@Preview @Preview
@Composable @Composable
fun AnalyticsSettingsViewLightPreview(@PreviewParameter(AnalyticsSettingsStateProvider::class) state: AnalyticsSettingsState) = internal fun AnalyticsSettingsViewLightPreview(@PreviewParameter(AnalyticsSettingsStateProvider::class) state: AnalyticsSettingsState) =
ElementPreviewLight { ContentToPreview(state) } ElementPreviewLight { ContentToPreview(state) }
@Preview @Preview
@Composable @Composable
fun AnalyticsSettingsViewDarkPreview(@PreviewParameter(AnalyticsSettingsStateProvider::class) state: AnalyticsSettingsState) = internal fun AnalyticsSettingsViewDarkPreview(@PreviewParameter(AnalyticsSettingsStateProvider::class) state: AnalyticsSettingsState) =
ElementPreviewDark { ContentToPreview(state) } ElementPreviewDark { ContentToPreview(state) }
@Composable @Composable

View file

@ -96,12 +96,12 @@ fun FeatureListContent(
@Preview @Preview
@Composable @Composable
fun DeveloperSettingsViewLightPreview(@PreviewParameter(DeveloperSettingsStateProvider::class) state: DeveloperSettingsState) = internal fun DeveloperSettingsViewLightPreview(@PreviewParameter(DeveloperSettingsStateProvider::class) state: DeveloperSettingsState) =
ElementPreviewLight { ContentToPreview(state) } ElementPreviewLight { ContentToPreview(state) }
@Preview @Preview
@Composable @Composable
fun DeveloperSettingsViewDarkPreview(@PreviewParameter(DeveloperSettingsStateProvider::class) state: DeveloperSettingsState) = internal fun DeveloperSettingsViewDarkPreview(@PreviewParameter(DeveloperSettingsStateProvider::class) state: DeveloperSettingsState) =
ElementPreviewDark { ContentToPreview(state) } ElementPreviewDark { ContentToPreview(state) }
@Composable @Composable

View file

@ -129,12 +129,12 @@ fun DeveloperPreferencesView(onOpenDeveloperSettings: () -> Unit) {
@LargeHeightPreview @LargeHeightPreview
@Composable @Composable
fun PreferencesRootViewLightPreview(@PreviewParameter(MatrixUserProvider::class) matrixUser: MatrixUser) = internal fun PreferencesRootViewLightPreview(@PreviewParameter(MatrixUserProvider::class) matrixUser: MatrixUser) =
ElementPreviewLight { ContentToPreview(matrixUser) } ElementPreviewLight { ContentToPreview(matrixUser) }
@LargeHeightPreview @LargeHeightPreview
@Composable @Composable
fun PreferencesRootViewDarkPreview(@PreviewParameter(MatrixUserProvider::class) matrixUser: MatrixUser) = internal fun PreferencesRootViewDarkPreview(@PreviewParameter(MatrixUserProvider::class) matrixUser: MatrixUser) =
ElementPreviewDark { ContentToPreview(matrixUser) } ElementPreviewDark { ContentToPreview(matrixUser) }
@Composable @Composable

View file

@ -68,12 +68,12 @@ fun RageshakePreferencesView(
@Preview @Preview
@Composable @Composable
fun RageshakePreferencesViewLightPreview(@PreviewParameter(RageshakePreferencesStateProvider::class) state: RageshakePreferencesState) = internal fun RageshakePreferencesViewLightPreview(@PreviewParameter(RageshakePreferencesStateProvider::class) state: RageshakePreferencesState) =
ElementPreviewLight { ContentToPreview(state) } ElementPreviewLight { ContentToPreview(state) }
@Preview @Preview
@Composable @Composable
fun RageshakePreferencesViewDarkPreview(@PreviewParameter(RageshakePreferencesStateProvider::class) state: RageshakePreferencesState) = internal fun RageshakePreferencesViewDarkPreview(@PreviewParameter(RageshakePreferencesStateProvider::class) state: RageshakePreferencesState) =
ElementPreviewDark { ContentToPreview(state) } ElementPreviewDark { ContentToPreview(state) }
@Composable @Composable

View file

@ -178,11 +178,11 @@ fun BugReportView(
@Preview @Preview
@Composable @Composable
fun BugReportViewLightPreview(@PreviewParameter(BugReportStateProvider::class) state: BugReportState) = ElementPreviewLight { ContentToPreview(state) } internal fun BugReportViewLightPreview(@PreviewParameter(BugReportStateProvider::class) state: BugReportState) = ElementPreviewLight { ContentToPreview(state) }
@Preview @Preview
@Composable @Composable
fun BugReportViewDarkPreview(@PreviewParameter(BugReportStateProvider::class) state: BugReportState) = ElementPreviewDark { ContentToPreview(state) } internal fun BugReportViewDarkPreview(@PreviewParameter(BugReportStateProvider::class) state: BugReportState) = ElementPreviewDark { ContentToPreview(state) }
@Composable @Composable
private fun ContentToPreview(state: BugReportState) { private fun ContentToPreview(state: BugReportState) {

View file

@ -62,9 +62,9 @@ class VectorUncaughtExceptionHandler(
totalSize = info.totalMemory() totalSize = info.totalMemory()
usedSize = totalSize - freeSize usedSize = totalSize - freeSize
} }
append("usedSize " + usedSize / 1048576L + " MB\n") append("usedSize " + usedSize / 1_048_576L + " MB\n")
append("freeSize " + freeSize / 1048576L + " MB\n") append("freeSize " + freeSize / 1_048_576L + " MB\n")
append("totalSize " + totalSize / 1048576L + " MB\n") append("totalSize " + totalSize / 1_048_576L + " MB\n")
append("Thread: ") append("Thread: ")
append(thread.name) append(thread.name)
append(", Exception: ") append(", Exception: ")

View file

@ -17,13 +17,11 @@
package io.element.android.features.roomdetails.impl package io.element.android.features.roomdetails.impl
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.ExperimentalLayoutApi import androidx.compose.foundation.layout.ExperimentalLayoutApi
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.consumeWindowInsets import androidx.compose.foundation.layout.consumeWindowInsets
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
@ -226,22 +224,28 @@ internal fun RoomHeaderSection(
roomAlias: String?, roomAlias: String?,
modifier: Modifier = Modifier modifier: Modifier = Modifier
) { ) {
Column(modifier.fillMaxWidth(), horizontalAlignment = Alignment.CenterHorizontally) { Column(
Box(modifier = Modifier.size(70.dp)) { modifier = modifier
Avatar( .fillMaxWidth()
avatarData = AvatarData(roomId, roomName, avatarUrl, AvatarSize.RoomHeader), .padding(horizontal = 16.dp),
modifier = Modifier.fillMaxSize() horizontalAlignment = Alignment.CenterHorizontally,
) ) {
} Avatar(
avatarData = AvatarData(roomId, roomName, avatarUrl, AvatarSize.RoomHeader),
modifier = Modifier.size(70.dp)
)
Spacer(modifier = Modifier.height(24.dp)) Spacer(modifier = Modifier.height(24.dp))
Text(roomName, style = ElementTheme.typography.fontHeadingLgBold) Text(
text = roomName,
style = ElementTheme.typography.fontHeadingLgBold,
textAlign = TextAlign.Center,
)
if (roomAlias != null) { if (roomAlias != null) {
Spacer(modifier = Modifier.height(6.dp)) Spacer(modifier = Modifier.height(6.dp))
Text( Text(
text = roomAlias, text = roomAlias,
style = ElementTheme.typography.fontBodyLgRegular, style = ElementTheme.typography.fontBodyLgRegular,
color = MaterialTheme.colorScheme.secondary, color = MaterialTheme.colorScheme.secondary,
modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp),
textAlign = TextAlign.Center, textAlign = TextAlign.Center,
) )
} }
@ -328,12 +332,12 @@ internal fun OtherActionsSection(onLeaveRoom: () -> Unit, modifier: Modifier = M
@LargeHeightPreview @LargeHeightPreview
@Composable @Composable
fun RoomDetailsLightPreview(@PreviewParameter(RoomDetailsStateProvider::class) state: RoomDetailsState) = internal fun RoomDetailsLightPreview(@PreviewParameter(RoomDetailsStateProvider::class) state: RoomDetailsState) =
ElementPreviewLight { ContentToPreview(state) } ElementPreviewLight { ContentToPreview(state) }
@LargeHeightPreview @LargeHeightPreview
@Composable @Composable
fun RoomDetailsDarkPreview(@PreviewParameter(RoomDetailsStateProvider::class) state: RoomDetailsState) = internal fun RoomDetailsDarkPreview(@PreviewParameter(RoomDetailsStateProvider::class) state: RoomDetailsState) =
ElementPreviewDark { ContentToPreview(state) } ElementPreviewDark { ContentToPreview(state) }
@Composable @Composable

View file

@ -292,12 +292,12 @@ private fun Modifier.clearFocusOnTap(focusManager: FocusManager): Modifier =
@Preview @Preview
@Composable @Composable
fun RoomDetailsEditViewLightPreview(@PreviewParameter(RoomDetailsEditStateProvider::class) state: RoomDetailsEditState) = internal fun RoomDetailsEditViewLightPreview(@PreviewParameter(RoomDetailsEditStateProvider::class) state: RoomDetailsEditState) =
ElementPreviewLight { ContentToPreview(state) } ElementPreviewLight { ContentToPreview(state) }
@Preview @Preview
@Composable @Composable
fun RoomDetailsEditViewDarkPreview(@PreviewParameter(RoomDetailsEditStateProvider::class) state: RoomDetailsEditState) = internal fun RoomDetailsEditViewDarkPreview(@PreviewParameter(RoomDetailsEditStateProvider::class) state: RoomDetailsEditState) =
ElementPreviewDark { ContentToPreview(state) } ElementPreviewDark { ContentToPreview(state) }
@Composable @Composable

View file

@ -220,12 +220,12 @@ private fun RoomInviteMembersSearchBar(
@Preview @Preview
@Composable @Composable
fun RoomInviteMembersLightPreview(@PreviewParameter(RoomInviteMembersStateProvider::class) state: RoomInviteMembersState) = internal fun RoomInviteMembersLightPreview(@PreviewParameter(RoomInviteMembersStateProvider::class) state: RoomInviteMembersState) =
ElementPreviewLight { ContentToPreview(state) } ElementPreviewLight { ContentToPreview(state) }
@Preview @Preview
@Composable @Composable
fun RoomInviteMembersDarkPreview(@PreviewParameter(RoomInviteMembersStateProvider::class) state: RoomInviteMembersState) = internal fun RoomInviteMembersDarkPreview(@PreviewParameter(RoomInviteMembersStateProvider::class) state: RoomInviteMembersState) =
ElementPreviewDark { ContentToPreview(state) } ElementPreviewDark { ContentToPreview(state) }
@Composable @Composable

View file

@ -257,12 +257,12 @@ private fun RoomMemberSearchBar(
@Preview @Preview
@Composable @Composable
fun RoomMemberListLightPreview(@PreviewParameter(RoomMemberListStateProvider::class) state: RoomMemberListState) = internal fun RoomMemberListLightPreview(@PreviewParameter(RoomMemberListStateProvider::class) state: RoomMemberListState) =
ElementPreviewLight { ContentToPreview(state) } ElementPreviewLight { ContentToPreview(state) }
@Preview @Preview
@Composable @Composable
fun RoomMemberListDarkPreview(@PreviewParameter(RoomMemberListStateProvider::class) state: RoomMemberListState) = internal fun RoomMemberListDarkPreview(@PreviewParameter(RoomMemberListStateProvider::class) state: RoomMemberListState) =
ElementPreviewDark { ContentToPreview(state) } ElementPreviewDark { ContentToPreview(state) }
@Composable @Composable

View file

@ -153,12 +153,12 @@ internal fun SendMessageSection(onSendMessage: () -> Unit, modifier: Modifier =
@LargeHeightPreview @LargeHeightPreview
@Composable @Composable
fun RoomMemberDetailsViewLightPreview(@PreviewParameter(RoomMemberDetailsStateProvider::class) state: RoomMemberDetailsState) = internal fun RoomMemberDetailsViewLightPreview(@PreviewParameter(RoomMemberDetailsStateProvider::class) state: RoomMemberDetailsState) =
ElementPreviewLight { ContentToPreview(state) } ElementPreviewLight { ContentToPreview(state) }
@LargeHeightPreview @LargeHeightPreview
@Composable @Composable
fun RoomMemberDetailsViewDarkPreview(@PreviewParameter(RoomMemberDetailsStateProvider::class) state: RoomMemberDetailsState) = internal fun RoomMemberDetailsViewDarkPreview(@PreviewParameter(RoomMemberDetailsStateProvider::class) state: RoomMemberDetailsState) =
ElementPreviewDark { ContentToPreview(state) } ElementPreviewDark { ContentToPreview(state) }
@Composable @Composable

View file

@ -43,6 +43,8 @@ import io.element.android.libraries.designsystem.components.avatar.Avatar
import io.element.android.libraries.designsystem.components.avatar.AvatarSize import io.element.android.libraries.designsystem.components.avatar.AvatarSize
import io.element.android.libraries.designsystem.preview.ElementPreviewDark import io.element.android.libraries.designsystem.preview.ElementPreviewDark
import io.element.android.libraries.designsystem.preview.ElementPreviewLight import io.element.android.libraries.designsystem.preview.ElementPreviewLight
import io.element.android.libraries.designsystem.text.applyScaleDown
import io.element.android.libraries.designsystem.text.toSp
import io.element.android.libraries.designsystem.theme.aliasScreenTitle import io.element.android.libraries.designsystem.theme.aliasScreenTitle
import io.element.android.libraries.designsystem.theme.components.DropdownMenu import io.element.android.libraries.designsystem.theme.components.DropdownMenu
import io.element.android.libraries.designsystem.theme.components.DropdownMenuItem import io.element.android.libraries.designsystem.theme.components.DropdownMenuItem
@ -114,7 +116,11 @@ private fun DefaultRoomListTopBar(
val fontStyle = if (scrollBehavior.state.collapsedFraction > 0.5) val fontStyle = if (scrollBehavior.state.collapsedFraction > 0.5)
ElementTheme.typography.aliasScreenTitle ElementTheme.typography.aliasScreenTitle
else else
ElementTheme.typography.fontHeadingLgBold ElementTheme.typography.fontHeadingLgBold.copy(
// Due to a limitation of MediumTopAppBar, and to avoid the text to be truncated,
// ensure that the font size will never be bigger than 28.dp.
fontSize = 28.dp.applyScaleDown().toSp()
)
Text( Text(
style = fontStyle, style = fontStyle,
text = stringResource(id = R.string.screen_roomlist_main_space_title) text = stringResource(id = R.string.screen_roomlist_main_space_title)

View file

@ -73,7 +73,8 @@ class RoomListDataSource @Inject constructor(
} }
.onEach { .onEach {
_filteredRooms.value = it _filteredRooms.value = it
}.launchIn(coroutineScope) }
.launchIn(coroutineScope)
} }
fun updateFilter(filterValue: String) { fun updateFilter(filterValue: String) {

View file

@ -242,12 +242,12 @@ internal fun BottomMenu(screenState: VerifySelfSessionState, goBack: () -> Unit)
@Preview @Preview
@Composable @Composable
fun VerifySelfSessionViewLightPreview(@PreviewParameter(VerifySelfSessionStateProvider::class) state: VerifySelfSessionState) = internal fun VerifySelfSessionViewLightPreview(@PreviewParameter(VerifySelfSessionStateProvider::class) state: VerifySelfSessionState) =
ElementPreviewLight { ContentToPreview(state) } ElementPreviewLight { ContentToPreview(state) }
@Preview @Preview
@Composable @Composable
fun VerifySelfSessionViewDarkPreview(@PreviewParameter(VerifySelfSessionStateProvider::class) state: VerifySelfSessionState) = internal fun VerifySelfSessionViewDarkPreview(@PreviewParameter(VerifySelfSessionStateProvider::class) state: VerifySelfSessionState) =
ElementPreviewDark { ContentToPreview(state) } ElementPreviewDark { ContentToPreview(state) }
@Composable @Composable

View file

@ -49,7 +49,7 @@ telephoto = "0.4.0"
# DI # DI
dagger = "2.47" dagger = "2.47"
anvil = "2.4.6" anvil = "2.4.7-1-8"
# Auto service # Auto service
autoservice = "1.1.1" autoservice = "1.1.1"

View file

@ -183,7 +183,7 @@ fun Context.startInstallFromSourceIntent(
noActivityFoundMessage: String = getString(R.string.error_no_compatible_app_found), noActivityFoundMessage: String = getString(R.string.error_no_compatible_app_found),
) { ) {
val intent = Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES) val intent = Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES)
.setData(Uri.parse(String.format("package:%s", packageName))) .setData(Uri.parse("package:$packageName"))
try { try {
activityResultLauncher.launch(intent) activityResultLauncher.launch(intent)
} catch (activityNotFoundException: ActivityNotFoundException) { } catch (activityNotFoundException: ActivityNotFoundException) {

View file

@ -23,5 +23,5 @@ import com.bumble.appyx.core.plugin.plugins
interface NodeInputs : Plugin interface NodeInputs : Plugin
inline fun <reified I : NodeInputs> Node.inputs(): I { inline fun <reified I : NodeInputs> Node.inputs(): I {
return plugins<I>().firstOrNull() ?: throw RuntimeException("Make sure to actually pass NodeInputs plugin to your node") return requireNotNull(plugins<I>().firstOrNull()) { "Make sure to actually pass NodeInputs plugin to your node" }
} }

View file

@ -72,7 +72,3 @@ fun String.ellipsize(length: Int): String {
return "${this.take(length)}" return "${this.take(length)}"
} }
inline fun <reified R> Any?.takeAs(): R? {
return takeIf { it is R } as R?
}

View file

@ -101,7 +101,7 @@ class DefaultLastMessageTimestampFormatterTest {
* Create DefaultLastMessageFormatter and set current time to the provided date. * Create DefaultLastMessageFormatter and set current time to the provided date.
*/ */
private fun createFormatter(@Suppress("SameParameterValue") currentDate: String): LastMessageTimestampFormatter { private fun createFormatter(@Suppress("SameParameterValue") currentDate: String): LastMessageTimestampFormatter {
val clock = FakeClock().also { it.givenInstant(Instant.parse(currentDate)) } val clock = FakeClock().apply { givenInstant(Instant.parse(currentDate)) }
val localDateTimeProvider = LocalDateTimeProvider(clock, TimeZone.UTC) val localDateTimeProvider = LocalDateTimeProvider(clock, TimeZone.UTC)
val dateFormatters = DateFormatters(Locale.US, clock, TimeZone.UTC) val dateFormatters = DateFormatters(Locale.US, clock, TimeZone.UTC)
return DefaultLastMessageTimestampFormatter(localDateTimeProvider, dateFormatters) return DefaultLastMessageTimestampFormatter(localDateTimeProvider, dateFormatters)

View file

@ -70,7 +70,7 @@ fun InfoListItemMolecule(
@DayNightPreviews @DayNightPreviews
@Composable @Composable
fun InfoListItemMoleculePreview() { internal fun InfoListItemMoleculePreview() {
ElementPreview { ElementPreview {
val color = if (isSystemInDarkTheme()) Color.DarkGray else Color.LightGray val color = if (isSystemInDarkTheme()) Color.DarkGray else Color.LightGray
Column( Column(

View file

@ -68,11 +68,11 @@ fun LabelledTextField(
@Preview @Preview
@Composable @Composable
fun LabelledTextFieldLightPreview() = ElementPreviewLight { ContentToPreview() } internal fun LabelledTextFieldLightPreview() = ElementPreviewLight { ContentToPreview() }
@Preview @Preview
@Composable @Composable
fun LabelledTextFieldDarkPreview() = ElementPreviewDark { ContentToPreview() } internal fun LabelledTextFieldDarkPreview() = ElementPreviewDark { ContentToPreview() }
@Composable @Composable
private fun ContentToPreview() { private fun ContentToPreview() {

View file

@ -51,6 +51,6 @@ fun PinIcon(
@DayNightPreviews @DayNightPreviews
@Composable @Composable
fun PinIconPreview() = ElementPreview { internal fun PinIconPreview() = ElementPreview {
PinIcon() PinIcon()
} }

View file

@ -102,7 +102,7 @@ private fun InitialsAvatar(
@Preview(group = PreviewGroup.Avatars) @Preview(group = PreviewGroup.Avatars)
@Composable @Composable
fun AvatarPreview(@PreviewParameter(AvatarDataProvider::class) avatarData: AvatarData) = internal fun AvatarPreview(@PreviewParameter(AvatarDataProvider::class) avatarData: AvatarData) =
ElementThemedPreview { ElementThemedPreview {
Row( Row(
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,

View file

@ -20,19 +20,16 @@ import androidx.compose.ui.tooling.preview.PreviewParameterProvider
open class AvatarDataProvider : PreviewParameterProvider<AvatarData> { open class AvatarDataProvider : PreviewParameterProvider<AvatarData> {
override val values: Sequence<AvatarData> override val values: Sequence<AvatarData>
get() { get() = AvatarSize.values()
AvatarSize.values() .asSequence()
.also { it.sortBy { item -> item.name } } .map {
.asSequence()
return AvatarSize.values().asSequence().map {
sequenceOf( sequenceOf(
anAvatarData(size = it), anAvatarData(size = it),
anAvatarData(size = it).copy(name = null), anAvatarData(size = it).copy(name = null),
anAvatarData(size = it).copy(url = "aUrl"), anAvatarData(size = it).copy(url = "aUrl"),
) )
} }
.flatten() .flatten()
}
} }
fun anAvatarData( fun anAvatarData(

View file

@ -42,6 +42,13 @@ const val DAY_MODE_NAME = "D"
* *
* NB: Content should be wrapped into [ElementPreview] to apply proper theming. * NB: Content should be wrapped into [ElementPreview] to apply proper theming.
*/ */
@Preview(name = DAY_MODE_NAME) @Preview(
@Preview(name = NIGHT_MODE_NAME, uiMode = Configuration.UI_MODE_NIGHT_YES) name = DAY_MODE_NAME,
fontScale = 1f,
)
@Preview(
name = NIGHT_MODE_NAME,
uiMode = Configuration.UI_MODE_NIGHT_YES,
fontScale = 1f,
)
annotation class DayNightPreviews annotation class DayNightPreviews

View file

@ -0,0 +1,38 @@
/*
* 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.libraries.designsystem.preview
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.unit.Density
/**
* Showkase does not take into account the `fontScale` parameter of the Preview annotation, so alter the
* LocalDensity in the CompositionLocalProvider.
*/
@Composable
fun WithFontScale(fontScale: Float, content: @Composable () -> Unit) {
CompositionLocalProvider(
LocalDensity provides Density(
density = LocalDensity.current.density,
fontScale = fontScale
)
) {
content()
}
}

View file

@ -0,0 +1,126 @@
/*
* 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.libraries.designsystem.text
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.padding
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
import io.element.android.libraries.designsystem.preview.WithFontScale
import io.element.android.libraries.designsystem.theme.components.Text
import io.element.android.libraries.theme.ElementTheme
/**
* Return the maximum value between the receiver value and the value with fontScale applied.
* So if fontScale is >= 1f, the same value is returned, and if fontScale is < 1f, so returned value
* will be smaller.
*/
@Composable
fun Dp.applyScaleDown(): Dp = with(LocalDensity.current) {
return this@applyScaleDown * fontScale.coerceAtMost(1f)
}
/**
* Return the minimum value between the receiver value and the value with fontScale applied.
* So if fontScale is <= 1f, the same value is returned, and if fontScale is > 1f, so returned value
* will be bigger.
*/
@Composable
fun Dp.applyScaleUp(): Dp = with(LocalDensity.current) {
return this@applyScaleUp * fontScale.coerceAtLeast(1f)
}
@Preview
@Composable
fun DpScalePreview_0_75f() = WithFontScale(0.75f) {
ElementPreviewLight {
val fontSizeInDp = 16.dp
Column(
modifier = Modifier.padding(4.dp),
verticalArrangement = Arrangement.spacedBy(6.dp)
) {
Text(
text = "Text with size of 16.sp",
style = ElementTheme.typography.fontBodyLgRegular.copy(fontSize = fontSizeInDp.toSp())
)
Text(
text = "Text with the same size (applyScaleUp)",
style = ElementTheme.typography.fontBodyLgRegular.copy(fontSize = fontSizeInDp.applyScaleUp().toSp())
)
Text(
text = "Text with a smaller size (applyScaleDown)",
style = ElementTheme.typography.fontBodyLgRegular.copy(fontSize = fontSizeInDp.applyScaleDown().toSp())
)
}
}
}
@Preview
@Composable
fun DpScalePreview_1_0f() = WithFontScale(1f) {
ElementPreviewLight {
val fontSizeInDp = 16.dp
Column(
modifier = Modifier.padding(4.dp),
verticalArrangement = Arrangement.spacedBy(6.dp)
) {
Text(
text = "Text with size of 16.sp",
style = ElementTheme.typography.fontBodyLgRegular.copy(fontSize = fontSizeInDp.toSp())
)
Text(
text = "Text with the same size (applyScaleUp)",
style = ElementTheme.typography.fontBodyLgRegular.copy(fontSize = fontSizeInDp.applyScaleUp().toSp())
)
Text(
text = "Text with the same size (applyScaleDown)",
style = ElementTheme.typography.fontBodyLgRegular.copy(fontSize = fontSizeInDp.applyScaleDown().toSp())
)
}
}
}
@Preview
@Composable
fun DpScalePreview_1_5f() = WithFontScale(1.5f) {
ElementPreviewLight {
val fontSizeInDp = 16.dp
Column(
modifier = Modifier.padding(4.dp),
verticalArrangement = Arrangement.spacedBy(6.dp)
) {
Text(
text = "Text with size of 16.sp",
style = ElementTheme.typography.fontBodyLgRegular.copy(fontSize = fontSizeInDp.toSp())
)
Text(
text = "Text with a bigger size (applyScaleUp)",
style = ElementTheme.typography.fontBodyLgRegular.copy(fontSize = fontSizeInDp.applyScaleUp().toSp())
)
Text(
text = "Text with the same size (applyScaleDown)",
style = ElementTheme.typography.fontBodyLgRegular.copy(fontSize = fontSizeInDp.applyScaleDown().toSp())
)
}
}
}

View file

@ -44,7 +44,7 @@ internal fun DatePickerPreviewDark() {
@Composable @Composable
private fun ContentToPreview() { private fun ContentToPreview() {
val state = rememberDatePickerState( val state = rememberDatePickerState(
initialSelectedDateMillis = 1672578000000L, initialSelectedDateMillis = 1_672_578_000_000L,
) )
AlertDialogContent( AlertDialogContent(
buttons = { /*TODO*/ }, buttons = { /*TODO*/ },

View file

@ -28,10 +28,12 @@ import timber.log.Timber
@Composable @Composable
fun LogCompositions(tag: String, msg: String) { fun LogCompositions(tag: String, msg: String) {
if (BuildConfig.DEBUG) { if (BuildConfig.DEBUG) {
val ref = remember { Ref(0) } val ref = remember { Ref() }
SideEffect { ref.value++ } SideEffect { ref.value++ }
Timber.tag(tag).d("Compositions: $msg ${ref.value}") Timber.tag(tag).d("Compositions: $msg ${ref.value}")
} }
} }
class Ref(var value: Int) private class Ref {
var value: Int = 0
}

View file

@ -236,7 +236,7 @@ private fun MapView.lifecycleObserver(previousState: MutableState<Lifecycle.Even
Lifecycle.Event.ON_DESTROY -> { Lifecycle.Event.ON_DESTROY -> {
//handled in onDispose //handled in onDispose
} }
else -> throw IllegalStateException() Lifecycle.Event.ON_ANY -> error("ON_ANY should never be used")
} }
previousState.value = event previousState.value = event
} }

View file

@ -95,9 +95,9 @@ object PermalinkParser {
return if (signUrl.isNullOrEmpty().not() && email.isNullOrEmpty().not()) { return if (signUrl.isNullOrEmpty().not() && email.isNullOrEmpty().not()) {
try { try {
val signValidUri = Uri.parse(signUrl) val signValidUri = Uri.parse(signUrl)
val identityServerHost = signValidUri.authority ?: throw IllegalArgumentException() val identityServerHost = signValidUri.authority ?: throw IllegalArgumentException("missing `authority`")
val token = signValidUri.getQueryParameter("token") ?: throw IllegalArgumentException() val token = signValidUri.getQueryParameter("token") ?: throw IllegalArgumentException("missing `token`")
val privateKey = signValidUri.getQueryParameter("private_key") ?: throw IllegalArgumentException() val privateKey = signValidUri.getQueryParameter("private_key") ?: throw IllegalArgumentException("missing `private_key`")
PermalinkData.RoomEmailInviteLink( PermalinkData.RoomEmailInviteLink(
roomId = identifier, roomId = identifier,
email = email!!, email = email!!,
@ -137,7 +137,8 @@ object PermalinkParser {
.parameterList .parameterList
.filter { .filter {
it.mParameter == "via" it.mParameter == "via"
}.map { }
.map {
URLDecoder.decode(it.mValue, "UTF-8") URLDecoder.decode(it.mValue, "UTF-8")
} }
} }

View file

@ -105,6 +105,8 @@ interface MatrixRoom : Closeable {
suspend fun canUserInvite(userId: UserId): Result<Boolean> suspend fun canUserInvite(userId: UserId): Result<Boolean>
suspend fun canUserRedact(userId: UserId): Result<Boolean>
suspend fun canUserSendState(userId: UserId, type: StateEventType): Result<Boolean> suspend fun canUserSendState(userId: UserId, type: StateEventType): Result<Boolean>
suspend fun canUserSendMessage(userId: UserId, type: MessageEventType): Result<Boolean> suspend fun canUserSendMessage(userId: UserId, type: MessageEventType): Result<Boolean>

View file

@ -34,3 +34,9 @@ suspend fun MatrixRoom.canSendState(type: StateEventType): Result<Boolean> = can
* Shortcut for calling [MatrixRoom.canUserSendMessage] with our own user. * Shortcut for calling [MatrixRoom.canUserSendMessage] with our own user.
*/ */
suspend fun MatrixRoom.canSendMessage(type: MessageEventType): Result<Boolean> = canUserSendMessage(sessionId, type) suspend fun MatrixRoom.canSendMessage(type: MessageEventType): Result<Boolean> = canUserSendMessage(sessionId, type)
/**
* Shortcut for calling [MatrixRoom.canUserRedact] with our own user.
*/
suspend fun MatrixRoom.canRedact(): Result<Boolean> = canUserRedact(sessionId)

View file

@ -147,7 +147,8 @@ class RustMatrixClient constructor(
if (syncState == SyncState.Running) { if (syncState == SyncState.Running) {
onSlidingSyncUpdate() onSlidingSyncUpdate()
} }
}.launchIn(sessionCoroutineScope) }
.launchIn(sessionCoroutineScope)
} }
override suspend fun getRoom(roomId: RoomId): MatrixRoom? = withContext(sessionDispatcher) { override suspend fun getRoom(roomId: RoomId): MatrixRoom? = withContext(sessionDispatcher) {
@ -227,7 +228,8 @@ class RustMatrixClient constructor(
roomSummaryDataSource.allRooms() roomSummaryDataSource.allRooms()
.filter { roomSummaries -> .filter { roomSummaries ->
roomSummaries.map { it.identifier() }.contains(roomId.value) roomSummaries.map { it.identifier() }.contains(roomId.value)
}.first() }
.first()
} }
roomId roomId
} }

View file

@ -93,7 +93,7 @@ class RustMatrixAuthenticationService @Inject constructor(
client.restoreSession(sessionData.toSession()) client.restoreSession(sessionData.toSession())
createMatrixClient(client) createMatrixClient(client)
} else { } else {
throw IllegalStateException("No session to restore with id $sessionId") error("No session to restore with id $sessionId")
} }
}.mapFailure { failure -> }.mapFailure { failure ->
failure.mapClientException() failure.mapClientException()

View file

@ -250,6 +250,12 @@ class RustMatrixRoom(
} }
} }
override suspend fun canUserRedact(userId: UserId): Result<Boolean> {
return runCatching {
innerRoom.canUserRedact(userId.value)
}
}
override suspend fun canUserSendState(userId: UserId, type: StateEventType): Result<Boolean> { override suspend fun canUserSendState(userId: UserId, type: StateEventType): Result<Boolean> {
return runCatching { return runCatching {
innerRoom.canUserSendState(userId.value, type.map()) innerRoom.canUserSendState(userId.value, type.map())

View file

@ -64,7 +64,8 @@ internal class RustRoomSummaryDataSource(
.map { it.toRoomSummaryDataSourceLoadingState() } .map { it.toRoomSummaryDataSourceLoadingState() }
.onEach { .onEach {
allRoomsLoadingState.value = it allRoomsLoadingState.value = it
}.launchIn(this) }
.launchIn(this)
launch { launch {
// Wait until running, as invites is only available after that // Wait until running, as invites is only available after that

View file

@ -118,7 +118,8 @@ class RustMatrixTimeline(
innerRoom.backPaginationStatusFlow() innerRoom.backPaginationStatusFlow()
.onEach { .onEach {
postPaginationStatus(it) postPaginationStatus(it)
}.launchIn(this) }
.launchIn(this)
taskHandleBag += fetchMembers().getOrNull() taskHandleBag += fetchMembers().getOrNull()
}.invokeOnCompletion { }.invokeOnCompletion {

View file

@ -27,7 +27,7 @@ import java.util.Date
class TimelineEncryptedHistoryPostProcessorTest { class TimelineEncryptedHistoryPostProcessorTest {
private val defaultLastLoginTimestamp = Date(1689061264L) private val defaultLastLoginTimestamp = Date(1_689_061_264L)
@Test @Test
fun `given an unencrypted room, nothing is done`() { fun `given an unencrypted room, nothing is done`() {

View file

@ -56,6 +56,7 @@ class FakeMatrixRoom(
override val joinedMemberCount: Long = 123L, override val joinedMemberCount: Long = 123L,
override val activeMemberCount: Long = 234L, override val activeMemberCount: Long = 234L,
private val matrixTimeline: MatrixTimeline = FakeMatrixTimeline(), private val matrixTimeline: MatrixTimeline = FakeMatrixTimeline(),
canRedact: Boolean = false,
) : MatrixRoom { ) : MatrixRoom {
private var ignoreResult: Result<Unit> = Result.success(Unit) private var ignoreResult: Result<Unit> = Result.success(Unit)
@ -66,6 +67,7 @@ class FakeMatrixRoom(
private var joinRoomResult = Result.success(Unit) private var joinRoomResult = Result.success(Unit)
private var inviteUserResult = Result.success(Unit) private var inviteUserResult = Result.success(Unit)
private var canInviteResult = Result.success(true) private var canInviteResult = Result.success(true)
private var canRedactResult = Result.success(canRedact)
private val canSendStateResults = mutableMapOf<StateEventType, Result<Boolean>>() private val canSendStateResults = mutableMapOf<StateEventType, Result<Boolean>>()
private val canSendEventResults = mutableMapOf<MessageEventType, Result<Boolean>>() private val canSendEventResults = mutableMapOf<MessageEventType, Result<Boolean>>()
private var sendMediaResult = Result.success(Unit) private var sendMediaResult = Result.success(Unit)
@ -207,6 +209,10 @@ class FakeMatrixRoom(
return canInviteResult return canInviteResult
} }
override suspend fun canUserRedact(userId: UserId): Result<Boolean> {
return canRedactResult
}
override suspend fun canUserSendState(userId: UserId, type: StateEventType): Result<Boolean> { override suspend fun canUserSendState(userId: UserId, type: StateEventType): Result<Boolean> {
return canSendStateResults[type] ?: Result.failure(IllegalStateException("No fake answer")) return canSendStateResults[type] ?: Result.failure(IllegalStateException("No fake answer"))
} }

View file

@ -111,12 +111,12 @@ private fun AvatarActionBottomSheetContent(
@Preview @Preview
@Composable @Composable
fun AvatarActionBottomSheetLightPreview() = internal fun AvatarActionBottomSheetLightPreview() =
ElementPreviewLight { ContentToPreview() } ElementPreviewLight { ContentToPreview() }
@Preview @Preview
@Composable @Composable
fun AvatarActionBottomSheetDarkPreview() = internal fun AvatarActionBottomSheetDarkPreview() =
ElementPreviewDark { ContentToPreview() } ElementPreviewDark { ContentToPreview() }
@Composable @Composable

View file

@ -103,12 +103,12 @@ private fun MatrixUserHeaderContent(
@Preview @Preview
@Composable @Composable
fun MatrixUserHeaderLightPreview(@PreviewParameter(MatrixUserProvider::class) matrixUser: MatrixUser) = internal fun MatrixUserHeaderLightPreview(@PreviewParameter(MatrixUserProvider::class) matrixUser: MatrixUser) =
ElementPreviewLight { ContentToPreview(matrixUser) } ElementPreviewLight { ContentToPreview(matrixUser) }
@Preview @Preview
@Composable @Composable
fun MatrixUserHeaderDarkPreview(@PreviewParameter(MatrixUserProvider::class) matrixUser: MatrixUser) = internal fun MatrixUserHeaderDarkPreview(@PreviewParameter(MatrixUserProvider::class) matrixUser: MatrixUser) =
ElementPreviewDark { ContentToPreview(matrixUser) } ElementPreviewDark { ContentToPreview(matrixUser) }
@Composable @Composable

View file

@ -68,12 +68,12 @@ fun MatrixUserHeaderPlaceholder(
@Preview @Preview
@Composable @Composable
fun MatrixUserHeaderPlaceholderLightPreview() = internal fun MatrixUserHeaderPlaceholderLightPreview() =
ElementPreviewLight { ContentToPreview() } ElementPreviewLight { ContentToPreview() }
@Preview @Preview
@Composable @Composable
fun MatrixUserHeaderPlaceholderDarkPreview() = internal fun MatrixUserHeaderPlaceholderDarkPreview() =
ElementPreviewDark { ContentToPreview() } ElementPreviewDark { ContentToPreview() }
@Composable @Composable

View file

@ -85,11 +85,11 @@ fun UnsavedAvatar(
@Preview @Preview
@Composable @Composable
fun UnsavedAvatarLightPreview() = ElementPreviewLight { ContentToPreview() } internal fun UnsavedAvatarLightPreview() = ElementPreviewLight { ContentToPreview() }
@Preview @Preview
@Composable @Composable
fun UnsavedAvatarDarkPreview() = ElementPreviewDark { ContentToPreview() } internal fun UnsavedAvatarDarkPreview() = ElementPreviewDark { ContentToPreview() }
@Composable @Composable
private fun ContentToPreview() { private fun ContentToPreview() {

View file

@ -57,14 +57,9 @@ fun MatrixRoom.getDirectRoomMember(roomMembersState: MatrixRoomMembersState): St
val roomMembers = roomMembersState.roomMembers() val roomMembers = roomMembersState.roomMembers()
return remember(roomMembersState) { return remember(roomMembersState) {
derivedStateOf { derivedStateOf {
if (roomMembers == null) { roomMembers
null ?.takeIf { it.size == 2 && isDirect && isEncrypted }
} else if (roomMembers.size == 2 && isDirect && isEncrypted) { ?.find { it.userId != sessionId }
roomMembers.find { it.userId != this.sessionId }
} else {
null
}
} }
} }
} }

View file

@ -21,6 +21,7 @@ import androidx.compose.runtime.State
import androidx.compose.runtime.produceState import androidx.compose.runtime.produceState
import io.element.android.libraries.matrix.api.room.MatrixRoom import io.element.android.libraries.matrix.api.room.MatrixRoom
import io.element.android.libraries.matrix.api.room.MessageEventType import io.element.android.libraries.matrix.api.room.MessageEventType
import io.element.android.libraries.matrix.api.room.powerlevels.canRedact
import io.element.android.libraries.matrix.api.room.powerlevels.canSendMessage import io.element.android.libraries.matrix.api.room.powerlevels.canSendMessage
@Composable @Composable
@ -30,3 +31,10 @@ fun MatrixRoom.canSendMessageAsState(type: MessageEventType, updateKey: Long): S
} }
} }
@Composable
fun MatrixRoom.canRedactAsState(updateKey: Long): State<Boolean> {
return produceState(initialValue = false, key1 = updateKey) {
value = canRedact().getOrElse { false }
}
}

View file

@ -83,12 +83,12 @@ fun PermissionsView(
@Preview @Preview
@Composable @Composable
fun PermissionsViewLightPreview(@PreviewParameter(PermissionsViewStateProvider::class) state: PermissionsState) = internal fun PermissionsViewLightPreview(@PreviewParameter(PermissionsViewStateProvider::class) state: PermissionsState) =
ElementPreviewLight { ContentToPreview(state) } ElementPreviewLight { ContentToPreview(state) }
@Preview @Preview
@Composable @Composable
fun PermissionsViewDarkPreview(@PreviewParameter(PermissionsViewStateProvider::class) state: PermissionsState) = internal fun PermissionsViewDarkPreview(@PreviewParameter(PermissionsViewStateProvider::class) state: PermissionsState) =
ElementPreviewDark { ContentToPreview(state) } ElementPreviewDark { ContentToPreview(state) }
@Composable @Composable

View file

@ -23,17 +23,15 @@ import io.element.android.libraries.matrix.api.core.SessionId
* Data class to hold information about a group of notifications for a room. * Data class to hold information about a group of notifications for a room.
*/ */
data class RoomEventGroupInfo( data class RoomEventGroupInfo(
val sessionId: SessionId, val sessionId: SessionId,
val roomId: RoomId, val roomId: RoomId,
val roomDisplayName: String, val roomDisplayName: String,
val isDirect: Boolean = false val isDirect: Boolean = false,
) {
// An event in the list has not yet been display // An event in the list has not yet been display
var hasNewEvent: Boolean = false val hasNewEvent: Boolean = false,
// true if at least one on the not yet displayed event is noisy // true if at least one on the not yet displayed event is noisy
var shouldBing: Boolean = false val shouldBing: Boolean = false,
var customSound: String? = null val customSound: String? = null,
var hasSmartReplyError: Boolean = false val hasSmartReplyError: Boolean = false,
var isUpdated: Boolean = false val isUpdated: Boolean = false,
} )

Some files were not shown because too many files have changed in this diff Show more