Skip to content
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

Jump to bottom

fix: 🐛 [IOSSDKBUG-455] FilterFeedbackBar maxWidth customization #878

Merged
merged 4 commits into from
Nov 13, 2024
Merged

fix: 🐛 [IOSSDKBUG-455] FilterFeedbackBar maxWidth customization #878

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9e168d2
fix: 🐛 [IOSSDKBUG-455] FilterFeedbackBar maxwidth customization
restaurantt Nov 12, 2024
c8ece2c
Merge branch 'main' into main-MCOESAPSTART-19946
dyongxu Nov 12, 2024
f70e24a
fix: 🐛 [IOSSDKBUG-455] FilterFeedbackBar maxwidth customization
restaurantt Nov 13, 2024
0f6ccad
Merge branch 'main' into main-MCOESAPSTART-19946
restaurantt Nov 13, 2024
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
10 changes: 6 additions & 4 deletions Sources/FioriSwiftUICore/Views/SortFilter/FilterFeedbackBarItem+Style.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,10 @@ public struct DefaultFilterFeedbackBarStyle: FilterFeedbackBarStyle {
let padding: CGFloat
let borderWidth: CGFloat
let minHeight: CGFloat
let maxWidth: CGFloat

/// :nodoc:
public init(font: Font = .system(.body), foregroundColorSelected: Color = DefaultFilterFeedbackBarForegroundColor, foregroundColorUnselected: Color = .preferredColor(.tertiaryLabel), fillColorSelected: Color = Color.clear, fillColorUnselected: Color = .preferredColor(.tertiaryFill), strokeColorSelected: Color = DefaultFilterFeedbackBarForegroundColor, strokeColorUnselected: Color = .preferredColor(.separator), cornerRadius: CGFloat = 10, spacing: CGFloat = 6, padding: CGFloat = 8, borderWidth: CGFloat = 1, minHeight: CGFloat = 38) {
public init(font: Font = .system(.body), foregroundColorSelected: Color = DefaultFilterFeedbackBarForegroundColor, foregroundColorUnselected: Color = .preferredColor(.tertiaryLabel), fillColorSelected: Color = Color.clear, fillColorUnselected: Color = .preferredColor(.tertiaryFill), strokeColorSelected: Color = DefaultFilterFeedbackBarForegroundColor, strokeColorUnselected: Color = .preferredColor(.separator), cornerRadius: CGFloat = 10, spacing: CGFloat = 6, padding: CGFloat = 8, borderWidth: CGFloat = 1, minHeight: CGFloat = 38, maxWidth: CGFloat = 0) {
self.font = font
self.foregroundColorSelected = foregroundColorSelected
self.foregroundColorUnselected = foregroundColorUnselected
Expand All @@ -61,6 +62,7 @@ public struct DefaultFilterFeedbackBarStyle: FilterFeedbackBarStyle {
self.padding = padding
self.borderWidth = borderWidth
self.minHeight = minHeight
self.maxWidth = maxWidth
}

/// Build view according to configuration and style
Expand All @@ -74,7 +76,7 @@ public struct DefaultFilterFeedbackBarStyle: FilterFeedbackBarStyle {
.font(self.font)
.foregroundColor(configuration.isSelected ? self.foregroundColorSelected : self.foregroundColorUnselected)
.padding(self.padding)
.frame(minHeight: self.minHeight)
.frame(maxWidth: self.maxWidth > 0 ? self.maxWidth : nil, minHeight: self.minHeight)
.background(
ZStack {
RoundedRectangle(cornerRadius: self.cornerRadius)
Expand Down Expand Up @@ -110,8 +112,8 @@ public extension View {
}

/// Experimental filter feedback bar styling
func filterFeedbackBarStyle(font: Font = .system(.body), foregroundColorSelected: Color = .preferredColor(.tintColor), foregroundColorUnselected: Color = .preferredColor(.tertiaryLabel), fillColorSelected: Color = Color.clear, fillColorUnselected: Color = .preferredColor(.tertiaryFill), strokeColorSelected: Color = .preferredColor(.tintColor), strokeColorUnselected: Color = .preferredColor(.separator), cornerRadius: CGFloat = 10, spacing: CGFloat = 6, padding: CGFloat = 8, borderWidth: CGFloat = 1, minHeight: CGFloat = 38) -> some View {
func filterFeedbackBarStyle(font: Font = .system(.body), foregroundColorSelected: Color = .preferredColor(.tintColor), foregroundColorUnselected: Color = .preferredColor(.tertiaryLabel), fillColorSelected: Color = Color.clear, fillColorUnselected: Color = .preferredColor(.tertiaryFill), strokeColorSelected: Color = .preferredColor(.tintColor), strokeColorUnselected: Color = .preferredColor(.separator), cornerRadius: CGFloat = 10, spacing: CGFloat = 6, padding: CGFloat = 8, borderWidth: CGFloat = 1, minHeight: CGFloat = 38, maxWidth: CGFloat = 0) -> some View {
self.environment(\.filterFeedbackBarStyle,
DefaultFilterFeedbackBarStyle(font: font, foregroundColorSelected: foregroundColorSelected, foregroundColorUnselected: foregroundColorUnselected, fillColorSelected: fillColorSelected, fillColorUnselected: fillColorUnselected, strokeColorSelected: strokeColorSelected, strokeColorUnselected: strokeColorUnselected, cornerRadius: cornerRadius, spacing: spacing, padding: padding, borderWidth: borderWidth, minHeight: minHeight))
DefaultFilterFeedbackBarStyle(font: font, foregroundColorSelected: foregroundColorSelected, foregroundColorUnselected: foregroundColorUnselected, fillColorSelected: fillColorSelected, fillColorUnselected: fillColorUnselected, strokeColorSelected: strokeColorSelected, strokeColorUnselected: strokeColorUnselected, cornerRadius: cornerRadius, spacing: spacing, padding: padding, borderWidth: borderWidth, minHeight: minHeight, maxWidth: maxWidth))
}
}
Loading