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

Remove useless (?) Column.

Browse source
This commit is contained in:
Benoit Marty 2023-06-21 17:46:56 +02:00 • committed by Benoit Marty
parent dc6a65a8db
commit 35fbdff907
1 changed files with 48 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -192,72 +192,67 @@ fun RoomListContent(
) )
}, },
content = { padding -> content = { padding ->
Column( LazyColumn(
modifier = Modifier modifier = Modifier
.padding(padding) .padding(padding)
.consumeWindowInsets(padding) .consumeWindowInsets(padding)
.nestedScroll(nestedScrollConnection),
state = lazyListState,
) { ) {
LazyColumn( if (state.displayVerificationPrompt) {
modifier = Modifier item {
.weight(1f) RequestVerificationHeader(
.nestedScroll(nestedScrollConnection), onVerifyClicked = onVerifyClicked,
state = lazyListState, onDismissClicked = { state.eventSink(RoomListEvents.DismissRequestVerificationPrompt) }
) { )
if (state.displayVerificationPrompt) {
item {
RequestVerificationHeader(
onVerifyClicked = onVerifyClicked,
onDismissClicked = { state.eventSink(RoomListEvents.DismissRequestVerificationPrompt) }
)
}
} }
}
if (state.invitesState != InvitesState.NoInvites) { if (state.invitesState != InvitesState.NoInvites) {
item { item {
Box( Box(
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
) {
Row(
modifier = Modifier
.clickable(role = Role.Button, onClick = onInvitesClicked)
.padding(horizontal = 16.dp)
.align(Alignment.CenterEnd)
.heightIn(min = 48.dp),
verticalAlignment = Alignment.CenterVertically,
) { ) {
Row( Text(
modifier = Modifier text = stringResource(CommonStrings.action_invites_list),
.clickable(role = Role.Button, onClick = onInvitesClicked) fontSize = 14.sp,
.padding(horizontal = 16.dp) style = noFontPadding,
.align(Alignment.CenterEnd) )
.heightIn(min = 48.dp),
verticalAlignment = Alignment.CenterVertically, if (state.invitesState == InvitesState.NewInvites) {
) { Spacer(Modifier.width(8.dp))
Text(
text = stringResource(CommonStrings.action_invites_list), Box(
fontSize = 14.sp, modifier = Modifier
style = noFontPadding, .size(12.dp)
.clip(CircleShape)
.background(MaterialTheme.roomListUnreadIndicator())
) )
if (state.invitesState == InvitesState.NewInvites) {
Spacer(Modifier.width(8.dp))
Box(
modifier = Modifier
.size(12.dp)
.clip(CircleShape)
.background(MaterialTheme.roomListUnreadIndicator())
)
}
} }
} }
} }
} }
}
itemsIndexed( itemsIndexed(
items = state.roomList, items = state.roomList,
contentType = { _, room -> room.contentType() }, contentType = { _, room -> room.contentType() },
) { index, room -> ) { index, room ->
RoomSummaryRow( RoomSummaryRow(
room = room, room = room,
onClick = ::onRoomClicked, onClick = ::onRoomClicked,
onLongClick = onRoomLongClicked, onLongClick = onRoomLongClicked,
) )
if (index != state.roomList.lastIndex) { if (index != state.roomList.lastIndex) {
Divider() Divider()
}
} }
} }
} }