diff options
author | Iván Ávalos <avalos@disroot.org> | 2022-01-31 23:41:31 -0600 |
---|---|---|
committer | Iván Ávalos <avalos@disroot.org> | 2022-01-31 23:41:31 -0600 |
commit | 3d926c76f41f9fb40a4a17322d53eb2fd3383b69 (patch) | |
tree | 7b7ca05e7a4dbb5d5b24b48b37da6b5d0db44ca3 /shared/src | |
parent | 90a9f7028053b3c4a56b88fcc52de675db5b9ab9 (diff) | |
download | etbsa-trackermap-mobile-3d926c76f41f9fb40a4a17322d53eb2fd3383b69.tar.gz etbsa-trackermap-mobile-3d926c76f41f9fb40a4a17322d53eb2fd3383b69.tar.bz2 etbsa-trackermap-mobile-3d926c76f41f9fb40a4a17322d53eb2fd3383b69.zip |
- Adapter iOS app to changes in UnitsController
- Added getHourmeter() method to UnitInformation
- Added missing license headers
Diffstat (limited to 'shared/src')
5 files changed, 72 insertions, 12 deletions
diff --git a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/Injectable.kt b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/Injectable.kt index a7467d6..6dda226 100644 --- a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/Injectable.kt +++ b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/Injectable.kt @@ -1,3 +1,20 @@ +/** + * TrackerMap + * Copyright (C) 2021-2022 Iván Ávalos <avalos@disroot.org>, Henoch Ojeda <imhenoch@protonmail.com> + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ package mx.trackermap.TrackerMap interface Injectable
\ No newline at end of file diff --git a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/UnitInformation.kt b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/UnitInformation.kt index a276fda..1e23396 100644 --- a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/UnitInformation.kt +++ b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/UnitInformation.kt @@ -17,6 +17,8 @@ */ package mx.trackermap.TrackerMap.client.models +import kotlinx.serialization.json.longOrNull + data class UnitInformation( val device: Device, val position: Position? @@ -51,4 +53,6 @@ data class UnitInformation( } } ?: EngineStop.UNKNOWN } else EngineStop.UNKNOWN + + fun getHourmeter() = position?.attributes?.get("hours")?.longOrNull }
\ No newline at end of file diff --git a/shared/src/iosMain/kotlin/mx/trackermap/TrackerMap/client/infrastructure/HttpClientProvider.kt b/shared/src/iosMain/kotlin/mx/trackermap/TrackerMap/client/infrastructure/HttpClientProvider.kt index 1ccb2e6..e95e964 100644 --- a/shared/src/iosMain/kotlin/mx/trackermap/TrackerMap/client/infrastructure/HttpClientProvider.kt +++ b/shared/src/iosMain/kotlin/mx/trackermap/TrackerMap/client/infrastructure/HttpClientProvider.kt @@ -1,3 +1,20 @@ +/** + * TrackerMap + * Copyright (C) 2021-2022 Iván Ávalos <avalos@disroot.org>, Henoch Ojeda <imhenoch@protonmail.com> + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ package mx.trackermap.TrackerMap.client.infrastructure import io.ktor.client.* diff --git a/shared/src/iosMain/kotlin/mx/trackermap/TrackerMap/utils/MainScope.kt b/shared/src/iosMain/kotlin/mx/trackermap/TrackerMap/utils/MainScope.kt new file mode 100644 index 0000000..b992524 --- /dev/null +++ b/shared/src/iosMain/kotlin/mx/trackermap/TrackerMap/utils/MainScope.kt @@ -0,0 +1,34 @@ +/** + * TrackerMap + * Copyright (C) 2021-2022 Iván Ávalos <avalos@disroot.org>, Henoch Ojeda <imhenoch@protonmail.com> + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +package mx.trackermap.TrackerMap.utils + +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.MainScope +import kotlinx.coroutines.cancel + +class MainScope { + companion object { + fun createMainScope(): CoroutineScope { + return MainScope() + } + + fun cancelScope(scope: CoroutineScope) { + scope.cancel() + } + } +}
\ No newline at end of file diff --git a/shared/src/iosMain/kotlin/mx/trackermap/TrackerMap/utils/Serialization.kt b/shared/src/iosMain/kotlin/mx/trackermap/TrackerMap/utils/Serialization.kt deleted file mode 100644 index be26416..0000000 --- a/shared/src/iosMain/kotlin/mx/trackermap/TrackerMap/utils/Serialization.kt +++ /dev/null @@ -1,12 +0,0 @@ -package mx.trackermap.TrackerMap.utils - -import kotlinx.serialization.json.JsonPrimitive -import kotlinx.serialization.json.longOrNull - -class Serialization { - companion object { - fun longOrNull(json: JsonPrimitive) = json.longOrNull - - fun toString(json: JsonPrimitive) = json.toString() - } -}
\ No newline at end of file |