Skip to content

Chore/badge sizing #151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bmc08gt merged 2 commits into from
Feb 8, 2024
Merged

Chore/badge sizing #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7700880
chore: simplify badge handling to reduce size
bmc08gt Feb 8, 2024
b0cdc24
chore: align badge with new sizing
bmc08gt Feb 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion app/src/main/java/com/getcode/ui/components/Badge.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand All @@ -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)
)
}
}
9 changes: 8 additions & 1 deletion app/src/main/java/com/getcode/view/main/home/components/HomeBottom.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
)
}
)
}
}
Expand Down