Refactor/clean architecture

app/build.gradle

@@ -2,25 +2,22 @@ plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
     id 'org.jetbrains.kotlin.plugin.serialization' version '1.8.20'
+    id 'kotlin-kapt'
+    id 'com.google.dagger.hilt.android'
 }
 
-Properties properties = new Properties()
-properties.load(project.rootProject.file('local.properties').newDataInputStream())
-
 android {
     namespace 'org.sopt.dosopttemplate'
     compileSdk 34
 
     defaultConfig {
         applicationId "org.sopt.dosopttemplate"
         minSdk 28
-        targetSdk 33
+        targetSdk 34
         versionCode 1
         versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-
-        buildConfigField "String", "AUTH_BASE_URL", properties["base.url"]
     }
 
     buildFeatures {
@@ -36,11 +33,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '11'
+        jvmTarget = '17'
     }
 }
 
@@ -73,4 +70,13 @@ dependencies {
     implementation("com.squareup.okhttp3:logging-interceptor")
 
     implementation("com.github.bumptech.glide:glide:4.16.0")
+
+    implementation "androidx.core:core-ktx:x.y.z"
+
+    implementation 'androidx.room:room-runtime:2.6.1'
+    kapt 'androidx.room:room-compiler:2.6.1'
+    implementation "androidx.room:room-ktx:2.6.1"
+
+    implementation 'com.google.dagger:hilt-android:2.50'
+    kapt 'com.google.dagger:hilt-compiler:2.50'
 }

app/src/main/AndroidManifest.xml

@@ -5,6 +5,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
+        android:name=".presentation.MyApplication"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
@@ -23,7 +24,8 @@
 
         <activity
             android:name=".presentation.login.LoginActivity"
-            android:exported="true">
+            android:exported="true"
+            android:windowSoftInputMode="adjustResize">
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -33,7 +35,8 @@
         </activity>
         <activity
             android:name=".presentation.signup.SignUpActivity"
-            android:exported="false" />
+            android:exported="false"
+            android:windowSoftInputMode="adjustResize" />
     </application>
 
 </manifest>

app/src/main/java/org/sopt/dosopttemplate/data/local/AppDatabase.kt

@@ -0,0 +1,11 @@
+package org.sopt.dosopttemplate.data.local
+
+import androidx.room.Database
+import androidx.room.RoomDatabase
+import org.sopt.dosopttemplate.data.local.dao.UserInfoDao
+import org.sopt.dosopttemplate.data.local.entity.UserInfoEntity
+
+@Database(entities = [UserInfoEntity::class], version = 1)
+abstract class AppDatabase : RoomDatabase() {
+    abstract fun userInfoDao(): UserInfoDao
+}

app/src/main/java/org/sopt/dosopttemplate/data/local/dao/UserInfoDao.kt

@@ -0,0 +1,18 @@
+package org.sopt.dosopttemplate.data.local.dao
+
+import androidx.room.Dao
+import androidx.room.Entity
+import androidx.room.Insert
+import androidx.room.Query
+import kotlinx.coroutines.flow.Flow
+import org.sopt.dosopttemplate.data.local.entity.UserInfoEntity
+
+@Entity
+@Dao
+interface UserInfoDao {
+    @Insert
+    fun saveUserInfo(userInfoEntity: UserInfoEntity)
+
+    @Query("SELECT * FROM user_info LIMIT 1")
+    fun getUserInfo(): Flow<UserInfoEntity>
+}

app/src/main/java/org/sopt/dosopttemplate/data/local/datasource/RoomDataSource.kt

@@ -0,0 +1,9 @@
+package org.sopt.dosopttemplate.data.local.datasource
+
+import kotlinx.coroutines.flow.Flow
+import org.sopt.dosopttemplate.data.local.entity.UserInfoEntity
+
+interface RoomDataSource {
+    fun saveUserInfo(userInfoEntity: UserInfoEntity)
+    fun getUserInfo(): Flow<UserInfoEntity>
+}

app/src/main/java/org/sopt/dosopttemplate/data/local/datasourceimpl/RoomDataSourceImpl.kt

@@ -0,0 +1,19 @@
+package org.sopt.dosopttemplate.data.local.datasourceimpl
+
+import kotlinx.coroutines.flow.Flow
+import org.sopt.dosopttemplate.data.local.dao.UserInfoDao
+import org.sopt.dosopttemplate.data.local.datasource.RoomDataSource
+import org.sopt.dosopttemplate.data.local.entity.UserInfoEntity
+import javax.inject.Inject
+
+class RoomDataSourceImpl @Inject constructor(
+    private val userInfoDao: UserInfoDao
+) : RoomDataSource {
+    override fun saveUserInfo(userInfoEntity: UserInfoEntity) {
+        userInfoDao.saveUserInfo(userInfoEntity)
+    }
+
+    override fun getUserInfo(): Flow<UserInfoEntity> {
+        return userInfoDao.getUserInfo()
+    }
+}

app/src/main/java/org/sopt/dosopttemplate/data/local/entity/UserInfoEntity.kt

@@ -0,0 +1,25 @@
+package org.sopt.dosopttemplate.data.local.entity
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import kotlinx.coroutines.flow.Flow
+import org.sopt.dosopttemplate.domain.model.UserInfo
+
+@Entity(tableName = "user_info")
+data class UserInfoEntity(
+    @PrimaryKey(autoGenerate = true)
+    val userNum: Long = 0,
+    val nickName: String,
+    val id: String,
+    val password: String,
+    val mbti: String,
+) {
+    fun toUserInfo(): UserInfo {
+        return UserInfo(
+            nickName = this.nickName,
+            id = this.id,
+            password = this.password,
+            mbti = this.mbti
+        )
+    }
+}

app/src/main/java/org/sopt/dosopttemplate/data/local/repositoryimpl/UserInfoRepositoryImpl.kt

@@ -0,0 +1,31 @@
+package org.sopt.dosopttemplate.data.local.repositoryimpl
+
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import org.sopt.dosopttemplate.data.local.dao.UserInfoDao
+import org.sopt.dosopttemplate.data.local.entity.UserInfoEntity
+import org.sopt.dosopttemplate.domain.model.UserInfo
+import org.sopt.dosopttemplate.domain.repository.UserInfoRepository
+import javax.inject.Inject
+
+class UserInfoRepositoryImpl @Inject constructor(
+    private val userDao: UserInfoDao
+) : UserInfoRepository {
+
+    override fun saveUserInfo(userInfo: UserInfo) {
+        userDao.saveUserInfo(
+            userInfoEntity = UserInfoEntity(
+                id = userInfo.id,
+                password = userInfo.password,
+                nickName = userInfo.nickName,
+                mbti = userInfo.mbti
+            )
+        )
+    }
+
+    override fun getUserInfo(): Flow<UserInfo> {
+        return userDao.getUserInfo().map { userInfoEntity ->
+            userInfoEntity.toUserInfo()
+        }
+    }
+}

app/src/main/java/org/sopt/dosopttemplate/data/ApiManager.kt → app/src/main/java/org/sopt/dosopttemplate/data/remote/ApiManager.kt

@@ -1,20 +1,11 @@
-package org.sopt.dosopttemplate.data
+package org.sopt.dosopttemplate.data.remote
 
 import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
 import kotlinx.serialization.json.Json
 import okhttp3.MediaType.Companion.toMediaType
-import org.sopt.dosopttemplate.BuildConfig
 import retrofit2.Retrofit
 
 object ApiManager {
-    private const val BASE_URL = BuildConfig.AUTH_BASE_URL
-
-    val retrofit: Retrofit by lazy {
-        Retrofit.Builder()
-            .baseUrl(BASE_URL)
-            .addConverterFactory(Json.asConverterFactory("application/json".toMediaType()))
-            .build()
-    }
 
     val retrofitTest: Retrofit by lazy {
         Retrofit.Builder()
@@ -23,7 +14,5 @@ object ApiManager {
             .build()
     }
 
-    inline fun <reified T> create(): T = retrofit.create<T>(T::class.java)
-
     inline fun <reified T> createTest(): T = retrofitTest.create<T>(T::class.java)
 }

app/src/main/java/org/sopt/dosopttemplate/data/api/UserService.kt → app/src/main/java/org/sopt/dosopttemplate/data/remote/api/UserService.kt

@@ -1,6 +1,6 @@
-package org.sopt.dosopttemplate.data.api
+package org.sopt.dosopttemplate.data.remote.api
 
-import org.sopt.dosopttemplate.data.model.response.ResponseUser
+import org.sopt.dosopttemplate.data.remote.model.response.ResponseUser
 import retrofit2.Response
 import retrofit2.http.GET
 import retrofit2.http.Query

app/src/main/java/org/sopt/dosopttemplate/data/model/request/RequestSignIn.kt → app/src/main/java/org/sopt/dosopttemplate/data/remote/model/request/RequestSignIn.kt

@@ -1,4 +1,4 @@
-package org.sopt.dosopttemplate.data.model.request
+package org.sopt.dosopttemplate.data.remote.model.request
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

app/src/main/java/org/sopt/dosopttemplate/data/model/request/RequestSignUp.kt → app/src/main/java/org/sopt/dosopttemplate/data/remote/model/request/RequestSignUp.kt

@@ -1,4 +1,4 @@
-package org.sopt.dosopttemplate.data.model.request
+package org.sopt.dosopttemplate.data.remote.model.request
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

app/src/main/java/org/sopt/dosopttemplate/data/model/response/ResponseError.kt → app/src/main/java/org/sopt/dosopttemplate/data/remote/model/response/ResponseError.kt

@@ -1,4 +1,4 @@
-package org.sopt.dosopttemplate.data.model.response
+package org.sopt.dosopttemplate.data.remote.model.response
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

app/src/main/java/org/sopt/dosopttemplate/data/model/response/ResponseSignIn.kt → app/src/main/java/org/sopt/dosopttemplate/data/remote/model/response/ResponseSignIn.kt

@@ -1,4 +1,4 @@
-package org.sopt.dosopttemplate.data.model.response
+package org.sopt.dosopttemplate.data.remote.model.response
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

app/src/main/java/org/sopt/dosopttemplate/data/model/response/ResponseUser.kt → app/src/main/java/org/sopt/dosopttemplate/data/remote/model/response/ResponseUser.kt

@@ -1,4 +1,4 @@
-package org.sopt.dosopttemplate.data.model.response
+package org.sopt.dosopttemplate.data.remote.model.response
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

app/src/main/java/org/sopt/dosopttemplate/di/DatabaseModule.kt

@@ -0,0 +1,39 @@
+package org.sopt.dosopttemplate.di
+
+import android.content.Context
+import androidx.room.Room
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import org.sopt.dosopttemplate.data.local.AppDatabase
+import org.sopt.dosopttemplate.data.local.dao.UserInfoDao
+import org.sopt.dosopttemplate.data.local.datasource.RoomDataSource
+import org.sopt.dosopttemplate.data.local.datasourceimpl.RoomDataSourceImpl
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class DatabaseModule {
+
+    companion object {
+        @Singleton
+        @Provides
+        fun provideAppDatabase(@ApplicationContext context: Context): AppDatabase {
+            return Room.databaseBuilder(context, AppDatabase::class.java, "user_info").build()
+        }
+
+        @Singleton
+        @Provides
+        fun provideRoomDataSource(impl: RoomDataSourceImpl): RoomDataSource {
+            return impl
+        }
+
+        @Singleton
+        @Provides
+        fun provideUserInfoDao(appDatabase: AppDatabase): UserInfoDao {
+            return appDatabase.userInfoDao()
+        }
+    }
+}

app/src/main/java/org/sopt/dosopttemplate/di/RepositoryModule.kt

@@ -0,0 +1,17 @@
+package org.sopt.dosopttemplate.di
+
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import org.sopt.dosopttemplate.data.local.repositoryimpl.UserInfoRepositoryImpl
+import org.sopt.dosopttemplate.domain.repository.UserInfoRepository
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class RepositoryModule {
+    @Singleton
+    @Binds
+    abstract fun provideUserInfoRepositoryImpl(userInfoRepositoryImpl: UserInfoRepositoryImpl): UserInfoRepository
+}

app/src/main/java/org/sopt/dosopttemplate/domain/model/UserInfo.kt

@@ -0,0 +1,8 @@
+package org.sopt.dosopttemplate.domain.model
+
+data class UserInfo(
+    val nickName: String,
+    val id: String,
+    val password: String,
+    val mbti: String,
+)