Merge pull request #112 from YAPP-Github/BOOK-192-fix/#83

easyhooon · web-flow · commit bf6dc1283108 · 2025-08-06T21:47:50.000+09:00
fix:  Android 15 버전 이상에서 SystemBar Color 적용 안되는 문제 해결
diff --git a/feature/home/src/main/kotlin/com/ninecraft/booket/feature/home/HomeUi.kt b/feature/home/src/main/kotlin/com/ninecraft/booket/feature/home/HomeUi.kt
@@ -12,6 +12,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.statusBarsPadding
 import androidx.compose.foundation.pager.HorizontalPager
 import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.foundation.shape.CircleShape
@@ -41,8 +42,6 @@ internal fun HomeUi(
     state: HomeUiState,
     modifier: Modifier = Modifier,
 ) {
-    HandleHomeSideEffects(state = state)
-
     // TODO: Android 15에서 statusBar 색상 적용 안되는 문제 있음. 해결 예정.
     val systemUiController = rememberSystemUiController()
 
@@ -59,20 +58,23 @@ internal fun HomeUi(
         }
     }
 
+    HandleHomeSideEffects(state = state)
+
     Column(
-        modifier = modifier.fillMaxSize(),
+        modifier = modifier
+            .fillMaxSize()
+            .background(HomeBg)
+            .statusBarsPadding(),
     ) {
         HomeHeader(
             onSettingsClick = {
                 state.eventSink(HomeUiEvent.OnSettingsClick)
             },
-            modifier = modifier,
         )
         HomeBanner(
             onBookRegisterClick = {
                 state.eventSink(HomeUiEvent.OnBookRegisterClick)
             },
-            modifier = modifier,
         )
         HomeContent(
             state = state,
diff --git a/feature/library/build.gradle.kts b/feature/library/build.gradle.kts
@@ -17,5 +17,7 @@ ksp {
 dependencies {
     implementations(
         libs.logger,
+
+        libs.compose.system.ui.controller,
     )
 }
diff --git a/feature/library/src/main/kotlin/com/ninecraft/booket/feature/library/LibraryUi.kt b/feature/library/src/main/kotlin/com/ninecraft/booket/feature/library/LibraryUi.kt
@@ -8,10 +8,12 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
@@ -21,6 +23,7 @@ import com.ninecraft.booket.core.designsystem.component.button.ReedButton
 import com.ninecraft.booket.core.designsystem.component.button.ReedButtonColorStyle
 import com.ninecraft.booket.core.designsystem.component.button.largeButtonStyle
 import com.ninecraft.booket.core.designsystem.theme.ReedTheme
+import com.ninecraft.booket.core.designsystem.theme.White
 import com.ninecraft.booket.core.model.LibraryBookSummaryModel
 import com.ninecraft.booket.core.ui.component.InfinityLazyColumn
 import com.ninecraft.booket.core.ui.component.LoadStateFooter
@@ -31,21 +34,44 @@ import com.ninecraft.booket.feature.screens.LibraryScreen
 import com.slack.circuit.codegen.annotations.CircuitInject
 import dagger.hilt.android.components.ActivityRetainedComponent
 import kotlinx.collections.immutable.persistentListOf
+import tech.thdev.compose.exteions.system.ui.controller.rememberSystemUiController
 
 @CircuitInject(LibraryScreen::class, ActivityRetainedComponent::class)
 @Composable
 internal fun LibraryUi(
     state: LibraryUiState,
     modifier: Modifier = Modifier,
 ) {
+    // TODO: Android 15에서 statusBar 색상 적용 안되는 문제 있음. 해결 예정.
+    val systemUiController = rememberSystemUiController()
+
+    DisposableEffect(systemUiController) {
+        systemUiController.setStatusBarColor(
+            color = White,
+            darkIcons = true,
+        )
+        onDispose {}
+    }
+
     HandleLibrarySideEffects(
         state = state,
         eventSink = state.eventSink,
     )
 
     Column(
-        modifier = modifier.fillMaxSize(),
+        modifier = modifier
+            .fillMaxSize()
+            .statusBarsPadding(),
     ) {
+        LibraryHeader(
+            onSearchClick = {
+                state.eventSink(LibraryUiEvent.OnLibrarySearchClick)
+            },
+            onSettingClick = {
+                state.eventSink(LibraryUiEvent.OnSettingsClick)
+            },
+        )
+
         LibraryContent(
             state = state,
             modifier = modifier,
@@ -63,14 +89,6 @@ internal fun LibraryContent(
         horizontalAlignment = Alignment.CenterHorizontally,
         verticalArrangement = Arrangement.Center,
     ) {
-        LibraryHeader(
-            onSearchClick = {
-                state.eventSink(LibraryUiEvent.OnLibrarySearchClick)
-            },
-            onSettingClick = {
-                state.eventSink(LibraryUiEvent.OnSettingsClick)
-            },
-        )
         FilterChipGroup(
             filterList = state.filterChips,
             selectedChipOption = state.currentFilter,
diff --git a/feature/main/src/main/kotlin/com/ninecraft/booket/feature/main/bottomnavigation/BottomNavigationUi.kt b/feature/main/src/main/kotlin/com/ninecraft/booket/feature/main/bottomnavigation/BottomNavigationUi.kt
@@ -1,9 +1,11 @@
 package com.ninecraft.booket.feature.main.bottomnavigation
 
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
 import com.ninecraft.booket.core.ui.ReedScaffold
 import com.ninecraft.booket.feature.main.component.MainBottomBar
 import com.ninecraft.booket.feature.main.component.MainTab
@@ -15,7 +17,7 @@ import kotlinx.collections.immutable.toImmutableList
 
 @CircuitInject(BottomNavigationScreen::class, ActivityRetainedComponent::class)
 @Composable
-fun BottomNavigation(
+fun BottomNavigationUi(
     state: BottomNavigationUiState,
     modifier: Modifier = Modifier,
 ) {
@@ -30,6 +32,7 @@ fun BottomNavigation(
                 },
             )
         },
+        contentWindowInsets = WindowInsets(top = 0.dp),
     ) { innerPadding ->
         NavigableCircuitContent(
             navigator = state.navigator,
diff --git a/feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/ocr/OcrUi.kt b/feature/record/src/main/kotlin/com/ninecraft/booket/feature/record/ocr/OcrUi.kt
@@ -19,18 +19,21 @@ 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.WindowInsets
 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.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.systemBarsPadding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.Icon
+import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
@@ -57,7 +60,6 @@ import com.ninecraft.booket.core.designsystem.theme.ReedTheme
 import com.ninecraft.booket.core.designsystem.theme.White
 import com.ninecraft.booket.core.ui.component.ReedCloseTopAppBar
 import com.ninecraft.booket.core.ui.component.ReedDialog
-import com.ninecraft.booket.core.ui.component.ReedFullScreen
 import com.ninecraft.booket.feature.record.R
 import com.ninecraft.booket.feature.record.ocr.component.CameraFrame
 import com.ninecraft.booket.feature.record.ocr.component.SentenceBox
@@ -73,10 +75,16 @@ internal fun Ocr(
     state: OcrUiState,
     modifier: Modifier = Modifier,
 ) {
-    ReedFullScreen {
-        when (state.currentUi) {
-            OcrUi.CAMERA -> CameraPreview(state = state, modifier = modifier)
-            OcrUi.RESULT -> TextScanResult(state = state, modifier = modifier)
+    Scaffold(contentWindowInsets = WindowInsets(0.dp)) { innerPadding ->
+        Box(
+            modifier = modifier
+                .fillMaxSize()
+                .padding(innerPadding),
+        ) {
+            when (state.currentUi) {
+                OcrUi.CAMERA -> CameraPreview(state = state, modifier = modifier)
+                OcrUi.RESULT -> TextScanResult(state = state, modifier = modifier)
+            }
         }
     }
 }
@@ -120,6 +128,20 @@ private fun CameraPreview(
     val systemUiController = rememberSystemUiController()
     val isDarkTheme = isSystemInDarkTheme()
 
+    DisposableEffect(systemUiController) {
+        systemUiController.setSystemBarsColor(
+            color = Neutral950,
+            isNavigationBarContrastEnforced = false,
+        )
+        onDispose {
+            systemUiController.setSystemBarsColor(
+                color = White,
+                darkIcons = !isDarkTheme,
+                isNavigationBarContrastEnforced = false,
+            )
+        }
+    }
+
     LaunchedEffect(Unit) {
         val granted = ContextCompat.checkSelfPermission(context, permission) == PackageManager.PERMISSION_GRANTED
         if (granted) {
@@ -141,27 +163,14 @@ private fun CameraPreview(
         }
     }
 
-    DisposableEffect(systemUiController) {
-        systemUiController.setSystemBarsColor(
-            color = Neutral950,
-            isNavigationBarContrastEnforced = false,
-        )
-        onDispose {
-            systemUiController.setSystemBarsColor(
-                color = White,
-                darkIcons = !isDarkTheme,
-                isNavigationBarContrastEnforced = false,
-            )
-        }
-    }
-
     Box(
-        modifier = modifier.fillMaxSize(),
+        modifier = modifier
+            .fillMaxSize()
+            .background(Neutral950)
+            .systemBarsPadding(),
     ) {
         Column(
-            modifier = Modifier
-                .fillMaxSize()
-                .background(Neutral950),
+            modifier = Modifier.fillMaxSize(),
             horizontalAlignment = Alignment.CenterHorizontally,
         ) {
             ReedCloseTopAppBar(
@@ -265,7 +274,8 @@ private fun TextScanResult(
     Column(
         modifier = modifier
             .fillMaxSize()
-            .background(White),
+            .background(White)
+            .systemBarsPadding(),
     ) {
         ReedCloseTopAppBar(
             title = stringResource(R.string.ocr_sentence_selection),

Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,7 @@ ksp {`
`17`	`17`	`dependencies {`
`18`	`18`	`implementations(`
`19`	`19`	`libs.logger,`
	`20`	`+`
	`21`	`+ libs.compose.system.ui.controller,`
`20`	`22`	`)`
`21`	`23`	`}`