Merge pull request #1 from charlymr/master

Some fixed & a Locale extension I like

Author: ddaddy

DJSwiftHelpers.xcodeproj/project.pbxproj

@@ -91,6 +91,10 @@
 		62DF50AD256E9AA800C88FF7 /* URLSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6206C950256D6FF8003F3A67 /* URLSession.swift */; };
 		62DF50B1256E9AAA00C88FF7 /* UserDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = 620F6A4D250BBCE900B10032 /* UserDefaults.swift */; };
 		62DF50B5256E9AAD00C88FF7 /* Decodable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62D6CDE8255BFCCB00ABD216 /* Decodable.swift */; };
+		62EC880526F8DACE00211A6A /* Locale.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62EC880426F8DACE00211A6A /* Locale.swift */; };
+		62EC880626F8DACE00211A6A /* Locale.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62EC880426F8DACE00211A6A /* Locale.swift */; };
+		62EC880726F8DACE00211A6A /* Locale.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62EC880426F8DACE00211A6A /* Locale.swift */; };
+		62EC880826F8DACE00211A6A /* Locale.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62EC880426F8DACE00211A6A /* Locale.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -127,6 +131,7 @@
 		62D6CDF4255C01F400ABD216 /* UILabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UILabel.swift; sourceTree = "<group>"; };
 		62DEDA482636D40A00771544 /* FileManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileManager.swift; sourceTree = "<group>"; };
 		62DF505D256E99DB00C88FF7 /* DJSwiftHelpers.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = DJSwiftHelpers.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		62EC880426F8DACE00211A6A /* Locale.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Locale.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -201,9 +206,11 @@
 				62754BA525E691E200F2F489 /* Codable.swift */,
 				6220B4C225ADDDC40064B9EB /* Collection.swift */,
 				62D6CDEB255BFDA900ABD216 /* Date.swift */,
+				62D6CDE8255BFCCB00ABD216 /* Decodable.swift */,
 				625380812594CE9B00C58B2F /* Double.swift */,
 				627631A6255D512F005C09B1 /* DJSwiftHelpers.swift */,
 				62DEDA482636D40A00771544 /* FileManager.swift */,
+				62EC880426F8DACE00211A6A /* Locale.swift */,
 				620F6A34250BB78200B10032 /* String.swift */,
 				620F6A36250BB78200B10032 /* UIColor.swift */,
 				620F6A47250BBC2F00B10032 /* UIDevice.swift */,
@@ -217,7 +224,6 @@
 				62D6CDEE255BFFA300ABD216 /* URLResponse.swift */,
 				6206C950256D6FF8003F3A67 /* URLSession.swift */,
 				620F6A4D250BBCE900B10032 /* UserDefaults.swift */,
-				62D6CDE8255BFCCB00ABD216 /* Decodable.swift */,
 			);
 			name = Common;
 			path = Sources/Common;
@@ -437,6 +443,7 @@
 				6206C951256D6FF8003F3A67 /* URLSession.swift in Sources */,
 				620F6A37250BB78200B10032 /* Array.swift in Sources */,
 				620F6A38250BB78200B10032 /* UIStackView.swift in Sources */,
+				62EC880526F8DACE00211A6A /* Locale.swift in Sources */,
 				620F6A4E250BBCE900B10032 /* UserDefaults.swift in Sources */,
 				62C4485225A2208F0014F44B /* UIFont.swift in Sources */,
 				620F6A3B250BB78200B10032 /* UIColor.swift in Sources */,
@@ -485,6 +492,7 @@
 				621136ED255D5CAC003F8FBF /* DJSwiftHelpers.swift in Sources */,
 				621B3C2E255D467000A5E77F /* UIViewController.swift in Sources */,
 				621B3C2F255D467000A5E77F /* UIImage.swift in Sources */,
+				62EC880626F8DACE00211A6A /* Locale.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -499,6 +507,7 @@
 				6266549F25F2767000696303 /* DJSwiftHelpers.swift in Sources */,
 				6266549725F2767000696303 /* URLSession.swift in Sources */,
 				6266549E25F2767000696303 /* URLResponse.swift in Sources */,
+				62EC880826F8DACE00211A6A /* Locale.swift in Sources */,
 				6266549B25F2767000696303 /* Collection.swift in Sources */,
 				6266549125F2767000696303 /* Codable.swift in Sources */,
 				626654A025F2767000696303 /* UserDefaults.swift in Sources */,
@@ -525,6 +534,7 @@
 				62DF5078256E9A8900C88FF7 /* Array.swift in Sources */,
 				62DF5081256E9A9000C88FF7 /* String.swift in Sources */,
 				62018FE925DEB40F002B71A5 /* AsyncOperation.swift in Sources */,
+				62EC880726F8DACE00211A6A /* Locale.swift in Sources */,
 				62DF50A5256E9AA500C88FF7 /* URLRequest.swift in Sources */,
 				62DF50B5256E9AAD00C88FF7 /* Decodable.swift in Sources */,
 				62C4485425A2208F0014F44B /* UIFont.swift in Sources */,

README.md

@@ -149,6 +149,14 @@ Parse a `json` file into the specified object type
 readJSONFromFile<T: Decodable>(fileURL: URL, type: T.Type) -> T?
 ```
 
+### Locale
+
+Return the emoji flag for the given Locale
+
+```swift
+var emojiFlag: String
+```
+
 ### String
 Truncate a string by removing all characters at the `position`
 

Sources/Common/Locale.swift

@@ -0,0 +1,26 @@
+//
+//  Locale.swift
+//  DJSwiftHelpers
+//
+//  Created by Denis Martin-Bruillot on 17/09/2021.
+//  Copyright © 2021 Darren Jones. All rights reserved.
+
+import Foundation
+
+public
+extension Locale {
+    
+    /**
+     Return the emoji flag for the given Locale
+     */
+    var emojiFlag: String {
+        let base : UInt32 = 127397
+        var s = ""
+        let country = regionCode?.uppercased() ?? languageCode ?? "US"
+        for v in country.unicodeScalars {
+            s.unicodeScalars.append(UnicodeScalar(base + v.value)!)
+        }
+        return String(s)
+    }
+    
+}

Sources/Non_Extension/UIApplication.swift

@@ -16,7 +16,7 @@ extension UIApplication {
     /**
      Returns the top most ViewController regardless if embeded in a navigation stack or not
      */
-    class func getTopViewController(base: UIViewController? = UIApplication.shared.keyWindow?.rootViewController) -> UIViewController? {
+    class func getTopViewController(base: UIViewController? = UIWindow.key?.rootViewController) -> UIViewController? {
 
         if let nav = base as? UINavigationController {
             return getTopViewController(base: nav.visibleViewController)
@@ -51,15 +51,15 @@ extension UIApplication {
     class func dismisstoRoot(animated:Bool, completion:(() -> Void)? = nil) {
 
         // On iOS 12, calling dismiss when there is nothing to dismiss does not call the completion block, so we have to see if we are already at base level
-        guard self.shared.keyWindow?.rootViewController?.presentedViewController != nil else {
+        guard UIWindow.key?.rootViewController?.presentedViewController != nil else {
 
             // rootViewController is on top, so nothing to dismiss
             completion?()
             return
         }
 
         // We have views on top of the rootViewController
-        self.shared.keyWindow?.rootViewController?.dismiss(animated: animated, completion: completion)
+        UIWindow.key?.rootViewController?.dismiss(animated: animated, completion: completion)
     }
 }
 #endif // !IS_EXTENSION

Sources/Non_Extension/UIWindow.swift

@@ -18,7 +18,13 @@ extension UIWindow {
      */
     static var key: UIWindow? {
         if #available(iOS 13, *) {
-            return UIApplication.shared.windows.first { $0.isKeyWindow }
+            return UIApplication.shared.windows.first { $0.isKeyWindow } ??
+            UIApplication.shared.connectedScenes
+                   .filter({$0.activationState == .foregroundActive})
+                   .map({$0 as? UIWindowScene})
+                   .compactMap({$0})
+                   .first?.windows
+                   .filter({ $0.isKeyWindow }).first
         } else {
             return UIApplication.shared.keyWindow
         }