From 3060133485d329de1101bd170f852ffca21f7963 Mon Sep 17 00:00:00 2001 From: Rahul Patel Date: Thu, 7 May 2026 16:52:02 +0530 Subject: [PATCH] fix: padding issues I introduced --- .../store/compose/ui/blacklist/BlacklistScreen.kt | 12 ++++++------ .../store/compose/ui/details/AppDetailsScreen.kt | 11 ++++++----- .../aurora/store/compose/ui/details/ExodusScreen.kt | 9 +++++---- .../aurora/store/compose/ui/details/MicroGScreen.kt | 7 +++++-- .../aurora/store/compose/ui/details/MoreScreen.kt | 12 ++++++------ .../store/compose/ui/details/PermissionScreen.kt | 9 +++++---- .../aurora/store/compose/ui/details/ReviewScreen.kt | 2 -- .../store/compose/ui/downloads/DownloadsScreen.kt | 2 -- .../store/compose/ui/favourite/FavouriteScreen.kt | 2 -- .../store/compose/ui/installed/InstalledScreen.kt | 2 -- .../aurora/store/compose/ui/search/SearchScreen.kt | 4 +--- 11 files changed, 34 insertions(+), 38 deletions(-) diff --git a/app/src/main/java/com/aurora/store/compose/ui/blacklist/BlacklistScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/blacklist/BlacklistScreen.kt index c55489080..df6928908 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/blacklist/BlacklistScreen.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/blacklist/BlacklistScreen.kt @@ -13,7 +13,6 @@ import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items @@ -221,15 +220,16 @@ private fun ScreenContent( } Scaffold( - modifier = Modifier.navigationBarsPadding(), topBar = { SearchBar() } ) { paddingValues -> val listState = rememberLazyListState() - Box(modifier = Modifier.fillMaxSize()) { + Box( + modifier = Modifier + .fillMaxSize() + .padding(paddingValues) + ) { LazyColumn( - modifier = Modifier - .fillMaxWidth() - .padding(paddingValues), + modifier = Modifier.fillMaxWidth(), state = listState, verticalArrangement = Arrangement.spacedBy( dimensionResource(R.dimen.margin_xxsmall) diff --git a/app/src/main/java/com/aurora/store/compose/ui/details/AppDetailsScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/details/AppDetailsScreen.kt index 6773c6a42..eded62a93 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/details/AppDetailsScreen.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/details/AppDetailsScreen.kt @@ -16,7 +16,6 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items @@ -410,7 +409,6 @@ private fun ScreenContentApp( @Composable fun MainPane() { Scaffold( - modifier = Modifier.navigationBarsPadding(), topBar = { TopAppBar( onNavigateUp = onNavigateUp, @@ -419,10 +417,13 @@ private fun ScreenContentApp( } ) { paddingValues -> val listState = rememberLazyListState() - Box(modifier = Modifier.fillMaxSize()) { + Box( + modifier = Modifier + .fillMaxSize() + .padding(paddingValues) + ) { LazyColumn( modifier = Modifier - .padding(paddingValues) .fillMaxSize(), verticalArrangement = Arrangement.spacedBy( dimensionResource(R.dimen.margin_medium) @@ -533,7 +534,7 @@ private fun ScreenContentApp( } ScrollHint( listState = listState, - bottomPadding = 72.dp, + bottomPadding = 5.dp, modifier = Modifier.align(Alignment.BottomCenter) ) } diff --git a/app/src/main/java/com/aurora/store/compose/ui/details/ExodusScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/details/ExodusScreen.kt index 81eef1603..0ed8a1093 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/details/ExodusScreen.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/details/ExodusScreen.kt @@ -8,7 +8,6 @@ package com.aurora.store.compose.ui.details import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items @@ -109,7 +108,6 @@ private fun ScreenContentReport( val context = LocalContext.current Scaffold( - modifier = Modifier.navigationBarsPadding(), topBar = { TopAppBar( title = topAppBarTitle, @@ -127,10 +125,13 @@ private fun ScreenContentReport( } ) { paddingValues -> val listState = rememberLazyListState() - Box(modifier = Modifier.fillMaxSize()) { + Box( + modifier = Modifier + .fillMaxSize() + .padding(paddingValues) + ) { LazyColumn( modifier = Modifier - .padding(paddingValues) .fillMaxSize() .padding(horizontal = dimensionResource(R.dimen.padding_medium)), state = listState diff --git a/app/src/main/java/com/aurora/store/compose/ui/details/MicroGScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/details/MicroGScreen.kt index a15abfdd9..e043478cd 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/details/MicroGScreen.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/details/MicroGScreen.kt @@ -139,10 +139,13 @@ private fun ScreenContent( } } ) { paddingValues -> - Box(modifier = Modifier.fillMaxSize()) { + Box( + modifier = Modifier + .fillMaxSize() + .padding(paddingValues) + ) { LazyColumn( modifier = Modifier - .padding(paddingValues) .fillMaxSize() .padding(horizontal = dimensionResource(R.dimen.padding_medium)), state = listState diff --git a/app/src/main/java/com/aurora/store/compose/ui/details/MoreScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/details/MoreScreen.kt index c63f14b70..93202195c 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/details/MoreScreen.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/details/MoreScreen.kt @@ -9,7 +9,6 @@ import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyRow @@ -87,7 +86,6 @@ private fun ScreenContent( } Scaffold( - modifier = Modifier.navigationBarsPadding(), topBar = { TopAppBar( title = topAppBarTitle, @@ -97,11 +95,13 @@ private fun ScreenContent( } ) { paddingValues -> val listState = rememberLazyListState() - Box(modifier = Modifier.fillMaxSize()) { + Box( + modifier = Modifier + .fillMaxSize() + .padding(paddingValues) + ) { LazyColumn( - modifier = Modifier - .padding(paddingValues) - .fillMaxSize(), + modifier = Modifier.fillMaxSize(), state = listState, verticalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.margin_medium)) ) { diff --git a/app/src/main/java/com/aurora/store/compose/ui/details/PermissionScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/details/PermissionScreen.kt index fd55dce7b..4cb83a20e 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/details/PermissionScreen.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/details/PermissionScreen.kt @@ -9,7 +9,6 @@ import android.content.pm.PermissionInfo import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items @@ -82,7 +81,6 @@ private fun ScreenContent( val packageManager = LocalContext.current.packageManager Scaffold( - modifier = Modifier.navigationBarsPadding(), topBar = { TopAppBar( title = topAppBarTitle, @@ -92,10 +90,13 @@ private fun ScreenContent( } ) { paddingValues -> val listState = rememberLazyListState() - Box(modifier = Modifier.fillMaxSize()) { + Box( + modifier = Modifier + .fillMaxSize() + .padding(paddingValues) + ) { LazyColumn( modifier = Modifier - .padding(paddingValues) .fillMaxSize() .padding(horizontal = dimensionResource(R.dimen.padding_medium)), state = listState, diff --git a/app/src/main/java/com/aurora/store/compose/ui/details/ReviewScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/details/ReviewScreen.kt index 6c300045a..b7f5eb395 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/details/ReviewScreen.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/details/ReviewScreen.kt @@ -11,7 +11,6 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyRow @@ -99,7 +98,6 @@ private fun ScreenContent( windowAdaptiveInfo: WindowAdaptiveInfo = currentWindowAdaptiveInfo() ) { Scaffold( - modifier = Modifier.navigationBarsPadding(), topBar = { Column { TopAppBar( diff --git a/app/src/main/java/com/aurora/store/compose/ui/downloads/DownloadsScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/downloads/DownloadsScreen.kt index a7d8a68a6..0fd65ac16 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/downloads/DownloadsScreen.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/downloads/DownloadsScreen.kt @@ -10,7 +10,6 @@ import androidx.activity.result.contract.ActivityResultContracts import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.rememberLazyListState @@ -130,7 +129,6 @@ private fun ScreenContent( } Scaffold( - modifier = Modifier.navigationBarsPadding(), topBar = { TopAppBar( title = stringResource(R.string.title_download_manager), diff --git a/app/src/main/java/com/aurora/store/compose/ui/favourite/FavouriteScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/favourite/FavouriteScreen.kt index c378dfb72..7bd470b84 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/favourite/FavouriteScreen.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/favourite/FavouriteScreen.kt @@ -10,7 +10,6 @@ import androidx.activity.result.contract.ActivityResultContracts import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.rememberLazyListState @@ -132,7 +131,6 @@ private fun ScreenContent( } Scaffold( - modifier = Modifier.navigationBarsPadding(), topBar = { TopAppBar( title = stringResource(R.string.title_favourites_manager), diff --git a/app/src/main/java/com/aurora/store/compose/ui/installed/InstalledScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/installed/InstalledScreen.kt index 960601e6c..f9d78cf61 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/installed/InstalledScreen.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/installed/InstalledScreen.kt @@ -8,7 +8,6 @@ package com.aurora.store.compose.ui.installed import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.rememberLazyListState @@ -76,7 +75,6 @@ private fun ScreenContent( var initialLoad by rememberSaveable { mutableStateOf(true) } Scaffold( - modifier = Modifier.navigationBarsPadding(), topBar = { TopAppBar( title = stringResource(R.string.title_apps_games), diff --git a/app/src/main/java/com/aurora/store/compose/ui/search/SearchScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/search/SearchScreen.kt index 021731e56..e0e571fc2 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/search/SearchScreen.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/search/SearchScreen.kt @@ -14,7 +14,6 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyRow @@ -234,8 +233,7 @@ private fun ScreenContent( // TODO: https://issuetracker.google.com/issues/445720462 Scaffold( modifier = Modifier - .focusable() - .navigationBarsPadding(), + .focusable(), topBar = { SearchBar() } ) { paddingValues -> Column(