Skip to content

Commit a01f570

Browse files
dfeinzimerdfeinzimer
authored
Merge pull request #669 from Esri/v.next
Merge v.next into main for 200.4
2 parents 99988c2 + 9887bca commit a01f570

File tree

333 files changed

+9865
-2725
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

333 files changed

+9865
-2725
lines changed

‎.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.sqlite filter=lfs diff=lfs merge=lfs -text

‎.swiftpm/xcode/xcshareddata/xcschemes/arcgis-runtime-toolkit-swift.xcscheme

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
33
LastUpgradeVersion = "1250"
4-
version = "1.3">
4+
version = "1.7">
55
<BuildAction
66
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES">
@@ -68,7 +68,8 @@
6868
buildConfiguration = "Debug"
6969
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
7070
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
71-
shouldUseLaunchSchemeArgsEnv = "YES">
71+
shouldUseLaunchSchemeArgsEnv = "YES"
72+
shouldAutocreateTestPlan = "YES">
7273
<Testables>
7374
<TestableReference
7475
skipped = "NO">

‎AuthenticationExample/AuthenticationExample.xcodeproj/project.pbxproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@
325325
"$(inherited)",
326326
"@executable_path/Frameworks",
327327
);
328-
MARKETING_VERSION = 200.3.0;
328+
MARKETING_VERSION = 200.4.0;
329329
PRODUCT_BUNDLE_IDENTIFIER = com.esri.Authentication;
330330
PRODUCT_NAME = "$(TARGET_NAME)";
331331
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -358,7 +358,7 @@
358358
"$(inherited)",
359359
"@executable_path/Frameworks",
360360
);
361-
MARKETING_VERSION = 200.3.0;
361+
MARKETING_VERSION = 200.4.0;
362362
PRODUCT_BUNDLE_IDENTIFIER = com.esri.Authentication;
363363
PRODUCT_NAME = "$(TARGET_NAME)";
364364
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";

‎AuthenticationExample/AuthenticationExample/AuthenticationApp.swift

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
// Copyright 2022 Esri.
2-
1+
// Copyright 2022 Esri
2+
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
55
// You may obtain a copy of the License at
6-
// http://www.apache.org/licenses/LICENSE-2.0
7-
6+
//
7+
// https://www.apache.org/licenses/LICENSE-2.0
8+
//
89
// Unless required by applicable law or agreed to in writing, software
910
// distributed under the License is distributed on an "AS IS" BASIS,
1011
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

‎AuthenticationExample/AuthenticationExample/HomeView.swift

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
// Copyright 2022 Esri.
2-
1+
// Copyright 2022 Esri
2+
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
55
// You may obtain a copy of the License at
6-
// http://www.apache.org/licenses/LICENSE-2.0
7-
6+
//
7+
// https://www.apache.org/licenses/LICENSE-2.0
8+
//
89
// Unless required by applicable law or agreed to in writing, software
910
// distributed under the License is distributed on an "AS IS" BASIS,
1011
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

‎AuthenticationExample/AuthenticationExample/LoadableImageView.swift

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
// Copyright 2022 Esri.
2-
1+
// Copyright 2022 Esri
2+
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
55
// You may obtain a copy of the License at
6-
// http://www.apache.org/licenses/LICENSE-2.0
7-
6+
//
7+
// https://www.apache.org/licenses/LICENSE-2.0
8+
//
89
// Unless required by applicable law or agreed to in writing, software
910
// distributed under the License is distributed on an "AS IS" BASIS,
1011
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

‎AuthenticationExample/AuthenticationExample/MapItemView.swift

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
// Copyright 2022 Esri.
2-
1+
// Copyright 2022 Esri
2+
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
55
// You may obtain a copy of the License at
6-
// http://www.apache.org/licenses/LICENSE-2.0
7-
6+
//
7+
// https://www.apache.org/licenses/LICENSE-2.0
8+
//
89
// Unless required by applicable law or agreed to in writing, software
910
// distributed under the License is distributed on an "AS IS" BASIS,
1011
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

‎AuthenticationExample/AuthenticationExample/ProfileView.swift

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
// Copyright 2022 Esri.
2-
1+
// Copyright 2022 Esri
2+
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
55
// You may obtain a copy of the License at
6-
// http://www.apache.org/licenses/LICENSE-2.0
7-
6+
//
7+
// https://www.apache.org/licenses/LICENSE-2.0
8+
//
89
// Unless required by applicable law or agreed to in writing, software
910
// distributed under the License is distributed on an "AS IS" BASIS,
1011
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

‎AuthenticationExample/AuthenticationExample/SignInView.swift

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
// Copyright 2022 Esri.
2-
1+
// Copyright 2022 Esri
2+
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
55
// You may obtain a copy of the License at
6-
// http://www.apache.org/licenses/LICENSE-2.0
7-
6+
//
7+
// https://www.apache.org/licenses/LICENSE-2.0
8+
//
89
// Unless required by applicable law or agreed to in writing, software
910
// distributed under the License is distributed on an "AS IS" BASIS,
1011
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

‎AuthenticationExample/AuthenticationExample/UserView.swift

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
// Copyright 2022 Esri.
2-
1+
// Copyright 2022 Esri
2+
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
55
// You may obtain a copy of the License at
6-
// http://www.apache.org/licenses/LICENSE-2.0
7-
6+
//
7+
// https://www.apache.org/licenses/LICENSE-2.0
8+
//
89
// Unless required by applicable law or agreed to in writing, software
910
// distributed under the License is distributed on an "AS IS" BASIS,
1011
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

‎AuthenticationExample/AuthenticationExample/WebMapsView.swift

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
// Copyright 2022 Esri.
2-
1+
// Copyright 2022 Esri
2+
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
55
// You may obtain a copy of the License at
6-
// http://www.apache.org/licenses/LICENSE-2.0
7-
6+
//
7+
// https://www.apache.org/licenses/LICENSE-2.0
8+
//
89
// Unless required by applicable law or agreed to in writing, software
910
// distributed under the License is distributed on an "AS IS" BASIS,
1011
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

‎Examples/Examples.xcodeproj/project.pbxproj

+14-4
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
1C40F3322B46118800C00ED5 /* WorldScaleExampleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C40F3312B46118800C00ED5 /* WorldScaleExampleView.swift */; };
1011
1CC376D42ABA0B3700A83300 /* TableTopExampleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CC376D32ABA0B3700A83300 /* TableTopExampleView.swift */; };
1112
4D19FCB52881C8F3002601E8 /* PopupExampleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D19FCB42881C8F3002601E8 /* PopupExampleView.swift */; };
13+
4D995CD72B5B01DB00AD45FE /* FeatureFormExampleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75B615012AD76158009D19B6 /* FeatureFormExampleView.swift */; };
1214
75230DAE28614369009AF501 /* UtilityNetworkTraceExampleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75230DAD28614369009AF501 /* UtilityNetworkTraceExampleView.swift */; };
1315
752A4FC4294D268000A49479 /* MapDataModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 752A4FC2294D268000A49479 /* MapDataModel.swift */; };
1416
752A4FC5294D268000A49479 /* SceneDataModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 752A4FC3294D268000A49479 /* SceneDataModel.swift */; };
@@ -46,12 +48,14 @@
4648
/* End PBXCopyFilesBuildPhase section */
4749

4850
/* Begin PBXFileReference section */
51+
1C40F3312B46118800C00ED5 /* WorldScaleExampleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WorldScaleExampleView.swift; sourceTree = "<group>"; };
4952
1CC376D32ABA0B3700A83300 /* TableTopExampleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TableTopExampleView.swift; sourceTree = "<group>"; };
5053
4D19FCB42881C8F3002601E8 /* PopupExampleView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PopupExampleView.swift; sourceTree = "<group>"; };
5154
75230DAD28614369009AF501 /* UtilityNetworkTraceExampleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UtilityNetworkTraceExampleView.swift; sourceTree = "<group>"; };
5255
752A4FC2294D268000A49479 /* MapDataModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapDataModel.swift; sourceTree = "<group>"; };
5356
752A4FC3294D268000A49479 /* SceneDataModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDataModel.swift; sourceTree = "<group>"; };
5457
75657E4727ABAC8400EE865B /* CompassExampleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CompassExampleView.swift; sourceTree = "<group>"; };
58+
75B615012AD76158009D19B6 /* FeatureFormExampleView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FeatureFormExampleView.swift; sourceTree = "<group>"; };
5559
75C37C9127BEDBD800FC9DCE /* BookmarksExampleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksExampleView.swift; sourceTree = "<group>"; };
5660
75D41B2A27C6F21400624D7C /* ScalebarExampleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScalebarExampleView.swift; sourceTree = "<group>"; };
5761
882899FC2AB5099300A0BDC1 /* FlyoverExampleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlyoverExampleView.swift; sourceTree = "<group>"; };
@@ -101,15 +105,17 @@
101105
E4C389D426B8A12C002BC255 /* BasemapGalleryExampleView.swift */,
102106
75C37C9127BEDBD800FC9DCE /* BookmarksExampleView.swift */,
103107
75657E4727ABAC8400EE865B /* CompassExampleView.swift */,
108+
75B615012AD76158009D19B6 /* FeatureFormExampleView.swift */,
104109
E4AA9315276BF5ED000E6289 /* FloatingPanelExampleView.swift */,
105110
E4624A24278CE815000D2A38 /* FloorFilterExampleView.swift */,
111+
882899FC2AB5099300A0BDC1 /* FlyoverExampleView.swift */,
106112
E4F9BC98265EFCAF001280FF /* OverviewMapExampleView.swift */,
107113
4D19FCB42881C8F3002601E8 /* PopupExampleView.swift */,
108114
75D41B2A27C6F21400624D7C /* ScalebarExampleView.swift */,
109115
E42BFBE82672BF9500159107 /* SearchExampleView.swift */,
110-
75230DAD28614369009AF501 /* UtilityNetworkTraceExampleView.swift */,
111-
882899FC2AB5099300A0BDC1 /* FlyoverExampleView.swift */,
112116
1CC376D32ABA0B3700A83300 /* TableTopExampleView.swift */,
117+
75230DAD28614369009AF501 /* UtilityNetworkTraceExampleView.swift */,
118+
1C40F3312B46118800C00ED5 /* WorldScaleExampleView.swift */,
113119
);
114120
name = Examples;
115121
sourceTree = "<group>";
@@ -270,6 +276,8 @@
270276
isa = PBXSourcesBuildPhase;
271277
buildActionMask = 2147483647;
272278
files = (
279+
4D995CD72B5B01DB00AD45FE /* FeatureFormExampleView.swift in Sources */,
280+
1C40F3322B46118800C00ED5 /* WorldScaleExampleView.swift in Sources */,
273281
1CC376D42ABA0B3700A83300 /* TableTopExampleView.swift in Sources */,
274282
752A4FC4294D268000A49479 /* MapDataModel.swift in Sources */,
275283
752A4FC5294D268000A49479 /* SceneDataModel.swift in Sources */,
@@ -419,6 +427,7 @@
419427
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
420428
CODE_SIGN_ENTITLEMENTS = ExamplesApp/Examples.entitlements;
421429
CODE_SIGN_STYLE = Automatic;
430+
CURRENT_PROJECT_VERSION = 1;
422431
DEVELOPMENT_ASSET_PATHS = "\"ExamplesApp/Preview Content\"";
423432
DEVELOPMENT_TEAM = "";
424433
ENABLE_PREVIEWS = YES;
@@ -429,7 +438,7 @@
429438
"$(inherited)",
430439
"@executable_path/Frameworks",
431440
);
432-
MARKETING_VERSION = 200.3.0;
441+
MARKETING_VERSION = 200.4.0;
433442
PRODUCT_BUNDLE_IDENTIFIER = "com.esri.arcgis-swift-sdk-toolkit-examples";
434443
PRODUCT_NAME = "$(TARGET_NAME)";
435444
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -447,6 +456,7 @@
447456
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
448457
CODE_SIGN_ENTITLEMENTS = ExamplesApp/Examples.entitlements;
449458
CODE_SIGN_STYLE = Automatic;
459+
CURRENT_PROJECT_VERSION = 1;
450460
DEVELOPMENT_ASSET_PATHS = "\"ExamplesApp/Preview Content\"";
451461
DEVELOPMENT_TEAM = "";
452462
ENABLE_PREVIEWS = YES;
@@ -457,7 +467,7 @@
457467
"$(inherited)",
458468
"@executable_path/Frameworks",
459469
);
460-
MARKETING_VERSION = 200.3.0;
470+
MARKETING_VERSION = 200.4.0;
461471
PRODUCT_BUNDLE_IDENTIFIER = "com.esri.arcgis-swift-sdk-toolkit-examples";
462472
PRODUCT_NAME = "$(TARGET_NAME)";
463473
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";

‎Examples/Examples.xcodeproj/xcshareddata/xcschemes/Toolkit Examples.xcscheme

+77
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1520"
4+
version = "1.7">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "E47ABE3F2652FE0900FD2FE3"
18+
BuildableName = "Toolkit Examples.app"
19+
BlueprintName = "Toolkit Examples"
20+
ReferencedContainer = "container:Examples.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES"
30+
shouldAutocreateTestPlan = "YES">
31+
</TestAction>
32+
<LaunchAction
33+
buildConfiguration = "Debug"
34+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
35+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
36+
launchStyle = "0"
37+
useCustomWorkingDirectory = "NO"
38+
ignoresPersistentStateOnLaunch = "NO"
39+
debugDocumentVersioning = "YES"
40+
debugServiceExtension = "internal"
41+
allowLocationSimulation = "YES">
42+
<BuildableProductRunnable
43+
runnableDebuggingMode = "0">
44+
<BuildableReference
45+
BuildableIdentifier = "primary"
46+
BlueprintIdentifier = "E47ABE3F2652FE0900FD2FE3"
47+
BuildableName = "Toolkit Examples.app"
48+
BlueprintName = "Toolkit Examples"
49+
ReferencedContainer = "container:Examples.xcodeproj">
50+
</BuildableReference>
51+
</BuildableProductRunnable>
52+
</LaunchAction>
53+
<ProfileAction
54+
buildConfiguration = "Release"
55+
shouldUseLaunchSchemeArgsEnv = "YES"
56+
savedToolIdentifier = ""
57+
useCustomWorkingDirectory = "NO"
58+
debugDocumentVersioning = "YES">
59+
<BuildableProductRunnable
60+
runnableDebuggingMode = "0">
61+
<BuildableReference
62+
BuildableIdentifier = "primary"
63+
BlueprintIdentifier = "E47ABE3F2652FE0900FD2FE3"
64+
BuildableName = "Toolkit Examples.app"
65+
BlueprintName = "Toolkit Examples"
66+
ReferencedContainer = "container:Examples.xcodeproj">
67+
</BuildableReference>
68+
</BuildableProductRunnable>
69+
</ProfileAction>
70+
<AnalyzeAction
71+
buildConfiguration = "Debug">
72+
</AnalyzeAction>
73+
<ArchiveAction
74+
buildConfiguration = "Release"
75+
revealArchiveInOrganizer = "YES">
76+
</ArchiveAction>
77+
</Scheme>

‎Examples/Examples/BasemapGalleryExampleView.swift

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
// Copyright 2021 Esri.
2-
1+
// Copyright 2021 Esri
2+
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
55
// You may obtain a copy of the License at
6-
// http://www.apache.org/licenses/LICENSE-2.0
7-
6+
//
7+
// https://www.apache.org/licenses/LICENSE-2.0
8+
//
89
// Unless required by applicable law or agreed to in writing, software
910
// distributed under the License is distributed on an "AS IS" BASIS,
1011
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,7 +30,7 @@ struct BasemapGalleryExampleView: View {
2930
)
3031

3132
/// The initial list of basemaps.
32-
@State private var basemaps = initialBasemaps()
33+
@State private var basemaps = makeBasemapGalleryItems()
3334

3435
var body: some View {
3536
MapView(map: map, viewpoint: initialViewpoint)
@@ -62,7 +63,7 @@ struct BasemapGalleryExampleView: View {
6263
}
6364
}
6465

65-
private static func initialBasemaps() -> [BasemapGalleryItem] {
66+
private static func makeBasemapGalleryItems() -> [BasemapGalleryItem] {
6667
let identifiers = [
6768
"46a87c20f09e4fc48fa3c38081e0cae6",
6869
"f33a34de3a294590ab48f246e99958c9",

‎Examples/Examples/BookmarksExampleView.swift

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
// Copyright 2022 Esri.
2-
1+
// Copyright 2022 Esri
2+
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
55
// You may obtain a copy of the License at
6-
// http://www.apache.org/licenses/LICENSE-2.0
7-
6+
//
7+
// https://www.apache.org/licenses/LICENSE-2.0
8+
//
89
// Unless required by applicable law or agreed to in writing, software
910
// distributed under the License is distributed on an "AS IS" BASIS,
1011
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

‎Examples/Examples/CompassExampleView.swift

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
// Copyright 2022 Esri.
2-
1+
// Copyright 2022 Esri
2+
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
55
// You may obtain a copy of the License at
6-
// http://www.apache.org/licenses/LICENSE-2.0
7-
6+
//
7+
// https://www.apache.org/licenses/LICENSE-2.0
8+
//
89
// Unless required by applicable law or agreed to in writing, software
910
// distributed under the License is distributed on an "AS IS" BASIS,
1011
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

0 commit comments

Comments
 (0)