aboutsummaryrefslogtreecommitdiff
path: root/iosApp/iosApp/Units/UnitsViewModel.swift
diff options
context:
space:
mode:
Diffstat (limited to 'iosApp/iosApp/Units/UnitsViewModel.swift')
-rw-r--r--iosApp/iosApp/Units/UnitsViewModel.swift25
1 files changed, 9 insertions, 16 deletions
diff --git a/iosApp/iosApp/Units/UnitsViewModel.swift b/iosApp/iosApp/Units/UnitsViewModel.swift
index 7ffcfd1..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
@@ -52,7 +41,8 @@ class UnitsViewModel: ObservableObject {
}
@Published var isEditing = false
@Published var showDetails = false
- @Published var unitsDisplayMode: UnitsDisplayMode = .list
+ @Published var showUserInfo = false
+ @Published var unitsDisplayMode: UnitsDisplayMode = .map
@Published var units: [UnitInformation] = [] {
didSet {
markers = units.compactMap(Marker.companion.fromUnit)
@@ -71,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)
@@ -127,8 +116,12 @@ class UnitsViewModel: ObservableObject {
}
func show(action: DeviceRow.Action, for unit: UnitInformation) {
- detailsAction = action
- detailsUnit = unit
- showDetails = true
+ if action != .close {
+ detailsAction = action
+ detailsUnit = unit
+ showDetails = true
+ } else {
+ selectedUnit = nil
+ }
}
}