Merge branch 'Release-1.4.0' of https://github.com/PermanentOrg/permanent-ios into main

Author: v-rusu

Permanent.xcodeproj/project.pbxproj

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "LeaveShare.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Permanent/Assets/Assets.xcassets/leaveShare.imageset/Contents.json

@@ -30,6 +30,7 @@ extension UIColor {
     static var dustyGray = UIColor(red: 96 / 255, green: 96 / 255, blue: 96 / 255, alpha: 1)
     static var mainPurple = UIColor(red: 141 / 255, green: 0 / 255, blue: 133 / 255, alpha: 1)
     static var paleYellow = UIColor(red: 254 / 255, green: 235 / 255, blue: 214 / 255, alpha: 1)
+    static var temporaryRed = UIColor(red: 255 / 255, green: 61 / 255, blue: 61 / 255, alpha: 1)
 }
 
 extension UIColor {

Permanent/Assets/Assets.xcassets/leaveShare.imageset/LeaveShare.svg

@@ -40,6 +40,9 @@ struct Text {
     static let style31 = TextStyle(UIFont(name: "OpenSans-Bold", size: 10)!, TextStyle.calculateSpacing(fontSize: CGFloat(10), lineHeight: CGFloat(12)), NSTextAlignment.center)
     static let style32 = TextStyle(UIFont(name: "OpenSans-Bold", size: 16)!, TextStyle.calculateSpacing(fontSize: CGFloat(16), lineHeight: CGFloat(22)), NSTextAlignment.natural)
     static let style33 = TextStyle(UIFont(name: "OpenSans-Bold", size: 24)!, TextStyle.calculateSpacing(fontSize: CGFloat(24), lineHeight: CGFloat(27)), NSTextAlignment.center)
+    static let style34 = TextStyle(UIFont(name: "OpenSans-Regular", size: 15)!, TextStyle.calculateSpacing(fontSize: CGFloat(15), lineHeight: CGFloat(20)), NSTextAlignment.natural)
+    static let style35 = TextStyle(UIFont(name: "OpenSans-SemiBold", size: 15)!, TextStyle.calculateSpacing(fontSize: CGFloat(15), lineHeight: CGFloat(20)), NSTextAlignment.natural)
+    static let style36 = TextStyle(UIFont(name: "OpenSans-Regular", size: 8)!, TextStyle.calculateSpacing(fontSize: CGFloat(8), lineHeight: CGFloat(12)), NSTextAlignment.center)
 }
 
 struct Constants {

Permanent/Constants/Colors.swift

@@ -39,9 +39,6 @@ struct StaticData {
     static let accessRoles = AccessRole.allCases
         .filter { $0 != .owner }
         .map { $0.groupName }
-    
-    static let archiveTypes = ArchiveType.allCases
-        .map { $0.archiveName }
 }
 
 enum DrawerSection: Int {

Permanent/Constants/Constants.swift

@@ -19,4 +19,15 @@ extension UILabel {
         self.text = text
     }
 
+    func setTextSpacingBy(value: Double) {
+        if let attributedText = attributedText {
+            let text = NSMutableAttributedString(attributedString: attributedText)
+            text.addAttribute(NSAttributedString.Key.kern, value: value, range: NSRange(location: 0, length: attributedText.length - 1))
+            self.attributedText = text
+        } else if let text = text {
+            let attributedString = NSMutableAttributedString(string: text)
+            attributedString.addAttribute(NSAttributedString.Key.kern, value: value, range: NSRange(location: 0, length: attributedString.length - 1))
+            attributedText = attributedString
+        }
+    }
 }

Permanent/Constants/TableViewData.swift

@@ -30,6 +30,7 @@ class JSONHelper {
             let decodedModel = try JSONDecoder().decode(T.self, from: data)
             return (decodedModel)
         } catch {
+            print(error)
             return nil
         }
     }

Permanent/Extensions/UILabelExtension.swift

@@ -20,7 +20,11 @@ class AuthenticationManager {
     }
 
     var currentAuthorizationFlow: OIDExternalUserAgentSession?
-    var session: PermSession?
+    var session: PermSession? {
+        didSet {
+            PermSession.currentSession = session
+        }
+    }
 
     init() {
         NotificationCenter.default.addObserver(forName: APIRequestDispatcher.sessionExpiredNotificationName, object: nil, queue: nil) { [self] notification in

Permanent/Helpers/CodableHelper.swift

@@ -38,4 +38,16 @@ class ExtensionUploadManager {
     func clearSavedFiles() {
         PreferencesManager().removeValue(forKey: Self.savedFilesKey)
     }
+    
+    func clearSavedFiles(_ files: [FileInfo]) throws {
+        var savedFiles: [FileInfo] = []
+        
+        if let nsFiles: NSArray = try PreferencesManager().getNonPlistObject(forKey: Self.savedFilesKey) {
+            savedFiles = (nsFiles as? [FileInfo]) ?? []
+        }
+        
+        savedFiles.removeAll(where: { files.contains($0) })
+        
+        try save(files: savedFiles)
+    }
 }