make widget transparent for iPad

Author: HHK1

Example/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - WeLoop (0.2.2)
+  - WeLoop (0.2.3)
 
 DEPENDENCIES:
   - WeLoop (from `../`)
@@ -9,8 +9,8 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  WeLoop: 4b43e35ee4ef8778becd782fccb58bae7b9d5351
+  WeLoop: 4957dcb973aea1b54a3c5796904bc1c9a27ceed3
 
 PODFILE CHECKSUM: f2bbf31f07ce3fbb7efbfdc77822603ebfe51121
 
-COCOAPODS: 1.6.1
+COCOAPODS: 1.7.1

Example/WeLoop.xcodeproj/project.pbxproj

@@ -258,15 +258,11 @@
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputFileListPaths = (
-			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-WeLoop_Example/Pods-WeLoop_Example-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/WeLoop/WeLoop.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-			);
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WeLoop.framework",
 			);
@@ -490,6 +486,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
 		};
@@ -508,6 +505,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
 		};

Example/WeLoop/Info.plist

@@ -22,6 +22,10 @@
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSCameraUsageDescription</key>
+	<string>WeLoop needs to access your camera to take pictures</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>WeLoop needs to access your library to share photos</string>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
@@ -34,12 +38,10 @@
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
 		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<true/>
-	<key>NSPhotoLibraryUsageDescription</key>
-	<string>WeLoop needs to access your library to share photos</string>
-	<key>NSCameraUsageDescription</key>
-	<string>WeLoop needs to access your camera to take pictures</string>
 </dict>
 </plist>

WeLoop/Classes/WeLoop.swift

@@ -56,9 +56,12 @@ public class WeLoop: NSObject {
 
     // MARK: Object references
 
-    /// A reference to the previous controller in the window when the widget is invoked. Used to restore
+    /// A reference to the previous window when the widget is invoked. Used to restore
     /// the app's state when the widget is dismissed
-    private var previousViewController: UIViewController?
+    private var previousWindow: UIWindow?
+    
+    /// A reference to the widget with containing the webview
+    private var weLoopViewController: WeLoopViewController?
 
     /// A reference to the controller containing the floating action button
     private var fabController: FloatingButtonController?
@@ -131,6 +134,11 @@ public class WeLoop: NSObject {
         super.init()
     }
 
+    var isShowingWidget: Bool {
+        guard let widgetVC = weLoopViewController else { return false }
+        return widgetVC.window.isKeyWindow && previousWindow == nil
+    }
+    
     func initialize(apiKey: String, autoAuthentication: Bool = true, subdomain: String? = nil) {
         self.apiKey = apiKey
         self.autoAuthentication = autoAuthentication
@@ -143,6 +151,7 @@ public class WeLoop: NSObject {
                 let project = try project()
                 self.project = project
                 self.setupInvocation(settings: project.settings)
+                try self.initializeWidget()
                 self.delegate?.initializationSuccessful?()
             } catch (let error) {
                 self.authenticationError = error
@@ -166,28 +175,14 @@ public class WeLoop: NSObject {
 
     @objc func invokeSelector() {
         do {
-            // Another instance of the widget is already present.
-            guard previousViewController == nil else { return }
-            
-            let url = try widgetURL()
-            let widgetVC = WeLoopViewController()
-            widgetVC.url = url
-            try showWidget(viewController: widgetVC)
-            
+            guard !isShowingWidget else { return }
+            try showWidget()
         } catch (let error) {
             print(error)
             delegate?.failedToLaunch?(with: error)
         }
     }
 
-    /// Close the widget, and show the previous view controller instead
-    func close() {
-        guard let viewController = previousViewController, let project = project, let window = UIApplication.shared.keyWindow else { return }
-        previousViewController = nil
-        window.rootViewController = viewController
-        setupInvocation(settings: project.settings)
-    }
-    
     private func setupInvocation(settings: Settings) {
         switch invocationMethod {
         case .shakeGesture:
@@ -212,13 +207,31 @@ public class WeLoop: NSObject {
         }
     }
 
-    private func showWidget(viewController: WeLoopViewController) throws {
+    private func initializeWidget() throws {
+        let url = try widgetURL()
+        let widgetVC = WeLoopViewController()
+        widgetVC.url = url
+        self.weLoopViewController = widgetVC
+    }
+    
+    private func showWidget() throws {
         guard let keyWindow = UIApplication.shared.keyWindow else { throw WeLoopError.windowMissing  }
 
         screenshot = keyWindow.takeScreenshot()
         disableInvocation(method: invocationMethod)
-        previousViewController = keyWindow.rootViewController
-        UIApplication.shared.keyWindow?.rootViewController = viewController
+        keyWindow.resignKey()
+        weLoopViewController?.window.becomeKey()
+        weLoopViewController?.window.isHidden = false
+        previousWindow = keyWindow
+    }
+    
+    /// Close the widget, and show the previous window instead
+    func closeWidget() {
+        guard let project = project, let window = previousWindow else { return }
+        weLoopViewController?.window.resignKey()
+        weLoopViewController?.window.isHidden = true
+        window.makeKeyAndVisible()
+        setupInvocation(settings: project.settings)
     }
 
     private func widgetURL() throws -> URL {

WeLoop/Classes/WeLoopViewController.swift

@@ -19,7 +19,8 @@ class WeLoopViewController: UIViewController {
 
     var url: URL?
     weak var webView: WKWebView!
-    
+    var window: UIWindow = UIWindow(frame: UIScreen.main.bounds)
+
     lazy var configuration: WKWebViewConfiguration = {
         let config = WKWebViewConfiguration()
         let userController = WKUserContentController()
@@ -32,14 +33,31 @@ class WeLoopViewController: UIViewController {
         return true
     }
 
+    init() {
+        super.init(nibName: nil, bundle: nil)
+        window.windowLevel = UIWindow.Level(rawValue: CGFloat.greatestFiniteMagnitude)
+        window.isHidden = true
+        window.rootViewController = self
+    }
+    
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
     override func viewDidLoad() {
         super.viewDidLoad()
+        view.backgroundColor = .clear
         configureWebview()
     }
 
     private func configureWebview() {
         let webView = FullScreenWKWebView(frame: view.bounds, configuration: self.configuration)
         view.addSubview(webView)
+    
+        webView.isOpaque = false
+        webView.backgroundColor = .clear
+        webView.scrollView.backgroundColor = .clear
+        
         webView.allowsLinkPreview = false
         webView.scrollView.delegate = self
         webView.scrollView.bounces = false
@@ -61,7 +79,7 @@ class WeLoopViewController: UIViewController {
     }
 
     @objc func back() {
-        WeLoop.shared.close()
+        WeLoop.shared.closeWidget()
     }
 
     func sendScreenshot() {