Skip to content

Commit 6665a6b

Browse files
fix: show public link info for folders (WPB-19471) (#4191)
Co-authored-by: Oussama Hassine <[email protected]>
1 parent cba0c73 commit 6665a6b

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

features/cells/src/main/java/com/wire/android/feature/cells/ui/CellListItem.kt

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,9 @@ internal fun CellListItem(
7878
verticalAlignment = Alignment.CenterVertically,
7979
) {
8080

81-
if (cell is CellNodeUi.File) {
82-
FileIconPreview(cell)
83-
} else {
84-
FolderIconPreview()
81+
when (cell) {
82+
is CellNodeUi.File -> FileIconPreview(cell)
83+
is CellNodeUi.Folder -> FolderIconPreview(cell)
8584
}
8685

8786
Column(
@@ -148,7 +147,7 @@ internal fun CellListItem(
148147
}
149148

150149
@Composable
151-
internal fun FolderIconPreview() {
150+
internal fun FolderIconPreview(cell: CellNodeUi.Folder) {
152151
Box(
153152
modifier = Modifier
154153
.size(dimensions().spacing56x),
@@ -159,6 +158,12 @@ internal fun FolderIconPreview() {
159158
painter = painterResource(R.drawable.ic_folder_item),
160159
contentDescription = null,
161160
)
161+
cell.publicLinkId?.let {
162+
PublicLinkIcon(
163+
offsetX = dimensions().spacing12x,
164+
offsetY = dimensions().spacing12x
165+
)
166+
}
162167
}
163168
}
164169

features/cells/src/main/java/com/wire/android/feature/cells/ui/model/CellNodeUi.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ internal fun Node.Folder.toUiModel() = CellNodeUi.Folder(
9797
remotePath = remotePath,
9898
size = size,
9999
tags = tags,
100+
publicLinkId = publicLinkId,
100101
)
101102

102103
private fun Node.File.formattedModifiedTime() = modifiedTime?.let {

features/cells/src/main/java/com/wire/android/feature/cells/ui/movetofolder/MoveToFolderScreen.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ private fun RowItem(
284284
) {
285285
when (cell) {
286286
is CellNodeUi.File -> FileIconPreview(cell)
287-
is CellNodeUi.Folder -> FolderIconPreview()
287+
is CellNodeUi.Folder -> FolderIconPreview(cell)
288288
}
289289
Text(
290290
cell.name ?: "",
@@ -307,6 +307,7 @@ fun PreviewMoveToFolderItem() {
307307
conversationName = "Conversation",
308308
modifiedTime = null,
309309
size = 1234,
310+
publicLinkId = "public"
310311
)
311312
)
312313
}

0 commit comments

Comments
 (0)