[Feat/#8] 4주차 필수 과제

app/build.gradle.kts

@@ -1,7 +1,17 @@
+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)
+    id("kotlin-kapt")
+    id("com.google.dagger.hilt.android")
+}
+
+
+val properties = Properties().apply {
+    load(project.rootProject.file("local.properties").inputStream())
 }
 
 android {
@@ -16,6 +26,7 @@ android {
         versionName = "1.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        buildConfigField("String", "BASE_URL", properties["base.url"].toString())
     }
 
     buildTypes {
@@ -36,6 +47,7 @@ android {
     }
     buildFeatures {
         compose = true
+        buildConfig = true
     }
 }
 
@@ -50,6 +62,7 @@ dependencies {
     implementation(libs.androidx.ui.tooling.preview)
     implementation(libs.androidx.material3)
     implementation(libs.androidx.navigation.runtime.ktx)
+    implementation(libs.androidx.runtime.livedata)
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
@@ -60,5 +73,19 @@ dependencies {
     implementation(libs.androidx.lifecycle.viewmodel.compose)
     implementation(libs.androidx.navigation.compose)
     implementation(libs.androidx.material)
+    // 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)
+    //hilt
+    implementation(libs.hilt.android.v2511)
+    kapt(libs.hilt.compiler.v2511)
+    implementation(libs.androidx.hilt.navigation.compose)
+}
 
+kapt {
+    correctErrorTypes = true
 }

app/src/main/AndroidManifest.xml

@@ -2,7 +2,10 @@
 <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:name=".MyApp"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
@@ -11,23 +14,11 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.ANDANDROID"
+        android:usesCleartextTraffic="true"
         tools:targetApi="31">
-        <activity
-            android:name=".presentation.ui.auth.MyActivity"
-            android:exported="false"
-            android:label="@string/title_activity_my" />
-        <activity
-            android:name=".presentation.ui.auth.SignInAcitivity"
-            android:exported="false"
-            android:label="@string/title_activity_sign_in_acitivity" />
-        <activity
-            android:name=".presentation.ui.auth.SignUpActivity"
-            android:exported="false"
-            android:label="@string/title_activity_sign_up" />
         <activity
             android:name=".MainActivity"
-            android:exported="true"
-            android:label="@string/app_name">
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

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

@@ -1,51 +1,51 @@
 package org.sopt.and
 
+import android.app.Application
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.compose.runtime.Composable
-import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
+import dagger.hilt.android.AndroidEntryPoint
+import dagger.hilt.android.HiltAndroidApp
 import org.sopt.and.navigation.AuthNavItem
 import org.sopt.and.presentation.ui.auth.SignInScreen
 import org.sopt.and.presentation.ui.auth.SignUpScreen
 import org.sopt.and.presentation.ui.main.MainScreen
-import org.sopt.and.presentation.viewmodel.SignUpViewModel
 import org.sopt.and.ui.theme.ANDANDROIDTheme
 
+@AndroidEntryPoint
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
         setContent {
             ANDANDROIDTheme {
-                val signUpViewModel: SignUpViewModel = viewModel()
-                MyApp(signUpViewModel)
+                MyAppScreen()
             }
         }
     }
 }
 
+@HiltAndroidApp
+class MyApp : Application()
+
 @Composable
-fun MyApp(signUpViewModel: SignUpViewModel) {
+fun MyAppScreen() {
     val navController = rememberNavController()
 
     NavHost(navController, startDestination = AuthNavItem.SignUp.route) {
         composable(AuthNavItem.SignUp.route) {
-            SignUpScreen(signUpViewModel = signUpViewModel, navController = navController)
+            SignUpScreen(navController = navController)
         }
-
         composable(AuthNavItem.SignIn.route) {
-            SignInScreen(signUpViewModel = signUpViewModel, navController = navController)
+            SignInScreen(navController = navController)
         }
-
         composable(AuthNavItem.Main.route) {
-            MainScreen(signUpViewModel = signUpViewModel)
+            MainScreen()
         }
-
     }
-
 }

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

@@ -0,0 +1,60 @@
+package org.sopt.and.data.api
+
+import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+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
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object ApiFactory {
+    private const val BASE_URL: String = BuildConfig.BASE_URL
+
+    @Provides
+    @Singleton
+    fun provideOkHttpClient(): OkHttpClient {
+        val loggingInterceptor = HttpLoggingInterceptor().apply {
+            level = HttpLoggingInterceptor.Level.BODY
+        }
+        return OkHttpClient.Builder()
+            .addInterceptor(loggingInterceptor)
+            .build()
+    }
+
+    @Provides
+    @Singleton
+    fun provideRetrofit(client: OkHttpClient): Retrofit {
+        return Retrofit.Builder()
+            .baseUrl(BASE_URL)
+            .client(client)
+            .addConverterFactory(Json.asConverterFactory("application/json".toMediaType()))
+            .build()
+    }
+
+    @Provides
+    @Singleton
+    fun provideUserRegistrationService(retrofit: Retrofit): UserRegistrationService {
+        return retrofit.create(UserRegistrationService::class.java)
+    }
+
+    @Provides
+    @Singleton
+    fun provideLoginService(retrofit: Retrofit): LoginService {
+        return retrofit.create(LoginService::class.java)
+    }
+
+    @Provides
+    @Singleton
+    fun provideHobbyService(retrofit: Retrofit): HobbyService {
+        return retrofit.create(HobbyService::class.java)
+    }
+
+}

app/src/main/java/org/sopt/and/data/api/AuthService.kt

@@ -0,0 +1,27 @@
+package org.sopt.and.data.api
+
+import org.sopt.and.data.dto.RequestLoginData
+import org.sopt.and.data.dto.RequestUserRegistrationData
+import org.sopt.and.data.dto.ResponseLogin
+import org.sopt.and.data.dto.ResponseUserRegistration
+import retrofit2.Response
+import retrofit2.http.Body
+import retrofit2.http.POST
+
+
+interface UserRegistrationService {
+    @POST("/user")
+    suspend fun postUserRegistration(
+        @Body userRequest: RequestUserRegistrationData
+    ): Response<ResponseUserRegistration>
+}
+
+interface LoginService {
+    @POST("/login")
+    suspend fun postLogin(
+        @Body loginRequeset: RequestLoginData
+    ): Response<ResponseLogin>
+}
+
+
+

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

@@ -0,0 +1,13 @@
+package org.sopt.and.data.api
+
+import org.sopt.and.data.dto.ResponseMyHobbyData
+import retrofit2.Response
+import retrofit2.http.GET
+import retrofit2.http.Header
+
+interface HobbyService {
+    @GET("/user/my-hobby")
+    suspend fun getHobby(
+        @Header("token") token: String?
+    ): Response<ResponseMyHobbyData>
+}

app/src/main/java/org/sopt/and/data/dto/AuthDto.kt

@@ -0,0 +1,48 @@
+package org.sopt.and.data.dto
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+/* 유저 등록 */
+@Serializable
+data class RequestUserRegistrationData(
+    @SerialName("username")
+    val userName: String,
+    @SerialName("password")
+    val password: String,
+    @SerialName("hobby")
+    val hobby: String
+)
+
+@Serializable
+data class ResponseUserRegistration(
+    @SerialName("result")
+    val result: ResultUserNo
+)
+
+@Serializable
+data class ResultUserNo(
+    @SerialName("no")
+    val no: Int
+)
+
+/* 로그인 */
+@Serializable
+data class RequestLoginData(
+    @SerialName("username")
+    val userName: String,
+    @SerialName("password")
+    val password: String
+)
+
+@Serializable
+data class ResponseLogin(
+    @SerialName("result")
+    val result: ResultToken
+)
+
+@Serializable
+data class ResultToken(
+    @SerialName("token")
+    val token: String
+)

app/src/main/java/org/sopt/and/data/dto/MyviewDto.kt

@@ -0,0 +1,17 @@
+package org.sopt.and.data.dto
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+/* 내 취미 조회 */
+@Serializable
+data class ResponseMyHobbyData(
+    @SerialName("result")
+    val result: ResponseMyHobbyDataResult
+)
+
+@Serializable
+data class ResponseMyHobbyDataResult(
+    @SerialName("hobby")
+    val hobby: String
+)

app/src/main/java/org/sopt/and/data/repository/Auth/LoginRepository.kt

@@ -0,0 +1,24 @@
+package org.sopt.and.data.repository.Auth
+
+import org.sopt.and.data.api.LoginService
+import org.sopt.and.data.dto.RequestLoginData
+import org.sopt.and.data.dto.ResponseLogin
+import javax.inject.Inject
+
+class LoginRepository @Inject constructor(
+    private val apiService: LoginService
+) {
+    suspend fun postLogin(requestData: RequestLoginData): Result<ResponseLogin> {
+        return try {
+            val response = apiService.postLogin(requestData)
+            if (response.isSuccessful) {
+                Result.success(response.body()!!)
+            } else {
+                val errorCode = response.errorBody()?.string() ?: "알수없슴"
+                Result.failure(Exception("Error code : ${response.code()}, 에러 코드 : $errorCode"))
+            }
+        } catch (e: Exception) {
+            Result.failure(e)
+        }
+    }
+}

app/src/main/java/org/sopt/and/data/repository/Auth/UserRegistrationRepository.kt

@@ -0,0 +1,24 @@
+package org.sopt.and.data.repository.Auth
+
+import org.sopt.and.data.api.UserRegistrationService
+import org.sopt.and.data.dto.RequestUserRegistrationData
+import org.sopt.and.data.dto.ResponseUserRegistration
+import javax.inject.Inject
+
+class UserRegistrationRepository @Inject constructor(
+    private val apiService: UserRegistrationService
+) {
+    suspend fun postUserRegistration(requestData: RequestUserRegistrationData): Result<ResponseUserRegistration> {
+        return try {
+            val response = apiService.postUserRegistration(requestData)
+            if (response.isSuccessful) {
+                Result.success(response.body()!!)
+            } else {
+                val errorCode = response.errorBody()?.string() ?: "알수없슴"
+                Result.failure(Exception("Error code : ${response.code()}, 에러 코드 : $errorCode"))
+            }
+        } catch (e: Exception) {
+            Result.failure(e)
+        }
+    }
+}