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

Merge develop into feature/fga/room_list_filters

Browse source
This commit is contained in:
ganfra 2024-02-21 17:48:20 +01:00
commit 0eacdfe565
2 changed files with 51 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -45,6 +45,7 @@ data class RoomListState(
val eventSink: (RoomListEvents) -> Unit,
) {
val displayFilters = filtersState.isFeatureEnabled && !displayMigrationStatus
val displayEmptyState = roomList is AsyncData.Success && roomList.data.isEmpty()
sealed interface ContextMenu {
data object Hidden : ContextMenu

11
features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListView.kt
View file

@ -59,7 +59,6 @@ import io.element.android.features.roomlist.impl.filters.RoomListFiltersView
import io.element.android.features.roomlist.impl.migration.MigrationScreenView
import io.element.android.features.roomlist.impl.model.RoomListRoomSummary
import io.element.android.features.roomlist.impl.search.RoomListSearchView
import io.element.android.libraries.architecture.AsyncData
import io.element.android.libraries.designsystem.preview.ElementPreview
import io.element.android.libraries.designsystem.preview.PreviewsDayNight
import io.element.android.libraries.designsystem.theme.components.Button
@ -136,9 +135,10 @@ fun RoomListView(
@Composable
private fun EmptyRoomListView(
onCreateRoomClicked: () -> Unit,
modifier: Modifier = Modifier
) {
Column(
modifier = Modifier.fillMaxSize(),
modifier = modifier.fillMaxSize(),
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.Center
) {
@ -222,9 +222,6 @@ private fun RoomListContent(
}
},
content = { padding ->
if (state.roomList is AsyncData.Success && state.roomList.data.isEmpty()) {
EmptyRoomListView(onCreateRoomClicked)
} else {
LazyColumn(
modifier = Modifier
.padding(padding)
@ -235,6 +232,7 @@ private fun RoomListContent(
contentPadding = PaddingValues(bottom = 80.dp)
) {
when {
state.displayEmptyState -> Unit
state.displayVerificationPrompt -> {
item {
RequestVerificationHeader(
@ -276,8 +274,9 @@ private fun RoomListContent(
}
}
}
if (state.displayEmptyState) {
EmptyRoomListView(onCreateRoomClicked)
}
MigrationScreenView(isMigrating = state.displayMigrationStatus)
},
floatingActionButton = {