fix(Home): padding between installation cards
This commit is contained in:
parent
297ced7a2a
commit
b2a8111f96
3 changed files with 21 additions and 21 deletions
|
|
@ -125,7 +125,7 @@ fun HomeScreenLoadedContent(
|
||||||
onOpenPlugins: (packageName: String) -> Unit,
|
onOpenPlugins: (packageName: String) -> Unit,
|
||||||
) {
|
) {
|
||||||
LazyColumn(
|
LazyColumn(
|
||||||
verticalArrangement = Arrangement.spacedBy(6.dp),
|
verticalArrangement = Arrangement.spacedBy(10.dp),
|
||||||
horizontalAlignment = Alignment.CenterHorizontally,
|
horizontalAlignment = Alignment.CenterHorizontally,
|
||||||
contentPadding = padding
|
contentPadding = padding
|
||||||
.exclude(PaddingValuesSides.Horizontal + PaddingValuesSides.Top),
|
.exclude(PaddingValuesSides.Horizontal + PaddingValuesSides.Top),
|
||||||
|
|
@ -143,7 +143,7 @@ fun HomeScreenLoadedContent(
|
||||||
secondaryInstall = true,
|
secondaryInstall = true,
|
||||||
onClick = onClickInstall,
|
onClick = onClickInstall,
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.padding(vertical = 10.dp)
|
.padding(vertical = 4.dp)
|
||||||
.height(50.dp)
|
.height(50.dp)
|
||||||
.fillMaxWidth()
|
.fillMaxWidth()
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -33,10 +33,24 @@ class LogsListScreen : Screen, Parcelable {
|
||||||
val navigator = LocalNavigator.currentOrThrow
|
val navigator = LocalNavigator.currentOrThrow
|
||||||
val model = koinScreenModel<LogsListScreenModel>()
|
val model = koinScreenModel<LogsListScreenModel>()
|
||||||
|
|
||||||
|
var showWipeConfirmDialog by remember { mutableStateOf(false) }
|
||||||
|
|
||||||
|
if (showWipeConfirmDialog) {
|
||||||
|
DeleteLogsDialog(
|
||||||
|
onConfirm = {
|
||||||
|
showWipeConfirmDialog = false
|
||||||
|
model.deleteLogs()
|
||||||
|
},
|
||||||
|
onDismiss = {
|
||||||
|
showWipeConfirmDialog = false
|
||||||
|
},
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
LogsScreenContent(
|
LogsScreenContent(
|
||||||
logs = model.logEntries,
|
logs = model.logEntries,
|
||||||
onOpenLog = { navigator.push(LogScreen(installId = it)) },
|
onOpenLog = { navigator.push(LogScreen(installId = it)) },
|
||||||
onDeleteLogs = model::deleteLogs, // TODO: show warning dialog first
|
onDeleteLogs = { showWipeConfirmDialog = true },
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -47,24 +61,10 @@ fun LogsScreenContent(
|
||||||
onOpenLog: (id: String) -> Unit,
|
onOpenLog: (id: String) -> Unit,
|
||||||
onDeleteLogs: () -> Unit,
|
onDeleteLogs: () -> Unit,
|
||||||
) {
|
) {
|
||||||
var showWipeConfirmDialog by remember { mutableStateOf(false) }
|
|
||||||
|
|
||||||
if (showWipeConfirmDialog) {
|
|
||||||
DeleteLogsDialog(
|
|
||||||
onConfirm = {
|
|
||||||
showWipeConfirmDialog = false
|
|
||||||
onDeleteLogs()
|
|
||||||
},
|
|
||||||
onDismiss = {
|
|
||||||
showWipeConfirmDialog = false
|
|
||||||
},
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
Scaffold(
|
Scaffold(
|
||||||
topBar = {
|
topBar = {
|
||||||
LogsListAppBar(
|
LogsListAppBar(
|
||||||
onDeleteLogs = { showWipeConfirmDialog = true },
|
onDeleteLogs = onDeleteLogs,
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
) { paddingValues ->
|
) { paddingValues ->
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
android:height="24dp"
|
android:height="24dp"
|
||||||
android:viewportWidth="256"
|
android:viewportWidth="256"
|
||||||
android:viewportHeight="256">
|
android:viewportHeight="256">
|
||||||
<path
|
<path
|
||||||
android:fillColor="#FFFFFFFF"
|
android:fillColor="#FFFFFFFF"
|
||||||
android:pathData="M216.86,45.1C200.29,37.34 182.57,31.71 164.04,28.5C161.77,32.61 159.11,38.15 157.28,42.55C137.58,39.58 118.07,39.58 98.74,42.55C96.91,38.15 94.19,32.61 91.9,28.5C73.35,31.71 55.61,37.36 39.04,45.14C5.62,95.65 -3.44,144.9 1.09,193.46C23.26,210.01 44.74,220.07 65.86,226.65C71.08,219.47 75.73,211.84 79.74,203.8C72.1,200.9 64.79,197.32 57.89,193.17C59.72,191.81 61.51,190.39 63.24,188.93C105.37,208.63 151.13,208.63 192.75,188.93C194.51,190.39 196.3,191.81 198.11,193.17C191.18,197.34 183.85,200.92 176.22,203.82C180.23,211.84 184.86,219.49 190.1,226.67C211.24,220.09 232.74,210.03 254.91,193.46C260.23,137.17 245.83,88.37 216.86,45.1ZM85.47,163.59C72.83,163.59 62.46,151.79 62.46,137.41C62.46,123.04 72.61,111.21 85.47,111.21C98.34,111.21 108.71,123.02 108.49,137.41C108.51,151.79 98.34,163.59 85.47,163.59ZM170.53,163.59C157.88,163.59 147.51,151.79 147.51,137.41C147.51,123.04 157.66,111.21 170.53,111.21C183.39,111.21 193.76,123.02 193.54,137.41C193.54,151.79 183.39,163.59 170.53,163.59Z" />
|
android:pathData="M216.86,45.1C200.29,37.34 182.57,31.71 164.04,28.5C161.77,32.61 159.11,38.15 157.28,42.55C137.58,39.58 118.07,39.58 98.74,42.55C96.91,38.15 94.19,32.61 91.9,28.5C73.35,31.71 55.61,37.36 39.04,45.14C5.62,95.65 -3.44,144.9 1.09,193.46C23.26,210.01 44.74,220.07 65.86,226.65C71.08,219.47 75.73,211.84 79.74,203.8C72.1,200.9 64.79,197.32 57.89,193.17C59.72,191.81 61.51,190.39 63.24,188.93C105.37,208.63 151.13,208.63 192.75,188.93C194.51,190.39 196.3,191.81 198.11,193.17C191.18,197.34 183.85,200.92 176.22,203.82C180.23,211.84 184.86,219.49 190.1,226.67C211.24,220.09 232.74,210.03 254.91,193.46C260.23,137.17 245.83,88.37 216.86,45.1ZM85.47,163.59C72.83,163.59 62.46,151.79 62.46,137.41C62.46,123.04 72.61,111.21 85.47,111.21C98.34,111.21 108.71,123.02 108.49,137.41C108.51,151.79 98.34,163.59 85.47,163.59ZM170.53,163.59C157.88,163.59 147.51,151.79 147.51,137.41C147.51,123.04 157.66,111.21 170.53,111.21C183.39,111.21 193.76,123.02 193.54,137.41C193.54,151.79 183.39,163.59 170.53,163.59Z" />
|
||||||
</vector>
|
</vector>
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue