compose: add scroll hint to all lazy columns + improve padding

app/src/main/java/com/aurora/store/compose/composable/Header.kt

@@ -11,14 +11,12 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
 import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
@@ -46,18 +44,16 @@ fun Header(
     Row(
         modifier = modifier
             .fillMaxWidth()
-            .clip(RoundedCornerShape(dimensionResource(R.dimen.radius_small)))
             .clickable(onClick = { if (onClick != null) onClick() }, enabled = onClick != null)
             .padding(
-                horizontal = dimensionResource(R.dimen.padding_small),
+                horizontal = dimensionResource(R.dimen.padding_medium),
-                vertical = dimensionResource(R.dimen.padding_xxsmall)
+                vertical = dimensionResource(R.dimen.padding_xsmall)
             ),
         horizontalArrangement = Arrangement.SpaceBetween,
         verticalAlignment = Alignment.CenterVertically
     ) {
         Column(
-            modifier = Modifier.weight(1F),
+            modifier = Modifier.weight(1F)
-            verticalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.padding_xsmall))
         ) {
             Text(
                 text = title,
@@ -68,7 +64,8 @@ fun Header(
             if (!subtitle.isNullOrBlank()) {
                 Text(
                     text = subtitle,
-                    style = MaterialTheme.typography.bodyMedium
+                    style = MaterialTheme.typography.bodyMedium,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant
                 )
             }
         }

app/src/main/java/com/aurora/store/compose/composable/Info.kt

@@ -56,7 +56,7 @@ fun Info(
             .fillMaxWidth()
             .clickable(onClick = { if (onClick != null) onClick() }, enabled = onClick != null)
             .padding(
-                horizontal = dimensionResource(R.dimen.padding_small),
+                horizontal = dimensionResource(R.dimen.padding_medium),
                 vertical = dimensionResource(R.dimen.padding_xxsmall)
             ),
         horizontalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.margin_normal)),
@@ -75,7 +75,7 @@ fun Info(
                 Text(
                     text = description,
                     style = MaterialTheme.typography.bodySmall,
-                    color = MaterialTheme.colorScheme.secondary
+                    color = MaterialTheme.colorScheme.onSurfaceVariant
                 )
             }
         }

app/src/main/java/com/aurora/store/compose/ui/blacklist/BlacklistScreen.kt

@@ -10,10 +10,14 @@ import android.net.Uri
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 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
+import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.text.input.clearText
 import androidx.compose.foundation.text.input.rememberTextFieldState
 import androidx.compose.foundation.text.input.setTextAndPlaceCursorAtEnd
@@ -30,6 +34,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.snapshotFlow
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
@@ -40,6 +45,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewWrapper
+import androidx.compose.ui.unit.dp
 import androidx.core.content.pm.PackageInfoCompat
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -47,6 +53,7 @@ import com.aurora.Constants
 import com.aurora.extensions.toast
 import com.aurora.store.R
 import com.aurora.store.compose.composable.BlackListItem
+import com.aurora.store.compose.composable.ScrollHint
 import com.aurora.store.compose.preview.ThemePreviewProvider
 import com.aurora.store.compose.ui.blacklist.menu.BlacklistMenu
 import com.aurora.store.compose.ui.blacklist.menu.MenuItem
@@ -209,14 +216,24 @@ private fun ScreenContent(
         )
     }
 
-    Scaffold(topBar = { SearchBar() }) { paddingValues ->
+    Scaffold(
+        modifier = Modifier.navigationBarsPadding(),
+        topBar = { SearchBar() }
+    ) { paddingValues ->
+        val listState = rememberLazyListState()
+        Box(modifier = Modifier.fillMaxSize()) {
             LazyColumn(
                 modifier = Modifier
                     .fillMaxWidth()
                     .padding(paddingValues),
-            verticalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.margin_xxsmall))
+                state = listState,
+                verticalArrangement = Arrangement.spacedBy(
+                    dimensionResource(R.dimen.margin_xxsmall)
+                )
             ) {
-            items(items = packages ?: emptyList(), key = { p -> p.packageName.hashCode() }) { pkg ->
+                items(items = packages ?: emptyList(), key = { p ->
+                    p.packageName.hashCode()
+                }) { pkg ->
                     val isBlacklisted = isPackageBlacklisted(pkg.packageName)
                     val isFiltered = isPackageFiltered(pkg)
                     BlackListItem(
@@ -239,6 +256,12 @@ private fun ScreenContent(
                     )
                 }
             }
+            ScrollHint(
+                listState = listState,
+                bottomPadding = 5.dp,
+                modifier = Modifier.align(Alignment.BottomCenter)
+            )
+        }
     }
 }
 

app/src/main/java/com/aurora/store/compose/ui/details/AppDetailsScreen.kt

@@ -12,14 +12,15 @@ import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.animation.togetherWith
 import androidx.compose.foundation.layout.Arrangement
+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
-import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.adaptive.WindowAdaptiveInfo
@@ -49,6 +50,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.PreviewScreenSizes
 import androidx.compose.ui.tooling.preview.PreviewWrapper
+import androidx.compose.ui.unit.dp
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation3.runtime.NavKey
@@ -65,6 +67,7 @@ import com.aurora.store.R
 import com.aurora.store.compose.composable.ContainedLoadingIndicator
 import com.aurora.store.compose.composable.Error
 import com.aurora.store.compose.composable.Header
+import com.aurora.store.compose.composable.ScrollHint
 import com.aurora.store.compose.composable.TopAppBar
 import com.aurora.store.compose.composable.app.LargeAppListItem
 import com.aurora.store.compose.navigation.Screen
@@ -163,7 +166,7 @@ fun AppDetailsScreen(
                                 PackageUtil.getLaunchIntent(context, packageName)
                             )
                         } catch (_: ActivityNotFoundException) {
-                            context.toast(context.getString(R.string.unable_to_open))
+                            context.toast(R.string.unable_to_open)
                         }
                     },
                     onTestingSubscriptionChange = { subscribe ->
@@ -390,6 +393,7 @@ private fun ScreenContentApp(
     @Composable
     fun MainPane() {
         Scaffold(
+            modifier = Modifier.navigationBarsPadding(),
             topBar = {
                 TopAppBar(
                     onNavigateUp = onNavigateUp,
@@ -397,50 +401,74 @@ private fun ScreenContentApp(
                 )
             }
         ) { paddingValues ->
-            Column(
+            val listState = rememberLazyListState()
+            Box(modifier = Modifier.fillMaxSize()) {
+                LazyColumn(
                     modifier = Modifier
                         .padding(paddingValues)
-                    .fillMaxSize()
+                        .fillMaxSize(),
-                    .verticalScroll(rememberScrollState())
+                    verticalArrangement = Arrangement.spacedBy(
-                    .padding(dimensionResource(R.dimen.padding_medium)),
+                        dimensionResource(R.dimen.margin_medium)
-                verticalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.margin_medium))
+                    ),
+                    state = listState
                 ) {
+                    item {
                         Details(
                             app = app,
                             state = state,
                             onNavigateToDetailsDevProfile = { showExtraPane(Screen.DevProfile(it)) }
                         )
+                    }
 
+                    item {
                         SetupActions()
+                    }
 
+                    item {
                         Tags(app = app)
+                    }
+
+                    item {
                         Changelog(changelog = app.changes)
+                    }
+
+                    item {
                         Header(
                             title = stringResource(R.string.details_more_about_app),
                             subtitle = app.shortDescription,
                             onClick = { showExtraPane(ExtraScreen.More) }
                         )
+                    }
 
+                    item {
                         Screenshots(
                             screenshots = app.screenshots,
                             onNavigateToScreenshot = { showExtraPane(ExtraScreen.Screenshot(it)) }
                         )
+                    }
 
+                    item {
                         RatingAndReviews(
                             rating = app.rating,
                             featuredReviews = featuredReviews,
                             onNavigateToDetailsReview = { showExtraPane(ExtraScreen.Review) }
                         )
+                    }
 
+                    item {
                         if (!isAnonymous && app.testingProgram?.isAvailable == true) {
                             Testing(
                                 isSubscribed = app.testingProgram!!.isSubscribed,
                                 onTestingSubscriptionChange = onTestingSubscriptionChange
                             )
                         }
+                    }
 
+                    item {
                         Compatibility(needsGms = app.requiresGMS(), plexusScores = plexusScores)
+                    }
 
+                    item {
                         Header(
                             title = stringResource(R.string.details_permission),
                             subtitle = if (app.permissions.isNotEmpty()) {
@@ -454,20 +482,31 @@ private fun ScreenContentApp(
                                 null
                             }
                         )
-
-                if (dataSafetyReport != null) {
-                    DataSafety(report = dataSafetyReport, privacyPolicyUrl = app.privacyPolicyUrl)
                     }
 
+                    item {
+                        if (dataSafetyReport != null) {
+                            DataSafety(
+                                report = dataSafetyReport,
+                                privacyPolicyUrl = app.privacyPolicyUrl
+                            )
+                        }
+                    }
+
+                    item {
                         Privacy(
                             report = exodusReport,
-                    onNavigateToDetailsExodus = if (exodusReport != null && exodusReport.id != -1) {
+                            onNavigateToDetailsExodus = if (exodusReport != null &&
+                                exodusReport.id != -1
+                            ) {
                                 { showExtraPane(ExtraScreen.Exodus) }
                             } else {
                                 null
                             }
                         )
+                    }
 
+                    item {
                         DeveloperDetails(
                             address = app.developerAddress,
                             website = app.developerWebsite,
@@ -475,6 +514,13 @@ private fun ScreenContentApp(
                         )
                     }
                 }
+                ScrollHint(
+                    listState = listState,
+                    bottomPadding = 5.dp,
+                    modifier = Modifier.align(Alignment.BottomCenter)
+                )
+            }
+        }
     }
 
     @Composable

app/src/main/java/com/aurora/store/compose/ui/details/ExodusScreen.kt

@@ -5,11 +5,14 @@
 
 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
+import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Scaffold
@@ -19,6 +22,7 @@ import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.dimensionResource
@@ -27,6 +31,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.PreviewWrapper
+import androidx.compose.ui.unit.dp
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.aurora.Constants.EXODUS_REPORT_URL
@@ -38,6 +43,7 @@ import com.aurora.gplayapi.data.models.App
 import com.aurora.store.R
 import com.aurora.store.compose.composable.Error
 import com.aurora.store.compose.composable.Header
+import com.aurora.store.compose.composable.ScrollHint
 import com.aurora.store.compose.composable.TopAppBar
 import com.aurora.store.compose.composable.details.ExodusListItem
 import com.aurora.store.compose.preview.AppPreviewProvider
@@ -103,6 +109,7 @@ private fun ScreenContentReport(
     val context = LocalContext.current
 
     Scaffold(
+        modifier = Modifier.navigationBarsPadding(),
         topBar = {
             TopAppBar(
                 title = topAppBarTitle,
@@ -119,11 +126,14 @@ private fun ScreenContentReport(
             }
         }
     ) { paddingValues ->
+        val listState = rememberLazyListState()
+        Box(modifier = Modifier.fillMaxSize()) {
             LazyColumn(
                 modifier = Modifier
                     .padding(paddingValues)
                     .fillMaxSize()
-                .padding(horizontal = dimensionResource(R.dimen.padding_medium))
+                    .padding(horizontal = dimensionResource(R.dimen.padding_medium)),
+                state = listState
             ) {
                 stickyHeader {
                     Surface(modifier = Modifier.fillMaxWidth()) {
@@ -147,6 +157,12 @@ private fun ScreenContentReport(
                     ExodusListItem(tracker = tracker)
                 }
             }
+            ScrollHint(
+                listState = listState,
+                bottomPadding = 5.dp,
+                modifier = Modifier.align(Alignment.BottomCenter)
+            )
+        }
     }
 }
 

app/src/main/java/com/aurora/store/compose/ui/details/MoreScreen.kt

@@ -6,14 +6,15 @@
 package com.aurora.store.compose.ui.details
 
 import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
+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
 import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
@@ -21,6 +22,7 @@ import androidx.compose.material3.adaptive.WindowAdaptiveInfo
 import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalLocale
 import androidx.compose.ui.res.dimensionResource
@@ -30,6 +32,7 @@ import androidx.compose.ui.text.fromHtml
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.PreviewWrapper
+import androidx.compose.ui.unit.dp
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.aurora.extensions.adaptiveNavigationIcon
@@ -38,6 +41,7 @@ import com.aurora.gplayapi.data.models.App
 import com.aurora.store.R
 import com.aurora.store.compose.composable.Header
 import com.aurora.store.compose.composable.Info
+import com.aurora.store.compose.composable.ScrollHint
 import com.aurora.store.compose.composable.TopAppBar
 import com.aurora.store.compose.composable.app.AppListItem
 import com.aurora.store.compose.preview.AppPreviewProvider
@@ -83,6 +87,7 @@ private fun ScreenContent(
     }
 
     Scaffold(
+        modifier = Modifier.navigationBarsPadding(),
         topBar = {
             TopAppBar(
                 title = topAppBarTitle,
@@ -91,32 +96,51 @@ private fun ScreenContent(
             )
         }
     ) { paddingValues ->
-        Column(
+        val listState = rememberLazyListState()
+        Box(modifier = Modifier.fillMaxSize()) {
+            LazyColumn(
                 modifier = Modifier
                     .padding(paddingValues)
-                .fillMaxSize()
+                    .fillMaxSize(),
-                .verticalScroll(rememberScrollState()),
+                state = listState,
                 verticalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.margin_medium))
             ) {
+                item {
                     Header(title = stringResource(R.string.details_description))
+                }
+
+                item {
                     Text(
-                modifier = Modifier.padding(horizontal = dimensionResource(R.dimen.padding_medium)),
+                        modifier = Modifier.padding(
+                            horizontal = dimensionResource(R.dimen.padding_medium)
+                        ),
                         text = AnnotatedString.fromHtml(
                             htmlString = app.description
                         ),
                         style = MaterialTheme.typography.bodyMedium
                     )
+                }
 
+                item {
                     if (dependencies != null) {
                         AppDependencies(
                             dependencies = dependencies,
                             onNavigateToAppDetails = onNavigateToAppDetails
                         )
                     }
+                }
 
+                item {
                     AppInfoMore(app = app)
                 }
             }
+            ScrollHint(
+                listState = listState,
+                bottomPadding = 5.dp,
+                modifier = Modifier.align(Alignment.BottomCenter)
+            )
+        }
+    }
 }
 
 /**

app/src/main/java/com/aurora/store/compose/ui/details/PermissionScreen.kt

@@ -7,15 +7,19 @@ package com.aurora.store.compose.ui.details
 
 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
+import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.adaptive.WindowAdaptiveInfo
 import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalLocale
@@ -25,6 +29,7 @@ import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.PreviewWrapper
+import androidx.compose.ui.unit.dp
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.aurora.extensions.adaptiveNavigationIcon
@@ -32,6 +37,7 @@ import com.aurora.extensions.isWindowCompact
 import com.aurora.gplayapi.data.models.App
 import com.aurora.store.R
 import com.aurora.store.compose.composable.Info
+import com.aurora.store.compose.composable.ScrollHint
 import com.aurora.store.compose.composable.TopAppBar
 import com.aurora.store.compose.preview.AppPreviewProvider
 import com.aurora.store.compose.preview.ThemePreviewProvider
@@ -76,6 +82,7 @@ private fun ScreenContent(
     val packageManager = LocalContext.current.packageManager
 
     Scaffold(
+        modifier = Modifier.navigationBarsPadding(),
         topBar = {
             TopAppBar(
                 title = topAppBarTitle,
@@ -84,11 +91,14 @@ private fun ScreenContent(
             )
         }
     ) { paddingValues ->
+        val listState = rememberLazyListState()
+        Box(modifier = Modifier.fillMaxSize()) {
             LazyColumn(
                 modifier = Modifier
                     .padding(paddingValues)
                     .fillMaxSize()
                     .padding(horizontal = dimensionResource(R.dimen.padding_medium)),
+                state = listState,
                 verticalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.margin_medium))
             ) {
                 items(items = permissionsInfo.keys.toList(), key = { it }) { permission ->
@@ -113,6 +123,12 @@ private fun ScreenContent(
                     )
                 }
             }
+            ScrollHint(
+                listState = listState,
+                bottomPadding = 5.dp,
+                modifier = Modifier.align(Alignment.BottomCenter)
+            )
+        }
     }
 }
 

app/src/main/java/com/aurora/store/compose/ui/details/ReviewScreen.kt

@@ -6,13 +6,17 @@
 package com.aurora.store.compose.ui.details
 
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 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
 import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material3.FilterChip
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Scaffold
@@ -24,6 +28,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.painterResource
@@ -31,6 +36,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.PreviewWrapper
+import androidx.compose.ui.unit.dp
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.paging.LoadState
@@ -45,6 +51,7 @@ import com.aurora.gplayapi.data.models.Review
 import com.aurora.store.R
 import com.aurora.store.compose.composable.ContainedLoadingIndicator
 import com.aurora.store.compose.composable.Error
+import com.aurora.store.compose.composable.ScrollHint
 import com.aurora.store.compose.composable.TopAppBar
 import com.aurora.store.compose.composable.details.ReviewListItem
 import com.aurora.store.compose.preview.ReviewPreviewProvider
@@ -92,22 +99,23 @@ private fun ScreenContent(
     windowAdaptiveInfo: WindowAdaptiveInfo = currentWindowAdaptiveInfo()
 ) {
     Scaffold(
+        modifier = Modifier.navigationBarsPadding(),
         topBar = {
+            Column {
                 TopAppBar(
                     title = topAppBarTitle,
                     navigationIcon = windowAdaptiveInfo.adaptiveNavigationIcon,
                     onNavigateUp = onNavigateUp
                 )
+                FilterHeader { filter -> onFilter(filter) }
+            }
         }
     ) { paddingValues ->
         Column(
             modifier = Modifier
                 .padding(paddingValues)
                 .fillMaxSize()
-                .padding(horizontal = dimensionResource(R.dimen.padding_medium))
         ) {
-            FilterHeader { filter -> onFilter(filter) }
-
             when (reviews.loadState.refresh) {
                 is LoadState.Loading -> ContainedLoadingIndicator()
 
@@ -120,7 +128,12 @@ private fun ScreenContent(
                 }
 
                 else -> {
-                    LazyColumn(modifier = Modifier.fillMaxSize()) {
+                    val listState = rememberLazyListState()
+                    Box(modifier = Modifier.fillMaxSize()) {
+                        LazyColumn(
+                            modifier = Modifier.fillMaxSize(),
+                            state = listState
+                        ) {
                             items(
                                 count = reviews.itemCount,
                                 key = reviews.itemKey { it.commentId }
@@ -128,6 +141,12 @@ private fun ScreenContent(
                                 reviews[index]?.let { review -> ReviewListItem(review = review) }
                             }
                         }
+                        ScrollHint(
+                            listState = listState,
+                            bottomPadding = 5.dp,
+                            modifier = Modifier.align(Alignment.BottomCenter)
+                        )
+                    }
                 }
             }
         }
@@ -155,6 +174,7 @@ private fun FilterHeader(onClick: (filter: Review.Filter) -> Unit) {
 
     LazyRow(
         modifier = Modifier.fillMaxWidth(),
+        contentPadding = PaddingValues(horizontal = dimensionResource(R.dimen.margin_normal)),
         horizontalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.margin_normal))
     ) {
         items(items = filters.keys.toList(), key = { item -> item }) { filter ->

app/src/main/java/com/aurora/store/compose/ui/details/composable/Actions.kt

@@ -7,8 +7,10 @@ package com.aurora.store.compose.ui.details.composable
 
 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.fillMaxWidth
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.material3.Button
 import androidx.compose.material3.FilledTonalButton
@@ -48,7 +50,9 @@ fun Actions(
     windowAdaptiveInfo: WindowAdaptiveInfo = currentWindowAdaptiveInfo()
 ) {
     Row(
-        modifier = Modifier.fillMaxWidth(),
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(PaddingValues(horizontal = dimensionResource(R.dimen.padding_medium))),
         horizontalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.padding_medium))
     ) {
         val buttonWidthModifier = when {

app/src/main/java/com/aurora/store/compose/ui/details/composable/Changelog.kt

@@ -38,12 +38,20 @@ import com.aurora.store.compose.preview.ThemePreviewProvider
 @Composable
 fun Changelog(changelog: String) {
     Header(title = stringResource(R.string.details_changelog))
+    Box(
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(dimensionResource(R.dimen.padding_medium))
+    ) {
         Box(
             modifier = Modifier
                 .fillMaxWidth()
                 .clip(RoundedCornerShape(dimensionResource(R.dimen.radius_small)))
                 .background(color = MaterialTheme.colorScheme.secondaryContainer)
-            .padding(dimensionResource(R.dimen.padding_medium))
+                .padding(
+                    horizontal = dimensionResource(R.dimen.padding_medium),
+                    vertical = dimensionResource(R.dimen.padding_small)
+                )
         ) {
             Text(
                 text = if (changelog.isBlank()) {
@@ -54,6 +62,7 @@ fun Changelog(changelog: String) {
                 style = MaterialTheme.typography.bodyMedium
             )
         }
+    }
 }
 
 @PreviewWrapper(ThemePreviewProvider::class)

app/src/main/java/com/aurora/store/compose/ui/details/composable/Details.kt

@@ -105,7 +105,11 @@ fun Details(
         )
     }
 
-    Row(modifier = Modifier.fillMaxWidth()) {
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(dimensionResource(R.dimen.margin_medium))
+    ) {
         AnimatedAppIcon(
             modifier = Modifier.requiredSize(dimensionResource(R.dimen.icon_size_large)),
             iconUrl = app.iconArtwork.url,

app/src/main/java/com/aurora/store/compose/ui/details/composable/RatingAndReviews.kt

@@ -87,9 +87,11 @@ fun RatingAndReviews(
     )
 
     Row(
-        modifier = Modifier.fillMaxWidth(),
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(dimensionResource(R.dimen.padding_medium)),
         verticalAlignment = Alignment.CenterVertically,
-        horizontalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.margin_small))
+        horizontalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.margin_large))
     ) {
         Column(
             modifier = Modifier.padding(dimensionResource(R.dimen.padding_medium)),
@@ -111,7 +113,6 @@ fun RatingAndReviews(
         }
 
         Column(
-            modifier = Modifier.padding(dimensionResource(R.dimen.padding_medium)),
             verticalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.margin_small))
         ) {
             stars.reversed().fastForEach { star ->
@@ -127,7 +128,7 @@ fun RatingAndReviews(
         val pagerState = rememberPagerState { featuredReviews.size }
         HorizontalPager(
             state = pagerState,
-            contentPadding = PaddingValues(dimensionResource(R.dimen.padding_large)),
+            contentPadding = PaddingValues(horizontal = dimensionResource(R.dimen.padding_medium)),
             pageSpacing = dimensionResource(R.dimen.margin_medium)
         ) { page ->
             Box(

app/src/main/java/com/aurora/store/compose/ui/details/composable/Screenshots.kt

@@ -8,6 +8,7 @@ package com.aurora.store.compose.ui.details.composable
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.foundation.lazy.items
@@ -34,7 +35,10 @@ import com.aurora.store.compose.preview.ThemePreviewProvider
  */
 @Composable
 fun Screenshots(screenshots: List<Artwork>, onNavigateToScreenshot: (index: Int) -> Unit = {}) {
-    LazyRow(horizontalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.margin_small))) {
+    LazyRow(
+        contentPadding = PaddingValues(horizontal = dimensionResource(R.dimen.padding_medium)),
+        horizontalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.margin_small))
+    ) {
         items(items = screenshots, key = { artwork -> artwork.url }) { artwork ->
             ScreenshotListItem(
                 modifier = Modifier

app/src/main/java/com/aurora/store/compose/ui/details/composable/Tags.kt

@@ -8,6 +8,7 @@ package com.aurora.store.compose.ui.details.composable
 import android.text.format.Formatter
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.foundation.lazy.items
 import androidx.compose.runtime.Composable
@@ -61,6 +62,7 @@ fun Tags(app: App) {
     ).filterKeys { it != null }
 
     LazyRow(
+        contentPadding = PaddingValues(horizontal = dimensionResource(R.dimen.padding_medium)),
         horizontalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.padding_medium))
     ) {
         items(items = tags.keys.toList()) { label ->

app/src/main/java/com/aurora/store/compose/ui/details/composable/Testing.kt

@@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.FilledTonalButton
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -40,7 +41,9 @@ import com.aurora.store.compose.preview.ThemePreviewProvider
 fun Testing(isSubscribed: Boolean, onTestingSubscriptionChange: (subscribe: Boolean) -> Unit = {}) {
     Header(title = stringResource(R.string.details_beta))
     Row(
-        modifier = Modifier.fillMaxWidth(),
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(dimensionResource(R.dimen.padding_medium)),
         verticalAlignment = Alignment.CenterVertically,
         horizontalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.margin_small))
     ) {

app/src/main/java/com/aurora/store/compose/ui/downloads/DownloadsScreen.kt

@@ -7,16 +7,20 @@ package com.aurora.store.compose.ui.downloads
 
 import androidx.activity.compose.rememberLauncherForActivityResult
 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
 import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.dimensionResource
@@ -25,6 +29,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.PreviewWrapper
+import androidx.compose.ui.unit.dp
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.paging.LoadState
 import androidx.paging.PagingData
@@ -38,6 +43,7 @@ import com.aurora.store.R
 import com.aurora.store.compose.composable.ContainedLoadingIndicator
 import com.aurora.store.compose.composable.DownloadListItem
 import com.aurora.store.compose.composable.Error
+import com.aurora.store.compose.composable.ScrollHint
 import com.aurora.store.compose.composable.TopAppBar
 import com.aurora.store.compose.preview.AppPreviewProvider
 import com.aurora.store.compose.preview.ThemePreviewProvider
@@ -124,6 +130,7 @@ private fun ScreenContent(
     }
 
     Scaffold(
+        modifier = Modifier.navigationBarsPadding(),
         topBar = {
             TopAppBar(
                 title = stringResource(R.string.title_download_manager),
@@ -153,7 +160,11 @@ private fun ScreenContent(
                             message = stringResource(R.string.download_none)
                         )
                     } else {
-                        LazyColumn {
+                        val listState = rememberLazyListState()
+                        Box(modifier = Modifier.fillMaxSize()) {
+                            LazyColumn(
+                                state = listState
+                            ) {
                                 items(
                                     count = downloads.itemCount,
                                     key = downloads.itemKey { it.packageName }
@@ -162,7 +173,9 @@ private fun ScreenContent(
                                         DownloadListItem(
                                             modifier = Modifier.animateItem(),
                                             download = download,
-                                        onClick = { onNavigateToAppDetails(download.packageName) },
+                                            onClick = {
+                                                onNavigateToAppDetails(download.packageName)
+                                            },
                                             onClear = { onClear(download) },
                                             onCancel = { onCancel(download.packageName) },
                                             onExport = { onExport(download) },
@@ -171,6 +184,12 @@ private fun ScreenContent(
                                     }
                                 }
                             }
+                            ScrollHint(
+                                listState = listState,
+                                bottomPadding = 5.dp,
+                                modifier = Modifier.align(Alignment.BottomCenter)
+                            )
+                        }
                     }
                 }
             }

app/src/main/java/com/aurora/store/compose/ui/favourite/FavouriteScreen.kt

@@ -7,16 +7,20 @@ package com.aurora.store.compose.ui.favourite
 
 import androidx.activity.compose.rememberLauncherForActivityResult
 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
 import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.dimensionResource
@@ -25,6 +29,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.PreviewWrapper
+import androidx.compose.ui.unit.dp
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.paging.LoadState
 import androidx.paging.PagingData
@@ -38,6 +43,7 @@ import com.aurora.store.R
 import com.aurora.store.compose.composable.ContainedLoadingIndicator
 import com.aurora.store.compose.composable.Error
 import com.aurora.store.compose.composable.FavouriteListItem
+import com.aurora.store.compose.composable.ScrollHint
 import com.aurora.store.compose.composable.TopAppBar
 import com.aurora.store.compose.preview.FavouritePreviewProvider
 import com.aurora.store.compose.preview.ThemePreviewProvider
@@ -126,6 +132,7 @@ private fun ScreenContent(
     }
 
     Scaffold(
+        modifier = Modifier.navigationBarsPadding(),
         topBar = {
             TopAppBar(
                 title = stringResource(R.string.title_favourites_manager),
@@ -155,7 +162,11 @@ private fun ScreenContent(
                             message = stringResource(R.string.details_no_favourites)
                         )
                     } else {
-                        LazyColumn {
+                        val listState = rememberLazyListState()
+                        Box(modifier = Modifier.fillMaxSize()) {
+                            LazyColumn(
+                                state = listState
+                            ) {
                                 items(
                                     count = favourites.itemCount,
                                     key = favourites.itemKey { it.packageName }
@@ -164,12 +175,20 @@ private fun ScreenContent(
                                         FavouriteListItem(
                                             modifier = Modifier.animateItem(),
                                             favourite = favourite,
-                                        onClick = { onNavigateToAppDetails(favourite.packageName) },
+                                            onClick = {
+                                                onNavigateToAppDetails(favourite.packageName)
+                                            },
                                             onClear = { onRemoveFavourite(favourite.packageName) }
                                         )
                                     }
                                 }
                             }
+                            ScrollHint(
+                                listState = listState,
+                                bottomPadding = 5.dp,
+                                modifier = Modifier.align(Alignment.BottomCenter)
+                            )
+                        }
                     }
                 }
             }

app/src/main/java/com/aurora/store/compose/ui/installed/InstalledScreen.kt

@@ -5,22 +5,27 @@
 
 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
 import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.PreviewWrapper
+import androidx.compose.ui.unit.dp
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.paging.LoadState
 import androidx.paging.PagingData
@@ -32,6 +37,7 @@ import com.aurora.gplayapi.data.models.App
 import com.aurora.store.R
 import com.aurora.store.compose.composable.ContainedLoadingIndicator
 import com.aurora.store.compose.composable.Error
+import com.aurora.store.compose.composable.ScrollHint
 import com.aurora.store.compose.composable.TopAppBar
 import com.aurora.store.compose.composable.app.LargeAppListItem
 import com.aurora.store.compose.preview.AppPreviewProvider
@@ -70,6 +76,7 @@ private fun ScreenContent(
     var initialLoad by rememberSaveable { mutableStateOf(true) }
 
     Scaffold(
+        modifier = Modifier.navigationBarsPadding(),
         topBar = {
             TopAppBar(
                 title = stringResource(R.string.title_apps_games),
@@ -97,7 +104,11 @@ private fun ScreenContent(
                             message = stringResource(R.string.no_apps_available)
                         )
                     } else {
-                        LazyColumn {
+                        val listState = rememberLazyListState()
+                        Box(modifier = Modifier.fillMaxSize()) {
+                            LazyColumn(
+                                state = listState
+                            ) {
                                 items(
                                     count = apps.itemCount,
                                     key = apps.itemKey { it.packageName }
@@ -110,6 +121,12 @@ private fun ScreenContent(
                                     }
                                 }
                             }
+                            ScrollHint(
+                                listState = listState,
+                                bottomPadding = 5.dp,
+                                modifier = Modifier.align(Alignment.BottomCenter)
+                            )
+                        }
                     }
                 }
             }

app/src/main/java/com/aurora/store/compose/ui/search/SearchScreen.kt

@@ -14,10 +14,12 @@ 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
 import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.text.input.clearText
 import androidx.compose.foundation.text.input.rememberTextFieldState
 import androidx.compose.foundation.text.input.setTextAndPlaceCursorAtEnd
@@ -45,6 +47,7 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.runtime.snapshotFlow
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
@@ -58,6 +61,7 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.PreviewScreenSizes
 import androidx.compose.ui.tooling.preview.PreviewWrapper
+import androidx.compose.ui.unit.dp
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.paging.LoadState
@@ -70,6 +74,7 @@ import com.aurora.gplayapi.data.models.App
 import com.aurora.store.R
 import com.aurora.store.compose.composable.ContainedLoadingIndicator
 import com.aurora.store.compose.composable.Error
+import com.aurora.store.compose.composable.ScrollHint
 import com.aurora.store.compose.composable.SearchSuggestionListItem
 import com.aurora.store.compose.composable.app.LargeAppListItem
 import com.aurora.store.compose.preview.AppPreviewProvider
@@ -221,7 +226,9 @@ private fun ScreenContent(
     fun ListPane() {
         // TODO: https://issuetracker.google.com/issues/445720462
         Scaffold(
-            modifier = Modifier.focusable(),
+            modifier = Modifier
+                .focusable()
+                .navigationBarsPadding(),
             topBar = { SearchBar() }
         ) { paddingValues ->
             Column(
@@ -255,7 +262,12 @@ private fun ScreenContent(
                                 message = stringResource(R.string.no_apps_available)
                             )
                         } else {
-                            LazyColumn {
+                            val listState = rememberLazyListState()
+                            Box(modifier = Modifier.fillMaxSize()) {
+                                LazyColumn(
+                                    state = listState,
+                                    modifier = Modifier.fillMaxSize()
+                                ) {
                                     items(
                                         count = results.itemCount,
                                         key = { Uuid.random().toString() }
@@ -268,6 +280,12 @@ private fun ScreenContent(
                                         }
                                     }
                                 }
+                                ScrollHint(
+                                    listState = listState,
+                                    bottomPadding = 5.dp,
+                                    modifier = Modifier.align(Alignment.BottomCenter)
+                                )
+                            }
                         }
                     }
                 }