Merge pull request #57 from rbqks529/ui/#55_typesafe_navigation

[FEAT] 네비게이션 연결 기초 세팅 완료

Author: rbqks529

app/build.gradle.kts

@@ -4,6 +4,7 @@ plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
+    alias(libs.plugins.kotlin.serialization)
 }
 
 android {
@@ -55,6 +56,7 @@ dependencies {
     implementation(libs.androidx.foundation)
     implementation(libs.androidx.lifecycle.viewmodel.compose)
     implementation(libs.androidx.navigation.runtime.android)
+    implementation(libs.kotlinx.serialization.json)
     implementation(libs.accompanist.pager)
     implementation(libs.accompanist.pager.indicators)
     testImplementation(libs.junit)

app/src/main/java/com/texthip/thip/MainScreen.kt

@@ -6,26 +6,29 @@ import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
 import com.texthip.thip.ui.navigator.BottomNavigationBar
 import com.texthip.thip.ui.navigator.MainNavHost
-import com.texthip.thip.ui.navigator.NavBarItems
+import com.texthip.thip.ui.navigator.extensions.isMainTabRoute
 
 @Composable
 fun MainScreen() {
     val navController = rememberNavController()
     val navBackStackEntry by navController.currentBackStackEntryAsState()
-    val currentRoute = navBackStackEntry?.destination?.route
-    val showBottomBar = currentRoute in NavBarItems.BarItems.map { it.route }
+    val currentDestination = navBackStackEntry?.destination
+
+    val showBottomBar = currentDestination?.isMainTabRoute() ?: true
 
     Scaffold(
         bottomBar = {
             if (showBottomBar) BottomNavigationBar(navController)
-        }
+        },
+        containerColor = Color.Transparent
     ) { innerPadding ->
         Box(modifier = Modifier.padding(innerPadding)) {
-            MainNavHost (navController)
+            MainNavHost(navController)
         }
     }
 }

app/src/main/java/com/texthip/thip/ui/common/alarmpage/screen/AlarmScreen.kt

@@ -72,16 +72,10 @@ fun AlarmScreen(
                     verticalArrangement = Arrangement.Center,
                     horizontalAlignment = Alignment.CenterHorizontally
                 ) {
-                    Icon(
-                        painter = painterResource(R.drawable.ic_notification),
-                        contentDescription = null,
-                        tint = colors.Grey02,
-                    )
-                    Spacer(modifier = Modifier.height(12.dp))
                     Text(
                         text = stringResource(R.string.alarm_notification_comment),
-                        style = typography.smalltitle_sb600_s16_h20,
-                        color = colors.Grey01
+                        style = typography.smalltitle_sb600_s18_h24,
+                        color = colors.White
                     )
                 }
             } else {

app/src/main/java/com/texthip/thip/ui/group/makeroom/screen/GroupMakeRoomScreen.kt

@@ -24,6 +24,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.lifecycle.viewmodel.compose.viewModel
 import com.texthip.thip.R
 import com.texthip.thip.ui.common.buttons.GenreChipRow
 import com.texthip.thip.ui.common.buttons.ToggleSwitchButton
@@ -36,13 +37,9 @@ import com.texthip.thip.ui.group.makeroom.component.GroupSelectBook
 import com.texthip.thip.ui.group.makeroom.component.GroupMemberLimitPicker
 import com.texthip.thip.ui.group.makeroom.component.SectionDivider
 import com.texthip.thip.ui.group.makeroom.mock.BookData
-import com.texthip.thip.ui.group.makeroom.mock.GroupMakeRoomRequest
 import com.texthip.thip.ui.group.makeroom.mock.dummyGroupBooks
 import com.texthip.thip.ui.group.makeroom.mock.dummySavedBooks
-import com.texthip.thip.ui.group.makeroom.viewmodel.ApiResult
-import com.texthip.thip.ui.group.makeroom.viewmodel.GroupCreateResponse
 import com.texthip.thip.ui.group.makeroom.viewmodel.GroupMakeRoomViewModel
-import com.texthip.thip.ui.group.makeroom.viewmodel.GroupRepository
 import com.texthip.thip.ui.theme.ThipTheme
 import com.texthip.thip.ui.theme.ThipTheme.colors
 import com.texthip.thip.ui.theme.ThipTheme.typography
@@ -238,15 +235,7 @@ fun GroupMakeRoomScreen(
 @Preview
 @Composable
 private fun GroupMakeRoomScreenPreview() {
-    // Preview용 MockViewModel 생성
-    val mockViewModel = object : GroupMakeRoomViewModel(MockGroupRepository()) {
-        // 필요한 경우 Preview용 초기 상태 설정
-        init {
-            // 예시: 미리 선택된 책이 있는 상태로 Preview
-            // selectBook(BookData(id = "1", title = "예시 책", author = "작가"))
-            // selectGenre(0)
-        }
-    }
+    val mockViewModel: GroupMakeRoomViewModel = viewModel()
 
     ThipTheme {
         GroupMakeRoomScreen(
@@ -256,16 +245,3 @@ private fun GroupMakeRoomScreenPreview() {
         )
     }
 }
-
-// Preview용 Mock Repository
-class MockGroupRepository : GroupRepository {
-    override suspend fun createGroup(request: GroupMakeRoomRequest): ApiResult<GroupCreateResponse> {
-        return ApiResult(
-            isSuccess = true,
-            data = GroupCreateResponse(
-                groupId = "mock_group_id",
-                groupName = "Mock Group"
-            )
-        )
-    }
-}

app/src/main/java/com/texthip/thip/ui/group/makeroom/viewmodel/GroupMakeRoomViewModel.kt

@@ -12,8 +12,8 @@ import kotlinx.coroutines.launch
 import java.time.LocalDate
 
 // 나중에 서버와 연동할 때 사용할 뷰모델 예시
-open class GroupMakeRoomViewModel(
-    private val groupRepository: GroupRepository // 의존성 주입
+class GroupMakeRoomViewModel(
+    private val groupRepository: GroupRepository = MockGroupRepository() // 기본값으로 Mock Repository 사용
 ) : ViewModel() {
 
     private val _uiState = MutableStateFlow(GroupMakeRoomUiState())
@@ -122,4 +122,18 @@ data class ApiResult<T>(
 data class GroupCreateResponse(
     val groupId: String,
     val groupName: String
-)
+)
+
+// Mock Repository 구현
+class MockGroupRepository : GroupRepository {
+    override suspend fun createGroup(request: GroupMakeRoomRequest): ApiResult<GroupCreateResponse> {
+        // 임시로 성공 응답 반환
+        return ApiResult(
+            isSuccess = true,
+            data = GroupCreateResponse(
+                groupId = "mock_group_${System.currentTimeMillis()}",
+                groupName = request.roomTitle
+            )
+        )
+    }
+}

app/src/main/java/com/texthip/thip/ui/group/screen/GroupScreen.kt

@@ -15,33 +15,31 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
-import androidx.navigation.NavHostController
 import com.texthip.thip.R
 import com.texthip.thip.ui.common.buttons.FloatingButton
 import com.texthip.thip.ui.common.topappbar.LogoTopAppBar
 import com.texthip.thip.ui.group.myroom.component.GroupMySectionHeader
 import com.texthip.thip.ui.group.myroom.component.GroupPager
 import com.texthip.thip.ui.group.myroom.component.GroupRoomDeadlineSection
 import com.texthip.thip.ui.group.myroom.component.GroupSearchTextField
-import com.texthip.thip.ui.group.myroom.mock.GroupViewModel
+import com.texthip.thip.ui.group.viewmodel.GroupViewModel
 import com.texthip.thip.ui.theme.ThipTheme
 import com.texthip.thip.ui.theme.ThipTheme.colors
 
 @Composable
 fun GroupScreen(
-    navController: NavHostController? = null,
+    onNavigateToMakeRoom: () -> Unit = {},
     viewModel: GroupViewModel = viewModel()
 ) {
     val myGroups by viewModel.myGroups.collectAsState()
     val roomSections by viewModel.roomSections.collectAsState()
     val scrollState = rememberScrollState()
-    var searchText by remember { mutableStateOf("") }
+    val searchText by remember { mutableStateOf("") }
 
     Box(
         Modifier
@@ -99,7 +97,7 @@ fun GroupScreen(
         // 오른쪽 하단 FAB
         FloatingButton(
             icon = painterResource(id = R.drawable.ic_makegroup),
-            onClick = { viewModel.onFabClick() }
+            onClick = onNavigateToMakeRoom
         )
     }
 }

…p/ui/group/myroom/mock/GroupViewModel.kt …hip/ui/group/viewmodel/GroupViewModel.ktapp/src/main/java/com/texthip/thip/ui/group/myroom/mock/GroupViewModel.kt renamed to app/src/main/java/com/texthip/thip/ui/group/viewmodel/GroupViewModel.kt app/src/main/java/com/texthip/thip/ui/group/myroom/mock/GroupViewModel.kt renamed to app/src/main/java/com/texthip/thip/ui/group/viewmodel/GroupViewModel.kt

@@ -1,7 +1,10 @@
-package com.texthip.thip.ui.group.myroom.mock
+package com.texthip.thip.ui.group.viewmodel
 
 import androidx.lifecycle.ViewModel
 import com.texthip.thip.R
+import com.texthip.thip.ui.group.myroom.mock.GroupCardData
+import com.texthip.thip.ui.group.myroom.mock.GroupCardItemRoomData
+import com.texthip.thip.ui.group.myroom.mock.GroupRoomSectionData
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 
@@ -84,7 +87,4 @@ class GroupViewModel : ViewModel() {
         // 방 카드 클릭 (상세 진입)
     }
 
-    fun onFabClick() {
-        // FAB 클릭(모임방 생성 등)
-    }
 }

app/src/main/java/com/texthip/thip/ui/mypage/screen/MypageScreen.kt

@@ -109,7 +109,7 @@ fun MyPageScreen(
                 )
                 MenuItemButton(
                     text = stringResource(R.string.notification_settings),
-                    icon = painterResource(R.drawable.ic_notification),
+                    icon = painterResource(R.drawable.ic_notice),
                     contentColor = colors.White,
                     backgroundColor = colors.DarkGrey02,
                     hasRightIcon = true,

app/src/main/java/com/texthip/thip/ui/navigator/BarItem.kt

@@ -17,17 +17,25 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.Path
+import androidx.compose.ui.graphics.drawscope.Stroke
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import androidx.navigation.NavController
+import androidx.navigation.NavHostController
 import androidx.navigation.compose.currentBackStackEntryAsState
+import com.texthip.thip.ui.navigator.data.NavBarItems
+import com.texthip.thip.ui.navigator.extensions.navigateToTab
+import com.texthip.thip.ui.navigator.extensions.isRoute
 import com.texthip.thip.ui.theme.ThipTheme.colors
 import com.texthip.thip.ui.theme.ThipTheme.typography
 
 @Composable
-fun BottomNavigationBar(navController: NavController) {
-    val currentRoute = navController.currentBackStackEntryAsState().value?.destination?.route
+fun BottomNavigationBar(navController: NavHostController) {
+    val currentDestination = navController.currentBackStackEntryAsState().value?.destination
+    val greyColor = colors.Grey02
 
     Box(
         modifier = Modifier
@@ -41,9 +49,48 @@ fun BottomNavigationBar(navController: NavController) {
                     bottomEnd = 0.dp
                 )
             )
-            .background(colors.Black),
+            .background(colors.Black)
+            .drawBehind {
+                val cornerRadius = 12.dp.toPx()
+                val strokeWidth = 2.dp.toPx()
+
+                val path = Path().apply {
+                    // 좌상단 모서리부터 시작
+                    moveTo(0f, cornerRadius)
+                    arcTo(
+                        rect = androidx.compose.ui.geometry.Rect(
+                            left = 0f,
+                            top = 0f,
+                            right = cornerRadius * 2,
+                            bottom = cornerRadius * 2
+                        ),
+                        startAngleDegrees = 180f,
+                        sweepAngleDegrees = 90f,
+                        forceMoveTo = false
+                    )
+                    lineTo(size.width - cornerRadius, 0f)
+                    arcTo(
+                        rect = androidx.compose.ui.geometry.Rect(
+                            left = size.width - cornerRadius * 2,
+                            top = 0f,
+                            right = size.width,
+                            bottom = cornerRadius * 2
+                        ),
+                        startAngleDegrees = 270f,
+                        sweepAngleDegrees = 90f,
+                        forceMoveTo = false
+                    )
+                }
+
+                drawPath(
+                    path = path,
+                    color = greyColor,
+                    style = Stroke(width = strokeWidth)
+                )
+            },
         contentAlignment = Alignment.Center
     ) {
+
         Row(
             modifier = Modifier
                 .fillMaxSize()
@@ -52,39 +99,32 @@ fun BottomNavigationBar(navController: NavController) {
             verticalAlignment = Alignment.CenterVertically
         ) {
             NavBarItems.BarItems.forEach { item ->
-                val isSelected = currentRoute == item.route
+                val isSelected = currentDestination?.isRoute(item.route) == true
                 NavigationBarItem(
                     icon = {
                         Icon(
-                            painter = painterResource(id = if (isSelected) item.SelectedIconRes else item.IconRes),
-                            contentDescription = item.title,
+                            painter = painterResource(id = if (isSelected) item.selectedIconRes else item.iconRes),
+                            contentDescription = stringResource(item.titleRes),
                         )
                     },
                     label = {
                         Text(
-                            text = item.title,
+                            text = stringResource(item.titleRes),
                             style = typography.navi_m500_s10
                         )
                     },
                     selected = isSelected,
                     onClick = {
                         if (!isSelected) {
-                            navController.navigate(item.route) {
-                                popUpTo(navController.graph.startDestinationId) {
-                                    saveState = true
-                                }
-                                launchSingleTop = true
-                                restoreState = true
-                            }
+                            navController.navigateToTab(item.route)
                         }
                     },
-
                     colors = NavigationBarItemDefaults.colors(
                         indicatorColor = Color.Transparent,
                         selectedIconColor = colors.Purple,
-                        unselectedIconColor = Color.Unspecified,
+                        unselectedIconColor = colors.Grey02,
                         selectedTextColor = colors.Purple,
-                        unselectedTextColor = Color.Unspecified
+                        unselectedTextColor = colors.Grey02
                     )
                 )
             }