[FEAT/#9] 6주차 과제

app/build.gradle.kts

@@ -5,6 +5,8 @@ plugins {
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.kotlin.serialization)
+    alias(libs.plugins.hilt.android)
+    id("kotlin-kapt")
 }
 
 val properties = Properties().apply {
@@ -46,6 +48,9 @@ android {
         compose = true
         buildConfig = true
     }
+    hilt {
+        enableAggregatingTask = false
+    }
 }
 
 dependencies {
@@ -75,4 +80,9 @@ dependencies {
     implementation(libs.retrofit)
     implementation(libs.retrofit.kotlin.serialization.converter)
     implementation(libs.kotlinx.serialization.json)
+
+    // Hilt
+    implementation(libs.hilt.android)
+    implementation(libs.hilt.navigation.compose)
+    kapt(libs.hilt.compiler)
 }

app/src/main/AndroidManifest.xml

@@ -5,6 +5,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
+        android:name=".WavveApplication"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"

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

@@ -16,15 +16,17 @@ import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
+import dagger.hilt.android.AndroidEntryPoint
 import org.sopt.and.feature.nav.BottomNavigation
 import org.sopt.and.feature.signin.SignInScreen
 import org.sopt.and.feature.signup.SignUpScreen
 import org.sopt.and.ui.theme.ANDANDROIDTheme
-import org.sopt.and.utils.KeyStorage.AUTH_PREFS
-import org.sopt.and.utils.KeyStorage.HOME
-import org.sopt.and.utils.KeyStorage.SIGN_IN
-import org.sopt.and.utils.KeyStorage.SIGN_UP
+import org.sopt.and.core.utils.KeyStorage.AUTH_PREFS
+import org.sopt.and.core.utils.KeyStorage.HOME
+import org.sopt.and.core.utils.KeyStorage.SIGN_IN
+import org.sopt.and.core.utils.KeyStorage.SIGN_UP
 
+@AndroidEntryPoint
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)

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

@@ -0,0 +1,7 @@
+package org.sopt.and
+
+import android.app.Application
+import dagger.hilt.android.HiltAndroidApp
+
+@HiltAndroidApp
+class WavveApplication : Application()

app/src/main/java/org/sopt/and/component/AutoSlidingRow.kt → app/src/main/java/org/sopt/and/core/designsystem/component/AutoSlidingRow.kt

@@ -1,4 +1,4 @@
-package org.sopt.and.component
+package org.sopt.and.core.designsystem.component
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background

app/src/main/java/org/sopt/and/component/HomeRowItemTitle.kt → app/src/main/java/org/sopt/and/core/designsystem/component/HomeRowItemTitle.kt

@@ -1,4 +1,4 @@
-package org.sopt.and.component
+package org.sopt.and.core.designsystem.component
 
 import androidx.annotation.StringRes
 import androidx.compose.foundation.Image

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

@@ -1,4 +1,4 @@
-package org.sopt.and.component
+package org.sopt.and.core.designsystem.component
 
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes

app/src/main/java/org/sopt/and/component/RecommendationRow.kt → app/src/main/java/org/sopt/and/core/designsystem/component/RecommendationRow.kt

@@ -1,4 +1,4 @@
-package org.sopt.and.component
+package org.sopt.and.core.designsystem.component
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Arrangement

app/src/main/java/org/sopt/and/component/SocialLoginItem.kt → app/src/main/java/org/sopt/and/core/designsystem/component/SocialLoginItem.kt

@@ -1,4 +1,4 @@
-package org.sopt.and.component
+package org.sopt.and.core.designsystem.component
 
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes

app/src/main/java/org/sopt/and/component/TabMenu.kt → app/src/main/java/org/sopt/and/core/designsystem/component/TabMenu.kt

@@ -1,4 +1,4 @@
-package org.sopt.and.component
+package org.sopt.and.core.designsystem.component
 
 import androidx.compose.material3.ScrollableTabRow
 import androidx.compose.material3.Tab
@@ -15,7 +15,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import org.sopt.and.R
-import org.sopt.and.model.TabMenuItem
+import org.sopt.and.feature.model.TabMenuItem
 
 @Composable
 fun TabMenu(

app/src/main/java/org/sopt/and/component/TextField.kt → app/src/main/java/org/sopt/and/core/designsystem/component/TextField.kt

@@ -1,4 +1,4 @@
-package org.sopt.and.component
+package org.sopt.and.core.designsystem.component
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.fillMaxWidth

app/src/main/java/org/sopt/and/component/TodayTop20Row.kt → app/src/main/java/org/sopt/and/core/designsystem/component/TodayTop20Row.kt

@@ -1,4 +1,4 @@
-package org.sopt.and.component
+package org.sopt.and.core.designsystem.component
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Arrangement

app/src/main/java/org/sopt/and/component/TopBar.kt → app/src/main/java/org/sopt/and/core/designsystem/component/TopBar.kt

@@ -1,4 +1,4 @@
-package org.sopt.and.component
+package org.sopt.and.core.designsystem.component
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background

app/src/main/java/org/sopt/and/utils/KeyStorage.kt → app/src/main/java/org/sopt/and/core/utils/KeyStorage.kt

@@ -1,4 +1,4 @@
-package org.sopt.and.utils
+package org.sopt.and.core.utils
 
 object KeyStorage {
     const val TEXTFIELD_MAX_LENGTH = 8

app/src/main/java/org/sopt/and/utils/ContextExt.kt → app/src/main/java/org/sopt/and/core/utils/context/ContextExt.kt

@@ -1,4 +1,4 @@
-package org.sopt.and.utils
+package org.sopt.and.core.utils.context
 
 import android.content.Context
 import android.widget.Toast

app/src/main/java/org/sopt/and/utils/ModifierExt.kt → app/src/main/java/org/sopt/and/core/utils/modifier/ModifierExt.kt

@@ -1,4 +1,4 @@
-package org.sopt.and.utils
+package org.sopt.and.core.utils.modifier
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource

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

@@ -0,0 +1,16 @@
+package org.sopt.and.data.datasource
+
+import org.sopt.and.data.dto.request.RequestSignInDto
+import org.sopt.and.data.dto.request.RequestSignUpDto
+import org.sopt.and.data.dto.response.BaseResponse
+import org.sopt.and.data.dto.response.ResponseHobbyDto
+import org.sopt.and.data.dto.response.ResponseSignInDto
+import org.sopt.and.data.dto.response.ResponseSignUpDto
+
+interface AuthDataSource {
+    suspend fun signUp(request: RequestSignUpDto): BaseResponse<ResponseSignUpDto>
+
+    suspend fun signIn(request: RequestSignInDto): BaseResponse<ResponseSignInDto>
+
+    suspend fun getHobby(request: String): BaseResponse<ResponseHobbyDto>
+}

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

@@ -0,0 +1,24 @@
+package org.sopt.and.data.datasourceimpl
+
+import org.sopt.and.data.datasource.AuthDataSource
+import org.sopt.and.data.dto.request.RequestSignInDto
+import org.sopt.and.data.dto.request.RequestSignUpDto
+import org.sopt.and.data.dto.response.BaseResponse
+import org.sopt.and.data.dto.response.ResponseHobbyDto
+import org.sopt.and.data.dto.response.ResponseSignInDto
+import org.sopt.and.data.dto.response.ResponseSignUpDto
+import org.sopt.and.data.service.AuthService
+import javax.inject.Inject
+
+class AuthDataSourceImpl @Inject constructor(
+    private val authService: AuthService
+) : AuthDataSource {
+    override suspend fun signUp(request: RequestSignUpDto): BaseResponse<ResponseSignUpDto> =
+        authService.signUp(request)
+
+    override suspend fun signIn(request: RequestSignInDto): BaseResponse<ResponseSignInDto> =
+        authService.signIn(request)
+
+    override suspend fun getHobby(request: String): BaseResponse<ResponseHobbyDto> =
+        authService.getHobby(request)
+}

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

@@ -0,0 +1,18 @@
+package org.sopt.and.data.di
+
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import org.sopt.and.data.service.AuthService
+import retrofit2.Retrofit
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object ApiModule {
+    @Provides
+    @Singleton
+    fun provideAuthService(retrofit: Retrofit): AuthService =
+        retrofit.create(AuthService::class.java)
+}

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

@@ -0,0 +1,17 @@
+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.datasourceimpl.AuthDataSourceImpl
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class DataSourceModule {
+    @Binds
+    @Singleton
+    abstract fun bindsAuthDataSource(authDataSourceImpl: AuthDataSourceImpl): AuthDataSource
+}

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

@@ -0,0 +1,74 @@
+package org.sopt.and.data.di
+
+import android.content.Context
+import android.content.SharedPreferences
+import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import kotlinx.serialization.ExperimentalSerializationApi
+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 java.util.concurrent.TimeUnit
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object NetworkModule {
+    @Provides
+    @Singleton
+    fun providesOkHttpClient(
+        loggingInterceptor: HttpLoggingInterceptor,
+        // authInterceptor: Interceptor
+    ): OkHttpClient =
+        OkHttpClient.Builder().apply {
+            connectTimeout(10, TimeUnit.SECONDS)
+            writeTimeout(10, TimeUnit.SECONDS)
+            readTimeout(10, TimeUnit.SECONDS)
+            // addInterceptor(authInterceptor)
+        }.build()
+
+    @Provides
+    @Singleton
+    fun providesJson(): Json =
+        Json {
+            isLenient = true
+            prettyPrint = true
+            explicitNulls = false
+            ignoreUnknownKeys = true
+        }
+
+    @Provides
+    @Singleton
+    fun provideLoggingInterceptor(): HttpLoggingInterceptor = HttpLoggingInterceptor().apply {
+        level = HttpLoggingInterceptor.Level.BODY
+    }
+
+    @ExperimentalSerializationApi
+    @Provides
+    @Singleton
+    fun provideRetrofit(
+        okHttpClient: OkHttpClient,
+        json: Json
+    ): Retrofit {
+        return Retrofit.Builder()
+            .baseUrl(BuildConfig.BASE_URL)
+            .client(okHttpClient)
+            .addConverterFactory(json.asConverterFactory("application/json".toMediaType()))
+            .build()
+    }
+
+    @Provides
+    @Singleton
+    fun provideSharedPreferences(
+        @ApplicationContext context: Context
+    ): SharedPreferences {
+        return context.getSharedPreferences("APP_PREFS", Context.MODE_PRIVATE)
+    }
+}

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

@@ -0,0 +1,17 @@
+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.AuthRepositoryImpl
+import org.sopt.and.domain.repository.AuthRepository
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class RepositoryModule {
+    @Binds
+    @Singleton
+    abstract fun bindAuthRepository(authRepositoryImpl: AuthRepositoryImpl): AuthRepository
+}

app/src/main/java/org/sopt/and/api/dto/request/RequestSignInDto.kt → app/src/main/java/org/sopt/and/data/dto/request/RequestSignInDto.kt

@@ -1,4 +1,4 @@
-package org.sopt.and.api.dto.request
+package org.sopt.and.data.dto.request
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

app/src/main/java/org/sopt/and/api/dto/request/RequestSignUpDto.kt → app/src/main/java/org/sopt/and/data/dto/request/RequestSignUpDto.kt

@@ -1,4 +1,4 @@
-package org.sopt.and.api.dto.request
+package org.sopt.and.data.dto.request
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

app/src/main/java/org/sopt/and/api/dto/response/BaseResponse.kt → app/src/main/java/org/sopt/and/data/dto/response/BaseResponse.kt

@@ -1,4 +1,4 @@
-package org.sopt.and.api.dto.response
+package org.sopt.and.data.dto.response
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

app/src/main/java/org/sopt/and/api/dto/response/ResponseErrorDto.kt → app/src/main/java/org/sopt/and/data/dto/response/ResponseErrorDto.kt

@@ -1,4 +1,4 @@
-package org.sopt.and.api.dto.response
+package org.sopt.and.data.dto.response
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

app/src/main/java/org/sopt/and/api/dto/response/ResponseHobbyDto.kt → app/src/main/java/org/sopt/and/data/dto/response/ResponseHobbyDto.kt

@@ -1,4 +1,4 @@
-package org.sopt.and.api.dto.response
+package org.sopt.and.data.dto.response
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable