[Feature/#7 week04]

app/build.gradle.kts

@@ -1,10 +1,16 @@
+import java.util.Properties
+
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.kotlin.serialization)
 }
 
+val properties = Properties().apply {
+    load(project.rootProject.file("local.properties").inputStream())
+}
+
 android {
     namespace = "org.sopt.and"
     compileSdk = 34
@@ -17,6 +23,7 @@ android {
         versionName = "1.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        buildConfigField("String", "BASE_URL", properties["base.url"].toString())
     }
 
     buildTypes {
@@ -37,6 +44,7 @@ android {
     }
     buildFeatures {
         compose = true
+        buildConfig = true
     }
 }
 
@@ -62,6 +70,14 @@ dependencies {
     implementation(libs.androidx.ui.text)
     implementation(libs.androidx.accompanist.systemuicontroller)
     implementation(libs.androidx.compose.foundation)
-    implementation(libs.io.coil.kt )
+    implementation(libs.io.coil.kt)
+    implementation(libs.kotlinx.serialization.json)
+
+    // Network
+    implementation(platform(libs.okhttp.bom))
+    implementation(libs.okhttp)
+    implementation(libs.okhttp.logging.interceptor)
+    implementation(libs.retrofit)
+    implementation(libs.retrofit.kotlin.serialization.converter)
     implementation(libs.kotlinx.serialization.json)
 }

app/src/main/AndroidManifest.xml

@@ -2,8 +2,11 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <uses-permission android:name="android.permission.INTERNET" />
+
     <application
         android:allowBackup="true"
+        android:usesCleartextTraffic="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"

app/src/main/java/org/sopt/and/core/designsystem/component/textfield/WavveTextField.kt

@@ -43,7 +43,7 @@ fun WavveTextField(
     onPasswordVisibilityChange: (() -> Unit)? = null,
     errorMessage: String? = null,
     onFocusChanged: (Boolean) -> Unit,
-    onNext: () -> Unit,
+    onNext: () -> Unit = {},
     keyboardOptions: KeyboardOptions = KeyboardOptions.Default,
     modifier: Modifier = Modifier
 ) {
@@ -126,4 +126,4 @@ fun WavveTextField(
             )
         }
     }
-}
+}

app/src/main/java/org/sopt/and/data/DataSource.kt

@@ -4,23 +4,39 @@ import android.content.SharedPreferences
 
 class DataSource(private val sharedPreferences: SharedPreferences) {
 
-    fun saveUserInfo(email: String, password: String) {
+    fun saveUserInfo(username: String, password: String, hobby: String) {
         sharedPreferences.edit().apply {
-            putString(KEY_USER_EMAIL, email)
+            putString(KEY_USER_USERNAME, username)
             putString(KEY_USER_PASSWORD, password)
+            putString(KEY_USER_HOBBY, hobby)
+            apply()
+        }
+    }
+
+    fun saveUserToken(token: String) {
+        sharedPreferences.edit().apply {
+            putString(KEY_USER_TOKEN, token)
             putBoolean(KEY_IS_LOGGED_IN, true)
             apply()
         }
     }
 
-    fun getEmail(): String? {
-        return sharedPreferences.getString(KEY_USER_EMAIL, null)
+    fun getToken(): String? {
+        return sharedPreferences.getString(KEY_USER_TOKEN, null)
+    }
+
+    fun getUsername(): String? {
+        return sharedPreferences.getString(KEY_USER_USERNAME, null)
     }
 
     fun getPassword(): String? {
         return sharedPreferences.getString(KEY_USER_PASSWORD, null)
     }
 
+    fun getHobby(): String? {
+        return sharedPreferences.getString(KEY_USER_HOBBY, null)
+    }
+
     fun isLoggedIn(): Boolean {
         return sharedPreferences.getBoolean(KEY_IS_LOGGED_IN, false)
     }
@@ -30,9 +46,10 @@ class DataSource(private val sharedPreferences: SharedPreferences) {
     }
 
     companion object {
-        private const val KEY_USER_EMAIL = "USER_EMAIL"
+        private const val KEY_USER_USERNAME = "USER_USERNAME"
         private const val KEY_USER_PASSWORD = "USER_PASSWORD"
+        private const val KEY_USER_HOBBY = "USER_HOBBY"
+        private const val KEY_USER_TOKEN = "USER_TOKEN"
         private const val KEY_IS_LOGGED_IN = "IS_LOGGED_IN"
     }
-
-}
+}

app/src/main/java/org/sopt/and/data/UserRepository.kt

@@ -1,27 +1,51 @@
 package org.sopt.and.data
 
 import android.content.Context
+import org.sopt.and.network.UserService
+import org.sopt.and.network.request.RequestLoginDto
+import org.sopt.and.network.request.RequestSignUpDto
+import org.sopt.and.network.response.ResponseDto
+import org.sopt.and.network.response.ResponseHobbyDto
+import retrofit2.Response
 
-class UserRepository(context: Context) {
+class UserRepository(
+    private val userService: UserService,
+    context: Context) {
     private val dataSource = DataSource(context.getSharedPreferences("UserPrefs", Context.MODE_PRIVATE))
 
-    fun saveUserInfo(email: String, password: String) {
-        dataSource.saveUserInfo(email, password)
+    suspend fun postSignUp(username: String, password: String, hobby: String): Response<ResponseDto> {
+        val request = RequestSignUpDto(username, password, hobby)
+        return userService.postSignUp(request)
     }
 
-    fun getEmail(): String? {
-        return dataSource.getEmail()
+    suspend fun postLogin(username: String, password: String): Response<ResponseDto> {
+        val request = RequestLoginDto(username, password)
+        return userService.postLogin(request)
     }
 
-    fun getPassword(): String? {
-        return dataSource.getPassword()
+    suspend fun getHobby(token: String): Response<ResponseHobbyDto> {
+        return userService.getHobby(token)
     }
 
+    fun saveUserInfo(username: String, password: String, hobby: String) {
+        dataSource.saveUserInfo(username, password, hobby)
+    }
+
+    fun saveUserToken(token: String) {
+        dataSource.saveUserToken(token)
+    }
+
+    fun getUsername(): String? = dataSource.getUsername()
+    fun getPassword(): String? = dataSource.getPassword()
+    fun getHobby(): String? = dataSource.getHobby()
+    fun getToken(): String? = dataSource.getToken()
+
     fun isLoggedIn(): Boolean {
         return dataSource.isLoggedIn()
     }
 
     fun logout() {
         dataSource.clearUserCredentials()
     }
+
 }

app/src/main/java/org/sopt/and/feature/login/LoginEvent.kt

@@ -1,6 +1,6 @@
 package org.sopt.and.feature.login
 
 sealed class LoginEvent {
-    data class Success(val email: String) : LoginEvent()
-    data class Failure(val message: String) : LoginEvent()
+   data class Success(val token: String) : LoginEvent()
+   data class Failure(val message: String) : LoginEvent()
 }

app/src/main/java/org/sopt/and/feature/login/LoginRoute.kt

@@ -57,11 +57,11 @@ fun LoginRoute(
     val snackbarHostState = remember { SnackbarHostState() }
     val coroutineScope = rememberCoroutineScope()
 
-    var email by remember { mutableStateOf("") }
+    var username by remember { mutableStateOf("") }
     var password by remember { mutableStateOf("") }
-    var ispasswordVisible by remember { mutableStateOf(false) }
-    var isemailErrorVisible by remember { mutableStateOf(false) }
-    var ispasswordErrorVisible by remember { mutableStateOf(false) }
+    var isPasswordVisible by remember { mutableStateOf(false) }
+    var isUsernameErrorVisible by remember { mutableStateOf(false) }
+    var isPasswordErrorVisible by remember { mutableStateOf(false) }
 
     LaunchedEffect(viewModel.loginEvent) {
         viewModel.loginEvent.collect { event ->
@@ -82,19 +82,20 @@ fun LoginRoute(
     }
 
     LoginScreen(
-        email = email,
-        onEmailChange = { email = it },
+        username = username,
+        onUsernameChange = { username = it },
         password = password,
         onPasswordChange = { password = it },
-        passwordVisible = ispasswordVisible,
-        onPasswordVisibilityChange = { ispasswordVisible = !ispasswordVisible },
-        onLoginClick = { viewModel.onLoginClick(email, password) },
-        passwordErrorVisible = ispasswordErrorVisible,
-        onEmailFocusChanged = { isFocused ->
-            isemailErrorVisible = isFocused && email.isEmpty()
+        passwordVisible = isPasswordVisible,
+        onPasswordVisibilityChange = { isPasswordVisible = !isPasswordVisible },
+        onLoginClick = { viewModel.onLoginClick(username, password) },
+        usernameErrorVisible = isUsernameErrorVisible,
+        passwordErrorVisible = isPasswordErrorVisible,
+        onUsernameFocusChanged = { isFocused ->
+            isUsernameErrorVisible = isFocused && username.isEmpty()
         },
         onPasswordFocusChanged = { isFocused ->
-            ispasswordErrorVisible = isFocused && password.isEmpty()
+            isPasswordErrorVisible = isFocused && password.isEmpty()
         },
         onNavigateToSignUp = { navController.navigate("signup") },
         snackbarHostState = snackbarHostState
@@ -103,20 +104,21 @@ fun LoginRoute(
 
 @Composable
 fun LoginScreen(
-    email: String,
-    onEmailChange: (String) -> Unit,
+    username: String,
+    onUsernameChange: (String) -> Unit,
     password: String,
     onPasswordChange: (String) -> Unit,
     passwordVisible: Boolean,
     onPasswordVisibilityChange: () -> Unit,
     onLoginClick: () -> Unit,
+    usernameErrorVisible: Boolean,
     passwordErrorVisible: Boolean,
-    onEmailFocusChanged: (Boolean) -> Unit,
+    onUsernameFocusChanged: (Boolean) -> Unit,
     onPasswordFocusChanged: (Boolean) -> Unit,
     onNavigateToSignUp: () -> Unit,
     snackbarHostState: SnackbarHostState
 ) {
-    val emailFocusRequester = remember { FocusRequester() }
+    val usernameFocusRequester = remember { FocusRequester() }
     val passwordFocusRequester = remember { FocusRequester() }
     val loginButtonFocusRequester = remember { FocusRequester() }
 
@@ -139,15 +141,15 @@ fun LoginScreen(
         )
 
         WavveTextField(
-            value = email,
-            onValueChange = onEmailChange,
-            placeholder = "이메일 입력",
+            value = username,
+            onValueChange = onUsernameChange,
+            placeholder = "사용자 이름 입력",
             onFocusChanged = { isFocused ->
-                onEmailFocusChanged(isFocused)
+                onUsernameFocusChanged(isFocused)
             },
             onNext = { passwordFocusRequester.requestFocus() },
             keyboardOptions = KeyboardOptions.Default.copy(imeAction = Next),
-            modifier = Modifier.focusRequester(emailFocusRequester)
+            modifier = Modifier.focusRequester(usernameFocusRequester)
         )
 
         Spacer(modifier = Modifier.height(16.dp))
@@ -201,4 +203,4 @@ fun LoginScreen(
             contentPadding = PaddingValues(horizontal = 16.dp, vertical = 16.dp)
         )
     }
-}
+}

app/src/main/java/org/sopt/and/feature/login/LoginViewModel.kt

@@ -11,22 +11,25 @@ class LoginViewModel(private val userRepository: UserRepository) : ViewModel() {
     private val _loginEvent = MutableSharedFlow<LoginEvent>()
     val loginEvent = _loginEvent.asSharedFlow()
 
-    fun onLoginClick(email: String, password: String) {
+    fun onLoginClick(username: String, password: String) {
         viewModelScope.launch {
-            val savedEmail = userRepository.getEmail()
-            val savedPassword = userRepository.getPassword()
-
-            if (email != savedEmail) {
-                _loginEvent.emit(LoginEvent.Failure("이메일이 다릅니다."))
-                return@launch
-            }
-
-            if (password != savedPassword) {
-                _loginEvent.emit(LoginEvent.Failure("비밀번호가 틀렸습니다."))
-                return@launch
+            runCatching {
+                userRepository.postLogin(username, password)
+            }.onSuccess { response ->
+                if (response.isSuccessful && response.body() != null) {
+                    val token = response.body()?.result?.token
+                    if (token != null) {
+                        userRepository.saveUserToken(token)
+                        _loginEvent.emit(LoginEvent.Success(token))
+                    } else {
+                        _loginEvent.emit(LoginEvent.Failure("토큰을 받아오지 못했습니다."))
+                    }
+                }  else {
+                    _loginEvent.emit(LoginEvent.Failure("로그인 실패: ${response.errorBody()?.string() ?: "알 수 없는 오류"}"))
+                }
+            }.onFailure { exception ->
+                _loginEvent.emit(LoginEvent.Failure("네트워크 오류 발생: ${exception.message}"))
             }
-
-            _loginEvent.emit(LoginEvent.Success(email))
         }
     }
 }

app/src/main/java/org/sopt/and/feature/main/MainActivity.kt

@@ -8,6 +8,8 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Scaffold
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
@@ -22,6 +24,7 @@ import org.sopt.and.feature.mypage.MyPageViewModel
 import org.sopt.and.feature.search.SearchRoute
 import org.sopt.and.feature.signup.SignUpRoute
 import org.sopt.and.feature.signup.SignUpViewModel
+import org.sopt.and.network.ServicePool.userService
 import org.sopt.and.ui.theme.ANDANDROIDTheme
 
 class MainActivity : ComponentActivity() {
@@ -30,19 +33,28 @@ class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
-        userRepository = UserRepository(this)
+        userRepository = UserRepository(userService, applicationContext)
 
         setContent {
+            val isLoggedIn = remember { mutableStateOf(userRepository.isLoggedIn()) }
+
             ANDANDROIDTheme {
                 ChangeStatusBarColor()
                 val navController = rememberNavController()
 
+                navController.addOnDestinationChangedListener { _, _, _ ->
+                    isLoggedIn.value = userRepository.isLoggedIn()
+                }
+
+
                 Scaffold(
                     modifier = Modifier.fillMaxSize(),
                     bottomBar = {
-                        if (userRepository.isLoggedIn()) {
-                            BottomNavigationBar(navController = navController)
-                            Modifier.navigationBarsPadding()
+                        if (isLoggedIn.value) {
+                            BottomNavigationBar(
+                                navController = navController,
+                                modifier = Modifier.navigationBarsPadding()
+                            )
                         }
                     }
                 ) { innerPadding ->