[Feature/#183] android 15

app/build.gradle.kts

@@ -25,7 +25,7 @@ fun String.removeQuotes(): String {
 
 android {
     namespace = "com.teamwable.wable"
-    compileSdk = 34
+    compileSdk = libs.versions.compileSdk.get().toInt()
 
     defaultConfig {
         applicationId = "com.teamwable.wable"

core/ui/src/main/java/com/teamwable/ui/extensions/ContextExt.kt

@@ -98,14 +98,6 @@ fun Context.pxToDp(px: Int): Int {
     ).toInt()
 }
 
-fun Context.statusBarColorOf(
-    @ColorRes resId: Int,
-) {
-    if (this is Activity) {
-        window?.statusBarColor = colorOf(resId)
-    }
-}
-
 fun Context.statusBarModeOf(isLightStatusBar: Boolean = true) {
     if (this is Activity) {
         window.apply {

core/ui/src/main/java/com/teamwable/ui/extensions/FragmentExt.kt

@@ -46,12 +46,6 @@ val Fragment.viewLifeCycle
 val Fragment.viewLifeCycleScope
     get() = viewLifecycleOwner.lifecycleScope
 
-fun Fragment.statusBarColorOf(
-    @ColorRes resId: Int,
-) {
-    requireActivity().statusBarColorOf(resId)
-}
-
 fun Fragment.openUri(uri: String) {
     Intent(Intent.ACTION_VIEW, Uri.parse(uri)).also {
         runCatching { startActivity(it) }

core/ui/src/main/java/com/teamwable/ui/extensions/ViewExt.kt

@@ -0,0 +1,23 @@
+package com.teamwable.ui.extensions
+
+import android.view.View
+import androidx.annotation.ColorRes
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updateLayoutParams
+
+fun View.visible(isVisible: Boolean) {
+    this.visibility = if (isVisible) View.VISIBLE else View.GONE
+}
+
+fun View.setStatusBarColor(@ColorRes resId: Int) {
+    setBackgroundResource(resId)
+
+    ViewCompat.setOnApplyWindowInsetsListener(this.rootView) { _, windowInsets ->
+        val insets = windowInsets.getInsets(WindowInsetsCompat.Type.statusBars())
+        updateLayoutParams {
+            height = insets.top
+        }
+        windowInsets
+    }
+}

core/ui/src/main/res/values/themes.xml

@@ -1,7 +1,8 @@
 <resources>
     <!-- Base application theme. -->
     <style name="Base.Theme.Wable" parent="Theme.Material3.Light.NoActionBar">
-        <item name="android:statusBarColor">@android:color/white</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="android:windowLightStatusBar">true</item>
         <item name="android:windowBackground">@color/white</item>
         <item name="android:windowIsTranslucent">true</item>

feature/auth/src/main/java/com/teamwable/auth/LoginScreen.kt

@@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.aspectRatio
 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.material3.Text
 import androidx.compose.runtime.Composable
@@ -37,8 +38,6 @@ import com.teamwable.common.util.AmplitudeSignInTag.CLICK_SIGNIN_KAKAO
 import com.teamwable.common.util.AmplitudeUtil.trackEvent
 import com.teamwable.designsystem.component.dialog.WableOneButtonDialog
 import com.teamwable.designsystem.extension.modifier.noRippleDebounceClickable
-import com.teamwable.designsystem.extension.system.SetStatusBarColor
-import com.teamwable.designsystem.theme.SystemLoginSystemAppBar
 import com.teamwable.designsystem.theme.WableTheme
 import com.teamwable.designsystem.type.DialogType
 
@@ -88,8 +87,6 @@ fun LoginRoute(
 fun LoginScreen(
     onLoginBtnClick: () -> Unit,
 ) {
-    SetStatusBarColor(color = SystemLoginSystemAppBar)
-
     val configuration = LocalConfiguration.current
     val screenHeightPx = with(LocalDensity.current) { configuration.screenHeightDp.dp.toPx() }
     val halfScreenHeightPx = screenHeightPx * 0.514f
@@ -156,6 +153,8 @@ fun LoginScreen(
                 .aspectRatio(6.56f)
                 .noRippleDebounceClickable { onLoginBtnClick() },
         )
+
+        Spacer(modifier = Modifier.navigationBarsPadding())
     }
 }
 

feature/main-compose/src/main/java/com/teamwable/main_compose/MainComposeActivity.kt

@@ -5,12 +5,10 @@ import android.content.pm.ActivityInfo
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import com.teamwable.common.di.MAIN
 import com.teamwable.common.intentprovider.IntentProvider
-import com.teamwable.designsystem.extension.system.SetLightNavigationBar
-import com.teamwable.designsystem.extension.system.SetStatusBarColor
 import com.teamwable.designsystem.theme.WableTheme
-import com.teamwable.designsystem.theme.WableTheme.colors
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
@@ -23,12 +21,11 @@ class MainComposeActivity : ComponentActivity() {
     @SuppressLint("SourceLockedOrientationActivity")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
         requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
         setContent {
             WableTheme {
                 val navigator: MainNavigator = rememberMainNavigator()
-                SetStatusBarColor(color = colors.white)
-                SetLightNavigationBar()
                 MainScreen(
                     navigator = navigator,
                     intentProvider = intentProvider,

feature/main-compose/src/main/java/com/teamwable/main_compose/MainScreen.kt

@@ -4,6 +4,7 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
@@ -14,7 +15,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.zIndex
-import androidx.core.content.ContextCompat.startActivity
 import androidx.navigation.NavGraph.Companion.findStartDestination
 import androidx.navigation.compose.NavHost
 import androidx.navigation.navOptions
@@ -56,6 +56,7 @@ internal fun MainScreen(
     Scaffold(
         topBar = {
             WableAppBar(
+                modifier = Modifier.statusBarsPadding(),
                 visibility = navigator.shouldShowTopBar(),
                 canNavigateBack = navigator.isBackStackNotEmpty(),
                 navigateUp = { navigator.navigateUp() },
@@ -64,9 +65,11 @@ internal fun MainScreen(
         },
         content = { innerPadding ->
             Box(
-                modifier = Modifier
-                    .fillMaxSize()
-                    .padding(innerPadding),
+                modifier =
+                    if (!navigator.shouldShowTopBar()) Modifier.fillMaxSize()
+                    else Modifier
+                        .fillMaxSize()
+                        .padding(innerPadding),
             ) {
                 NavHost(
                     navController = navigator.navController,
@@ -84,11 +87,11 @@ internal fun MainScreen(
                                 navOptions = navOptions,
                             )
                         },
-                        navigateToHome = { startActivity(localContext, intent, null) },
+                        navigateToHome = { localContext.startActivity(intent) },
                     )
                     loginNavGraph(
                         navigateToFirstLckWatch = { navigator.navigateToFirstLckWatch() },
-                        navigateToHome = { startActivity(localContext, intent, null) },
+                        navigateToHome = { localContext.startActivity(intent) },
                         onShowErrorSnackBar = onShowErrorSnackBar,
                     )
                     firstLckWatchNavGraph(
@@ -104,7 +107,7 @@ internal fun MainScreen(
                         onShowErrorSnackBar = onShowErrorSnackBar,
                     )
                     agreeTermsNavGraph(
-                        navigateToHome = { startActivity(localContext, intent, null) },
+                        navigateToHome = { localContext.startActivity(intent) },
                         onShowErrorSnackBar = onShowErrorSnackBar,
                     )
                 }

feature/main-compose/src/main/java/com/teamwable/main_compose/splash/SplashScreen.kt

@@ -29,7 +29,7 @@ fun SplashRoute(
     val lifecycleOwner = LocalLifecycleOwner.current
     val composition by rememberLottieComposition(LottieCompositionSpec.RawRes(R.raw.wable_splash))
 
-    LaunchedEffect(Unit) {
+    LaunchedEffect(lifecycleOwner) {
         delay(2000)
         viewModel.observeAutoLogin()
     }

feature/main/src/main/java/com/teamwable/main/MainActivity.kt

@@ -5,6 +5,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.pm.ActivityInfo
 import android.os.Bundle
+import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
@@ -24,8 +25,8 @@ import com.teamwable.common.util.AmplitudeHomeTag.CLICK_NEWS_BOTNAVI
 import com.teamwable.common.util.AmplitudeUtil.trackEvent
 import com.teamwable.home.HomeFragment
 import com.teamwable.main.databinding.ActivityMainBinding
+import com.teamwable.ui.extensions.setStatusBarColor
 import com.teamwable.ui.extensions.showAlertDialog
-import com.teamwable.ui.extensions.statusBarColorOf
 import com.teamwable.ui.extensions.statusBarModeOf
 import com.teamwable.ui.extensions.toast
 import com.teamwable.ui.extensions.visible
@@ -63,6 +64,7 @@ class MainActivity : AppCompatActivity(), Navigation {
 
     @SuppressLint("SourceLockedOrientationActivity")
     override fun onCreate(savedInstanceState: Bundle?) {
+        enableEdgeToEdge()
         super.onCreate(savedInstanceState)
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
@@ -220,14 +222,14 @@ class MainActivity : AppCompatActivity(), Navigation {
         navController.addOnDestinationChangedListener { _, destination, _ ->
             when (destination.id) {
                 in darkStatusBarDestinations -> {
-                    statusBarColorOf(com.teamwable.ui.R.color.black)
+                    binding.statusBarBackground.setStatusBarColor(com.teamwable.ui.R.color.black)
                     statusBarModeOf(false)
                 }
 
                 in noStatusBarChangeDestinations -> Unit
 
                 else -> {
-                    statusBarColorOf(com.teamwable.ui.R.color.white)
+                    binding.statusBarBackground.setStatusBarColor(com.teamwable.ui.R.color.white)
                     statusBarModeOf()
                 }
             }

feature/main/src/main/res/layout/activity_main.xml

@@ -1,52 +1,63 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/fcv_main"
-        android:name="androidx.navigation.fragment.NavHostFragment"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:defaultNavHost="true"
-        app:layout_constraintBottom_toTopOf="@id/divider_main_bnv"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:navGraph="@navigation/graph_main" />
+    <View
+        android:id="@+id/status_bar_background"
+        android:layout_width="match_parent"
+        android:layout_height="0dp" />
 
-    <androidx.constraintlayout.widget.Group
-        android:id="@+id/group_main_bnv"
-        android:layout_width="wrap_content"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:constraint_referenced_ids="divider_main_bnv, bnv_main" />
+        android:fitsSystemWindows="true">
 
-    <com.google.android.material.divider.MaterialDivider
-        android:id="@+id/divider_main_bnv"
-        android:layout_width="0dp"
-        android:layout_height="1dp"
-        app:dividerColor="@color/gray_200"
-        app:layout_constraintBottom_toTopOf="@id/bnv_main"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        <androidx.fragment.app.FragmentContainerView
+            android:id="@+id/fcv_main"
+            android:name="androidx.navigation.fragment.NavHostFragment"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:defaultNavHost="true"
+            app:layout_constraintBottom_toTopOf="@id/divider_main_bnv"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:navGraph="@navigation/graph_main" />
 
-    <com.google.android.material.bottomnavigation.BottomNavigationView
-        android:id="@+id/bnv_main"
-        android:layout_width="0dp"
-        android:layout_height="84dp"
-        app:backgroundTint="@color/white"
-        app:itemActiveIndicatorStyle="@null"
-        app:itemPaddingBottom="25dp"
-        app:itemPaddingTop="13dp"
-        app:itemRippleColor="@color/white"
-        app:itemTextAppearanceActive="@style/TextAppearance.Wable.Caption5"
-        app:itemTextAppearanceActiveBoldEnabled="false"
-        app:itemTextAppearanceInactive="@style/TextAppearance.Wable.Caption5"
-        app:itemTextColor="@color/sel_main_bnv_menu_color"
-        app:labelVisibilityMode="labeled"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:menu="@menu/menu_main_navigation" />
-</androidx.constraintlayout.widget.ConstraintLayout>
+        <androidx.constraintlayout.widget.Group
+            android:id="@+id/group_main_bnv"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            app:constraint_referenced_ids="divider_main_bnv, bnv_main" />
+
+        <com.google.android.material.divider.MaterialDivider
+            android:id="@+id/divider_main_bnv"
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            app:dividerColor="@color/gray_200"
+            app:layout_constraintBottom_toTopOf="@id/bnv_main"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+
+        <com.google.android.material.bottomnavigation.BottomNavigationView
+            android:id="@+id/bnv_main"
+            android:layout_width="0dp"
+            android:layout_height="84dp"
+            app:backgroundTint="@color/white"
+            app:itemActiveIndicatorStyle="@null"
+            app:itemPaddingBottom="25dp"
+            app:itemPaddingTop="13dp"
+            app:itemRippleColor="@color/white"
+            app:itemTextAppearanceActive="@style/TextAppearance.Wable.Caption5"
+            app:itemTextAppearanceActiveBoldEnabled="false"
+            app:itemTextAppearanceInactive="@style/TextAppearance.Wable.Caption5"
+            app:itemTextColor="@color/sel_main_bnv_menu_color"
+            app:labelVisibilityMode="labeled"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:menu="@menu/menu_main_navigation" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</RelativeLayout>

feature/onboarding/src/main/java/com/teamwable/onboarding/firstlckwatch/FirstLckWatchScreen.kt

@@ -28,7 +28,6 @@ import androidx.lifecycle.flowWithLifecycle
 import com.teamwable.common.util.AmplitudeSignUpTag.CLICK_NEXT_YEAR_SIGNUP
 import com.teamwable.common.util.AmplitudeUtil.trackEvent
 import com.teamwable.designsystem.component.button.WableButton
-import com.teamwable.designsystem.extension.system.SetStatusBarColor
 import com.teamwable.designsystem.theme.WableTheme
 import com.teamwable.model.profile.MemberInfoEditModel
 import com.teamwable.onboarding.R
@@ -68,8 +67,6 @@ fun FirstLckWatchRoute(
 fun FirstLckWatchScreen(
     onNextBtnClick: (Int) -> Unit,
 ) {
-    SetStatusBarColor(color = WableTheme.colors.white)
-
     val options = (2012..2025).toImmutableList()
 
     var expanded by remember { mutableStateOf(false) }