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

fix: 🐛 [IOSSDKBUG-454] FilterFeedbackBar dark mode design #889

Merged
merged 3 commits into from
Nov 18, 2024
Merged

fix: 🐛 [IOSSDKBUG-454] FilterFeedbackBar dark mode design #889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a377f7
fix: 🐛 [IOSSDKBUG-454] FilterFeedbackBar dark mode design
restaurantt Nov 18, 2024
3d2642d
fix: 🐛 [IOSSDKBUG-454] FilterFeedbackBar dark mode design
restaurantt Nov 18, 2024
d6cacb7
Merge branch 'main' into main-IOSSDKBUG-454
dyongxu Nov 18, 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
27 changes: 13 additions & 14 deletions Sources/FioriSwiftUICore/Components/CancellableResettableForm.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,15 +77,20 @@ struct CancellableResettableDialogNavigationForm<Title: View, CancelAction: View
}

var body: some View {
let isNotIphone = UIDevice.current.userInterfaceIdiom != .phone
NavigationStack {
VStack(spacing: UIDevice.current.userInterfaceIdiom != .phone ? 8 : 16) {
#if !os(visionOS)
self.components.background(Color.preferredColor(.secondaryGroupedBackground))
#else
self.components.background(Color.clear)
#endif
self.applyAction
.accessibilityIdentifier("Apply")
ZStack {
Color.preferredColor(.chromeSecondary)
.ignoresSafeArea()
VStack(spacing: isNotIphone ? 8 : 16) {
self.components

VStack(spacing: 0) {
self.applyAction
.accessibilityIdentifier("Apply")
Spacer().frame(height: isNotIphone ? 13 : 16)
}
}
}
.navigationBarTitleDisplayMode(.inline)
.toolbar {
Expand All @@ -100,12 +105,6 @@ struct CancellableResettableDialogNavigationForm<Title: View, CancelAction: View
}
}
}
.padding([.bottom], UIDevice.current.userInterfaceIdiom != .phone ? 13 : 16)
#if !os(visionOS)
.background(Color.preferredColor(.chromeSecondary))
#else
.background(Color.clear)
#endif
}
}

Expand Down
4 changes: 3 additions & 1 deletion Sources/FioriSwiftUICore/Views/SearchListPickerItem+View.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ extension SearchListPickerItem: View {
_onTap?(index)
}
}

.listRowBackground(Color.preferredColor(.chromeSecondary))

Rectangle().fill(Color.preferredColor(.primaryGroupedBackground))
.frame(height: 30)
.listRowInsets(EdgeInsets())
Expand Down Expand Up @@ -72,6 +73,7 @@ extension SearchListPickerItem: View {
_onTap?(index)
}
}
.listRowBackground(Color.preferredColor(.chromeSecondary))
}
}
.modifier(FioriIntrospectModifier<UIScrollView> { scrollView in
Expand Down
1 change: 0 additions & 1 deletion Sources/FioriSwiftUICore/Views/SortFilter/SortFilterView+View.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ extension SortFilterView: View {
}
#if !os(visionOS)
.frame(minWidth: UIDevice.current.userInterfaceIdiom != .phone ? 393.0 : nil)
.background(Color.preferredColor(.chromeSecondary))
#else
.frame(minWidth: 480.0)
.background(Color.clear)
Expand Down
5 changes: 4 additions & 1 deletion Sources/FioriSwiftUICore/Views/SortFilter/_SortFilterCFGItemContainer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,9 @@ extension _SortFilterCFGItemContainer: View {
.padding([.leading, .trailing], UIDevice.current.userInterfaceIdiom != .phone ? 13 : 16)
.frame(width: UIDevice.current.userInterfaceIdiom != .phone ? self.popoverWidth : nil)
}
} footer: {
Rectangle().fill(Color.preferredColor(.primaryGroupedBackground))
.frame(height: 30)
.listRowInsets(EdgeInsets())
}
.listSectionSeparator(.hidden, edges: .all)
.listRowInsets(EdgeInsets())
Expand All @@ -53,6 +54,8 @@ extension _SortFilterCFGItemContainer: View {
.frame(width: UIDevice.current.userInterfaceIdiom != .phone ? self.popoverWidth : nil)
.frame(height: self.height)
.background(Color.preferredColor(.secondaryGroupedBackground))
.environment(\.defaultMinListRowHeight, 0)
.environment(\.defaultMinListHeaderHeight, 0)
.modifier(FioriIntrospectModifier<UIScrollView> { scrollView in
DispatchQueue.main.async {
let popverHeight = Screen.bounds.size.height
Expand Down
Loading