[강원대 안드로이드 주민철] 4주차 과제 스텝1

README.md

@@ -1 +1,13 @@
 # android-map-location
+
+## 1단계 - 카카오맵 API 심화
+### 기능 요구 사항
+- 저장된 검색어를 선택하면 해당 검색어의 검색 결과가 표시된다.
+- 검색 결과 목록 중 하나의 항목을 선택하면 해당 항목의 위치를 지도에 표시한다.
+- 앱 종료 시 마지막 위치를 저장하여 다시 앱 실행 시 해당 위치로 포커스 한다.
+- 카카오지도 onMapError() 호출 시 에러 화면을 보여준다.
+### 프로그래밍 요구 사항
+- BottomSheet를 사용한다.
+- 카카오 API 사용을 위한 앱 키를 외부에 노출하지 않는다.
+- 가능한 MVVM 아키텍처 패턴을 적용하도록 한다.
+- 코드 컨벤션을 준수하며 프로그래밍한다.

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

@@ -3,9 +3,11 @@ package campus.tech.kakao.map
 import android.app.Application
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.LiveData
-import campus.tech.kakao.map.DBHelper.SearchWordDbHelper
-import campus.tech.kakao.map.DTO.Document
-import campus.tech.kakao.map.DTO.SearchWord
+import campus.tech.kakao.map.dbHelper.SearchWordDbHelper
+import campus.tech.kakao.map.dto.Document
+import campus.tech.kakao.map.dto.MapPositionContract
+import campus.tech.kakao.map.dto.SearchWord
+import campus.tech.kakao.map.MyApplication.Companion.mapPosition
 import campus.tech.kakao.map.RetrofitData.Companion.getInstance
 
 class MainViewModel(application: Application): AndroidViewModel(application) {
@@ -39,4 +41,11 @@ class MainViewModel(application: Application): AndroidViewModel(application) {
 		super.onCleared()
 		wordDbHelper.close()
 	}
+
+	fun getMapInfo(document: Document){
+		mapPosition.setPreferences(MapPositionContract.PREFERENCE_KEY_LATITUDE, document.latitude)
+		mapPosition.setPreferences(MapPositionContract.PREFERENCE_KEY_LONGITUDE, document.longitude)
+		mapPosition.setPreferences(MapPositionContract.PREFERENCE_KEY_PLACENAME, document.placeName)
+		mapPosition.setPreferences(MapPositionContract.PREFERENCE_KEY_ADDRESSNAME, document.addressName)
+	}
 }

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

@@ -1,54 +1,152 @@
 package campus.tech.kakao.map
 
 import android.content.Intent
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.graphics.Color
 import android.os.Bundle
 import android.util.Log
+import android.view.View
 import android.widget.LinearLayout
+import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
+import campus.tech.kakao.map.MyApplication.Companion.mapPosition
+import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.kakao.vectormap.KakaoMap
 import com.kakao.vectormap.KakaoMapReadyCallback
+import com.kakao.vectormap.LatLng
 import com.kakao.vectormap.MapLifeCycleCallback
 import com.kakao.vectormap.MapView
+import com.kakao.vectormap.camera.CameraUpdate
+import com.kakao.vectormap.camera.CameraUpdateFactory
+import com.kakao.vectormap.label.Label
+import com.kakao.vectormap.label.LabelLayer
+import com.kakao.vectormap.label.LabelOptions
+import com.kakao.vectormap.label.LabelStyle
+import com.kakao.vectormap.label.LabelStyles
 import java.lang.Exception
 
 class MapActivity : AppCompatActivity() {
 	private lateinit var mapView: MapView
 	private var map: KakaoMap? = null
 	private lateinit var searchBar: LinearLayout
+	private var latitude = 37.402005
+	private var longitude = 127.108621
+	private lateinit var placeName:String
+	private lateinit var addressName:String
+	private var styles: LabelStyles? = null
+	private lateinit var options:LabelOptions
+	private var layer: LabelLayer? = null
+	private var label: Label? = null
+	private lateinit var bitmapImage: Bitmap
+	private lateinit var markerImage: Bitmap
+	private lateinit var bottomSheetBehavior: BottomSheetBehavior<LinearLayout>
+	private val bottomSheet by lazy { findViewById<LinearLayout>(R.id.bottom_sheet) }
+	private val bottomSheetName by lazy { findViewById<TextView>(R.id.name) }
+	private val bottomSheetAddress by lazy { findViewById<TextView>(R.id.address) }
+	companion object{
+		var documentClicked = false
+	}
+
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
 		setContentView(R.layout.activity_map)
 		mapView = findViewById(R.id.map_view)
+		setMapInfo()
 		mapView.start(object : MapLifeCycleCallback() {
 			override fun onMapDestroy() {
 
 			}
 
 			override fun onMapError(p0: Exception?) {
-				Log.e("MapActivity", "onMapError: ${p0?.message}", p0)
+				setContentView(R.layout.map_error)
+				val errorText = findViewById<TextView>(R.id.map_error_text)
+				errorText.text = p0?.message
 			}
 
 		}, object: KakaoMapReadyCallback() {
 			override fun onMapReady(kakaoMap: KakaoMap) {
 				map = kakaoMap
 			}
 
+			override fun getPosition(): LatLng {
+				return LatLng.from(latitude, longitude)
+			}
+
+			override fun getZoomLevel(): Int {
+				return 17
+			}
 		})
 		searchBar = findViewById(R.id.search_bar)
 		searchBar.setOnClickListener {
 			val intent = Intent(this@MapActivity, SearchActivity::class.java)
 			startActivity(intent)
 		}
+		initBottomSheet()
 	}
 
 	override fun onResume() {
 		super.onResume()
+		setMapInfo()
 		mapView.resume()
+		if(documentClicked){
+			makeMarker()
+			setBottomSheet()
+			documentClicked = false
+		}
+		else{
+			layer?.remove(label)
+			bottomSheetBehavior.state = BottomSheetBehavior.STATE_HIDDEN
+		}
+		val cameraUpdate: CameraUpdate = CameraUpdateFactory.newCenterPosition(LatLng.from(latitude, longitude))
+		map?.moveCamera(cameraUpdate)
 	}
 
 	override fun onPause() {
 		super.onPause()
 		mapView.pause()
 	}
 
+	private fun setMapInfo(){
+		latitude = mapPosition.getPreferences("latitude","37.406960").toDouble()
+		longitude = mapPosition.getPreferences("longitude","127.110030").toDouble()
+		placeName = mapPosition.getPreferences("placeName","")
+		addressName = mapPosition.getPreferences("addressName","")
+	}
+
+	private fun makeMarker(){
+		bitmapImage = BitmapFactory.decodeResource(resources, R.drawable.marker)
+		markerImage = Bitmap.createScaledBitmap(bitmapImage, 100, 100, true)
+		styles = map?.labelManager?.addLabelStyles(LabelStyles.from(LabelStyle.from(markerImage).setTextStyles(40, Color.BLACK)))
+		if(styles != null){
+			options = LabelOptions.from(LatLng.from(latitude, longitude)).setStyles(styles).setTexts(placeName)
+			layer = map?.labelManager?.layer
+			if(label != null){
+				layer?.remove(label)
+			}
+			label = layer?.addLabel(options)
+		}
+		else{
+			Log.e("MapActivity", "makeMarker: styles is null")
+		}
+	}
+
+	private fun initBottomSheet(){
+		bottomSheetBehavior = BottomSheetBehavior.from(bottomSheet)
+		bottomSheetBehavior.addBottomSheetCallback(object : BottomSheetBehavior.BottomSheetCallback(){
+			override fun onStateChanged(bottomSheet: View, newState: Int) {
+			}
+
+			override fun onSlide(bottomSheet: View, slideOffset: Float) {
+			}
+
+		})
+		bottomSheetBehavior.state = BottomSheetBehavior.STATE_HIDDEN
+	}
+
+	private fun setBottomSheet(){
+		bottomSheetBehavior.state = BottomSheetBehavior.STATE_COLLAPSED
+		bottomSheetName.text = placeName
+		bottomSheetAddress.text = addressName
+	}
 }

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

@@ -1,11 +1,17 @@
 package campus.tech.kakao.map
 
 import android.app.Application
+import campus.tech.kakao.map.dto.MapPositionPreferences
 import com.kakao.vectormap.KakaoMapSdk
 
 class MyApplication : Application() {
 	override fun onCreate() {
 		super.onCreate()
+		mapPosition = MapPositionPreferences(this)
 		KakaoMapSdk.init(this, BuildConfig.KAKAO_API_KEY)
 	}
+
+	companion object{
+		lateinit var mapPosition : MapPositionPreferences
+	}
 }

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

@@ -1,10 +1,10 @@
 package campus.tech.kakao.map
 
 import androidx.lifecycle.MutableLiveData
-import campus.tech.kakao.map.DTO.Document
-import campus.tech.kakao.map.DTO.PlaceResponse
-import campus.tech.kakao.map.DTO.UrlContract
-import campus.tech.kakao.map.DTO.UrlContract.AUTHORIZATION
+import campus.tech.kakao.map.dto.Document
+import campus.tech.kakao.map.dto.PlaceResponse
+import campus.tech.kakao.map.dto.UrlContract
+import campus.tech.kakao.map.dto.UrlContract.AUTHORIZATION
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -28,8 +28,13 @@ class RetrofitData private constructor() {
 				if (response.isSuccessful) {
 					val documentList = mutableListOf<Document>()
 					val body = response.body()
-					body?.documents?.forEach {
-						documentList.add(Document(it.placeName, it.categoryGroupName, it.addressName))
+					body?.documents?.forEach {document ->
+						documentList.add(Document(
+							document.placeName,
+							document.categoryGroupName,
+							document.addressName,
+							document.longitude,
+							document.latitude))
 					}
 					_documents.value = documentList
 				}

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

@@ -1,6 +1,6 @@
 package campus.tech.kakao.map
 
-import campus.tech.kakao.map.DTO.PlaceResponse
+import campus.tech.kakao.map.dto.PlaceResponse
 import retrofit2.Call
 import retrofit2.http.GET
 import retrofit2.http.Header

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

@@ -10,8 +10,8 @@ import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import campus.tech.kakao.map.Adapter.DocumentAdapter
-import campus.tech.kakao.map.Adapter.WordAdapter
+import campus.tech.kakao.map.adapter.DocumentAdapter
+import campus.tech.kakao.map.adapter.WordAdapter
 
 class SearchActivity : AppCompatActivity() {
 
@@ -29,13 +29,20 @@ class SearchActivity : AppCompatActivity() {
         setupUI()
         searchResult.layoutManager = LinearLayoutManager(this)
         searchWordResult.layoutManager = LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, false)
-        documentAdapter = DocumentAdapter(){ Document ->
-            model.addWord(Document)
-        }
-        wordAdapter = WordAdapter() { SearchWord ->
-            model.deleteWord(SearchWord)
-        }
-        search.doOnTextChanged { text, start, before, count ->
+        documentAdapter = DocumentAdapter({ document ->
+            model.addWord(document)
+        },{document ->
+            model.getMapInfo(document)
+            finish()
+        })
+        wordAdapter = WordAdapter(
+            { searchWord ->
+                model.deleteWord(searchWord)
+            },{ searchWord ->
+                model.searchLocalAPI(searchWord.name)
+            }
+        )
+        search.doOnTextChanged { text, _, _, _ ->
             val query = text.toString()
             if (query.isEmpty()){
                 noResult.visibility = View.VISIBLE
@@ -71,7 +78,7 @@ class SearchActivity : AppCompatActivity() {
         })
     }
 
-    fun setupUI(){
+    private fun setupUI(){
         search = findViewById(R.id.search)
         clear = findViewById(R.id.search_clear)
         noResult = findViewById(R.id.no_search_result)

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

@@ -0,0 +1,60 @@
+package campus.tech.kakao.map.adapter
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import campus.tech.kakao.map.dto.Document
+import campus.tech.kakao.map.MapActivity.Companion.documentClicked
+import campus.tech.kakao.map.R
+
+class DocumentAdapter(
+	val addWord: (Document) -> Unit,
+	val sendDocumentInfo: (Document) -> Unit
+): ListAdapter<Document, DocumentAdapter.ViewHolder>(
+	object : DiffUtil.ItemCallback<Document>(){
+		override fun areItemsTheSame(oldItem: Document, newItem: Document): Boolean {
+			return oldItem === newItem
+		}
+
+		override fun areContentsTheSame(oldItem: Document, newItem: Document): Boolean {
+			return oldItem == newItem
+		}
+
+	}
+) {
+	private var placeClicked = { position:Int ->
+		val document: Document = getItem(position)
+		addWord(document)
+		sendDocumentInfo(document)
+		documentClicked = true
+	}
+	inner class ViewHolder(
+		itemView: View
+	): RecyclerView.ViewHolder(itemView) {
+		val name:TextView = itemView.findViewById(R.id.name)
+		val address:TextView = itemView.findViewById(R.id.address)
+		val type:TextView = itemView.findViewById(R.id.type)
+		init {
+			itemView.setOnClickListener {
+				placeClicked(bindingAdapterPosition)
+			}
+		}
+	}
+
+	override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+		return ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.place_item, parent, false))
+	}
+
+	override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+		val document: Document = getItem(position)
+		holder.name.text = document.placeName
+		holder.address.text = document.addressName
+		holder.type.text = document.categoryGroupName
+	}
+}
+
+