diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/reader/ReaderScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/reader/ReaderScreen.kt index 0f54a8af9..317335c8f 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/reader/ReaderScreen.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/reader/ReaderScreen.kt @@ -221,7 +221,7 @@ fun AnimatedVisibilityScope.ReaderScreen(pageLoader: PageLoader2, info: BaseGall onDismissRequest = { dispose() }, modifier = Modifier.windowInsetsPadding(WindowInsets.safeDrawing.only(WindowInsetsSides.Top)), sheetState = state, - contentWindowInsets = { WindowInsets(0) }, + contentWindowInsets = { EmptyWindowInsets }, ) { ReaderPageSheetMeta( retry = { pageLoader.retryPage(page.index) }, @@ -324,7 +324,7 @@ fun AnimatedVisibilityScope.ReaderScreen(pageLoader: PageLoader2, info: BaseGall // Yeah, I know color state should not be read here, but we have to do it... scrimColor = scrim, dragHandle = null, - contentWindowInsets = { WindowInsets(0) }, + contentWindowInsets = { EmptyWindowInsets }, ) { SettingsPager(modifier = Modifier.fillMaxSize()) { page -> isColorFilter = page == 2 diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/DownloadsScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/DownloadsScreen.kt index c07b91ae4..e3e429506 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/DownloadsScreen.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/DownloadsScreen.kt @@ -107,6 +107,7 @@ import com.hippo.ehviewer.ui.main.plus import com.hippo.ehviewer.ui.navToReader import com.hippo.ehviewer.ui.showMoveDownloadLabelList import com.hippo.ehviewer.ui.tools.Await +import com.hippo.ehviewer.ui.tools.EmptyWindowInsets import com.hippo.ehviewer.ui.tools.FastScrollLazyColumn import com.hippo.ehviewer.ui.tools.FastScrollLazyVerticalStaggeredGrid import com.hippo.ehviewer.ui.tools.HapticFeedbackType @@ -215,7 +216,7 @@ fun AnimatedVisibilityScope.DownloadsScreen(navigator: DestinationsNavigator) = fun closeSheet() = launch { drawerState.close() } TopAppBar( title = { Text(text = labelsStr) }, - windowInsets = WindowInsets(0, 0, 0, 0), + windowInsets = EmptyWindowInsets, actions = { if (DownloadsFilterMode.CUSTOM == filterMode) { IconButton( diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/FavoritesScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/FavoritesScreen.kt index 0f5fa3add..c688cfe42 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/FavoritesScreen.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/FavoritesScreen.kt @@ -74,6 +74,7 @@ import com.hippo.ehviewer.ui.main.GalleryInfoGridItem import com.hippo.ehviewer.ui.main.GalleryInfoListItem import com.hippo.ehviewer.ui.main.GalleryList import com.hippo.ehviewer.ui.startDownload +import com.hippo.ehviewer.ui.tools.EmptyWindowInsets import com.hippo.ehviewer.ui.tools.delegateSnapshotUpdate import com.hippo.ehviewer.ui.tools.foldToLoadResult import com.hippo.ehviewer.ui.tools.rememberInVM @@ -185,7 +186,7 @@ fun AnimatedVisibilityScope.FavouritesScreen(navigator: DestinationsNavigator) = val localFavCount by localFavCountFlow.collectAsState(0) TopAppBar( title = { Text(text = stringResource(id = R.string.collections)) }, - windowInsets = WindowInsets(0, 0, 0, 0), + windowInsets = EmptyWindowInsets, ) val scope = currentRecomposeScope LaunchedEffect(Unit) { diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryDetailScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryDetailScreen.kt index aa0e4a549..ea6121e61 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryDetailScreen.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryDetailScreen.kt @@ -20,7 +20,6 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.WindowInsets import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height @@ -133,6 +132,7 @@ import com.hippo.ehviewer.ui.navToReader import com.hippo.ehviewer.ui.openBrowser import com.hippo.ehviewer.ui.startDownload import com.hippo.ehviewer.ui.tools.CrystalCard +import com.hippo.ehviewer.ui.tools.EmptyWindowInsets import com.hippo.ehviewer.ui.tools.FilledTertiaryIconButton import com.hippo.ehviewer.ui.tools.FilledTertiaryIconToggleButton import com.hippo.ehviewer.ui.tools.GalleryDetailRating @@ -800,7 +800,7 @@ fun AnimatedVisibilityScope.GalleryDetailScreen(args: GalleryDetailScreenArgs, n if (showBottomSheet && galleryDetail != null) { ModalBottomSheet( onDismissRequest = { showBottomSheet = false }, - contentWindowInsets = { WindowInsets(0, 0, 0, 0) }, + contentWindowInsets = { EmptyWindowInsets }, ) { GalleryInfoBottomSheet(galleryDetail, navigator) } diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryListScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryListScreen.kt index 3fd0081c0..c47c12cf9 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryListScreen.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryListScreen.kt @@ -126,6 +126,7 @@ import com.hippo.ehviewer.ui.main.GalleryList import com.hippo.ehviewer.ui.main.ImageSearch import com.hippo.ehviewer.ui.main.SearchFilter import com.hippo.ehviewer.ui.tools.Await +import com.hippo.ehviewer.ui.tools.EmptyWindowInsets import com.hippo.ehviewer.ui.tools.HapticFeedbackType import com.hippo.ehviewer.ui.tools.animateFloatMergePredictiveBackAsState import com.hippo.ehviewer.ui.tools.delegateSnapshotUpdate @@ -283,7 +284,7 @@ fun AnimatedVisibilityScope.GalleryListScreen(lub: ListUrlBuilder, navigator: De ProvideSideSheetContent { sheetState -> TopAppBar( title = { Text(text = stringResource(id = R.string.toplist)) }, - windowInsets = WindowInsets(0), + windowInsets = EmptyWindowInsets, ) toplists.forEach { (name, keyword) -> ListItem( @@ -364,7 +365,7 @@ fun AnimatedVisibilityScope.GalleryListScreen(lub: ListUrlBuilder, navigator: De ) } }, - windowInsets = WindowInsets(0), + windowInsets = EmptyWindowInsets, ) Box(modifier = Modifier.fillMaxSize()) { val quickSearchListState = rememberLazyListState()