Merge pull request #755 from Team-WSS/feat/754

m6z1 · web-flow · commit f35c65912f79 · 2025-09-11T22:27:51.000+09:00
fix: EdgeToEdge 대응
diff --git a/app/src/main/java/com/into/websoso/core/common/ui/base/BaseActivity.kt b/app/src/main/java/com/into/websoso/core/common/ui/base/BaseActivity.kt
@@ -5,6 +5,7 @@ import androidx.activity.enableEdgeToEdge
 import androidx.annotation.LayoutRes
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.ViewCompat
+import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.updatePadding
 import androidx.databinding.DataBindingUtil
@@ -30,7 +31,11 @@ abstract class BaseActivity<B : ViewDataBinding>(
                 left = bars.left,
                 right = bars.right,
             )
-            insets
+            WindowInsetsCompat.CONSUMED
+        }
+        WindowCompat.getInsetsController(this.window, this.window.decorView).apply {
+            isAppearanceLightStatusBars = true
+            isAppearanceLightNavigationBars = true
         }
     }
 }
diff --git a/app/src/main/java/com/into/websoso/core/common/util/ExtentionFuction.kt b/app/src/main/java/com/into/websoso/core/common/util/ExtentionFuction.kt
@@ -15,7 +15,6 @@ import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.toArgb
 import androidx.core.view.WindowCompat
 import androidx.datastore.core.DataStore
 import androidx.datastore.core.handlers.ReplaceFileCorruptionHandler
@@ -31,7 +30,6 @@ import androidx.lifecycle.repeatOnLifecycle
 import com.into.websoso.BuildConfig
 import com.into.websoso.core.common.ui.custom.WebsosoCustomSnackBar
 import com.into.websoso.core.common.ui.custom.WebsosoCustomToast
-import com.into.websoso.core.designsystem.theme.White
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.launch
 import java.io.Serializable
@@ -163,10 +161,9 @@ fun <T> Flow<T>.collectWithLifecycle(
     }
 }
 
-fun Activity.setupWhiteStatusBar() {
-    this.window.statusBarColor = White.toArgb()
-
+fun Activity.setupSystemBarIconColor(isLightMode: Boolean) {
     WindowCompat.getInsetsController(this.window, this.window.decorView).apply {
-        isAppearanceLightStatusBars = true
+        isAppearanceLightStatusBars = isLightMode
+        isAppearanceLightNavigationBars = isLightMode
     }
 }
diff --git a/app/src/main/java/com/into/websoso/ui/expandedFeedImage/ExpandedFeedImageActivity.kt b/app/src/main/java/com/into/websoso/ui/expandedFeedImage/ExpandedFeedImageActivity.kt
@@ -5,20 +5,20 @@ import android.content.Intent
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import com.into.websoso.core.common.ui.model.ResultFrom
-import com.into.websoso.core.common.util.setupWhiteStatusBar
 import com.into.websoso.core.designsystem.theme.WebsosoTheme
 
 class ExpandedFeedImageActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        this.setupWhiteStatusBar()
-
+        enableEdgeToEdge()
         setContent {
             WebsosoTheme {
                 ExpandedFeedImageScreen(
                     index = intent.getIntExtra(FEED_IMAGE_INDEX, 0),
-                    imageUrls = intent.getStringArrayListExtra(FEED_IMAGE_URLS) ?: return@WebsosoTheme,
+                    imageUrls = intent.getStringArrayListExtra(FEED_IMAGE_URLS)
+                        ?: return@WebsosoTheme,
                     onBackButtonClick = {
                         setResult(ResultFrom.Notification.RESULT_OK)
                         finish()
diff --git a/app/src/main/java/com/into/websoso/ui/expandedFeedImage/ExpandedFeedImageScreen.kt b/app/src/main/java/com/into/websoso/ui/expandedFeedImage/ExpandedFeedImageScreen.kt
@@ -3,10 +3,13 @@ package com.into.websoso.ui.expandedFeedImage
 import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.systemBars
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.pager.HorizontalPager
 import androidx.compose.foundation.pager.PagerState
 import androidx.compose.foundation.pager.rememberPagerState
@@ -40,7 +43,8 @@ fun ExpandedFeedImageScreen(
     Box(
         modifier = Modifier
             .fillMaxSize()
-            .background(ExpandedFeedImageBackground),
+            .background(color = ExpandedFeedImageBackground)
+            .windowInsetsPadding(WindowInsets.systemBars),
     ) {
         HorizontalPager(
             state = pagerState,
diff --git a/app/src/main/java/com/into/websoso/ui/login/LoginActivity.kt b/app/src/main/java/com/into/websoso/ui/login/LoginActivity.kt
@@ -5,23 +5,23 @@ import android.content.Intent
 import android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK
 import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
 import android.os.Bundle
+import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
-import androidx.appcompat.app.AppCompatActivity
 import com.google.firebase.Firebase
 import com.google.firebase.analytics.FirebaseAnalytics
 import com.google.firebase.analytics.analytics
-import com.into.websoso.R.layout.activity_login
 import com.into.websoso.core.auth.AuthClient
 import com.into.websoso.core.auth.AuthPlatform
 import com.into.websoso.core.common.navigator.NavigatorProvider
+import com.into.websoso.core.common.util.setupSystemBarIconColor
 import com.into.websoso.core.designsystem.theme.WebsosoTheme
 import com.into.websoso.feature.signin.SignInScreen
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class LoginActivity : AppCompatActivity(activity_login) {
+class LoginActivity : ComponentActivity() {
     // TODO: CompositionLocal로 주입
     private val firebaseAnalytics: FirebaseAnalytics = Firebase.analytics
 
@@ -33,8 +33,8 @@ class LoginActivity : AppCompatActivity(activity_login) {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
         enableEdgeToEdge()
+        setupSystemBarIconColor(true)
         setContent {
             WebsosoTheme {
                 SignInScreen(
diff --git a/app/src/main/java/com/into/websoso/ui/main/MainActivity.kt b/app/src/main/java/com/into/websoso/ui/main/MainActivity.kt
@@ -8,7 +8,6 @@ import android.view.View
 import androidx.activity.OnBackPressedCallback
 import androidx.activity.viewModels
 import androidx.annotation.IntegerRes
-import androidx.core.view.WindowCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.commit
 import com.into.websoso.R.id.fcv_main
@@ -52,7 +51,6 @@ class MainActivity : BaseActivity<ActivityMainBinding>(activity_main) {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        WindowCompat.setDecorFitsSystemWindows(window, false)
 
         setupBackButtonListener()
         setupBottomNavigationView()
diff --git a/app/src/main/java/com/into/websoso/ui/notification/NotificationActivity.kt b/app/src/main/java/com/into/websoso/ui/notification/NotificationActivity.kt
@@ -8,7 +8,7 @@ import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
 import com.into.websoso.core.common.ui.model.ResultFrom
-import com.into.websoso.core.common.util.setupWhiteStatusBar
+import com.into.websoso.core.common.util.setupSystemBarIconColor
 import com.into.websoso.core.designsystem.theme.WebsosoTheme
 import com.into.websoso.ui.feedDetail.FeedDetailActivity
 import com.into.websoso.ui.notification.model.NotificationModel
@@ -22,8 +22,7 @@ class NotificationActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
-        this.setupWhiteStatusBar()
-
+        setupSystemBarIconColor(true)
         setContent {
             WebsosoTheme {
                 NotificationScreen(
diff --git a/app/src/main/java/com/into/websoso/ui/notificationDetail/NotificationDetailActivity.kt b/app/src/main/java/com/into/websoso/ui/notificationDetail/NotificationDetailActivity.kt
@@ -8,7 +8,7 @@ import androidx.activity.addCallback
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
-import com.into.websoso.core.common.util.setupWhiteStatusBar
+import com.into.websoso.core.common.util.setupSystemBarIconColor
 import com.into.websoso.core.designsystem.theme.WebsosoTheme
 import dagger.hilt.android.AndroidEntryPoint
 
@@ -19,7 +19,7 @@ class NotificationDetailActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
-        this.setupWhiteStatusBar()
+        setupSystemBarIconColor(true)
 
         handleBackPressed()
 
diff --git a/app/src/main/java/com/into/websoso/ui/splash/SplashActivity.kt b/app/src/main/java/com/into/websoso/ui/splash/SplashActivity.kt
@@ -5,10 +5,11 @@ import android.os.Bundle
 import android.provider.Settings.Secure.ANDROID_ID
 import android.provider.Settings.Secure.getString
 import androidx.activity.viewModels
-import androidx.appcompat.app.AppCompatActivity
 import com.into.websoso.R
 import com.into.websoso.core.common.navigator.NavigatorProvider
+import com.into.websoso.core.common.ui.base.BaseActivity
 import com.into.websoso.core.common.util.collectWithLifecycle
+import com.into.websoso.databinding.ActivitySplashBinding
 import com.into.websoso.ui.splash.UiEffect.NavigateToLogin
 import com.into.websoso.ui.splash.UiEffect.NavigateToMain
 import com.into.websoso.ui.splash.UiEffect.ShowDialog
@@ -17,7 +18,7 @@ import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class SplashActivity : AppCompatActivity(R.layout.activity_splash) {
+class SplashActivity : BaseActivity<ActivitySplashBinding>(R.layout.activity_splash) {
     @Inject
     lateinit var websosoNavigator: NavigatorProvider
 
diff --git a/app/src/main/java/com/into/websoso/ui/userStorage/UserStorageActivity.kt b/app/src/main/java/com/into/websoso/ui/userStorage/UserStorageActivity.kt
@@ -7,6 +7,7 @@ import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
@@ -16,7 +17,9 @@ import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.material3.Scaffold
 import androidx.compose.ui.Modifier
 import com.into.websoso.core.common.navigator.NavigatorProvider
+import com.into.websoso.core.common.util.setupSystemBarIconColor
 import com.into.websoso.core.designsystem.theme.WebsosoTheme
+import com.into.websoso.core.designsystem.theme.White
 import com.into.websoso.feature.library.LibraryScreen
 import com.into.websoso.feature.library.LibraryViewModel
 import dagger.hilt.android.AndroidEntryPoint
@@ -31,11 +34,13 @@ class UserStorageActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
+        setupSystemBarIconColor(true)
         setContent {
             WebsosoTheme {
                 Scaffold(
                     modifier = Modifier
                         .fillMaxSize()
+                        .background(color = White)
                         .windowInsetsPadding(WindowInsets.systemBars),
                 ) { inner ->
                     Box(modifier = Modifier.padding(inner)) {
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml
@@ -1,30 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@drawable/img_splash_background"
-    tools:context=".ui.splash.SplashActivity">
+    xmlns:tools="http://schemas.android.com/tools">
 
-    <ImageView
-        android:layout_width="86dp"
-        android:layout_height="0dp"
-        android:src="@drawable/ic_splash_icon"
-        app:layout_constraintBottom_toTopOf="@id/iv_splash_typo"
-        app:layout_constraintDimensionRatio="1"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+    <data>
 
-    <ImageView
-        android:id="@+id/iv_splash_typo"
-        android:layout_width="144dp"
-        android:layout_height="42dp"
-        android:layout_marginBottom="30dp"
-        android:src="@drawable/ic_splash_typo"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+    </data>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/img_splash_background"
+        tools:context=".ui.splash.SplashActivity">
+
+        <ImageView
+            android:layout_width="86dp"
+            android:layout_height="0dp"
+            android:src="@drawable/ic_splash_icon"
+            app:layout_constraintBottom_toTopOf="@id/iv_splash_typo"
+            app:layout_constraintDimensionRatio="1"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <ImageView
+            android:id="@+id/iv_splash_typo"
+            android:layout_width="144dp"
+            android:layout_height="42dp"
+            android:layout_marginBottom="30dp"
+            android:src="@drawable/ic_splash_typo"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
diff --git a/feature/signin/src/main/java/com/into/websoso/feature/signin/SignInScreen.kt b/feature/signin/src/main/java/com/into/websoso/feature/signin/SignInScreen.kt
@@ -4,11 +4,10 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.navigationBars
-import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.systemBars
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.pager.PagerState
 import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.runtime.Composable
@@ -82,11 +81,7 @@ private fun SignInScreen(
         modifier = Modifier
             .fillMaxSize()
             .background(color = Gray50)
-            .padding(
-                bottom = WindowInsets.navigationBars
-                    .asPaddingValues()
-                    .calculateBottomPadding(),
-            ),
+            .windowInsetsPadding(WindowInsets.systemBars),
     ) {
         Spacer(modifier = Modifier.weight(weight = 1f))
         OnboardingHorizontalPager(pagerState = pagerState)

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ import androidx.activity.enableEdgeToEdge`
`5`	`5`	`import androidx.annotation.LayoutRes`
`6`	`6`	`import androidx.appcompat.app.AppCompatActivity`
`7`	`7`	`import androidx.core.view.ViewCompat`
	`8`	`+import androidx.core.view.WindowCompat`
`8`	`9`	`import androidx.core.view.WindowInsetsCompat`
`9`	`10`	`import androidx.core.view.updatePadding`
`10`	`11`	`import androidx.databinding.DataBindingUtil`
`@@ -30,7 +31,11 @@ abstract class BaseActivity<B : ViewDataBinding>(`
`30`	`31`	`left = bars.left,`
`31`	`32`	`right = bars.right,`
`32`	`33`	`)`
`33`		`- insets`
	`34`	`+ WindowInsetsCompat.CONSUMED`
	`35`	`+ }`
	`36`	`+ WindowCompat.getInsetsController(this.window, this.window.decorView).apply {`
	`37`	`+ isAppearanceLightStatusBars = true`
	`38`	`+ isAppearanceLightNavigationBars = true`
`34`	`39`	`}`
`35`	`40`	`}`
`36`	`41`	`}`