Add MissionMateTopAppBar on BoardSetup and Invitation screen.

Nexters · Aug 7, 2024 · 9ce1991 · 9ce1991
1 parent bc03657
commit 9ce1991
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 27 deletions.
diff --git a/...m/src/main/java/com/goalpanzi/mission_mate/core/designsystem/theme/component/AppTopBar.kt b/...m/src/main/java/com/goalpanzi/mission_mate/core/designsystem/theme/component/AppTopBar.kt
@@ -70,7 +70,7 @@ fun MissionMateTopAppBar(
         Box(
             modifier = Modifier
                 .fillMaxWidth()
-                .height(98.dp)
+                .height(56.dp)
                 .background(containerColor)
                 .padding(horizontal = 12.dp)
         ) {

diff --git a/feature/main/src/main/java/com/goalpanzi/mission_mate/core/main/MainActivity.kt b/feature/main/src/main/java/com/goalpanzi/mission_mate/core/main/MainActivity.kt
@@ -1,7 +1,9 @@
 package com.goalpanzi.mission_mate.core.main
 
+import android.graphics.Color
 import android.os.Bundle
 import androidx.activity.ComponentActivity
+import androidx.activity.SystemBarStyle
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
@@ -17,7 +19,9 @@ class MainActivity : ComponentActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        enableEdgeToEdge()
+        enableEdgeToEdge(
+            statusBarStyle = SystemBarStyle.light(Color.TRANSPARENT, Color.TRANSPARENT)
+        )
         setContent {
             val navigator: MainNavigator = rememberMainNavigator()
             MissionmateTheme {

diff --git a/...n/java/com/goalpanzi/mission_mate/feature/onboarding/component/BoardSetupNavigationBar.kt b/...n/java/com/goalpanzi/mission_mate/feature/onboarding/component/BoardSetupNavigationBar.kt
@@ -3,20 +3,18 @@ package com.goalpanzi.mission_mate.feature.onboarding.component
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.wrapContentHeight
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.KeyboardArrowLeft
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.goalpanzi.mission_mate.core.designsystem.theme.ColorGray1_FF404249
+import com.goalpanzi.mission_mate.core.designsystem.theme.ColorWhite_FFFFFFFF
 import com.goalpanzi.mission_mate.core.designsystem.theme.MissionMateTypography
+import com.goalpanzi.mission_mate.core.designsystem.theme.component.MissionMateTopAppBar
+import com.goalpanzi.mission_mate.core.designsystem.theme.component.NavigationType
 import com.goalpanzi.mission_mate.feature.onboarding.R
 
 @Composable
@@ -29,16 +27,12 @@ fun BoardSetupNavigationBar(
     Column(
         modifier = modifier
     ) {
-        IconButton(
-            modifier = Modifier.padding(start = 4.dp),
-            onClick = onBackClick
-        ) {
-            Icon(
-                modifier = Modifier.size(24.dp),
-                imageVector = Icons.Default.KeyboardArrowLeft, // merge 전까지 임시 사용
-                contentDescription = null
-            )
-        }
+        MissionMateTopAppBar(
+            modifier = modifier,
+            navigationType = NavigationType.BACK,
+            onNavigationClick = onBackClick,
+            containerColor = ColorWhite_FFFFFFFF
+        )
         Row(
             modifier = Modifier.padding(start = 16.dp,bottom = 16.dp, end = 24.dp),
             verticalAlignment = Alignment.CenterVertically

diff --git a/...a/com/goalpanzi/mission_mate/feature/onboarding/screen/invitation/InvitationCodeScreen.kt b/...a/com/goalpanzi/mission_mate/feature/onboarding/screen/invitation/InvitationCodeScreen.kt
@@ -48,6 +48,8 @@ import com.goalpanzi.mission_mate.core.designsystem.theme.ColorOrange_FFFF5732
 import com.goalpanzi.mission_mate.core.designsystem.theme.ColorRed_FFFF5858
 import com.goalpanzi.mission_mate.core.designsystem.theme.ColorWhite_FFFFFFFF
 import com.goalpanzi.mission_mate.core.designsystem.theme.MissionMateTypography
+import com.goalpanzi.mission_mate.core.designsystem.theme.component.MissionMateTopAppBar
+import com.goalpanzi.mission_mate.core.designsystem.theme.component.NavigationType
 import com.goalpanzi.mission_mate.feature.onboarding.R
 import com.goalpanzi.mission_mate.feature.onboarding.component.InvitationCodeTextField
 import com.goalpanzi.mission_mate.feature.onboarding.model.CodeResultEvent
@@ -161,16 +163,12 @@ fun InvitationCodeScreen(
             .statusBarsPadding()
             .navigationBarsPadding()
     ) {
-        IconButton(
-            modifier = Modifier.padding(start = 4.dp),
-            onClick = onBackClick
-        ) {
-            Icon(
-                modifier = Modifier.size(24.dp),
-                imageVector = Icons.Default.KeyboardArrowLeft, // merge 전까지 임시 사용
-                contentDescription = null
-            )
-        }
+        MissionMateTopAppBar(
+            modifier = modifier,
+            navigationType = NavigationType.BACK,
+            onNavigationClick = onBackClick,
+            containerColor = ColorWhite_FFFFFFFF,
+        )
         Text(
             text = stringResource(id = R.string.onboarding_invitation_title),
             modifier = Modifier.padding(start = 24.dp, end = 24.dp, bottom = 22.dp),