diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/home/HomeScreen.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/home/HomeScreen.kt index f08cf61..db57eaf 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/home/HomeScreen.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/home/HomeScreen.kt @@ -125,7 +125,7 @@ fun HomeScreenLoadedContent( onOpenPlugins: (packageName: String) -> Unit, ) { LazyColumn( - verticalArrangement = Arrangement.spacedBy(6.dp), + verticalArrangement = Arrangement.spacedBy(10.dp), horizontalAlignment = Alignment.CenterHorizontally, contentPadding = padding .exclude(PaddingValuesSides.Horizontal + PaddingValuesSides.Top), @@ -143,7 +143,7 @@ fun HomeScreenLoadedContent( secondaryInstall = true, onClick = onClickInstall, modifier = Modifier - .padding(vertical = 10.dp) + .padding(vertical = 4.dp) .height(50.dp) .fillMaxWidth() ) diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/logs/LogsListScreen.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/logs/LogsListScreen.kt index c38283e..c80ecbb 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/logs/LogsListScreen.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/logs/LogsListScreen.kt @@ -33,10 +33,24 @@ class LogsListScreen : Screen, Parcelable { val navigator = LocalNavigator.currentOrThrow val model = koinScreenModel() + var showWipeConfirmDialog by remember { mutableStateOf(false) } + + if (showWipeConfirmDialog) { + DeleteLogsDialog( + onConfirm = { + showWipeConfirmDialog = false + model.deleteLogs() + }, + onDismiss = { + showWipeConfirmDialog = false + }, + ) + } + LogsScreenContent( logs = model.logEntries, 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, onDeleteLogs: () -> Unit, ) { - var showWipeConfirmDialog by remember { mutableStateOf(false) } - - if (showWipeConfirmDialog) { - DeleteLogsDialog( - onConfirm = { - showWipeConfirmDialog = false - onDeleteLogs() - }, - onDismiss = { - showWipeConfirmDialog = false - }, - ) - } - Scaffold( topBar = { LogsListAppBar( - onDeleteLogs = { showWipeConfirmDialog = true }, + onDeleteLogs = onDeleteLogs, ) }, ) { paddingValues -> diff --git a/app/src/main/res/drawable/ic_discord.xml b/app/src/main/res/drawable/ic_discord.xml index a753f01..a8b2b45 100644 --- a/app/src/main/res/drawable/ic_discord.xml +++ b/app/src/main/res/drawable/ic_discord.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="256" android:viewportHeight="256"> - +