feat : 북마크 제거 및 뷰 깨짐 수정

koreatlwls · koreatlwls · commit 8e9f1c3d7183 · 2022-12-05T11:50:40.000+09:00
diff --git a/presentation/src/main/java/com/stop/ui/map/MapFragment.kt b/presentation/src/main/java/com/stop/ui/map/MapFragment.kt
@@ -58,7 +58,6 @@ class MapFragment : Fragment(), MapHandler {
         requestPermissionsLauncher.launch(PERMISSIONS)
 
         tMap.initListener()
-        addBookmarkMarker()
         observeClickPlace()
         observeClickCurrentLocation()
     }
@@ -108,12 +107,6 @@ class MapFragment : Fragment(), MapHandler {
                 .navigate(R.id.action_mapFragment_to_placeSearchFragment)
         }
 
-        /*
-        binding.layoutBookmark.setOnClickListener {
-            binding.root.findNavController().navigate(R.id.action_mapFragment_to_bookMarkFragment)
-        }
-        */
-
         binding.layoutPanel.findViewById<View>(R.id.view_panel_start).setOnClickListener {
             val action = MapFragmentDirections.actionMapFragmentToRouteFragment().setStart(placeSearchViewModel.panelInfo)
             binding.root.findNavController().navigate(action)
@@ -159,16 +152,6 @@ class MapFragment : Fragment(), MapHandler {
         })
     }
 
-    private fun addBookmarkMarker() {
-        placeSearchViewModel.bookmarks.forEachIndexed { index, location ->
-            tMap.addMarker(
-                index.toString(),
-                Marker.BOOKMARK_MARKER_IMG,
-                TMapPoint(location.latitude, location.longitude)
-            )
-        }
-    }
-
     private fun observeClickPlace() {
         placeSearchViewModel.clickPlaceUseCaseItem.observe(viewLifecycleOwner) { event ->
             event.getContentIfNotHandled()?.let { clickPlace ->
@@ -227,7 +210,6 @@ class MapFragment : Fragment(), MapHandler {
             layoutSearch.visibility = mapUIVisibility
             layoutCompass.visibility = mapUIVisibility
             layoutCurrent.visibility = mapUIVisibility
-            layoutBookmark.visibility = mapUIVisibility
         }
     }
 
diff --git a/presentation/src/main/java/com/stop/ui/placesearch/PlaceSearchViewModel.kt b/presentation/src/main/java/com/stop/ui/placesearch/PlaceSearchViewModel.kt
@@ -43,8 +43,6 @@ class PlaceSearchViewModel @Inject constructor(
     private val _isNearPlacesNotEmpty = MutableStateFlow(false)
     val isNearPlacesNotEmpty: StateFlow<Boolean> = _isNearPlacesNotEmpty
 
-    var bookmarks = mutableListOf(EXAMPLE_BOOKMARK_1, EXAMPLE_BOOKMARK_2, EXAMPLE_BOOKMARK_3)
-
     private val errorMessageChannel = Channel<String>()
     val errorMessage = errorMessageChannel.receiveAsFlow()
 
@@ -157,10 +155,4 @@ class PlaceSearchViewModel @Inject constructor(
         }
     }
 
-    companion object {
-        private val EXAMPLE_BOOKMARK_1 = Location(37.3931010, 126.9781449)
-        private val EXAMPLE_BOOKMARK_2 = Location(37.55063543842469, 127.07369927986392)
-        private val EXAMPLE_BOOKMARK_3 = Location(37.48450549635376, 126.89324337770405)
-    }
-
 }
diff --git a/presentation/src/main/res/layout/fragment_map.xml b/presentation/src/main/res/layout/fragment_map.xml
@@ -4,6 +4,7 @@
     xmlns:bind="http://schemas.android.com/apk/res-auto">
 
     <data>
+
         <variable
             name="placeSearchViewModel"
             type="com.stop.ui.placesearch.PlaceSearchViewModel" />
@@ -58,13 +59,13 @@
             android:id="@+id/layout_panel"
             android:layout_width="0dp"
             android:layout_height="170dp"
-            android:layout_marginEnd="90dp"
             android:layout_marginTop="30dp"
+            android:layout_marginEnd="90dp"
             android:elevation="15dp"
             android:visibility="@{placeSearchViewModel.panelVisibility}"
-            app:layout_constraintStart_toStartOf="@id/guideline_start"
+            app:layout_constraintBottom_toBottomOf="@id/guideline_bottom"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toBottomOf="@id/guideline_bottom">
+            app:layout_constraintStart_toStartOf="@id/guideline_start">
 
             <include
                 android:id="@+id/home_panel"
@@ -77,10 +78,10 @@
             android:id="@+id/layout_search"
             android:layout_width="0dp"
             android:layout_height="52dp"
-            android:elevation="15dp"
             android:background="@drawable/background_search"
-            app:layout_constraintStart_toStartOf="@id/guideline_start"
+            android:elevation="15dp"
             app:layout_constraintEnd_toStartOf="@id/guideline_end"
+            app:layout_constraintStart_toStartOf="@id/guideline_start"
             app:layout_constraintTop_toTopOf="@id/guideline_top">
 
             <TextView
@@ -91,17 +92,17 @@
                 android:layout_marginBottom="1dp"
                 android:gravity="center_vertical"
                 android:text="@string/search_hint"
-                android:textSize="17sp"
-                android:textColor="#808590" />
+                android:textColor="#808590"
+                android:textSize="17sp" />
 
             <ImageView
                 android:id="@+id/image_view_search"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="15dp"
+                app:layout_constraintBottom_toBottomOf="@id/layout_search"
                 app:layout_constraintStart_toStartOf="@id/layout_search"
                 app:layout_constraintTop_toTopOf="@id/layout_search"
-                app:layout_constraintBottom_toBottomOf="@id/layout_search"
                 app:srcCompat="@drawable/ic_search" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
@@ -111,20 +112,20 @@
             android:layout_width="60dp"
             android:layout_height="60dp"
             android:layout_marginBottom="10dp"
-            android:elevation="15dp"
             android:background="@drawable/background_button"
-            app:layout_constraintEnd_toEndOf="@id/guideline_end"
-            app:layout_constraintBottom_toTopOf="@id/layout_current">
+            android:elevation="15dp"
+            app:layout_constraintBottom_toTopOf="@id/layout_current"
+            app:layout_constraintEnd_toEndOf="@id/guideline_end">
 
             <ImageView
                 android:id="@+id/image_view_compass"
                 android:layout_width="30dp"
                 android:layout_height="30dp"
                 android:elevation="15dp"
-                app:layout_constraintStart_toStartOf="@id/layout_compass"
+                app:layout_constraintBottom_toBottomOf="@id/layout_compass"
                 app:layout_constraintEnd_toEndOf="@id/layout_compass"
+                app:layout_constraintStart_toStartOf="@id/layout_compass"
                 app:layout_constraintTop_toTopOf="@id/layout_compass"
-                app:layout_constraintBottom_toBottomOf="@id/layout_compass"
                 app:srcCompat="@drawable/ic_compass" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
@@ -134,46 +135,24 @@
             android:layout_width="60dp"
             android:layout_height="60dp"
             android:layout_marginBottom="10dp"
-            android:elevation="15dp"
             android:background="@drawable/background_button"
-            app:layout_constraintEnd_toEndOf="@id/guideline_end"
-            app:layout_constraintBottom_toTopOf="@id/layout_bookmark">
+            android:elevation="15dp"
+            app:layout_constraintBottom_toBottomOf="@id/guideline_bottom"
+            app:layout_constraintEnd_toEndOf="@id/guideline_end">
 
             <ImageView
                 android:id="@+id/image_view_current"
                 android:layout_width="30dp"
                 android:layout_height="30dp"
                 android:elevation="15dp"
-                app:layout_constraintStart_toStartOf="@id/layout_current"
+                app:layout_constraintBottom_toBottomOf="@id/layout_current"
                 app:layout_constraintEnd_toEndOf="@id/layout_current"
+                app:layout_constraintStart_toStartOf="@id/layout_current"
                 app:layout_constraintTop_toTopOf="@id/layout_current"
-                app:layout_constraintBottom_toBottomOf="@id/layout_current"
                 app:srcCompat="@drawable/ic_location" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/layout_bookmark"
-            android:layout_width="60dp"
-            android:layout_height="60dp"
-            android:elevation="15dp"
-            android:background="@drawable/background_button"
-            app:layout_constraintEnd_toEndOf="@id/guideline_end"
-            app:layout_constraintBottom_toBottomOf="@id/guideline_bottom">
-
-            <ImageView
-                android:id="@+id/image_view_bookmark"
-                android:layout_width="30dp"
-                android:layout_height="30dp"
-                android:elevation="15dp"
-                app:layout_constraintStart_toStartOf="@id/layout_bookmark"
-                app:layout_constraintEnd_toEndOf="@id/layout_bookmark"
-                app:layout_constraintTop_toTopOf="@id/layout_bookmark"
-                app:layout_constraintBottom_toBottomOf="@id/layout_bookmark"
-                app:srcCompat="@drawable/ic_bookmark" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
         <androidx.coordinatorlayout.widget.CoordinatorLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -183,9 +162,9 @@
                 android:id="@+id/layout_home_bottom_sheet"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"
+                app:behavior_hideable="false"
                 app:behavior_peekHeight="100dp"
-                app:behavior_hideable="false">
+                app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
                 <include
                     android:id="@+id/home_bottom_sheet"
diff --git a/presentation/src/main/res/layout/home_panel.xml b/presentation/src/main/res/layout/home_panel.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <data>
+
         <variable
             name="placeSearchViewModel"
             type="com.stop.ui.placesearch.PlaceSearchViewModel" />
@@ -28,55 +29,35 @@
             android:id="@+id/text_view_panel_title"
             android:layout_width="0dp"
             android:layout_height="30dp"
-            android:layout_marginStart="10dp"
-            android:layout_marginEnd="10dp"
+            android:layout_marginStart="5dp"
             android:layout_marginTop="19dp"
-            android:maxLines="1"
+            android:layout_marginEnd="20dp"
             android:ellipsize="end"
+            android:gravity="center_vertical"
+            android:maxLines="1"
             android:text="@{placeSearchViewModel.geoLocation.title}"
-            android:textSize="22sp"
             android:textColor="@color/white"
-            android:gravity="center_vertical"
+            android:textSize="22sp"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/image_view_panel_place"
-            app:layout_constraintEnd_toStartOf="@id/view_panel_bookmark"
             app:layout_constraintTop_toTopOf="parent"
             tools:text="성복역" />
 
-        <View
-            android:id="@+id/view_panel_bookmark"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:layout_marginEnd="20dp"
-            android:layout_marginTop="20dp"
-            android:background="@drawable/background_button"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <ImageView
-            android:id="@+id/image_view_panel_bookmark"
-            android:layout_width="15dp"
-            android:layout_height="15dp"
-            app:layout_constraintStart_toStartOf="@id/view_panel_bookmark"
-            app:layout_constraintEnd_toEndOf="@id/view_panel_bookmark"
-            app:layout_constraintTop_toTopOf="@id/view_panel_bookmark"
-            app:layout_constraintBottom_toBottomOf="@id/view_panel_bookmark"
-            app:srcCompat="@drawable/ic_bookmark" />
-
         <TextView
             android:id="@+id/text_view_panel_address"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
             android:layout_marginEnd="20dp"
-            android:maxLines="1"
             android:ellipsize="end"
+            android:maxLines="1"
             android:text="@{placeSearchViewModel.geoLocation.roadAddress}"
-            android:textSize="14sp"
             android:textColor="#808590"
+            android:textSize="14sp"
+            app:layout_constraintBottom_toTopOf="@id/view_panel_start"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/text_view_panel_title"
-            app:layout_constraintBottom_toTopOf="@id/view_panel_start"
             tools:text="서울 구로구 디지털로31길 41" />
 
         <TextView
@@ -86,11 +67,11 @@
             android:layout_marginStart="20dp"
             android:layout_marginBottom="16dp"
             android:text="@{placeSearchViewModel.distance.toString()}"
-            android:textSize="40sp"
             android:textColor="@color/white"
+            android:textSize="32sp"
             android:textStyle="bold"
-            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             tools:text="1.6" />
 
         <TextView
@@ -100,51 +81,51 @@
             android:layout_marginStart="10dp"
             android:layout_marginBottom="22dp"
             android:text="@string/km"
-            android:textSize="20sp"
             android:textColor="@color/white"
+            android:textSize="16sp"
             android:textStyle="bold"
-            app:layout_constraintStart_toEndOf="@id/text_view_panel_distance"
             app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@id/text_view_panel_distance"
             tools:text="km" />
 
         <View
             android:id="@+id/view_panel_start"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
             android:layout_marginEnd="10dp"
             android:layout_marginBottom="20dp"
             android:background="@drawable/background_button"
-            app:layout_constraintEnd_toStartOf="@id/view_panel_end"
-            app:layout_constraintBottom_toBottomOf="parent" />
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/view_panel_end" />
 
         <ImageView
             android:id="@+id/image_view_panel_start"
             android:layout_width="25dp"
             android:layout_height="25dp"
-            app:layout_constraintStart_toStartOf="@id/view_panel_start"
+            app:layout_constraintBottom_toBottomOf="@id/view_panel_start"
             app:layout_constraintEnd_toEndOf="@id/view_panel_start"
+            app:layout_constraintStart_toStartOf="@id/view_panel_start"
             app:layout_constraintTop_toTopOf="@id/view_panel_start"
-            app:layout_constraintBottom_toBottomOf="@id/view_panel_start"
             app:srcCompat="@drawable/ic_start" />
 
         <View
             android:id="@+id/view_panel_end"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
             android:layout_marginEnd="20dp"
             android:layout_marginBottom="20dp"
             android:background="@drawable/background_button"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent" />
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
 
         <ImageView
             android:id="@+id/image_view_panel_end"
             android:layout_width="25dp"
             android:layout_height="25dp"
-            app:layout_constraintStart_toStartOf="@id/view_panel_end"
+            app:layout_constraintBottom_toBottomOf="@id/view_panel_end"
             app:layout_constraintEnd_toEndOf="@id/view_panel_end"
+            app:layout_constraintStart_toStartOf="@id/view_panel_end"
             app:layout_constraintTop_toTopOf="@id/view_panel_end"
-            app:layout_constraintBottom_toBottomOf="@id/view_panel_end"
             app:srcCompat="@drawable/ic_end" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>

Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,6 @@ class PlaceSearchViewModel @Inject constructor(`
`43`	`43`	`private val _isNearPlacesNotEmpty = MutableStateFlow(false)`
`44`	`44`	`val isNearPlacesNotEmpty: StateFlow<Boolean> = _isNearPlacesNotEmpty`
`45`	`45`
`46`		`- var bookmarks = mutableListOf(EXAMPLE_BOOKMARK_1, EXAMPLE_BOOKMARK_2, EXAMPLE_BOOKMARK_3)`
`47`		`-`
`48`	`46`	`private val errorMessageChannel = Channel<String>()`
`49`	`47`	`val errorMessage = errorMessageChannel.receiveAsFlow()`
`50`	`48`
`@@ -157,10 +155,4 @@ class PlaceSearchViewModel @Inject constructor(`
`157`	`155`	`}`
`158`	`156`	`}`
`159`	`157`
`160`		`- companion object {`
`161`		`- private val EXAMPLE_BOOKMARK_1 = Location(37.3931010, 126.9781449)`
`162`		`- private val EXAMPLE_BOOKMARK_2 = Location(37.55063543842469, 127.07369927986392)`
`163`		`- private val EXAMPLE_BOOKMARK_3 = Location(37.48450549635376, 126.89324337770405)`
`164`		`- }`
`165`		`-`
`166`	`158`	`}`