Skip to content

Use shared corner radius across components #522

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
andrewtavis merged 2 commits into from
Dec 23, 2025
Merged

Use shared corner radius across components #522

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0372892
use shared corner radius across components
Initye Dec 22, 2025
a6486bd
Merge branch 'main' into unify-corner-radius
andrewtavis Dec 23, 2025
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
4 changes: 3 additions & 1 deletion app/src/main/java/be/scri/ui/common/components/AboutPageItemComp.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,11 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.dimensionResource
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import be.scri.R

/**
* A composable component that displays a row with a title as well as leading and trailing icons.
Expand Down Expand Up @@ -49,7 +51,7 @@ fun AboutPageItemComp(
end = 20.dp,
top = 10.dp,
bottom = 10.dp,
).clip(RoundedCornerShape(12.dp)),
).clip(RoundedCornerShape(dimensionResource(id = R.dimen.rounded_corner_radius_standard))),
verticalAlignment = Alignment.CenterVertically,
) {
Icon(
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/java/be/scri/ui/common/components/ItemCardContainer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@ import androidx.compose.material3.Surface
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.dimensionResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import be.scri.R
import be.scri.ui.models.ScribeItem
import be.scri.ui.models.ScribeItemList

Expand All @@ -27,7 +29,7 @@ fun ItemsCardContainer(
) {
Surface(
modifier = modifier,
shape = RoundedCornerShape(12.dp),
shape = RoundedCornerShape(dimensionResource(id = R.dimen.rounded_corner_radius_standard)),
color = MaterialTheme.colorScheme.surface,
) {
Column(
Expand Down
9 changes: 5 additions & 4 deletions app/src/main/java/be/scri/ui/screens/InstallationScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.platform.LocalLayoutDirection
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.res.colorResource
import androidx.compose.ui.res.dimensionResource
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
Expand Down Expand Up @@ -120,7 +121,7 @@ fun InstallationScreen(
val intent = Intent(Settings.ACTION_INPUT_METHOD_SETTINGS)
context.startActivity(intent)
}.testTag("keyboardSettingsCard"),
shape = RoundedCornerShape(Dimensions.PaddingLarge),
shape = RoundedCornerShape(dimensionResource(id = R.dimen.rounded_corner_radius_standard)),
colors =
CardDefaults.cardColors(
containerColor = MaterialTheme.colorScheme.surface,
Expand Down Expand Up @@ -248,7 +249,7 @@ fun InstallationScreen(
.clickable {
onNavigateToDownloadData()
},
shape = RoundedCornerShape(Dimensions.PaddingLarge),
shape = RoundedCornerShape(dimensionResource(id = R.dimen.rounded_corner_radius_standard)),
colors =
CardDefaults.cardColors(
containerColor = MaterialTheme.colorScheme.surface,
Expand Down Expand Up @@ -295,8 +296,8 @@ fun InstallationScreen(
Modifier
.fillMaxWidth()
.padding(vertical = Dimensions.PaddingLarge)
.shadow(Dimensions.ElevationSmall, RoundedCornerShape(Dimensions.PaddingLarge)),
shape = RoundedCornerShape(Dimensions.PaddingLarge),
.shadow(Dimensions.ElevationSmall, RoundedCornerShape(dimensionResource(id = R.dimen.rounded_corner_radius_standard))),
shape = RoundedCornerShape(dimensionResource(id = R.dimen.rounded_corner_radius_standard)),
colors =
ButtonDefaults.outlinedButtonColors(
containerColor = MaterialTheme.colorScheme.surfaceContainer,
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/java/be/scri/ui/screens/PrivacyPolicyScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,15 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.dimensionResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.font.FontWeight
Expand Down Expand Up @@ -89,6 +91,7 @@ fun PrivacyPolicyScreenContent(
),
)
Card(
shape = RoundedCornerShape(dimensionResource(id = R.dimen.rounded_corner_radius_standard)),
colors =
CardDefaults.cardColors(
containerColor = MaterialTheme.colorScheme.surface,
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/java/be/scri/ui/screens/ThirdPartyScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,15 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.dimensionResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.font.FontWeight
Expand Down Expand Up @@ -99,6 +101,7 @@ fun ThirdPartyScreenContent(
),
)
Card(
shape = RoundedCornerShape(dimensionResource(id = R.dimen.rounded_corner_radius_standard)),
colors =
CardDefaults.cardColors(
containerColor = MaterialTheme.colorScheme.surface,
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/java/be/scri/ui/screens/WikimediaScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults
Expand All @@ -21,6 +22,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.ColorFilter
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.res.dimensionResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.res.vectorResource
import androidx.compose.ui.text.TextStyle
Expand Down Expand Up @@ -134,6 +136,7 @@ fun WikimediaScreenContent(
),
)
Card(
shape = RoundedCornerShape(dimensionResource(id = R.dimen.rounded_corner_radius_standard)),
colors =
CardDefaults.cardColors(
containerColor = MaterialTheme.colorScheme.surface,
Expand Down
5 changes: 3 additions & 2 deletions app/src/main/java/be/scri/ui/screens/settings/SettingsScreen.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.runtime.getValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.shadow
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.dimensionResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
Expand Down Expand Up @@ -147,8 +148,8 @@ private fun InstallKeyboardButton(onClick: () -> Unit) {
Modifier
.fillMaxWidth()
.padding(Dimensions.PaddingSmallXL)
.shadow(Dimensions.ElevationSmall, RoundedCornerShape(Dimensions.PaddingLarge)),
shape = RoundedCornerShape(Dimensions.PaddingLarge),
.shadow(Dimensions.ElevationSmall, RoundedCornerShape(dimensionResource(id = R.dimen.rounded_corner_radius_standard))),
shape = RoundedCornerShape(dimensionResource(id = R.dimen.rounded_corner_radius_standard)),
colors =
ButtonDefaults.outlinedButtonColors(
containerColor = MaterialTheme.colorScheme.surfaceContainer,
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
<dimen name="top_shadow_height">100dp</dimen>
<dimen name="rounded_corner_radius_small">4dp</dimen>
<dimen name="rounded_corner_radius_big">10dp</dimen>
<dimen name="rounded_corner_radius_standard">14dp</dimen>
<dimen name="bottom_sheet_corner_radius">24dp</dimen>
<dimen name="breadcrumbs_layout_height">48dp</dimen>

Expand Down