부산대 Android_이지은 5주차 1단계

README.md

@@ -1,27 +1,4 @@
-# android-map-location
-## step1 기능 목록
-1. 저장된 검색어 목록에 기능 추가하기
-   - 저장된 검색어 중 하나를 선택하면 해당 검색어의 검색 결과 목록이 표시된다. 
-2. 검색 결과 목록에 기능 추가하기
-   - 검색 결과 목록 중 하나의 항목을 선택하면 해당 항목의 위치를 지도에 표시한다. 
-3. 마지막 위치 저장하기
-   - 앱 종료 시 마지막 위치를 SharedPreference 저장하여 다시 앱 실행 시 해당 위치로 포커스 한다.
-4. 에러 처리하기
-  - 카카오지도 onMapError() 호출 시 에러 화면을 보여준다. "지도 인증을 실패했습니다. 다시 시도해주세요. '에러이름(에러코드): 에러메세지'
-## step2 기능 목록
-- 테스트 코드 - JUnit과 mockito를 이용하여 단위 테스트 코드를 작성한다.
-  - data source 테스트
-    - local
-      - SavedLocation 저장 테스트
-      - SavedLocation 삭제 테스트
-      - SavedLocation 조회 테스트
-      - 마지막 위치 저장 테스트
-  - UI 테스트 코드
-    - 검색 페이지
-      - 검색 결과 목록 테스트
-      - 검색어 저장 목록 테스트
-      - clearButton 테스트
-    - 지도 페이지
-      - BottomSheet 테스트
-      - KakaoMap Label 테스트
-      - 지도 에러 화면 테스트
+# android-map-refactoring
+## 기능 목록
+- 데이터베이스를 Room으로 변경한다.
+- Hilt를 사용하여 의존성 주입을 적용한다.

app/build.gradle.kts

@@ -3,6 +3,8 @@ import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
 plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
+    id("kotlin-kapt")
+    id("com.google.dagger.hilt.android")
 }
 
 android {
@@ -79,4 +81,11 @@ dependencies {
     implementation("com.squareup.retrofit2:retrofit:2.11.0")
     implementation("com.squareup.retrofit2:converter-gson:2.11.0")
     androidTestImplementation("androidx.test.espresso:espresso-intents:3.3.0")
+    // room
+    implementation("androidx.room:room-runtime:2.6.1")
+    kapt("androidx.room:room-compiler:2.6.1")
+    implementation("androidx.room:room-ktx:2.4.3")
+    // hilt
+    implementation("com.google.dagger:hilt-android:2.48.1")
+    kapt("com.google.dagger:hilt-compiler:2.48.1")
 }

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

@@ -3,7 +3,9 @@ package campus.tech.kakao.map
 import android.app.Application
 import campus.tech.kakao.map.model.datasource.SharedPreferences
 import com.kakao.vectormap.KakaoMapSdk
+import dagger.hilt.android.HiltAndroidApp
 
+@HiltAndroidApp
 class App : Application(){
     companion object{
         lateinit var sharedPreferencesManager : SharedPreferences

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

@@ -0,0 +1,35 @@
+package campus.tech.kakao.map
+
+import android.content.Context
+import androidx.room.Room
+import campus.tech.kakao.map.model.datasource.LastLocationlSharedPreferences
+import campus.tech.kakao.map.model.datasource.LocationApi
+import campus.tech.kakao.map.model.datasource.SavedLocationDao
+import campus.tech.kakao.map.model.datasource.SavedLocationDatabase
+import campus.tech.kakao.map.model.repository.DefaultLocationRepository
+import campus.tech.kakao.map.model.repository.DefaultSavedLocationRepository
+import campus.tech.kakao.map.model.repository.LocationRepository
+import campus.tech.kakao.map.model.repository.SavedLocationRepository
+import dagger.Binds
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+class LocationModule {
+    @Singleton
+    @Provides
+    fun provideLocationApi(): LocationApi {
+        return LocationApi()
+    }
+
+    @Singleton
+    @Provides
+    fun provideLastLocationlSharedPreferences(): LastLocationlSharedPreferences {
+        return LastLocationlSharedPreferences()
+    }
+}

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

@@ -0,0 +1,26 @@
+package campus.tech.kakao.map
+
+import campus.tech.kakao.map.model.repository.DefaultLocationRepository
+import campus.tech.kakao.map.model.repository.DefaultSavedLocationRepository
+import campus.tech.kakao.map.model.repository.LocationRepository
+import campus.tech.kakao.map.model.repository.SavedLocationRepository
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ViewModelComponent
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+// ViewModelComponent로 설정해도 될까요? Repository가 ViewModel에서 쓰이니까 ViewModelComponent를 쓰면 되겠다고 생각했는데요..
+// 적절한 Component를 선택하는 기준이 뭔지 모르겠습니다!
+abstract class RepositoryModule {
+    @Binds
+    @Singleton
+    abstract fun bindDefaultLocationRepository(impl: DefaultLocationRepository) : LocationRepository
+
+    @Binds
+    @Singleton
+    abstract fun bindDefaultSavedLocationRepository(impl: DefaultSavedLocationRepository) : SavedLocationRepository
+}

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

@@ -0,0 +1,39 @@
+package campus.tech.kakao.map
+
+import android.content.Context
+import androidx.room.Room
+import campus.tech.kakao.map.model.datasource.LastLocationlSharedPreferences
+import campus.tech.kakao.map.model.datasource.LocationApi
+import campus.tech.kakao.map.model.datasource.SavedLocationDao
+import campus.tech.kakao.map.model.datasource.SavedLocationDatabase
+import campus.tech.kakao.map.model.repository.DefaultLocationRepository
+import campus.tech.kakao.map.model.repository.DefaultSavedLocationRepository
+import campus.tech.kakao.map.model.repository.LocationRepository
+import campus.tech.kakao.map.model.repository.SavedLocationRepository
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ViewModelComponent
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object SavedLocationModule {
+    @Singleton
+    @Provides
+    fun provideSavedLocationDatabase(@ApplicationContext context: Context): SavedLocationDatabase {
+        return Room.databaseBuilder(
+            context,
+            SavedLocationDatabase::class.java,
+            SavedLocationDatabase.DATABASE_NAME
+        ).build()
+    }
+
+    @Singleton
+    @Provides
+    fun provideSavedLocationDao(savedLocationDatabase: SavedLocationDatabase): SavedLocationDao {
+        return savedLocationDatabase.savedLocationDao()
+    }
+}

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

@@ -1,15 +1,19 @@
 package campus.tech.kakao.map.model
 
+import java.io.Serializable
+
 data class Location(
+    val id: Long,
     val title: String,
     val address: String,
     val category: String,
     val longitude: Double,
     val latitude: Double
-){
+): Serializable
+{
     companion object {
         fun LocationDto.toLocation(): Location {
-            return Location(title, address, category, x.toDouble(), y.toDouble())
+            return Location(id.toLong(), title, address, category, x.toDouble(), y.toDouble())
 
         }
     }

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

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

app/src/main/java/campus/tech/kakao/map/model/repository/KakaoAPI.kt → app/src/main/java/campus/tech/kakao/map/model/datasource/KakaoAPI.kt

@@ -1,4 +1,4 @@
-package campus.tech.kakao.map.model.repository
+package campus.tech.kakao.map.model.datasource
 
 import campus.tech.kakao.map.model.SearchFromKeywordResponse
 import retrofit2.Response

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

@@ -0,0 +1,27 @@
+package campus.tech.kakao.map.model.datasource
+
+import campus.tech.kakao.map.App
+import campus.tech.kakao.map.model.Location
+
+class LastLocationlSharedPreferences() {
+
+    fun putLastLocation(location: Location) {
+        App.sharedPreferencesManager.putString("id", location.id.toString())
+        App.sharedPreferencesManager.putString("longitude", location.longitude.toString())
+        App.sharedPreferencesManager.putString("latitude", location.latitude.toString())
+        App.sharedPreferencesManager.putString("title", location.title.toString())
+        App.sharedPreferencesManager.putString("address", location.address.toString())
+        App.sharedPreferencesManager.putString("category", location.category.toString())
+    }
+
+    fun getLastLocation(): Location? {
+        val id = App.sharedPreferencesManager.getString("id", "").toString()
+        if(id == "") return null
+        val title = App.sharedPreferencesManager.getString("title", "")
+        val longitude = App.sharedPreferencesManager.getString("longitude", "").toString().toDouble()
+        val latitude = App.sharedPreferencesManager.getString("latitude", "").toString().toDouble()
+        val address = App.sharedPreferencesManager.getString("address", "").toString()
+        val category = App.sharedPreferencesManager.getString("category", "").toString()
+        return Location(id.toLong(), title, address, category, longitude, latitude)
+    }
+}

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

@@ -0,0 +1,19 @@
+package campus.tech.kakao.map.model.datasource
+
+import campus.tech.kakao.map.model.SearchFromKeywordResponse
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+
+class LocationApi {
+    companion object{
+        private const val RESULT_SIZE = 15
+    }
+
+    private val client = RetrofitInstance.getInstance().create(KakaoAPI::class.java)
+
+    suspend fun getLocations(keyword: String): SearchFromKeywordResponse? {
+        return withContext(Dispatchers.IO){
+            client.searchFromKeyword(keyword, RESULT_SIZE).body()
+        }
+    }
+}

app/src/main/java/campus/tech/kakao/map/model/repository/RetrofitInstance.kt → app/src/main/java/campus/tech/kakao/map/model/datasource/RetrofitInstance.kt

@@ -1,4 +1,4 @@
-package campus.tech.kakao.map.model.repository
+package campus.tech.kakao.map.model.datasource
 
 import android.os.Looper
 import campus.tech.kakao.map.BuildConfig