Merge branch 'main' of github.com:SAP/cloud-sdk-ios-fiori into visionOS

* 'main' of github.com:SAP/cloud-sdk-ios-fiori: fix: 🐛 [bcp: 0] remove background in ObjectHeader (#614) docs: ✏️ build documentation with DocC and host on swiftpackageindex.com (#613) chore: 🤖 refactor FioriIcon and support accessing cgImage through Image (#612) feat: 🎸 jira 2286 sort & filter for SwiftUI project (#606) fix: 🐛 [bcp: 2370136916] fix width mode for DimensionSelector (#610) feat: [JIRA: HCPSDKFIORIUIKIT-2444] Update to include more icons feat: [JIRA: HCPSDKFIORIUIKIT-2444] Update to include more icons chore: 🤖 update CI job for watchOS to use xcode 15 (#609) chore: 🤖 run CI job on macos-13 and xcode 15.0 (#608) feat: [JIRA: HCPSDKFIORIUIKIT-2444] Update to include more icons feat: [JIRA: HCPSDKFIORIUIKIT-2444] Update to include more icons feat: 🎸 [JIRA: HCPSDKFIORIUIKIT-2224] New FioriButtonStyle support (#603) feat: 🎸 [JIRA: HCPSDKFIORIUIKIT-2444] Update to include more icons feat: 🎸 [JIRA: HCPSDKFIORIUIKIT-2444] Update to include more icons feat: [JIRA: HCPSDKFIORIUIKIT-2444] Update to include more icons
SAP · Nov 17, 2023 · 17350c3 · 17350c3
2 parents 1c65609 + f1763fc
commit 17350c3
Show file tree

Hide file tree

Showing 2,018 changed files with 85,128 additions and 29,342 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,24 +11,19 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-11, macos-12]
-        xcode: ['Xcode_14.0']
-        exclude:
-          - os: macos-11
-            xcode: 'Xcode_14.0'  
+        os: [macos-13]
+        xcode: ['Xcode_15.0.1']
     runs-on: ${{ matrix.os }}         
     env:
       DEVELOPER_DIR: /Applications/${{ matrix.xcode }}.app/Contents/Developer
 
     steps:
     - uses: actions/checkout@v3
     - name: Build and Test
-      run: set -o pipefail && xcodebuild -enableCodeCoverage YES -scheme FioriSwiftUI-Package -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 11' clean build test | xcpretty
+      run: set -o pipefail && xcodebuild -enableCodeCoverage YES -scheme FioriSwiftUI-Package -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 15' clean build test | xcpretty
     - name: Create code coverage report
-      if: matrix.xcode == 'Xcode_14.0'
       run: ./scripts/xccov-to-sonarqube-generic.sh /Users/runner/Library/Developer/Xcode/DerivedData/cloud-sdk-ios-fiori*/Logs/Test/*.xcresult/ > sonarqube-generic-coverage.xml
     - name: Store coverage for sonar job
-      if: matrix.xcode == 'Xcode_14.0'
       uses: actions/upload-artifact@v1
       with:
         name: coverage
@@ -53,7 +48,15 @@ jobs:
         SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }}
 
   build_watch:
-    runs-on: macos-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [macos-13]
+        xcode: ['Xcode_15.0.1']
+    runs-on: ${{ matrix.os }}         
+    env:
+      DEVELOPER_DIR: /Applications/${{ matrix.xcode }}.app/Contents/Developer
+
     steps:
     - uses: actions/checkout@v3
     - name: Run tests on Apple Watch simulator

diff --git a/.spi.yml b/.spi.yml
@@ -0,0 +1,5 @@
+version: 1
+builder:
+  configs:
+    - documentation_targets: [FioriThemeManager, FioriCharts]
+      platform: ios
diff --git a/Apps/Apps.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Apps/Apps.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Apps/Examples/Examples.xcodeproj/project.pbxproj b/Apps/Examples/Examples.xcodeproj/project.pbxproj
@@ -10,6 +10,7 @@
 		108E43D5292DAB7C006532F3 /* EmptyStateViewExample.swift in Sources */ = {isa = PBXBuildFile; fileRef = 108E43D4292DAB7C006532F3 /* EmptyStateViewExample.swift */; };
 		1F26DCFA261A5CD9006C43B1 /* FioriButtonContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F26DCF9261A5CD9006C43B1 /* FioriButtonContentView.swift */; };
 		1F3C92F125DF12C100A99A07 /* ListPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F3C92F025DF12C100A99A07 /* ListPicker.swift */; };
+		1F55FEF32AC941FF00D7A1BE /* View+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F55FEF22AC941FF00D7A1BE /* View+Extensions.swift */; };
 		1F60179729A8439A00DBDCDE /* WatchExamplesApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F60179629A8439A00DBDCDE /* WatchExamplesApp.swift */; };
 		1F60179929A8439A00DBDCDE /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F60179829A8439A00DBDCDE /* ContentView.swift */; };
 		1F60179B29A8439C00DBDCDE /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1F60179A29A8439C00DBDCDE /* Assets.xcassets */; };
@@ -99,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 */
@@ -151,6 +154,7 @@
 		108E43D4292DAB7C006532F3 /* EmptyStateViewExample.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptyStateViewExample.swift; sourceTree = "<group>"; };
 		1F26DCF9261A5CD9006C43B1 /* FioriButtonContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FioriButtonContentView.swift; sourceTree = "<group>"; };
 		1F3C92F025DF12C100A99A07 /* ListPicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListPicker.swift; sourceTree = "<group>"; };
+		1F55FEF22AC941FF00D7A1BE /* View+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "View+Extensions.swift"; sourceTree = "<group>"; };
 		1F60179429A8439A00DBDCDE /* WatchExamples Watch App.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "WatchExamples Watch App.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		1F60179629A8439A00DBDCDE /* WatchExamplesApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WatchExamplesApp.swift; sourceTree = "<group>"; };
 		1F60179829A8439A00DBDCDE /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
@@ -238,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 */
@@ -286,6 +292,14 @@
 			path = FioriButton;
 			sourceTree = "<group>";
 		};
+		1F55FEF12AC941C100D7A1BE /* Utility */ = {
+			isa = PBXGroup;
+			children = (
+				1F55FEF22AC941FF00D7A1BE /* View+Extensions.swift */,
+			);
+			path = Utility;
+			sourceTree = "<group>";
+		};
 		1F60179529A8439A00DBDCDE /* WatchExamples Watch App */ = {
 			isa = PBXGroup;
 			children = (
@@ -364,6 +378,7 @@
 		8A55795524C1286E0098003A /* Examples */ = {
 			isa = PBXGroup;
 			children = (
+				1F55FEF12AC941C100D7A1BE /* Utility */,
 				1FC3040F2705409C004BEE00 /* FioriThemeManager */,
 				8A55797824C1293C0098003A /* FioriCharts */,
 				8A5579C824C1293C0098003A /* FioriSwiftUICore */,
@@ -412,6 +427,7 @@
 		8A5579C824C1293C0098003A /* FioriSwiftUICore */ = {
 			isa = PBXGroup;
 			children = (
+				C1C764862A818BD600BCB0F7 /* SortFilter */,
 				B100639129C0623300AF0CA2 /* StepProgressIndicator */,
 				108E43D3292DAB3E006532F3 /* EmptyStateView */,
 				B1D41B1E291A2D2E004E64A5 /* Picker */,
@@ -564,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 */
@@ -717,12 +742,14 @@
 				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 */,
 				8A5579CC24C1293C0098003A /* SettingsColorForCategory.swift in Sources */,
 				8A557A1A24C12C820098003A /* ChartsContentView.swift in Sources */,
 				8A5579CE24C1293C0098003A /* SettingColor.swift in Sources */,
+				1F55FEF32AC941FF00D7A1BE /* View+Extensions.swift in Sources */,
 				8A6DE30B28DD27F9003222E3 /* Colors.swift in Sources */,
 				8AD9DFB225D49967007448EC /* StylingModifierExample.swift in Sources */,
 				8A5579D124C1293C0098003A /* Settings.swift in Sources */,
@@ -765,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 */,
@@ -909,7 +937,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;
@@ -964,7 +992,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;
@@ -984,7 +1012,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",
@@ -1010,7 +1038,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",

diff --git a/Apps/Examples/Examples/FioriSwiftUICore/CoreContentView.swift b/Apps/Examples/Examples/FioriSwiftUICore/CoreContentView.swift
@@ -107,6 +107,10 @@ struct CoreContentView: View {
                     destination: EmptyStateViewExample()) {
                     Text("EmptyStateViewExample")
                 }
+
+                NavigationLink(destination: SortFilterExample()) {
+                    Text("SortFilterExample")
+                }
             }
         }.navigationBarTitle("FioriSwiftUICore")
     }

diff --git a/Apps/Examples/Examples/FioriSwiftUICore/DimensionSelector/DimensionSelector+Chart.swift b/Apps/Examples/Examples/FioriSwiftUICore/DimensionSelector/DimensionSelector+Chart.swift
@@ -4,16 +4,17 @@ import FioriSwiftUICore
 import SwiftUI
 
 struct DimensionSelector_Chart: View {
-    let segmentTitltes = ["intraday: 1min", "one day: 1min", "1year:1day", "3years:1week"]
+    let segmentTitltes = ["1min", "One day", "1year: 1day", "Three years: one week"]
 
     @ObservedObject var stockModel = Tests.stockModels[0]
 
+    @State var widthMode: SegmentWidthMode = .intrinsic
     var cancellableSet: Set<AnyCancellable> = []
-
     var dimensionSelector: DimensionSelector!
 
     init() {
         self.dimensionSelector = DimensionSelector(segmentTitles: self.segmentTitltes, selectedIndex: stockModel.indexOfStockSeries)
+        self.dimensionSelector.segmentWidthMode = .equal
         let stockModel = self.stockModel
         self.dimensionSelector.selectionDidChangePublisher
             .sink(receiveValue: { index in
@@ -25,6 +26,7 @@ struct DimensionSelector_Chart: View {
     var body: some View {
         VStack(alignment: .center, spacing: 30) {
             dimensionSelector
+
             chartView
         }
     }