diff --git a/app/src/main/java/com/example/tiptime/MainActivity.kt b/app/src/main/java/com/example/tiptime/MainActivity.kt index 49e7ecd..f4ea76e 100644 --- a/app/src/main/java/com/example/tiptime/MainActivity.kt +++ b/app/src/main/java/com/example/tiptime/MainActivity.kt @@ -50,7 +50,6 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.focus.FocusDirection import androidx.compose.ui.platform.LocalFocusManager -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 @@ -97,12 +96,11 @@ fun TipTimeLayout() { horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.Center ) { - val largePadding = dimensionResource(R.dimen.padding_large) - + val largePadding = 32.dp Text( text = stringResource(R.string.calculate_tip), modifier = Modifier - .padding(bottom = dimensionResource(R.dimen.padding_medium)) + .padding(bottom = 16.dp) .align(alignment = Alignment.Start) ) EditNumberField( @@ -156,13 +154,12 @@ fun EditNumberField( onValueChanged: (String) -> Unit, modifier: Modifier = Modifier ) { - val mediumPadding = dimensionResource(R.dimen.padding_medium) TextField( value = value, singleLine = true, leadingIcon = { Icon(painter = painterResource(id = leadingIcon), null) }, modifier = modifier, - shape = RoundedCornerShape(topStart = mediumPadding, topEnd = mediumPadding), + shape = RoundedCornerShape(topStart = 16.dp, topEnd = 16.dp), onValueChange = onValueChanged, label = { Text(stringResource(label)) }, keyboardOptions = keyboardOptions, diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml deleted file mode 100644 index 130cf93..0000000 --- a/app/src/main/res/values/dimens.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - 8dp - 16dp - 32dp -