Merge pull request #24 from VishwaiOSDev/feat/vishwa/download-progress-bar

feat: async progress bar

Author: VishwaiOSDev

Loadify.xcodeproj/project.pbxproj

@@ -3,4 +3,84 @@
    uuid = "3060FD4B-BC5F-4B01-9BBA-9EF176B0168D"
    type = "1"
    version = "2.0">
+   <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "C4EBE5E0-9EBF-4910-9F55-AA444CED162B"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Loadify/Services/API/DetailsFetcher.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "21"
+            endingLineNumber = "21"
+            landmarkName = "loadDetails(for:to:)"
+            landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "C4EBE5E0-9EBF-4910-9F55-AA444CED162B - 5f19f898d5295893"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "(1) suspend resume partial function for Loadify.DetailsFetcher.loadDetails&lt;&#x3c4;_0_0 where &#x3c4;_0_0: Swift.Decodable&gt;(for: Swift.String, to: Loadify.PlatformType) async throws -&gt; &#x3c4;_0_0"
+                  moduleName = "Loadify"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/vishweshwaran/Developer/iOS/SwiftUI/Loadify-iOS/Loadify/Services/API/DetailsFetcher.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "21"
+                  endingLineNumber = "21"
+                  offsetFromSymbolStart = "264">
+               </Location>
+               <Location
+                  uuid = "C4EBE5E0-9EBF-4910-9F55-AA444CED162B - cebad7a4497636b4"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "(2) await resume partial function for Loadify.DetailsFetcher.loadDetails&lt;&#x3c4;_0_0 where &#x3c4;_0_0: Swift.Decodable&gt;(for: Swift.String, to: Loadify.PlatformType) async throws -&gt; &#x3c4;_0_0"
+                  moduleName = "Loadify"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/vishweshwaran/Developer/iOS/SwiftUI/Loadify-iOS/Loadify/Services/API/DetailsFetcher.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "21"
+                  endingLineNumber = "21"
+                  offsetFromSymbolStart = "40">
+               </Location>
+               <Location
+                  uuid = "C4EBE5E0-9EBF-4910-9F55-AA444CED162B - bf9608eb03561c95"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "(3) suspend resume partial function for Loadify.DetailsFetcher.loadDetails&lt;&#x3c4;_0_0 where &#x3c4;_0_0: Swift.Decodable&gt;(for: Swift.String, to: Loadify.PlatformType) async throws -&gt; &#x3c4;_0_0"
+                  moduleName = "Loadify"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/vishweshwaran/Developer/iOS/SwiftUI/Loadify-iOS/Loadify/Services/API/DetailsFetcher.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "21"
+                  endingLineNumber = "21"
+                  offsetFromSymbolStart = "84">
+               </Location>
+               <Location
+                  uuid = "C4EBE5E0-9EBF-4910-9F55-AA444CED162B - 8fce7123ea697e94"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "(4) suspend resume partial function for Loadify.DetailsFetcher.loadDetails&lt;&#x3c4;_0_0 where &#x3c4;_0_0: Swift.Decodable&gt;(for: Swift.String, to: Loadify.PlatformType) async throws -&gt; &#x3c4;_0_0"
+                  moduleName = "Loadify"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/vishweshwaran/Developer/iOS/SwiftUI/Loadify-iOS/Loadify/Services/API/DetailsFetcher.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "21"
+                  endingLineNumber = "21"
+                  offsetFromSymbolStart = "68">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
+   </Breakpoints>
 </Bucket>

Loadify.xcodeproj/xcuserdata/vishweshwaran.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -13,7 +13,8 @@ enum DownloadError: Error, LocalizedError {
 
     var errorDescription: String? {
         switch self {
-        case .notCompatible: return "This video is not compatible to save"
+        case .notCompatible: 
+            return "This video is not compatible to save"
         }
     }
 }
@@ -25,8 +26,10 @@ enum PhotosError: Error, LocalizedError {
 
     var errorDescription: String? {
         switch self {
-        case .permissionDenied: return "Please grant permission to photos"
-        case .insufficientStorage: return  "There is no enough storage to save this video"
+        case .permissionDenied: 
+            return "Please grant permission to photos"
+        case .insufficientStorage:
+            return  "There is no enough storage to save this video"
         }
     }
 }

Loadify/App/Enums/Errors.swift

@@ -16,10 +16,14 @@ enum VideoQuality: String, CaseIterable {
 
     var description: String {
         switch self {
-        case .none: return "Select Video Quality"
-        case .low: return "Low - 320p"
-        case .medium: return "Medium - 720p"
-        case .high: return "High - 1080p"
+        case .none: 
+            return "Select Video Quality"
+        case .low: 
+            return "Low - 320p"
+        case .medium: 
+            return "Medium - 720p"
+        case .high: 
+            return "High - 1080p"
         }
     }
 

Loadify/App/Enums/VideoQuality.swift

@@ -9,32 +9,40 @@ import Foundation
 
 extension URLSession: URLSessionProtocol {
 
-    func fetchData(for request: URLRequest) async throws -> (Data, HTTPURLResponse) {
+    func fetch(for request: URLRequest) async throws -> (Data, HTTPURLResponse) {
         let (data, response) = try await data(for: request)
 
-        guard let httpResponse = response as? HTTPURLResponse else {
-            throw NetworkError.invalidResponse(message: nil)
-        }
-        
-        try handleStateBasedOnStatusCode(for: httpResponse.statusCode)
+        let httpResponse = try response.handleStatusCodeAndReturnHTTPResponse()
 
         return (data, httpResponse)
     }
 
-    func downloadData(for request: URLRequest) async throws -> (URL, HTTPURLResponse) {
-        let (data, response) = try await download(for: request)
-        
-        guard let httpResponse = response as? HTTPURLResponse else {
-            throw NetworkError.invalidResponse(message: nil)
+    func download(for request: URLRequest) {
+        let task = downloadTask(with: request)
+        task.resume()
+    }
+    
+    func finishAndInvalidate() {
+        self.finishTasksAndInvalidate()
+    }
+}
+
+extension URLResponse {
+    
+    var httpResponse: HTTPURLResponse {
+        get throws {
+            guard let httpResponse = self as? HTTPURLResponse else {
+                throw NetworkError.unknownError(message: nil)
+            }
+            
+            return httpResponse
         }
-        
-        try handleStateBasedOnStatusCode(for: httpResponse.statusCode)
-        
-        return (data, httpResponse)
     }
 
-    private func handleStateBasedOnStatusCode(for statusCode: Int) throws {
-        switch statusCode {
+    func handleStatusCodeAndReturnHTTPResponse() throws -> HTTPURLResponse {
+        let response = try httpResponse
+        
+        switch response.statusCode {
         case 200...299:
             break
         case 400:
@@ -50,5 +58,7 @@ extension URLSession: URLSessionProtocol {
         default:
             throw NetworkError.unknownError(message: "An unknown error occurred.")
         }
+        
+        return response
     }
 }

Loadify/Others/Extensions/URLSession+Extension.swift

@@ -18,7 +18,12 @@ extension View {
     }
 
     func hideKeyboard() {
-        UIApplication.shared.sendAction(#selector(UIResponder.resignFirstResponder), to: nil, from: nil, for: nil)
+        UIApplication.shared.sendAction(
+            #selector(UIResponder.resignFirstResponder),
+            to: nil,
+            from: nil,
+            for: nil
+        )
     }
 
     /// Applies the given transform if the given condition evaluates to `true`.
@@ -90,23 +95,6 @@ extension View {
         }
     }
 
-    /// This will return an Alert from LoaderKit.
-    /// This functions helps you to present `Alert` on top of the View Hierarchy
-    /// - Parameters:
-    ///   - isPresented: Bool to indicate to show Alert on the View heriracy
-    ///   - content: Closure to show `Alert` and display alert message
-    func showAlert<T: View>(isPresented: Binding<Bool>, for duration: TimeInterval = 2.5, content: () -> T) -> some View {
-        ZStack {
-            self.allowsHitTesting(!isPresented.wrappedValue)
-            if isPresented.wrappedValue {
-                content()
-                    .dismiss(delay: duration) {
-                        isPresented.wrappedValue = false
-                    }
-            }
-        }
-    }
-    
     func permissionAlert(isPresented: Binding<Bool>) -> some View {
         let title = LoadifyTexts.photosAccessTitle
         let message = LoadifyTexts.photosAccessSubtitle
@@ -129,48 +117,6 @@ extension View {
         }
     }
 
-    /// This will return a loader from LoaderKit.
-    /// This functions helps you to register loader in the rootView and can be acessible by creating and instance of the **LoaderViewAction**
-    /// - Parameters:
-    ///   - loaderAction: Lifecycle of the loaderAction
-    ///   - showOverlay: Bool property to add black background behind the loader when it is active. By default it is false
-    ///   - options: This gives some View of type LoaderView
-    @available(*, deprecated, message: "use showLoader instead.")
-    func addLoaderView(
-        for loaderAction: LoaderViewAction,
-        showOverlay: Bool = false,
-        options: LoaderOptions = LoaderOptions()
-    ) -> some View {
-        ZStack {
-            self
-            if loaderAction.isLoading {
-                LoaderView(
-                    title: loaderAction.title,
-                    subTitle: loaderAction.subTitle,
-                    showOverlay: showOverlay,
-                    options: options
-                )
-            }
-        }
-    }
-    
-    @available(*, deprecated, message: "use showAlert instead.")
-    func addAlertView(
-        for alertAction: AlertViewAction
-    ) -> some View {
-        ZStack {
-            self
-            if alertAction.isShowing {
-                AlertView(
-                    title: alertAction.title,
-                    subTitle: alertAction.subTitle,
-                    showOverlay: alertAction.showOverlay,
-                    options: alertAction.options
-                )
-            }
-        }
-    }
-    
     /// Uses VisualEffectsView to blur the background beneath the views
     func loaderBackground(colors: [Color]? = nil) -> some View {
         modifier(LoaderBackground(colors: colors))

Loadify/Others/Extensions/View+Extension.swift

@@ -31,13 +31,15 @@ struct Loadify {
 
     struct Texts {
         static let loading = "LOADING"
-        static let downloading = "DOWNLOADING"
         static let downloadedTitle = "Downloaded Successfully"
-        static let downloadedSubtitle = "Added to photos"
+
         static let loadifySubTitle = "Download YouTube Videos, Shorts, Instagram Reels, and Posts with Ease!"
+
         static let photosAccessTitle = "Photos access is required"
         static let photosAccessSubtitle = "To enable access, go to Settings > Privacy > Photos and turn on All Photos access for this app."
+
         static let tryAgain: [String] = ["Please try again later", "Oops, something went wrong", "There was an error. Please try again later"]
+
         static let noInternet = "No Internet Connection"
         static let noInternetMessage = "Make sure your device is connected to the internet"
     }

Loadify/Others/LoadifyConstants.swift

@@ -1,6 +1,6 @@
 //
 //  CustomButtonStyle.swift
-//  
+//
 //
 //  Created by Vishweshwaran on 30/10/22.
 //
@@ -9,27 +9,72 @@ import SwiftUI
 
 struct CustomButtonStyle: ButtonStyle {
 
+    var progress: Binding<Double>?
     var buttonColor: Color
     var cornerRadius: CGFloat = 10
-    var isDisabled: Bool = false
+    var isDisabled: Bool
+    var downloadFailed: Bool
 
     init(
+        progress: Binding<Double>? = nil,
         buttonColor: Color = LoadifyColors.blueAccent,
         cornerRadius: CGFloat = 10,
-        isDisabled: Bool = false
+        isDisabled: Bool = false,
+        downloadFailed: Bool
     ) {
+        self.progress = progress
         self.buttonColor = buttonColor
         self.cornerRadius = cornerRadius
         self.isDisabled = isDisabled
+        self.downloadFailed = downloadFailed
     }
 
     func makeBody(configuration: Configuration) -> some View {
-        configuration.label
-            .foregroundColor(isDisabled ? .white.opacity(0.5) : .white)
+        let label = configuration.label
+        let foregroundColor = isDisabled ? Color.white.opacity(0.5) : Color.white
+        
+        let button = label
+            .foregroundColor(foregroundColor)
             .frame(maxWidth: Loadify.maxWidth, maxHeight: 56)
+            .background(downloadFailed ? LoadifyColors.errorRed : Color.clear)
+            .background(
+                progress.map { ProgressBar(progress: $0.wrappedValue) }
+                    .foregroundStyle(LoadifyColors.successGreen)
+            )
             .background(isDisabled ? buttonColor.opacity(0.5) : buttonColor)
             .cornerRadius(cornerRadius)
             .scaleEffect(configuration.isPressed ? 0.98 : 1.0)
+            .onChange(of: progress?.wrappedValue) {
+                if $0 == 1.0 {
+                    DispatchQueue.main.asyncAfter(deadline: .now() + 2.0) {
+                        self.progress?.wrappedValue = .zero
+                    }
+                }
+            }
+        
+        return button
+    }
+}
+
+fileprivate struct ProgressBar: Shape {
+    
+    var progress: CGFloat
+    
+    var animatableData: CGFloat {
+        get { return progress }
+        set { self.progress = newValue }
+    }
+    
+    func path(in rect: CGRect) -> Path {
+        var path = Path()
+        
+        path.move(to: CGPoint(x: 0, y: 0))
+        path.addLine(to: CGPoint(x: rect.width * progress, y: 0))
+        path.addLine(to: CGPoint(x: rect.width * progress, y: rect.height))
+        path.addLine(to: CGPoint(x: 0, y: rect.height))
+        path.closeSubpath()
+        
+        return path
     }
 }
 
@@ -40,6 +85,12 @@ struct CustomButtonStyle_Previews: PreviewProvider {
             Text("Download Now")
         }
         .padding()
-        .buttonStyle(CustomButtonStyle(isDisabled: false))
+        .buttonStyle(
+            CustomButtonStyle(
+                progress: .constant(0.2),
+                isDisabled: false,
+                downloadFailed: true
+            )
+        )
     }
 }