From 33ef1e7b01a9d666670b11adc4209371e585d37b Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Sun, 11 Sep 2022 21:12:54 -0400 Subject: [PATCH] Remove extra padding --- .../java/eu/kanade/presentation/browse/FeedScreen.kt | 5 +---- .../eu/kanade/presentation/browse/SourceFeedScreen.kt | 11 +---------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/eu/kanade/presentation/browse/FeedScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/FeedScreen.kt index b5dc55ae7..b463f2026 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/FeedScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/FeedScreen.kt @@ -8,12 +8,9 @@ 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.asPaddingValues import androidx.compose.foundation.layout.aspectRatio import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.navigationBars import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.width import androidx.compose.foundation.lazy.LazyRow @@ -111,7 +108,7 @@ fun FeedList( onClickManga: (Manga) -> Unit, ) { ScrollbarLazyColumn( - contentPadding = bottomNavPaddingValues + WindowInsets.navigationBars.asPaddingValues() + topPaddingValues, + contentPadding = bottomNavPaddingValues + topPaddingValues, ) { items( state.items.orEmpty(), diff --git a/app/src/main/java/eu/kanade/presentation/browse/SourceFeedScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/SourceFeedScreen.kt index fb9dca5f8..2427c1d46 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/SourceFeedScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/SourceFeedScreen.kt @@ -7,12 +7,7 @@ import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.WindowInsets -import androidx.compose.foundation.layout.WindowInsetsSides -import androidx.compose.foundation.layout.asPaddingValues import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.navigationBars -import androidx.compose.foundation.layout.only import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyRow import androidx.compose.foundation.lazy.items @@ -37,7 +32,6 @@ import eu.kanade.presentation.components.LoadingScreen import eu.kanade.presentation.components.Scaffold import eu.kanade.presentation.components.ScrollbarLazyColumn import eu.kanade.presentation.components.SearchToolbar -import eu.kanade.presentation.util.bottomNavPaddingValues import eu.kanade.presentation.util.plus import eu.kanade.presentation.util.topPaddingValues import eu.kanade.tachiyomi.R @@ -155,10 +149,7 @@ fun SourceFeedList( onClickManga: (Manga) -> Unit, ) { ScrollbarLazyColumn( - contentPadding = paddingValues + - bottomNavPaddingValues + - WindowInsets.navigationBars.only(WindowInsetsSides.Vertical).asPaddingValues() + - topPaddingValues, + contentPadding = paddingValues + topPaddingValues, ) { items( state.items.orEmpty(),