Feat:[snsproject] navigation-compose, hilt-navigation-compose 의존성 추가 …

app/build.gradle.kts

@@ -75,6 +75,8 @@ dependencies {
     implementation(libs.converter.gson)
     implementation(libs.hilt.android)
     ksp(libs.hilt.android.compiler)
+    implementation(libs.androidx.hilt.navigation.compose)
+    implementation (libs.androidx.navigation.compose)
     implementation(libs.orbit.viewmodel)
     implementation(libs.coil.compose)
     implementation(libs.androidx.paging.compose)

gradle/libs.versions.toml

@@ -8,11 +8,13 @@ converter-gson = "2.9.0"
 core-ktx = "1.12.0"
 espresso-core = "3.5.1"
 hilt-android = "2.48"
+hilt-navigation-compose = "1.2.0"
 junit = "4.13.2"
 kotlinx-coroutines-core = "1.8.0"
 lifecycle-runtime-ktx = "2.7.0"
 material = "1.11.0"
 
+navigation-compose = "2.7.7"
 orbit-viewmodel = "7.0.1"
 paging-compose = "3.3.0-beta01"
 paging-runtime = "3.2.1"
@@ -34,8 +36,10 @@ androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "a
 androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" }
 androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "core-ktx" }
 androidx-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso-core" }
+androidx-hilt-navigation-compose = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "hilt-navigation-compose" }
 androidx-junit = { module = "androidx.test.ext:junit", version.ref = "androidx-junit" }
 androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle-runtime-ktx" }
+androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "navigation-compose" }
 androidx-paging-common = { module = "androidx.paging:paging-common", version.ref = "paging-runtime" }
 androidx-paging-compose = { module = "androidx.paging:paging-compose", version.ref = "paging-compose" }
 androidx-paging-runtime = { module = "androidx.paging:paging-runtime", version.ref = "paging-runtime" }

presentation/build.gradle.kts

@@ -65,5 +65,7 @@ dependencies {
     debugImplementation(libs.androidx.compose.ui.ui.test.manifest)
     implementation(libs.hilt.android)
     ksp(libs.hilt.android.compiler)
+    implementation(libs.androidx.hilt.navigation.compose)
+    implementation (libs.androidx.navigation.compose)
     implementation(project(":domain"))
 }

presentation/src/main/java/com/example/presentation/login/LoginActivity.kt

@@ -1,10 +1,17 @@
 package com.example.presentation.login
 
 import android.os.Bundle
+import androidx.activity.compose.setContent
 import androidx.appcompat.app.AppCompatActivity
+import com.example.presentation.ui.theme.SnsProjectTheme
 
 class LoginActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        setContent {
+            SnsProjectTheme {
+                LoginNavHost()
+            }
+        }
     }
 }

presentation/src/main/java/com/example/presentation/login/LoginNavHost.kt

@@ -0,0 +1,30 @@
+package com.example.presentation.login
+
+import androidx.compose.runtime.Composable
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.rememberNavController
+
+@Composable
+fun LoginNavHost() {
+    val navController = rememberNavController()
+    NavHost(
+        navController = navController,
+        startDestination = LoginRoute.WelcomeScreen.route,
+    ) {
+        composable(route = LoginRoute.WelcomeScreen.route) {
+            WelcomeScreen {
+                navController.navigate(LoginRoute.LoginScreen.route)
+            }
+        }
+
+        composable(route = LoginRoute.LoginScreen.route) {
+            LoginScreen()
+        }
+
+        composable(route = LoginRoute.SignUpScreen.route) {
+            SignUpScreen(id = "", username = "", password1 = "", password2 = "", {}, {}, {}, {}, {})
+        }
+
+    }
+}

presentation/src/main/java/com/example/presentation/login/LoginRoute.kt

@@ -0,0 +1,7 @@
+package com.example.presentation.login
+
+sealed class LoginRoute(val route: String) {
+    data object WelcomeScreen : LoginRoute("WelcomeScreen")
+    data object LoginScreen : LoginRoute("LoginScreen")
+    data object SignUpScreen : LoginRoute("SignUpScreen")
+}

presentation/src/main/java/com/example/presentation/login/LoginScreen.kt

@@ -14,10 +14,24 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
 import com.example.presentation.component.LoginTextField
 import com.example.presentation.component.SubmitButton
 import com.example.presentation.ui.theme.SnsProjectTheme
 
+@Composable
+fun LoginScreen(
+    viewmodel: LoginViewModel = hiltViewModel()
+) {
+    LoginScreen(
+        id = "",
+        password = "",
+        onIdChange = {},
+        passwordChange = {},
+        onNavigationToSignUpScreen = { viewmodel.onLoginClick() }
+    )
+}
+
 @Composable
 fun LoginScreen(
     id: String,
@@ -38,58 +52,61 @@ fun LoginScreen(
                 Text(text = "Connected", style = MaterialTheme.typography.displaySmall)
                 Text(text = "Your favorite social network", style = MaterialTheme.typography.labelSmall)
             }
-
+            
             Column(
                 modifier =
-                    Modifier
-                        .padding(top = 24.dp)
-                        .padding(horizontal = 16.dp),
+                Modifier
+                    .padding(top = 24.dp)
+                    .padding(horizontal = 16.dp),
             ) {
                 Text(
                     modifier = Modifier.padding(36.dp),
                     text = "Log in",
                     style = MaterialTheme.typography.headlineMedium,
                 )
-
+                
                 Text(
                     modifier = Modifier.padding(16.dp),
                     text = "Id",
                     style = MaterialTheme.typography.labelLarge,
                 )
                 LoginTextField(
                     modifier =
-                        Modifier
-                            .padding(8.dp)
-                            .fillMaxWidth(),
+                    Modifier
+                        .padding(8.dp)
+                        .fillMaxWidth(),
                     value = id,
                     onValueString = onIdChange,
                 )
-
+                
                 Text(
                     modifier = Modifier.padding(16.dp),
                     text = "password",
                     style = MaterialTheme.typography.labelLarge,
                 )
                 LoginTextField(
                     modifier =
-                        Modifier
-                            .padding(8.dp)
-                            .fillMaxWidth(),
+                    Modifier
+                        .padding(8.dp)
+                        .fillMaxWidth(),
                     value = password,
                     onValueString = passwordChange,
                 )
-
+                
                 SubmitButton(
                     modifier =
-                        Modifier
-                            .padding(top = 24.dp)
-                            .fillMaxWidth(),
+                    Modifier
+                        .padding(top = 24.dp)
+                        .fillMaxWidth(),
                     text = "로그인",
                     onClick = {},
                 )
-
+                
                 Spacer(modifier = Modifier.weight(1f))
-                Row(modifier = Modifier.align(Alignment.CenterHorizontally).padding(bottom = 24.dp).clickable(onClick = onNavigationToSignUpScreen)) {
+                Row(modifier = Modifier
+                    .align(Alignment.CenterHorizontally)
+                    .padding(bottom = 24.dp)
+                    .clickable(onClick = onNavigationToSignUpScreen)) {
                     Text(text = "Don't hava and account?")
                     Text(text = "Sign up", color = MaterialTheme.colorScheme.primary)
                 }

presentation/src/main/java/com/example/presentation/login/LoginViewModel.kt

@@ -0,0 +1,23 @@
+package com.example.presentation.login
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.example.domain.usecase.login.LoginUseCase
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
+import kotlinx.coroutines.launch
+
+@HiltViewModel
+class LoginViewModel @Inject constructor(
+    private val loginUseCase: LoginUseCase
+) : ViewModel() {
+
+    fun onLoginClick() {
+        val id = ""
+        val pwd = ""
+        viewModelScope.launch {
+            loginUseCase(id, pwd)
+        }
+    }
+
+}

presentation/src/main/java/com/example/presentation/login/WelcomeScreen.kt

@@ -17,7 +17,9 @@ import com.example.presentation.component.SubmitButton
 import com.example.presentation.ui.theme.SnsProjectTheme
 
 @Composable
-fun WelcomeScreen() {
+fun WelcomeScreen(
+    onNavigationToLoginScreen: () -> Unit
+) {
     Surface {
         Box(
             modifier = Modifier.fillMaxSize(),
@@ -39,7 +41,7 @@ fun WelcomeScreen() {
                         .padding(bottom = 24.dp)
                         .align(Alignment.BottomCenter),
                 text = "로그인",
-                onClick = {},
+                onClick = onNavigationToLoginScreen,
             )
         }
     }
@@ -49,6 +51,6 @@ fun WelcomeScreen() {
 @Composable
 private fun WelcomeScreenPreview() {
     SnsProjectTheme {
-        WelcomeScreen()
+        WelcomeScreen({})
     }
 }