diff options
Diffstat (limited to 'iosApp/iosApp/Devices')
-rw-r--r-- | iosApp/iosApp/Devices/DevicesView.swift | 39 | ||||
-rw-r--r-- | iosApp/iosApp/Devices/DevicesViewModel.swift | 48 |
2 files changed, 60 insertions, 27 deletions
diff --git a/iosApp/iosApp/Devices/DevicesView.swift b/iosApp/iosApp/Devices/DevicesView.swift index d3a361e..06f1df1 100644 --- a/iosApp/iosApp/Devices/DevicesView.swift +++ b/iosApp/iosApp/Devices/DevicesView.swift @@ -18,35 +18,20 @@ import SwiftUI struct DevicesView: View { - @StateObject var unitsViewModel: UnitsViewModel - @State var shouldShowView = false - @State var action: DeviceRow.Action = .details - @State var id: Int32? + @ObservedObject var devicesViewModel: DevicesViewModel + + init (unitsViewModel: UnitsViewModel) { + self._devicesViewModel = ObservedObject( + wrappedValue: DevicesViewModel(unitsViewModel: unitsViewModel)) + } var body: some View { - VStack { - List(unitsViewModel.units, id: \.device.id) { unit in - DeviceRow(unit: unit, callback: { action in - self.action = action - id = unit.device.id - shouldShowView = true - }) - .onTapGesture { - unitsViewModel.searchQuery = "" - unitsViewModel.isEditing = false - unitsViewModel.unitsDisplayMode = .map - unitsViewModel.selectedUnit = unit - UIApplication.shared.endEditing() - } - } - } - .sheet(isPresented: $shouldShowView) { - print("Dismissed") - } content: { - if let id = id { - DetailsView(isPresented: $shouldShowView, - action: action, - forId: id) + List(devicesViewModel.units, id: \.device.id) { unit in + DeviceRow(unit: unit, callback: { action in + self.devicesViewModel.show(action: action, for: unit) + }).onTapGesture { + self.devicesViewModel.select(unit: unit) + UIApplication.shared.endEditing() } } } diff --git a/iosApp/iosApp/Devices/DevicesViewModel.swift b/iosApp/iosApp/Devices/DevicesViewModel.swift new file mode 100644 index 0000000..76cf9a2 --- /dev/null +++ b/iosApp/iosApp/Devices/DevicesViewModel.swift @@ -0,0 +1,48 @@ +/** + * 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/>. + */ +import Foundation +import shared + +class DevicesViewModel: ObservableObject { + var unitsViewModel: UnitsViewModel + var id: Int32? = nil + var units: [UnitInformation] { + get { + return unitsViewModel.units + } + } + + @Published var shouldShowView = false + @Published var action: DeviceRow.Action = .details + + init(unitsViewModel: UnitsViewModel) { + self.unitsViewModel = unitsViewModel + } + + func select(unit: UnitInformation) { + unitsViewModel.searchQuery = "" + unitsViewModel.isEditing = false + unitsViewModel.unitsDisplayMode = .map + unitsViewModel.selectedUnit = unit + + } + + func show(action: DeviceRow.Action, for unit: UnitInformation) { + unitsViewModel.show(action: action, for: unit) + } +} |