Merge branch 'main' into main

Author: dyongxu

Apps/Examples/Examples/FioriThemeManager/IconLibraryExample.swift

@@ -1248,6 +1248,10 @@ struct FioriIconSet {
             "beforeSearchDot": FioriIcon.illustrations.beforeSearchDot,
             "beforeSearchScene": FioriIcon.illustrations.beforeSearchScene,
             "beforeSearchSpot": FioriIcon.illustrations.beforeSearchSpot,
+            "beforeSearch2Dialog": FioriIcon.illustrations.beforeSearch2Dialog,
+            "beforeSearch2Dot": FioriIcon.illustrations.beforeSearch2Dot,
+            "beforeSearch2Scene": FioriIcon.illustrations.beforeSearch2Scene,
+            "beforeSearch2Spot": FioriIcon.illustrations.beforeSearch2Spot,
             "connectionDialog": FioriIcon.illustrations.connectionDialog,
             "connectionDot": FioriIcon.illustrations.connectionDot,
             "connectionScene": FioriIcon.illustrations.connectionScene,

Sources/FioriSwiftUICore/Views/SortFilter/_SortFilterCFGItemContainer.swift

@@ -224,7 +224,7 @@ extension _SortFilterCFGItemContainer: View {
             }, axis: .horizontal)
         }
         .listRowBackground(Color.preferredColor(.secondaryGroupedBackground))
-        .frame(height: 44)
+        .frame(minHeight: 44)
     }
 
     func picker(row r: Int, column c: Int) -> some View {

Sources/FioriThemeManager/FioriIcons/FioriIcon.swift

@@ -2439,6 +2439,14 @@ public enum FioriIcon {
         ///
         public static let beforeSearchSpot = Image(fioriName: "fiori.ill.before.search.spot")
         ///
+        public static let beforeSearch2Dialog = Image(fioriName: "fiori.ill.before.search.2.dialog")
+        ///
+        public static let beforeSearch2Dot = Image(fioriName: "fiori.ill.before.search.2.dot")
+        ///
+        public static let beforeSearch2Scene = Image(fioriName: "fiori.ill.before.search.2.scene")
+        ///
+        public static let beforeSearch2Spot = Image(fioriName: "fiori.ill.before.search.2.spot")
+        ///
         public static let connectionDialog = Image(fioriName: "fiori.ill.connection.dialog")
         ///
         public static let connectionDot = Image(fioriName: "fiori.ill.connection.dot")

Sources/FioriThemeManager/FioriIcons/Resources/FioriIcon.xcassets/fiori.ill.before.search.2.dialog.imageset/Contents.json

@@ -0,0 +1,24 @@
+{
+  "images" : [
+    {
+      "filename" : "fiori.ill.before.search.2.dialog.svg",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "fiori.ill.before.search.2.dialog.dark.svg",
+      "idiom" : "universal",
+      "scale" : "1x",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ]
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Sources/FioriThemeManager/FioriIcons/Resources/FioriIcon.xcassets/fiori.ill.before.search.2.dialog.imageset/fiori.ill.before.search.2.dialog.dark.svg

@@ -0,0 +1,24 @@
+{
+  "images" : [
+    {
+      "filename" : "fiori.ill.before.search.2.dot.svg",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "fiori.ill.before.search.2.dot.dark.svg",
+      "idiom" : "universal",
+      "scale" : "1x",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ]
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Sources/FioriThemeManager/FioriIcons/Resources/FioriIcon.xcassets/fiori.ill.before.search.2.dialog.imageset/fiori.ill.before.search.2.dialog.svg

@@ -0,0 +1,24 @@
+{
+  "images" : [
+    {
+      "filename" : "fiori.ill.before.search.2.scene.dark.svg",
+      "idiom" : "universal",
+      "scale" : "1x",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ]
+    },
+    {
+      "filename" : "fiori.ill.before.search.2.scene.svg",
+      "idiom" : "universal",
+      "scale" : "1x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}