diff options
Diffstat (limited to 'androidApp/src/main/java/mx/trackermap/TrackerMap/android/details')
2 files changed, 14 insertions, 13 deletions
diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/reports/UnitReportsFragment.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/reports/UnitReportsFragment.kt index aab3cfa..65071da 100644 --- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/reports/UnitReportsFragment.kt +++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/reports/UnitReportsFragment.kt @@ -36,7 +36,6 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.commit import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.card.MaterialCardView -import io.ktor.utils.io.* import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.datetime.* import kotlinx.datetime.TimeZone @@ -223,6 +222,7 @@ class UnitReportsFragment : Fragment() { } } is ReportController.Report.LoadingReport -> loading() + else -> loading() } } @@ -260,13 +260,13 @@ class UnitReportsFragment : Fragment() { val (from, to) = period.getObjectDates() - fromDatePicker = DatePickerDialog(requireContext(), { p0, p1, p2, p3 -> + fromDatePicker = DatePickerDialog(requireContext(), { _, p1, p2, p3 -> fromPickedDatetime = LocalDateTime(p1, p2 + 1, p3, from.hour, from.minute) fromTimePicker.show() }, from.year, from.monthNumber, from.dayOfMonth) fromDatePicker.datePicker.maxDate = Calendar.getInstance().timeInMillis - fromTimePicker = TimePickerDialog(requireContext(), { p0, p1, p2 -> + fromTimePicker = TimePickerDialog(requireContext(), { _, p1, p2 -> fromPickedDatetime = LocalDateTime( fromPickedDatetime.year, fromPickedDatetime.monthNumber, @@ -275,7 +275,7 @@ class UnitReportsFragment : Fragment() { ) (period as? ReportDates.ReportPeriod.Custom)?.let { val fromInstant = fromPickedDatetime.toInstant(TimeZone.currentSystemDefault()) - val toInstant = Calendar.getInstance().toInstant().toKotlinInstant() + val toInstant = Clock.System.now() val plusMonth = fromInstant.plus(31.toDuration(DurationUnit.DAYS)) /* Make ultra sure that user can't select a period longer than a month */ @@ -293,13 +293,13 @@ class UnitReportsFragment : Fragment() { } }, from.hour, from.minute, false) - toDatePicker = DatePickerDialog(requireContext(), { p0, p1, p2, p3 -> + toDatePicker = DatePickerDialog(requireContext(), { _, p1, p2, p3 -> toPickedDatetime = LocalDateTime(p1, p2 + 1, p3, from.hour, from.minute) toTimePicker.show() }, to.year, to.monthNumber, to.dayOfMonth) toDatePicker.datePicker.maxDate = Calendar.getInstance().timeInMillis - toTimePicker = TimePickerDialog(requireContext(), { p0, p1, p2 -> + toTimePicker = TimePickerDialog(requireContext(), { _, p1, p2 -> toPickedDatetime = LocalDateTime( toPickedDatetime.year, toPickedDatetime.monthNumber, diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/reports/UnitReportsViewModel.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/reports/UnitReportsViewModel.kt index 41a6b6d..628ce2f 100644 --- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/reports/UnitReportsViewModel.kt +++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/reports/UnitReportsViewModel.kt @@ -19,7 +19,7 @@ package mx.trackermap.TrackerMap.android.details.reports import androidx.lifecycle.* import kotlinx.coroutines.DelicateCoroutinesApi -import kotlinx.coroutines.flow.collect +import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.launch import mx.trackermap.TrackerMap.client.models.EventInformation import mx.trackermap.TrackerMap.client.models.Geofence @@ -42,16 +42,17 @@ class UnitReportsViewModel( private val reportController: ReportController by inject() private var _deviceId = savedStateHandle.getLiveData("deviceId", 0) - private val _reportType: MutableLiveData<ReportController.ReportType> = savedStateHandle.getLiveData("reportType", null) + private val _reportType: MutableLiveData<ReportController.ReportType> = + savedStateHandle.getLiveData("reportType", ReportController.ReportType.POSITIONS) private val _reportPeriod: MutableLiveData<ReportDates.ReportPeriod> = - savedStateHandle.getLiveData("reportPeriod", null) - private val _report: MutableLiveData<ReportController.Report> = MutableLiveData() + savedStateHandle.getLiveData("reportPeriod", ReportDates.ReportPeriod.Today()) + private val _report: MutableLiveData<ReportController.Report?> = MutableLiveData() private val _geofences: MutableLiveData<Array<Geofence>> = MutableLiveData(emptyArray()) val deviceId: LiveData<Int> get() = _deviceId val reportType: LiveData<ReportController.ReportType> get() = _reportType val reportPeriod: LiveData<ReportDates.ReportPeriod> get() = _reportPeriod - val report: LiveData<ReportController.Report> get() = _report + val report: LiveData<ReportController.Report?> get() = _report val geofences: LiveData<Array<Geofence>> get() = _geofences init { @@ -82,13 +83,13 @@ class UnitReportsViewModel( } private suspend fun setupReportObserver() { - reportController.reportFlow.collect { + (reportController.reportFlow as StateFlow<ReportController.Report>).collect { _report.value = it } } private suspend fun setupGeofenceObserver() { - geofencesController.geofencesFlow.collect { + (geofencesController.geofencesFlow as StateFlow<Map<Int, Geofence>>).collect { _geofences.value = it.values.toTypedArray() } } |