Skip to content

Commit 7fbff09

Browse files
jeeminiminijeeminimini
committed
refactor : Marker object 만들기
1 parent 22a51e7 commit 7fbff09

File tree

6 files changed

+57
-86
lines changed

6 files changed

+57
-86
lines changed

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

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import com.stop.databinding.FragmentMapBinding
2020
import com.stop.model.Location
2121
import com.stop.ui.alarmsetting.AlarmViewModel
2222
import com.stop.ui.placesearch.PlaceSearchViewModel
23+
import com.stop.ui.util.Marker
2324
import kotlinx.coroutines.launch
2425

2526
class MapFragment : Fragment(), MapHandler {
@@ -80,8 +81,8 @@ class MapFragment : Fragment(), MapHandler {
8081
true
8182
)
8283
tMap.makeMarker(
83-
PERSON_MARKER,
84-
PERSON_MARKER_IMG,
84+
Marker.PERSON_MARKER,
85+
Marker.PERSON_MARKER_IMG,
8586
TMapPoint(
8687
placeSearchViewModel.currentLocation.latitude,
8788
placeSearchViewModel.currentLocation.longitude
@@ -135,7 +136,7 @@ class MapFragment : Fragment(), MapHandler {
135136
placeSearchViewModel.bookmarks.forEachIndexed { index, location ->
136137
tMap.makeMarker(
137138
index.toString(),
138-
BOOKMARK_MARKER_IMG,
139+
Marker.BOOKMARK_MARKER_IMG,
139140
TMapPoint(location.latitude, location.longitude)
140141
)
141142
}
@@ -160,8 +161,8 @@ class MapFragment : Fragment(), MapHandler {
160161
setPanel(clickTMapPoint)
161162

162163
tMap.makeMarker(
163-
PLACE_MARKER,
164-
PLACE_MARKER_IMG,
164+
Marker.PLACE_MARKER,
165+
Marker.PLACE_MARKER_IMG,
165166
clickTMapPoint
166167
)
167168
}
@@ -181,8 +182,8 @@ class MapFragment : Fragment(), MapHandler {
181182
setPanel(currentTmapPoint)
182183

183184
tMap.makeMarker(
184-
PLACE_MARKER,
185-
PLACE_MARKER_IMG,
185+
Marker.PLACE_MARKER,
186+
Marker.PLACE_MARKER_IMG,
186187
currentTmapPoint
187188
)
188189
}
@@ -221,7 +222,7 @@ class MapFragment : Fragment(), MapHandler {
221222
override fun setOnDisableScrollWIthZoomLevelListener() {
222223
if (binding.layoutPanel.visibility == View.VISIBLE) {
223224
binding.layoutPanel.visibility = View.GONE
224-
tMap.tMapView.removeTMapMarkerItem(PLACE_MARKER)
225+
tMap.tMapView.removeTMapMarkerItem(Marker.PLACE_MARKER)
225226
} else {
226227
setViewVisibility()
227228
mapUIVisibility = mapUIVisibility.xor(View.GONE)
@@ -233,15 +234,6 @@ class MapFragment : Fragment(), MapHandler {
233234
}
234235

235236
companion object {
236-
private const val PLACE_MARKER = "place_marker"
237-
private const val PLACE_MARKER_IMG = R.drawable.ic_point_marker
238-
239-
private const val PERSON_MARKER = "marker_person_pin"
240-
private const val PERSON_MARKER_IMG = R.drawable.ic_person_marker
241-
242-
private const val SAME_POINT = 1
243237
val PERMISSIONS = arrayOf(permission.ACCESS_FINE_LOCATION, permission.ACCESS_COARSE_LOCATION)
244-
245-
private const val BOOKMARK_MARKER_IMG = R.drawable.ic_bookmark_marker
246238
}
247239
}

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.stop.ui.map
22

33
import android.content.Context
4-
import com.stop.R
54
import com.stop.model.Location
5+
import com.stop.ui.util.Marker
66
import com.stop.ui.util.TMap
77

88
class MapTMap(
@@ -28,8 +28,8 @@ class MapTMap(
2828
fun clickLocation() {
2929
tMapView.setOnLongClickListenerCallback { _, _, tMapPoint ->
3030
makeMarker(
31-
PLACE_MARKER,
32-
PLACE_MARKER_IMG,
31+
Marker.PLACE_MARKER,
32+
Marker.PLACE_MARKER_IMG,
3333
tMapPoint
3434
)
3535

@@ -39,9 +39,8 @@ class MapTMap(
3939
}
4040

4141
companion object {
42-
private const val PLACE_MARKER = "marker"
43-
private const val PLACE_MARKER_IMG = R.drawable.ic_point_marker
4442

4543
private const val SAME_POINT = 1
44+
4645
}
4746
}

‎presentation/src/main/java/com/stop/ui/mission/MissionFragment.kt

Lines changed: 11 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package com.stop.ui.mission
33
import android.animation.Animator
44
import android.animation.AnimatorListenerAdapter
55
import android.content.ContextWrapper
6-
import android.graphics.Color
76
import android.os.Bundle
87
import android.view.LayoutInflater
98
import android.view.View
@@ -15,6 +14,7 @@ import com.skt.tmap.TMapPoint
1514
import com.stop.R
1615
import com.stop.databinding.FragmentMissionBinding
1716
import com.stop.model.Location
17+
import com.stop.ui.util.Marker
1818
import dagger.hilt.android.AndroidEntryPoint
1919
import kotlinx.coroutines.delay
2020
import kotlinx.coroutines.launch
@@ -57,31 +57,6 @@ class MissionFragment : Fragment(), MissionHandler {
5757
super.onDestroyView()
5858
}
5959

60-
// private fun mimicUserMove() {
61-
// val lines = readFromAssets()
62-
//
63-
// CoroutineScope(Dispatchers.IO).launch {
64-
// lines.forEach { line ->
65-
// val (longitude, latitude) = line.split(",")
66-
// tMap.moveLocation(longitude, latitude)
67-
// delay(500)
68-
// }
69-
// }
70-
// }
71-
72-
// private fun readFromAssets(): List<String> {
73-
// val reader =
74-
// BufferedReader(InputStreamReader(requireContext().assets.open(FAKE_USER_FILE_PATH)))
75-
// val lines = arrayListOf<String>()
76-
// var line = reader.readLine()
77-
// while (line != null) {
78-
// lines.add(line)
79-
// line = reader.readLine()
80-
// }
81-
// reader.close()
82-
// return lines
83-
// }
84-
8560
private fun setDataBinding() {
8661
binding.lifecycleOwner = viewLifecycleOwner
8762
binding.viewModel = viewModel
@@ -164,8 +139,8 @@ class MissionFragment : Fragment(), MissionHandler {
164139
tMap.drawMoveLine(
165140
TMapPoint(nowLocation.latitude, nowLocation.longitude),
166141
TMapPoint(beforeLocation.latitude, beforeLocation.longitude),
167-
BUS_LINE + BUS_LINE_NUM.toString(),
168-
BUS_LINE_COLOR
142+
Marker.BUS_LINE + BUS_LINE_NUM.toString(),
143+
Marker.BUS_LINE_COLOR
169144
)
170145
BUS_LINE_NUM += 1
171146
}
@@ -174,8 +149,8 @@ class MissionFragment : Fragment(), MissionHandler {
174149
viewModel.busCurrentLocation = beforeLocation
175150

176151
tMap.makeMarker(
177-
BUS_MARKER,
178-
BUS_MARKER_IMG,
152+
Marker.BUS_MARKER,
153+
Marker.BUS_MARKER_IMG,
179154
TMapPoint(nowLocation.latitude, nowLocation.longitude)
180155
)
181156
}
@@ -192,15 +167,15 @@ class MissionFragment : Fragment(), MissionHandler {
192167
tMap.drawMoveLine(
193168
TMapPoint(nowLocation.latitude, nowLocation.longitude),
194169
TMapPoint(beforeLocation.latitude, beforeLocation.longitude),
195-
SUBWAY_LINE + (index - 1).toString(),
196-
SUBWAY_LINE_COLOR
170+
Marker.SUBWAY_LINE + (index - 1).toString(),
171+
Marker.SUBWAY_LINE_COLOR
197172
)
198173
}
199174
viewModel.busCurrentLocation = Location(nowLocation.latitude, nowLocation.longitude)
200175

201176
tMap.makeMarker(
202-
SUBWAY_MARKER,
203-
SUBWAY_MARKER_IMG,
177+
Marker.SUBWAY_MARKER,
178+
Marker.SUBWAY_MARKER_IMG,
204179
TMapPoint(nowLocation.latitude, nowLocation.longitude)
205180
)
206181

@@ -223,8 +198,8 @@ class MissionFragment : Fragment(), MissionHandler {
223198
tMap.drawMoveLine(
224199
nowLocation,
225200
beforeLocation,
226-
PERSON_LINE + PERSON_LINE_NUM.toString(),
227-
PERSON_LINE_COLOR
201+
Marker.PERSON_LINE + PERSON_LINE_NUM.toString(),
202+
Marker.PERSON_LINE_COLOR
228203
)
229204
PERSON_LINE_NUM += 1
230205
}
@@ -247,25 +222,12 @@ class MissionFragment : Fragment(), MissionHandler {
247222
private const val MINUS = ""
248223
private const val LEFT_TIME = 60
249224

250-
private const val PERSON_LINE = "person_line"
251-
private const val PERSON_LINE_COLOR = Color.MAGENTA
252225
private var PERSON_LINE_NUM = 0
253226

254-
private const val BUS_LINE = "bus_line"
255-
private const val BUS_LINE_COLOR = Color.BLUE
256227
private var BUS_LINE_NUM = 0
257228

258-
private const val SUBWAY_LINE = "bus_line"
259-
private const val SUBWAY_LINE_COLOR = Color.BLUE
260-
261229
private val INIT_LOCATION = Location(0.0, 0.0)
262230

263-
private const val BUS_MARKER = "marker_bus_pin"
264-
private const val BUS_MARKER_IMG = R.drawable.ic_bus_marker
265-
266-
private const val SUBWAY_MARKER = "marker_subway_pin"
267-
private const val SUBWAY_MARKER_IMG = R.drawable.ic_subway_marker
268-
269231
private const val SECOND_UNIT = 1000
270232

271233
}

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

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
package com.stop.ui.mission
22

33
import android.content.Context
4-
import android.graphics.Color
54
import com.skt.tmap.TMapPoint
65
import com.skt.tmap.overlay.TMapPolyLine
7-
import com.stop.R
6+
import com.stop.ui.util.Marker
87
import com.stop.ui.util.TMap
98

109
class MissionTMap(
@@ -27,21 +26,16 @@ class MissionTMap(
2726
drawMoveLine(
2827
mockLocation,
2928
tMapView.locationPoint,
30-
PERSON_LINE + PERSON_LINE_NUM.toString(),
31-
PERSON_LINE_COLOR
29+
Marker.PERSON_LINE + PERSON_LINE_NUM.toString(),
30+
Marker.PERSON_LINE_COLOR
3231
)
3332
PERSON_LINE_NUM += 1
3433

35-
makeMarker(PERSON_MARKER, PERSON_MARKER_IMG, mockLocation)
34+
makeMarker(Marker.PERSON_MARKER, Marker.PERSON_MARKER_IMG, mockLocation)
3635
tMapView.setLocationPoint(mockLocation.latitude, mockLocation.longitude)
3736
}
3837

3938
companion object {
40-
private const val PERSON_MARKER = "marker_person_pin"
41-
private const val PERSON_MARKER_IMG = R.drawable.ic_person_marker
42-
43-
private const val PERSON_LINE = "person_line"
44-
private const val PERSON_LINE_COLOR = Color.MAGENTA
4539
private var PERSON_LINE_NUM = 0
4640
}
4741

‎presentation/src/main/java/com/stop/ui/util/Marker.kt

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
package com.stop.ui.util
2+
3+
import android.graphics.Color
4+
import com.stop.R
5+
6+
object Marker {
7+
const val PLACE_MARKER = "place_marker"
8+
const val PLACE_MARKER_IMG = R.drawable.ic_point_marker
9+
10+
const val PERSON_MARKER = "marker_person_pin"
11+
const val PERSON_MARKER_IMG = R.drawable.ic_person_marker
12+
const val PERSON_LINE = "person_line"
13+
const val PERSON_LINE_COLOR = Color.MAGENTA
14+
15+
const val BOOKMARK_MARKER_IMG = R.drawable.ic_bookmark_marker
16+
17+
const val BUS_MARKER = "marker_bus_pin"
18+
const val BUS_MARKER_IMG = R.drawable.ic_bus_marker
19+
const val BUS_LINE = "bus_line"
20+
const val BUS_LINE_COLOR = Color.BLUE
21+
22+
const val SUBWAY_MARKER = "marker_subway_pin"
23+
const val SUBWAY_MARKER_IMG = R.drawable.ic_subway_marker
24+
const val SUBWAY_LINE = "bus_line"
25+
const val SUBWAY_LINE_COLOR = Color.BLUE
26+
27+
}

‎presentation/src/main/java/com/stop/ui/util/TMap.kt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import com.skt.tmap.TMapPoint
88
import com.skt.tmap.TMapView
99
import com.skt.tmap.overlay.TMapMarkerItem
1010
import com.stop.BuildConfig
11-
import com.stop.R
1211
import com.stop.model.Location
1312
import com.stop.ui.map.MapHandler
1413
import com.stop.ui.mission.MissionHandler
@@ -71,8 +70,8 @@ open class TMap(
7170
tMapView.setLocationPoint(location.latitude, location.longitude)
7271

7372
makeMarker(
74-
PERSON_MARKER,
75-
PERSON_MARKER_IMG,
73+
Marker.PERSON_MARKER,
74+
Marker.PERSON_MARKER_IMG,
7675
nowLocation
7776
)
7877

@@ -108,7 +107,5 @@ open class TMap(
108107
private const val KOREA_LONGITUDE_MIN = 124.661865
109108
private const val KOREA_LONGITUDE_MAX = 132.550049
110109

111-
private const val PERSON_MARKER = "marker_person_pin"
112-
private const val PERSON_MARKER_IMG = R.drawable.ic_person_marker
113110
}
114111
}

0 commit comments

Comments
 (0)