From c4a85599b6a1f2dffc21d6a6dc481c65e2967113 Mon Sep 17 00:00:00 2001 From: easyhooon Date: Fri, 31 Jan 2025 05:11:02 +0900 Subject: [PATCH] =?UTF-8?q?[feat]=20=EB=A9=94=EC=9D=B8=ED=99=94=EB=A9=B4?= =?UTF-8?q?=20system=20bar=20=EC=83=89=EC=83=81=20=EB=B3=80=EA=B2=BD=20(#4?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit system bar 색상 변경 로직 수정(불필요한 코드, 옵션 제거) --- .../ziine/android/presentation/MainActivity.kt | 14 ++++++++++++++ .../android/presentation/splash/SplashActivity.kt | 12 ++---------- .../android/presentation/splash/SplashScreen.kt | 2 +- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/presentation/src/main/kotlin/com/nexters/ziine/android/presentation/MainActivity.kt b/presentation/src/main/kotlin/com/nexters/ziine/android/presentation/MainActivity.kt index 94ed7ef..1f5711b 100644 --- a/presentation/src/main/kotlin/com/nexters/ziine/android/presentation/MainActivity.kt +++ b/presentation/src/main/kotlin/com/nexters/ziine/android/presentation/MainActivity.kt @@ -4,13 +4,27 @@ import android.os.Bundle import androidx.activity.ComponentActivity import androidx.activity.compose.setContent import androidx.activity.enableEdgeToEdge +import androidx.compose.runtime.DisposableEffect +import com.nexters.ziine.android.presentation.ui.theme.Gray900 import com.nexters.ziine.android.presentation.ui.theme.ZiineTheme +import tech.thdev.compose.exteions.system.ui.controller.rememberExSystemUiController class MainActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) enableEdgeToEdge() setContent { + val systemUiController = rememberExSystemUiController() + + DisposableEffect(systemUiController) { + systemUiController.setSystemBarsColor( + color = Gray900, + darkIcons = false, + ) + + onDispose {} + } + ZiineTheme { ZiineApp() } diff --git a/presentation/src/main/kotlin/com/nexters/ziine/android/presentation/splash/SplashActivity.kt b/presentation/src/main/kotlin/com/nexters/ziine/android/presentation/splash/SplashActivity.kt index 013ea9e..edc94f9 100644 --- a/presentation/src/main/kotlin/com/nexters/ziine/android/presentation/splash/SplashActivity.kt +++ b/presentation/src/main/kotlin/com/nexters/ziine/android/presentation/splash/SplashActivity.kt @@ -11,7 +11,6 @@ import androidx.compose.runtime.LaunchedEffect import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen import com.nexters.ziine.android.presentation.MainActivity import com.nexters.ziine.android.presentation.common.extensions.startActivityWithAnimation -import com.nexters.ziine.android.presentation.ui.theme.Gray900 import com.nexters.ziine.android.presentation.ui.theme.Primary500 import com.nexters.ziine.android.presentation.ui.theme.ZiineTheme import dagger.hilt.android.AndroidEntryPoint @@ -34,23 +33,16 @@ class SplashActivity : ComponentActivity() { systemUiController.setSystemBarsColor( color = Primary500, darkIcons = false, - isNavigationBarContrastEnforced = false, ) - onDispose { - systemUiController.setSystemBarsColor( - color = Gray900, - darkIcons = false, - isNavigationBarContrastEnforced = false, - ) - } + onDispose {} } LaunchedEffect(key1 = Unit) { delay(500) activity?.startActivityWithAnimation( withFinish = true, - intentBuilder = { this } + intentBuilder = { this }, ) } diff --git a/presentation/src/main/kotlin/com/nexters/ziine/android/presentation/splash/SplashScreen.kt b/presentation/src/main/kotlin/com/nexters/ziine/android/presentation/splash/SplashScreen.kt index 44bffe3..d20d6cf 100644 --- a/presentation/src/main/kotlin/com/nexters/ziine/android/presentation/splash/SplashScreen.kt +++ b/presentation/src/main/kotlin/com/nexters/ziine/android/presentation/splash/SplashScreen.kt @@ -14,7 +14,7 @@ import com.nexters.ziine.android.presentation.R import com.nexters.ziine.android.presentation.ui.theme.Subtitle1 @Composable -fun SplashScreen(modifier: Modifier = Modifier,) { +fun SplashScreen(modifier: Modifier = Modifier) { Surface( modifier = modifier.fillMaxSize(), color = MaterialTheme.colorScheme.primary,