[feat/#9] 4주차 필수 과제 구현

app/build.gradle.kts

@@ -1,3 +1,5 @@
+import java.util.Properties
+
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
@@ -7,6 +9,10 @@ plugins {
     alias(libs.plugins.kotlin.serialization)
 }
 
+val properties = Properties().apply {
+    load(rootProject.file("local.properties").inputStream())
+}
+
 android {
     namespace = "org.sopt.and"
     compileSdk = 34
@@ -19,6 +25,12 @@ android {
         versionName = "1.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+
+        buildConfigField(
+            "String",
+            "BASE_URL",
+            properties.getProperty("base.url")
+        )
     }
 
     buildTypes {
@@ -39,6 +51,7 @@ android {
     }
     buildFeatures {
         compose = true
+        buildConfig = true
     }
 }
 
@@ -83,4 +96,12 @@ dependencies {
 
     //coil
     implementation(libs.coil)
+
+    //retrofit
+    implementation(libs.okhttp)
+    implementation(libs.okhttp.logging)
+    implementation(platform(libs.okhttp.bom))
+    implementation(libs.retrofit)
+    implementation(libs.retrofit)
+    implementation(libs.retrofit.kotlinx.serialization.converter)
 }

app/src/main/AndroidManifest.xml

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

app/src/main/java/org/sopt/and/core/designsystem/component/dialog/SearchDialog.kt

@@ -13,11 +13,11 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import org.sopt.and.R
-import org.sopt.and.core.data.repositoryimpl.DummyPopularProgramRepositoryImpl
 import org.sopt.and.core.designsystem.component.BasicPreview
 import org.sopt.and.core.designsystem.theme.Grey500
 import org.sopt.and.core.extension.noRippleClickable
 import org.sopt.and.core.model.Program
+import org.sopt.and.data.repositoryimpl.DummyPopularProgramRepositoryImpl
 import org.sopt.and.presentation.search.component.SearchItem
 
 @Composable

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

@@ -17,6 +17,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.VisualTransformation
@@ -26,8 +27,8 @@ import androidx.compose.ui.unit.dp
 fun WavveBasicTextField(
     value: String,
     hint: String,
-    cursorBrush: Brush,
     modifier: Modifier = Modifier,
+    cursorBrush: Brush = SolidColor(Color.Blue),
     hintColor: Color = Color.LightGray,
     valueColor: Color = Color.White,
     onValueChange: (String) -> Unit = {},

app/src/main/java/org/sopt/and/core/preference/PreferenceUtil.kt

@@ -11,25 +11,20 @@ class PreferenceUtil(
         PREF_NAME, Context.MODE_PRIVATE
     )
 
-    var id: String
-        get() = preference.getString(ID, DEFAULT_STRING).toString()
-        set(value) = preference.edit().putString(ID, value).apply()
+    var token: String
+        get() = preference.getString(TOKEN, DEFAULT_STRING).toString()
+        set(value) = preference.edit().putString(TOKEN, value).apply()
 
-    var password: String
-        get() = preference.getString(PASSWORD, DEFAULT_STRING).toString()
-        set(value) = preference.edit().putString(PASSWORD, value).apply()
-
-    fun clearIdPassword() {
-        id = ""
-        password = ""
+    fun clearToken() {
+        token = ""
     }
 
     companion object {
         private const val PREF_NAME = "wavve_prefs"
-        private const val ID = "ID"
-        private const val PASSWORD = "PASSWORD"
+        private const val TOKEN = "TOKEN"
         private const val DEFAULT_STRING = ""
 
+
         val LocalPreference = staticCompositionLocalOf<PreferenceUtil> {
             error("PreferenceUtil is not initialized")
         }

app/src/main/java/org/sopt/and/data/datasource/AuthDataSource.kt

@@ -0,0 +1,18 @@
+package org.sopt.and.data.datasource
+
+import org.sopt.and.data.dto.BaseResponse
+import org.sopt.and.data.dto.request.SignInRequestDto
+import org.sopt.and.data.dto.request.SignUpRequestDto
+import org.sopt.and.data.dto.response.SignInResponseDto
+import org.sopt.and.data.dto.response.SignUpResponseDto
+import retrofit2.Call
+
+interface AuthDataSource {
+    fun postSignUp(
+        request: SignUpRequestDto
+    ): Call<BaseResponse<SignUpResponseDto>>
+
+    fun postSignIn(
+        request: SignInRequestDto
+    ): Call<BaseResponse<SignInResponseDto>>
+}

app/src/main/java/org/sopt/and/data/datasource/UserDataSource.kt

@@ -0,0 +1,9 @@
+package org.sopt.and.data.datasource
+
+import org.sopt.and.data.dto.BaseResponse
+import org.sopt.and.data.dto.response.MyHobbyResponseDto
+import retrofit2.Call
+
+interface UserDataSource {
+    fun getMyHobby(token: String): Call<BaseResponse<MyHobbyResponseDto>>
+}

app/src/main/java/org/sopt/and/data/datasourceImpl/AuthDataSourceImpl.kt

@@ -0,0 +1,18 @@
+package org.sopt.and.data.datasourceImpl
+
+import org.sopt.and.data.datasource.AuthDataSource
+import org.sopt.and.data.dto.BaseResponse
+import org.sopt.and.data.dto.request.SignInRequestDto
+import org.sopt.and.data.dto.request.SignUpRequestDto
+import org.sopt.and.data.dto.response.SignInResponseDto
+import org.sopt.and.data.dto.response.SignUpResponseDto
+import org.sopt.and.data.remote.AuthService
+import retrofit2.Call
+import javax.inject.Inject
+
+class AuthDataSourceImpl @Inject constructor(
+    private val userService: AuthService
+): AuthDataSource {
+    override fun postSignUp(request: SignUpRequestDto): Call<BaseResponse<SignUpResponseDto>> = userService.signUp(request)
+    override fun postSignIn(request: SignInRequestDto): Call<BaseResponse<SignInResponseDto>> = userService.signIn(request)
+}

app/src/main/java/org/sopt/and/data/datasourceImpl/UserDataSourceImpl.kt

@@ -0,0 +1,15 @@
+package org.sopt.and.data.datasourceImpl
+
+import org.sopt.and.data.datasource.UserDataSource
+import org.sopt.and.data.dto.BaseResponse
+import org.sopt.and.data.dto.response.MyHobbyResponseDto
+import org.sopt.and.data.remote.UserService
+import retrofit2.Call
+import javax.inject.Inject
+
+class UserDataSourceImpl @Inject constructor(
+    private val userService: UserService
+) : UserDataSource {
+    override fun getMyHobby(token: String): Call<BaseResponse<MyHobbyResponseDto>> =
+        userService.getMyHobby(token)
+}

app/src/main/java/org/sopt/and/core/data/di/DBModule.kt → app/src/main/java/org/sopt/and/data/di/DBModule.kt

@@ -1,12 +1,12 @@
-package org.sopt.and.core.data.di
+package org.sopt.and.data.di
 
 import android.content.Context
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
-import org.sopt.and.core.data.local.database.StarredProgramDatabase
+import org.sopt.and.data.local.database.StarredProgramDatabase
 import javax.inject.Singleton
 
 @InstallIn(SingletonComponent::class)

app/src/main/java/org/sopt/and/data/di/DataSourceModule.kt

@@ -0,0 +1,29 @@
+package org.sopt.and.data.di
+
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import org.sopt.and.data.datasource.AuthDataSource
+import org.sopt.and.data.datasource.UserDataSource
+import org.sopt.and.data.datasourceImpl.AuthDataSourceImpl
+import org.sopt.and.data.datasourceImpl.UserDataSourceImpl
+import javax.inject.Singleton
+
+@InstallIn(SingletonComponent::class)
+@Module
+abstract class DataSourceModule {
+
+    @Binds
+    @Singleton
+    abstract fun bindsAuthDataSource(
+        authDataSourceImpl: AuthDataSourceImpl
+    ): AuthDataSource
+
+    @Binds
+    @Singleton
+    abstract fun bindsUserDataSource(
+        userDataSourceImpl: UserDataSourceImpl
+    ): UserDataSource
+
+}

app/src/main/java/org/sopt/and/data/di/RepositoryModule.kt

@@ -0,0 +1,62 @@
+package org.sopt.and.data.di
+
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import org.sopt.and.data.repositoryimpl.DummyPopularProgramRepositoryImpl
+import org.sopt.and.data.repositoryimpl.DummyRecommendationRepositoryImpl
+import org.sopt.and.data.repositoryimpl.MyHobbyRepositoryImpl
+import org.sopt.and.data.repositoryimpl.SignInRepositoryImpl
+import org.sopt.and.data.repositoryimpl.SignUpRepositoryImpl
+import org.sopt.and.data.repositoryimpl.StarredProgramRepositoryImpl
+import org.sopt.and.domain.repository.MyHobbyRepository
+import org.sopt.and.domain.repository.PopularProgramRepository
+import org.sopt.and.domain.repository.RecommendationRepository
+import org.sopt.and.domain.repository.SignInRepository
+import org.sopt.and.domain.repository.SignUpRepository
+import org.sopt.and.domain.repository.StarredProgramRepository
+import javax.inject.Singleton
+
+@InstallIn(SingletonComponent::class)
+@Module
+abstract class RepositoryModule() {
+
+    @Binds
+    @Singleton
+    abstract fun bindsDummyRecommendationRepository(
+        recommendationRepositoryImpl: DummyRecommendationRepositoryImpl
+    ): RecommendationRepository
+
+    @Binds
+    @Singleton
+    abstract fun bindsDummyPopularProgramRepository(
+        popularProgramRepositoryImpl: DummyPopularProgramRepositoryImpl
+    ): PopularProgramRepository
+
+    @Binds
+    @Singleton
+    abstract fun bindsStarredProgramRepository(
+        starredProgramRepositoryImpl: StarredProgramRepositoryImpl
+    ): StarredProgramRepository
+
+    @Binds
+    @Singleton
+    abstract fun bindsSignUpRepository(
+        signUpRepositoryImpl: SignUpRepositoryImpl
+    ): SignUpRepository
+
+
+    @Binds
+    @Singleton
+    abstract fun bindsSignInRepository(
+        signInRepositoryImpl: SignInRepositoryImpl
+    ): SignInRepository
+
+    @Binds
+    @Singleton
+    abstract fun bindsMyHobbyRepository(
+        myHobbyRepositoryImpl: MyHobbyRepositoryImpl
+    ): MyHobbyRepository
+
+}

app/src/main/java/org/sopt/and/data/di/RetrofitModule.kt

@@ -0,0 +1,49 @@
+package org.sopt.and.data.di
+
+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.BASE_URL
+import retrofit2.Converter
+import retrofit2.Retrofit
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object RetrofitModule {
+
+    @Provides
+    @Singleton
+    fun providesLoggingInterceptor() = HttpLoggingInterceptor().apply {
+        level = HttpLoggingInterceptor.Level.BODY
+    }
+
+    @Provides
+    @Singleton
+    fun providesOkHttpClient(
+        loggingInterceptor: HttpLoggingInterceptor
+    ): OkHttpClient = OkHttpClient.Builder()
+            .addInterceptor(loggingInterceptor)
+            .build()
+
+    @Provides
+    @Singleton
+    fun providesConverterFactory(): Converter.Factory = Json.asConverterFactory("application/json".toMediaType())
+
+    @Provides
+    @Singleton
+    fun providesRetrofit(
+        client: OkHttpClient,
+        converterFactory: Converter.Factory
+    ): Retrofit = Retrofit.Builder()
+            .baseUrl(BASE_URL)
+            .client(client)
+            .addConverterFactory(converterFactory)
+            .build()
+}