Merge pull request #131 from ProteGO-Safe/release/4.10.0

Release/4.10.0

Author: qLb

CHANGELOG.md

@@ -6,6 +6,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 4.10.0
+- Added new file storage method
+- Split current JSON data to multiple smaller data files to prevent over downloading unwanted data
+- Enhanced view of the app home screen, which now includes more detailed statistics on vaccination and infections
+- New screen with detailed statistics and graphs on vaccination (number of people vaccinated, doses, adverse reactions) and infections (number of people infected, recovered, deaths, causes of death and tests)
+- Added information on vaccination and registration rules with redirection to registration, vaccination request and helpline
+
 ## 4.9.1
 - Added Vaccination stats to dashboard
 

Podfile.lock

@@ -185,4 +185,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 779fe596c92aaa178911e4fb4980414eb2b9ab2e
 
-COCOAPODS: 1.10.0
+COCOAPODS: 1.10.1

README.md

@@ -73,6 +73,14 @@ For convenience, there's a `rebuild.sh` script which performs actions mentioned
 To launch it, type `sh rebuild.sh` in your console.
 
 ## ChangeLog
+**4.10.0**
+- Added new file storage method
+- Split current JSON data to multiple smaller data files to prevent over downloading unwanted data
+- Enhanced view of the app home screen, which now includes more detailed statistics on vaccination and infections
+- New screen with detailed statistics and graphs on vaccination (number of people vaccinated, doses, adverse reactions) and infections (number of people infected, recovered, deaths, causes of death and tests)
+- Added information on vaccination and registration rules with redirection to registration, vaccination request and helpline
+
+
 **4.9.1**
 - Added Vaccination stats to dashboard
 

project.yml

@@ -42,8 +42,8 @@ targets:
   PushMutableContent:
     settings:
       CODE_SIGN_STYLE: Manual
-      MARKETING_VERSION: "4.9.1"
-      CURRENT_PROJECT_VERSION: 745
+      MARKETING_VERSION: "4.10.0"
+      CURRENT_PROJECT_VERSION: 746
       TARGETED_DEVICE_FAMILY: 1,2
     type: app-extension
     platform: iOS
@@ -67,6 +67,8 @@ targets:
         group: safesafe/Language
       - path: safesafe/Resources/Extensions
         group: safesafe/Resources
+      - path: safesafe/Models/DashboardStatsAPIResponse.swift
+        group: safesafe/Models
   # Main app target
   #
   safesafe:
@@ -75,8 +77,8 @@ targets:
     deploymentTarget: "12.1"
     settings:
         CODE_SIGN_STYLE: Manual
-        MARKETING_VERSION: "4.9.1"
-        CURRENT_PROJECT_VERSION: 745
+        MARKETING_VERSION: "4.10.0"
+        CURRENT_PROJECT_VERSION: 746
         TARGETED_DEVICE_FAMILY: 1
         SWIFT_OBJC_BRIDGING_HEADER: $(PROJECT_DIR)/safesafe/App/safesafe-Bridging-Header.h
     configFiles:

safesafe/App/AppCoordinator.swift

@@ -142,6 +142,7 @@ final class AppCoordinator: CoordinatorType {
         dependencyContainer.jsBridge.register(freeTestService: dependencyContainer.freeTestService)
         dependencyContainer.jsBridge.register(historicalDataWorker: dependencyContainer.historicalDataWorker)
         dependencyContainer.jsBridge.register(dashboardWorker: dependencyContainer.dashboardWorker)
+        dependencyContainer.jsBridge.register(detailsWorker: dependencyContainer.detailsWorker)
     }
 
     @objc private func applicationWillEnterForeground(notification: Notification) {
@@ -158,6 +159,5 @@ final class AppCoordinator: CoordinatorType {
         } else {
             UIScreen.main.isCaptured ? HiderController.shared.show() : HiderController.shared.hide()
         }
-        
     }
 }

safesafe/Common/Extensions/Moya+PromiseKit.swift

@@ -0,0 +1,32 @@
+//
+//  Moya+PromiseKit.swift
+//  safesafe
+//
+//  Created by Namedix on 22/02/2021.
+//
+
+import Moya
+import PromiseKit
+
+extension MoyaProvider {
+    func request(
+        _ target: Target,
+        callbackQueue: DispatchQueue? = .none,
+        progress: ProgressBlock? = .none
+    ) -> Promise<Moya.Response> {
+        Promise { seal in
+            request(
+                target,
+                callbackQueue: callbackQueue,
+                progress: progress
+            ) { result in
+                switch result {
+                case .success(let response):
+                    seal.fulfill(response)
+                case .failure(let error):
+                    seal.reject(error)
+                }
+            }
+        }
+    }
+}

safesafe/Common/Extensions/Result+Void.swift

@@ -7,11 +7,24 @@
 //
 
 import Foundation
+import PromiseKit
 
-extension Result where Success == Void {
-    
-    static var success: Result {
+extension Swift.Result where Success == Void {
+    static var success: Swift.Result<Void, Failure> {
         return .success(())
     }
-    
+}
+
+
+extension Swift.Result {
+    func toPromise() -> Promise<Success> {
+        Promise { seal in
+            switch  self {
+            case .success(let success):
+                seal.fulfill(success)
+            case .failure(let error):
+                seal.reject(error)
+            }
+        }
+    }
 }