diff --git a/ApplicationLibrary/Views/Connections/ConnectionListView.swift b/ApplicationLibrary/Views/Connections/ConnectionListView.swift index e27d627..51b2be0 100644 --- a/ApplicationLibrary/Views/Connections/ConnectionListView.swift +++ b/ApplicationLibrary/Views/Connections/ConnectionListView.swift @@ -26,7 +26,7 @@ public struct ConnectionListView: View { } } } - #if !os(tvOS) + #if os(iOS) .toolbar { ToolbarItemGroup(placement: .topBarTrailing) { Menu { diff --git a/ApplicationLibrary/Views/Dashboard/ActiveDashboardView.swift b/ApplicationLibrary/Views/Dashboard/ActiveDashboardView.swift index f6c0017..ccde8a3 100644 --- a/ApplicationLibrary/Views/Dashboard/ActiveDashboardView.swift +++ b/ApplicationLibrary/Views/Dashboard/ActiveDashboardView.swift @@ -256,11 +256,13 @@ import SwiftUI } #if os(tvOS) StartStopButton() - #else + #elseif os(iOS) if #available(iOS 26.0, *), !Variant.debugNoIOS26 { } else if !useLegacyTabView || coordinator.selection != .connections { StartStopButton() } + #else + StartStopButton() #endif } } diff --git a/ApplicationLibrary/Views/Dashboard/Cards/ProfilePickerSheet.swift b/ApplicationLibrary/Views/Dashboard/Cards/ProfilePickerSheet.swift index a47cdb5..6666fb7 100644 --- a/ApplicationLibrary/Views/Dashboard/Cards/ProfilePickerSheet.swift +++ b/ApplicationLibrary/Views/Dashboard/Cards/ProfilePickerSheet.swift @@ -235,7 +235,7 @@ struct ProfilePickerSheet: View { macOSProfileRow(profile) .listRowBackground(Color.clear) .listRowSeparator(.hidden) - .listRowInsets(EdgeInsets(top: 6, leading: 16, bottom: 6, trailing: 16)) + .listRowInsets(EdgeInsets(top: 3, leading: 16, bottom: 3, trailing: 16)) } } .listStyle(.plain) @@ -260,7 +260,7 @@ struct ProfilePickerSheet: View { .environmentObject(environments) .listRowBackground(Color.clear) .listRowSeparator(.hidden) - .listRowInsets(EdgeInsets(top: 4, leading: 16, bottom: 4, trailing: 16)) + .listRowInsets(EdgeInsets(top: 2, leading: 16, bottom: 2, trailing: 16)) } .onMove(perform: moveProfile) .onDelete(perform: deleteProfile) @@ -662,16 +662,6 @@ private struct ProfilePickerRow: View { private var macOSEditingBody: some View { rowContent - .overlay(alignment: .trailing) { - Button { - onDelete() - } label: { - Image(systemName: "minus.circle.fill") - .font(.system(size: 20)) - .foregroundStyle(.red) - } - .buttonStyle(.plain) - } } #endif @@ -729,9 +719,24 @@ private struct ProfilePickerRow: View { Spacer() - if !isEditing { - rowMenu - } + #if os(macOS) + if isEditing { + Button { + onDelete() + } label: { + Image(systemName: "minus.circle.fill") + .font(.system(size: 20)) + .foregroundStyle(.red) + } + .buttonStyle(.plain) + } else { + rowMenu + } + #else + if !isEditing { + rowMenu + } + #endif } .contentShape(Rectangle()) .padding(16)