diff --git a/app/src/main/java/be/scri/ui/common/components/AboutPageItemComp.kt b/app/src/main/java/be/scri/ui/common/components/AboutPageItemComp.kt
index 084b5715..815820c2 100644
--- a/app/src/main/java/be/scri/ui/common/components/AboutPageItemComp.kt
+++ b/app/src/main/java/be/scri/ui/common/components/AboutPageItemComp.kt
@@ -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.
@@ -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(
diff --git a/app/src/main/java/be/scri/ui/common/components/ItemCardContainer.kt b/app/src/main/java/be/scri/ui/common/components/ItemCardContainer.kt
index f1065b9c..a92656c7 100644
--- a/app/src/main/java/be/scri/ui/common/components/ItemCardContainer.kt
+++ b/app/src/main/java/be/scri/ui/common/components/ItemCardContainer.kt
@@ -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
@@ -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(
diff --git a/app/src/main/java/be/scri/ui/screens/InstallationScreen.kt b/app/src/main/java/be/scri/ui/screens/InstallationScreen.kt
index 1d510084..b45008a3 100644
--- a/app/src/main/java/be/scri/ui/screens/InstallationScreen.kt
+++ b/app/src/main/java/be/scri/ui/screens/InstallationScreen.kt
@@ -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
@@ -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,
@@ -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,
@@ -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,
diff --git a/app/src/main/java/be/scri/ui/screens/PrivacyPolicyScreen.kt b/app/src/main/java/be/scri/ui/screens/PrivacyPolicyScreen.kt
index 97999cef..02eeddeb 100644
--- a/app/src/main/java/be/scri/ui/screens/PrivacyPolicyScreen.kt
+++ b/app/src/main/java/be/scri/ui/screens/PrivacyPolicyScreen.kt
@@ -8,6 +8,7 @@ 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
@@ -15,6 +16,7 @@ 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
@@ -89,6 +91,7 @@ fun PrivacyPolicyScreenContent(
),
)
Card(
+ shape = RoundedCornerShape(dimensionResource(id = R.dimen.rounded_corner_radius_standard)),
colors =
CardDefaults.cardColors(
containerColor = MaterialTheme.colorScheme.surface,
diff --git a/app/src/main/java/be/scri/ui/screens/ThirdPartyScreen.kt b/app/src/main/java/be/scri/ui/screens/ThirdPartyScreen.kt
index 784ce02b..7b65c804 100644
--- a/app/src/main/java/be/scri/ui/screens/ThirdPartyScreen.kt
+++ b/app/src/main/java/be/scri/ui/screens/ThirdPartyScreen.kt
@@ -9,6 +9,7 @@ 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
@@ -16,6 +17,7 @@ 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
@@ -99,6 +101,7 @@ fun ThirdPartyScreenContent(
),
)
Card(
+ shape = RoundedCornerShape(dimensionResource(id = R.dimen.rounded_corner_radius_standard)),
colors =
CardDefaults.cardColors(
containerColor = MaterialTheme.colorScheme.surface,
diff --git a/app/src/main/java/be/scri/ui/screens/WikimediaScreen.kt b/app/src/main/java/be/scri/ui/screens/WikimediaScreen.kt
index a479ce8f..e50326a4 100644
--- a/app/src/main/java/be/scri/ui/screens/WikimediaScreen.kt
+++ b/app/src/main/java/be/scri/ui/screens/WikimediaScreen.kt
@@ -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
@@ -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
@@ -134,6 +136,7 @@ fun WikimediaScreenContent(
),
)
Card(
+ shape = RoundedCornerShape(dimensionResource(id = R.dimen.rounded_corner_radius_standard)),
colors =
CardDefaults.cardColors(
containerColor = MaterialTheme.colorScheme.surface,
diff --git a/app/src/main/java/be/scri/ui/screens/settings/SettingsScreen.kt b/app/src/main/java/be/scri/ui/screens/settings/SettingsScreen.kt
index b3b78618..95da9b6f 100644
--- a/app/src/main/java/be/scri/ui/screens/settings/SettingsScreen.kt
+++ b/app/src/main/java/be/scri/ui/screens/settings/SettingsScreen.kt
@@ -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
@@ -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,
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 77458b47..4089933f 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -53,6 +53,7 @@
100dp
4dp
10dp
+ 14dp
24dp
48dp