충남대 Android_정기주 5주차 Step1

README.md

@@ -1 +1,4 @@
 # android-map-refactoring
+
+- 데이터베이스를 Room으로 변경한다.
+- 가능한 모든 부분에 대해서 의존성 주입을 적용한다

app/build.gradle.kts

@@ -4,6 +4,8 @@ plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
     id("kotlin-parcelize")
+    id("kotlin-kapt")
+    id("com.google.dagger.hilt.android")
 }
 
 android {
@@ -61,7 +63,14 @@ dependencies {
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.1.5")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
-    androidTestImplementation ("androidx.test.espresso:espresso-intents:3.4.0")
+    androidTestImplementation("androidx.test.espresso:espresso-intents:3.4.0")
+    implementation("androidx.room:room-runtime:2.6.1")
+    kapt("androidx.room:room-compiler:2.6.1")
+    implementation("androidx.room:room-ktx:2.4.2")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0")
+    implementation("com.google.dagger:hilt-android:2.48.1")
+    kapt("com.google.dagger:hilt-compiler:2.48.1")
+    implementation("androidx.activity:activity-ktx:1.2.3")
 }
 
 fun getApiKey(key: String): String = gradleLocalProperties(rootDir, providers).getProperty(key)

app/src/main/AndroidManifest.xml

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

app/src/main/java/campus/tech/kakao/map/AppModule.kt

@@ -0,0 +1,48 @@
+package campus.tech.kakao.map
+
+import android.content.Context
+import campus.tech.kakao.map.model.KakaoLocalService
+import campus.tech.kakao.map.repository.MapRepository
+import campus.tech.kakao.map.repository.MapRepositoryImpl
+import campus.tech.kakao.map.repository.SearchRepository
+import campus.tech.kakao.map.repository.SearchRepositoryImpl
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object AppModule {
+
+    @Provides
+    @Singleton
+    fun provideMapRepository(
+        @ApplicationContext context: Context
+    ): MapRepository {
+        return MapRepositoryImpl(context)
+    }
+
+    @Provides
+    @Singleton
+    fun provideSearchRepository(
+        @ApplicationContext context: Context,
+        retrofit: KakaoLocalService
+    ): SearchRepository {
+        return SearchRepositoryImpl(context, retrofit)
+    }
+
+    @Provides
+    @Singleton
+    fun provideKakaoLocalService(): KakaoLocalService {
+        return Retrofit.Builder()
+            .baseUrl("https://dapi.kakao.com/")
+            .addConverterFactory(GsonConverterFactory.create())
+            .build()
+            .create(KakaoLocalService::class.java)
+    }
+}

app/src/main/java/campus/tech/kakao/map/MyApplication.kt

@@ -0,0 +1,7 @@
+package campus.tech.kakao.map
+
+import android.app.Application
+import dagger.hilt.android.HiltAndroidApp
+
+@HiltAndroidApp
+class MyApplication : Application()

app/src/main/java/campus/tech/kakao/map/model/AppDatabase.kt

@@ -0,0 +1,10 @@
+package campus.tech.kakao.map.model
+
+import androidx.room.Database
+import androidx.room.RoomDatabase
+
+@Database(entities = [SavePlace::class], version = 1)
+abstract class AppDatabase : RoomDatabase() {
+    abstract fun savePlaceDao(): SavePlaceDao
+}
+

app/src/main/java/campus/tech/kakao/map/model/SavePlace.kt

@@ -1,5 +1,11 @@
 package campus.tech.kakao.map.model
 
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity(tableName = "savePlace")
 data class SavePlace(
-    val savePlace: String,
-)
+    @PrimaryKey(autoGenerate = true) val id: Int = 0,
+    val savePlaceName: String
+)
+

app/src/main/java/campus/tech/kakao/map/model/SavePlaceDao.kt

@@ -0,0 +1,22 @@
+package campus.tech.kakao.map.model
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.Query
+import androidx.room.Delete
+
+@Dao
+interface SavePlaceDao {
+    @Insert
+    suspend fun insert(savePlace: SavePlace)
+
+    @Delete
+    suspend fun delete(savePlace: SavePlace)
+
+    @Query("SELECT * FROM savePlace")
+    suspend fun getAll(): List<SavePlace>
+
+    @Query("SELECT * FROM savePlace WHERE savePlaceName = :name LIMIT 1")
+    suspend fun getByName(name: String): SavePlace?
+}
+

app/src/main/java/campus/tech/kakao/map/repository/MapRepository.kt

@@ -1,22 +1,6 @@
 package campus.tech.kakao.map.repository
 
-import android.content.Context
-import android.content.SharedPreferences
-
-class MapRepository(context: Context) {
-    private val spf: SharedPreferences =
-        context.getSharedPreferences("map_prefs", Context.MODE_PRIVATE)
-
-    fun saveLastPosition(latitude: Double, longitude: Double) {
-        val editor = spf.edit()
-        editor.putString("latitude", latitude.toString())
-        editor.putString("longitude", longitude.toString())
-        editor.apply()
-    }
-
-    fun getLastPosition(): Pair<Double, Double> {
-        val latitude = spf.getString("latitude", "37.394660")?.toDouble() ?: 37.394660
-        val longitude = spf.getString("longitude", "127.111182")?.toDouble() ?: 127.111182
-        return Pair(latitude, longitude)
-    }
-}
+interface MapRepository {
+    fun saveLastPosition(latitude: Double, longitude: Double)
+    fun getLastPosition(): Pair<Double, Double>
+}

app/src/main/java/campus/tech/kakao/map/repository/MapRepositoryImpl.kt

@@ -0,0 +1,28 @@
+package campus.tech.kakao.map.repository
+
+import android.content.Context
+import android.content.SharedPreferences
+import dagger.hilt.android.qualifiers.ApplicationContext
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class MapRepositoryImpl @Inject constructor(
+    @ApplicationContext private val context: Context
+) : MapRepository {
+    private val spf: SharedPreferences =
+        context.getSharedPreferences("map_prefs", Context.MODE_PRIVATE)
+
+    override fun saveLastPosition(latitude: Double, longitude: Double) {
+        val editor = spf.edit()
+        editor.putString("latitude", latitude.toString())
+        editor.putString("longitude", longitude.toString())
+        editor.apply()
+    }
+
+    override fun getLastPosition(): Pair<Double, Double> {
+        val latitude = spf.getString("latitude", "37.394660")?.toDouble() ?: 37.394660
+        val longitude = spf.getString("longitude", "127.111182")?.toDouble() ?: 127.111182
+        return Pair(latitude, longitude)
+    }
+}

app/src/main/java/campus/tech/kakao/map/repository/SearchRepository.kt

@@ -1,32 +1,11 @@
 package campus.tech.kakao.map.repository
 
-import android.content.Context
-import campus.tech.kakao.map.model.PlaceDBHelper
+import campus.tech.kakao.map.model.PlaceInfo
 import campus.tech.kakao.map.model.SavePlace
 
-
-class SearchRepository(context: Context) {
-    private val dbHelper = PlaceDBHelper(context)
-
-    private fun savePlaces(placeName: String) {
-        dbHelper.savePlaces(placeName)
-    }
-
-    fun showSavePlace(): MutableList<SavePlace> {
-        return dbHelper.showSavePlace()
-    }
-
-    private fun deleteSavedPlace(savedPlaceName: String) {
-        dbHelper.deleteSavedPlace(savedPlaceName)
-    }
-
-    fun savePlacesAndUpdate(placeName: String): MutableList<SavePlace> {
-        savePlaces(placeName)
-        return showSavePlace()
-    }
-
-    fun deleteSavedPlacesAndUpdate(savedPlaceName: String): MutableList<SavePlace> {
-        deleteSavedPlace(savedPlaceName)
-        return showSavePlace()
-    }
+interface SearchRepository {
+    suspend fun savePlaces(placeName: String): List<SavePlace>
+    suspend fun showSavePlace(): List<SavePlace>
+    suspend fun deleteSavedPlace(savedPlaceName: String): List<SavePlace>
+    fun getPlaceList(categoryGroupName: String, callback: (List<PlaceInfo>?) -> Unit)
 }