[FEAT/#15] 가운데 정렬 수정 및 null 체크 로직 변경

teamterning · Jul 7, 2024 · 95051f8 · 95051f8
1 parent 31bf20d
commit 95051f8
Show file tree

Hide file tree

Showing 8 changed files with 50 additions and 39 deletions.
diff --git a/core/src/main/java/com/terning/core/designsystem/topappbar/LogoTopAppBar.kt b/core/src/main/java/com/terning/core/designsystem/topappbar/LogoTopAppBar.kt
@@ -10,7 +10,7 @@ import com.terning.core.R
 fun LogoTopAppBar() {
     TerningTopAppBar(
         showBackButton = false,
-        customActions = listOf {
+        actions = listOf {
             Icon(
                 painter = painterResource(id = R.drawable.ic_logo),
                 contentDescription = stringResource(id = R.string.ic_logo),

diff --git a/core/src/main/java/com/terning/core/designsystem/topappbar/MyPageTopAppBar.kt b/core/src/main/java/com/terning/core/designsystem/topappbar/MyPageTopAppBar.kt
@@ -16,7 +16,7 @@ import com.terning.core.designsystem.theme.TerningTypography
 fun MyPageTopAppBar() {
     TerningTopAppBar(
         showBackButton = false,
-        customActions = listOf(
+        actions = listOf(
             {},
             {
                 Row(

diff --git a/core/src/main/java/com/terning/core/designsystem/topappbar/TerningTopAppBar.kt b/core/src/main/java/com/terning/core/designsystem/topappbar/TerningTopAppBar.kt
@@ -21,19 +21,18 @@ import com.terning.core.designsystem.theme.TerningTypography
 fun TerningTopAppBar(
     title: String = "",
     showBackButton: Boolean = false,
-    customActions: List<@Composable () -> Unit> = emptyList(),
+    actions: List<@Composable () -> Unit> = emptyList(),
     onBackButtonClick: () -> Unit = {},
 ) {
     CenterAlignedTopAppBar(
         title = {
-            Box(Modifier.fillMaxWidth()) {
-                Text(
-                    text = title,
-                    modifier = Modifier.align(Alignment.Center),
-                    textAlign = TextAlign.Center,
-                    style = TerningTypography().title2
-                )
-            }
+
+            Text(
+                text = title,
+                textAlign = TextAlign.Center,
+                style = TerningTypography().title2
+            )
+
         },
         navigationIcon = {
             if (showBackButton) {
@@ -46,12 +45,12 @@ fun TerningTopAppBar(
                     )
                 }
             } else {
-                customActions.getOrNull(0)?.invoke()
+                actions.getOrNull(0)?.invoke()
             }
         },
         actions = {
-            customActions.drop(1).forEach { customAction ->
-                customAction()
+            actions.drop(1).forEach { action ->
+                action()
             }
         },
     )

diff --git a/feature/src/main/java/com/terning/feature/main/MainNavigator.kt b/feature/src/main/java/com/terning/feature/main/MainNavigator.kt
@@ -10,6 +10,7 @@ import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.navOptions
 import com.terning.feature.calendar.navigation.navigateCalendar
+import com.terning.feature.home.navigation.Home
 import com.terning.feature.home.navigation.navigateHome
 import com.terning.feature.mypage.navigation.navigateMyPage
 import com.terning.feature.onboarding.signin.navigation.SignIn
@@ -22,7 +23,7 @@ class MainNavigator(
         @Composable get() = navController
             .currentBackStackEntryAsState().value?.destination
 
-    val startDestination = SignIn
+    val startDestination = Home
 
     val currentTab: MainTab?
         @Composable get() = MainTab.find { tab ->

diff --git a/feature/src/main/java/com/terning/feature/main/MainScreen.kt b/feature/src/main/java/com/terning/feature/main/MainScreen.kt
@@ -21,10 +21,11 @@ import androidx.navigation.compose.NavHost
 import com.terning.core.designsystem.theme.Grey300
 import com.terning.core.designsystem.theme.TerningMain
 import com.terning.core.designsystem.theme.White
-import com.terning.feature.calendar.navigation.calendarNavGraph
+import com.terning.core.designsystem.topappbar.BackButtonTopAppBar
 import com.terning.core.designsystem.topappbar.LogoTopAppBar
 import com.terning.core.designsystem.topappbar.MyPageTopAppBar
 import com.terning.core.designsystem.topappbar.TerningTopAppBar
+import com.terning.feature.calendar.navigation.calendarNavGraph
 import com.terning.feature.home.navigation.homeNavGraph
 import com.terning.feature.mypage.navigation.myPageNavGraph
 import com.terning.feature.onboarding.signin.navigation.signInNavGraph
@@ -41,10 +42,13 @@ fun MainScreen(
         topBar = {
             when (navigator.currentTab) {
                 MainTab.HOME -> LogoTopAppBar()
-                MainTab.CALENDAR -> TerningTopAppBar()
+                MainTab.CALENDAR -> BackButtonTopAppBar(
+                    title = "dkssud",
+                    onBackButtonClick = { navigator.navigateUp() })
+
                 MainTab.SEARCH -> LogoTopAppBar()
                 MainTab.MY_PAGE -> MyPageTopAppBar()
-                null -> LogoTopAppBar()
+                null -> TerningTopAppBar()
             }
         },
         bottomBar = {

diff --git a/feature/src/main/java/com/terning/feature/mypage/MyPageRoute.kt b/feature/src/main/java/com/terning/feature/mypage/MyPageRoute.kt
@@ -14,6 +14,7 @@ import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.flowWithLifecycle
+import com.terning.core.designsystem.topappbar.MyPageTopAppBar
 import com.terning.core.extension.toast
 import com.terning.core.state.UiState
 import com.terning.domain.entity.response.MockResponseModel
@@ -46,13 +47,13 @@ fun MyPageRoute(
         is UiState.Loading -> {}
         is UiState.Failure -> {}
         is UiState.Success -> {
-            MockScreen(mockList = (state.followers as UiState.Success<List<MockResponseModel>>).data)
+            MyPageScreen(mockList = (state.followers as UiState.Success<List<MockResponseModel>>).data)
         }
     }
 }
 
 @Composable
-fun MockScreen(
+fun MyPageScreen(
     mockList: List<MockResponseModel>,
 ) {
     LazyColumn(

diff --git a/feature/src/main/java/com/terning/feature/search/SearchRoute.kt b/feature/src/main/java/com/terning/feature/search/SearchRoute.kt
@@ -0,0 +1,25 @@
+package com.terning.feature.search
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import com.terning.core.designsystem.topappbar.LogoTopAppBar
+
+@Composable
+fun SearchRoute() {
+    SearchScreen()
+}
+
+@Composable
+fun SearchScreen(modifier: Modifier = Modifier) {
+    Column(
+        modifier = Modifier
+            .fillMaxWidth()
+    ) {
+        Text(text = "탐색 스크린")
+    }
+}
diff --git a/feature/src/main/java/com/terning/feature/search/SearchRouth.kt b/feature/src/main/java/com/terning/feature/search/SearchRouth.kt