Merge pull request #538 from Esri/Caleb/Update-RemoveDeprecatedAPIs

CalebRas · web-flow · commit f66f42d367f4 · 2024-11-01T10:58:36.000-07:00
[Update] Remove deprecated API usage
diff --git a/Shared/Samples/Add ENC exchange set/AddENCExchangeSetView.swift b/Shared/Samples/Add ENC exchange set/AddENCExchangeSetView.swift
@@ -33,7 +33,7 @@ struct AddENCExchangeSetView: View {
                         ProgressView("Loading…")
                             .padding()
                             .background(.ultraThickMaterial)
-                            .cornerRadius(10)
+                            .clipShape(.rect(cornerRadius: 10))
                             .shadow(radius: 50)
                     }
                 }
diff --git a/Shared/Samples/Add raster from service/AddRasterFromServiceView.swift b/Shared/Samples/Add raster from service/AddRasterFromServiceView.swift
@@ -57,7 +57,7 @@ struct AddRasterFromServiceView: View {
                     ProgressView("Drawing…")
                         .padding()
                         .background(.ultraThinMaterial)
-                        .cornerRadius(10)
+                        .clipShape(.rect(cornerRadius: 10))
                         .shadow(radius: 50)
                 }
             }
diff --git a/Shared/Samples/Analyze network with subnetwork trace/AnalyzeNetworkWithSubnetworkTraceView.swift b/Shared/Samples/Analyze network with subnetwork trace/AnalyzeNetworkWithSubnetworkTraceView.swift
@@ -132,7 +132,7 @@ struct AnalyzeNetworkWithSubnetworkTraceView: View {
                 }
                 .padding()
                 .background(.ultraThickMaterial)
-                .cornerRadius(10)
+                .clipShape(.rect(cornerRadius: 10))
                 .shadow(radius: 50)
             }
         }
diff --git a/Shared/Samples/Animate 3D graphic/Animate3DGraphicView.Model.swift b/Shared/Samples/Animate 3D graphic/Animate3DGraphicView.Model.swift
@@ -276,11 +276,11 @@ extension Animate3DGraphicView {
         /// Loads the frames of a mission from a CSV file.
         /// - Parameter filename: The name of the file containing the CSV data.
         mutating func loadFrames(for filename: String) {
-            // Get the path of the file from the bundle using the filename name.
-            guard let path = Bundle.main.path(forResource: filename, ofType: "csv") else { return }
-            
-            // Get the content of the file using the path.
-            guard let content = try? String(contentsOfFile: path) else { return }
+            // Get the content of the file from the bundle using the filename name.
+            guard let url = Bundle.main.url(forResource: filename, withExtension: "csv"),
+                  let content = try? String(contentsOf: url, encoding: .utf8) else {
+                return
+            }
             
             // Split the content by line into an array.
             let lines = content.split(whereSeparator: \.isNewline)
diff --git a/Shared/Samples/Animate 3D graphic/Animate3DGraphicView.swift b/Shared/Samples/Animate 3D graphic/Animate3DGraphicView.swift
@@ -44,7 +44,7 @@ struct Animate3DGraphicView: View {
                     .frame(width: 170, height: 100)
                     .padding([.leading, .trailing])
                     .background(.ultraThinMaterial)
-                    .cornerRadius(10)
+                    .clipShape(.rect(cornerRadius: 10))
                     .shadow(radius: 3)
                 }
                 .padding()
@@ -65,7 +65,7 @@ struct Animate3DGraphicView: View {
                             }
                         }
                         .frame(width: isShowingFullMap ? nil : 100, height: isShowingFullMap ? nil : 100)
-                        .cornerRadius(10)
+                        .clipShape(.rect(cornerRadius: 10))
                         .shadow(radius: 3)
                     Spacer()
                 }
diff --git a/Shared/Samples/Apply mosaic rule to rasters/ApplyMosaicRuleToRastersView.swift b/Shared/Samples/Apply mosaic rule to rasters/ApplyMosaicRuleToRastersView.swift
@@ -44,7 +44,7 @@ struct ApplyMosaicRuleToRastersView: View {
                         ProgressView("Loading...")
                             .padding()
                             .background(.ultraThickMaterial)
-                            .cornerRadius(10)
+                            .clipShape(.rect(cornerRadius: 10))
                             .shadow(radius: 50)
                     }
                 }
diff --git a/Shared/Samples/Create load report/CreateLoadReportView.swift b/Shared/Samples/Create load report/CreateLoadReportView.swift
@@ -45,7 +45,7 @@ struct CreateLoadReportView: View {
                         }
                         .padding()
                         .background(.ultraThickMaterial)
-                        .cornerRadius(10)
+                        .clipShape(.rect(cornerRadius: 10))
                         .shadow(radius: 50)
                     }
                 }
diff --git a/Shared/Samples/Display dimensions/DisplayDimensionsView.swift b/Shared/Samples/Display dimensions/DisplayDimensionsView.swift
@@ -59,7 +59,7 @@ struct DisplayDimensionsView: View {
                     }
                     .padding(8)
                     .background(.ultraThinMaterial)
-                    .cornerRadius(10)
+                    .clipShape(.rect(cornerRadius: 10))
                     .disabled(dimensionLayer == nil)
                 }
                 .padding()
diff --git a/Shared/Samples/Edit and sync features with feature service/EditAndSyncFeaturesWithFeatureServiceView.swift b/Shared/Samples/Edit and sync features with feature service/EditAndSyncFeaturesWithFeatureServiceView.swift
@@ -161,7 +161,7 @@ struct EditAndSyncFeaturesWithFeatureServiceView: View {
                 }
                 .padding()
                 .background(.ultraThickMaterial)
-                .cornerRadius(10)
+                .clipShape(.rect(cornerRadius: 10))
                 .shadow(radius: 50)
             }
         }
diff --git a/Shared/Samples/Find closest facility from point/FindClosestFacilityFromPointView.swift b/Shared/Samples/Find closest facility from point/FindClosestFacilityFromPointView.swift
@@ -36,7 +36,7 @@ struct FindClosestFacilityFromPointView: View {
                         ProgressView("Routing...")
                             .padding()
                             .background(.ultraThickMaterial)
-                            .cornerRadius(10)
+                            .clipShape(.rect(cornerRadius: 10))
                             .shadow(radius: 50)
                     }
                 }
diff --git a/Shared/Samples/Find route around barriers/FindRouteAroundBarriersView.swift b/Shared/Samples/Find route around barriers/FindRouteAroundBarriersView.swift
@@ -58,7 +58,7 @@ struct FindRouteAroundBarriersView: View {
                         ProgressView("Routing...")
                             .padding()
                             .background(.ultraThickMaterial)
-                            .cornerRadius(10)
+                            .clipShape(.rect(cornerRadius: 10))
                             .shadow(radius: 50)
                     }
                 }
diff --git a/Shared/Samples/Monitor changes to draw status/MonitorChangesToDrawStatusView.swift b/Shared/Samples/Monitor changes to draw status/MonitorChangesToDrawStatusView.swift
@@ -52,7 +52,7 @@ struct MonitorChangesToDrawStatusView: View {
                     ProgressView()
                         .padding()
                         .background(.ultraThinMaterial)
-                        .cornerRadius(10)
+                        .clipShape(.rect(cornerRadius: 10))
                         .shadow(radius: 50)
                 }
             }
diff --git a/Shared/Samples/Play KML tour/PlayKMLTourView.swift b/Shared/Samples/Play KML tour/PlayKMLTourView.swift
@@ -104,7 +104,7 @@ struct PlayKMLTourView: View {
                     ProgressView()
                         .padding()
                         .background(.ultraThickMaterial)
-                        .cornerRadius(10)
+                        .clipShape(.rect(cornerRadius: 10))
                         .shadow(radius: 50)
                 }
             }
diff --git a/Shared/Samples/Query features with Arcade expression/QueryFeaturesWithArcadeExpressionView.swift b/Shared/Samples/Query features with Arcade expression/QueryFeaturesWithArcadeExpressionView.swift
@@ -77,7 +77,7 @@ struct QueryFeaturesWithArcadeExpressionView: View {
                         }
                         .padding()
                         .background(.ultraThickMaterial)
-                        .cornerRadius(10)
+                        .clipShape(.rect(cornerRadius: 10))
                         .shadow(radius: 50)
                     }
                 }
diff --git a/Shared/Samples/Query related features/QueryRelatedFeaturesView.swift b/Shared/Samples/Query related features/QueryRelatedFeaturesView.swift
@@ -105,7 +105,7 @@ struct QueryRelatedFeaturesView: View {
                         }
                         .padding()
                         .background(.ultraThickMaterial)
-                        .cornerRadius(10)
+                        .clipShape(.rect(cornerRadius: 10))
                         .shadow(radius: 50)
                     }
                 }
diff --git a/Shared/Samples/Run valve isolation trace/RunValveIsolationTraceView.swift b/Shared/Samples/Run valve isolation trace/RunValveIsolationTraceView.swift
@@ -99,7 +99,7 @@ struct RunValveIsolationTraceView: View {
                     }
                     .padding()
                     .background(.thinMaterial)
-                    .cornerRadius(10)
+                    .clipShape(.rect(cornerRadius: 10))
                 }
             }
             .alert(
diff --git a/Shared/Samples/Set feature request mode/SetFeatureRequestModeView.swift b/Shared/Samples/Set feature request mode/SetFeatureRequestModeView.swift
@@ -88,7 +88,7 @@ struct SetFeatureRequestModeView: View {
                 }
                 .padding()
                 .background(.ultraThickMaterial)
-                .cornerRadius(10)
+                .clipShape(.rect(cornerRadius: 10))
                 .shadow(radius: 50)
             }
         }
diff --git a/Shared/Samples/Show scale bar/ShowScaleBarView.swift b/Shared/Samples/Show scale bar/ShowScaleBarView.swift
@@ -78,7 +78,7 @@ struct ShowScaleBarView: View {
                 .padding([.horizontal, .vertical], 10)
                 .background(Color.white)
                 .opacity(0.8)
-                .cornerRadius(8)
+                .clipShape(.rect(cornerRadius: 8))
                 .padding(.vertical, 10 + attributionBarHeight)
                 .padding(10)
             }
diff --git a/Shared/Samples/Show utility associations/ShowUtilityAssociationsView.swift b/Shared/Samples/Show utility associations/ShowUtilityAssociationsView.swift
@@ -55,7 +55,7 @@ struct ShowUtilityAssociationsView: View {
             legend
                 .padding()
                 .background(.thinMaterial)
-                .cornerRadius(10)
+                .clipShape(.rect(cornerRadius: 10))
                 .shadow(radius: 3)
                 .padding()
         }
diff --git a/Shared/Samples/Show viewshed from point on map/ShowViewshedFromPointOnMapView.swift b/Shared/Samples/Show viewshed from point on map/ShowViewshedFromPointOnMapView.swift
@@ -58,7 +58,7 @@ struct ShowViewshedFromPointOnMapView: View {
                     ProgressView("Geoprocessing \n   in progress…")
                         .padding()
                         .background(.ultraThinMaterial)
-                        .cornerRadius(10)
+                        .clipShape(.rect(cornerRadius: 10))
                         .shadow(radius: 50)
                 }
             }
diff --git a/Shared/Samples/Style point with distance composite scene symbol/StylePointWithDistanceCompositeSceneSymbolView.swift b/Shared/Samples/Style point with distance composite scene symbol/StylePointWithDistanceCompositeSceneSymbolView.swift
@@ -47,7 +47,7 @@ struct StylePointWithDistanceCompositeSceneSymbolView: View {
                     }
                     .padding()
                     .background(.ultraThinMaterial)
-                    .cornerRadius(10)
+                    .clipShape(.rect(cornerRadius: 10))
                     .shadow(radius: 3)
                 }
                 .padding(.trailing, 8)
diff --git a/Shared/Samples/Trace utility network/TraceUtilityNetworkView.swift b/Shared/Samples/Trace utility network/TraceUtilityNetworkView.swift
@@ -43,7 +43,7 @@ struct TraceUtilityNetworkView: View {
                     }
                     .padding(6)
                     .background(.thinMaterial)
-                    .cornerRadius(10)
+                    .clipShape(.rect(cornerRadius: 10))
                 }
             }
             .overlay(alignment: .top) {
diff --git a/Shared/Samples/Validate utility network topology/ValidateUtilityNetworkTopologyView.swift b/Shared/Samples/Validate utility network topology/ValidateUtilityNetworkTopologyView.swift
@@ -103,7 +103,7 @@ struct ValidateUtilityNetworkTopologyView: View {
                 ProgressView()
                     .padding()
                     .background(.ultraThickMaterial)
-                    .cornerRadius(10)
+                    .clipShape(.rect(cornerRadius: 10))
                     .shadow(radius: 50)
             }
         }
diff --git a/Shared/Supporting Files/Views/AboutView.swift b/Shared/Supporting Files/Views/AboutView.swift
@@ -44,18 +44,24 @@ struct AboutView: View {
                     LabeledContent("Version", value: Bundle.main.shortVersion)
                     LabeledContent("SDK Version", value: arcGISVersion)
                 }
-                Section(header: Text("Powered By")) {
+                Section("Powered By") {
                     Link("ArcGIS Maps SDK for Swift Toolkit", destination: .toolkit)
                     Link("ArcGIS Maps SDK for Swift", destination: .developers)
                 }
-                Section(footer: Text("Browse and discuss in the Esri Community.")) {
+                Section {
                     Link("Esri Community", destination: .esriCommunity)
+                } footer: {
+                    Text("Browse and discuss in the Esri Community.")
                 }
-                Section(footer: Text("Log an issue in the GitHub repository.")) {
+                Section {
                     Link("GitHub Repository", destination: .githubRepository)
+                } footer: {
+                    Text("Log an issue in the GitHub repository.")
                 }
-                Section(footer: Text("View details about the API.")) {
+                Section {
                     Link("API Reference", destination: .apiReference)
+                } footer: {
+                    Text("View details about the API.")
                 }
             }
             .navigationTitle("About")

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ struct AddENCExchangeSetView: View {`
`33`	`33`	`ProgressView("Loading…")`
`34`	`34`	`.padding()`
`35`	`35`	`.background(.ultraThickMaterial)`
`36`		`- .cornerRadius(10)`
	`36`	`+ .clipShape(.rect(cornerRadius: 10))`
`37`	`37`	`.shadow(radius: 50)`
`38`	`38`	`}`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ struct AddRasterFromServiceView: View {`
`57`	`57`	`ProgressView("Drawing…")`
`58`	`58`	`.padding()`
`59`	`59`	`.background(.ultraThinMaterial)`
`60`		`- .cornerRadius(10)`
	`60`	`+ .clipShape(.rect(cornerRadius: 10))`
`61`	`61`	`.shadow(radius: 50)`
`62`	`62`	`}`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ struct AnalyzeNetworkWithSubnetworkTraceView: View {`
`132`	`132`	`}`
`133`	`133`	`.padding()`
`134`	`134`	`.background(.ultraThickMaterial)`
`135`		`- .cornerRadius(10)`
	`135`	`+ .clipShape(.rect(cornerRadius: 10))`
`136`	`136`	`.shadow(radius: 50)`
`137`	`137`	`}`
`138`	`138`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ struct Animate3DGraphicView: View {`
`44`	`44`	`.frame(width: 170, height: 100)`
`45`	`45`	`.padding([.leading, .trailing])`
`46`	`46`	`.background(.ultraThinMaterial)`
`47`		`- .cornerRadius(10)`
	`47`	`+ .clipShape(.rect(cornerRadius: 10))`
`48`	`48`	`.shadow(radius: 3)`
`49`	`49`	`}`
`50`	`50`	`.padding()`
`@@ -65,7 +65,7 @@ struct Animate3DGraphicView: View {`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`	`.frame(width: isShowingFullMap ? nil : 100, height: isShowingFullMap ? nil : 100)`
`68`		`- .cornerRadius(10)`
	`68`	`+ .clipShape(.rect(cornerRadius: 10))`
`69`	`69`	`.shadow(radius: 3)`
`70`	`70`	`Spacer()`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ struct ApplyMosaicRuleToRastersView: View {`
`44`	`44`	`ProgressView("Loading...")`
`45`	`45`	`.padding()`
`46`	`46`	`.background(.ultraThickMaterial)`
`47`		`- .cornerRadius(10)`
	`47`	`+ .clipShape(.rect(cornerRadius: 10))`
`48`	`48`	`.shadow(radius: 50)`
`49`	`49`	`}`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ struct CreateLoadReportView: View {`
`45`	`45`	`}`
`46`	`46`	`.padding()`
`47`	`47`	`.background(.ultraThickMaterial)`
`48`		`- .cornerRadius(10)`
	`48`	`+ .clipShape(.rect(cornerRadius: 10))`
`49`	`49`	`.shadow(radius: 50)`
`50`	`50`	`}`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ struct DisplayDimensionsView: View {`
`59`	`59`	`}`
`60`	`60`	`.padding(8)`
`61`	`61`	`.background(.ultraThinMaterial)`
`62`		`- .cornerRadius(10)`
	`62`	`+ .clipShape(.rect(cornerRadius: 10))`
`63`	`63`	`.disabled(dimensionLayer == nil)`
`64`	`64`	`}`
`65`	`65`	`.padding()`
Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ struct EditAndSyncFeaturesWithFeatureServiceView: View {`
`161`	`161`	`}`
`162`	`162`	`.padding()`
`163`	`163`	`.background(.ultraThickMaterial)`
`164`		`- .cornerRadius(10)`
	`164`	`+ .clipShape(.rect(cornerRadius: 10))`
`165`	`165`	`.shadow(radius: 50)`
`166`	`166`	`}`
`167`	`167`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ struct FindClosestFacilityFromPointView: View {`
`36`	`36`	`ProgressView("Routing...")`
`37`	`37`	`.padding()`
`38`	`38`	`.background(.ultraThickMaterial)`
`39`		`- .cornerRadius(10)`
	`39`	`+ .clipShape(.rect(cornerRadius: 10))`
`40`	`40`	`.shadow(radius: 50)`
`41`	`41`	`}`
`42`	`42`	`}`