From 260d3eb39e56b4092fdac08e60b5c3c4bf4e954f Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 12 Aug 2024 10:40:34 +0200 Subject: [PATCH] Remove useless Boxes. --- .../pinned/banner/PinnedMessagesBannerView.kt | 40 +++++++++---------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerView.kt index e925220796..d466f1c20f 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerView.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerView.kt @@ -71,16 +71,15 @@ fun PinnedMessagesBannerView( onViewAllClick: () -> Unit, modifier: Modifier = Modifier, ) { - Box(modifier = modifier) { - when (state) { - PinnedMessagesBannerState.Hidden -> Unit - is PinnedMessagesBannerState.Visible -> { - PinnedMessagesBannerRow( - state = state, - onClick = onClick, - onViewAllClick = onViewAllClick, - ) - } + when (state) { + PinnedMessagesBannerState.Hidden -> Unit + is PinnedMessagesBannerState.Visible -> { + PinnedMessagesBannerRow( + state = state, + onClick = onClick, + onViewAllClick = onViewAllClick, + modifier = modifier, + ) } } } @@ -136,18 +135,17 @@ private fun ViewAllButton( onViewAllClick: () -> Unit, modifier: Modifier = Modifier, ) { - Box(modifier = modifier) { - val text = if (state is PinnedMessagesBannerState.Loaded) { - stringResource(id = CommonStrings.screen_room_pinned_banner_view_all_button_title) - } else { - "" - } - TextButton( - text = text, - showProgress = state is PinnedMessagesBannerState.Loading, - onClick = onViewAllClick - ) + val text = if (state is PinnedMessagesBannerState.Loaded) { + stringResource(id = CommonStrings.screen_room_pinned_banner_view_all_button_title) + } else { + "" } + TextButton( + text = text, + showProgress = state is PinnedMessagesBannerState.Loading, + onClick = onViewAllClick, + modifier = modifier, + ) } private fun Modifier.drawBorder(borderColor: Color): Modifier {