Skip to content

fix: always show safe mode badge including silent level #359

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
datlechin merged 1 commit into from
Mar 18, 2026
+30 −35
Merged

fix: always show safe mode badge including silent level #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 1 addition & 3 deletions TablePro/Models/Connection/ConnectionToolbarState.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,9 +213,7 @@ final class ConnectionToolbarState {
parts.append(String(localized: "Replication lag: \(lag)s"))
}

if safeModeLevel != .silent {
parts.append(safeModeLevel.displayName)
}
parts.append(safeModeLevel.displayName)

return parts.joined(separator: " • ")
}
Expand Down
12 changes: 5 additions & 7 deletions TablePro/Views/Toolbar/ConnectionStatusView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,11 @@ struct ConnectionStatusView: View {
.font(.system(size: 13))
.foregroundStyle(ThemeEngine.shared.colors.toolbar.secondaryTextSwiftUI)
.overlay(alignment: .bottomTrailing) {
if safeModeLevel != .silent {
Image(systemName: safeModeLevel.iconName)
.font(.system(size: 7, weight: .bold))
.foregroundStyle(safeModeLevel.badgeColor)
.offset(x: 3, y: 2)
.help(safeModeLevel.displayName)
}
Image(systemName: safeModeLevel.iconName)
.font(.system(size: 7, weight: .bold))
.foregroundStyle(safeModeLevel.badgeColor)
.offset(x: 3, y: 2)
.help(safeModeLevel.displayName)
}

Text(databaseName)
Expand Down
49 changes: 24 additions & 25 deletions TablePro/Views/Toolbar/SafeModeBadgeView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,36 +10,34 @@ struct SafeModeBadgeView: View {
@State private var showPopover = false

var body: some View {
if safeModeLevel != .silent {
Button {
showPopover.toggle()
} label: {
HStack(spacing: 4) {
Image(systemName: safeModeLevel.iconName)
.font(.system(size: 12, weight: .medium))
.foregroundStyle(safeModeLevel.badgeColor)
}
Button {
showPopover.toggle()
} label: {
HStack(spacing: 4) {
Image(systemName: safeModeLevel.iconName)
.font(.system(size: 12, weight: .medium))
.foregroundStyle(safeModeLevel.badgeColor)
}
.buttonStyle(.plain)
.help(String(localized: "Safe Mode: \(safeModeLevel.displayName)"))
.popover(isPresented: $showPopover) {
VStack(alignment: .leading, spacing: 8) {
Text("Safe Mode")
.font(.headline)
.padding(.bottom, 4)
}
.buttonStyle(.plain)
.help(String(localized: "Safe Mode: \(safeModeLevel.displayName)"))
.popover(isPresented: $showPopover) {
VStack(alignment: .leading, spacing: 8) {
Text("Safe Mode")
.font(.headline)
.padding(.bottom, 4)

Picker("", selection: $safeModeLevel) {
ForEach(SafeModeLevel.allCases) { level in
Label(level.displayName, systemImage: level.iconName)
.tag(level)
}
Picker("", selection: $safeModeLevel) {
ForEach(SafeModeLevel.allCases) { level in
Label(level.displayName, systemImage: level.iconName)
.tag(level)
}
.pickerStyle(.radioGroup)
.labelsHidden()
}
.padding()
.frame(width: 200)
.pickerStyle(.radioGroup)
.labelsHidden()
}
.padding()
.frame(width: 200)
}
}
}
Expand All @@ -48,6 +46,7 @@ struct SafeModeBadgeView: View {

#Preview("Safe Mode Badges") {
VStack(spacing: 12) {
SafeModeBadgeView(safeModeLevel: .constant(.silent))
SafeModeBadgeView(safeModeLevel: .constant(.alert))
SafeModeBadgeView(safeModeLevel: .constant(.safeMode))
SafeModeBadgeView(safeModeLevel: .constant(.readOnly))
Expand Down
Loading