Signed-off-by: Matt Bruce <mbrucedogs@gmail.com>
This commit is contained in:
parent
089f8b9f7b
commit
4f46304a5b
@ -37,7 +37,7 @@ struct AdvancedAppearanceSection: View {
|
|||||||
Rectangle()
|
Rectangle()
|
||||||
.fill(AppBorder.subtle)
|
.fill(AppBorder.subtle)
|
||||||
.frame(height: 1)
|
.frame(height: 1)
|
||||||
.padding(.horizontal, Design.Spacing.medium)
|
.padding(.horizontal, Design.Spacing.small)
|
||||||
|
|
||||||
SettingsToggle(
|
SettingsToggle(
|
||||||
title: String(localized: "settings.advanced_appearance.randomize_color.title", defaultValue: "Randomize Color"),
|
title: String(localized: "settings.advanced_appearance.randomize_color.title", defaultValue: "Randomize Color"),
|
||||||
@ -49,7 +49,7 @@ struct AdvancedAppearanceSection: View {
|
|||||||
Rectangle()
|
Rectangle()
|
||||||
.fill(AppBorder.subtle)
|
.fill(AppBorder.subtle)
|
||||||
.frame(height: 1)
|
.frame(height: 1)
|
||||||
.padding(.horizontal, Design.Spacing.medium)
|
.padding(.horizontal, Design.Spacing.small)
|
||||||
|
|
||||||
SettingsSlider(
|
SettingsSlider(
|
||||||
title: String(localized: "settings.advanced_appearance.glow.title", defaultValue: "Glow"),
|
title: String(localized: "settings.advanced_appearance.glow.title", defaultValue: "Glow"),
|
||||||
@ -64,7 +64,7 @@ struct AdvancedAppearanceSection: View {
|
|||||||
Rectangle()
|
Rectangle()
|
||||||
.fill(AppBorder.subtle)
|
.fill(AppBorder.subtle)
|
||||||
.frame(height: 1)
|
.frame(height: 1)
|
||||||
.padding(.horizontal, Design.Spacing.medium)
|
.padding(.horizontal, Design.Spacing.small)
|
||||||
|
|
||||||
SettingsSlider(
|
SettingsSlider(
|
||||||
title: String(localized: "settings.advanced_appearance.clock_opacity.title", defaultValue: "Clock Opacity"),
|
title: String(localized: "settings.advanced_appearance.clock_opacity.title", defaultValue: "Clock Opacity"),
|
||||||
|
|||||||
@ -33,7 +33,7 @@ struct AdvancedDisplaySection: View {
|
|||||||
Rectangle()
|
Rectangle()
|
||||||
.fill(AppBorder.subtle)
|
.fill(AppBorder.subtle)
|
||||||
.frame(height: 1)
|
.frame(height: 1)
|
||||||
.padding(.horizontal, Design.Spacing.medium)
|
.padding(.horizontal, Design.Spacing.small)
|
||||||
|
|
||||||
HStack {
|
HStack {
|
||||||
Text(String(localized: "settings.advanced_display.current_brightness", defaultValue: "Current Brightness"))
|
Text(String(localized: "settings.advanced_display.current_brightness", defaultValue: "Current Brightness"))
|
||||||
@ -47,7 +47,7 @@ struct AdvancedDisplaySection: View {
|
|||||||
.animation(.snappy(duration: 0.3), value: style.effectiveBrightness)
|
.animation(.snappy(duration: 0.3), value: style.effectiveBrightness)
|
||||||
}
|
}
|
||||||
.padding(.vertical, Design.Spacing.medium)
|
.padding(.vertical, Design.Spacing.medium)
|
||||||
.padding(.horizontal, Design.Spacing.medium)
|
.padding(.horizontal, Design.Spacing.small)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -49,7 +49,7 @@ struct BasicAppearanceSection: View {
|
|||||||
Rectangle()
|
Rectangle()
|
||||||
.fill(AppBorder.subtle)
|
.fill(AppBorder.subtle)
|
||||||
.frame(height: 1)
|
.frame(height: 1)
|
||||||
.padding(.horizontal, Design.Spacing.medium)
|
.padding(.horizontal, Design.Spacing.small)
|
||||||
|
|
||||||
ColorPicker(
|
ColorPicker(
|
||||||
String(localized: "settings.colors.digit_color", defaultValue: "Digit Color"),
|
String(localized: "settings.colors.digit_color", defaultValue: "Digit Color"),
|
||||||
@ -57,13 +57,13 @@ struct BasicAppearanceSection: View {
|
|||||||
supportsOpacity: false
|
supportsOpacity: false
|
||||||
)
|
)
|
||||||
.foregroundStyle(AppTextColors.primary)
|
.foregroundStyle(AppTextColors.primary)
|
||||||
.padding(.horizontal, Design.Spacing.medium)
|
.padding(.horizontal, Design.Spacing.small)
|
||||||
.padding(.vertical, Design.Spacing.small)
|
.padding(.vertical, Design.Spacing.small)
|
||||||
|
|
||||||
Rectangle()
|
Rectangle()
|
||||||
.fill(AppBorder.subtle)
|
.fill(AppBorder.subtle)
|
||||||
.frame(height: 1)
|
.frame(height: 1)
|
||||||
.padding(.horizontal, Design.Spacing.medium)
|
.padding(.horizontal, Design.Spacing.small)
|
||||||
|
|
||||||
ColorPicker(
|
ColorPicker(
|
||||||
String(localized: "settings.colors.background_color", defaultValue: "Background Color"),
|
String(localized: "settings.colors.background_color", defaultValue: "Background Color"),
|
||||||
@ -71,7 +71,7 @@ struct BasicAppearanceSection: View {
|
|||||||
supportsOpacity: true
|
supportsOpacity: true
|
||||||
)
|
)
|
||||||
.foregroundStyle(AppTextColors.primary)
|
.foregroundStyle(AppTextColors.primary)
|
||||||
.padding(.horizontal, Design.Spacing.medium)
|
.padding(.horizontal, Design.Spacing.small)
|
||||||
.padding(.vertical, Design.Spacing.small)
|
.padding(.vertical, Design.Spacing.small)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -31,7 +31,7 @@ struct BasicDisplaySection: View {
|
|||||||
Rectangle()
|
Rectangle()
|
||||||
.fill(AppBorder.subtle)
|
.fill(AppBorder.subtle)
|
||||||
.frame(height: 1)
|
.frame(height: 1)
|
||||||
.padding(.horizontal, Design.Spacing.medium)
|
.padding(.horizontal, Design.Spacing.small)
|
||||||
|
|
||||||
SettingsToggle(
|
SettingsToggle(
|
||||||
title: String(localized: "settings.display.show_seconds.title", defaultValue: "Show Seconds"),
|
title: String(localized: "settings.display.show_seconds.title", defaultValue: "Show Seconds"),
|
||||||
@ -44,7 +44,7 @@ struct BasicDisplaySection: View {
|
|||||||
Rectangle()
|
Rectangle()
|
||||||
.fill(AppBorder.subtle)
|
.fill(AppBorder.subtle)
|
||||||
.frame(height: 1)
|
.frame(height: 1)
|
||||||
.padding(.horizontal, Design.Spacing.medium)
|
.padding(.horizontal, Design.Spacing.small)
|
||||||
|
|
||||||
SettingsToggle(
|
SettingsToggle(
|
||||||
title: String(localized: "settings.display.show_ampm.title", defaultValue: "Show AM/PM"),
|
title: String(localized: "settings.display.show_ampm.title", defaultValue: "Show AM/PM"),
|
||||||
@ -57,7 +57,7 @@ struct BasicDisplaySection: View {
|
|||||||
Rectangle()
|
Rectangle()
|
||||||
.fill(AppBorder.subtle)
|
.fill(AppBorder.subtle)
|
||||||
.frame(height: 1)
|
.frame(height: 1)
|
||||||
.padding(.horizontal, Design.Spacing.medium)
|
.padding(.horizontal, Design.Spacing.small)
|
||||||
|
|
||||||
SettingsToggle(
|
SettingsToggle(
|
||||||
title: String(localized: "settings.display.auto_brightness.title", defaultValue: "Auto Brightness"),
|
title: String(localized: "settings.display.auto_brightness.title", defaultValue: "Auto Brightness"),
|
||||||
@ -70,7 +70,7 @@ struct BasicDisplaySection: View {
|
|||||||
Rectangle()
|
Rectangle()
|
||||||
.fill(AppBorder.subtle)
|
.fill(AppBorder.subtle)
|
||||||
.frame(height: 1)
|
.frame(height: 1)
|
||||||
.padding(.horizontal, Design.Spacing.medium)
|
.padding(.horizontal, Design.Spacing.small)
|
||||||
|
|
||||||
SettingsToggle(
|
SettingsToggle(
|
||||||
title: String(localized: "settings.display.horizontal_mode.title", defaultValue: "Horizontal Mode"),
|
title: String(localized: "settings.display.horizontal_mode.title", defaultValue: "Horizontal Mode"),
|
||||||
|
|||||||
@ -85,7 +85,7 @@ struct FontSection: View {
|
|||||||
Rectangle()
|
Rectangle()
|
||||||
.fill(AppBorder.subtle)
|
.fill(AppBorder.subtle)
|
||||||
.frame(height: 1)
|
.frame(height: 1)
|
||||||
.padding(.horizontal, Design.Spacing.medium)
|
.padding(.horizontal, Design.Spacing.small)
|
||||||
|
|
||||||
// Font Design
|
// Font Design
|
||||||
SettingsNavigationRow(
|
SettingsNavigationRow(
|
||||||
@ -105,7 +105,7 @@ struct FontSection: View {
|
|||||||
Rectangle()
|
Rectangle()
|
||||||
.fill(AppBorder.subtle)
|
.fill(AppBorder.subtle)
|
||||||
.frame(height: 1)
|
.frame(height: 1)
|
||||||
.padding(.horizontal, Design.Spacing.medium)
|
.padding(.horizontal, Design.Spacing.small)
|
||||||
|
|
||||||
HStack {
|
HStack {
|
||||||
Text(String(localized: "settings.font.preview.title", defaultValue: "Preview")).styled(.subheadingEmphasis)
|
Text(String(localized: "settings.font.preview.title", defaultValue: "Preview")).styled(.subheadingEmphasis)
|
||||||
|
|||||||
@ -31,7 +31,7 @@ struct NightModeSection: View {
|
|||||||
Rectangle()
|
Rectangle()
|
||||||
.fill(AppBorder.subtle)
|
.fill(AppBorder.subtle)
|
||||||
.frame(height: 1)
|
.frame(height: 1)
|
||||||
.padding(.horizontal, Design.Spacing.medium)
|
.padding(.horizontal, Design.Spacing.small)
|
||||||
|
|
||||||
SettingsToggle(
|
SettingsToggle(
|
||||||
title: String(localized: "settings.night_mode.auto.title", defaultValue: "Auto Night Mode"),
|
title: String(localized: "settings.night_mode.auto.title", defaultValue: "Auto Night Mode"),
|
||||||
@ -44,7 +44,7 @@ struct NightModeSection: View {
|
|||||||
Rectangle()
|
Rectangle()
|
||||||
.fill(AppBorder.subtle)
|
.fill(AppBorder.subtle)
|
||||||
.frame(height: 1)
|
.frame(height: 1)
|
||||||
.padding(.horizontal, Design.Spacing.medium)
|
.padding(.horizontal, Design.Spacing.small)
|
||||||
|
|
||||||
SettingsSlider(
|
SettingsSlider(
|
||||||
title: String(localized: "settings.night_mode.light_threshold.title", defaultValue: "Light Threshold"),
|
title: String(localized: "settings.night_mode.light_threshold.title", defaultValue: "Light Threshold"),
|
||||||
@ -60,7 +60,7 @@ struct NightModeSection: View {
|
|||||||
Rectangle()
|
Rectangle()
|
||||||
.fill(AppBorder.subtle)
|
.fill(AppBorder.subtle)
|
||||||
.frame(height: 1)
|
.frame(height: 1)
|
||||||
.padding(.horizontal, Design.Spacing.medium)
|
.padding(.horizontal, Design.Spacing.small)
|
||||||
|
|
||||||
SettingsToggle(
|
SettingsToggle(
|
||||||
title: String(localized: "settings.night_mode.scheduled.title", defaultValue: "Scheduled Night Mode"),
|
title: String(localized: "settings.night_mode.scheduled.title", defaultValue: "Scheduled Night Mode"),
|
||||||
@ -73,7 +73,7 @@ struct NightModeSection: View {
|
|||||||
Rectangle()
|
Rectangle()
|
||||||
.fill(AppBorder.subtle)
|
.fill(AppBorder.subtle)
|
||||||
.frame(height: 1)
|
.frame(height: 1)
|
||||||
.padding(.horizontal, Design.Spacing.medium)
|
.padding(.horizontal, Design.Spacing.small)
|
||||||
|
|
||||||
HStack {
|
HStack {
|
||||||
Text(String(localized: "settings.night_mode.start_time", defaultValue: "Start Time"))
|
Text(String(localized: "settings.night_mode.start_time", defaultValue: "Start Time"))
|
||||||
@ -83,12 +83,12 @@ struct NightModeSection: View {
|
|||||||
TimePickerView(timeString: $style.nightModeStartTime)
|
TimePickerView(timeString: $style.nightModeStartTime)
|
||||||
}
|
}
|
||||||
.padding(.vertical, Design.Spacing.medium)
|
.padding(.vertical, Design.Spacing.medium)
|
||||||
.padding(.horizontal, Design.Spacing.medium)
|
.padding(.horizontal, Design.Spacing.small)
|
||||||
|
|
||||||
Rectangle()
|
Rectangle()
|
||||||
.fill(AppBorder.subtle)
|
.fill(AppBorder.subtle)
|
||||||
.frame(height: 1)
|
.frame(height: 1)
|
||||||
.padding(.horizontal, Design.Spacing.medium)
|
.padding(.horizontal, Design.Spacing.small)
|
||||||
|
|
||||||
HStack {
|
HStack {
|
||||||
Text(String(localized: "settings.night_mode.end_time", defaultValue: "End Time"))
|
Text(String(localized: "settings.night_mode.end_time", defaultValue: "End Time"))
|
||||||
@ -98,14 +98,14 @@ struct NightModeSection: View {
|
|||||||
TimePickerView(timeString: $style.nightModeEndTime)
|
TimePickerView(timeString: $style.nightModeEndTime)
|
||||||
}
|
}
|
||||||
.padding(.vertical, Design.Spacing.medium)
|
.padding(.vertical, Design.Spacing.medium)
|
||||||
.padding(.horizontal, Design.Spacing.medium)
|
.padding(.horizontal, Design.Spacing.small)
|
||||||
}
|
}
|
||||||
|
|
||||||
if style.isNightModeActive {
|
if style.isNightModeActive {
|
||||||
Rectangle()
|
Rectangle()
|
||||||
.fill(AppBorder.subtle)
|
.fill(AppBorder.subtle)
|
||||||
.frame(height: 1)
|
.frame(height: 1)
|
||||||
.padding(.horizontal, Design.Spacing.medium)
|
.padding(.horizontal, Design.Spacing.small)
|
||||||
|
|
||||||
HStack(spacing: Design.Spacing.xSmall) {
|
HStack(spacing: Design.Spacing.xSmall) {
|
||||||
Image(systemName: "moon.fill")
|
Image(systemName: "moon.fill")
|
||||||
@ -116,7 +116,7 @@ struct NightModeSection: View {
|
|||||||
Spacer()
|
Spacer()
|
||||||
}
|
}
|
||||||
.padding(.vertical, Design.Spacing.small)
|
.padding(.vertical, Design.Spacing.small)
|
||||||
.padding(.horizontal, Design.Spacing.medium)
|
.padding(.horizontal, Design.Spacing.small)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -33,7 +33,7 @@ struct OverlaySection: View {
|
|||||||
Rectangle()
|
Rectangle()
|
||||||
.fill(AppBorder.subtle)
|
.fill(AppBorder.subtle)
|
||||||
.frame(height: 1)
|
.frame(height: 1)
|
||||||
.padding(.horizontal, Design.Spacing.medium)
|
.padding(.horizontal, Design.Spacing.small)
|
||||||
|
|
||||||
SettingsToggle(
|
SettingsToggle(
|
||||||
title: String(localized: "settings.overlays.date.title", defaultValue: "Date"),
|
title: String(localized: "settings.overlays.date.title", defaultValue: "Date"),
|
||||||
@ -45,7 +45,7 @@ struct OverlaySection: View {
|
|||||||
Rectangle()
|
Rectangle()
|
||||||
.fill(AppBorder.subtle)
|
.fill(AppBorder.subtle)
|
||||||
.frame(height: 1)
|
.frame(height: 1)
|
||||||
.padding(.horizontal, Design.Spacing.medium)
|
.padding(.horizontal, Design.Spacing.small)
|
||||||
|
|
||||||
SettingsToggle(
|
SettingsToggle(
|
||||||
title: String(localized: "settings.overlays.next_alarm.title", defaultValue: "Next Alarm"),
|
title: String(localized: "settings.overlays.next_alarm.title", defaultValue: "Next Alarm"),
|
||||||
@ -57,7 +57,7 @@ struct OverlaySection: View {
|
|||||||
Rectangle()
|
Rectangle()
|
||||||
.fill(AppBorder.subtle)
|
.fill(AppBorder.subtle)
|
||||||
.frame(height: 1)
|
.frame(height: 1)
|
||||||
.padding(.horizontal, Design.Spacing.medium)
|
.padding(.horizontal, Design.Spacing.small)
|
||||||
|
|
||||||
SettingsToggle(
|
SettingsToggle(
|
||||||
title: String(localized: "settings.overlays.noise_controls.title", defaultValue: "Noise Controls"),
|
title: String(localized: "settings.overlays.noise_controls.title", defaultValue: "Noise Controls"),
|
||||||
@ -70,7 +70,7 @@ struct OverlaySection: View {
|
|||||||
Rectangle()
|
Rectangle()
|
||||||
.fill(AppBorder.subtle)
|
.fill(AppBorder.subtle)
|
||||||
.frame(height: 1)
|
.frame(height: 1)
|
||||||
.padding(.horizontal, Design.Spacing.medium)
|
.padding(.horizontal, Design.Spacing.small)
|
||||||
|
|
||||||
SettingsNavigationRow(
|
SettingsNavigationRow(
|
||||||
title: String(localized: "settings.overlays.date_format.title", defaultValue: "Date Format"),
|
title: String(localized: "settings.overlays.date_format.title", defaultValue: "Date Format"),
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user