[#30] - Remove Kingfisher

Coding-Couch · Sep 14, 2021 · e0f63b7 · e0f63b7
1 parent 1e99478
commit e0f63b7
Show file tree

Hide file tree

Showing 6 changed files with 136 additions and 228 deletions.
diff --git a/Shared/View/History/HistoryRowView.swift b/Shared/View/History/HistoryRowView.swift
@@ -35,14 +35,10 @@ struct HistoryRowView: View {
 
     @ViewBuilder private var memeRow: some View {
         HStack {
-            AsyncImage(url: meme.url) {
-                Image(Asset.Images.memeNotFound.name)
-                    .resizable()
-                    .aspectRatio(contentMode: .fill)
-            }
-            .aspectRatio(contentMode: .fill)
-            .frame(maxWidth: 60, maxHeight: 60)
-            .clipShape(RoundedRectangle(cornerRadius: .smallRadius))
+            MemeImage(url: meme.url)
+                .aspectRatio(contentMode: .fill)
+                .frame(maxWidth: 60, maxHeight: 60)
+                .clipShape(RoundedRectangle(cornerRadius: .smallRadius))
 
             VStack(alignment: .leading, spacing: .margin) {
 

diff --git a/Shared/View/History/MemeDetails.swift b/Shared/View/History/MemeDetails.swift
@@ -42,43 +42,39 @@ struct MemeDetails: View {
                 .edgesIgnoringSafeArea(.all)
 
             VStack(spacing: .margin) {
-                AsyncImage(url: meme.url) {
-                    Image("meme-not-found")
-                        .resizable()
-                        .aspectRatio(contentMode: .fit)
-                }
-                .aspectRatio(contentMode: .fit)
-                .cornerRadius(.cornerRadius)
-                .shadow(radius: .smallRadius)
-                .contextMenu(
-                    menuItems: {
-                        #if os(iOS) || os(watchOS) || os(tvOS)
-                        Button {
-                            showShareSheet = true
-                        } label: {
-                            Label("Share", systemImage: "square.and.arrow.up")
-                        }
-
-                        Button {
-                            let pasteboard = UIPasteboard.general
-                            pasteboard.url = meme.url
-                        } label: {
-                            Image(systemName: "doc.on.doc")
-                            Text("Copy")
-                        }
-                        #elseif os(macOS)
-                        ShareMenu(sharedItems: [meme.url], showText: true)
-                        #endif
-
-                        Button {
-                            openMemeInBrowser()
-                        } label: {
-                            Image(systemName: "safari")
-                            Text("Open in Browser")
+                MemeImage(url: meme.url)
+                    .scaledToFit()
+                    .cornerRadius(.cornerRadius)
+                    .shadow(radius: .smallRadius)
+                    .contextMenu(
+                        menuItems: {
+                            #if os(iOS) || os(watchOS) || os(tvOS)
+                            Button {
+                                showShareSheet = true
+                            } label: {
+                                Label("Share", systemImage: "square.and.arrow.up")
+                            }
+
+                            Button {
+                                let pasteboard = UIPasteboard.general
+                                pasteboard.url = meme.url
+                            } label: {
+                                Image(systemName: "doc.on.doc")
+                                Text("Copy")
+                            }
+                            #elseif os(macOS)
+                            ShareMenu(sharedItems: [meme.url], showText: true)
+                            #endif
+
+                            Button {
+                                openMemeInBrowser()
+                            } label: {
+                                Image(systemName: "safari")
+                                Text("Open in Browser")
+                            }
                         }
-                    }
-                )
-                .contentShape(RoundedRectangle(cornerRadius: .smallRadius))
+                    )
+                    .contentShape(RoundedRectangle(cornerRadius: .smallRadius))
 
                 detailsView
                     .background(Color.systemBackground)

diff --git a/Shared/View/Home/MemeCardView.swift b/Shared/View/Home/MemeCardView.swift
@@ -28,51 +28,47 @@ struct MemeCardView: View {
         .frame(width: 0, height: 0)
         .hidden()
 
-        AsyncImage(url: meme.url) {
-            Image(Asset.Images.memeNotFound.name)
-                .resizable()
-                .aspectRatio(contentMode: .fit)
-        }
-        .aspectRatio(contentMode: .fit)
-        .cornerRadius(.cornerRadius)
-        .padding(.margin)
-        .frame(
-            maxWidth: geometrySize.width,
-            maxHeight: geometrySize.height/2
-        )
-        .foregroundColor(.secondarySystemBackground)
-        .animation(.interactiveSpring())
-        .offset(x: self.translation.width, y: self.translation.height)
-        .rotationEffect(
-            .degrees(Double(self.translation.width / geometrySize.width) * 25),
-            anchor: .bottom
-        )
-        .gesture(
-            DragGesture()
-                .onChanged { value in
-                    self.translation = value.translation
-                    self.swipingAction = value.translation.swipeDirection.asMemeAction
-                }
-                .onEnded { value in
-                    /// remove overlay
-                    self.swipingAction = nil
+        MemeImage(url: meme.url)
+            .aspectRatio(contentMode: .fit)
+            .cornerRadius(.cornerRadius)
+            .padding(.margin)
+            .frame(
+                maxWidth: geometrySize.width,
+                maxHeight: geometrySize.height/2
+            )
+            .foregroundColor(.secondarySystemBackground)
+            .animation(.interactiveSpring(), value: translation)
+            .offset(x: self.translation.width, y: self.translation.height)
+            .rotationEffect(
+                .degrees(Double(self.translation.width / geometrySize.width) * 25),
+                anchor: .bottom
+            )
+            .gesture(
+                DragGesture()
+                    .onChanged { value in
+                        self.translation = value.translation
+                        self.swipingAction = value.translation.swipeDirection.asMemeAction
+                    }
+                    .onEnded { value in
+                        /// remove overlay
+                        self.swipingAction = nil
 
-                    /// complete swipe
-                    switch value.translation.swipeDirection {
-                    case .up:
-                        self.swipe(.skip)
-                    case .down:
-                        self.translation = .zero
-                    case .left:
-                        self.swipe(.dislike)
-                    case .right:
-                        self.swipe(.like)
+                        /// complete swipe
+                        switch value.translation.swipeDirection {
+                        case .up:
+                            self.swipe(.skip)
+                        case .down:
+                            self.translation = .zero
+                        case .left:
+                            self.swipe(.dislike)
+                        case .right:
+                            self.swipe(.like)
+                        }
                     }
-                }
-        )
-        .onTapGesture {
-            showMeme = true
-        }
+            )
+            .onTapGesture {
+                showMeme = true
+            }
     }
 }
 

diff --git a/Shared/View/Image/AsyncImage.swift b/Shared/View/Image/AsyncImage.swift
diff --git a/Shared/View/Image/MemeImage.swift b/Shared/View/Image/MemeImage.swift
@@ -0,0 +1,42 @@
+//
+//  MemeImage.swift
+//  MemeImage
+//
+//  Created by Brent Mifsud on 2021-09-14.
+//
+
+import SwiftUI
+import os
+
+struct MemeImage: View {
+    var url: URL?
+
+    var body: some View {
+        AsyncImage(
+            url: url,
+            scale: 1.0,
+            transaction: Transaction(animation: .easeOut(duration: 0.2))
+        ) { phase in
+            switch phase {
+            case .empty:
+                Color.tertiarySystemBackground
+                    .overlay(ProgressView().progressViewStyle(.circular))
+            case let .success(image):
+                image.resizable().transition(.opacity)
+            case .failure:
+                Image("meme-not-found")
+                    .resizable()
+                    .transition(.opacity)
+            @unknown default:
+                Image("meme-not-found")
+                    .resizable()
+            }
+        }
+    }
+}
+
+struct MemeImage_Previews: PreviewProvider {
+    static var previews: some View {
+        MemeImage()
+    }
+}