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
27 changes: 11 additions & 16 deletions dashpilot-ios/dashpilot/UI/DashboardSelectionView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -58,22 +58,17 @@ private struct DashboardCard: View {

var body: some View {
VStack(spacing: 0) {
if dashboard.type == .devRive {
RoundedRectangle(cornerRadius: 12)
.fill(Color(white: 0.16))
.aspectRatio(16.0 / 9.0, contentMode: .fit)
} else if let name = dashboard.screenshotName, let _ = UIImage(named: name) {
Image(name)
.resizable()
.scaledToFill()
.aspectRatio(16.0 / 9.0, contentMode: .fit)
.clipped()
.clipShape(RoundedRectangle(cornerRadius: 12))
} else {
RoundedRectangle(cornerRadius: 12)
.fill(Color(white: 0.16))
.aspectRatio(16.0 / 9.0, contentMode: .fit)
}
Color(white: 0.16)
.aspectRatio(16.0 / 9.0, contentMode: .fit)
.overlay {
if dashboard.type != .devRive,
let name = dashboard.screenshotName, UIImage(named: name) != nil {
Image(name)
.resizable()
.scaledToFill()
}
}
.clipShape(RoundedRectangle(cornerRadius: 12))

Spacer().frame(height: 10)

Expand Down
30 changes: 14 additions & 16 deletions dashpilot-ios/dashpilot/UI/SettingsView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ struct SettingsView: View {
private var showDarkModeToggle: Bool { hasSetting(.darkMode) }
private var showRenderQualityControl: Bool { hasSetting(.renderQuality) }
private var showVisualizerSettings: Bool {
showRenderQualityControl || showAlwaysOnBlindSpotMonitorToggle || showDarkModeToggle
showRenderQualityControl || showAlwaysOnBlindSpotMonitorToggle
}
private var showPhoneBatteryToggle: Bool { hasSetting(.showPhoneBattery) }
private var showUseImperialToggle: Bool { hasSetting(.useImperial) }
Expand Down Expand Up @@ -177,19 +177,17 @@ struct SettingsView: View {
}
}

@ViewBuilder
private func dashboardThumbnail(for dashboard: DashboardConfig) -> some View {
if let name = dashboard.screenshotName, UIImage(named: name) != nil {
Image(name)
.resizable()
.scaledToFill()
.aspectRatio(16.0 / 9.0, contentMode: .fit)
.clipped()
} else {
Rectangle()
.fill(Color(white: 0.16))
.aspectRatio(16.0 / 9.0, contentMode: .fit)
}
Color(white: 0.16)
.aspectRatio(16.0 / 9.0, contentMode: .fit)
.overlay {
if let name = dashboard.screenshotName, UIImage(named: name) != nil {
Image(name)
.resizable()
.scaledToFill()
}
}
.clipped()
}

// MARK: - Configuration Section
Expand Down Expand Up @@ -220,6 +218,9 @@ struct SettingsView: View {
if showPhoneBatteryToggle {
SettingsToggleRow(label: "Show Phone Battery", isOn: $showPhoneBattery)
}
if showDarkModeToggle {
SettingsToggleRow(label: "Dark Mode", isOn: $darkMode)
}
Spacer().frame(height: 8)
}
.padding(.horizontal, 24)
Expand All @@ -233,9 +234,6 @@ struct SettingsView: View {
if showAlwaysOnBlindSpotMonitorToggle {
SettingsToggleRow(label: "Always On Blind-Spot Monitor", isOn: $alwaysOnBlindSpotMonitor)
}
if showDarkModeToggle {
SettingsToggleRow(label: "Dark Mode", isOn: $darkMode)
}
if showRenderQualityControl {
renderQualityRow
}
Expand Down
22 changes: 10 additions & 12 deletions dashpilot-ios/dashpilot/UI/ThemePickerView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -101,18 +101,16 @@ struct ThemePickerView: View {
}
}

@ViewBuilder
private func thumbnail(for dashboard: DashboardConfig) -> some View {
if let name = dashboard.screenshotName, UIImage(named: name) != nil {
Image(name)
.resizable()
.scaledToFill()
.aspectRatio(16.0 / 9.0, contentMode: .fit)
.clipped()
} else {
Rectangle()
.fill(Color(white: 0.16))
.aspectRatio(16.0 / 9.0, contentMode: .fit)
}
Color(white: 0.16)
.aspectRatio(16.0 / 9.0, contentMode: .fit)
.overlay {
if let name = dashboard.screenshotName, UIImage(named: name) != nil {
Image(name)
.resizable()
.scaledToFill()
}
}
.clipped()
}
}
Loading