Remove usages of dimensionResource

This commit is contained in:
Ensar Sarajčić
2023-10-03 13:06:50 +02:00
parent 3f901ff290
commit 3323b2fb70
6 changed files with 43 additions and 57 deletions

View File

@ -14,13 +14,14 @@ import androidx.compose.ui.graphics.SolidColor
import androidx.compose.ui.graphics.painter.BrushPainter
import androidx.compose.ui.graphics.toArgb
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 com.simplemobiletools.commons.compose.extensions.MyDevices
import com.simplemobiletools.commons.compose.theme.AppThemeSurface
import com.simplemobiletools.commons.compose.theme.Dimens
import com.simplemobiletools.commons.extensions.adjustAlpha
import com.simplemobiletools.flashlight.R
import com.simplemobiletools.flashlight.helpers.AppDimensions
@Composable
internal fun WidgetConfigureScreen(
@ -37,15 +38,15 @@ internal fun WidgetConfigureScreen(
) {
Box(
modifier = Modifier
.padding(dimensionResource(id = R.dimen.activity_margin))
.padding(bottom = dimensionResource(id = R.dimen.activity_margin))
.padding(Dimens.margin.activity)
.padding(bottom = Dimens.margin.activity)
.fillMaxWidth()
.weight(1f)
) {
Icon(
modifier = Modifier
.align(Alignment.Center)
.size(dimensionResource(id = R.dimen.main_button_size)),
.size(AppDimensions.mainButtonSize),
painter = painterResource(id = widgetDrawable),
contentDescription = stringResource(id = R.string.bright_display),
tint = Color(widgetColor.adjustAlpha(widgetAlpha))
@ -55,8 +56,8 @@ internal fun WidgetConfigureScreen(
Row {
Icon(
modifier = Modifier
.size(dimensionResource(id = R.dimen.widget_colorpicker_size))
.padding(dimensionResource(id = R.dimen.tiny_margin))
.size(AppDimensions.widgetColorPickerSize)
.padding(Dimens.margin.tiny)
.clip(CircleShape)
.clickable { onColorPressed() },
painter = BrushPainter(SolidColor(Color(widgetColor))),
@ -68,12 +69,12 @@ internal fun WidgetConfigureScreen(
value = widgetAlpha,
onValueChange = onSliderChanged,
modifier = Modifier
.padding(start = dimensionResource(id = R.dimen.medium_margin))
.padding(start = Dimens.margin.medium)
.background(
color = colorResource(id = R.color.md_grey_white),
shape = MaterialTheme.shapes.extraLarge
)
.padding(horizontal = dimensionResource(id = R.dimen.activity_margin))
.padding(horizontal = Dimens.margin.activity)
)
}