Public interfaces, small fixes

Author: hrabkin

Sources/Extensions/Extensions.swift

@@ -163,3 +163,63 @@ public extension [String: String] {
         }
     }
 }
+
+extension UIImage {
+    
+    func resized(toMaxSize maxSize: CGFloat = 1000.0) -> UIImage? {
+        guard let image = self.normalizedImage() else { return nil }
+        
+        let width = image.size.width
+        let height = image.size.height
+        let aspectRatio = width / height
+        
+        var newWidth: CGFloat
+        var newHeight: CGFloat
+        
+        if width <= height {
+            // Portrait or square
+            newHeight = min(height, maxSize)
+            newWidth = newHeight * aspectRatio
+            if newWidth > maxSize {
+                newWidth = maxSize
+                newHeight = newWidth / aspectRatio
+            }
+        } else {
+            // Landscape
+            newWidth = min(width, maxSize)
+            newHeight = newWidth / aspectRatio
+            if newHeight > maxSize {
+                newHeight = maxSize
+                newWidth = newHeight * aspectRatio
+            }
+        }
+        
+        let newSize = CGSize(width: newWidth, height: newHeight)
+        UIGraphicsBeginImageContextWithOptions(newSize, false, image.scale)
+        defer { UIGraphicsEndImageContext() }
+        
+        image.draw(in: CGRect(origin: .zero, size: newSize))
+        return UIGraphicsGetImageFromCurrentImageContext()
+    }
+    
+    /// `Re-orientate` the image to `up`.
+    func normalizedImage() -> UIImage?
+    {
+        if self.imageOrientation == .up
+        {
+            return self
+        }
+        else
+        {
+            UIGraphicsBeginImageContextWithOptions(self.size, false, self.scale)
+            defer
+            {
+                UIGraphicsEndImageContext()
+            }
+
+            self.draw(in: CGRect(origin: .zero, size: self.size))
+
+            return UIGraphicsGetImageFromCurrentImageContext()
+        }
+    }
+}

Sources/Model/OFF/Product.swift

@@ -61,7 +61,7 @@ public struct Product: Codable, Equatable, Sendable {
     public let novaGroup: Double?
     public let nutriScore: String?
 
-    enum CodingKeys: String, CodingKey {
+    public enum CodingKeys: String, CodingKey {
         case code
         case lang
         case brands
@@ -85,6 +85,29 @@ public struct Product: Codable, Equatable, Sendable {
         case keywords = "_keywords"
     }
 
+    public init(code: String, productName: String? = nil, productNameEn: String? = nil, brands: String? = nil, lang: OpenFoodFactsLanguage = .ENGLISH, quantity: String? = nil, packagingQuantity: Double = 100, packagingQuantityUnit: String = "g", servingSize: String? = nil, servingQuantity: Double = 100, servingQuantityUnit: String = "g", dataPer: String? = nil, categories: String? = nil, nutriments: [String: Any]? = nil, imageFront: String? = nil, imageIngredients: String? = nil, imageNutrition: String? = nil, keywords: [String]? = nil, novaGroup: Double? = nil, nutriScore: String? = nil) {
+        self.code = code
+        self.productName = productName
+        self.productNameEn = productNameEn
+        self.brands = brands
+        self.lang = lang
+        self.quantity = quantity
+        self.packagingQuantity = packagingQuantity
+        self.packagingQuantityUnit = packagingQuantityUnit
+        self.servingSize = servingSize
+        self.servingQuantity = servingQuantity
+        self.servingQuantityUnit = servingQuantityUnit
+        self.dataPer = dataPer
+        self.categories = categories
+        self.nutriments = nutriments
+        self.imageFront = imageFront
+        self.imageIngredients = imageIngredients
+        self.imageNutrition = imageNutrition
+        self.keywords = keywords
+        self.novaGroup = novaGroup
+        self.nutriScore = nutriScore
+    }
+    
     public init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
         code = try container.decode(String.self, forKey: .code)

Sources/Model/OFF/SendImage.swift

@@ -28,13 +28,13 @@ public enum ImageField: String, CaseIterable, Decodable {
 
 public struct SendImage {
 
-    var barcode: String
-    var image: UIImage
-    var imageField: ImageField
+    public var barcode: String
+    public var image: UIImage
+    public var imageField: ImageField
 
-    var imageUri: String?
+    public var imageUri: String?
 
-    init(barcode: String, imageField: ImageField = .front, image: UIImage, imageUri: String? = nil) {
+    public init(barcode: String, imageField: ImageField = .front, image: UIImage, imageUri: String? = nil) {
         self.barcode = barcode
         self.image = image
         self.imageField = imageField

Sources/Networking/HttpHelper.swift

@@ -72,8 +72,7 @@ final class HttpHelper {
             data.append("\(value)\r\n")
         }
 
-        // Files
-        if let fileData = sendImage.image.pngData() {
+        if let fileData = sendImage.image.resized()?.jpegData(compressionQuality: 0.8) {
             data.append("--\(boundary)\r\n")
             data.append("Content-Disposition: form-data; name=\"\(sendImage.getImageDataKey())\"; filename=\"\(fileData.hashValue)\"\r\n")
             data.append("Content-Type: application/octet-stream\r\n\r\n")
@@ -90,6 +89,7 @@ final class HttpHelper {
             let (data, _) = try await URLSession.shared.data(for: request)
             return data
         } catch {
+            print("\(#function) \(uri) error: \(error)")
             throw error
         }
     }
@@ -140,6 +140,7 @@ final class HttpHelper {
             return data
         } catch {
             // Re-throw the error to be caught by the caller
+            print("\(#function) \(uri) error: \(error)")
             throw error
         }
     }

Sources/Networking/UriHelper.swift

@@ -25,7 +25,7 @@ final class UriHelper {
 
         var components = URLComponents()
         components.scheme = OFFApi.scheme
-        components.host = OFFConfig.shared.api.host(for: .world)
+        components.host = OFFConfig.shared.api.host(for: .none)
         components.path = path
         components.queryItems = allQueryParams?.map { URLQueryItem(name: $0.key, value: $0.value) }
 

Sources/OFFApi.swift

@@ -41,6 +41,7 @@ public struct OFFApi {
         case images
         case events
         case taxonomies
+        case none
     }
 
     func host(for endpoint: Endpoint) -> String {
@@ -64,8 +65,12 @@ public struct OFFApi {
             subdomain = "static"
         case .events:
             subdomain = "events"
+        case .none:
+            subdomain = ""
         }
 
+        if subdomain.isEmpty { return domain }
+        
         return "\(subdomain).\(domain)"
     }
 }

Sources/ProductPage.swift

@@ -121,7 +121,6 @@ public struct ProductPage: View {
             }))
         })
         .onAppear(perform: {
-            UIApplication.shared.addTapGestureRecognizer()
             Task(priority: .userInitiated) {
                 await pageConfig.fetchData(barcode: barcode)
             }

Sources/ViewModels/ProductPageConfig.swift

@@ -172,25 +172,21 @@ final class ProductPageConfig: ObservableObject {
         }
     }
 
+    @MainActor
     func uploadAllProductData(barcode: String) async {
 
-        await MainActor.run {
-            self.pageState = .loading
-        }
+        self.pageState = .loading
 
         await sendAllImages(barcode: barcode)
         do {
             let productBody = try await composeProductBody(barcode: barcode)
             try await OpenFoodAPIClient.shared.saveProduct(product: productBody)
             let productResponse = try await OpenFoodAPIClient.shared.getProduct(config: ProductQueryConfiguration(barcode: barcode))
-            await MainActor.run {
-                self.pageState = .completed
-            }
+            
+            self.pageState = .completed
             try await Task.sleep(nanoseconds: 1_000_000_000 * UInt64(PageOverlay.completedAnimDuration))
-            await MainActor.run {
-                self.pageState = ProductPageState.productDetails
-                self.submittedProduct = productResponse.product
-            }
+            self.pageState = ProductPageState.productDetails
+            self.submittedProduct = productResponse.product
         } catch {
             await MainActor.run {
                 self.pageState = .error