[FEAT] 4주차 과제 완료

app/build.gradle.kts

@@ -1,7 +1,14 @@
+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 {
@@ -16,6 +23,7 @@ android {
         versionName = "1.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        buildConfigField("String","BASE_URL", properties["base.url"].toString())
     }
 
     buildTypes {
@@ -36,6 +44,7 @@ android {
     }
     buildFeatures {
         compose = true
+        buildConfig = true
     }
 }
 
@@ -61,4 +70,11 @@ dependencies {
     androidTestImplementation(libs.androidx.ui.test.junit4)
     debugImplementation(libs.androidx.ui.tooling)
     debugImplementation(libs.androidx.ui.test.manifest)
+    // 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

@@ -13,6 +13,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.ANDANDROID"
+        android:usesCleartextTraffic="true"
         tools:targetApi="31">
         <activity
             android:name=".MainActivity"

app/src/main/java/org/sopt/and/api/ApiFactory.kt

@@ -0,0 +1,40 @@
+package org.sopt.and.api
+
+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 org.sopt.and.api.service.HobbyService
+import org.sopt.and.api.service.LoginService
+import org.sopt.and.api.service.UserService
+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)
+}
+
+object ServicePool {
+    val userService = ApiFactory.create<UserService>()
+    val loginService = ApiFactory.create<LoginService>()
+    val hobbyService = ApiFactory.create<HobbyService>()
+}

app/src/main/java/org/sopt/and/api/dto/ErrorDto.kt

@@ -0,0 +1,10 @@
+package org.sopt.and.api.dto
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ResponseErrorDto(
+    @SerialName("code")
+    val code: String
+)

app/src/main/java/org/sopt/and/api/dto/HobbyDto.kt

@@ -0,0 +1,16 @@
+package org.sopt.and.api.dto
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ResponseHobbySuccessDto(
+    @SerialName("result")
+    val result: HobbyData
+)
+
+@Serializable
+data class HobbyData(
+    @SerialName("hobby")
+    val hobby: String
+)

app/src/main/java/org/sopt/and/api/dto/LoginDto.kt

@@ -0,0 +1,24 @@
+package org.sopt.and.api.dto
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ResponseLoginSuccessDto(
+    @SerialName("result")
+    val result: LoginData
+)
+
+@Serializable
+data class LoginData(
+    @SerialName("token")
+    val token: String
+)
+
+@Serializable
+data class RequestLoginDto(
+    @SerialName("username")
+    val username: String,
+    @SerialName("password")
+    val password: String
+)

app/src/main/java/org/sopt/and/api/dto/UserDto.kt

@@ -0,0 +1,26 @@
+package org.sopt.and.api.dto
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ResponseUserSuccessDto(
+    @SerialName("result")
+    val result: UserData
+)
+
+@Serializable
+data class UserData(
+    @SerialName("no")
+    val no: Int
+)
+
+@Serializable
+data class RequestUserDto(
+    @SerialName("username")
+    val username: String,
+    @SerialName("password")
+    val password: String,
+    @SerialName("hobby")
+    val hobby: String
+)

app/src/main/java/org/sopt/and/api/service/HobbyService.kt

@@ -0,0 +1,13 @@
+package org.sopt.and.api.service
+
+import okhttp3.ResponseBody
+import retrofit2.Call
+import retrofit2.http.GET
+import retrofit2.http.Header
+
+interface HobbyService {
+    @GET("/user/my-hobby")
+    fun getMyHobby(
+        @Header("token") token: String
+    ): Call<ResponseBody>
+}

app/src/main/java/org/sopt/and/api/service/LoginService.kt

@@ -0,0 +1,14 @@
+package org.sopt.and.api.service
+
+import okhttp3.ResponseBody
+import org.sopt.and.api.dto.RequestLoginDto
+import retrofit2.Call
+import retrofit2.http.Body
+import retrofit2.http.POST
+
+interface LoginService {
+    @POST("/login")
+    fun postLogin(
+        @Body requestLogin: RequestLoginDto
+    ): Call<ResponseBody>
+}

app/src/main/java/org/sopt/and/api/service/UserService.kt

@@ -0,0 +1,14 @@
+package org.sopt.and.api.service
+
+import okhttp3.ResponseBody
+import org.sopt.and.api.dto.RequestUserDto
+import retrofit2.Call
+import retrofit2.http.Body
+import retrofit2.http.POST
+
+interface UserService {
+    @POST("/user")
+    fun postUser(
+        @Body requestUser: RequestUserDto
+    ): Call<ResponseBody>
+}

app/src/main/java/org/sopt/and/component/BuyTextButton.kt

@@ -18,7 +18,7 @@ import org.sopt.and.R
 @Composable
 fun BuyTextButton(
     labelText: String,
-    onClick: ()->Unit
+    onClick: () -> Unit
 ) {
     Column {
         Text(

app/src/main/java/org/sopt/and/component/MyPageItem.kt

@@ -34,7 +34,7 @@ fun MyPageItem(
             .padding(bottom = 80.dp)
             .fillMaxWidth(),
         horizontalAlignment = Alignment.CenterHorizontally
-    ){
+    ) {
         Image(
             painter = icon,
             contentDescription = "",

app/src/main/java/org/sopt/and/component/bar/BottomBar.kt

@@ -24,7 +24,6 @@ import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.navigation.NavHostController
-import org.sopt.and.navigate.Routes
 import org.sopt.and.navigate.ScreenTab
 
 @Composable
@@ -55,8 +54,8 @@ fun BottomBar(
 
                     BottomTab(
                         onClick = {
-                            navController.navigate(tab.route){
-                                popUpTo(tab.route){
+                            navController.navigate(tab.route) {
+                                popUpTo(tab.route) {
                                     inclusive = true
                                 }
                             }

app/src/main/java/org/sopt/and/component/bar/TopBar.kt

@@ -27,7 +27,7 @@ fun TopBar(modifier: Modifier = Modifier) {
             modifier = Modifier.width(100.dp)
         )
 
-        Row{
+        Row {
             Image(
                 painter = painterResource(R.drawable.outline_cast_connected_24),
                 contentDescription = "",

app/src/main/java/org/sopt/and/component/textField/IDTextfield.kt

@@ -15,7 +15,7 @@ fun IDTextField(
     onValueChange: (String) -> Unit,
     placeholder: String,
     modifier: Modifier = Modifier
-){
+) {
     TextField(
         value = value,
         onValueChange = onValueChange,

app/src/main/java/org/sopt/and/navigate/NavGraph.kt

@@ -16,18 +16,19 @@ import androidx.navigation.compose.composable
 import androidx.navigation.compose.currentBackStackEntryAsState
 import org.sopt.and.component.bar.BottomBar
 import org.sopt.and.ui.home.HomeScreen
-import org.sopt.and.ui.home.HomeViewModel
 import org.sopt.and.ui.my.MyScreen
+import org.sopt.and.ui.my.MyViewModel
 import org.sopt.and.ui.search.SearchScreen
 import org.sopt.and.ui.signin.SignInScreen
 import org.sopt.and.ui.signin.SignInViewModel
 import org.sopt.and.ui.signup.SignUpScreen
 import org.sopt.and.ui.signup.SignUpViewModel
 
 @Composable
-fun NavGraph(navController: NavHostController){
+fun NavGraph(navController: NavHostController) {
     val signUpViewModel: SignUpViewModel = viewModel()
     val signInViewModel: SignInViewModel = viewModel()
+    val myViewModel: MyViewModel = viewModel()
 
     val navBackStackEntry by navController.currentBackStackEntryAsState()
     val currentRoute = navBackStackEntry?.destination?.route
@@ -37,7 +38,12 @@ fun NavGraph(navController: NavHostController){
             val selectedScreen = ScreenTab.entries.find { it.route == currentRoute }
             if (selectedScreen != null) {
                 BottomBar(selected = selectedScreen, navController = navController)
-            }else if (currentRoute in listOf(Routes.Home.route, Routes.My.route, Routes.Search.route)) {
+            } else if (currentRoute in listOf(
+                    Routes.Home.route,
+                    Routes.My.route,
+                    Routes.Search.route
+                )
+            ) {
                 BottomBar(selected = null, navController = navController)
             }
         }
@@ -49,9 +55,24 @@ fun NavGraph(navController: NavHostController){
                 .padding(paddingValues)
         ) {
             NavHost(navController = navController, startDestination = Routes.SignIn.route) {
-                composable(Routes.SignIn.route) { SignInScreen(navController, signInViewModel = signInViewModel) }
-                composable(Routes.SignUp.route) { SignUpScreen(navController, signUpViewModel = signUpViewModel) }
-                composable(Routes.My.route) { MyScreen(navController, signInViewModel = signInViewModel) }
+                composable(Routes.SignIn.route) {
+                    SignInScreen(
+                        navController,
+                        signInViewModel = signInViewModel
+                    )
+                }
+                composable(Routes.SignUp.route) {
+                    SignUpScreen(
+                        navController,
+                        signUpViewModel = signUpViewModel
+                    )
+                }
+                composable(Routes.My.route) {
+                    MyScreen(
+                        navController,
+                        myViewModel = myViewModel
+                    )
+                }
                 composable(Routes.Search.route) { SearchScreen(navController) }
                 composable(Routes.Home.route) { HomeScreen(navController) }
             }