Merge branch 'main' into removingFastlane

Author: glm4

CODEOWNERS

@@ -1,4 +1,4 @@
 # These owners will be the default owners for everything in
 # the repo. Unless a later match takes precedence
 
- * @pMalvasio @glm4 @CamilaMoscatelli @mato2593 @germanStabile @kstoletniy @fpiruzi @LetoFranco @LeandroHiga @FLTravieso @danialepaco @agerace @camipera-rootstrap
+ * @pMalvasio @glm4 @CamilaMoscatelli @mato2593 @germanStabile @kstoletniy @fpiruzi @LetoFranco @LeandroHiga @danialepaco @fconelli @fnicola1 @DaegoDev @JUNIOR140889 @SofiaCantero24

Podfile

@@ -1,11 +1,11 @@
-platform :ios, '11.4'
+platform :ios, '14.0'
 use_frameworks!
 inhibit_all_warnings!
 
 target 'ios-base' do
   pod 'Alamofire', '~> 5.2.0'
   pod 'IQKeyboardManagerSwift', '~> 6.1.1'
-  pod 'RSFontSizes', '~> 1.0.2'
+  pod 'RSFontSizes', '~> 1.2.0'
   pod 'R.swift', '~> 5.0.3'
   pod 'SwiftLint', '~> 0.43.1'
   pod 'Firebase/CoreOnly', '~> 8.6.0'
@@ -25,6 +25,6 @@ target 'ios-base' do
 
   target 'ios-baseUITests' do
     inherit! :complete
-    pod 'Swifter', '~> 1.4.7'
+    pod 'Swifter', '~> 1.5.0'
   end
 end

Podfile.lock

@@ -104,9 +104,9 @@ PODS:
   - R.swift (5.0.3):
     - R.swift.Library (~> 5.0.0)
   - R.swift.Library (5.0.1)
-  - RSFontSizes (1.0.2):
+  - RSFontSizes (1.2.0):
     - Device (~> 3.1.2)
-  - Swifter (1.4.7)
+  - Swifter (1.5.0)
   - SwiftLint (0.43.1)
 
 DEPENDENCIES:
@@ -118,8 +118,8 @@ DEPENDENCIES:
   - Firebase/Crashlytics (~> 8.6.0)
   - IQKeyboardManagerSwift (~> 6.1.1)
   - R.swift (~> 5.0.3)
-  - RSFontSizes (~> 1.0.2)
-  - Swifter (~> 1.4.7)
+  - RSFontSizes (~> 1.2.0)
+  - Swifter (~> 1.5.0)
   - SwiftLint (~> 0.43.1)
 
 SPEC REPOS:
@@ -165,10 +165,10 @@ SPEC CHECKSUMS:
   PromisesObjC: 68159ce6952d93e17b2dfe273b8c40907db5ba58
   R.swift: f5a87643b91ea569d23d6afb3eee9c743edde239
   R.swift.Library: cfe85d569d9bae6cb262922db130e7c3a7a5fad1
-  RSFontSizes: cf14ae41c2807b66573f7064528ccff8c98251c9
-  Swifter: 2327ef5d872c638aebab79646ce494af508b0c8f
+  RSFontSizes: 78158061f9f6121c6715f746395b1d8390fcb18b
+  Swifter: e71dd674404923d7f03ebb03f3f222d1c570bc8e
   SwiftLint: 99f82d07b837b942dd563c668de129a03fc3fb52
 
-PODFILE CHECKSUM: 9bf8204f31e4c13e914fa6af761a3874db46b336
+PODFILE CHECKSUM: ad8b2fa0cef07782327d22c0570f1659eddad970
 
-COCOAPODS: 1.10.2
+COCOAPODS: 1.11.2

ios-base.xcodeproj/project.pbxproj

@@ -47,16 +47,18 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     _ application: UIApplication, open url: URL,
     sourceApplication: String?, annotation: Any
   ) -> Bool {
-    return ApplicationDelegate.shared.application(application, open: url,
-                                                  sourceApplication: sourceApplication,
-                                                  annotation: annotation)
+    ApplicationDelegate.shared.application(
+      application, open: url,
+      sourceApplication: sourceApplication,
+      annotation: annotation
+    )
   }
 
   func unexpectedLogout() {
     UserDataManager.deleteUser()
     SessionManager.deleteSession()
-    //Clear any local data if needed
-    //Take user to onboarding if needed, do NOT redirect the user
+    // Clear any local data if needed
+    // Take user to onboarding if needed, do NOT redirect the user
     // if is already in the landing to avoid losing the current VC stack state.
     if window?.rootViewController is HomeViewController {
       AppNavigator.shared.navigate(to: OnboardingRoutes.firstScreen, with: .changeRoot)

ios-base/AppDelegate.swift

@@ -9,7 +9,7 @@
 import Foundation
 import UIKit
 
-protocol NetworkStatusDelegate: class {
+protocol NetworkStatusDelegate: AnyObject {
   func networkStatusChanged(to networkStatus: NetworkState)
 }
 

ios-base/Base.lproj/Main.storyboard

@@ -37,12 +37,12 @@ struct Session: Codable {
     guard let stringHeaders = loweredHeaders as? [String: String] else {
       return nil
     }
-    if let expiryString = stringHeaders[APIClient.HTTPHeader.expiry.rawValue],
+    if let expiryString = stringHeaders[HTTPHeader.expiry.rawValue],
       let expiryNumber = Double(expiryString) {
       expiry = Date(timeIntervalSince1970: expiryNumber)
     }
-    uid = stringHeaders[APIClient.HTTPHeader.uid.rawValue]
-    client = stringHeaders[APIClient.HTTPHeader.client.rawValue]
-    accessToken = stringHeaders[APIClient.HTTPHeader.token.rawValue]
+    uid = stringHeaders[HTTPHeader.uid.rawValue]
+    client = stringHeaders[HTTPHeader.client.rawValue]
+    accessToken = stringHeaders[HTTPHeader.token.rawValue]
   }
 }

ios-base/Common/Models/AuthViewModelStateDelegate.swift

@@ -20,19 +20,4 @@ struct User: Codable {
     case email
     case image = "profile_picture"
   }
-    
-  init?(dictionary: [String: Any]) {
-    guard
-      let id = dictionary[CodingKeys.id.rawValue] as? Int,
-      let username = dictionary[CodingKeys.username.rawValue] as? String,
-      let email = dictionary[CodingKeys.email.rawValue] as? String
-    else {
-      return nil
-    }
-      
-    self.id = id
-    self.username = username
-    self.email = email
-    self.image = URL(string: dictionary[CodingKeys.image.rawValue] as? String ?? "")
-  }
 }

ios-base/Common/Models/Session.swift

@@ -8,7 +8,7 @@
 
 import UIKit
 
-protocol ActivityIndicatorPresenter: class {
+protocol ActivityIndicatorPresenter: AnyObject {
   var activityIndicator: UIActivityIndicatorView { get }
   func showActivityIndicator(_ show: Bool)
 }