Week4

app/build.gradle.kts

@@ -1,22 +1,28 @@
+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
+    compileSdk = 35
 
     defaultConfig {
         applicationId = "org.sopt.and"
         minSdk = 28
-        targetSdk = 34
+        targetSdk = 35
         versionCode = 1
         versionName = "1.0"
-
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        buildConfigField("String", "BASE_URL", properties["base.url"].toString())
     }
 
     buildTypes {
@@ -37,6 +43,7 @@ android {
     }
     buildFeatures {
         compose = true
+        buildConfig = true
     }
 }
 
@@ -65,4 +72,10 @@ dependencies {
     androidTestImplementation(libs.androidx.ui.test.junit4)
     debugImplementation(libs.androidx.ui.tooling)
     debugImplementation(libs.androidx.ui.test.manifest)
+    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,6 +2,8 @@
 <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:dataExtractionRules="@xml/data_extraction_rules"
@@ -11,26 +13,9 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.ANDANDROID"
+        android:usesCleartextTraffic="true"
         tools:targetApi="31">
-        <activity
-            android:name=".MyActivity"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name=".HomeActivity"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name=".SearchActivity"
-            android:exported="false" />
+
         <activity
             android:name=".MainActivity"
             android:exported="true"

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

@@ -11,26 +11,20 @@ import androidx.compose.material3.SnackbarHostState
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.rememberNavController
 import org.sopt.and.ui.theme.ANDANDROIDTheme
 import androidx.navigation.compose.composable
 import androidx.navigation.toRoute
-
-//로그인 성공 시 로그인한 이메일을 viewmodel에 담아 전역변수로 관리..
-class UserViewModel : ViewModel() {
-
-    private val _email = MutableLiveData<String>()
-    val email: LiveData<String> = _email
-
-    fun setEmail(newEmail: String) {
-        _email.value = newEmail
-    }
-}
+import org.sopt.and.presentation.loginScreen.LoginScreen
+import org.sopt.and.presentation.mypageScreen.MypageScreen
+import org.sopt.and.presentation.searchScreen.SearchScreen
+import org.sopt.and.presentation.signupScreen.SignUpScreen
+import org.sopt.and.presentation.homeScreen.HomeScreen
+import org.sopt.and.presentation.homeScreen.HomeViewModel
+import org.sopt.and.presentation.main.UserViewModel
+import org.sopt.and.presentation.mypageScreen.MypageViewModel
 
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -41,6 +35,7 @@ class MainActivity : ComponentActivity() {
                 Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->
                     val navController = rememberNavController()
                     val userViewModel: UserViewModel = viewModel()
+                    val mypageViewModel : MypageViewModel = viewModel()
 
                     NavHost(
                         navController = navController,
@@ -49,8 +44,8 @@ class MainActivity : ComponentActivity() {
                     ){
                         composable<SignUpScreen> {
                             SignUpScreen(
-                                navigateToLoginScreen = {
-                                    emailText, passwordText -> navController.navigate(LoginScreen(emailText, passwordText))
+                                navigateToLoginScreen = { userNameText, passwordText ->
+                                    navController.navigate(LoginScreen(userNameText, passwordText))
                                 }
                             )
                         }
@@ -60,19 +55,22 @@ class MainActivity : ComponentActivity() {
                             val scope = rememberCoroutineScope()
                             val snackbarHostState = remember { SnackbarHostState() }
                             LoginScreen(
-                                emailText = item.emailText,
+                                userNameText = item.userNameText,
                                 passwordText = item.passwordText,
                                 scope = scope,
                                 snackbarHostState = snackbarHostState,
                                 navigateToHomeScreen = {
                                     navController.navigate("home")
-                                }
+                                },
+                                userViewModel = userViewModel,
+                                mypageViewModel = mypageViewModel
                             )
                         }
 
                         composable("home") {
                             HomeScreen(
                                 navController = navController,
+                                homeViewModel = HomeViewModel()
                             )
                         }
 
@@ -86,7 +84,8 @@ class MainActivity : ComponentActivity() {
 
                             MypageScreen(
                                 navController = navController,
-                                userViewModel = userViewModel
+                                userViewModel = userViewModel,
+                                mypageViewModel = mypageViewModel
                             )
                         }
 

app/src/main/java/org/sopt/and/model/dto/login/RequestGetUserDto.kt

@@ -0,0 +1,11 @@
+package org.sopt.and.model.dto.login
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+//요청할 때는 username만 가지고 요청 (unique해야 함)
+@Serializable
+data class RequestGetUserDto(
+    @SerialName("username")
+    val userName: String,
+)

app/src/main/java/org/sopt/and/model/dto/login/ResponseGetUserFailDto.kt

@@ -0,0 +1,10 @@
+package org.sopt.and.model.dto.login
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ResponseGetUserFailDto(
+    @SerialName("code")
+    val no: Int
+)

app/src/main/java/org/sopt/and/model/dto/login/ResponseGetUserSuccessDto.kt

@@ -0,0 +1,16 @@
+package org.sopt.and.model.dto.login
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ResponseGetUserSuccessDto(
+    @SerialName("result")
+    val result: UserResult
+)
+
+@Serializable
+data class UserResult(
+    @SerialName("token")
+    val token: String
+)

app/src/main/java/org/sopt/and/model/dto/login/ResponseGetUserWrapperDto.kt

@@ -0,0 +1,12 @@
+package org.sopt.and.model.dto.login
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ResponseGetUserWrapperDto(
+    @SerialName("success")
+    val success: ResponseGetUserSuccessDto,
+    @SerialName("failed")
+    val failed: ResponseGetUserFailDto
+)

app/src/main/java/org/sopt/and/model/dto/mypage/RequestGetUserHobbyDto.kt

@@ -0,0 +1,11 @@
+package org.sopt.and.model.dto.mypage
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+//요청할 때는 token만 가지고 요청
+@Serializable
+data class RequestGetUserHobbyDto(
+    @SerialName("token")
+    val token: String,
+)

app/src/main/java/org/sopt/and/model/dto/mypage/ResponseGetUserHobbyFailDto.kt

@@ -0,0 +1,10 @@
+package org.sopt.and.model.dto.mypage
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ResponseGetUserHobbyFailDto(
+    @SerialName("code")
+    val no: Int
+)

app/src/main/java/org/sopt/and/model/dto/mypage/ResponseGetUserHobbySuccessDto.kt

@@ -0,0 +1,16 @@
+package org.sopt.and.model.dto.mypage
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ResponseGetUserHobbySuccessDto(
+    @SerialName("result")
+    val result: HobbyResult? = null,
+)
+
+@Serializable
+data class HobbyResult(
+    @SerialName("hobby")
+    val userHobby: String? = null,
+)

app/src/main/java/org/sopt/and/model/dto/mypage/ResponseGetUserHobbyWrapperDto.kt

@@ -0,0 +1,14 @@
+package org.sopt.and.model.dto.mypage
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import org.sopt.and.model.dto.login.ResponseGetUserFailDto
+import org.sopt.and.model.dto.login.ResponseGetUserSuccessDto
+
+@Serializable
+data class ResponseGetUserHobbyWrapperDto(
+    @SerialName("success")
+    val success: ResponseGetUserHobbySuccessDto,
+    @SerialName("failed")
+    val failed: ResponseGetUserHobbyFailDto
+)

app/src/main/java/org/sopt/and/model/dto/signup/RequestCreateUserDto.kt

@@ -0,0 +1,14 @@
+package org.sopt.and.model.dto.signup
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class RequestCreateUserDto(
+    @SerialName("username")
+    val userName: String,
+    @SerialName("password")
+    val password: String,
+    @SerialName("hobby")
+    val hobby: String
+)

app/src/main/java/org/sopt/and/model/dto/signup/ResponseCreateUserFailDto.kt

@@ -0,0 +1,16 @@
+package org.sopt.and.model.dto.signup
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ResponseCreateUserFailDto(
+    @SerialName("failed")
+    val code: FailureResult
+)
+
+@Serializable
+data class FailureResult(
+    @SerialName("code")
+    val no: Int
+)

app/src/main/java/org/sopt/and/model/dto/signup/ResponseCreateUserSuccessDto.kt

@@ -0,0 +1,16 @@
+package org.sopt.and.model.dto.signup
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ResponseCreateUserSuccessDto(
+    @SerialName("success")
+    val result: UserResult
+)
+
+@Serializable
+data class UserResult(
+    @SerialName("no")
+    val no: Int
+)

app/src/main/java/org/sopt/and/model/dto/signup/ResponseCreateUserWrapperDto.kt

@@ -0,0 +1,14 @@
+package org.sopt.and.model.dto.signup
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ResponseCreateUserWrapperDto( //특정 유저 한 명의 응답 DTO
+    @SerialName("success")
+    val success: ResponseCreateUserSuccessDto,
+    @SerialName("failed")
+    val failed: ResponseCreateUserFailDto
+)
+
+

app/src/main/java/org/sopt/and/model/network/ApiFactory.kt

@@ -0,0 +1,37 @@
+package org.sopt.and.model.network
+
+import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
+import kotlinx.serialization.json.Json
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.OkHttpClient
+import okhttp3.logging.HttpLoggingInterceptor
+import org.sopt.and.BuildConfig
+import retrofit2.Retrofit
+
+object ApiFactory {
+    private const val BASE_URL: String = BuildConfig.BASE_URL
+
+    private val loggingInterceptor = HttpLoggingInterceptor().apply {
+        level = HttpLoggingInterceptor.Level.BODY
+    }
+
+    private val client = OkHttpClient.Builder()
+        .addInterceptor(loggingInterceptor)
+        .build()
+
+    val retrofit: Retrofit by lazy {
+        Retrofit.Builder()
+            .baseUrl(BASE_URL)
+            .client(client)
+            .addConverterFactory(Json.asConverterFactory("application/json".toMediaType()))
+            .build()
+    }
+
+    inline fun <reified T> create(): T = retrofit.create(T::class.java)
+}
+
+//이 userService를, 서버를 붙이는 부분에서 사용해야 함.
+//Viewmodel에서 이 userService에 접근하면 됨.
+object ServicePool {
+    val userService = ApiFactory.create<UserService>()
+}