Merge branch 'develop' of ssh://git@192.168.1.128:220/mbrucedogs/Bedrock.git into develop
This commit is contained in:
commit
1e13ea74e7
@ -94,6 +94,7 @@ public struct SelectableRow<Badge: View>: View {
|
||||
)
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
.sensoryFeedback(.selection, trigger: isSelected)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -36,6 +36,7 @@ public struct SelectionIndicator: View {
|
||||
public var body: some View {
|
||||
if isSelected {
|
||||
SymbolIcon("checkmark.circle.fill", size: .row, color: accentColor)
|
||||
.symbolEffect(.bounce, value: isSelected)
|
||||
} else {
|
||||
Circle()
|
||||
.strokeBorder(Color.white.opacity(Design.Opacity.light), lineWidth: Design.LineWidth.medium)
|
||||
|
||||
@ -66,19 +66,18 @@ public struct SettingsNavigationRow<Destination: View>: View {
|
||||
destination
|
||||
} label: {
|
||||
HStack {
|
||||
VStack(alignment: .leading, spacing: Design.Spacing.xxSmall) {
|
||||
Text(title).styled(.subheadingEmphasis)
|
||||
|
||||
if let subtitle {
|
||||
Text(subtitle).styled(.caption, emphasis: .secondary)
|
||||
}
|
||||
}
|
||||
Text(title).styled(.subheadingEmphasis)
|
||||
|
||||
Spacer()
|
||||
|
||||
if let subtitle {
|
||||
Text(subtitle).styled(.subheading, emphasis: .secondary)
|
||||
}
|
||||
|
||||
SymbolIcon.chevron(color: .secondary)
|
||||
}
|
||||
.padding(Design.Spacing.medium)
|
||||
.padding(.vertical, Design.Spacing.medium)
|
||||
.padding(.horizontal, Design.Spacing.medium)
|
||||
.background(backgroundColor, in: RoundedRectangle(cornerRadius: Design.CornerRadius.medium))
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
|
||||
@ -109,6 +109,7 @@ public struct SettingsSegmentedPicker<T: Equatable, Accessory: View>: View {
|
||||
.buttonStyle(.plain)
|
||||
}
|
||||
}
|
||||
.sensoryFeedback(.selection, trigger: selection)
|
||||
}
|
||||
.padding(.vertical, Design.Spacing.xSmall)
|
||||
}
|
||||
|
||||
@ -118,6 +118,8 @@ public struct SettingsSlider<Value: BinaryFloatingPoint & Sendable>: View where
|
||||
Text(format(value))
|
||||
.styled(.subheadingEmphasis, emphasis: .secondary)
|
||||
.fontDesign(.rounded)
|
||||
.contentTransition(.numericText())
|
||||
.animation(.snappy(duration: 0.2), value: value)
|
||||
}
|
||||
|
||||
Text(subtitle).styled(.caption, emphasis: .secondary)
|
||||
@ -139,7 +141,8 @@ public struct SettingsSlider<Value: BinaryFloatingPoint & Sendable>: View where
|
||||
}
|
||||
}
|
||||
}
|
||||
.padding(.vertical, Design.Spacing.xSmall)
|
||||
.padding(.vertical, Design.Spacing.medium)
|
||||
.padding(.horizontal, Design.Spacing.medium)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -90,7 +90,9 @@ public struct SettingsToggle<Accessory: View>: View {
|
||||
}
|
||||
}
|
||||
.tint(accentColor)
|
||||
.padding(.vertical, Design.Spacing.xSmall)
|
||||
.padding(.vertical, Design.Spacing.medium)
|
||||
.padding(.horizontal, Design.Spacing.medium)
|
||||
.sensoryFeedback(.impact(flexibility: .soft), trigger: isOn)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user