Simplified edge to edge (#14)

This commit is contained in:
Android Dev
2025-11-12 00:00:00 +07:00
committed by GitHub
parent e18ffec9f1
commit 9496ab03d1
7 changed files with 36 additions and 19 deletions

View File

@@ -29,6 +29,7 @@ import androidx.compose.animation.slideInVertically
import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.Box
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.fillMaxWidth
@@ -63,6 +64,7 @@ import com.example.superheroes.ui.theme.SuperheroesTheme
fun HeroesList(
heroes: List<Hero>,
modifier: Modifier = Modifier,
contentPadding: PaddingValues = PaddingValues(0.dp),
) {
val visibleState = remember {
MutableTransitionState(false).apply {
@@ -80,7 +82,7 @@ fun HeroesList(
exit = fadeOut(),
modifier = modifier
) {
LazyColumn {
LazyColumn(contentPadding = contentPadding) {
itemsIndexed(heroes) { index, hero ->
HeroListItem(
hero = hero,

View File

@@ -20,7 +20,6 @@ import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.CenterAlignedTopAppBar
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.MaterialTheme
@@ -66,8 +65,7 @@ class MainActivity : ComponentActivity() {
data source as a dependency and exposes heroes.
*/
val heroes = HeroesRepository.heroes
HeroesList(heroes = heroes, Modifier.padding(it))
HeroesList(heroes = heroes, contentPadding = it)
}
}
@@ -98,4 +96,3 @@ class MainActivity : ComponentActivity() {
}
}
}

View File

@@ -18,6 +18,7 @@ package com.example.superheroes.ui.theme
import android.app.Activity
import android.os.Build
import android.view.View
import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.darkColorScheme
@@ -26,6 +27,7 @@ import androidx.compose.material3.dynamicLightColorScheme
import androidx.compose.material3.lightColorScheme
import androidx.compose.runtime.Composable
import androidx.compose.runtime.SideEffect
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.toArgb
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalView
@@ -115,9 +117,7 @@ fun SuperheroesTheme(
val view = LocalView.current
if (!view.isInEditMode) {
SideEffect {
val window = (view.context as Activity).window
window.statusBarColor = colorScheme.background.toArgb()
WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = !darkTheme
setUpEdgeToEdge(view, darkTheme)
}
}
@@ -128,3 +128,23 @@ fun SuperheroesTheme(
content = content
)
}
/**
* Sets up edge-to-edge for the window of this [view]. The system icon colors are set to either
* light or dark depending on whether the [darkTheme] is enabled or not.
*/
private fun setUpEdgeToEdge(view: View, darkTheme: Boolean) {
val window = (view.context as Activity).window
WindowCompat.setDecorFitsSystemWindows(window, false)
window.statusBarColor = Color.Transparent.toArgb()
val navigationBarColor = when {
Build.VERSION.SDK_INT >= 29 -> Color.Transparent.toArgb()
Build.VERSION.SDK_INT >= 26 -> Color(0xFF, 0xFF, 0xFF, 0x63).toArgb()
// Min sdk version for this app is 24, this block is for SDK versions 24 and 25
else -> Color(0x00, 0x00, 0x00, 0x50).toArgb()
}
window.navigationBarColor = navigationBarColor
val controller = WindowCompat.getInsetsController(window, view)
controller.isAppearanceLightStatusBars = !darkTheme
controller.isAppearanceLightNavigationBars = !darkTheme
}

View File

@@ -28,9 +28,9 @@ val Cabin = FontFamily(
Font(R.font.cabin_regular, FontWeight.Normal),
Font(R.font.cabin_bold, FontWeight.Bold)
)
// Set of Material typography styles to start with
val Typography = Typography(
bodyLarge = TextStyle(
fontFamily = Cabin,
fontWeight = FontWeight.Normal,
@@ -38,7 +38,6 @@ val Typography = Typography(
lineHeight = 24.sp,
letterSpacing = 0.5.sp
),
displayLarge = TextStyle(
fontFamily = Cabin,
fontWeight = FontWeight.Normal,