전남대 Android_최영빈_5주차 과제_step2

README.md

@@ -1 +1,12 @@
 # android-map-refactoring
+
+### 구현할 기능 목록
+[step1]
+- 데이터베이스를 Room으로 변경
+- 의존성 주입 적용
+
+
+[step2]
+- MVVM 아키텍처 패턴 적용
+  - DataBinding, LiveData 사용
+- 비동기 처리를 Coroutine으로 변경

app/src/androidTest/java/campus/tech/kakao/map/DataSearchActivityTest.kt

@@ -7,7 +7,7 @@ import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.rules.ActivityScenarioRule
-import campus.tech.kakao.map.activity.DataSearchActivity
+import campus.tech.kakao.map.view.DataSearchActivity
 import org.junit.Rule
 import org.junit.Test
 

app/src/androidTest/java/campus/tech/kakao/map/HomeMapActivityTest.kt

@@ -13,8 +13,8 @@ import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.rules.ActivityScenarioRule
-import campus.tech.kakao.map.activity.DataSearchActivity
-import campus.tech.kakao.map.activity.HomeMapActivity
+import campus.tech.kakao.map.view.DataSearchActivity
+import campus.tech.kakao.map.view.HomeMapActivity
 import org.junit.After
 import org.junit.Before
 import org.junit.Rule
@@ -57,7 +57,7 @@ class HomeMapActivityTest {
 
     @Test
     fun 검색바를_클릭하면_검색화면으로_이동() {
-        onView(withId(R.id.search_home))
+        onView(withId(R.id.searchbar_home))
             .perform(click())
         intended(hasComponent(DataSearchActivity::class.java.name))
     }

app/src/androidTest/java/campus/tech/kakao/map/MapErrorActivityTest.kt

@@ -7,8 +7,8 @@ import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.rules.ActivityScenarioRule
-import campus.tech.kakao.map.activity.HomeMapActivity
-import campus.tech.kakao.map.activity.MapErrorActivity
+import campus.tech.kakao.map.view.HomeMapActivity
+import campus.tech.kakao.map.view.MapErrorActivity
 import org.junit.Rule
 import org.junit.Test
 

app/src/main/AndroidManifest.xml

@@ -16,10 +16,10 @@
         android:theme="@style/Theme.Map"
         tools:targetApi="31">
         <activity
-            android:name=".activity.MapErrorActivity"
+            android:name=".view.MapErrorActivity"
             android:exported="true" />
         <activity
-            android:name=".activity.HomeMapActivity"
+            android:name=".view.HomeMapActivity"
             android:allowBackup="true"
             android:exported="true">
             <intent-filter>
@@ -29,7 +29,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".activity.DataSearchActivity"
+            android:name=".view.DataSearchActivity"
             android:exported="true"
             android:windowSoftInputMode="adjustResize" />
     </application>

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

@@ -2,7 +2,9 @@ package campus.tech.kakao.map
 
 import android.app.Application
 import com.kakao.vectormap.KakaoMapSdk
+import dagger.hilt.android.HiltAndroidApp
 
+@HiltAndroidApp
 class Application : Application() {
     override fun onCreate(){
         super.onCreate()

app/src/main/java/campus/tech/kakao/map/adapter/RecentSearchAdapter.kt

@@ -5,15 +5,17 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageButton
 import android.widget.TextView
+import androidx.lifecycle.viewModelScope
 import androidx.recyclerview.widget.RecyclerView
-import campus.tech.kakao.map.data.RecentSearchData
 import campus.tech.kakao.map.R
-import campus.tech.kakao.map.listener.RecentAdapterListener
-import campus.tech.kakao.map.viewModel.RecentViewModel
+import campus.tech.kakao.map.data.room.SearchHistoryData
+import campus.tech.kakao.map.adapter.listener.RecentAdapterListener
+import campus.tech.kakao.map.viewModel.DBViewModel
+import kotlinx.coroutines.launch
 
 class RecentSearchAdapter(
-    private val recentDataList: List<RecentSearchData>,
-    private val viewModel: RecentViewModel,
+    private val searchHistoryDataList: List<SearchHistoryData>,
+    private val dbViewModel: DBViewModel,
     private val adapterListener: RecentAdapterListener
 ) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
@@ -28,14 +30,17 @@ class RecentSearchAdapter(
         return RecentViewHolder(view)
     }
 
-    override fun getItemCount(): Int = recentDataList.count()
+    override fun getItemCount(): Int = searchHistoryDataList.count()
 
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        val item = recentDataList[position]
+        val item = searchHistoryDataList[position]
         val viewHolder = holder as RecentViewHolder
         viewHolder.name.text = item.name
+
         viewHolder.deleteBtn.setOnClickListener {
-            viewModel.deleteRecentData(item.name, item.address)
+            dbViewModel.viewModelScope.launch {
+                dbViewModel.deleteRecentData(item.name, item.address, item.searchTime)
+            }
         }
 
         viewHolder.name.setOnClickListener {

app/src/main/java/campus/tech/kakao/map/adapter/SearchDataAdapter.kt

@@ -4,15 +4,17 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
+import androidx.lifecycle.viewModelScope
 import androidx.recyclerview.widget.RecyclerView
 import campus.tech.kakao.map.R
-import campus.tech.kakao.map.listener.SearchAdapterListener
-import campus.tech.kakao.map.viewModel.RecentViewModel
+import campus.tech.kakao.map.adapter.listener.SearchAdapterListener
+import campus.tech.kakao.map.viewModel.DBViewModel
 import campus.tech.kakao.map.retrofit.Document
+import kotlinx.coroutines.launch
 
 class SearchDataAdapter(
     private var items: List<Document>,
-    private val recentViewModel: RecentViewModel,
+    private val recentViewModel: DBViewModel,
     private var adapterListener: SearchAdapterListener
 ) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
@@ -43,7 +45,9 @@ class SearchDataAdapter(
         }
         holder.itemView.setOnClickListener {
             val searchTime = System.currentTimeMillis()
-            recentViewModel.addRecentData(item.name, item.address, searchTime)
+            recentViewModel.viewModelScope.launch {
+                recentViewModel.addRecentSearchItem(item.name, item.address, searchTime)
+            }
             adapterListener.displaySearchLocation(
                 item.name,
                 item.address,

app/src/main/java/campus/tech/kakao/map/listener/RecentAdapterListener.kt → app/src/main/java/campus/tech/kakao/map/adapter/listener/RecentAdapterListener.kt

@@ -1,4 +1,4 @@
-package campus.tech.kakao.map.listener
+package campus.tech.kakao.map.adapter.listener
 
 interface RecentAdapterListener {
     fun autoSearch(searchData: String)

app/src/main/java/campus/tech/kakao/map/listener/SearchAdapterListener.kt → app/src/main/java/campus/tech/kakao/map/adapter/listener/SearchAdapterListener.kt

@@ -1,4 +1,4 @@
-package campus.tech.kakao.map.listener
+package campus.tech.kakao.map.adapter.listener
 
 interface SearchAdapterListener {
     fun displaySearchLocation(name: String, address: String, latitude: String, longitude: String)

app/src/main/java/campus/tech/kakao/map/dataContract/LocationDataContract.kt → app/src/main/java/campus/tech/kakao/map/data/LocationDataContract.kt

@@ -1,4 +1,4 @@
-package campus.tech.kakao.map.dataContract
+package campus.tech.kakao.map.data
 
 object LocationDataContract {
     const val LOCATION_NAME = "name"