Skip to content

Commit 931d4cd

Browse files
committed
Fix build for macOS
1 parent e6ba51b commit 931d4cd

File tree

5 files changed

+51
-1
lines changed

5 files changed

+51
-1
lines changed

Harbour/Extensions/SwiftUI/iOS 26/matchedTransitionSource.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,16 @@
88

99
import SwiftUI
1010

11+
#if os(iOS)
1112
extension ToolbarContent {
1213
@ToolbarContentBuilder @inlinable
1314
func _matchedTransitionSource(id: some Hashable, in namespace: Namespace.ID) -> some ToolbarContent {
14-
if #available(iOS 26.0, macOS 26.0, *) {
15+
if #available(iOS 26.0, *) {
1516
self
1617
.matchedTransitionSource(id: id, in: namespace)
1718
} else {
1819
self
1920
}
2021
}
2122
}
23+
#endif

Harbour/UI/Views/ContainersView/ContainersView.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,9 @@ struct ContainersView: View {
8181
.animation(.default, value: viewModel.isStatusProgressViewVisible)
8282
// .animation(.default, value: portainerStore.removedContainerIDs)
8383
.navigationTitle(navigationTitle)
84+
#if os(iOS)
8485
.navigationBarTitleDisplayMode(.inline)
86+
#endif
8587
.environment(viewModel)
8688
.onKeyPress(action: onKeyPress)
8789
.onChange(of: sceneDelegate.selectedStackNameForContainersView) { _, stackName in
@@ -198,7 +200,9 @@ private extension ContainersView {
198200
}
199201
.labelStyle(.titleAndIcon)
200202
}
203+
#if os(iOS)
201204
._matchedTransitionSource(id: SettingsView.id, in: namespace)
205+
#endif
202206

203207
#if os(iOS)
204208
if horizontalSizeClass == .regular {

Harbour/UI/Views/StacksView/StacksView.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,9 @@ private extension StacksView {
183183
}
184184
.disabled(!portainerStore.isSetup)
185185
}
186+
#if os(iOS)
186187
._matchedTransitionSource(id: CreateStackView.id, in: namespace)
188+
#endif
187189

188190
ToolbarItem(placement: .automatic) {
189191
Menu {
@@ -231,7 +233,9 @@ private extension StacksView {
231233
}
232234
.labelStyle(.titleAndIcon)
233235
}
236+
#if os(iOS)
234237
._matchedTransitionSource(id: SettingsView.id, in: namespace)
238+
#endif
235239

236240
// ToolbarItem(placement: .status) {
237241
// DelayedView(isVisible: viewModel.isStatusProgressViewVisible) {

HarbourWidgets/Assets.xcassets/RecessedWidgetBackground.colorset/Contents.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,26 @@
2424
}
2525
},
2626
"idiom" : "universal"
27+
},
28+
{
29+
"color" : {
30+
"platform" : "osx",
31+
"reference" : "alternatingContentBackgroundColor"
32+
},
33+
"idiom" : "mac"
34+
},
35+
{
36+
"appearances" : [
37+
{
38+
"appearance" : "luminosity",
39+
"value" : "dark"
40+
}
41+
],
42+
"color" : {
43+
"platform" : "osx",
44+
"reference" : "underPageBackgroundColor"
45+
},
46+
"idiom" : "mac"
2747
}
2848
],
2949
"info" : {

HarbourWidgets/Assets.xcassets/WidgetBackground.colorset/Contents.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,26 @@
1919
"reference" : "systemBackgroundColor"
2020
},
2121
"idiom" : "universal"
22+
},
23+
{
24+
"color" : {
25+
"platform" : "osx",
26+
"reference" : "windowBackgroundColor"
27+
},
28+
"idiom" : "mac"
29+
},
30+
{
31+
"appearances" : [
32+
{
33+
"appearance" : "luminosity",
34+
"value" : "dark"
35+
}
36+
],
37+
"color" : {
38+
"platform" : "osx",
39+
"reference" : "windowBackgroundColor"
40+
},
41+
"idiom" : "mac"
2242
}
2343
],
2444
"info" : {

0 commit comments

Comments
 (0)