From 03b03ba3424d6683d0025e1a74d238e68e56ffd4 Mon Sep 17 00:00:00 2001 From: arkon Date: Sat, 30 Apr 2022 11:59:39 -0400 Subject: [PATCH] Update navigation bar padding in Compose screens (cherry picked from commit dee783079363acef241e574bc9c5600bc8f27bf3) # Conflicts: # app/src/main/java/eu/kanade/domain/source/interactor/GetSourcesWithFavoriteCount.kt # app/src/main/java/eu/kanade/presentation/history/HistoryScreen.kt --- .../source/interactor/GetSourcesWithFavoriteCount.kt | 1 - .../java/eu/kanade/presentation/history/HistoryScreen.kt | 9 ++++----- .../main/java/eu/kanade/presentation/more/MoreScreen.kt | 4 ++++ .../eu/kanade/presentation/more/about/AboutScreen.kt | 4 ++++ .../eu/kanade/presentation/more/about/LicensesScreen.kt | 4 ++++ .../presentation/more/settings/SettingsMainScreen.kt | 4 ++++ .../eu/kanade/presentation/source/SourceFilterScreen.kt | 6 +++++- .../tachiyomi/data/backup/legacy/LegacyBackupRestore.kt | 1 - .../eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt | 1 - .../eu/kanade/tachiyomi/widget/ActionModeWithToolbar.kt | 1 + 10 files changed, 26 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/eu/kanade/domain/source/interactor/GetSourcesWithFavoriteCount.kt b/app/src/main/java/eu/kanade/domain/source/interactor/GetSourcesWithFavoriteCount.kt index aaa342665..a290091f6 100644 --- a/app/src/main/java/eu/kanade/domain/source/interactor/GetSourcesWithFavoriteCount.kt +++ b/app/src/main/java/eu/kanade/domain/source/interactor/GetSourcesWithFavoriteCount.kt @@ -8,7 +8,6 @@ import kotlinx.coroutines.flow.combine import java.text.Collator import java.util.Collections import java.util.Locale -import kotlin.Comparator class GetSourcesWithFavoriteCount( private val repository: SourceRepository, 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 c55bf4fd6..a9ebb4cd2 100644 --- a/app/src/main/java/eu/kanade/presentation/history/HistoryScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/history/HistoryScreen.kt @@ -4,10 +4,11 @@ import androidx.compose.foundation.clickable import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.Column 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.fillMaxHeight import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.navigationBarsPadding +import androidx.compose.foundation.layout.navigationBars import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.rememberLazyListState @@ -105,6 +106,7 @@ fun HistoryContent( LazyColumn( modifier = Modifier .nestedScroll(nestedScroll), + contentPadding = WindowInsets.navigationBars.asPaddingValues(), state = scrollState, ) { items(history) { item -> @@ -131,9 +133,6 @@ fun HistoryContent( null -> {} } } - item { - Spacer(Modifier.navigationBarsPadding()) - } } if (removeState != null) { diff --git a/app/src/main/java/eu/kanade/presentation/more/MoreScreen.kt b/app/src/main/java/eu/kanade/presentation/more/MoreScreen.kt index 4c9e86856..4fe412630 100644 --- a/app/src/main/java/eu/kanade/presentation/more/MoreScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/MoreScreen.kt @@ -1,5 +1,8 @@ package eu.kanade.presentation.more +import androidx.compose.foundation.layout.WindowInsets +import androidx.compose.foundation.layout.asPaddingValues +import androidx.compose.foundation.layout.navigationBars import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.CloudOff @@ -47,6 +50,7 @@ fun MoreScreen( LazyColumn( modifier = Modifier.nestedScroll(nestedScrollInterop), + contentPadding = WindowInsets.navigationBars.asPaddingValues(), ) { item { LogoHeader() diff --git a/app/src/main/java/eu/kanade/presentation/more/about/AboutScreen.kt b/app/src/main/java/eu/kanade/presentation/more/about/AboutScreen.kt index 181cd2edb..2ef22b221 100644 --- a/app/src/main/java/eu/kanade/presentation/more/about/AboutScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/about/AboutScreen.kt @@ -2,7 +2,10 @@ package eu.kanade.presentation.more.about import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.WindowInsets +import androidx.compose.foundation.layout.asPaddingValues import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.navigationBars import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.Public @@ -37,6 +40,7 @@ fun AboutScreen( LazyColumn( modifier = Modifier.nestedScroll(nestedScrollInterop), + contentPadding = WindowInsets.navigationBars.asPaddingValues(), ) { item { LogoHeader() diff --git a/app/src/main/java/eu/kanade/presentation/more/about/LicensesScreen.kt b/app/src/main/java/eu/kanade/presentation/more/about/LicensesScreen.kt index 374c22e03..3645daea5 100644 --- a/app/src/main/java/eu/kanade/presentation/more/about/LicensesScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/about/LicensesScreen.kt @@ -1,6 +1,9 @@ package eu.kanade.presentation.more.about +import androidx.compose.foundation.layout.WindowInsets +import androidx.compose.foundation.layout.asPaddingValues import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.navigationBars import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier @@ -17,6 +20,7 @@ fun LicensesScreen( modifier = Modifier .fillMaxSize() .nestedScroll(nestedScrollInterop), + contentPadding = WindowInsets.navigationBars.asPaddingValues(), colors = LibraryDefaults.libraryColors( backgroundColor = MaterialTheme.colorScheme.background, contentColor = MaterialTheme.colorScheme.onBackground, diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/SettingsMainScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/SettingsMainScreen.kt index 111561537..c33070b3d 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/SettingsMainScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/SettingsMainScreen.kt @@ -1,6 +1,9 @@ package eu.kanade.presentation.more.settings import androidx.annotation.StringRes +import androidx.compose.foundation.layout.WindowInsets +import androidx.compose.foundation.layout.asPaddingValues +import androidx.compose.foundation.layout.navigationBars import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier @@ -17,6 +20,7 @@ fun SettingsMainScreen( ) { LazyColumn( modifier = Modifier.nestedScroll(nestedScrollInterop), + contentPadding = WindowInsets.navigationBars.asPaddingValues(), ) { sections.map { item { diff --git a/app/src/main/java/eu/kanade/presentation/source/SourceFilterScreen.kt b/app/src/main/java/eu/kanade/presentation/source/SourceFilterScreen.kt index f87946ff1..10d5fcfe0 100644 --- a/app/src/main/java/eu/kanade/presentation/source/SourceFilterScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/source/SourceFilterScreen.kt @@ -1,5 +1,8 @@ package eu.kanade.presentation.source +import androidx.compose.foundation.layout.WindowInsets +import androidx.compose.foundation.layout.asPaddingValues +import androidx.compose.foundation.layout.navigationBars import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.material3.Checkbox @@ -70,7 +73,8 @@ fun SourceFilterContent( return } LazyColumn( - modifier = Modifier.nestedScroll(nestedScrollInterop) + modifier = Modifier.nestedScroll(nestedScrollInterop), + contentPadding = WindowInsets.navigationBars.asPaddingValues(), ) { items( items = items, diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupRestore.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupRestore.kt index 9e39605df..35bb6b1fe 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupRestore.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupRestore.kt @@ -21,7 +21,6 @@ import kotlinx.serialization.json.decodeFromJsonElement import kotlinx.serialization.json.decodeFromStream import kotlinx.serialization.json.intOrNull import kotlinx.serialization.json.jsonPrimitive -import okio.source import java.util.Date class LegacyBackupRestore(context: Context, notifier: BackupNotifier) : AbstractBackupRestore(context, notifier) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt index 3b1f7ce2d..0f22b703d 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt @@ -42,7 +42,6 @@ import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import java.text.Collator import java.util.Collections -import java.util.Comparator import java.util.Locale /** diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/ActionModeWithToolbar.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/ActionModeWithToolbar.kt index 9ab0bc115..0cd50e5b7 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/ActionModeWithToolbar.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/ActionModeWithToolbar.kt @@ -17,6 +17,7 @@ import dev.chrisbanes.insetter.applyInsetter import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.databinding.ActionToolbarBinding import eu.kanade.tachiyomi.util.system.applySystemAnimatorScale +import eu.kanade.tachiyomi.widget.ActionModeWithToolbar.Callback import eu.kanade.tachiyomi.widget.listener.SimpleAnimationListener /**