Complete SpaceFiltersView ui
This commit is contained in:
parent
e2e49ba384
commit
bb3e955ef8
2 changed files with 151 additions and 5 deletions
|
|
@ -8,6 +8,7 @@
|
||||||
package io.element.android.features.home.impl.spacefilters
|
package io.element.android.features.home.impl.spacefilters
|
||||||
|
|
||||||
import androidx.compose.ui.tooling.preview.PreviewParameterProvider
|
import androidx.compose.ui.tooling.preview.PreviewParameterProvider
|
||||||
|
import io.element.android.libraries.matrix.api.core.RoomAlias
|
||||||
import io.element.android.libraries.matrix.api.core.RoomId
|
import io.element.android.libraries.matrix.api.core.RoomId
|
||||||
import io.element.android.libraries.matrix.api.spaces.SpaceServiceFilter
|
import io.element.android.libraries.matrix.api.spaces.SpaceServiceFilter
|
||||||
import io.element.android.libraries.previewutils.room.aSpaceRoom
|
import io.element.android.libraries.previewutils.room.aSpaceRoom
|
||||||
|
|
@ -33,9 +34,24 @@ fun anUnselectedSpaceFiltersState(
|
||||||
|
|
||||||
fun aSelectingSpaceFiltersState(
|
fun aSelectingSpaceFiltersState(
|
||||||
availableFilters: List<SpaceServiceFilter> = listOf(
|
availableFilters: List<SpaceServiceFilter> = listOf(
|
||||||
aSpaceServiceFilter(displayName = "Work"),
|
aSpaceServiceFilter(
|
||||||
aSpaceServiceFilter(displayName = "Personal", roomId = RoomId("!personal:example.com")),
|
displayName = "Work",
|
||||||
aSpaceServiceFilter(displayName = "Gaming", roomId = RoomId("!gaming:example.com")),
|
canonicalAlias = RoomAlias("#work:example.com"),
|
||||||
|
),
|
||||||
|
aSpaceServiceFilter(
|
||||||
|
displayName = "Personal",
|
||||||
|
roomId = RoomId("!personal:example.com"),
|
||||||
|
),
|
||||||
|
aSpaceServiceFilter(
|
||||||
|
displayName = "Projects",
|
||||||
|
roomId = RoomId("!projects:example.com"),
|
||||||
|
canonicalAlias = RoomAlias("#projects:example.com"),
|
||||||
|
level = 1,
|
||||||
|
),
|
||||||
|
aSpaceServiceFilter(
|
||||||
|
displayName = "Gaming",
|
||||||
|
roomId = RoomId("!gaming:example.com"),
|
||||||
|
),
|
||||||
),
|
),
|
||||||
eventSink: (SpaceFiltersEvent.Selecting) -> Unit = {},
|
eventSink: (SpaceFiltersEvent.Selecting) -> Unit = {},
|
||||||
) = SpaceFiltersState.Selecting(
|
) = SpaceFiltersState.Selecting(
|
||||||
|
|
@ -54,10 +70,11 @@ fun aSelectedSpaceFiltersState(
|
||||||
fun aSpaceServiceFilter(
|
fun aSpaceServiceFilter(
|
||||||
displayName: String = "Space",
|
displayName: String = "Space",
|
||||||
roomId: RoomId = RoomId("!space:example.com"),
|
roomId: RoomId = RoomId("!space:example.com"),
|
||||||
|
canonicalAlias: RoomAlias? = null,
|
||||||
level: Int = 0,
|
level: Int = 0,
|
||||||
descendants: List<RoomId> = emptyList(),
|
descendants: List<RoomId> = emptyList(),
|
||||||
) = SpaceServiceFilter(
|
) = SpaceServiceFilter(
|
||||||
spaceRoom = aSpaceRoom(displayName = displayName, roomId = roomId),
|
spaceRoom = aSpaceRoom(displayName = displayName, roomId = roomId, canonicalAlias = canonicalAlias),
|
||||||
level = level,
|
level = level,
|
||||||
descendants = descendants,
|
descendants = descendants,
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -7,18 +7,147 @@
|
||||||
|
|
||||||
package io.element.android.features.home.impl.spacefilters
|
package io.element.android.features.home.impl.spacefilters
|
||||||
|
|
||||||
|
import androidx.compose.foundation.clickable
|
||||||
|
import androidx.compose.foundation.layout.Box
|
||||||
|
import androidx.compose.foundation.layout.Column
|
||||||
|
import androidx.compose.foundation.layout.Row
|
||||||
|
import androidx.compose.foundation.layout.Spacer
|
||||||
|
import androidx.compose.foundation.layout.fillMaxWidth
|
||||||
|
import androidx.compose.foundation.layout.height
|
||||||
|
import androidx.compose.foundation.layout.navigationBarsPadding
|
||||||
|
import androidx.compose.foundation.layout.padding
|
||||||
|
import androidx.compose.foundation.layout.systemBarsPadding
|
||||||
|
import androidx.compose.foundation.layout.width
|
||||||
|
import androidx.compose.foundation.lazy.LazyColumn
|
||||||
|
import androidx.compose.foundation.lazy.items
|
||||||
|
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||||
|
import androidx.compose.material3.rememberModalBottomSheetState
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
|
import androidx.compose.runtime.LaunchedEffect
|
||||||
|
import androidx.compose.runtime.getValue
|
||||||
|
import androidx.compose.runtime.mutableStateOf
|
||||||
|
import androidx.compose.runtime.remember
|
||||||
|
import androidx.compose.runtime.setValue
|
||||||
|
import androidx.compose.ui.Alignment
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.tooling.preview.PreviewParameter
|
import androidx.compose.ui.tooling.preview.PreviewParameter
|
||||||
|
import androidx.compose.ui.unit.dp
|
||||||
|
import io.element.android.compound.theme.ElementTheme
|
||||||
|
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.AvatarType
|
||||||
import io.element.android.libraries.designsystem.preview.ElementPreview
|
import io.element.android.libraries.designsystem.preview.ElementPreview
|
||||||
import io.element.android.libraries.designsystem.preview.PreviewsDayNight
|
import io.element.android.libraries.designsystem.preview.PreviewsDayNight
|
||||||
|
import io.element.android.libraries.designsystem.theme.components.ModalBottomSheet
|
||||||
|
import io.element.android.libraries.designsystem.theme.components.Text
|
||||||
|
import io.element.android.libraries.matrix.api.spaces.SpaceServiceFilter
|
||||||
|
import io.element.android.libraries.matrix.ui.model.getAvatarData
|
||||||
|
|
||||||
|
@OptIn(ExperimentalMaterial3Api::class)
|
||||||
@Composable
|
@Composable
|
||||||
fun SpaceFiltersView(
|
fun SpaceFiltersView(
|
||||||
state: SpaceFiltersState,
|
state: SpaceFiltersState,
|
||||||
modifier: Modifier = Modifier
|
modifier: Modifier = Modifier
|
||||||
) {
|
) {
|
||||||
// TODO
|
val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
|
||||||
|
var showSheet by remember { mutableStateOf(false) }
|
||||||
|
|
||||||
|
LaunchedEffect(state) {
|
||||||
|
when (state) {
|
||||||
|
is SpaceFiltersState.Selecting -> showSheet = true
|
||||||
|
else -> {
|
||||||
|
sheetState.hide()
|
||||||
|
showSheet = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Box(modifier = modifier) {
|
||||||
|
if (showSheet && state is SpaceFiltersState.Selecting) {
|
||||||
|
ModalBottomSheet(
|
||||||
|
modifier = Modifier
|
||||||
|
.systemBarsPadding()
|
||||||
|
.navigationBarsPadding(),
|
||||||
|
sheetState = sheetState,
|
||||||
|
onDismissRequest = { state.eventSink(SpaceFiltersEvent.Selecting.Cancel) },
|
||||||
|
) {
|
||||||
|
SpaceFiltersBottomSheetContent(
|
||||||
|
filters = state.availableFilters,
|
||||||
|
onFilterSelected = { filter ->
|
||||||
|
state.eventSink(SpaceFiltersEvent.Selecting.SelectFilter(filter))
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
private fun SpaceFiltersBottomSheetContent(
|
||||||
|
filters: List<SpaceServiceFilter>,
|
||||||
|
onFilterSelected: (SpaceServiceFilter) -> Unit,
|
||||||
|
modifier: Modifier = Modifier
|
||||||
|
) {
|
||||||
|
Column(
|
||||||
|
modifier = modifier
|
||||||
|
.fillMaxWidth()
|
||||||
|
.padding(bottom = 16.dp)
|
||||||
|
) {
|
||||||
|
Text(
|
||||||
|
modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
|
||||||
|
text = "Your spaces",
|
||||||
|
style = ElementTheme.typography.fontBodyLgMedium,
|
||||||
|
)
|
||||||
|
Spacer(modifier = Modifier.height(8.dp))
|
||||||
|
LazyColumn {
|
||||||
|
items(filters) { filter ->
|
||||||
|
SpaceFilterItem(
|
||||||
|
filter = filter,
|
||||||
|
onClick = { onFilterSelected(filter) }
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
private fun SpaceFilterItem(
|
||||||
|
filter: SpaceServiceFilter,
|
||||||
|
onClick: () -> Unit,
|
||||||
|
modifier: Modifier = Modifier
|
||||||
|
) {
|
||||||
|
val spaceRoom = filter.spaceRoom
|
||||||
|
val supportingText = spaceRoom.canonicalAlias?.value
|
||||||
|
|
||||||
|
Row(
|
||||||
|
modifier = modifier
|
||||||
|
.fillMaxWidth()
|
||||||
|
.clickable(onClick = onClick)
|
||||||
|
.padding(horizontal = 16.dp, vertical = 12.dp),
|
||||||
|
verticalAlignment = Alignment.CenterVertically,
|
||||||
|
) {
|
||||||
|
// Level-based indentation
|
||||||
|
Spacer(modifier = Modifier.width((16 * filter.level).dp))
|
||||||
|
Avatar(
|
||||||
|
avatarData = spaceRoom.getAvatarData(AvatarSize.RoomSelectRoomListItem),
|
||||||
|
avatarType = AvatarType.Space(),
|
||||||
|
)
|
||||||
|
Spacer(modifier = Modifier.width(16.dp))
|
||||||
|
Column {
|
||||||
|
Text(
|
||||||
|
text = spaceRoom.displayName,
|
||||||
|
style = ElementTheme.typography.fontBodyLgMedium,
|
||||||
|
color = ElementTheme.colors.textPrimary,
|
||||||
|
)
|
||||||
|
if (supportingText != null) {
|
||||||
|
Text(
|
||||||
|
text = supportingText,
|
||||||
|
style = ElementTheme.typography.fontBodyMdRegular,
|
||||||
|
color = ElementTheme.colors.textSecondary,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@PreviewsDayNight
|
@PreviewsDayNight
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue