aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-27 23:36:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

ServiceWarningDialog: Tweak layout, add Cancel button

Browse Source
This commit is contained in:
Patryk Michalik
2021-06-04 18:33:30 +02:00
parent 07489cd782
commit 1a6d438887
3 changed files with 35 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
lawnchair/src/app/lawnchair/gestures/handlers/SleepGestureHandler.kt
View File

@@ -25,14 +25,10 @@ import android.content.Context
import android.content.Intent
import android.os.Build
import android.provider.Settings
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.*
import androidx.compose.material.*
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
@@ -137,25 +133,41 @@ fun ServiceWarningDialog(
.padding(16.dp)
.fillMaxWidth()
) {
CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.high) {
Text(
text = stringResource(id = title),
style = MaterialTheme.typography.h6
)
}
Text(
modifier = Modifier.padding(top = 8.dp, bottom = 16.dp),
text = stringResource(id = description),
style = MaterialTheme.typography.body2
text = stringResource(id = title),
style = MaterialTheme.typography.h6,
color = MaterialTheme.colors.onSurface
)
Button(
modifier = Modifier.align(Alignment.End),
onClick = {
context.startActivity(settingsIntent)
scope.launch { sheetState.hide() }
}
Text(
modifier = Modifier.padding(top = 16.dp),
text = stringResource(id = description),
style = MaterialTheme.typography.body2,
color = MaterialTheme.colors.onSurface
)
Row(
horizontalArrangement = Arrangement.End,
modifier = Modifier
.padding(top = 20.dp)
.fillMaxWidth()
) {
Text(text = stringResource(id = R.string.dt2s_warning_open_settings))
OutlinedButton(
shape = MaterialTheme.shapes.small,
onClick = {
scope.launch { sheetState.hide() }
}
) {
Text(text = stringResource(id = R.string.cancel))
}
Spacer(modifier = Modifier.requiredWidth(16.dp))
Button(
shape = MaterialTheme.shapes.small,
onClick = {
context.startActivity(settingsIntent)
scope.launch { sheetState.hide() }
}
) {
Text(text = stringResource(id = R.string.dt2s_warning_open_settings))
}
}
}
}

2
lawnchair/src/app/lawnchair/ui/theme/Shape.kt
View File

@@ -21,7 +21,7 @@ import androidx.compose.material.Shapes
import androidx.compose.ui.unit.dp
val Shapes = Shapes(
small = RoundedCornerShape(4.dp),
small = RoundedCornerShape(8.dp),
medium = RoundedCornerShape(8.dp),
large = RoundedCornerShape(12.dp)
)

2
lawnchair/src/app/lawnchair/ui/theme/Type.kt
View File

@@ -86,7 +86,7 @@ val Typography = Typography(
button = TextStyle(
fontWeight = FontWeight.SemiBold,
fontSize = 14.sp,
letterSpacing = 1.25.sp
letterSpacing = 0.25.sp
),
caption = TextStyle(
fontWeight = FontWeight.Bold,