From 851aa14a2ada0975690a61360e8f33aeb2d8811e Mon Sep 17 00:00:00 2001 From: Patryk Michalik Date: Thu, 21 Oct 2021 21:47:06 +0200 Subject: [PATCH] `PreferenceCategory`: Use `PreferenceTemplate` --- .../components/PreferenceCategory.kt | 48 +++++++------------ 1 file changed, 17 insertions(+), 31 deletions(-) diff --git a/lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceCategory.kt b/lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceCategory.kt index fc52bd1176..9ec2d7963e 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceCategory.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceCategory.kt @@ -40,37 +40,23 @@ fun PreferenceCategory( val navController = LocalNavController.current val resolvedRoute = subRoute(name = route) - Row( - verticalAlignment = Alignment.CenterVertically, - modifier = Modifier - .clickable(onClick = { navController.navigate(resolvedRoute) }) - .height(72.dp) - .padding(horizontal = 16.dp) - .fillMaxWidth() - ) { - Image( - painter = painterResource(id = iconResource), - contentDescription = null, - modifier = Modifier - .size(32.dp) - ) - Column(Modifier.padding(start = 16.dp)) { - Text( - text = label, - style = MaterialTheme.typography.subtitle1, - color = MaterialTheme.colors.onBackground - ) + PreferenceTemplate( + verticalPadding = 14.dp, + modifier = Modifier.clickable(onClick = { navController.navigate(resolvedRoute) }), + title = { + Text(text = label) + }, + description = { if (description != null) { - CompositionLocalProvider( - LocalContentAlpha provides ContentAlpha.medium, - LocalContentColor provides MaterialTheme.colors.onBackground - ) { - Text( - text = description, - style = MaterialTheme.typography.body2, - ) - } + Text(text = description) } - } - } + }, + startWidget = { + Image( + painter = painterResource(id = iconResource), + contentDescription = null, + modifier = Modifier.size(32.dp) + ) + }, + ) }