From ef2dff9f7ab74608c978d96cdaf6bffe54ebcd78 Mon Sep 17 00:00:00 2001 From: grakovne Date: Mon, 2 Mar 2026 13:59:32 +0300 Subject: [PATCH] Revert "feat(ui): implement proper edge-to-edge support (Android 15 / targetSdk 35) (#357)" This reverts commit d1cec349 --- .../lissen/ui/screens/library/LibraryScreen.kt | 17 ++++++----------- .../library/composables/MiniPlayerComposable.kt | 3 --- .../lissen/ui/screens/login/LoginScreen.kt | 2 ++ .../lissen/ui/screens/player/PlayerScreen.kt | 2 ++ .../composable/NavigationBarComposable.kt | 2 +- .../NavigationBarPlaceholderComposable.kt | 2 +- .../ui/screens/settings/SettingsScreen.kt | 2 ++ .../advanced/AdvancedSettingsComposable.kt | 2 ++ .../advanced/CustomHeadersSettingsScreen.kt | 2 ++ .../settings/advanced/LocalUrlSettingsScreen.kt | 2 ++ .../settings/advanced/SeekSettingsScreen.kt | 2 ++ .../advanced/cache/CacheSettingsScreen.kt | 2 ++ .../org/grakovne/lissen/ui/theme/Theme.kt | 4 +--- 13 files changed, 25 insertions(+), 19 deletions(-) diff --git a/app/src/main/kotlin/org/grakovne/lissen/ui/screens/library/LibraryScreen.kt b/app/src/main/kotlin/org/grakovne/lissen/ui/screens/library/LibraryScreen.kt index a2aa79f6..aac39f2a 100644 --- a/app/src/main/kotlin/org/grakovne/lissen/ui/screens/library/LibraryScreen.kt +++ b/app/src/main/kotlin/org/grakovne/lissen/ui/screens/library/LibraryScreen.kt @@ -21,6 +21,7 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.imePadding import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.systemBarsPadding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.material.ExperimentalMaterialApi @@ -331,6 +332,7 @@ fun LibraryScreen( } } }, + modifier = Modifier.systemBarsPadding(), ) }, bottomBar = { @@ -347,11 +349,13 @@ fun LibraryScreen( }, modifier = Modifier + .systemBarsPadding() .fillMaxSize(), content = { innerPadding -> Box( modifier = Modifier + .padding(innerPadding) .pullRefresh(pullRefreshState) .fillMaxSize(), ) { @@ -367,13 +371,7 @@ fun LibraryScreen( totalItems = libraryCount, ignoreItems = listOf("recent_books", "library_title"), ), - contentPadding = - PaddingValues( - start = 16.dp, - end = 16.dp, - top = innerPadding.calculateTopPadding(), - bottom = innerPadding.calculateBottomPadding(), - ), + contentPadding = PaddingValues(horizontal = 16.dp), ) { item(key = "recent_books") { val showRecent = isRecentVisible() @@ -490,10 +488,7 @@ fun LibraryScreen( state = pullRefreshState, contentColor = colorScheme.primary, backgroundColor = colorScheme.surfaceContainer, - modifier = - Modifier - .align(Alignment.TopCenter) - .padding(top = innerPadding.calculateTopPadding()), + modifier = Modifier.align(Alignment.TopCenter), ) } } diff --git a/app/src/main/kotlin/org/grakovne/lissen/ui/screens/library/composables/MiniPlayerComposable.kt b/app/src/main/kotlin/org/grakovne/lissen/ui/screens/library/composables/MiniPlayerComposable.kt index a3f377b2..5a9d3512 100644 --- a/app/src/main/kotlin/org/grakovne/lissen/ui/screens/library/composables/MiniPlayerComposable.kt +++ b/app/src/main/kotlin/org/grakovne/lissen/ui/screens/library/composables/MiniPlayerComposable.kt @@ -14,7 +14,6 @@ import androidx.compose.foundation.layout.aspectRatio import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width @@ -101,7 +100,6 @@ fun MiniPlayerComposable( modifier = Modifier .fillMaxSize() - .navigationBarsPadding() .padding(horizontal = 12.dp), horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically, @@ -132,7 +130,6 @@ fun MiniPlayerComposable( .fillMaxWidth() .background(colorScheme.background) .clickable { navController.showPlayer(book.id, book.title, book.subtitle) } - .navigationBarsPadding() .padding(horizontal = 20.dp, vertical = 8.dp), verticalAlignment = Alignment.CenterVertically, ) { diff --git a/app/src/main/kotlin/org/grakovne/lissen/ui/screens/login/LoginScreen.kt b/app/src/main/kotlin/org/grakovne/lissen/ui/screens/login/LoginScreen.kt index a7eecf28..5b0f8274 100644 --- a/app/src/main/kotlin/org/grakovne/lissen/ui/screens/login/LoginScreen.kt +++ b/app/src/main/kotlin/org/grakovne/lissen/ui/screens/login/LoginScreen.kt @@ -12,6 +12,7 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.imePadding import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.systemBarsPadding import androidx.compose.foundation.layout.width import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.text.KeyboardOptions @@ -118,6 +119,7 @@ fun LoginScreen( Scaffold( modifier = Modifier + .systemBarsPadding() .fillMaxSize(), content = { innerPadding -> Box( diff --git a/app/src/main/kotlin/org/grakovne/lissen/ui/screens/player/PlayerScreen.kt b/app/src/main/kotlin/org/grakovne/lissen/ui/screens/player/PlayerScreen.kt index 533d33c5..76292f87 100644 --- a/app/src/main/kotlin/org/grakovne/lissen/ui/screens/player/PlayerScreen.kt +++ b/app/src/main/kotlin/org/grakovne/lissen/ui/screens/player/PlayerScreen.kt @@ -17,6 +17,7 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.systemBarsPadding import androidx.compose.foundation.layout.width import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.outlined.ArrowBack @@ -241,6 +242,7 @@ fun PlayerScreen( } } }, + modifier = Modifier.systemBarsPadding(), content = { innerPadding -> Column( modifier = diff --git a/app/src/main/kotlin/org/grakovne/lissen/ui/screens/player/composable/NavigationBarComposable.kt b/app/src/main/kotlin/org/grakovne/lissen/ui/screens/player/composable/NavigationBarComposable.kt index 2ff0710c..c5e4d637 100644 --- a/app/src/main/kotlin/org/grakovne/lissen/ui/screens/player/composable/NavigationBarComposable.kt +++ b/app/src/main/kotlin/org/grakovne/lissen/ui/screens/player/composable/NavigationBarComposable.kt @@ -75,7 +75,7 @@ fun NavigationBarComposable( Surface( shadowElevation = 4.dp, - modifier = modifier, + modifier = modifier.height(64.dp), ) { NavigationBar( containerColor = Color.Transparent, diff --git a/app/src/main/kotlin/org/grakovne/lissen/ui/screens/player/composable/placeholder/NavigationBarPlaceholderComposable.kt b/app/src/main/kotlin/org/grakovne/lissen/ui/screens/player/composable/placeholder/NavigationBarPlaceholderComposable.kt index 93f75645..f03e9484 100644 --- a/app/src/main/kotlin/org/grakovne/lissen/ui/screens/player/composable/placeholder/NavigationBarPlaceholderComposable.kt +++ b/app/src/main/kotlin/org/grakovne/lissen/ui/screens/player/composable/placeholder/NavigationBarPlaceholderComposable.kt @@ -33,7 +33,7 @@ fun NavigationBarPlaceholderComposable( ) { Surface( shadowElevation = 4.dp, - modifier = modifier, + modifier = modifier.height(64.dp), ) { NavigationBar( containerColor = Color.Transparent, diff --git a/app/src/main/kotlin/org/grakovne/lissen/ui/screens/settings/SettingsScreen.kt b/app/src/main/kotlin/org/grakovne/lissen/ui/screens/settings/SettingsScreen.kt index 7a295d29..3bc9e670 100644 --- a/app/src/main/kotlin/org/grakovne/lissen/ui/screens/settings/SettingsScreen.kt +++ b/app/src/main/kotlin/org/grakovne/lissen/ui/screens/settings/SettingsScreen.kt @@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.systemBarsPadding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons @@ -77,6 +78,7 @@ fun SettingsScreen( }, modifier = Modifier + .systemBarsPadding() .fillMaxHeight(), content = { innerPadding -> Column( diff --git a/app/src/main/kotlin/org/grakovne/lissen/ui/screens/settings/advanced/AdvancedSettingsComposable.kt b/app/src/main/kotlin/org/grakovne/lissen/ui/screens/settings/advanced/AdvancedSettingsComposable.kt index 5b9cc3fd..fa0f9f2a 100644 --- a/app/src/main/kotlin/org/grakovne/lissen/ui/screens/settings/advanced/AdvancedSettingsComposable.kt +++ b/app/src/main/kotlin/org/grakovne/lissen/ui/screens/settings/advanced/AdvancedSettingsComposable.kt @@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.systemBarsPadding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons @@ -83,6 +84,7 @@ fun AdvancedSettingsComposable( }, modifier = Modifier + .systemBarsPadding() .fillMaxHeight(), content = { innerPadding -> Column( diff --git a/app/src/main/kotlin/org/grakovne/lissen/ui/screens/settings/advanced/CustomHeadersSettingsScreen.kt b/app/src/main/kotlin/org/grakovne/lissen/ui/screens/settings/advanced/CustomHeadersSettingsScreen.kt index b203bfa4..bf976fce 100644 --- a/app/src/main/kotlin/org/grakovne/lissen/ui/screens/settings/advanced/CustomHeadersSettingsScreen.kt +++ b/app/src/main/kotlin/org/grakovne/lissen/ui/screens/settings/advanced/CustomHeadersSettingsScreen.kt @@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.systemBarsPadding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.itemsIndexed import androidx.compose.foundation.lazy.rememberLazyListState @@ -75,6 +76,7 @@ fun CustomHeadersSettingsScreen(onBack: () -> Unit) { }, modifier = Modifier + .systemBarsPadding() .fillMaxHeight(), content = { innerPadding -> LazyColumn( diff --git a/app/src/main/kotlin/org/grakovne/lissen/ui/screens/settings/advanced/LocalUrlSettingsScreen.kt b/app/src/main/kotlin/org/grakovne/lissen/ui/screens/settings/advanced/LocalUrlSettingsScreen.kt index a8336b28..5589793b 100644 --- a/app/src/main/kotlin/org/grakovne/lissen/ui/screens/settings/advanced/LocalUrlSettingsScreen.kt +++ b/app/src/main/kotlin/org/grakovne/lissen/ui/screens/settings/advanced/LocalUrlSettingsScreen.kt @@ -10,6 +10,7 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.systemBarsPadding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.itemsIndexed import androidx.compose.foundation.lazy.rememberLazyListState @@ -92,6 +93,7 @@ fun LocalUrlSettingsScreen(onBack: () -> Unit) { }, modifier = Modifier + .systemBarsPadding() .fillMaxHeight(), content = { innerPadding -> LazyColumn( diff --git a/app/src/main/kotlin/org/grakovne/lissen/ui/screens/settings/advanced/SeekSettingsScreen.kt b/app/src/main/kotlin/org/grakovne/lissen/ui/screens/settings/advanced/SeekSettingsScreen.kt index 505aa5de..b208529d 100644 --- a/app/src/main/kotlin/org/grakovne/lissen/ui/screens/settings/advanced/SeekSettingsScreen.kt +++ b/app/src/main/kotlin/org/grakovne/lissen/ui/screens/settings/advanced/SeekSettingsScreen.kt @@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.systemBarsPadding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons @@ -72,6 +73,7 @@ fun SeekSettingsScreen(onBack: () -> Unit) { }, modifier = Modifier + .systemBarsPadding() .fillMaxHeight(), content = { innerPadding -> Column( diff --git a/app/src/main/kotlin/org/grakovne/lissen/ui/screens/settings/advanced/cache/CacheSettingsScreen.kt b/app/src/main/kotlin/org/grakovne/lissen/ui/screens/settings/advanced/cache/CacheSettingsScreen.kt index 0ade7434..cc24a0f4 100644 --- a/app/src/main/kotlin/org/grakovne/lissen/ui/screens/settings/advanced/cache/CacheSettingsScreen.kt +++ b/app/src/main/kotlin/org/grakovne/lissen/ui/screens/settings/advanced/cache/CacheSettingsScreen.kt @@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.systemBarsPadding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons @@ -65,6 +66,7 @@ fun CacheSettingsScreen( }, modifier = Modifier + .systemBarsPadding() .fillMaxHeight(), content = { innerPadding -> Column( diff --git a/app/src/main/kotlin/org/grakovne/lissen/ui/theme/Theme.kt b/app/src/main/kotlin/org/grakovne/lissen/ui/theme/Theme.kt index fe13277a..3779b9ea 100644 --- a/app/src/main/kotlin/org/grakovne/lissen/ui/theme/Theme.kt +++ b/app/src/main/kotlin/org/grakovne/lissen/ui/theme/Theme.kt @@ -60,9 +60,7 @@ fun LissenTheme( SideEffect { window?.let { - val insetsController = WindowCompat.getInsetsController(it, view) - insetsController.isAppearanceLightStatusBars = !isDarkTheme - insetsController.isAppearanceLightNavigationBars = !isDarkTheme + WindowCompat.getInsetsController(it, view).isAppearanceLightStatusBars = !isDarkTheme } }