From e38960ff845bddbd463c43801ad01834f77474f2 Mon Sep 17 00:00:00 2001 From: Iván Ávalos Date: Mon, 17 Jan 2022 02:06:41 -0600 Subject: Implemented timer that fetches units every 10 seconds, and updated map to work with timer --- .../java/mx/trackermap/TrackerMap/android/details/DetailsActivity.kt | 2 ++ .../java/mx/trackermap/TrackerMap/android/details/UnitDetailsAdapter.kt | 2 ++ .../TrackerMap/android/details/commands/UnitCommandsFragment.kt | 2 ++ .../TrackerMap/android/details/information/UnitInformationFragment.kt | 2 ++ .../TrackerMap/android/details/information/UnitInformationViewModel.kt | 2 ++ .../TrackerMap/android/details/reports/UnitReportsFragment.kt | 2 ++ 6 files changed, 12 insertions(+) (limited to 'androidApp/src/main/java/mx/trackermap/TrackerMap/android/details') diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/DetailsActivity.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/DetailsActivity.kt index 7fd1203..56d5c4b 100644 --- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/DetailsActivity.kt +++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/DetailsActivity.kt @@ -13,8 +13,10 @@ import kotlinx.coroutines.DelicateCoroutinesApi import mx.trackermap.TrackerMap.android.R import mx.trackermap.TrackerMap.android.databinding.DetailsActivityBinding import mx.trackermap.TrackerMap.android.shared.UnitRenderData +import kotlin.time.ExperimentalTime @DelicateCoroutinesApi +@ExperimentalTime class DetailsActivity : AppCompatActivity() { private var _binding: DetailsActivityBinding? = null diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/UnitDetailsAdapter.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/UnitDetailsAdapter.kt index 8987af1..cc2a7c2 100644 --- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/UnitDetailsAdapter.kt +++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/UnitDetailsAdapter.kt @@ -8,8 +8,10 @@ import kotlinx.coroutines.DelicateCoroutinesApi import mx.trackermap.TrackerMap.android.details.commands.UnitCommandsFragment import mx.trackermap.TrackerMap.android.details.information.UnitInformationFragment import mx.trackermap.TrackerMap.android.details.reports.UnitReportsFragment +import kotlin.time.ExperimentalTime @DelicateCoroutinesApi +@ExperimentalTime class UnitDetailsAdapter( activity: FragmentActivity, private val deviceId: Int, diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/commands/UnitCommandsFragment.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/commands/UnitCommandsFragment.kt index 61a4e37..cd8d7af 100644 --- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/commands/UnitCommandsFragment.kt +++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/commands/UnitCommandsFragment.kt @@ -16,8 +16,10 @@ import mx.trackermap.TrackerMap.android.databinding.UnitDetailsCommandsBinding import mx.trackermap.TrackerMap.android.details.UnitDetailsAdapter import mx.trackermap.TrackerMap.android.shared.MarkerTransformations import org.koin.androidx.viewmodel.ext.android.viewModel +import kotlin.time.ExperimentalTime @DelicateCoroutinesApi +@ExperimentalTime class UnitCommandsFragment: Fragment() { private var _binding: UnitDetailsCommandsBinding? = null private val binding get() = _binding!! diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/information/UnitInformationFragment.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/information/UnitInformationFragment.kt index e75f475..ab94547 100644 --- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/information/UnitInformationFragment.kt +++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/information/UnitInformationFragment.kt @@ -24,8 +24,10 @@ import mx.trackermap.TrackerMap.client.models.UnitInformation import mx.trackermap.TrackerMap.utils.Formatter import mx.trackermap.TrackerMap.utils.SpeedUnit import org.koin.androidx.viewmodel.ext.android.viewModel +import kotlin.time.ExperimentalTime @DelicateCoroutinesApi +@ExperimentalTime class UnitInformationFragment : Fragment() { private var _binding: UnitDetailsInformationBinding? = null diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/information/UnitInformationViewModel.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/information/UnitInformationViewModel.kt index 4705c00..721fa68 100644 --- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/information/UnitInformationViewModel.kt +++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/information/UnitInformationViewModel.kt @@ -9,8 +9,10 @@ import kotlinx.coroutines.launch import mx.trackermap.TrackerMap.client.models.UnitInformation import mx.trackermap.TrackerMap.controllers.UnitsController import org.koin.core.component.KoinComponent +import kotlin.time.ExperimentalTime @DelicateCoroutinesApi +@ExperimentalTime class UnitInformationViewModel constructor( private val unitsController: UnitsController ) : ViewModel(), KoinComponent { 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 4c87b31..d3e008f 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 @@ -32,8 +32,10 @@ import mx.trackermap.TrackerMap.utils.ReportDates import org.koin.androidx.viewmodel.ext.android.viewModel import java.lang.Exception import kotlin.math.max +import kotlin.time.ExperimentalTime @DelicateCoroutinesApi +@ExperimentalTime class UnitReportsFragment : Fragment() { private var _binding: UnitDetailsReportsBinding? = null -- cgit v1.2.3