Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-12-22 15:41:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix padding in history screen

Browse Source
This commit is contained in:
arkon 2022-07-23 11:25:45 -04:00
parent d6977e5676
commit 07c9af4901
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/eu/kanade/presentation/history/HistoryScreen.kt
View File

@ -1,6 +1,6 @@
package eu.kanade.presentation.history 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.material3.Scaffold
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.LaunchedEffect
@ -30,18 +30,18 @@ fun HistoryScreen(
) { ) {
val context = LocalContext.current val context = LocalContext.current
Scaffold( Scaffold(
modifier = Modifier.safeContentPadding(), modifier = Modifier.safeDrawingPadding(),
topBar = { topBar = {
HistoryToolbar(state = presenter) HistoryToolbar(state = presenter)
}, },
) { ) { contentPadding ->
val items = presenter.getLazyHistory() val items = presenter.getLazyHistory()
when { when {
items.loadState.refresh is LoadState.Loading && items.itemCount < 1 -> LoadingScreen() 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) items.loadState.refresh is LoadState.NotLoading && items.itemCount < 1 -> EmptyScreen(textResource = R.string.information_no_recent_manga)
else -> HistoryContent( else -> HistoryContent(
history = items, history = items,
contentPadding = it, contentPadding = contentPadding,
onClickCover = onClickCover, onClickCover = onClickCover,
onClickResume = onClickResume, onClickResume = onClickResume,
onClickDelete = { presenter.dialog = Dialog.Delete(it) }, onClickDelete = { presenter.dialog = Dialog.Delete(it) },
@ -62,7 +62,7 @@ fun HistoryScreen(
}, },
) )
} }
Dialog.DeleteAll -> { is Dialog.DeleteAll -> {
HistoryDeleteAllDialog( HistoryDeleteAllDialog(
onDismissRequest = onDismissRequest, onDismissRequest = onDismissRequest,
onDelete = { onDelete = {
@ -70,7 +70,7 @@ fun HistoryScreen(
}, },
) )
} }
else -> {} null -> {}
} }
LaunchedEffect(Unit) { LaunchedEffect(Unit) {
presenter.events.collectLatest { event -> presenter.events.collectLatest { event ->

9
app/src/main/res/drawable/ic_delete_sweep_24dp.xml
View File

@ -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>