Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Shellbee.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -833,6 +833,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
CODE_SIGN_ENTITLEMENTS = Shellbee.entitlements;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = "$(APP_DEVELOPMENT_TEAM)";
Expand Down Expand Up @@ -908,6 +909,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
CODE_SIGN_ENTITLEMENTS = ShellbeeWidgets.entitlements;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = "$(APP_DEVELOPMENT_TEAM)";
Expand Down
10 changes: 10 additions & 0 deletions Shellbee/Features/Settings/BridgeSettingsView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,16 @@ struct BridgeSettingsView: View {
}
.navigationTitle(displayName)
.navigationBarTitleDisplayMode(.inline)
// Match SettingsView — Logs is reachable from per-bridge settings via
// the Tools section and the device/group hero card inside log detail
// pushes a DeviceRoute / GroupRoute that needs a handler on the
// enclosing stack.
.navigationDestination(for: DeviceRoute.self) { route in
DeviceDetailView(bridgeID: route.bridgeID, device: route.device)
}
.navigationDestination(for: GroupRoute.self) { route in
GroupDetailView(bridgeID: route.bridgeID, group: route.group)
}
.sheet(item: editorBinding) { vm in
NavigationStack {
ConnectionEditorView(viewModel: vm, mode: .save)
Expand Down
13 changes: 13 additions & 0 deletions Shellbee/Features/Settings/SettingsView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,19 @@ struct SettingsView: View {
}
}
.navigationTitle("Settings")
// Settings → Logs pushes LogsView (which has its own
// NavigationStack). Inside LogsView's log-detail screen, the
// device/group hero card uses NavigationLink(value:) to push a
// DeviceRoute / GroupRoute. With nested NavigationStacks SwiftUI
// can route the push to whichever stack first matches a
// destination — register handlers on the outer Settings stack as
// a safety net so the tap always lands on the right screen.
.navigationDestination(for: DeviceRoute.self) { route in
DeviceDetailView(bridgeID: route.bridgeID, device: route.device)
}
.navigationDestination(for: GroupRoute.self) { route in
GroupDetailView(bridgeID: route.bridgeID, group: route.group)
}
.toolbar {
ToolbarItem(placement: .topBarTrailing) {
Menu {
Expand Down
Loading