Merge pull request #54 from boostcampwm-2022/18-feature-home-bottom-sheet

[PR] Map Fragment UI 디자인 및 바텀 시트 구현

Author: khcho226

data/build.gradle

@@ -1,8 +1,8 @@
 plugins {
     id 'com.android.library'
     id 'org.jetbrains.kotlin.android'
-    id 'com.google.dagger.hilt.android'
     id 'kotlin-kapt'
+    id 'com.google.dagger.hilt.android'
 }
 
 Properties properties = new Properties()
@@ -76,9 +76,9 @@ dependencies {
 
     // Room
     implementation "androidx.room:room-runtime:2.4.3"
+    implementation "androidx.room:room-ktx:2.4.3"
     annotationProcessor "androidx.room:room-compiler:2.4.3"
     kapt "androidx.room:room-compiler:2.4.3"
-    implementation "androidx.room:room-ktx:2.4.3"
 
     //DataStore
     implementation "androidx.datastore:datastore-preferences:1.0.0"

data/src/main/java/com/stop/data/local/database/dao/AlarmDao.kt

@@ -6,6 +6,7 @@ import android.os.Bundle
 import com.stop.databinding.ActivityMainBinding
 import android.view.MotionEvent
 import android.view.View
+import android.view.WindowManager
 import android.view.inputmethod.InputMethodManager
 import android.widget.EditText
 import androidx.appcompat.app.AppCompatActivity
@@ -17,10 +18,19 @@ class MainActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+
         binding = ActivityMainBinding.inflate(layoutInflater)
+        hideStatusBar()
         setContentView(binding.root)
     }
 
+    private fun hideStatusBar() {
+        window.setFlags(
+            WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS,
+            WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS
+        )
+    }
+
     override fun dispatchTouchEvent(event: MotionEvent): Boolean {
         if (event.action == MotionEvent.ACTION_DOWN) {
             val view = currentFocus
@@ -39,7 +49,8 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun hideKeyBoard(view: View) {
-        val inputMethodManager = this.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+        val inputMethodManager =
+            this.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
         inputMethodManager.hideSoftInputFromWindow(view.windowToken, 0)
     }
 }

presentation/src/main/java/com/stop/MainActivity.kt

@@ -28,7 +28,7 @@ class AlarmSettingFragment : Fragment() {
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
+    ): View {
         _binding = FragmentAlarmSettingBinding.inflate(inflater, container, false)
 
         initBinding()
@@ -38,29 +38,6 @@ class AlarmSettingFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        val test = AlarmUseCaseItem(
-            "abc",
-            "abc",
-            listOf("ABC"),
-            "abc","abc",true,true
-        )
-
-        lifecycleScope.launch{
-            alarmSettingViewModel.save(test)
-        }
-
-      /*  lifecycleScope.launch{
-            alarmSettingViewModel.get().asLiveData().observe(viewLifecycleOwner){
-                Log.e("ABC", it.toString())
-            }
-        }*/
-
-        lifecycleScope.launch{
-            alarmSettingViewModel.get().collectLatest {
-                Log.e("ABC", it.toString())
-            }
-        }
-
 
         initView()
         setButtonListener()

presentation/src/main/java/com/stop/ui/alarmsetting/AlarmSettingFragment.kt

@@ -0,0 +1,39 @@
+package com.stop.ui.alarmsetting
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+
+class AlarmViewModel : ViewModel() {
+    private val _fakeAlarmUseCaseItem = MutableLiveData<AlarmUseCaseItem>()
+    val fakeAlarmUseCaseItem: LiveData<AlarmUseCaseItem> = _fakeAlarmUseCaseItem
+
+    private val _bottomSheetVisibility = MutableLiveData(false)
+    val bottomSheetVisibility: LiveData<Boolean> = _bottomSheetVisibility
+
+    init {
+        _fakeAlarmUseCaseItem.value = AlarmUseCaseItem(
+            startPosition = "성복역 신분당선",
+            endPosition = "이엔씨벤처드림타워3차",
+            routes = listOf("성복역 승차", "강남역 환승", "구로디지털단지역 하차"),
+            lastTime = "23시 50분",
+            alarmTime = "23시 30분",
+            alarmMethod = true,
+            isMission = true
+        )
+    }
+
+    fun setVisibility(input: Boolean) {
+        _bottomSheetVisibility.value = input.not()
+    }
+}
+
+data class AlarmUseCaseItem(
+    val startPosition: String,
+    val endPosition: String,
+    val routes: List<String>,
+    val lastTime: String,
+    val alarmTime: String,
+    val alarmMethod: Boolean,
+    val isMission: Boolean
+)

presentation/src/main/java/com/stop/ui/alarmsetting/AlarmViewModel.kt

@@ -3,6 +3,7 @@ package com.stop.ui.map
 import android.Manifest.permission
 import android.os.Bundle
 import android.util.Log
+import android.util.TypedValue
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -12,17 +13,20 @@ import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.findNavController
+import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.skt.tmap.TMapPoint
 import com.stop.R
 import com.stop.databinding.FragmentMapBinding
 import com.stop.model.Location
+import com.stop.ui.alarmsetting.AlarmViewModel
 import com.stop.ui.placesearch.PlaceSearchViewModel
 import kotlinx.coroutines.launch
 
 class MapFragment : Fragment(), MapHandler {
     private var _binding: FragmentMapBinding? = null
     private val binding get() = _binding!!
 
+    private val alarmViewModel: AlarmViewModel by activityViewModels()
     private val placeSearchViewModel: PlaceSearchViewModel by activityViewModels()
 
     private lateinit var tMap: MapTMap
@@ -47,13 +51,13 @@ class MapFragment : Fragment(), MapHandler {
         initView()
         clickSearchButton()
         clickEndLocation()
+        initBottomSheetBehavior()
     }
 
     private fun initBinding() {
-        binding.apply {
-            lifecycleOwner = viewLifecycleOwner
-            viewModel = placeSearchViewModel
-        }
+        binding.lifecycleOwner = viewLifecycleOwner
+        binding.placeSearchViewModel = placeSearchViewModel
+        binding.alarmViewModel = alarmViewModel
     }
 
     private fun initTMap() {
@@ -64,11 +68,11 @@ class MapFragment : Fragment(), MapHandler {
     }
 
     private fun initView() {
-        binding.imageViewCompassMode.setOnClickListener {
+        binding.layoutCompass.setOnClickListener {
             tMap.tMapView.isCompassMode = tMap.tMapView.isCompassMode.not()
         }
 
-        binding.imageViewCurrentLocation.setOnClickListener {
+        binding.layoutCurrent.setOnClickListener {
             requestPermissionsLauncher.launch(PERMISSIONS)
             tMap.tMapView.setCenterPoint(
                 placeSearchViewModel.currentLocation.latitude,
@@ -86,8 +90,10 @@ class MapFragment : Fragment(), MapHandler {
             tMap.isTracking = true
         }
 
-        binding.imageViewBookmark.setOnClickListener {
-
+        binding.layoutBookmark.setOnClickListener {
+            alarmViewModel.bottomSheetVisibility.value?.let {
+                alarmViewModel.setVisibility(it)
+            }
         }
     }
 
@@ -98,17 +104,30 @@ class MapFragment : Fragment(), MapHandler {
     }
 
     private fun clickEndLocation() {
-        binding.textViewEndLocation.setOnClickListener {
+        binding.viewPanelEnd.setOnClickListener {
             binding.root.findNavController().navigate(R.id.action_mapFragment_to_routeFragment)
         }
     }
 
+    private fun initBottomSheetBehavior() {
+        val behavior = BottomSheetBehavior.from(binding.layoutHomeBottomSheet)
+
+        alarmViewModel.bottomSheetVisibility.observe(viewLifecycleOwner) {
+            if (it) {
+                behavior.state = BottomSheetBehavior.STATE_EXPANDED
+                behavior.maxHeight = convertDpToPx(200)
+            } else {
+                behavior.maxHeight = convertDpToPx(100)
+            }
+        }
+    }
+
     private fun setViewVisibility() {
         with(binding) {
-            textViewSearch.visibility = mapUIVisibility
-            imageViewCompassMode.visibility = mapUIVisibility
-            imageViewCurrentLocation.visibility = mapUIVisibility
-            imageViewBookmark.visibility = mapUIVisibility
+            layoutSearch.visibility = mapUIVisibility
+            layoutCompass.visibility = mapUIVisibility
+            layoutCurrent.visibility = mapUIVisibility
+            layoutBookmark.visibility = mapUIVisibility
         }
     }
 
@@ -170,8 +189,17 @@ class MapFragment : Fragment(), MapHandler {
         }
     }
 
+    private fun convertDpToPx(dp: Int): Int {
+        return TypedValue.applyDimension(
+            TypedValue.COMPLEX_UNIT_DIP,
+            dp.toFloat(),
+            resources.displayMetrics
+        ).toInt()
+    }
+
     override fun onDestroyView() {
         _binding = null
+
         super.onDestroyView()
     }
 
@@ -206,14 +234,14 @@ class MapFragment : Fragment(), MapHandler {
 
     companion object {
         private const val PLACE_MARKER = "place_marker"
-        private const val PLACE_MARKER_IMG = R.drawable.ic_baseline_location_on_32
+        private const val PLACE_MARKER_IMG = R.drawable.ic_point_marker
 
         private const val PERSON_MARKER = "marker_person_pin"
-        private const val PERSON_MARKER_IMG = R.drawable.ic_person_pin
+        private const val PERSON_MARKER_IMG = R.drawable.ic_person_marker
 
         private const val SAME_POINT = 1
         val PERMISSIONS = arrayOf(permission.ACCESS_FINE_LOCATION, permission.ACCESS_COARSE_LOCATION)
 
-        private const val BOOKMARK_MARKER_IMG = R.drawable.ic_baseline_stars_32
+        private const val BOOKMARK_MARKER_IMG = R.drawable.ic_bookmark_marker
     }
-}
+}

presentation/src/main/java/com/stop/ui/map/MapFragment.kt

@@ -40,7 +40,7 @@ class MapTMap(
 
     companion object {
         private const val PLACE_MARKER = "marker"
-        private const val PLACE_MARKER_IMG = R.drawable.ic_baseline_location_on_32
+        private const val PLACE_MARKER_IMG = R.drawable.ic_point_marker
 
         private const val SAME_POINT = 1
     }

presentation/src/main/java/com/stop/ui/map/MapTMap.kt

@@ -38,7 +38,7 @@ class MissionTMap(
 
     companion object {
         private const val PERSON_MARKER = "marker_person_pin"
-        private const val PERSON_MARKER_IMG = R.drawable.ic_person_pin
+        private const val PERSON_MARKER_IMG = R.drawable.ic_person_marker
 
         private const val PERSON_LINE = "person_line"
         private const val PERSON_LINE_COLOR = Color.MAGENTA

presentation/src/main/java/com/stop/ui/mission/MissionTMap.kt

@@ -1,5 +1,6 @@
 package com.stop.ui.placesearch
 
+import android.location.LocationManager
 import android.text.Editable
 import android.util.Log
 import android.view.View
@@ -21,6 +22,9 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.launch
 import javax.inject.Inject
+import kotlin.math.pow
+import kotlin.math.round
+import kotlin.math.sqrt
 
 @HiltViewModel
 class PlaceSearchViewModel @Inject constructor(
@@ -46,13 +50,16 @@ class PlaceSearchViewModel @Inject constructor(
 
     private val _searchKeyword = MutableStateFlow("")
     val searchKeyword : StateFlow<String> = _searchKeyword
-    
+
     private val _geoLocation = MutableLiveData<GeoLocationInfo>()
     val geoLocation: LiveData<GeoLocationInfo> = _geoLocation
 
     private val _panelVisibility = MutableLiveData(View.GONE)
     val panelVisibility: LiveData<Int> = _panelVisibility
 
+    private val _distance = MutableLiveData<Float>()
+    val distance: LiveData<Float> = _distance
+
     fun afterTextChanged(s: Editable?) {
         _searchKeyword.value = s.toString()
     }
@@ -74,7 +81,7 @@ class PlaceSearchViewModel @Inject constructor(
             } catch (e: Exception) {
                 setNearPlaceListEmpty()
                 errorMessageChannel.send(e.message ?: "something is wrong")
-                Log.d("PlaceSearchViewModel","getNearPlace 실패~ ${e.toString()}")
+                Log.d("PlaceSearchViewModel", "getNearPlace 실패~ ${e.toString()}")
             }
         }
     }
@@ -93,13 +100,25 @@ class PlaceSearchViewModel @Inject constructor(
         }
     }
 
-    fun getGeoLocationInfo(lat: Double, lon: Double) {
-        viewModelScope.launch{
-            _geoLocation.value = geoLocationUseCase.getGeoLocationInfo(lat, lon)
+    fun getGeoLocationInfo(latitude: Double, longitude: Double) {
+        viewModelScope.launch {
+            _geoLocation.value = geoLocationUseCase.getGeoLocationInfo(latitude, longitude)
             _panelVisibility.value = View.VISIBLE
+            getDistance(latitude, longitude)
         }
     }
 
+    private fun getDistance(latitude: Double, longitude: Double) {
+        val startPoint = android.location.Location("Start")
+        val endPoint = android.location.Location("End")
+
+        startPoint.latitude = latitude
+        startPoint.longitude = longitude
+        endPoint.latitude = currentLocation.latitude
+        endPoint.longitude = currentLocation.longitude
+        _distance.value = round(startPoint.distanceTo(endPoint) / 100) / 10
+    }
+
     companion object {
         private const val TMAP_VERSION = 1
         private val EXAMPLE_BOOKMARK_1 = Location(37.3931010, 126.9781449)

presentation/src/main/java/com/stop/ui/placesearch/PlaceSearchViewModel.kt

@@ -107,6 +107,6 @@ open class TMap(
         private const val KOREA_LONGITUDE_MAX = 132.550049
 
         private const val PERSON_MARKER = "marker_person_pin"
-        private const val PERSON_MARKER_IMG = R.drawable.ic_person_pin
+        private const val PERSON_MARKER_IMG = R.drawable.ic_person_marker
     }
 }