fix: 🐛 [IOSSDKBUG-454]FilterFeedbackBar dark mode design (#891)

SAP · Nov 19, 2024 · 4d21c78 · 4d21c78
1 parent 23484cb
commit 4d21c78
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 19 deletions.
diff --git a/Sources/FioriSwiftUICore/Components/CancellableResettableForm.swift b/Sources/FioriSwiftUICore/Components/CancellableResettableForm.swift
@@ -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 {
@@ -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
     }
 }
 
@@ -120,7 +119,7 @@ struct ApplyButtonStyle: PrimitiveButtonStyle {
                     Screen.bounds.size.width - 16 * 2)
                 .padding([.top, .bottom], 8)
                 .font(.body)
-                .fontWeight(.bold)
+                .fontWeight(.semibold)
             #if !os(visionOS)
                 .foregroundStyle(Color.preferredColor(.base2))
                 .background(RoundedRectangle(cornerRadius: 8).fill(Color.preferredColor(.tintColor)))
@@ -139,7 +138,7 @@ struct ApplyButtonStyle: PrimitiveButtonStyle {
                     Screen.bounds.size.width - 16 * 2)
                 .padding([.top, .bottom], 8)
                 .font(.body)
-                .fontWeight(.bold)
+                .fontWeight(.semibold)
             #if !os(visionOS)
                 .foregroundStyle(Color.preferredColor(.grey1))
             #else

diff --git a/Sources/FioriSwiftUICore/Views/SearchListPickerItem+View.swift b/Sources/FioriSwiftUICore/Views/SearchListPickerItem+View.swift
@@ -43,7 +43,8 @@ extension SearchListPickerItem: View {
                                 _onTap?(index)
                             }
                     }
-
+                    .listRowBackground(Color.preferredColor(.chromeSecondary))
+
                     Rectangle().fill(Color.preferredColor(.primaryGroupedBackground))
                         .frame(height: 30)
                         .listRowInsets(EdgeInsets())
@@ -72,6 +73,7 @@ extension SearchListPickerItem: View {
                             _onTap?(index)
                         }
                 }
+                .listRowBackground(Color.preferredColor(.chromeSecondary))
             }
         }
         .modifier(FioriIntrospectModifier<UIScrollView> { scrollView in

diff --git a/Sources/FioriSwiftUICore/Views/SortFilter/SortFilterView+View.swift b/Sources/FioriSwiftUICore/Views/SortFilter/SortFilterView+View.swift
@@ -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)

diff --git a/Sources/FioriSwiftUICore/Views/SortFilter/_SortFilterCFGItemContainer.swift b/Sources/FioriSwiftUICore/Views/SortFilter/_SortFilterCFGItemContainer.swift
@@ -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())
@@ -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