Merge pull request #1140 from Esri/v.next

200.7 Release

Author: dfeinzimer

Diff for: .swiftlint.yml

@@ -33,9 +33,10 @@ opt_in_rules:
   - closure_end_indentation
   - closure_spacing
   - collection_alignment
+  - contains_over_filter_count
+  - contains_over_filter_is_empty
   - contains_over_first_not_nil
   - convenience_type
-  - discouraged_direct_init
   - discouraged_optional_boolean
   - empty_count
   - empty_string
@@ -47,7 +48,6 @@ opt_in_rules:
   - function_default_parameter_at_end
   - identical_operands
   - joined_default_parameter
-  - legacy_random
   - let_var_whitespace
   - literal_expression_end_indentation
   - lower_acl_than_parent
@@ -57,9 +57,9 @@ opt_in_rules:
   - multiline_function_chains
   - multiline_parameters
   - operator_usage_whitespace
-  - operator_whitespace
   - overridden_super_call
   - override_in_extension
+  - prefer_key_path
   - prohibited_super_call
   - redundant_nil_coalescing
   - redundant_type_annotation

Diff for: AuthenticationExample/AuthenticationExample.xcodeproj/project.pbxproj

@@ -353,7 +353,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 200.6.0;
+				MARKETING_VERSION = 200.7.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.esri.Authentication;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator";
@@ -390,7 +390,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 200.6.0;
+				MARKETING_VERSION = 200.7.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.esri.Authentication;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator";

Diff for: AuthenticationExample/AuthenticationExample/LoadableImageView.swift

@@ -1,4 +1,4 @@
-// Copyright 2022 Esri
+// Copyright 2024 Esri
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,32 +17,68 @@ import SwiftUI
 
 /// A view that loads a `LoadableImage` and displays it.
 /// While the image is loading a progress view is displayed.
-/// If there is an error displaying the image a red exclamation circle is displayed.
-struct LoadableImageView: View {
+/// If there is an error loading the image then user defined failure content is shown.
+/// Once the image loads, a user-defined closure is used to display the image.
+struct LoadableImageView<FailureContent: View, LoadedContent: View>: View {
     /// The loadable image to display.
     let loadableImage: LoadableImage
-    
+    /// The content to display in the case of load failure.
+    var failureContent: (() -> FailureContent)?
+    /// The content to display once the image loads.
+    var loadedContent: (Image) -> LoadedContent
     /// The result of loading the image.
-    @State private var result: Result<UIImage, Error>?
+    @State var result: Result<UIImage, Error>?
+    
+    /// Creates a `LoadableImageView`.
+    /// - Parameters:
+    ///   - loadableImage: The loadable image.
+    ///   - failureContent: The content to display if the loadable image fails to load.
+    ///   - loadedContent: The content to display once the loadable image loads.
+    init(
+        loadableImage: LoadableImage,
+        failureContent: @escaping () -> FailureContent,
+        loadedContent: @escaping (Image) -> LoadedContent
+    ) {
+        self.loadableImage = loadableImage
+        self.failureContent = failureContent
+        self.loadedContent = loadedContent
+    }
+    
+    /// Creates a `LoadableImageView`.
+    /// - Parameters:
+    ///   - loadableImage: The loadable image.
+    ///   - loadedContent: The content to display once the loadable image loads.
+    init(
+        loadableImage: LoadableImage,
+        loadedContent: @escaping (Image) -> LoadedContent
+    ) where FailureContent == EmptyView {
+        self.loadableImage = loadableImage
+        self.failureContent = nil
+        self.loadedContent = loadedContent
+    }
+    
+    /// An error to signify that the loadable image had a null image once it loaded.
+    /// This shouldn't ever happen, but in the case that it does, the failure content
+    /// will be displayed.
+    private struct NoImageError: Error {}
 
     var body: some View {
         Group {
             switch result {
             case .none:
                 ProgressView()
             case .failure:
-                Image(systemName: "exclamationmark.circle")
-                    .aspectRatio(contentMode: .fit)
-                    .foregroundColor(.red)
+                if let failureContent {
+                    failureContent()
+                }
             case .success(let image):
-                Image(uiImage: image)
-                    .resizable()
+                loadedContent(Image(uiImage: image))
             }
-        }
-        .task {
+        }.task {
             result = await Result {
                 try await loadableImage.load()
-                return loadableImage.image ?? UIImage()
+                guard let image = loadableImage.image else { throw NoImageError() }
+                return image
             }
         }
     }

Diff for: AuthenticationExample/AuthenticationExample/MapItemView.swift

@@ -34,7 +34,7 @@ struct MapItemView: View {
             case .failure(let error):
                 Text(error.localizedDescription)
                     .font(.footnote)
-                    .foregroundColor(.secondary)
+                    .foregroundStyle(.secondary)
             }
         }
         .task {

Diff for: AuthenticationExample/AuthenticationExample/SignInView.swift

@@ -48,14 +48,14 @@ struct SignInView: View {
 #else
                     .font(.footnote)
 #endif
-                    .foregroundColor(.secondary)
+                    .foregroundStyle(.secondary)
                 signInButton
             }
             Spacer()
             if let error = error, !error.isChallengeCancellationError {
                 Text(error.localizedDescription)
                     .font(.footnote)
-                    .foregroundColor(.secondary)
+                    .foregroundStyle(.secondary)
             }
         }
         .task {

Diff for: AuthenticationExample/AuthenticationExample/UserView.swift

@@ -24,13 +24,15 @@ struct UserView: View {
         VStack {
             Group {
                 if let thumbnail = user.thumbnail {
-                    LoadableImageView(loadableImage: thumbnail)
-                        .frame(width: 100, height: 100, alignment: .center)
-                        .clipShape(Circle())
+                    LoadableImageView(loadableImage: thumbnail) {
+                        placeholderImage
+                    } loadedContent: { image in
+                        image
+                            .frame(width: 100, height: 100, alignment: .center)
+                            .clipShape(Circle())
+                    }
                 } else {
-                    Image(systemName: "person.circle")
-                        .resizable()
-                        .foregroundColor(.secondary)
+                    placeholderImage
                 }
             }
             .frame(width: 100, height: 100, alignment: .center)
@@ -63,6 +65,12 @@ struct UserView: View {
             }
         }
     }
+    
+    @ViewBuilder private var placeholderImage: some View {
+        Image(systemName: "person.circle")
+            .resizable()
+            .foregroundColor(.secondary)
+    }
 }
 
 extension PortalUser.Role: @retroactive CustomStringConvertible {
@@ -92,7 +100,7 @@ struct UserAttributeView: View {
         VStack(alignment: .leading, spacing: 2) {
             Text(title)
                 .lineLimit(1)
-                .foregroundColor(.secondary)
+                .foregroundStyle(.secondary)
                 .font(.footnote)
             Text(detail)
                 .font(.caption)
@@ -113,7 +121,7 @@ struct UserAttributeListView: View {
         VStack(alignment: .leading, spacing: 2) {
             Text(title)
                 .lineLimit(1)
-                .foregroundColor(.secondary)
+                .foregroundStyle(.secondary)
                 .font(.footnote)
             Text(details.map(\.description).joined(separator: "\r"))
                 .font(.caption)

Diff for: AuthenticationExample/AuthenticationExample/WebMapsView.swift

@@ -69,8 +69,11 @@ struct PortalItemView: View {
     var body: some View {
         HStack {
             if let thumbnail = item.thumbnail {
-                LoadableImageView(loadableImage: thumbnail)
-                    .frame(width: 64, height: 44)
+                LoadableImageView(loadableImage: thumbnail) { image in
+                    image
+                        .resizable()
+                        .frame(width: 64, height: 44)
+                }
             }
             VStack(alignment: .leading, spacing: 2) {
                 Text(item.title)
@@ -80,7 +83,7 @@ struct PortalItemView: View {
                     .font(.caption)
                 Text(item.snippet)
                     .font(.caption)
-                    .foregroundColor(.secondary)
+                    .foregroundStyle(.secondary)
                     .lineLimit(2)
             }
         }