Skip to content

Commit 73f80c2

Browse files
committed
refactor: layout_panel 제거
1 parent c08dc13 commit 73f80c2

File tree

3 files changed

+14
-18
lines changed

3 files changed

+14
-18
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class MapFragment : Fragment(), MapHandler {
7474
tMap = MapTMap(requireActivity(), this)
7575
tMap.init()
7676

77-
binding.frameLayoutContainer.addView(tMap.tMapView)
77+
binding.layoutContainer.addView(tMap.tMapView)
7878
}
7979

8080
private fun initView() {
@@ -109,14 +109,14 @@ class MapFragment : Fragment(), MapHandler {
109109
.navigate(R.id.action_mapFragment_to_placeSearchFragment)
110110
}
111111

112-
binding.layoutPanel.findViewById<View>(R.id.view_panel_start).setOnClickListener {
112+
binding.homePanel.viewPanelStart.setOnClickListener {
113113
val navController = findNavController()
114114
navController.setGraph(R.navigation.route_nav_graph)
115115
val action = RouteNavGraphDirections.actionGlobalRouteFragment().setStart(placeSearchViewModel.panelInfo)
116116
navController.navigate(action)
117117
}
118118

119-
binding.layoutPanel.findViewById<View>(R.id.view_panel_end).setOnClickListener {
119+
binding.homePanel.viewPanelEnd.setOnClickListener {
120120
val navController = findNavController()
121121
navController.setGraph(R.navigation.route_nav_graph)
122122
val action = RouteNavGraphDirections.actionGlobalRouteFragment().setEnd(placeSearchViewModel.panelInfo)
@@ -202,8 +202,8 @@ class MapFragment : Fragment(), MapHandler {
202202
}
203203

204204
override fun setOnDisableScrollWIthZoomLevelListener() {
205-
if (binding.layoutPanel.visibility == View.VISIBLE) {
206-
binding.layoutPanel.visibility = View.GONE
205+
if (binding.homePanel.layoutPanel.visibility == View.VISIBLE) {
206+
binding.homePanel.layoutPanel.visibility = View.GONE
207207
tMap.tMapView.removeTMapMarkerItem(Marker.PLACE_MARKER)
208208
} else {
209209
setViewVisibility()

presentation/src/main/res/layout/fragment_map.xml

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
android:orientation="horizontal"
4747
app:layout_constraintGuide_end="115dp" />
4848

49-
<FrameLayout
50-
android:id="@+id/frame_layout_container"
49+
<androidx.constraintlayout.widget.ConstraintLayout
50+
android:id="@+id/layout_container"
5151
android:layout_width="match_parent"
5252
android:layout_height="match_parent"
5353
app:layout_constraintBottom_toBottomOf="parent"
@@ -72,23 +72,18 @@
7272
app:layout_constraintStart_toStartOf="@id/guideline_start"
7373
app:layout_constraintTop_toTopOf="@id/guideline_top" />
7474

75-
<androidx.constraintlayout.widget.ConstraintLayout
76-
android:id="@+id/layout_panel"
75+
<include
76+
android:id="@+id/home_panel"
7777
android:layout_width="0dp"
7878
android:layout_height="170dp"
7979
android:layout_marginTop="30dp"
8080
android:layout_marginEnd="90dp"
8181
android:elevation="15dp"
82-
android:visibility="@{placeSearchViewModel.panelVisibility}"
8382
app:layout_constraintBottom_toBottomOf="@id/guideline_bottom"
8483
app:layout_constraintEnd_toEndOf="parent"
85-
app:layout_constraintStart_toStartOf="@id/guideline_start">
86-
87-
<include
88-
android:id="@+id/home_panel"
89-
bind:placeSearchViewModel="@{placeSearchViewModel}"
90-
layout="@layout/home_panel" />
91-
</androidx.constraintlayout.widget.ConstraintLayout>
84+
app:layout_constraintStart_toStartOf="@id/guideline_start"
85+
bind:placeSearchViewModel="@{placeSearchViewModel}"
86+
layout="@layout/home_panel" />
9287

9388
<androidx.constraintlayout.widget.ConstraintLayout
9489
android:id="@+id/layout_compass"

presentation/src/main/res/layout/home_panel.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,16 @@
44
xmlns:tools="http://schemas.android.com/tools">
55

66
<data>
7-
87
<variable
98
name="placeSearchViewModel"
109
type="com.stop.ui.placesearch.PlaceSearchViewModel" />
1110
</data>
1211

1312
<androidx.constraintlayout.widget.ConstraintLayout
13+
android:id="@+id/layout_panel"
1414
android:layout_width="match_parent"
1515
android:layout_height="match_parent"
16+
android:visibility="@{placeSearchViewModel.panelVisibility}"
1617
android:background="@drawable/background_panel">
1718

1819
<ImageView

0 commit comments

Comments
 (0)