From cf278e8e52ec7d974beb4db731925e606a5ca16f Mon Sep 17 00:00:00 2001 From: ohassine Date: Tue, 16 Dec 2025 15:28:09 +0100 Subject: [PATCH 1/2] fix: Share icon too small in menu --- .../android/ui/edit/ShareAssetMenuOption.kt | 2 +- .../{ic_link.xml => ic_link_indicator.xml} | 0 .../android/feature/cells/ui/CellListItem.kt | 8 ++-- .../cells/ui/model/NodeBottomSheetAction.kt | 2 +- .../cells/src/main/res/drawable/ic_link.xml | 47 ++++++++++--------- .../options/MeetingOptionsModalSheetLayout.kt | 2 +- 6 files changed, 34 insertions(+), 27 deletions(-) rename core/ui-common/src/main/res/drawable/{ic_link.xml => ic_link_indicator.xml} (100%) diff --git a/app/src/main/kotlin/com/wire/android/ui/edit/ShareAssetMenuOption.kt b/app/src/main/kotlin/com/wire/android/ui/edit/ShareAssetMenuOption.kt index 1cb18e98b07..3c1c5013801 100644 --- a/app/src/main/kotlin/com/wire/android/ui/edit/ShareAssetMenuOption.kt +++ b/app/src/main/kotlin/com/wire/android/ui/edit/ShareAssetMenuOption.kt @@ -42,7 +42,7 @@ fun SharePublicLinkMenuOption(onShareAsset: () -> Unit) { MenuBottomSheetItem( leading = { MenuItemIcon( - id = com.wire.android.ui.common.R.drawable.ic_link, + id = com.wire.android.ui.common.R.drawable.ic_link_indicator, contentDescription = stringResource(R.string.content_description_share_the_file), ) }, diff --git a/core/ui-common/src/main/res/drawable/ic_link.xml b/core/ui-common/src/main/res/drawable/ic_link_indicator.xml similarity index 100% rename from core/ui-common/src/main/res/drawable/ic_link.xml rename to core/ui-common/src/main/res/drawable/ic_link_indicator.xml diff --git a/features/cells/src/main/java/com/wire/android/feature/cells/ui/CellListItem.kt b/features/cells/src/main/java/com/wire/android/feature/cells/ui/CellListItem.kt index f774f3bd130..6a2c0aa4215 100644 --- a/features/cells/src/main/java/com/wire/android/feature/cells/ui/CellListItem.kt +++ b/features/cells/src/main/java/com/wire/android/feature/cells/ui/CellListItem.kt @@ -201,7 +201,9 @@ internal fun FileIconPreview(cell: CellNodeUi.File) { width = dimensions().spacing1x, color = colorsScheme().outline, shape = RoundedCornerShape(dimensions().spacing4x) - ), + ).clickable { + + }, contentScale = ContentScale.Crop, model = builder.build(), contentDescription = null, @@ -246,8 +248,8 @@ private fun PublicLinkIcon( color = colorsScheme().outline, shape = CircleShape ) - .padding(dimensions().spacing2x), - painter = painterResource(R.drawable.ic_link), + .padding(dimensions().spacing4x), + painter = painterResource(commonR.drawable.ic_link_indicator), contentDescription = null, ) } diff --git a/features/cells/src/main/java/com/wire/android/feature/cells/ui/model/NodeBottomSheetAction.kt b/features/cells/src/main/java/com/wire/android/feature/cells/ui/model/NodeBottomSheetAction.kt index 3121c211fef..9db85bcdf9b 100644 --- a/features/cells/src/main/java/com/wire/android/feature/cells/ui/model/NodeBottomSheetAction.kt +++ b/features/cells/src/main/java/com/wire/android/feature/cells/ui/model/NodeBottomSheetAction.kt @@ -25,7 +25,7 @@ enum class NodeBottomSheetAction( val isHighlighted: Boolean = false ) { SHARE(R.string.share_label, R.drawable.ic_share), - PUBLIC_LINK(R.string.public_link, com.wire.android.ui.common.R.drawable.ic_link), + PUBLIC_LINK(R.string.public_link, R.drawable.ic_link), ADD_REMOVE_TAGS(R.string.add_remove_tags_label, R.drawable.ic_tags), MOVE(R.string.move_label, R.drawable.ic_folder), RENAME(R.string.rename_label, R.drawable.ic_rename), diff --git a/features/cells/src/main/res/drawable/ic_link.xml b/features/cells/src/main/res/drawable/ic_link.xml index 5e42c8c0137..3f075a26f5e 100644 --- a/features/cells/src/main/res/drawable/ic_link.xml +++ b/features/cells/src/main/res/drawable/ic_link.xml @@ -1,22 +1,27 @@ - - - - - + + + + diff --git a/features/meetings/src/main/java/com/wire/android/feature/meetings/ui/options/MeetingOptionsModalSheetLayout.kt b/features/meetings/src/main/java/com/wire/android/feature/meetings/ui/options/MeetingOptionsModalSheetLayout.kt index a9da9f0d090..61aa2509a09 100644 --- a/features/meetings/src/main/java/com/wire/android/feature/meetings/ui/options/MeetingOptionsModalSheetLayout.kt +++ b/features/meetings/src/main/java/com/wire/android/feature/meetings/ui/options/MeetingOptionsModalSheetLayout.kt @@ -122,7 +122,7 @@ private fun MeetingOptionsModalContent( title = stringResource(R.string.meeting_options_copy_link), leading = { Icon( - painter = painterResource(UICommonR.drawable.ic_link), + painter = painterResource(UICommonR.drawable.ic_link_indicator), contentDescription = stringResource(R.string.content_description_copy_link), tint = colorsScheme().onSurface, ) From 77129deae13a8db773c4603c105b8c927bacfa10 Mon Sep 17 00:00:00 2001 From: ohassine Date: Tue, 16 Dec 2025 16:42:26 +0100 Subject: [PATCH 2/2] fix: cleanup --- .../java/com/wire/android/feature/cells/ui/CellListItem.kt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/features/cells/src/main/java/com/wire/android/feature/cells/ui/CellListItem.kt b/features/cells/src/main/java/com/wire/android/feature/cells/ui/CellListItem.kt index 6a2c0aa4215..fabff351240 100644 --- a/features/cells/src/main/java/com/wire/android/feature/cells/ui/CellListItem.kt +++ b/features/cells/src/main/java/com/wire/android/feature/cells/ui/CellListItem.kt @@ -201,9 +201,7 @@ internal fun FileIconPreview(cell: CellNodeUi.File) { width = dimensions().spacing1x, color = colorsScheme().outline, shape = RoundedCornerShape(dimensions().spacing4x) - ).clickable { - - }, + ), contentScale = ContentScale.Crop, model = builder.build(), contentDescription = null,