부산대 Android_이지은 4주차 2단계(리팩토링 완료)

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

@@ -1,11 +1,17 @@
 package campus.tech.kakao.map
 
 import android.app.Application
+import campus.tech.kakao.map.model.datasource.SharedPreferences
 import com.kakao.vectormap.KakaoMapSdk
 
 class App : Application(){
+    companion object{
+        lateinit var sharedPreferencesManager : SharedPreferences
+    }
     override fun onCreate() {
+        sharedPreferencesManager = SharedPreferences(applicationContext)
+        KakaoMapSdk.init(this, BuildConfig.KAKAO_API_KEY)
         super.onCreate()
-        KakaoMapSdk.init(this, BuildConfig.KAKAO_API_KEY);
+
     }
 }

app/src/main/java/campus/tech/kakao/map/model/datasource/LastLocationLocalDataSource.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 LastLocationLocalDataSource() {
+
+    fun putLastLocation(location: Location) {
+        if (location != null) {
+            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 title = App.sharedPreferencesManager.getString("title", "")
+        if(title == "") return null
+        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(title, address, category, longitude, latitude)
+    }
+}

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

@@ -1,9 +1,8 @@
 package campus.tech.kakao.map.model.datasource
 
 import android.content.ContentValues
-import android.database.Cursor
 import android.util.Log
-import campus.tech.kakao.map.model.Contract.LocationEntry
+import campus.tech.kakao.map.App
 import campus.tech.kakao.map.model.Contract.SavedLocationEntry
 import campus.tech.kakao.map.model.Location
 import campus.tech.kakao.map.model.LocationDbHelper

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

@@ -0,0 +1,16 @@
+package campus.tech.kakao.map.model.datasource
+
+import android.content.Context
+
+class SharedPreferences(context: Context) {
+    private val prefs = context.getSharedPreferences("myPref", Context.MODE_PRIVATE)
+
+    fun getString(key: String, defValue: String): String {
+        return prefs.getString(key, defValue).toString()
+    }
+
+    fun putString(key: String, value: String) {
+        prefs.edit().putString(key, value).apply()
+
+    }
+}

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

@@ -0,0 +1,16 @@
+package campus.tech.kakao.map.model.repository
+
+import campus.tech.kakao.map.model.Location
+import campus.tech.kakao.map.model.datasource.LastLocationLocalDataSource
+
+class LastLocationRepository(
+    private val lastLocationLocalDataSource: LastLocationLocalDataSource
+) {
+    fun putLastLocation(location: Location){
+        lastLocationLocalDataSource.putLastLocation(location)
+    }
+
+    fun getLastLocation(): Location? {
+        return lastLocationLocalDataSource.getLastLocation()
+    }
+}

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

@@ -5,9 +5,9 @@ import campus.tech.kakao.map.model.datasource.LocationLocalDataSource
 import campus.tech.kakao.map.model.datasource.LocationRemoteDataSource
 
 class LocationRepository(
-    private val locationRemoteRepository: LocationRemoteDataSource
+    private val locationRemoteDataSource: LocationRemoteDataSource
 ) {
     suspend fun getLocationRemote(query: String): List<Location> {
-        return locationRemoteRepository.getLocations(query)
+        return locationRemoteDataSource.getLocations(query)
     }
 }

app/src/main/java/campus/tech/kakao/map/view/map/MapActivity.kt

@@ -1,8 +1,6 @@
 package campus.tech.kakao.map.view.map
 
-import android.app.Activity
 import android.content.Intent
-import android.content.SharedPreferences
 import android.graphics.Color
 import android.os.Bundle
 import android.util.Log
@@ -11,13 +9,14 @@ import android.widget.EditText
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.constraintlayout.widget.ConstraintLayout
-import campus.tech.kakao.map.BuildConfig
 import campus.tech.kakao.map.R
+import campus.tech.kakao.map.model.Location
+import campus.tech.kakao.map.model.datasource.LastLocationLocalDataSource
+import campus.tech.kakao.map.model.repository.LastLocationRepository
 import campus.tech.kakao.map.view.search.MainActivity
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.kakao.vectormap.KakaoMap
 import com.kakao.vectormap.KakaoMapReadyCallback
-import com.kakao.vectormap.KakaoMapSdk
 import com.kakao.vectormap.LatLng
 import com.kakao.vectormap.MapLifeCycleCallback
 import com.kakao.vectormap.MapView
@@ -35,6 +34,9 @@ class MapActivity : AppCompatActivity() {
     private val errorMessageTextView by lazy { findViewById<TextView>(R.id.errorMessageTextView) }
     private val bottomSheetBehavior: BottomSheetBehavior<ConstraintLayout> by lazy { BottomSheetBehavior.from(bottomSheetLayout) }
 
+    private val lastLocationLocalDataSource: LastLocationLocalDataSource by lazy { LastLocationLocalDataSource() }
+    private val lastLocationRepository: LastLocationRepository by lazy { LastLocationRepository(lastLocationLocalDataSource) }
+
     companion object{
         private val DEFAULT_LONGITUDE = 127.115587
         private val DEFAULT_LATITUDE = 37.406960
@@ -76,13 +78,13 @@ class MapActivity : AppCompatActivity() {
                 showErrorMessage(error)
             }
         }, object : KakaoMapReadyCallback() {
-            val coordinates = getCoordinates()
+            val location = getCoordinates()
             override fun onMapReady(kakaoMap: KakaoMap) { // 인증 후 API 가 정상적으로 실행될 때 호출됨
-                Log.d("jieun", "onMapReady coordinates: " + coordinates.toString())
-                if (coordinates != null) {
-                    showLabel(coordinates, kakaoMap)
-                    showBottomSheet(coordinates)
-                    setSharedData("pref", coordinates)
+                Log.d("jieun", "onMapReady coordinates: " + location.toString())
+                if (location != null) {
+                    showLabel(location, kakaoMap)
+                    showBottomSheet(location)
+                    lastLocationRepository.putLastLocation(location)
 //                    Log.d("jieun", "onMapReady setSharedData: " + getSharedData("pref"))
                 } else{
                     hideBottomSheet()
@@ -91,8 +93,8 @@ class MapActivity : AppCompatActivity() {
 
             override fun getPosition(): LatLng {
 //                Log.d("jieun", "getPosition coordinates: " + coordinates.toString())
-                if (coordinates != null) {
-                    return LatLng.from(coordinates.latitude, coordinates.longitude)
+                if (location != null) {
+                    return LatLng.from(location.latitude, location.longitude)
                 } else{
                     return LatLng.from(DEFAULT_LATITUDE, DEFAULT_LONGITUDE)
                 }
@@ -110,76 +112,53 @@ class MapActivity : AppCompatActivity() {
     }
 
     private fun showLabel(
-        coordinates: Coordinates,
+        location: Location,
         kakaoMap: KakaoMap
     ) {
         val labelStyles: LabelStyles = LabelStyles.from(
             LabelStyle.from(R.drawable.location_red_icon_resized).setZoomLevel(8),
             LabelStyle.from(R.drawable.location_red_icon_resized)
                 .setTextStyles(32, Color.BLACK, 1, Color.GRAY).setZoomLevel(15)
         )
-        val position = LatLng.from(coordinates.latitude, coordinates.longitude)
+        val position = LatLng.from(location.latitude, location.longitude)
         kakaoMap.labelManager?.getLayer()?.addLabel(
             LabelOptions.from(position)
                 .setStyles(labelStyles)
-                .setTexts(coordinates.title)
+                .setTexts(location.title)
         )
     }
 
     private fun hideBottomSheet() {
         bottomSheetLayout.visibility = View.GONE
     }
 
-    private fun showBottomSheet(coordinates: Coordinates) {
+    private fun showBottomSheet(location: Location) {
         bottomSheetLayout.visibility = View.VISIBLE
         bottomSheetBehavior.state = BottomSheetBehavior.STATE_COLLAPSED
-        bottom_sheet_title.text = coordinates.title
-        bottom_sheet_address.text = coordinates.address
+        bottom_sheet_title.text = location.title
+        bottom_sheet_address.text = location.address
     }
 
-    private fun getCoordinates(): Coordinates? {
-        var coordinates = getCoordinatesByIntent()
-        if(coordinates == null) {
-            coordinates = getCoordinatedBySharedPreference("pref")
+    private fun getCoordinates(): Location? {
+        var location = getCoordinatesByIntent()
+        if(location == null) {
+            location = lastLocationRepository.getLastLocation()
         }
-        return coordinates
+        return location
 
     }
 
-    private fun getCoordinatesByIntent(): Coordinates? {
+    private fun getCoordinatesByIntent(): Location? {
         if (intent.hasExtra("title") && intent.hasExtra("longitude")
             && intent.hasExtra("latitude") && intent.hasExtra("address")) {
             val title = intent.getStringExtra("title")
             val longitude = intent.getDoubleExtra("longitude", 0.0)
             val latitude = intent.getDoubleExtra("latitude", 0.0)
             val address = intent.getStringExtra("address").toString()
+            val category = intent.getStringExtra("category").toString()
             if (title != null) {
-                return Coordinates(title, longitude, latitude, address)
+                return Location(title, address, category, longitude, latitude)
             } else return null
         } else return null
     }
-
-    fun setSharedData(name: String, coordinates: Coordinates?) {
-        if (coordinates != null) {
-            var pref: SharedPreferences = getSharedPreferences(name, Activity.MODE_PRIVATE)
-            var editor: SharedPreferences.Editor = pref.edit()
-            editor.putString("longitude", coordinates.longitude.toString())
-            editor.putString("latitude", coordinates.latitude.toString())
-            editor.putString("title", coordinates.title.toString())
-            editor.putString("address", coordinates.address.toString())
-            editor.apply()
-        }
-    }
-
-    fun getCoordinatedBySharedPreference(name: String): Coordinates? {
-        var pref: SharedPreferences = getSharedPreferences(name, Activity.MODE_PRIVATE)
-        if(pref.getString("title", "") == ""){
-            return null
-        }
-        val title = pref.getString("title", "").toString()
-        val longitude = pref.getString("longitude", "").toString().toDouble()
-        val latitude = pref.getString("latitude", "").toString().toDouble()
-        val address = pref.getString("address", "").toString()
-        return Coordinates(title, longitude, latitude, address)
-    }
 }

app/src/main/java/campus/tech/kakao/map/view/search/LocationAdapter.kt

@@ -33,7 +33,7 @@ class LocationAdapter(
         init {
             itemView.setOnClickListener {
                 val location = getItem(bindingAdapterPosition)
-                itemSelectedListener.onLocationViewClicked(location.title, location.longitude, location.latitude, location.address)
+                itemSelectedListener.onLocationViewClicked(location)
             }
         }
     }

app/src/main/java/campus/tech/kakao/map/view/search/MainActivity.kt

@@ -16,6 +16,7 @@ import androidx.recyclerview.widget.RecyclerView
 import campus.tech.kakao.map.model.datasource.LocationLocalDataSource
 import campus.tech.kakao.map.model.datasource.LocationRemoteDataSource
 import campus.tech.kakao.map.R
+import campus.tech.kakao.map.model.Location
 import campus.tech.kakao.map.model.SavedLocation
 import campus.tech.kakao.map.model.LocationDbHelper
 import campus.tech.kakao.map.model.repository.LocationRepository
@@ -120,14 +121,15 @@ class MainActivity : AppCompatActivity(), OnItemSelectedListener {
         savedLocationRecyclerView.adapter = savedLocationAdapter
     }
 
-    override fun onLocationViewClicked(title: String, longitude: Double, latitude: Double, address:String) {
-        savedLocationViewModel.addSavedLocation(title)
+    override fun onLocationViewClicked(location: Location) {
+        savedLocationViewModel.addSavedLocation(location.title)
 
         val intent = Intent(this@MainActivity, MapActivity::class.java)
-        intent.putExtra("title", title)
-        intent.putExtra("longitude", longitude)
-        intent.putExtra("latitude", latitude)
-        intent.putExtra("address", address)
+        intent.putExtra("title", location.title)
+        intent.putExtra("address", location.address)
+        intent.putExtra("category", location.category)
+        intent.putExtra("longitude", location.longitude)
+        intent.putExtra("latitude", location.latitude)
         startActivity(intent)
     }
 

app/src/main/java/campus/tech/kakao/map/view/search/OnItemSelectedListener.kt

@@ -1,9 +1,10 @@
 package campus.tech.kakao.map.view.search
 
+import campus.tech.kakao.map.model.Location
 import campus.tech.kakao.map.model.SavedLocation
 
 interface OnItemSelectedListener {
-    fun onLocationViewClicked(title: String, longitude: Double, latitude: Double, address:String)
+    fun onLocationViewClicked(location: Location)
     fun onSavedLocationXButtonClicked(item: SavedLocation)
     fun onSavedLocationViewClicked(title: String)
 }

app/src/main/java/campus/tech/kakao/map/viewmodel/LocationViewModel.kt

@@ -31,4 +31,5 @@ class LocationViewModel(
             handleNoResultMessage(getSearchedLocationsSize())
         }
     }
+
 }