Merge branch 'master' of https://git.warp.ly/open-source/warply_sdk_framework

@@ -7,6 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		1E7086652811A93F00704CA8 /* CouponBarcodeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E7086642811A93F00704CA8 /* CouponBarcodeView.swift */; };
+		1E7086672811A96E00704CA8 /* CouponBarcodeViewInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E7086662811A96E00704CA8 /* CouponBarcodeViewInterface.swift */; };
 		1E735FF2281067320050A298 /* CampaignWebview.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E735FF1281067320050A298 /* CampaignWebview.swift */; };
 		1E735FF42810681E0050A298 /* CampaignWebviewInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E735FF32810681E0050A298 /* CampaignWebviewInterface.swift */; };
 		1EBEB02D280D69D800BF802C /* GiftsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EBEB02C280D69D800BF802C /* GiftsView.swift */; };
@@ -141,6 +143,8 @@
 
 /* Begin PBXFileReference section */
 		1353B8C484CC0649CAC2EB74 /* Pods_WarplySDKFrameworkIOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_WarplySDKFrameworkIOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		1E7086642811A93F00704CA8 /* CouponBarcodeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CouponBarcodeView.swift; sourceTree = "<group>"; };
+		1E7086662811A96E00704CA8 /* CouponBarcodeViewInterface.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CouponBarcodeViewInterface.swift; sourceTree = "<group>"; };
 		1E735FF1281067320050A298 /* CampaignWebview.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CampaignWebview.swift; sourceTree = "<group>"; };
 		1E735FF32810681E0050A298 /* CampaignWebviewInterface.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CampaignWebviewInterface.swift; sourceTree = "<group>"; };
 		1EBEB02C280D69D800BF802C /* GiftsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GiftsView.swift; sourceTree = "<group>"; };
@@ -345,6 +349,8 @@
 				E67D1EB9281055F800940F01 /* MoreForYouViewInterface.swift */,
 				E67D1EBF2810579F00940F01 /* MoreForYouView.swift */,
 				E67D1EC128113EED00940F01 /* CouponView.swift */,
+				1E7086642811A93F00704CA8 /* CouponBarcodeView.swift */,
+				1E7086662811A96E00704CA8 /* CouponBarcodeViewInterface.swift */,
 				E67D1EC328113EFD00940F01 /* CouponViewInterface.swift */,
 				E6D8DF5E27A9429E0006A3A9 /* MyApi.h */,
 				E6D8DF5C27A9429E0006A3A9 /* MyApi.m */,
@@ -746,6 +752,7 @@
 				E6D8DF2E27A942920006A3A9 /* UIRefreshControl+AFNetworking.m in Sources */,
 				E6D8DF4827A942920006A3A9 /* AFURLRequestSerialization.m in Sources */,
 				E67D1EC228113EED00940F01 /* CouponView.swift in Sources */,
+				1E7086672811A96E00704CA8 /* CouponBarcodeViewInterface.swift in Sources */,
 				E6D8DEF327A942920006A3A9 /* WLNativeVideoTableViewCell.m in Sources */,
 				E6D8DF2527A942920006A3A9 /* WLSMSActionHanlder.m in Sources */,
 				E67D1EBE2810573900940F01 /* WalletView.swift in Sources */,
@@ -790,6 +797,7 @@
 				E67D1EC828119ED300940F01 /* swiftApi.swift in Sources */,
 				E6D8DF5227A942920006A3A9 /* FMDatabase.m in Sources */,
 				E6D8DF1227A942920006A3A9 /* WLPushManager.m in Sources */,
+				1E7086652811A93F00704CA8 /* CouponBarcodeView.swift in Sources */,
 				E6D8DEF827A942920006A3A9 /* WLNativeAdTableViewCell.m in Sources */,
 				E6D8DE6D27A942010006A3A9 /* WarplySDKFrameworkIOS.docc in Sources */,
 				E6D8DF4427A942920006A3A9 /* AFURLResponseSerialization.m in Sources */,

+//
+//  CouponBarcodeViewInterface.swift
+//  WarplySDKFrameworkIOS
+//
+//  Created by Manos Chorianopoulos on 21/4/22.
+//
+
+import Foundation
+import SwiftUI
+
+@available(iOS 13.0.0, *)
+@objc public class CouponBarcodeViewInterface : NSObject {
+
+    @objc(couponBarcodeViewController::) static public func couponBarcodeViewController(parentView: UIView?, coupon: Dictionary<String, Any>) -> UIViewController {
+        return UIHostingController(rootView: CouponBarcodeView(parentView: parentView!, coupon: coupon))
+    }
+
+}
+

@@ -130,24 +130,20 @@ extension CouponView {
     }
     
     struct ImageView: View {
-        @ObservedObject var imageLoader:ImageLoaderGifts
-        @State var image:UIImage = UIImage()
+        @ObservedObject var imageLoader:UrlImageModel
         
         var uiscreen = UIScreen.main.bounds
 
         init(withURL url:String) {
-            imageLoader = ImageLoaderGifts(urlString:url)
+            imageLoader = UrlImageModel(urlString:url)
         }
 
         var body: some View {
             
-            Image(uiImage: image)
+            Image(uiImage: imageLoader.image ?? UIImage())
                 .resizable()
                 .aspectRatio(contentMode: .fill)
                 .frame(width: self.uiscreen.width, height: self.uiscreen.height * 0.25)
-                .onReceive(imageLoader.didChange) { data in
-                    self.image = UIImage(data: data) ?? UIImage()
-                }
         }
     }
     

@@ -179,24 +179,88 @@ struct RoundedCorner: Shape {
     }
 }
 
-class ImageLoaderGifts: ObservableObject {
-    var didChange = PassthroughSubject<Data, Never>()
-    var data = Data() {
-        didSet {
-            didChange.send(data)
+class UrlImageModel: ObservableObject {
+    @Published var image: UIImage?
+    var urlString: String?
+    var imageCache = ImageCache.getImageCache()
+    
+    
+    func loadImage() {
+        if loadImageFromCache() {
+            print("Cache hit")
+            return
         }
+        
+        print("Cache miss, loading from url")
+        loadImageFromUrl()
     }
-
-    init(urlString:String) {
-        guard let url = URL(string: urlString) else { return }
-        let task = URLSession.shared.dataTask(with: url) { data, response, error in
-            guard let data = data else { return }
-            DispatchQueue.main.async {
-                self.data = data
-            }
+    
+    func loadImageFromCache() -> Bool {
+        guard let urlString = urlString else {
+            return false
+        }
+        
+        guard let cacheImage = imageCache.get(forKey: urlString) else {
+            return false
         }
+        
+        image = cacheImage
+        return true
+    }
+    
+    func loadImageFromUrl() {
+        guard let urlString = urlString else {
+            return
+        }
+        
+        let url = URL(string: urlString)!
+        let task = URLSession.shared.dataTask(with: url, completionHandler: getImageFromResponse(data:response:error:))
         task.resume()
     }
+    
+    func getImageFromResponse(data: Data?, response: URLResponse?, error: Error?) {
+        guard error == nil else {
+            print("Error: \(error!)")
+            return
+        }
+        guard let data = data else {
+            print("No data found")
+            return
+        }
+        
+        DispatchQueue.main.async {
+            guard let loadedImage = UIImage(data: data) else {
+                return
+            }
+            
+            self.imageCache.set(forKey: self.urlString!, image: loadedImage)
+            self.image = loadedImage
+        }
+    }
+
+    init(urlString:String) {
+        self.urlString = urlString
+        loadImage()
+    }
+}
+
+class ImageCache {
+    var cache = NSCache<NSString, UIImage>()
+    
+    func get(forKey: String) -> UIImage? {
+        return cache.object(forKey: NSString(string: forKey))
+    }
+    
+    func set(forKey: String, image: UIImage) {
+        cache.setObject(image, forKey: NSString(string: forKey))
+    }
+}
+
+extension ImageCache {
+    private static var imageCache = ImageCache()
+    static func getImageCache() -> ImageCache {
+        return imageCache
+    }
 }
 
 
@@ -286,29 +350,25 @@ extension GiftsView {
     }
     
     struct ImageView: View {
-        @ObservedObject var imageLoader:ImageLoaderGifts
-        @State var image:UIImage = UIImage()
+        @ObservedObject var imageLoader:UrlImageModel
         @State var width:CGFloat
         @State var isFill:Bool
         
         var uiscreen = UIScreen.main.bounds
 
         init(withURL url:String , width:CGFloat, isFill:Bool) {
-            imageLoader = ImageLoaderGifts(urlString:url)
+            imageLoader = UrlImageModel(urlString:url)
             self.width = width
             self.isFill = isFill
         }
 
         var body: some View {
             
-                Image(uiImage: image)
-                    .resizable()
-                    .aspectRatio(contentMode: isFill ? .fill : .fit)
-                    .frame(width: self.width)
-                    .frame(maxHeight: .infinity)
-                    .onReceive(imageLoader.didChange) { data in
-                        self.image = UIImage(data: data) ?? UIImage()
-                    }
+            Image(uiImage: imageLoader.image ?? UIImage())
+                .resizable()
+                .aspectRatio(contentMode: isFill ? .fill : .fit)
+                .frame(width: self.width)
+                .frame(maxHeight: .infinity)
         }
     }
     

@@ -19,6 +19,7 @@
 - (void) setLang:(NSString*) lang;
 - (UIViewController *) openCoupons:(UIView*) parentView;
 - (UIViewController *) openCoupon:(UIView*) parentView coupon:(NSDictionary*) coupon;
+- (UIViewController *) openCouponBarcode:(UIView*) parentView coupon:(NSDictionary*) coupon;
 - (UIViewController *) openGifts:(UIView*) parentView;
 - (UIViewController *) openWallet:(UIView*) parentView;
 - (UIViewController *) openMoreForYou:(UIView*) parentView;

@@ -59,6 +59,12 @@ NSString *LANG;
     return couponViewController;
 }
 
+- (UIViewController *) openCouponBarcode:(UIView*) parentView coupon:(NSDictionary*) coupon {
+    
+    UIViewController *couponBarcodeViewController = [CouponBarcodeViewInterface couponBarcodeViewController:parentView :coupon];
+    return couponBarcodeViewController;
+}
+
 - (UIViewController *) openGifts:(UIView*) parentView{
     
     UIViewController *giftsViewController = [GiftsViewInterface giftsViewController:parentView];