From 546738888395565ac2d5fe2cfb941ecdd0c1df45 Mon Sep 17 00:00:00 2001 From: Iván Ávalos Date: Mon, 11 Apr 2022 00:55:26 -0500 Subject: - [shared] Added DateUtils 'expect' class for platform-specific date format. - [android] Redesigned reports view, now supports custom reports! - [ios] Not rewritten yet, it won't build! --- androidApp/build.gradle.kts | 4 +- .../android/details/reports/UnitReportsFragment.kt | 116 +++++- androidApp/src/main/res/drawable/icon_down.xml | 10 + androidApp/src/main/res/drawable/icon_up.xml | 10 + .../src/main/res/layout/unit_details_reports.xml | 413 +++++++++++++-------- androidApp/src/main/res/values-es-rMX/strings.xml | 5 + androidApp/src/main/res/values/dimen.xml | 6 + androidApp/src/main/res/values/strings.xml | 5 + androidApp/src/main/res/values/styles.xml | 13 + .../mx/trackermap/TrackerMap/utils/DateUtils.kt | 23 ++ .../TrackerMap/controllers/ReportController.kt | 15 +- .../mx/trackermap/TrackerMap/utils/DateUtils.kt | 9 + .../mx/trackermap/TrackerMap/utils/Formatter.kt | 5 +- .../mx/trackermap/TrackerMap/utils/ReportDates.kt | 45 ++- 14 files changed, 484 insertions(+), 195 deletions(-) create mode 100644 androidApp/src/main/res/drawable/icon_down.xml create mode 100644 androidApp/src/main/res/drawable/icon_up.xml create mode 100644 shared/src/androidMain/kotlin/mx/trackermap/TrackerMap/utils/DateUtils.kt create mode 100644 shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/utils/DateUtils.kt diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts index 5bb488c..c813186 100644 --- a/androidApp/build.gradle.kts +++ b/androidApp/build.gradle.kts @@ -14,8 +14,8 @@ android { versionCode = 1 versionName = "1.0" ndk { - abiFilters.clear() - abiFilters += listOf("armeabi-v7a", "arm64-v8a") + // abiFilters.clear() + // abiFilters += listOf("armeabi-v7a", "arm64-v8a") } } buildTypes { 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 091cb7b..03a4220 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 @@ -18,6 +18,8 @@ package mx.trackermap.TrackerMap.android.details.reports import android.app.Activity +import android.app.DatePickerDialog +import android.app.TimePickerDialog import android.content.Intent import android.os.Build import android.os.Bundle @@ -27,14 +29,16 @@ import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.PopupMenu -import android.widget.TableRow -import android.widget.TextView +import android.widget.* import androidx.activity.result.contract.ActivityResultContracts import androidx.core.view.setMargins 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.LocalDateTime import mx.trackermap.TrackerMap.android.R import mx.trackermap.TrackerMap.android.databinding.UnitDetailsReportsBinding import mx.trackermap.TrackerMap.android.details.UnitDetailsAdapter @@ -47,6 +51,7 @@ import mx.trackermap.TrackerMap.utils.Formatter import mx.trackermap.TrackerMap.utils.ReportDates import org.koin.androidx.viewmodel.ext.android.viewModel import java.io.* +import java.util.* import kotlin.math.max import kotlin.time.ExperimentalTime @@ -59,12 +64,22 @@ class UnitReportsFragment : Fragment() { private val unitReportsViewModel: UnitReportsViewModel by viewModel() private lateinit var mapFragment: MapWrapperFragment + private lateinit var bottomSheetBehavior: BottomSheetBehavior private var reportFile: ReportController.Report.XlsxReport? = null private var exportAction: UnitReportsViewModel.ExportAction? = null + private lateinit var fromPickedDatetime: LocalDateTime + private lateinit var fromDatePicker: DatePickerDialog + private lateinit var fromTimePicker: TimePickerDialog + + private lateinit var toPickedDatetime: LocalDateTime + private lateinit var toDatePicker: DatePickerDialog + private lateinit var toTimePicker: TimePickerDialog + private companion object { - const val XLSX_MIME_TYPE = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" + const val XLSX_MIME_TYPE = + "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" } override fun onCreateView( @@ -80,7 +95,12 @@ class UnitReportsFragment : Fragment() { super.onViewCreated(view, savedInstanceState) unitReportsViewModel.setDeviceId( - arguments?.getInt(UnitDetailsAdapter.DEVICE_ID_ARG) ?: 0) + arguments?.getInt(UnitDetailsAdapter.DEVICE_ID_ARG) ?: 0 + ) + + bottomSheetBehavior = BottomSheetBehavior.from(binding.bottomSheet) + bottomSheetBehavior.state = BottomSheetBehavior.STATE_EXPANDED + setupEvents() initializeMap() } @@ -129,6 +149,12 @@ class UnitReportsFragment : Fragment() { binding.periodButton.setOnClickListener { showPeriodPopUp(it) } + binding.fromEditText.setOnClickListener { + fromDatePicker.show() + } + binding.toEditText.setOnClickListener { + toDatePicker.show() + } binding.exportButton.setOnClickListener { exportAction = UnitReportsViewModel.ExportAction.ACTION_SAVE unitReportsViewModel.fetchReportXlsx() @@ -137,6 +163,26 @@ class UnitReportsFragment : Fragment() { exportAction = UnitReportsViewModel.ExportAction.ACTION_SHARE unitReportsViewModel.fetchReportXlsx() } + binding.toggleSheet.setOnClickListener { + if (bottomSheetBehavior.state == BottomSheetBehavior.STATE_EXPANDED) { + bottomSheetBehavior.state = BottomSheetBehavior.STATE_COLLAPSED + } else { + bottomSheetBehavior.state = BottomSheetBehavior.STATE_EXPANDED + } + } + bottomSheetBehavior.addBottomSheetCallback(object: BottomSheetBehavior.BottomSheetCallback() { + override fun onStateChanged(bottomSheet: View, newState: Int) { + if (newState == BottomSheetBehavior.STATE_EXPANDED) { + binding.toggleSheet.setImageResource(R.drawable.icon_down) + binding.toggleSheet.contentDescription = getString(R.string.shared_slide_down) + } else { + binding.toggleSheet.setImageResource(R.drawable.icon_up) + binding.toggleSheet.contentDescription = getString(R.string.shared_slide_up) + } + } + + override fun onSlide(bottomSheet: View, slideOffset: Float) {} + }) unitReportsViewModel.setReportPeriod(ReportDates.ReportPeriod.Today()) unitReportsViewModel.setReportType(ReportController.ReportType.POSITIONS) } @@ -149,7 +195,11 @@ class UnitReportsFragment : Fragment() { when (report) { is ReportController.Report.PositionsReport -> { mapFragment.display(unitReportsViewModel.geofences.value!!) - mapFragment.display(report.positions.toTypedArray(), isReport = true, center = true) + mapFragment.display( + report.positions.toTypedArray(), + isReport = true, + center = true + ) showMap(true) } is ReportController.Report.EventsReport -> { @@ -191,6 +241,55 @@ class UnitReportsFragment : Fragment() { is ReportDates.ReportPeriod.Custom -> R.string.period_custom } ) + + binding.rangeLayout.visibility = + if (period is ReportDates.ReportPeriod.Custom) View.VISIBLE else View.GONE + + (period as? ReportDates.ReportPeriod.Custom)?.let { + val (from, to) = it.getStringDates() + binding.fromEditText.setText(Formatter.formatDate(from)) + binding.toEditText.setText(Formatter.formatDate(to)) + } + + /** + * Initialize date and time pickers + */ + + val (from, to) = period.getObjectDates() + + fromDatePicker = DatePickerDialog(requireContext(), { p0, p1, p2, p3 -> + fromPickedDatetime = LocalDateTime(p1, p2, p3, from.hour, from.minute) + fromTimePicker.show() + }, from.year, from.monthNumber, from.dayOfMonth) + + fromTimePicker = TimePickerDialog(requireContext(), { p0, p1, p2 -> + fromPickedDatetime = LocalDateTime( + fromPickedDatetime.year, + fromPickedDatetime.monthNumber, + fromPickedDatetime.dayOfMonth, + p1, p2 + ) + (period as? ReportDates.ReportPeriod.Custom)?.let { + unitReportsViewModel.setReportPeriod(it.withFrom(fromPickedDatetime)) + } + }, from.hour, from.minute, false) + + toDatePicker = DatePickerDialog(requireContext(), { p0, p1, p2, p3 -> + toPickedDatetime = LocalDateTime(p1, p2, p3, from.hour, from.minute) + toTimePicker.show() + }, to.year, to.monthNumber, to.dayOfMonth) + + toTimePicker = TimePickerDialog(requireContext(), { p0, p1, p2 -> + toPickedDatetime = LocalDateTime( + toPickedDatetime.year, + toPickedDatetime.monthNumber, + toPickedDatetime.dayOfMonth, + p1, p2 + ) + (period as? ReportDates.ReportPeriod.Custom)?.let { + unitReportsViewModel.setReportPeriod(it.withFrom(fromPickedDatetime)) + } + }, to.hour, to.minute, false) } unitReportsViewModel.geofences.observe(viewLifecycleOwner) { geofences -> @@ -280,9 +379,10 @@ class UnitReportsFragment : Fragment() { EventInformation.Type.MAINTENANCE -> R.string.event_maintenance EventInformation.Type.TEXT_MESSAGE -> R.string.event_text_message EventInformation.Type.DRIVER_CHANGED -> R.string.event_driver_changed - EventInformation.Type.UNKNOWN -> R.string.event_unknown + EventInformation.Type.UNKNOWN -> R.string.event_unknown else -> R.string.event_unknown - }) + } + ) } event.geofence?.let { geofenceText.text = it.name diff --git a/androidApp/src/main/res/drawable/icon_down.xml b/androidApp/src/main/res/drawable/icon_down.xml new file mode 100644 index 0000000..884bee1 --- /dev/null +++ b/androidApp/src/main/res/drawable/icon_down.xml @@ -0,0 +1,10 @@ + + + diff --git a/androidApp/src/main/res/drawable/icon_up.xml b/androidApp/src/main/res/drawable/icon_up.xml new file mode 100644 index 0000000..9b15755 --- /dev/null +++ b/androidApp/src/main/res/drawable/icon_up.xml @@ -0,0 +1,10 @@ + + + diff --git a/androidApp/src/main/res/layout/unit_details_reports.xml b/androidApp/src/main/res/layout/unit_details_reports.xml index 903c2c3..c29e4b0 100644 --- a/androidApp/src/main/res/layout/unit_details_reports.xml +++ b/androidApp/src/main/res/layout/unit_details_reports.xml @@ -1,194 +1,297 @@ - - - - - - - + android:layout_height="match_parent" + xmlns:tools="http://schemas.android.com/tools"> - + + - + + + + + - + - + - + - + - + - + - + - + - + + + + + + + + + + app:behavior_hideable="false" + app:behavior_peekHeight="@dimen/bottom_sheet_peak" + app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior" + style="@style/BottomSheetCardStyle"> + android:orientation="vertical"> - - - + android:layout_marginBottom="@dimen/margin" + android:orientation="horizontal"> - + + - - - - - - - + + + + + + + + + + + + + + android:orientation="horizontal"> - + - + + - + + android:gravity="center_vertical" + android:weightSum="2" + android:orientation="horizontal"> + + + + - + + + + + + + + + + + + + + android:orientation="horizontal" + android:layout_marginTop="@dimen/margin"> - + + + - + + + - + - \ No newline at end of file + \ No newline at end of file diff --git a/androidApp/src/main/res/values-es-rMX/strings.xml b/androidApp/src/main/res/values-es-rMX/strings.xml index d07b18d..f3fecb2 100644 --- a/androidApp/src/main/res/values-es-rMX/strings.xml +++ b/androidApp/src/main/res/values-es-rMX/strings.xml @@ -6,6 +6,8 @@ Cerrar Enviar Cargando + Deslizar hacia arriba + Deslizar hacia abajo Nombre de usuario @@ -113,6 +115,9 @@ Mes Últimos 30d Personalizado + — + Inicio + Fin Evento Fecha y hora diff --git a/androidApp/src/main/res/values/dimen.xml b/androidApp/src/main/res/values/dimen.xml index 92d5242..8c8c5f5 100644 --- a/androidApp/src/main/res/values/dimen.xml +++ b/androidApp/src/main/res/values/dimen.xml @@ -35,6 +35,12 @@ 10dp 11sp + + 80dp + + + 12sp + 8dp 16dp diff --git a/androidApp/src/main/res/values/strings.xml b/androidApp/src/main/res/values/strings.xml index ce07188..93dd45f 100644 --- a/androidApp/src/main/res/values/strings.xml +++ b/androidApp/src/main/res/values/strings.xml @@ -20,6 +20,8 @@ Close Send Loading + Slide up + Slide down Username @@ -127,6 +129,9 @@ Month Last 30d Custom + — + Start + End Event Datetime diff --git a/androidApp/src/main/res/values/styles.xml b/androidApp/src/main/res/values/styles.xml index dc40450..982d4dc 100644 --- a/androidApp/src/main/res/values/styles.xml +++ b/androidApp/src/main/res/values/styles.xml @@ -12,4 +12,17 @@ bold + + + + \ No newline at end of file diff --git a/shared/src/androidMain/kotlin/mx/trackermap/TrackerMap/utils/DateUtils.kt b/shared/src/androidMain/kotlin/mx/trackermap/TrackerMap/utils/DateUtils.kt new file mode 100644 index 0000000..35f1ac6 --- /dev/null +++ b/shared/src/androidMain/kotlin/mx/trackermap/TrackerMap/utils/DateUtils.kt @@ -0,0 +1,23 @@ +package mx.trackermap.TrackerMap.utils + +import android.os.Build +import kotlinx.datetime.LocalDateTime +import kotlinx.datetime.toJavaLocalDateTime +import java.text.SimpleDateFormat +import java.time.format.DateTimeFormatter +import java.util.* + +actual class DateUtils { + actual companion object { + actual fun formatDate(date: LocalDateTime): String { + val javaDate = date.toJavaLocalDateTime() + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + val formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm") + return javaDate.format(formatter) + } else { + val formatter = SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.getDefault()) + return formatter.format(date) + } + } + } +} \ No newline at end of file diff --git a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/controllers/ReportController.kt b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/controllers/ReportController.kt index e120e97..bc0a48f 100644 --- a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/controllers/ReportController.kt +++ b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/controllers/ReportController.kt @@ -60,18 +60,17 @@ class ReportController( return } - val (currentDate, previousDate) = reportPeriod.getDates() + val (from, to) = reportPeriod.getStringDates() if (!xlsx) { reportFlow.value = Report.LoadingReport } - // GlobalScope.launch { - when (reportType) { - ReportType.POSITIONS -> fetchPositions(deviceId, previousDate, currentDate, xlsx) - ReportType.EVENTS -> fetchEvents(deviceId, previousDate, currentDate, eventTypes, xlsx) - ReportType.STOPS -> fetchStops(deviceId, previousDate, currentDate, xlsx) - } - // } + + when (reportType) { + ReportType.POSITIONS -> fetchPositions(deviceId, from, to, xlsx) + ReportType.EVENTS -> fetchEvents(deviceId, from, to, eventTypes, xlsx) + ReportType.STOPS -> fetchStops(deviceId, from, to, xlsx) + } } private suspend fun fetchPositions( diff --git a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/utils/DateUtils.kt b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/utils/DateUtils.kt new file mode 100644 index 0000000..a85ae69 --- /dev/null +++ b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/utils/DateUtils.kt @@ -0,0 +1,9 @@ +package mx.trackermap.TrackerMap.utils + +import kotlinx.datetime.LocalDateTime + +expect class DateUtils { + companion object { + fun formatDate(date: LocalDateTime): String + } +} \ No newline at end of file diff --git a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/utils/Formatter.kt b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/utils/Formatter.kt index 77d0d14..bc7e622 100644 --- a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/utils/Formatter.kt +++ b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/utils/Formatter.kt @@ -23,9 +23,8 @@ class Formatter { companion object { fun formatDate(str: String): String { val timezone = TimeZone.currentSystemDefault() - val date = str.toInstant().toLocalDateTime(timezone).toString() - return date - .replace('T', ' ').trim('Z') + val datetime = str.toInstant().toLocalDateTime(timezone) + return DateUtils.formatDate(datetime) } fun formatSpeed(speed: Double, unit: SpeedUnit): String { diff --git a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/utils/ReportDates.kt b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/utils/ReportDates.kt index 64df79d..6c86d27 100644 --- a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/utils/ReportDates.kt +++ b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/utils/ReportDates.kt @@ -29,81 +29,86 @@ class ReportDates { val dateTime = instant.toLocalDateTime(timezone) val date = dateTime.date - abstract fun getDates(): Pair + abstract fun getObjectDates(): Pair + + fun getStringDates(): Pair { + val (from, to) = getObjectDates() + return formatDateTime(from) to formatDateTime(to) + } fun formatDateTime(dateTime: LocalDateTime) = dateTime.toInstant(timezone).toString() class Today : ReportPeriod() { - override fun getDates(): Pair { + override fun getObjectDates(): Pair { val from = date.atTime(0, 0) val to = dateTime - return formatDateTime(to) to formatDateTime(from) + return from to to } } class Last24 : ReportPeriod() { - override fun getDates(): Pair { + override fun getObjectDates(): Pair { val from = instant .minus(1, DateTimeUnit.DAY, timezone) .toLocalDateTime(timezone) val to = dateTime - return formatDateTime(to) to formatDateTime(from) + return from to to } } class Yesterday : ReportPeriod() { - override fun getDates(): Pair { + override fun getObjectDates(): Pair { val yesterday = instant .minus(1, DateTimeUnit.DAY, timezone) .toLocalDateTime(timezone).date val from = yesterday.atTime(0, 0) val to = yesterday.atTime(23, 59) - return formatDateTime(to) to formatDateTime(from) + return from to to } } class ThisWeek : ReportPeriod() { - override fun getDates(): Pair { + override fun getObjectDates(): Pair { val from = instant .minus(date.dayOfWeek.isoDayNumber - 1, DateTimeUnit.DAY, timezone) .toLocalDateTime(timezone).date .atTime(0, 0) val to = dateTime - return formatDateTime(to) to formatDateTime(from) + return from to to } } class Last7 : ReportPeriod() { - override fun getDates(): Pair { + override fun getObjectDates(): Pair { val from = instant .minus(1, DateTimeUnit.WEEK, timezone) .toLocalDateTime(timezone).date .atTime(0, 0) val to = dateTime - return formatDateTime(to) to formatDateTime(from) + return from to to } } class ThisMonth : ReportPeriod() { - override fun getDates(): Pair { + override fun getObjectDates(): Pair { val from = instant .minus(date.dayOfMonth - 1, DateTimeUnit.DAY, timezone) .toLocalDateTime(timezone).date .atTime(0, 0) val to = dateTime - return formatDateTime(to) to formatDateTime(from) + return from to to } } class Last30 : ReportPeriod() { - override fun getDates(): Pair { + override fun getObjectDates(): Pair { val from = instant .minus(1, DateTimeUnit.MONTH, timezone) .toLocalDateTime(timezone).date .atTime(0, 0) val to = dateTime - return formatDateTime(to) to formatDateTime(from) + return from to to } } @@ -111,13 +116,15 @@ class ReportDates { private val from: LocalDateTime? = null, private val to: LocalDateTime? = null ) : ReportPeriod() { - override fun getDates(): Pair { - return formatDateTime( + override fun getObjectDates(): Pair { + return Pair( + from ?: date.atTime(0, 0), to ?: dateTime - ) to formatDateTime( - from ?: date.atTime(0, 0) ) } + + fun withFrom (from: LocalDateTime): Custom = Custom (from, to) + fun withTo (to: LocalDateTime): Custom = Custom (from, to) } } } \ No newline at end of file -- cgit v1.2.3