[TNT-176] 트레이너, 트레이니 메인 네비게이션 기초 세팅

core/navigation/src/main/java/co/kr/tnt/navigation/RouteModel.kt

@@ -42,6 +42,49 @@ sealed interface Route {
     @Serializable
     data class TraineeConnect(val isSkippable: Boolean) : Route
 
+    @Serializable
+    data object TrainerMain : Route
+
+    sealed interface TrainerMainTab : Route {
+        @Serializable
+        data object Home : TrainerMainTab
+
+        @Serializable
+        data object Members : TrainerMainTab
+
+        @Serializable
+        data object Feedback : TrainerMainTab
+
+        @Serializable
+        data object MyPage : TrainerMainTab
+    }
+
+    @Serializable
+    data object TrainerHome : Route
+
+    @Serializable
+    data object TrainerMembers : Route
+
+    @Serializable
+    data object TrainerFeedback : Route
+
+    @Serializable
+    data object TrainerMyPage : Route
+
+    @Serializable
+    data object TraineeMain : Route
+
+    sealed interface TraineeMainTab : Route {
+        @Serializable
+        data object Home : TraineeMainTab
+
+        @Serializable
+        data object MyPage : TraineeMainTab
+    }
+
+    @Serializable
+    data object TraineeHome : Route
+
     @Serializable
     data object TraineeMyPage : Route
 

data/network/src/main/java/co/kr/data/network/interceptor/SessionInterceptor.kt

@@ -14,7 +14,7 @@ internal class SessionInterceptor @Inject constructor(
         val requestBuilder = originRequest.newBuilder()
 
         requestBuilder.addHeader(
-            "AUTHORIZATION",
+            "Authorization",
             "SESSION-ID ${runBlocking { sessionProvider.getSessionId() }}",
         )
 

data/repository/src/main/java/co/kr/data/repository/SignUpRepositoryImpl.kt

@@ -42,7 +42,7 @@ class SignUpRepositoryImpl @Inject constructor(
             email = email,
             fcmToken = "EMPTY",
         )
-        val requestBody = signUpRequest.toRequestBody(Json)
+        val requestBody = signUpRequest.toRequestBody()
 
         val response = signupRemoteDataSource.postSignUp(
             profileImage = profileImagePart,
@@ -54,7 +54,7 @@ class SignUpRepositoryImpl @Inject constructor(
         return response.toDomain()
     }
 
-    private fun SignUpRequest.toRequestBody(json: Json): RequestBody {
+    private fun SignUpRequest.toRequestBody(): RequestBody {
         val jsonString = json.encodeToString(this)
         return jsonString.toRequestBody("application/json".toMediaTypeOrNull())
     }

feature/login/src/main/java/co/kr/tnt/login/LoginViewModel.kt

@@ -1,6 +1,5 @@
 package co.kr.tnt.login
 
-import android.util.Log
 import androidx.lifecycle.viewModelScope
 import co.kr.tnt.domain.model.AuthType
 import co.kr.tnt.domain.model.LoginResult
@@ -28,8 +27,6 @@ internal class LoginViewModel @Inject constructor(
 
             is LoginUiEvent.OnAuthFail -> {
                 if (event.throwable !is LoginException.CancelException) {
-                    // TODO resource
-                    Log.w("test", "exception : ${event.throwable}")
                     sendEffect(LoginSideEffect.ShowToast("로그인에 실패하였습니다. 다시 시도해주세요."))
                 }
             }

feature/login/src/main/java/co/kr/tnt/login/navigation/LoginNavigation.kt

@@ -16,7 +16,7 @@ fun NavController.navigateToLogin(
     route = Route.Login,
     navOptions = navOptions {
         if (clearBackStack) {
-            popUpTo(graph.startDestinationId) { inclusive = true }
+            popUpTo(graph.id) { inclusive = true }
         }
         navOptions()
     },

feature/main/build.gradle.kts

@@ -9,17 +9,15 @@ android {
 }
 
 dependencies {
-    implementation(projects.feature.home)
     implementation(projects.feature.webview)
     implementation(projects.feature.login)
     implementation(projects.feature.roleselect)
+    implementation(projects.feature.trainer.main)
+    implementation(projects.feature.trainee.main)
     implementation(projects.feature.trainee.signup)
     implementation(projects.feature.trainer.signup)
     implementation(projects.feature.trainer.connect)
-    implementation(projects.feature.trainer.notification)
     implementation(projects.feature.trainee.connect)
-    implementation(projects.feature.trainee.mypage)
-    implementation(projects.feature.trainee.notification)
 
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.appcompat)

feature/main/src/main/java/co/kr/tnt/main/MainViewModel.kt

@@ -22,7 +22,7 @@ internal class MainViewModel @Inject constructor(
                 val startDestination: Route = if (isNeedLogin) {
                     Route.Login
                 } else {
-                    Route.HomeBase
+                    Route.TraineeMain
                 }
 
                 updateState {

feature/main/src/main/java/co/kr/tnt/main/ui/TnTNavHost.kt

@@ -5,22 +5,20 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.navigation.compose.NavHost
-import co.kr.tnt.home.navigation.homeNavGraph
-import co.kr.tnt.home.navigation.navigateToHome
 import co.kr.tnt.login.navigation.loginScreen
 import co.kr.tnt.login.navigation.navigateToLogin
-import co.kr.tnt.navigation.Route
 import co.kr.tnt.roleselect.navigateToRoleSelection
 import co.kr.tnt.roleselect.roleSelectionScreen
 import co.kr.tnt.trainee.connect.navigation.navigateToTraineeConnect
 import co.kr.tnt.trainee.connect.navigation.traineeConnectScreen
-import co.kr.tnt.trainee.mypage.navigation.traineeMyPageScreen
-import co.kr.tnt.trainee.notification.navigation.traineeNotification
+import co.kr.tnt.trainee.main.navigation.navigateToTraineeMain
+import co.kr.tnt.trainee.main.navigation.traineeMainScreen
 import co.kr.tnt.trainee.signup.navigation.navigateToTraineeSignUp
 import co.kr.tnt.trainee.signup.navigation.traineeSignUpScreen
 import co.kr.tnt.trainer.connect.navigation.navigateToTrainerConnect
 import co.kr.tnt.trainer.connect.navigation.trainerConnectScreen
-import co.kr.tnt.trainer.notification.navigation.trainerNotification
+import co.kr.tnt.trainer.main.navigation.navigateToTrainerMain
+import co.kr.tnt.trainer.main.navigation.trainerMainScreen
 import co.kr.tnt.trainer.signup.navigation.navigateToTrainerSignUp
 import co.kr.tnt.trainer.signup.navigation.trainerSignUpScreen
 import co.kr.tnt.webview.navigateToWebView
@@ -42,13 +40,7 @@ fun TnTNavHost(
         ) {
             loginScreen(
                 navigateToHome = {
-                    navController.navigateToHome {
-                        popUpTo(Route.Login) {
-                            inclusive = true
-                        }
-                        launchSingleTop = true
-                        restoreState = true
-                    }
+                    navController.navigateToTraineeMain(clearBackStack = true)
                 },
                 navigateToSignup = { loginResult ->
                     navController.navigateToRoleSelection(
@@ -59,23 +51,11 @@ fun TnTNavHost(
                 },
             )
             roleSelectionScreen(
-                navigateToTraineeSignUp = { authId, authType, email ->
-                    navController.navigateToTraineeSignUp(
-                        authId = authId,
-                        authType = authType,
-                        email = email,
-                    )
-                },
-                navigateToTrainerSignUp = { authId, authType, email ->
-                    navController.navigateToTrainerSignUp(
-                        authId = authId,
-                        authType = authType,
-                        email = email,
-                    )
-                },
+                navigateToTraineeSignUp = navController::navigateToTraineeSignUp,
+                navigateToTrainerSignUp = navController::navigateToTrainerSignUp,
             )
             trainerSignUpScreen(
-                navigateToPrevious = { navController.popBackStack() },
+                navigateToPrevious = navController::popBackStack,
                 navigateToConnect = {
                     navController.navigateToTrainerConnect(
                         isSkippable = true,
@@ -84,45 +64,35 @@ fun TnTNavHost(
                 },
             )
             traineeSignUpScreen(
-                navigateToPrevious = { navController.popBackStack() },
-                navigateToConnect = { navController.navigateToTraineeConnect(isSkippable = true) },
+                navigateToPrevious = navController::popBackStack,
+                navigateToConnect = {
+                    navController.navigateToTrainerConnect(
+                        isSkippable = true,
+                        isCompleted = false,
+                    )
+                },
             )
             trainerConnectScreen(
-                navigateToPrevious = { navController.popBackStack() },
-                navigateToHome = {
-                    navController.navigateToHome(clearBackStack = true)
-                },
+                navigateToPrevious = navController::popBackStack,
+                navigateToHome = { navController.navigateToTrainerMain(clearBackStack = true) },
             )
             traineeConnectScreen(
-                navigateToPrevious = { navController.popBackStack() },
-                navigateToHome = {
-                    navController.navigateToHome(clearBackStack = true)
-                },
+                navigateToPrevious = navController::popBackStack,
+                navigateToHome = { navController.navigateToTraineeMain(clearBackStack = true) },
             )
-            traineeMyPageScreen(
-                navigateToPrevious = { navController.popBackStack() },
-                navigateToTraineeConnect = { navController.navigateToTraineeConnect(isSkippable = false) },
+            trainerMainScreen(
+                navigateToConnect = navController::navigateToTrainerConnect,
+                navigateToWebView = navController::navigateToWebView,
                 navigateToLogin = { navController.navigateToLogin(clearBackStack = true) },
-                navigateToWebView = { url ->
-                    navController.navigateToWebView(url = url)
-                },
-            )
-            traineeNotification(
-                navigateToPrevious = { navController.popBackStack() },
             )
-            trainerNotification(
-                navigateToPrevious = { navController.popBackStack() },
-                navigateToConnect = {
-                    navController.navigateToTrainerConnect(
-                        isSkippable = false,
-                        isCompleted = true,
-                    )
-                },
+            traineeMainScreen(
+                navigateToConnect = { navController.navigateToTraineeConnect(true) },
+                navigateToWebView = navController::navigateToWebView,
+                navigateToLogin = { navController.navigateToLogin(clearBackStack = true) },
             )
             webViewScreen(
-                navigateToPrevious = { navController.popBackStack() },
+                navigateToPrevious = navController::popBackStack,
             )
-            homeNavGraph()
         }
     }
 }

feature/home/build.gradle.kts → feature/trainee/home/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 }
 
 android {
-    setNamespace("feature.home")
+    setNamespace("feature.trainee.home")
 }
 
 dependencies {

feature/trainee/home/src/main/java/co/kr/tnt/trainee/home/TraineeHomeScreen.kt

@@ -0,0 +1,37 @@
+package co.kr.tnt.trainee.home
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Button
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.hilt.navigation.compose.hiltViewModel
+
+@Composable
+@Suppress("UnusedParameter")
+internal fun TraineeHomeRoute(
+    viewModel: TraineeHomeViewModel = hiltViewModel(),
+    navigateToNotification: () -> Unit,
+) {
+    TraineeHomeScreen(navigateToNotification)
+}
+
+@Composable
+fun TraineeHomeScreen(
+    navigateToNotification: () -> Unit,
+) {
+    Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->
+        Column {
+            Text(
+                text = "trainee home",
+                modifier = Modifier.padding(innerPadding),
+            )
+            Button(onClick = navigateToNotification) {
+                Text("navigate to notification")
+            }
+        }
+    }
+}

feature/home/src/main/java/co/kr/tnt/home/HomeViewModel.kt → feature/trainee/home/src/main/java/co/kr/tnt/trainee/home/TraineeHomeViewModel.kt

@@ -1,8 +1,8 @@
-package co.kr.tnt.home
+package co.kr.tnt.trainee.home
 
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 
 @HiltViewModel
-class HomeViewModel @Inject constructor() : ViewModel()
+class TraineeHomeViewModel @Inject constructor() : ViewModel()

feature/trainee/home/src/main/java/co/kr/tnt/trainee/home/navigation/TraineeHomeNavigation.kt

@@ -0,0 +1,30 @@
+package co.kr.tnt.trainee.home.navigation
+
+import androidx.navigation.NavController
+import androidx.navigation.NavGraphBuilder
+import androidx.navigation.NavOptionsBuilder
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.navigation
+import co.kr.tnt.navigation.Route
+import co.kr.tnt.trainee.home.TraineeHomeRoute
+
+fun NavController.navigateToTraineeHome(
+    navOptions: NavOptionsBuilder.() -> Unit = {},
+) = navigate(
+    route = Route.TraineeHome,
+    builder = navOptions,
+)
+
+fun NavGraphBuilder.traineeHomeNavGraph(
+    navigateToNotification: () -> Unit,
+    homeDestination: NavGraphBuilder.() -> Unit = { },
+) {
+    navigation<Route.TraineeMainTab.Home>(startDestination = Route.TraineeHome) {
+        composable<Route.TraineeHome> {
+            TraineeHomeRoute(
+                navigateToNotification = navigateToNotification,
+            )
+        }
+        homeDestination()
+    }
+}

feature/trainee/main/.gitignore

@@ -0,0 +1 @@
+/build

feature/trainee/main/build.gradle.kts

@@ -0,0 +1,17 @@
+import co.kr.tnt.setNamespace
+
+plugins {
+    id("tnt.android.feature")
+}
+
+android {
+    setNamespace("feature.trainee.main")
+}
+
+dependencies {
+    implementation(projects.feature.trainee.home)
+    implementation(projects.feature.trainee.mypage)
+    implementation(projects.feature.trainee.notification)
+
+    implementation(libs.kotlinx.immutable)
+}

feature/trainee/main/src/main/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest />