Skip to content

Commit 0e46002

Browse files
committed
fix : DataStore 용량제한으로 null이 들어가는 이슈 해결
1 parent 6194013 commit 0e46002

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed

data/src/main/java/com/stop/data/local/model/Alarm.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import com.stop.domain.model.route.tmap.custom.Route
88
data class Alarm(
99
val startPosition: String,
1010
val endPosition: String,
11-
val routes: List<Route>,
11+
val routes: Route,
1212
val lastTime: String, // 막차 시간 -> 23:30:15 시분초
1313
val walkTime : Int, // 도보시간 -> 분단위
1414
val alarmTime: Int, // 10분 전 알람 설정 -> 10

data/src/main/java/com/stop/data/model/alarm/AlarmRepositoryItem.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import com.stop.domain.model.route.tmap.custom.Route
77
data class AlarmRepositoryItem(
88
val startPosition: String,
99
val endPosition: String,
10-
val routes: List<Route>,
10+
val routes: Route,
1111
val lastTime: String, // 막차 시간 -> 23:30:15 시분초
1212
val walkTime : Int, // 도보시간 -> 분단위
1313
val alarmTime: Int, // 10분 전 알람 설정 -> 10

domain/src/main/java/com/stop/domain/model/alarm/AlarmUseCaseItem.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import com.stop.domain.model.route.tmap.custom.Route
55
data class AlarmUseCaseItem(
66
val startPosition: String,
77
val endPosition: String,
8-
val routes: List<Route>,
8+
val routes: Route,
99
val lastTime: String, // 막차 시간 -> 23:30:15 시분초
1010
val walkTime : Int, // 도보시간 -> 분단위
1111
val alarmTime: Int, // 10분 전 알람 설정 -> 10

presentation/src/main/AndroidManifest.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747

4848
<activity
4949
android:name=".AlarmActivity"
50-
android:excludeFromRecents="true"
5150
android:exported="true"
5251
android:screenOrientation="portrait"
5352
android:showOnLockScreen="true"

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,20 @@ class MapFragment : Fragment(), MapHandler {
4343
savedInstanceState: Bundle?
4444
): View {
4545
_binding = FragmentMapBinding.inflate(inflater, container, false)
46+
4647
initBinding()
4748

4849
return binding.root
4950
}
5051

52+
private fun initBinding() {
53+
alarmViewModel.getAlarm()
54+
binding.lifecycleOwner = viewLifecycleOwner
55+
binding.alarmViewModel = alarmViewModel
56+
binding.placeSearchViewModel = placeSearchViewModel
57+
binding.fragment = this@MapFragment
58+
}
59+
5160
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
5261
super.onViewCreated(view, savedInstanceState)
5362

@@ -71,13 +80,6 @@ class MapFragment : Fragment(), MapHandler {
7180
observeClickCurrentLocation()
7281
}
7382

74-
private fun initBinding() {
75-
binding.lifecycleOwner = viewLifecycleOwner
76-
binding.alarmViewModel = alarmViewModel
77-
binding.placeSearchViewModel = placeSearchViewModel
78-
binding.fragment = this@MapFragment
79-
}
80-
8183
private fun initTMap() {
8284
placeSearchViewModel.tMap?.let {
8385
tMap = it
@@ -282,7 +284,6 @@ class MapFragment : Fragment(), MapHandler {
282284
}
283285

284286
private fun showBottomSheet() {
285-
alarmViewModel.getAlarm()
286287
val behavior = BottomSheetBehavior.from(binding.layoutHomeBottomSheet)
287288
behavior.state = BottomSheetBehavior.STATE_EXPANDED
288289
binding.homeBottomSheet.layoutStateExpanded.root.visibility = View.VISIBLE

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ class MissionFragment : Fragment(), MissionHandler {
183183
private fun getAlarmInfo() {
184184
alarmSettingViewModel.getAlarm()
185185
val linePoints = arrayListOf<TMapPoint>()
186-
val walkInfo = alarmSettingViewModel.alarmItem.value?.routes?.first() as WalkRoute
186+
val walkInfo = alarmSettingViewModel.alarmItem.value?.routes as WalkRoute
187187
tMap.drawWalkRoute(walkInfo, linePoints)
188188
tMap.drawWalkLines(linePoints, Marker.WALK_LINE, Marker.WALK_LINE_COLOR)
189189

0 commit comments

Comments
 (0)