From 770088077a3b0cc2c604da907b051db1f2e6c91d Mon Sep 17 00:00:00 2001 From: Brandon McAnsh Date: Thu, 8 Feb 2024 09:24:30 -0500 Subject: [PATCH 1/2] chore: simplify badge handling to reduce size Signed-off-by: Brandon McAnsh --- .../main/java/com/getcode/ui/components/Badge.kt | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/getcode/ui/components/Badge.kt b/app/src/main/java/com/getcode/ui/components/Badge.kt index 550eeb3ab..e86149ba3 100644 --- a/app/src/main/java/com/getcode/ui/components/Badge.kt +++ b/app/src/main/java/com/getcode/ui/components/Badge.kt @@ -5,12 +5,17 @@ import androidx.compose.animation.fadeIn import androidx.compose.animation.fadeOut import androidx.compose.animation.scaleIn import androidx.compose.animation.scaleOut +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size import androidx.compose.material.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.drawBehind import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp import com.getcode.theme.CodeTheme +import com.getcode.ui.components.chat.ChatNodeDefaults import com.getcode.ui.utils.circleBackground @@ -31,7 +36,13 @@ fun Badge( text = text, color = contentColor, style = CodeTheme.typography.body1.copy(fontWeight = FontWeight.W700), - modifier = modifier.circleBackground(color = color, padding = CodeTheme.dimens.staticGrid.x1) + modifier = modifier + .drawBehind { + drawCircle( + color = color, + radius = this.size.maxDimension / 2f + ) + }.padding(2.dp) ) } } \ No newline at end of file From b0cdc242cc751efb1879c6240cad08b337dc4779 Mon Sep 17 00:00:00 2001 From: Brandon McAnsh Date: Thu, 8 Feb 2024 09:35:31 -0500 Subject: [PATCH 2/2] chore: align badge with new sizing Signed-off-by: Brandon McAnsh --- .../com/getcode/view/main/home/components/HomeBottom.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/getcode/view/main/home/components/HomeBottom.kt b/app/src/main/java/com/getcode/view/main/home/components/HomeBottom.kt index a6ebb4436..fdb9f7668 100644 --- a/app/src/main/java/com/getcode/view/main/home/components/HomeBottom.kt +++ b/app/src/main/java/com/getcode/view/main/home/components/HomeBottom.kt @@ -20,6 +20,7 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.dp import com.getcode.R import com.getcode.theme.CodeTheme import com.getcode.ui.utils.heightOrZero @@ -77,7 +78,13 @@ internal fun HomeBottom( imageSize = CodeTheme.dimens.grid.x9, painter = painterResource(R.drawable.ic_history), onClick = { onPress(HomeBottomSheet.BALANCE) }, - badge = { Badge(count = state.chatUnreadCount, color = ChatNodeDefaults.UnreadIndicator) } + badge = { + Badge( + modifier = Modifier.padding(top = 2.dp, end = 2.dp), + count = state.chatUnreadCount, + color = ChatNodeDefaults.UnreadIndicator + ) + } ) } }