Skip to content

Commit

Permalink
settings(iOS): lots of ugly hacks to get iOS 14 to work
Browse files Browse the repository at this point in the history 
Fixes #4864
  • Loading branch information
@osy
osy committed Jan 2, 2023
1 parent 6d56dc8 commit bc9c97f
Showing 1 changed file with 92 additions and 40 deletions.
132 changes: 92 additions & 40 deletions Platform/iOS/VMSettingsView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ struct VMSettingsView: View {
@ObservedObject var config: UTMQemuConfiguration

@State private var isResetConfig: Bool = false
@State private var isCreateDriveShown: Bool = false
@State private var isImportDriveShown: Bool = false
@StateObject private var devicesState = DevicesState()

@StateObject private var globalFileImporterShim = GlobalFileImporterShim()

Expand Down Expand Up @@ -71,51 +70,31 @@ struct VMSettingsView: View {
Label("Sharing", systemImage: "person.crop.circle")
.labelStyle(.roundRectIcon)
})
Section(header: Text("Devices")) {
ForEach($config.displays) { $display in
NavigationLink(destination: VMConfigDisplayView(config: $display, system: $config.system).navigationTitle("Display")) {
Label("Display", systemImage: "rectangle.on.rectangle")
.labelStyle(RoundRectIconLabelStyle(color: .green))
if #available(iOS 15, *) {
Devices(config: config, state: devicesState)
} else {
Section {
NavigationLink {
Form {
List {
Devices(config: config, state: devicesState)
}
}
}.onDelete { offsets in
config.displays.remove(atOffsets: offsets)
} label: {
Label("Show all devices…", systemImage: "ellipsis")
.labelStyle(RoundRectIconLabelStyle(color: .green))
}
}
ForEach($config.serials) { $serial in
NavigationLink(destination: VMConfigSerialView(config: $serial, system: $config.system).navigationTitle("Serial")) {
Label("Serial", systemImage: "rectangle.connected.to.line.below")
.labelStyle(RoundRectIconLabelStyle(color: .green))
}
}.onDelete { offsets in
config.serials.remove(atOffsets: offsets)
}
ForEach($config.networks) { $network in
NavigationLink(destination: VMConfigNetworkView(config: $network, system: $config.system).navigationTitle("Network")) {
Label("Network", systemImage: "network")
.labelStyle(RoundRectIconLabelStyle(color: .green))
}
}.onDelete { offsets in
config.networks.remove(atOffsets: offsets)
}
ForEach($config.sound) { $sound in
NavigationLink(destination: VMConfigSoundView(config: $sound, system: $config.system).navigationTitle("Sound")) {
Label("Sound", systemImage: "speaker.wave.2")
.labelStyle(RoundRectIconLabelStyle(color: .green))
}
}.onDelete { offsets in
config.sound.remove(atOffsets: offsets)
}
}.uniqued()
Section(header: Text("Drives")) {
VMDrivesSettingsView(config: config, isCreateDriveShown: $isCreateDriveShown, isImportDriveShown: $isImportDriveShown)
.labelStyle(RoundRectIconLabelStyle(color: .yellow))
}.uniqued()
}
}
}
.navigationTitle("Settings")
.navigationViewStyle(.stack)
.navigationBarItems(leading: HStack {
VMSettingsAddDeviceMenuView(config: config, isCreateDriveShown: $isCreateDriveShown, isImportDriveShown: $isImportDriveShown)
EditButton()
if #available(iOS 15, *) {
VMSettingsAddDeviceMenuView(config: config, isCreateDriveShown: $devicesState.isCreateDriveShown, isImportDriveShown: $devicesState.isImportDriveShown)
EditButton()
}
}, trailing: HStack {
Button(action: cancel) {
Text("Cancel")
Expand Down Expand Up @@ -147,6 +126,79 @@ struct VMSettingsView: View {
}
}

/// Private state shared between VMSettingsView and Devices
///
/// You may be reading this and wonder "why not use @State and @Binding instead?" Well, after a long session of debugging, it was revealed that lots of odd behaviours happen before
/// trial and error led us to the following code. For example, settings would not get updated, or updating settings would cause random crashes, or deleting a device crashes. (Seems to be
/// limited to iOS 14). Anyways, this code is less than optimal but it's what resulted from a natural evolution of code that would not cause any (known) problems in iOS 14.
private class DevicesState: ObservableObject {
@Published var isCreateDriveShown: Bool = false
@Published var isImportDriveShown: Bool = false
}

private struct Devices: View {
@ObservedObject var config: UTMQemuConfiguration
@ObservedObject var state: DevicesState

var body: some View {
Section(header: Text("Devices")) {
ForEach($config.displays) { $display in
NavigationLink(destination: VMConfigDisplayView(config: $display, system: $config.system).navigationTitle("Display")) {
Label("Display", systemImage: "rectangle.on.rectangle")
.labelStyle(RoundRectIconLabelStyle(color: .green))
}
}.onDelete { offsets in
config.displays.remove(atOffsets: offsets)
}
ForEach($config.serials) { $serial in
NavigationLink(destination: VMConfigSerialView(config: $serial, system: $config.system).navigationTitle("Serial")) {
Label("Serial", systemImage: "rectangle.connected.to.line.below")
.labelStyle(RoundRectIconLabelStyle(color: .green))
}
}.onDelete { offsets in
config.serials.remove(atOffsets: offsets)
}
ForEach($config.networks) { $network in
NavigationLink(destination: VMConfigNetworkView(config: $network, system: $config.system).navigationTitle("Network")) {
Label("Network", systemImage: "network")
.labelStyle(RoundRectIconLabelStyle(color: .green))
}
}.onDelete { offsets in
config.networks.remove(atOffsets: offsets)
}
ForEach($config.sound) { $sound in
NavigationLink(destination: VMConfigSoundView(config: $sound, system: $config.system).navigationTitle("Sound")) {
Label("Sound", systemImage: "speaker.wave.2")
.labelStyle(RoundRectIconLabelStyle(color: .green))
}
}.onDelete { offsets in
config.sound.remove(atOffsets: offsets)
}
}
Section(header: Text("Drives")) {
VMDrivesSettingsView(config: config, isCreateDriveShown: $state.isCreateDriveShown, isImportDriveShown: $state.isImportDriveShown)
.labelStyle(RoundRectIconLabelStyle(color: .yellow))
}
if #unavailable(iOS 15) {
// SwiftUI: !! WARNING DO NOT REMOVE !! The follow is LOAD BEARING code disguised as an innocent version display.
// On iOS 14, if you attach any attribute like .navigationBarItems() to something inside a List, it will mess up the layout.
// As a result, we cannot put it on any of the items above and instead we put in the sacrificial Section below.
Section {
HStack {
Text("Version")
Spacer()
Text(Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as? String ?? "")
}
HStack {
Text("Build")
Spacer()
Text(Bundle.main.object(forInfoDictionaryKey: "CFBundleVersion") as? String ?? "")
}
}.navigationBarItems(trailing: VMSettingsAddDeviceMenuView(config: config, isCreateDriveShown: $state.isCreateDriveShown, isImportDriveShown: $state.isImportDriveShown))
}
}
}

struct RoundRectIconLabelStyle: LabelStyle {
var color: Color = .blue

Expand Down

0 comments on commit bc9c97f

Please sign in to comment.