login ui, signup ui, onboarding ui

app/src/main/java/com/example/hangsha_android/data/network/api/MemoApi.kt

@@ -16,6 +16,11 @@ interface MemoApi {
     @GET("api/v1/memos")
     suspend fun getMemos(): Response<MemoListResponse>
 
+    @GET("api/v1/memos/by-event/{eventId}")
+    suspend fun getMemoByEvent(
+        @Path("eventId") eventId: Long
+    ): Response<MemoResponse>
+
     @POST("api/v1/memos")
     suspend fun createMemo(
         @Body request: CreateMemoRequest

app/src/main/java/com/example/hangsha_android/data/network/model/EventDetailResponse.kt

@@ -4,7 +4,7 @@ data class EventDetailResponse(
     val id: Long,
     val title: String,
     val imageUrl: String?,
-    val operationMode: String,
+    val operationMode: String?,
     val statusId: Long,
     val eventTypeId: Long,
     val orgId: Long,

app/src/main/java/com/example/hangsha_android/data/network/model/EventSummaryResponse.kt

@@ -4,7 +4,7 @@ data class EventSummaryResponse(
     val id: Long,
     val title: String,
     val imageUrl: String?,
-    val operationMode: String,
+    val operationMode: String?,
     val statusId: Long,
     val eventTypeId: Long,
     val orgId: Long,

app/src/main/java/com/example/hangsha_android/data/repository/AuthRepository.kt

@@ -32,12 +32,16 @@ class AuthRepository @Inject constructor(
     }
 
     // 회원가입
-    suspend fun register(email: String, password: String): Response<LoginResponse> {
+    suspend fun register(
+        email: String,
+        password: String,
+        username: String
+    ): Response<LoginResponse> {
         return authApi.register(
             RegisterRequest(
                 email = email,
                 password = password,
-                username = "username" // TODO: username이 가야되긴 하는데, 웹에서도 입력받는 부분이 없어서 임시로 고정값 넣어둠. 나중에 수정 필요
+                username = username
             )
         )
     }

app/src/main/java/com/example/hangsha_android/data/repository/MemoRepository.kt

@@ -15,6 +15,12 @@ class MemoRepository @Inject constructor(
         return memoApi.getMemos()
     }
 
+    suspend fun getMemoByEvent(
+        eventId: Long
+    ): Response<MemoResponse> {
+        return memoApi.getMemoByEvent(eventId = eventId)
+    }
+
     suspend fun createMemo(
         eventId: Long,
         content: String,

app/src/main/java/com/example/hangsha_android/ui/navigation/HangshaNavHost.kt

@@ -17,7 +17,6 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
@@ -47,22 +46,24 @@ import com.example.hangsha_android.ui.view.eventdetail.EventDetailScreen
 import com.example.hangsha_android.ui.view.eventdetail.EventDetailViewModel
 import com.example.hangsha_android.ui.view.interestpriority.InterestPriorityScreen
 import com.example.hangsha_android.ui.view.interestpriority.InterestPriorityViewModel
+import com.example.hangsha_android.ui.view.login.OpeningScreen
 import com.example.hangsha_android.ui.view.mypage.MyPageScreen
 import com.example.hangsha_android.ui.view.mypage.MyPageViewModel
 import com.example.hangsha_android.ui.view.mymemos.MyMemosScreen
 import com.example.hangsha_android.ui.view.mymemos.MyMemosViewModel
-import com.example.hangsha_android.ui.view.serverhealth.ServerHealthViewModel
+import com.example.hangsha_android.ui.view.onboarding.OnboardingScreen
+import com.example.hangsha_android.ui.view.onboarding.OnboardingViewModel
 import com.example.hangsha_android.ui.view.signup.SignUpScreen
 import com.example.hangsha_android.ui.view.signup.SignUpViewModel
 import com.google.android.gms.auth.api.signin.GoogleSignIn
 import com.google.android.gms.auth.api.signin.GoogleSignInOptions
 import com.google.android.gms.common.api.ApiException
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.tasks.await
 
 sealed class HangshaDestinations(val route: String) {
     data object Login : HangshaDestinations("login")
+    data object CredentialLogin : HangshaDestinations("credential_login")
     data object SignUp : HangshaDestinations("sign_up")
+    data object Onboarding : HangshaDestinations("onboarding")
     data object Main : HangshaDestinations("main")
     data object InterestPriority : HangshaDestinations("interest_priority")
     data object MyBookmarks : HangshaDestinations("my_bookmarks")
@@ -100,6 +101,7 @@ fun HangshaNavHost(
     ) {
         loginGraph(navController = navController)
         signUpGraph(navController = navController)
+        onboardingGraph(navController = navController)
         mainGraph(navController = navController)
     }
 }
@@ -108,10 +110,7 @@ fun NavGraphBuilder.loginGraph(navController: NavHostController) {
     composable(HangshaDestinations.Login.route) {
         val loginViewModel: LoginViewModel = hiltViewModel()
         val loginUiState by loginViewModel.uiState.collectAsState()
-        val serverHealthViewModel: ServerHealthViewModel = hiltViewModel()
-        val serverHealthUiState by serverHealthViewModel.uiState.collectAsState()
         val context = LocalContext.current
-        val coroutineScope = rememberCoroutineScope()
         val googleSignInOptions = remember(BuildConfig.GOOGLE_SERVER_CLIENT_ID) {
             GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
                 .requestEmail()
@@ -157,40 +156,53 @@ fun NavGraphBuilder.loginGraph(navController: NavHostController) {
             loginViewModel.onLoginSuccessConsumed()
         }
 
-        LoginScreen(
-            onLoginClick = { loginViewModel.loginWithCredentials() },
+        OpeningScreen(
+            loginUiState = loginUiState,
+            onEmailLoginClick = {
+                navController.navigate(HangshaDestinations.CredentialLogin.route)
+            },
             onSignUpClick = {
                 navController.navigate(HangshaDestinations.SignUp.route)
             },
-            onUsernameChanged = { value -> loginViewModel.onUsernameChanged(value) },
-            onPasswordChanged = { value -> loginViewModel.onPasswordChanged(value) },
             onGoogleLoginClick = {
                 if (BuildConfig.GOOGLE_SERVER_CLIENT_ID.isBlank()) {
                     loginViewModel.onGoogleLoginConfigMissing()
                 } else {
                     googleLoginLauncher.launch(googleSignInClient.signInIntent)
                 }
             },
-            onClearGoogleLoginHistoryClick = {
-                loginViewModel.onGoogleHistoryClearStarted()
-                coroutineScope.launch {
-                    runCatching {
-                        googleSignInClient.signOut().await()
-                    }.fold(
-                        onSuccess = {
-                            loginViewModel.onGoogleHistoryCleared()
-                        },
-                        onFailure = { error ->
-                            loginViewModel.onGoogleLoginError(
-                                error.message ?: "Failed to clear Google login history."
-                            )
-                        }
-                    )
-                }
+            onKakaoLoginClick = {
+                // TODO(KAKAO_LOGIN): Connect Kakao social login after the UI pass.
             },
-            onCheckServerClick = { serverHealthViewModel.checkServer() },
-            loginUiState = loginUiState,
-            serverHealthUiState = serverHealthUiState
+            onNaverLoginClick = {
+                // TODO(NAVER_LOGIN): Connect Naver social login after the UI pass.
+            },
+            onGuestContinueClick = {
+                // TODO(GUEST_CONTINUE): Connect guest-mode navigation after the UI pass.
+            }
+        )
+    }
+
+    composable(HangshaDestinations.CredentialLogin.route) {
+        val loginViewModel: LoginViewModel = hiltViewModel()
+        val loginUiState by loginViewModel.uiState.collectAsState()
+
+        LaunchedEffect(loginUiState.isLoginSuccessful) {
+            if (!loginUiState.isLoginSuccessful) {
+                return@LaunchedEffect
+            }
+
+            navController.navigate(HangshaDestinations.Main.route) {
+                popUpTo(HangshaDestinations.Login.route) { inclusive = true }
+            }
+            loginViewModel.onLoginSuccessConsumed()
+        }
+
+        LoginScreen(
+            onLoginClick = { loginViewModel.loginWithCredentials() },
+            onUsernameChanged = { value -> loginViewModel.onUsernameChanged(value) },
+            onPasswordChanged = { value -> loginViewModel.onPasswordChanged(value) },
+            loginUiState = loginUiState
         )
     }
 }
@@ -212,7 +224,9 @@ fun NavGraphBuilder.signUpGraph(navController: NavHostController) {
                 return@LaunchedEffect
             }
 
-            navController.popBackStack()
+            navController.navigate(HangshaDestinations.Onboarding.route) {
+                popUpTo(HangshaDestinations.Login.route) { inclusive = true }
+            }
             signUpViewModel.onSignUpSuccessConsumed()
         }
 
@@ -223,10 +237,39 @@ fun NavGraphBuilder.signUpGraph(navController: NavHostController) {
             onPasswordConfirmationChanged = { value ->
                 signUpViewModel.onPasswordConfirmationChanged(value)
             },
-            onSignUpClick = { signUpViewModel.signUp() },
-            onNavigateBack = {
-                navController.popBackStack()
+            onSignUpClick = { signUpViewModel.signUp() }
+        )
+    }
+}
+
+fun NavGraphBuilder.onboardingGraph(navController: NavHostController) {
+    composable(HangshaDestinations.Onboarding.route) {
+        val onboardingViewModel: OnboardingViewModel = hiltViewModel()
+        val onboardingUiState by onboardingViewModel.uiState.collectAsState()
+        val context = LocalContext.current
+
+        LaunchedEffect(onboardingUiState.onboardingMessage) {
+            val message = onboardingUiState.onboardingMessage ?: return@LaunchedEffect
+            Toast.makeText(context, message, Toast.LENGTH_SHORT).show()
+            onboardingViewModel.onOnboardingMessageConsumed()
+        }
+
+        LaunchedEffect(onboardingUiState.isUsernameSaved) {
+            if (!onboardingUiState.isUsernameSaved) {
+                return@LaunchedEffect
             }
+
+            // TODO(ONBOARDING): Add the remaining onboarding steps after username setup.
+            navController.navigate(HangshaDestinations.Main.route) {
+                popUpTo(HangshaDestinations.Onboarding.route) { inclusive = true }
+            }
+            onboardingViewModel.onUsernameSavedConsumed()
+        }
+
+        OnboardingScreen(
+            uiState = onboardingUiState,
+            onUsernameChanged = { value -> onboardingViewModel.onUsernameChanged(value) },
+            onContinueClick = { onboardingViewModel.saveUsername() }
         )
     }
 }
@@ -586,6 +629,15 @@ fun NavGraphBuilder.mainGraph(navController: NavHostController) {
                 onInterestPriorityClick = {
                     navController.navigate(HangshaDestinations.InterestPriority.route)
                 },
+                onTimetableClick = {
+                    navController.navigate(BottomTab.Timetable.route) {
+                        popUpTo(HangshaDestinations.Main.route) {
+                            saveState = true
+                        }
+                        launchSingleTop = true
+                        restoreState = true
+                    }
+                },
                 onBookmarksClick = {
                     navController.navigate(HangshaDestinations.MyBookmarks.route)
                 },

app/src/main/java/com/example/hangsha_android/ui/view/calendar/CalendarEvent.kt

@@ -7,7 +7,7 @@ data class CalendarEvent(
     val date: LocalDate,
     val title: String,
     val imageUrl: String?,
-    val operationMode: String,
+    val operationMode: String?,
     val statusId: Long,
     val eventTypeId: Long,
     val orgId: Long,

app/src/main/java/com/example/hangsha_android/ui/view/eventdetail/EventDetailViewModel.kt

@@ -285,11 +285,14 @@ class EventDetailViewModel @Inject constructor(
         memoLoadJob?.cancel()
         memoLoadJob = viewModelScope.launch {
             runCatching {
-                memoRepository.getMemos()
-                    .requireBody("Memo list response was empty.")
-                    .items
-                    .firstOrNull { it.eventId == eventId }
-                    ?.toEventDetailMemo()
+                val response = memoRepository.getMemoByEvent(eventId)
+                if (response.code() == 404) {
+                    null
+                } else if (!response.isSuccessful) {
+                    throw HttpException(response)
+                } else {
+                    response.body()?.toEventDetailMemo()
+                }
             }.onSuccess { memo ->
                 _uiState.update {
                     it.copy(