From 07c9af49012f13bf9a5790a130c4fbf501666b83 Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Sat, 23 Jul 2022 11:25:45 -0400
Subject: [PATCH] Fix padding in history screen

---
 .../eu/kanade/presentation/history/HistoryScreen.kt  | 12 ++++++------
 app/src/main/res/drawable/ic_delete_sweep_24dp.xml   |  9 ---------
 2 files changed, 6 insertions(+), 15 deletions(-)
 delete mode 100644 app/src/main/res/drawable/ic_delete_sweep_24dp.xml

diff --git a/app/src/main/java/eu/kanade/presentation/history/HistoryScreen.kt b/app/src/main/java/eu/kanade/presentation/history/HistoryScreen.kt
index 56664ba041..aeeaba192b 100644
--- a/app/src/main/java/eu/kanade/presentation/history/HistoryScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/history/HistoryScreen.kt
@@ -1,6 +1,6 @@
 package eu.kanade.presentation.history
 
-import androidx.compose.foundation.layout.safeContentPadding
+import androidx.compose.foundation.layout.safeDrawingPadding
 import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -30,18 +30,18 @@ fun HistoryScreen(
 ) {
     val context = LocalContext.current
     Scaffold(
-        modifier = Modifier.safeContentPadding(),
+        modifier = Modifier.safeDrawingPadding(),
         topBar = {
             HistoryToolbar(state = presenter)
         },
-    ) {
+    ) { contentPadding ->
         val items = presenter.getLazyHistory()
         when {
             items.loadState.refresh is LoadState.Loading && items.itemCount < 1 -> LoadingScreen()
             items.loadState.refresh is LoadState.NotLoading && items.itemCount < 1 -> EmptyScreen(textResource = R.string.information_no_recent_manga)
             else -> HistoryContent(
                 history = items,
-                contentPadding = it,
+                contentPadding = contentPadding,
                 onClickCover = onClickCover,
                 onClickResume = onClickResume,
                 onClickDelete = { presenter.dialog = Dialog.Delete(it) },
@@ -62,7 +62,7 @@ fun HistoryScreen(
                 },
             )
         }
-        Dialog.DeleteAll -> {
+        is Dialog.DeleteAll -> {
             HistoryDeleteAllDialog(
                 onDismissRequest = onDismissRequest,
                 onDelete = {
@@ -70,7 +70,7 @@ fun HistoryScreen(
                 },
             )
         }
-        else -> {}
+        null -> {}
     }
     LaunchedEffect(Unit) {
         presenter.events.collectLatest { event ->
diff --git a/app/src/main/res/drawable/ic_delete_sweep_24dp.xml b/app/src/main/res/drawable/ic_delete_sweep_24dp.xml
deleted file mode 100644
index c618bc1348..0000000000
--- a/app/src/main/res/drawable/ic_delete_sweep_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="@android:color/black"
-      android:pathData="M15,16h4v2h-4zM15,8h7v2h-7zM15,12h6v2h-6zM3,18c0,1.1 0.9,2 2,2h6c1.1,0 2,-0.9 2,-2L13,8L3,8v10zM5,10h6v8L5,18v-8zM10,4L6,4L5,5L2,5v2h12L14,5h-3z" />
-</vector>