feat: 🎸 jira 2286 sort & filter for SwiftUI project

Apps/Examples/Examples.xcodeproj/project.pbxproj

@@ -100,6 +100,8 @@
 		B8D4376F25F980340024EE7D /* ObjectCell_Spec_Jan2018.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8D4376E25F980340024EE7D /* ObjectCell_Spec_Jan2018.swift */; };
 		B8D4377125F983730024EE7D /* ObjectCell_Rules_Alignment.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8D4377025F983730024EE7D /* ObjectCell_Rules_Alignment.swift */; };
 		B8D437732609479E0024EE7D /* SingleActionFollowButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8D437722609479E0024EE7D /* SingleActionFollowButton.swift */; };
+		C1A0FDB32AD893FA0001738E /* SortFilterView+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1A0FDB22AD893FA0001738E /* SortFilterView+Extensions.swift */; };
+		C1C764882A818BEC00BCB0F7 /* SortFilterExample.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1C764872A818BEC00BCB0F7 /* SortFilterExample.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -240,6 +242,8 @@
 		B8D4376E25F980340024EE7D /* ObjectCell_Spec_Jan2018.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ObjectCell_Spec_Jan2018.swift; sourceTree = "<group>"; };
 		B8D4377025F983730024EE7D /* ObjectCell_Rules_Alignment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ObjectCell_Rules_Alignment.swift; sourceTree = "<group>"; };
 		B8D437722609479E0024EE7D /* SingleActionFollowButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingleActionFollowButton.swift; sourceTree = "<group>"; };
+		C1A0FDB22AD893FA0001738E /* SortFilterView+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SortFilterView+Extensions.swift"; sourceTree = "<group>"; };
+		C1C764872A818BEC00BCB0F7 /* SortFilterExample.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SortFilterExample.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -423,6 +427,7 @@
 		8A5579C824C1293C0098003A /* FioriSwiftUICore */ = {
 			isa = PBXGroup;
 			children = (
+				C1C764862A818BD600BCB0F7 /* SortFilter */,
 				B100639129C0623300AF0CA2 /* StepProgressIndicator */,
 				108E43D3292DAB3E006532F3 /* EmptyStateView */,
 				B1D41B1E291A2D2E004E64A5 /* Picker */,
@@ -575,6 +580,15 @@
 			path = ObjectItem;
 			sourceTree = "<group>";
 		};
+		C1C764862A818BD600BCB0F7 /* SortFilter */ = {
+			isa = PBXGroup;
+			children = (
+				C1C764872A818BEC00BCB0F7 /* SortFilterExample.swift */,
+				C1A0FDB22AD893FA0001738E /* SortFilterView+Extensions.swift */,
+			);
+			path = SortFilter;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -728,6 +742,7 @@
 				8A557A2424C12F380098003A /* ChartDetailView.swift in Sources */,
 				8A5579D024C1293C0098003A /* SettingsLine.swift in Sources */,
 				1FC30412270540FB004BEE00 /* 72-Fonts.swift in Sources */,
+				C1A0FDB32AD893FA0001738E /* SortFilterView+Extensions.swift in Sources */,
 				B84D24ED2652F343007F2373 /* HeaderChartExample.swift in Sources */,
 				B100639329C0624D00AF0CA2 /* StepProgressIndicatorExample.swift in Sources */,
 				B846F94626815CC90085044B /* ContactItemExample.swift in Sources */,
@@ -777,6 +792,7 @@
 				8A5579D524C1293C0098003A /* SettingsSeries.swift in Sources */,
 				8A557A2224C12C9B0098003A /* CoreContentView.swift in Sources */,
 				8A5579D224C1293C0098003A /* Color+Extensions.swift in Sources */,
+				C1C764882A818BEC00BCB0F7 /* SortFilterExample.swift in Sources */,
 				B84D24EF2652F343007F2373 /* ObjectHeaderTestApp.swift in Sources */,
 				B84D24EC2652F343007F2373 /* ObjectHeaderSpecCompact.swift in Sources */,
 				8A5579CD24C1293C0098003A /* SettingsLabel.swift in Sources */,
@@ -920,7 +936,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -975,7 +991,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = iphoneos;
@@ -995,7 +1011,7 @@
 				DEVELOPMENT_TEAM = "";
 				ENABLE_PREVIEWS = YES;
 				INFOPLIST_FILE = Examples/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1017,7 +1033,7 @@
 				DEVELOPMENT_TEAM = "";
 				ENABLE_PREVIEWS = YES;
 				INFOPLIST_FILE = Examples/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",

Apps/Examples/Examples/FioriSwiftUICore/CoreContentView.swift

@@ -107,6 +107,10 @@ struct CoreContentView: View {
                     destination: EmptyStateViewExample()) {
                     Text("EmptyStateViewExample")
                 }
+
+                NavigationLink(destination: SortFilterExample()) {
+                    Text("SortFilterExample")
+                }
             }
         }.navigationBarTitle("FioriSwiftUICore")
     }

Apps/Examples/Examples/FioriSwiftUICore/SortFilter/SortFilterExample.swift

@@ -0,0 +1,110 @@
+import FioriSwiftUICore
+import SwiftUI
+
+struct SortFilterExample: View {
+    @State private var items: [[SortFilterItem]] = [
+        [
+            .switch(item: .init(name: "Favorite", value: true, icon: "heart.fill"), isShownOnMenu: true),
+            .switch(item: .init(name: "Tagged", value: nil, icon: "tag"), isShownOnMenu: false),
+            .picker(item: .init(value: [0], valueOptions: ["Received", "Started", "Hold", "Transfer", "Completed", "Pending Review", "Accepted", "Rejected"], name: "JIRA Status", allowsMultipleSelection: true, allowsEmptySelection: true, icon: "clock"), isShownOnMenu: true)
+        ],
+        [
+            .picker(item: .init(value: [0], valueOptions: ["High", "Medium", "Low"], name: "Priority", allowsMultipleSelection: true, allowsEmptySelection: true, icon: "filemenu.and.cursorarrow"), isShownOnMenu: true),
+            .filterfeedback(item: .init(value: [0], valueOptions: ["Ascending", "Descending"], name: "Sort Order", allowsMultipleSelection: false, allowsEmptySelection: false, icon: "checkmark"))
+        ],
+        [
+            .slider(item: .init(value: 10, minimumValue: 0, maximumValue: 100, name: "User Stories", formatter: "%2d Stories", icon: "number"), isShownOnMenu: true),
+            .slider(item: .init(value: nil, minimumValue: 0, maximumValue: 100, name: "Number of Tasks"), isShownOnMenu: true),
+            .datetime(item: .init(value: Date(), name: "Start Date", formatter: "yyyy-MM-dd HH:mm",icon: "calendar"), isShownOnMenu: true)
+        ],
+        [
+            .datetime(item: .init(value: nil, name: "Completion Date"), isShownOnMenu: true)
+        ]
+    ]
+
+    @State private var isShowingFullCFG: Bool = false
+    @State private var isCustomStyle: Bool = false
+    @State private var sortFilterList: [String] = []
+    @State private var sortFilterButtonLabel: String = "Sort & Filter"
+
+    var body: some View {
+        VStack {
+            if isCustomStyle {
+                SortFilterMenu(items: $items, onUpdate: performSortAndFilter)
+                    .sortFilterMenuItemStyle(font: .subheadline, foregroundColorSelected: .red, strokeColorSelected: .red, cornerRadius: 25)
+                    .optionChipStyle(font: .footnote, foregroundColorUnselected: .green, strokeColorSelected: .black)
+//                    .trailingFullConfigurationMenuItem(icon: "command")
+//                    .leadingFullConfigurationMenuItem(icon: "command")
+//                    .leadingFullConfigurationMenuItem(name: "All")
+            } else {
+                SortFilterMenu(items: $items, onUpdate: performSortAndFilter)
+            }
+
+            List {
+                ForEach(sortFilterList, id: \.self) { line in
+                    Text(line)
+                }
+            }
+            .listStyle(PlainListStyle())
+
+            HStack {
+                Toggle("Custom Style", isOn: $isCustomStyle)
+                    .fixedSize()
+                    .toggleStyle(FioriToggleStyle())
+
+                Button("Print") {
+                    for line in sortFilterList {
+                        print(line)
+                    }
+                }
+            }
+        }
+        .navigationTitle("Sort & Filter")
+        .toolbar {
+            Button(sortFilterButtonLabel) {
+                isShowingFullCFG.toggle()
+            }
+            .popover(isPresented: $isShowingFullCFG, arrowEdge: .leading) {
+                if isCustomStyle {
+                    SortFilterFullCFG(
+                        title: "Configuration",
+                        items: $items,
+                        onUpdate: performSortAndFilter
+                    )
+                    .optionChipStyle(font: .footnote, foregroundColorUnselected: .green, strokeColorSelected: .black)
+                } else {
+                    SortFilterFullCFG(
+                        title: "Configuration",
+                        items: $items,
+                        onUpdate: performSortAndFilter
+                    )
+                }
+            }
+        }
+        .onAppear {
+            performSortAndFilter()
+        }
+    }
+
+    func numberOfItems() -> Int {
+        // randomly padding result to mimic impact of filterring
+        for i in 0 ... Int.random(in: 0 ... 5) {
+            self.sortFilterList.append("padding element \(i + 1)")
+        }
+        return self.sortFilterList.count
+    }
+
+    func performSortAndFilter() {
+        self.sortFilterList = self.items.joined().map { value(of: $0) }
+        self.sortFilterButtonLabel = "CFG (\(self.numberOfItems()))"
+    }
+}
+
+#if DEBUG
+    @available(iOS 16.0, *)
+    struct SortFilterExample_Previews: PreviewProvider {
+        static var previews: some View {
+            SortFilterExample()
+        }
+    }
+#endif

Apps/Examples/Examples/FioriSwiftUICore/SortFilter/SortFilterView+Extensions.swift

@@ -0,0 +1,35 @@
+import FioriSwiftUICore
+import SwiftUI
+
+extension View {
+    func value(of item: SortFilterItem) -> String {
+        switch item {
+        case .picker(let v, _):
+            return self.json(item: v)
+        case .filterfeedback(let v):
+            return self.json(item: v)
+        case .slider(let v, _):
+            return self.json(item: v)
+        case .datetime(let v, _):
+            return self.json(item: v)
+        case .switch(let v, _):
+            return self.json(item: v)
+        }
+    }
+
+    func json(item: PickerItem) -> String {
+        "{name: \(item.name), value: \(item.value)}"
+    }
+
+    func json(item: SliderItem) -> String {
+        "{name: \(item.name), value: \(String(describing: item.value))}"
+    }
+
+    func json(item: DateTimeItem) -> String {
+        "{name: \(item.name), value: \(String(describing: item.value))}"
+    }
+
+    func json(item: SwitchItem) -> String {
+        "{name: \(item.name), value: \(String(describing: item.value))}"
+    }
+}

Apps/Examples/Examples/Preview Content/Preview Assets.xcassets/iconfromapp.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "icon.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Package.swift

@@ -6,7 +6,7 @@ import PackageDescription
 let package = Package(
     name: "FioriSwiftUI",
     defaultLocalization: "en",
-    platforms: [.iOS(.v15), .watchOS(.v7)],
+    platforms: [.iOS(.v16), .watchOS(.v7)],
     products: [
         .library(
             name: "FioriSwiftUI",

Sources/FioriSwiftUICore/Components/CancellableResettableForm.swift

@@ -0,0 +1,93 @@
+import Foundation
+import SwiftUI
+
+struct CancellableResettableDialogForm<Title: View, CancelAction: View, ResetAction: View, ApplyAction: View, Components: View>: View {
+    let title: Title
+
+    let components: Components
+
+    var cancelAction: CancelAction
+    var resetAction: ResetAction
+    var applyAction: ApplyAction
+
+    public init(@ViewBuilder title: () -> Title,
+                @ViewBuilder cancelAction: () -> CancelAction,
+                @ViewBuilder resetAction: () -> ResetAction,
+                @ViewBuilder applyAction: () -> ApplyAction,
+                @ViewBuilder components: () -> Components)
+    {
+        self.title = title()
+        self.cancelAction = cancelAction()
+        self.resetAction = resetAction()
+        self.applyAction = applyAction()
+        self.components = components()
+    }
+
+    var body: some View {
+        VStack(spacing: UIDevice.current.userInterfaceIdiom == .pad ? 8 : 16) {
+            HStack {
+                cancelAction
+                Spacer()
+                title
+                Spacer()
+                resetAction
+            }
+            components
+            applyAction
+        }
+        .frame(width: UIDevice.current.userInterfaceIdiom == .pad ? 375: UIScreen.main.bounds.size.width - 32)
+        .padding([.leading, .trailing], 16)
+        .padding([.top, .bottom], UIDevice.current.userInterfaceIdiom == .pad ? 13 : 16)
+    }
+}
+
+struct ApplyButtonStyle: PrimitiveButtonStyle {
+    func makeBody(configuration: Configuration) -> some View {
+        configuration.label
+            .frame(minWidth: UIDevice.current.userInterfaceIdiom == .pad ? 375 : 200, maxWidth: .infinity)
+            .padding(8)
+            .font(.body)
+            .fontWeight(.bold)
+            .foregroundStyle(Color.preferredColor(.base2))
+            .background(RoundedRectangle(cornerRadius: 8).fill(Color.preferredColor(.tintColor)))
+            .onTapGesture {
+                configuration.trigger()
+            }
+            .padding([.top, .bottom], UIDevice.current.userInterfaceIdiom == .pad ? 16 : 8)
+    }
+}
+
+struct CancelResetButtonStyle: PrimitiveButtonStyle {
+    func makeBody(configuration: Configuration) -> some View {
+        configuration.label
+            .font(.body)
+            .fontWeight(.bold)
+            .foregroundStyle(Color.preferredColor(.tintColor))
+            .onTapGesture {
+                configuration.trigger()
+            }
+    }
+}
+
+#Preview {
+    VStack {
+        Spacer()
+        CancellableResettableDialogForm {
+            Text("Date of Completion")
+        } cancelAction: {
+            Action(actionText: "Cancel", didSelectAction: nil)
+        } resetAction: {
+            Action(actionText: "Reset", didSelectAction: nil)
+        } applyAction: {
+            Action(actionText: "Apply", didSelectAction: nil)
+                .buttonStyle(ApplyButtonStyle())
+        } components: {
+            DatePicker(
+                "date",
+                selection: Binding<Date>(get: { Date() }, set: { print($0) }),
+                displayedComponents: [.date]
+            )
+            .datePickerStyle(.graphical)
+        }
+    }
+}