[ADD] iOS 13 compatible AsyncImage implementation with cache

2026-02-09 06:43:25 +01:00 · 2022-11-27 00:26:15 +01:00
parent d3e8473f45
commit 0dc7af5e51
8 changed files with 143 additions and 63 deletions
--- a/AltStore.xcodeproj/project.pbxproj
+++ b/AltStore.xcodeproj/project.pbxproj
@@ -19,6 +19,9 @@
 		191E6087290C7B50001A3B7C /* libminimuxer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 191E5FB5290A5E1F001A3B7C /* libminimuxer.a */; };
 		1920B04F2924AC8300744F60 /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 1920B04E2924AC8300744F60 /* Settings.bundle */; };
 		19B9B7452845E6DF0076EF69 /* SelectTeamViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19B9B7442845E6DF0076EF69 /* SelectTeamViewController.swift */; };
+		1F0DD810293222DF007608A4 /* AsyncImage in Frameworks */ = {isa = PBXBuildFile; productRef = 1F0DD80F293222DF007608A4 /* AsyncImage */; };
+		1F0DD81329322487007608A4 /* LazyScrollingVStack.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F0DD81229322487007608A4 /* LazyScrollingVStack.swift */; };
+		1F0DD81C2932D2FF007608A4 /* AppScreenshotsScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F0DD81B2932D2FF007608A4 /* AppScreenshotsScrollView.swift */; };
 		1F6E08DA292806E0005059C0 /* AppRowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F6E08D9292806E0005059C0 /* AppRowView.swift */; };
 		1F6E08DC292807D3005059C0 /* AppIconView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F6E08DB292807D3005059C0 /* AppIconView.swift */; };
 		1F6E08E029280B12005059C0 /* SafariView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F6E08DF29280B12005059C0 /* SafariView.swift */; };
@@ -539,6 +542,8 @@
 		191E5FD7290A6EFB001A3B7C /* minimuxer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = minimuxer.h; path = ../Dependencies/minimuxer/minimuxer.h; sourceTree = "<group>"; };
 		1920B04E2924AC8300744F60 /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Settings.bundle; sourceTree = "<group>"; };
 		19B9B7442845E6DF0076EF69 /* SelectTeamViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectTeamViewController.swift; sourceTree = "<group>"; };
+		1F0DD81229322487007608A4 /* LazyScrollingVStack.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LazyScrollingVStack.swift; sourceTree = "<group>"; };
+		1F0DD81B2932D2FF007608A4 /* AppScreenshotsScrollView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppScreenshotsScrollView.swift; sourceTree = "<group>"; };
 		1F6E08D9292806E0005059C0 /* AppRowView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppRowView.swift; sourceTree = "<group>"; };
 		1F6E08DB292807D3005059C0 /* AppIconView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppIconView.swift; sourceTree = "<group>"; };
 		1F6E08DF29280B12005059C0 /* SafariView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SafariView.swift; sourceTree = "<group>"; };
@@ -979,6 +984,7 @@
 				D533E8BE2727BBF800A9B5DD /* libcurl.a in Frameworks */,
 				4879A9622861049C00FC1BBD /* OpenSSL in Frameworks */,
 				B3C395F4284F35DD00DA9E2F /* Nuke in Frameworks */,
+				1F0DD810293222DF007608A4 /* AsyncImage in Frameworks */,
 				BF1614F1250822F100767AEA /* Roxas.framework in Frameworks */,
 				B3C395F7284F362400DA9E2F /* AppCenterAnalytics in Frameworks */,
 				BF66EE852501AE50007EE018 /* AltStoreCore.framework in Frameworks */,
@@ -1025,6 +1031,14 @@
 			path = "libimobiledevice-glue/src";
 			sourceTree = "<group>";
 		};
+		1F0DD81129322472007608A4 /* Layout */ = {
+			isa = PBXGroup;
+			children = (
+				1F0DD81229322487007608A4 /* LazyScrollingVStack.swift */,
+			);
+			path = Layout;
+			sourceTree = "<group>";
+		};
 		1F6E08DD29280AF1005059C0 /* View Extensions */ = {
 			isa = PBXGroup;
 			children = (
@@ -1090,6 +1104,7 @@
 			isa = PBXGroup;
 			children = (
 				1FB84BA52928DE08006A5CF4 /* AppDetailView.swift */,
+				1F0DD81B2932D2FF007608A4 /* AppScreenshotsScrollView.swift */,
 			);
 			path = "App Detail";
 			sourceTree = "<group>";
@@ -1130,6 +1145,7 @@
 		1FB84BA72928E073006A5CF4 /* View Components */ = {
 			isa = PBXGroup;
 			children = (
+				1F0DD81129322472007608A4 /* Layout */,
 				1F6E08D9292806E0005059C0 /* AppRowView.swift */,
 				1F6E08DB292807D3005059C0 /* AppIconView.swift */,
 				1F6E08E529280F4B005059C0 /* RatingStars.swift */,
@@ -2194,6 +2210,7 @@
 				B3C395F8284F362400DA9E2F /* AppCenterCrashes */,
 				4879A9612861049C00FC1BBD /* OpenSSL */,
 				1FB96FB729297C11007E68D1 /* GridStack */,
+				1F0DD80F293222DF007608A4 /* AsyncImage */,
 			);
 			productName = AltStore;
 			productReference = BFD2476A2284B9A500981D42 /* SideStore.app */;
@@ -2264,11 +2281,9 @@
 				B3C395FD284F3C0900DA9E2F /* XCRemoteSwiftPackageReference "STPrivilegedTask" */,
 				4879A95D2861046500FC1BBD /* XCRemoteSwiftPackageReference "AltSign" */,
 				4879A9602861049C00FC1BBD /* XCRemoteSwiftPackageReference "OpenSSL" */,
-<<<<<<< HEAD
 				99C4EF472978D52400CB538D /* XCRemoteSwiftPackageReference "SemanticVersion" */,
-=======
 				1FB96FB629297C11007E68D1 /* XCRemoteSwiftPackageReference "GridStack" */,
->>>>>>> f1b7033 ([ADD] News, Browse and Settings views ported to SwiftUI)
+				1F0DD80E293222DF007608A4 /* XCRemoteSwiftPackageReference "AsyncImage" */,
 			);
 			productRefGroup = BFD2476B2284B9A500981D42 /* Products */;
 			projectDirPath = "";
@@ -2665,6 +2680,7 @@
 				1F943C712927F90400ABE095 /* MyAppsView.swift in Sources */,
 				BF3BEFC124086A1E00DE7D55 /* RefreshAppOperation.swift in Sources */,
 				BFE60740231AFD2A002B0E8E /* InsetGroupTableViewCell.swift in Sources */,
+				1F0DD81329322487007608A4 /* LazyScrollingVStack.swift in Sources */,
 				BF0DCA662433BDF500E3A595 /* AnalyticsManager.swift in Sources */,
 				BFCCB51A245E3401001853EA /* VerifyAppOperation.swift in Sources */,
 				BFF0B6982322CAB8007A79E1 /* InstructionsViewController.swift in Sources */,
@@ -2730,6 +2746,7 @@
 				BF0C4EBD22A1BD8B009A2DD7 /* AppManager.swift in Sources */,
 				BF2901312318F7A800D88A45 /* AppBannerView.swift in Sources */,
 				BFF00D342501BDCF00746320 /* IntentHandler.swift in Sources */,
+				1F0DD81C2932D2FF007608A4 /* AppScreenshotsScrollView.swift in Sources */,
 				BFDBBD80246CB84F004ED2F3 /* RemoveAppBackupOperation.swift in Sources */,
 				1FB96FCF292BBBCA007E68D1 /* SiriShortcutSetupView.swift in Sources */,
 				BFF0B6942321CB85007A79E1 /* AuthenticationViewController.swift in Sources */,
@@ -3568,6 +3585,14 @@
 /* End XCConfigurationList section */

 /* Begin XCRemoteSwiftPackageReference section */
+		1F0DD80E293222DF007608A4 /* XCRemoteSwiftPackageReference "AsyncImage" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/zzzzeu/AsyncImage";
+			requirement = {
+				kind = upToNextMajorVersion;
+				minimumVersion = 0.0.1;
+			};
+		};
 		1FB96FB629297C11007E68D1 /* XCRemoteSwiftPackageReference "GridStack" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/pietropizzi/GridStack";
@@ -3661,6 +3686,11 @@
 			package = 4879A9602861049C00FC1BBD /* XCRemoteSwiftPackageReference "OpenSSL" */;
 			productName = OpenSSL;
 		};
+		1F0DD80F293222DF007608A4 /* AsyncImage */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 1F0DD80E293222DF007608A4 /* XCRemoteSwiftPackageReference "AsyncImage" */;
+			productName = AsyncImage;
+		};
 		1FB96FB729297C11007E68D1 /* GridStack */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 1FB96FB629297C11007E68D1 /* XCRemoteSwiftPackageReference "GridStack" */;
--- a/AltStore.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/AltStore.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -18,6 +18,15 @@
        "version" : "4.4.2"
      }
    },
+    {
+      "identity" : "asyncimage",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/zzzzeu/AsyncImage",
+      "state" : {
+        "revision" : "854d01f6bb9550f4aeee8959ab5b67d7d7775f02",
+        "version" : "0.0.1"
+      }
+    },
    {
      "identity" : "gridstack",
      "kind" : "remoteSourceControl",
--- a/Components/AppIconView.swift
+++ b/Components/AppIconView.swift
@@ -7,6 +7,7 @@
 //

 import SwiftUI
+import AsyncImage

 struct AppIconView: View {
    let iconUrl: URL?
@@ -16,7 +17,7 @@ struct AppIconView: View {
    }
    
    var body: some View {
-        if let iconUrl, #available(iOS 15.0, *) {
+        if let iconUrl {
            AsyncImage(url: iconUrl) { image in
                image
                    .resizable()
@@ -25,10 +26,6 @@ struct AppIconView: View {
            }
            .frame(width: size, height: size)
            .clipShape(RoundedRectangle(cornerRadius: cornerRadius, style: .continuous))
-        } else {
-            RoundedRectangle(cornerRadius: cornerRadius, style: .continuous)
-                .background(Color.secondary)
-                .frame(width: size, height: size)
        }
    }
 }
--- a/Detail/AppDetailView.swift
+++ b/Detail/AppDetailView.swift
@@ -8,6 +8,7 @@

 import SwiftUI
 import GridStack
+import AsyncImage
 import AltStoreCore

 struct AppDetailView: View {
@@ -39,7 +40,7 @@ struct AppDetailView: View {
    }
    
    var body: some View {
-        ObservableScrollView(scrollOffset: self.$scrollOffset) { proxy in
+        ObservableScrollView(scrollOffset: $scrollOffset) { proxy in
            LazyVStack {
                headerView
                    .frame(height: headerViewHeight)
@@ -86,29 +87,35 @@ struct AppDetailView: View {
    }
    
    var contentView: some View {
-        VStack(alignment: .leading) {
+        VStack(alignment: .leading, spacing: 24) {
            if let subtitle = storeApp.subtitle {
                Text(subtitle)
                    .multilineTextAlignment(.center)
                    .frame(maxWidth: .infinity)
-                    .padding()
+                    .padding(.horizontal)
            }
            
            if !storeApp.screenshotURLs.isEmpty {
-                screenshotsView
+                // Equatable: Only reload the view if the screenshots change.
+                // This prevents unnecessary redraws on scroll.
+                AppScreenshotsScrollView(urls: storeApp.screenshotURLs)
+                    .equatable()
            }
            
            Text(storeApp.localizedDescription)
                .lineLimit(6)
-                .padding()
+                .padding(.horizontal)
            
            currentVersionView
+                .padding(.horizontal)
            
            permissionsView
+                .padding(.horizontal)
            
            // TODO: Add review view
            // Only let users rate the app if it is currently installed!
        }
+        .padding(.vertical)
        .background(
            RoundedRectangle(cornerRadius: contentCornerRadius)
                .foregroundColor(Color(UIColor.systemBackground))
@@ -116,28 +123,6 @@ struct AppDetailView: View {
        )
    }
    
-    var screenshotsView: some View {
-        ScrollView(.horizontal, showsIndicators: false) {
-            HStack {
-                ForEach(storeApp.screenshotURLs) { url in
-                    if #available(iOS 15.0, *) {
-                        AsyncImage(url: url) { image in
-                            image.resizable()
-                        } placeholder: {
-                            Rectangle()
-                                .foregroundColor(.secondary)
-                        }
-                        .aspectRatio(9/16, contentMode: .fit)
-                        .cornerRadius(8)
-                    }
-                }
-            }
-            .padding(.horizontal)
-        }
-        .frame(height: 400)
-        .shadow(radius: 12)
-    }
-    
    var currentVersionView: some View {
        VStack(alignment: .leading, spacing: 8) {
            HStack(alignment: .bottom) {
@@ -169,7 +154,6 @@ struct AppDetailView: View {
                    .foregroundColor(.secondary)
            }
        }
-        .padding()
    }
    
    var permissionsView: some View {
@@ -199,12 +183,5 @@ struct AppDetailView: View {
            
            Spacer()
        }
-        .padding()
    }
 }
-
-//struct AppDetailView_Previews: PreviewProvider {
-//    static var previews: some View {
-//        AppDetailView()
-//    }
-//}
--- a/Detail/AppScreenshotsScrollView.swift
+++ b/Detail/AppScreenshotsScrollView.swift
@@ -0,0 +1,49 @@
+//
+//  AppScreenshotsScrollView.swift
+//  SideStore
+//
+//  Created by Fabian Thies on 27.11.22.
+//  Copyright © 2022 SideStore. All rights reserved.
+//
+
+import SwiftUI
+import AsyncImage
+
+
+/// Horizontal ScrollView with an asynchronously loaded image for each screenshot URL
+///
+/// The struct inherits the `Equatable` protocol and implements the respective comparisation function to prevent the view from being constantly re-rendered when a `@State` change in the parent view occurs.
+/// This way, the `AppScreenshotsScrollView` will only be reloaded when the parameters change.
+struct AppScreenshotsScrollView: View {
+    let urls: [URL]
+    var aspectRatio: CGFloat = 9/16
+    var height: CGFloat = 400
+    
+    var body: some View {
+        ScrollView(.horizontal, showsIndicators: false) {
+            HStack {
+                ForEach(urls) { url in
+                    AsyncImage(url: url) { image in
+                        image
+                            .resizable()
+                    } placeholder: {
+                        Rectangle()
+                            .foregroundColor(.secondary)
+                    }
+                    .aspectRatio(aspectRatio, contentMode: .fit)
+                    .cornerRadius(8)
+                }
+            }
+            .padding(.horizontal)
+        }
+        .frame(height: height)
+        .shadow(radius: 12)
+    }
+}
+
+extension AppScreenshotsScrollView: Equatable {
+    /// Prevent re-rendering of the view if the parameters didn't change
+    static func == (lhs: AppScreenshotsScrollView, rhs: AppScreenshotsScrollView) -> Bool {
+        lhs.urls == rhs.urls && lhs.aspectRatio == rhs.aspectRatio && lhs.height == rhs.height
+    }
+}
--- a/AltStore/Views/Browse/BrowseAppPreviewView.swift
+++ b/AltStore/Views/Browse/BrowseAppPreviewView.swift
@@ -7,6 +7,7 @@
 //

 import SwiftUI
+import AsyncImage
 import AltStoreCore

 struct BrowseAppPreviewView: View {
@@ -23,16 +24,15 @@ struct BrowseAppPreviewView: View {
            if !storeApp.screenshotURLs.isEmpty {
                HStack {
                    ForEach(storeApp.screenshotURLs.prefix(2)) { url in
-                        if #available(iOS 15.0, *) {
-                            AsyncImage(url: url) { image in
-                                image
-                                    .resizable()
-                                    .aspectRatio(contentMode: .fit)
-                            } placeholder: {
-                                Color(UIColor.secondarySystemBackground)
-                            }
-                            .cornerRadius(8)
+                        AsyncImage(url: url) { image in
+                            image
+                                .resizable()
+                                .aspectRatio(contentMode: .fit)
+                        } placeholder: {
+                            Color(UIColor.secondarySystemBackground)
+                                .aspectRatio(9/16, contentMode: .fit)
                        }
+                        .cornerRadius(8)
                    }
                }
                .frame(height: 300)
--- a/AltStore/Views/News/NewsItemView.swift
+++ b/AltStore/Views/News/NewsItemView.swift
@@ -7,6 +7,7 @@
 //

 import SwiftUI
+import AsyncImage
 import AltStoreCore

 struct NewsItemView: View {
@@ -53,17 +54,15 @@ struct NewsItemView: View {
            }
            .padding(24)
            
-            if let imageUrl = newsItem.imageURL, #available(iOS 15.0, *) {
-                AsyncImage(
-                    url: imageUrl,
-                    content: { image in
-                        if let image = image.image {
-                            image
-                                .resizable()
-                                .aspectRatio(contentMode: .fit)
-                        }
-                    }
-                )
+            if let imageUrl = newsItem.imageURL {
+                AsyncImage(url: imageUrl) { image in
+                    image
+                        .resizable()
+                        .aspectRatio(contentMode: .fit)
+                } placeholder: {
+                    Color.secondary
+                        .frame(maxWidth: .infinity, maxHeight: 100)
+                }
            }
        }
        .frame(
--- a/AltStore/Views/Settings/SettingsView.swift
+++ b/AltStore/Views/Settings/SettingsView.swift
@@ -7,6 +7,7 @@
 //

 import SwiftUI
+import AsyncImage
 import AltStoreCore
 import Intents

@@ -86,6 +87,9 @@ struct SettingsView: View {
                    Text("Switch to UIKit")
                }

+                SwiftUI.Button(action: resetImageCache) {
+                    Text("Reset Image Cache")
+                }
            } header: {
                Text("Debug")
            }
@@ -137,6 +141,19 @@ struct SettingsView: View {
        
        UIApplication.shared.keyWindow?.rootViewController = rootVC
    }
+    
+    func resetImageCache() {
+        do {
+            let url = try FileManager.default.url(
+                for: .cachesDirectory,
+                in: .userDomainMask,
+                appropriateFor: nil,
+                create: true)
+            try FileManager.default.removeItem(at: url.appendingPathComponent("com.zeu.cache", isDirectory: true))
+        } catch let error {
+            fatalError("\(error)")
+        }
+    }
 }

 struct SettingsView_Previews: PreviewProvider {
@@ -144,3 +161,5 @@ struct SettingsView_Previews: PreviewProvider {
        SettingsView()
    }
 }
+
+