Skip to content

Commit ca20fb5

Browse files
authored
Merge pull request #151 from code-payments/chore/badge-sizing
Chore/badge sizing
2 parents 61662e0 + b0cdc24 commit ca20fb5

2 files changed

Lines changed: 20 additions & 2 deletions

File tree

app/src/main/java/com/getcode/ui/components/Badge.kt

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,17 @@ import androidx.compose.animation.fadeIn
55
import androidx.compose.animation.fadeOut
66
import androidx.compose.animation.scaleIn
77
import androidx.compose.animation.scaleOut
8+
import androidx.compose.foundation.layout.padding
9+
import androidx.compose.foundation.layout.size
810
import androidx.compose.material.Text
911
import androidx.compose.runtime.Composable
1012
import androidx.compose.ui.Modifier
13+
import androidx.compose.ui.draw.drawBehind
1114
import androidx.compose.ui.graphics.Color
1215
import androidx.compose.ui.text.font.FontWeight
16+
import androidx.compose.ui.unit.dp
1317
import com.getcode.theme.CodeTheme
18+
import com.getcode.ui.components.chat.ChatNodeDefaults
1419
import com.getcode.ui.utils.circleBackground
1520

1621

@@ -31,7 +36,13 @@ fun Badge(
3136
text = text,
3237
color = contentColor,
3338
style = CodeTheme.typography.body1.copy(fontWeight = FontWeight.W700),
34-
modifier = modifier.circleBackground(color = color, padding = CodeTheme.dimens.staticGrid.x1)
39+
modifier = modifier
40+
.drawBehind {
41+
drawCircle(
42+
color = color,
43+
radius = this.size.maxDimension / 2f
44+
)
45+
}.padding(2.dp)
3546
)
3647
}
3748
}

app/src/main/java/com/getcode/view/main/home/components/HomeBottom.kt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import androidx.compose.ui.res.painterResource
2020
import androidx.compose.ui.res.stringResource
2121
import androidx.compose.ui.tooling.preview.Preview
2222
import androidx.compose.ui.unit.Dp
23+
import androidx.compose.ui.unit.dp
2324
import com.getcode.R
2425
import com.getcode.theme.CodeTheme
2526
import com.getcode.ui.utils.heightOrZero
@@ -77,7 +78,13 @@ internal fun HomeBottom(
7778
imageSize = CodeTheme.dimens.grid.x9,
7879
painter = painterResource(R.drawable.ic_history),
7980
onClick = { onPress(HomeBottomSheet.BALANCE) },
80-
badge = { Badge(count = state.chatUnreadCount, color = ChatNodeDefaults.UnreadIndicator) }
81+
badge = {
82+
Badge(
83+
modifier = Modifier.padding(top = 2.dp, end = 2.dp),
84+
count = state.chatUnreadCount,
85+
color = ChatNodeDefaults.UnreadIndicator
86+
)
87+
}
8188
)
8289
}
8390
}

0 commit comments

Comments
 (0)