Merge branch 'trunk' into andrewdmontgomery/cleanup-swiftlint-removal

.buildkite/commands/upload-to-appcenter.sh

@@ -1,14 +1,11 @@
 #!/bin/bash -eu
 
-NAME=$1
-NAME_LOWERCASED="$(echo "$NAME" | tr '[:upper:]' '[:lower:]')"
-
 echo "--- :arrow_down: Downloading Prototype Build"
-buildkite-agent artifact download ".build/artifacts/*.ipa" . --step "build_$NAME_LOWERCASED"
-buildkite-agent artifact download ".build/artifacts/*.app.dSYM.zip" . --step "build_$NAME_LOWERCASED"
+buildkite-agent artifact download ".build/artifacts/*.ipa" . --step "build_demo"
+buildkite-agent artifact download ".build/artifacts/*.app.dSYM.zip" . --step "build_demo"
 
 echo "--- :rubygems: Setting up Gems"
 install_gems
 
 echo "--- :hammer_and_wrench: Uploading"
-bundle exec fastlane ios upload_demo_to_appcenter name:"$NAME" build_number:"$BUILDKITE_BUILD_NUMBER"
+bundle exec fastlane ios upload_demo_to_appcenter build_number:"$BUILDKITE_BUILD_NUMBER"

.buildkite/pipeline.yml

@@ -66,36 +66,19 @@ steps:
   ###################
   - group: ":appcenter: Prototype Builds"
     steps:
-      - label: "🛠️ Build SwiftUI Demo"
-        key: build_swiftui
+      - label: "🛠️ Build Demo"
+        key: build_demo
         depends_on: test
         plugins: [$CI_TOOLKIT]
         command: |
           install_gems
-          BUILD_NUMBER=$BUILDKITE_BUILD_NUMBER make build-demo-for-distribution-swiftui
+          BUILD_NUMBER=$BUILDKITE_BUILD_NUMBER make build-demo-for-distribution
         artifact_paths:
           - ".build/artifacts/*.ipa"
           - ".build/artifacts/*.dSYM.zip"
 
-      - label: "⬆️ Upload SwiftUI Demo to App Center"
-        depends_on: build_swiftui
+      - label: "⬆️ Upload Demo to App Center"
+        depends_on: build_demo
         plugins: [$CI_TOOLKIT]
-        command: .buildkite/commands/upload-to-appcenter.sh SwiftUI
-        if: build.pull_request.id != null
-
-      - label: "🛠️ Build UIKit Demo"
-        key: build_uikit
-        depends_on: test
-        plugins: [$CI_TOOLKIT]
-        command: |
-          install_gems
-          BUILD_NUMBER=$BUILDKITE_BUILD_NUMBER make build-demo-for-distribution-uikit
-        artifact_paths:
-          - ".build/artifacts/*.ipa"
-          - ".build/artifacts/*.dSYM.zip"
-
-      - label: "⬆️ Upload UIKit Demo to App Center"
-        depends_on: build_uikit
-        plugins: [$CI_TOOLKIT]
-        command: .buildkite/commands/upload-to-appcenter.sh UIKit
+        command: .buildkite/commands/upload-to-appcenter.sh
         if: build.pull_request.id != null

Demo/Demo/Gravatar-UIKit-Demo/Gravatar-UIKit-Demo.Release.xcconfig → Demo/Demo/Gravatar-Demo/Gravatar-Demo.Release.xcconfig

@@ -1,4 +1,4 @@
-#include "Gravatar-UIKit-Demo.Base.xcconfig"
+#include "Gravatar-Demo.Base.xcconfig"
 #include "../Enterprise.xcconfig"
 
 // Declared explicitly rather than by building on top of what's defined in Base so it can be read by other tools such as Fastlane

Demo/Demo/Gravatar-UIKit-Demo/MainTableViewController.swift → Demo/Demo/Gravatar-Demo/MainTableViewController.swift

@@ -1,16 +1,12 @@
-//
-//  MainTableViewController.swift
-//  Gravatar-Demo
-//
-//  Created by Pinar Olguc on 24.01.2024.
-//
 
 import Foundation
 import UIKit
+import SwiftUI
 
 class MainTableViewController: UITableViewController {
 
     enum Row: Int, CaseIterable {
+        case swiftUI
         case imageDownloadNetworking
         case uiImageViewExtension
         case fetchProfile
@@ -40,8 +36,12 @@ class MainTableViewController: UITableViewController {
         guard let row = Row(rawValue: indexPath.row) else { return UITableViewCell() }
         let cell = tableView.dequeueReusableCell(withIdentifier: Self.reuseID, for: indexPath)
         var content = cell.defaultContentConfiguration()
+        cell.accessoryType = .disclosureIndicator
 
         switch row {
+        case .swiftUI:
+            content.text = "SwiftUI Demos"
+            cell.accessoryType = .none
         case .imageDownloadNetworking:
             content.text = "Image download - Networking"
         case .uiImageViewExtension:
@@ -73,6 +73,12 @@ class MainTableViewController: UITableViewController {
         guard let row = Row(rawValue: indexPath.row) else { return }
 
         switch row {
+        case .swiftUI:
+            let swiftUIContentViewController = UIHostingController(rootView: ContentView(onDismiss: { [weak self] in
+                self?.dismiss(animated: true)
+            }))
+            swiftUIContentViewController.modalPresentationStyle = .fullScreen
+            present(swiftUIContentViewController, animated: true)
         case .imageDownloadNetworking:
             let vc = DemoAvatarDownloadViewController()
             navigationController?.pushViewController(vc, animated: true)

Demo/Demo/Gravatar-SwiftUI-Demo/ContentView.swift → Demo/Demo/Gravatar-Demo/SwiftUI/ContentView.swift

@@ -2,6 +2,8 @@ import SwiftUI
 import GravatarUI
 
 struct ContentView: View {
+    let onDismiss: (() -> Void)?
+
     enum Page: String, CaseIterable, Identifiable {
         case avatarView = "Avatar view"
         case avatarPickerView = "Avatar picker view"
@@ -27,6 +29,15 @@ struct ContentView: View {
             }
             .navigationTitle("Gravatar SwiftUI Demo")
             .navigationBarTitleDisplayMode(.inline)
+            .toolbar {
+                if let onDismiss {
+                    ToolbarItem(placement: .topBarLeading) {
+                        Button("Dismiss") {
+                            onDismiss()
+                        }
+                    }
+                }
+            }
         }
     }
 
@@ -44,5 +55,5 @@ struct ContentView: View {
 }
 
 #Preview {
-    ContentView()
+    ContentView(onDismiss: nil)
 }