diff options
| author | Iván Ávalos <avalos@disroot.org> | 2022-02-17 20:23:43 -0600 |
|---|---|---|
| committer | Iván Ávalos <avalos@disroot.org> | 2022-02-17 20:23:43 -0600 |
| commit | 51d6a29e387dbb3e657ba681be42b9c443522bea (patch) | |
| tree | 2386bd7d5640c80a79c69b5bbbeba3bd65543c3e | |
| parent | 91681e8dd5875ac1cfa2844f7a25df081a4b255d (diff) | |
| parent | e7c2291795f54d6080895d939c7a1feeeeac5dc2 (diff) | |
| download | etbsa-trackermap-mobile-51d6a29e387dbb3e657ba681be42b9c443522bea.tar.gz etbsa-trackermap-mobile-51d6a29e387dbb3e657ba681be42b9c443522bea.tar.bz2 etbsa-trackermap-mobile-51d6a29e387dbb3e657ba681be42b9c443522bea.zip | |
Merge branch 'ios_app' of https://git.sr.ht/~avalos/trackermap-mobile into ios_app
| -rw-r--r-- | iosApp/iosApp/Devices/DeviceRow.swift | 1 | ||||
| -rw-r--r-- | iosApp/iosApp/Units/UnitsViewModel.swift | 12 |
2 files changed, 1 insertions, 12 deletions
diff --git a/iosApp/iosApp/Devices/DeviceRow.swift b/iosApp/iosApp/Devices/DeviceRow.swift index 42ef0dc..31ffbc0 100644 --- a/iosApp/iosApp/Devices/DeviceRow.swift +++ b/iosApp/iosApp/Devices/DeviceRow.swift @@ -38,6 +38,7 @@ struct DeviceRow: View { /* MARK: - Device icon */ let category = Marker.companion.categoryToMarkerType(category: unit.device.category) Image(MarkerTransformations.markerTypeToImageName(markerType: category)) + .imageScale(.large) .padding(5.0) getSharedContent() diff --git a/iosApp/iosApp/Units/UnitsViewModel.swift b/iosApp/iosApp/Units/UnitsViewModel.swift index af6fe32..47adeb7 100644 --- a/iosApp/iosApp/Units/UnitsViewModel.swift +++ b/iosApp/iosApp/Units/UnitsViewModel.swift @@ -30,17 +30,6 @@ class UnitsViewModel: ObservableObject { case list } - class Camera { - let point: MaplyCoordinate? - let height: Float? - - init(_ point: MaplyCoordinate? = nil, - height: Float? = nil) { - self.point = point - self.height = height - } - } - var detailsUnit: UnitInformation? = nil var detailsAction = DeviceRow.Action.details @@ -72,7 +61,6 @@ class UnitsViewModel: ObservableObject { @Published var selectedMarker: Marker? = nil @Published var mapLayerType: MapLayer = .companion.defaultLayer @Published var geofences: [Int: Geofence] = [:] - @Published var camera: Camera = Camera() init() { unitsController.fetchUnits(scope: mainScope) |