Dark Mode support, faulty URLSheme protection, bug fixes.

EncuestaMarle/AppDelegate.swift

@@ -13,6 +13,7 @@ import UserNotifications
 import Firebase
 import ResearchKit
 
+
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterDelegate {
 
@@ -193,7 +194,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
         let registered = checkIfRegistered()
         
         if !registered {
-            let alertTitle = NSLocalizedString("Please join study first", comment: "")
+            let alertTitle = NSLocalizedString("Please join Tania first", comment: "")
             let alertMessage = NSLocalizedString("Press the 'Join Study' buttton below to register, then open this link again", comment: "")
             let alert = UIAlertController(title: alertTitle, message: alertMessage, preferredStyle: UIAlertController.Style.alert)
             alert.addAction(UIAlertAction(title: "OK", style: UIAlertAction.Style.default, handler: nil))
@@ -210,6 +211,13 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
             guard let components = NSURLComponents(url: url, resolvingAgainstBaseURL: true),
                 let params = components.queryItems else {
                     print("Invalid URL or host missing")
+                    
+                    let alertTitle = NSLocalizedString("Invalid link or resource", comment: "")
+                    let alertMessage = NSLocalizedString("Please contact your mentor for further assistance", comment: "")
+                    let alert = UIAlertController(title: alertTitle, message: alertMessage, preferredStyle: UIAlertController.Style.alert)
+                    alert.addAction(UIAlertAction(title: "OK", style: UIAlertAction.Style.default, handler: nil))
+                    self.window?.rootViewController?.present(alert, animated: true, completion: nil)
+                    
                     return false
             }
             
@@ -219,9 +227,42 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
                 
                 registerToExperience(id: id)
                 
-                return true
+                while(newResponseID == false) {}
+                newResponseID = false
+                
+                if response_id == "Error:hash" {
+                    
+                    let alertTitle = NSLocalizedString("That experience does not exist", comment: "")
+                    let alertMessage = NSLocalizedString("Please contact your mentor for further assistance", comment: "")
+                    let alert = UIAlertController(title: alertTitle, message: alertMessage, preferredStyle: UIAlertController.Style.alert)
+                    alert.addAction(UIAlertAction(title: "OK", style: UIAlertAction.Style.default, handler: nil))
+                    self.window?.rootViewController?.present(alert, animated: true, completion: nil)
+                    
+                    return false
+                }
+                
+                else if response_id == "Success" {
+                    
+                    let alertTitle = NSLocalizedString("Sucessful registration to experience", comment: "")
+                    let alertMessage = NSLocalizedString("Surveys will become available to answer", comment: "")
+                    let alert = UIAlertController(title: alertTitle, message: alertMessage, preferredStyle: UIAlertController.Style.alert)
+                    alert.addAction(UIAlertAction(title: "OK", style: UIAlertAction.Style.default, handler: nil))
+                    self.window?.rootViewController?.present(alert, animated: true, completion: nil)
+                    
+                    return true
+                }
+                
+                return false
+                
             } else {
                 print("Encuesta id missing")
+                
+                let alertTitle = NSLocalizedString("Invalid link or experience ID", comment: "")
+                let alertMessage = NSLocalizedString("Please contact your mentor for further assistance", comment: "")
+                let alert = UIAlertController(title: alertTitle, message: alertMessage, preferredStyle: UIAlertController.Style.alert)
+                alert.addAction(UIAlertAction(title: "OK", style: UIAlertAction.Style.default, handler: nil))
+                self.window?.rootViewController?.present(alert, animated: true, completion: nil)
+                
                 return false
             }
         }
@@ -256,6 +297,21 @@ extension AppDelegate: ORKPasscodeDelegate {
 }
 
 
+extension UIApplication {
+  class func topViewController(controller: UIViewController? = UIApplication.shared.keyWindow?.rootViewController) -> UIViewController? {
+    if let tabController = controller as? UITabBarController {
+      return topViewController(controller: tabController.selectedViewController)
+    }
+    if let navController = controller as? UINavigationController {
+      return topViewController(controller: navController.visibleViewController)
+    }
+    if let presented = controller?.presentedViewController {
+      return topViewController(controller: presented)
+    }
+    return controller
+  }
+}
+
 
 func registerToExperience(id: String) {
     
@@ -298,16 +354,6 @@ func registerToExperience(id: String) {
         print ("❌ JSON Failure")
     }
     
-    if response_id == "Error:id_experiencia" {
-        
-        experienceAlert()
-        
-    }
-    
-    else {
-        
     getJsonFromUrl()
-        
-    }
     
 }

EncuestaMarle/Assets.xcassets/white_black.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "colors" : [
+    {
+      "idiom" : "universal",
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "1.000",
+          "alpha" : "1.000",
+          "blue" : "1.000",
+          "green" : "1.000"
+        }
+      }
+    },
+    {
+      "idiom" : "universal",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "0x00",
+          "alpha" : "1.000",
+          "blue" : "0x00",
+          "green" : "0x00"
+        }
+      }
+    }
+  ]
+}

EncuestaMarle/Assets.xcassets/white_gray.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "colors" : [
+    {
+      "idiom" : "universal",
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "1.000",
+          "alpha" : "1.000",
+          "blue" : "1.000",
+          "green" : "1.000"
+        }
+      }
+    },
+    {
+      "idiom" : "universal",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "0x38",
+          "alpha" : "1.000",
+          "blue" : "0x3B",
+          "green" : "0x38"
+        }
+      }
+    }
+  ]
+}

EncuestaMarle/Base.lproj/Main.storyboard

@@ -4,11 +4,12 @@
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15510"/>
+        <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
-        <!--Encuesta View Controller-->
+        <!--Survey-->
         <scene sceneID="tne-QT-ifu">
             <objects>
                 <viewController id="BYZ-38-t0r" customClass="EncuestaViewController" customModule="Tania" customModuleProvider="target" sceneMemberID="viewController">
@@ -43,7 +44,7 @@
                                 </connections>
                             </button>
                         </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <color key="backgroundColor" name="white_gray"/>
                         <constraints>
                             <constraint firstItem="X5i-Gf-gnI" firstAttribute="leading" secondItem="6Tk-OE-BBY" secondAttribute="leading" constant="35" identifier="Ans2" id="FUW-5x-JJm"/>
                             <constraint firstItem="X5i-Gf-gnI" firstAttribute="top" secondItem="6Tk-OE-BBY" secondAttribute="top" constant="241" identifier="Ans3" id="Isl-Wl-ceq"/>
@@ -51,7 +52,7 @@
                         </constraints>
                         <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
                     </view>
-                    <navigationItem key="navigationItem" id="a31-hX-hUP"/>
+                    <navigationItem key="navigationItem" title="Survey" id="a31-hX-hUP"/>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
             </objects>
@@ -180,7 +181,7 @@ To log-in to a previously registered account tap Recover Account above.</string>
                                 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                             </textView>
                         </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <color key="backgroundColor" name="white_black"/>
                         <constraints>
                             <constraint firstItem="gGJ-33-J27" firstAttribute="top" secondItem="beN-qE-bp8" secondAttribute="bottom" constant="8" identifier="O3" id="4zi-tr-PYm"/>
                             <constraint firstItem="gGJ-33-J27" firstAttribute="leading" secondItem="BO1-Dh-wF9" secondAttribute="leading" constant="20" identifier="O4" id="CVA-X6-d88"/>
@@ -240,7 +241,7 @@ To log-in to a previously registered account tap Recover Account above.</string>
                     </tabBar>
                     <userDefinedRuntimeAttributes>
                         <userDefinedRuntimeAttribute type="number" keyPath="selectedIndex">
-                            <integer key="value" value="1"/>
+                            <integer key="value" value="0"/>
                         </userDefinedRuntimeAttribute>
                     </userDefinedRuntimeAttributes>
                     <connections>
@@ -256,7 +257,7 @@ To log-in to a previously registered account tap Recover Account above.</string>
         <scene sceneID="VzZ-Qy-O7s">
             <objects>
                 <navigationController automaticallyAdjustsScrollViewInsets="NO" id="6cF-m5-fPN" sceneMemberID="viewController">
-                    <tabBarItem key="tabBarItem" title="Survey" image="tab_activities" id="yyT-tP-N6f"/>
+                    <tabBarItem key="tabBarItem" title="Survey" image="pencil" catalog="system" id="yyT-tP-N6f"/>
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="Kt2-3G-lKB">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
@@ -311,13 +312,13 @@ To log-in to a previously registered account tap Recover Account above.</string>
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="49" sectionHeaderHeight="28" sectionFooterHeight="28" id="MXz-QS-IlS">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="backgroundColor" name="white_gray"/>
                         <view key="tableHeaderView" contentMode="scaleToFill" id="UPL-u9-fkL" customClass="ProfileHeaderView" customModule="Tania" customModuleProvider="target">
                             <rect key="frame" x="0.0" y="0.0" width="414" height="621"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <subviews>
-                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Currently Participating In MARLE" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.80000001192092896" translatesAutoresizingMaskIntoConstraints="NO" id="nI8-Mq-6Bk">
-                                    <rect key="frame" x="8" y="16" width="398" height="20.666666666666671"/>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Currently Participating In Tania" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.80000001192092896" translatesAutoresizingMaskIntoConstraints="NO" id="nI8-Mq-6Bk">
+                                    <rect key="frame" x="8" y="16" width="398" height="21"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                     <nil key="highlightedColor"/>
                                 </label>
@@ -329,7 +330,7 @@ To log-in to a previously registered account tap Recover Account above.</string>
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="leading" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="We0-cd-h10">
-                                    <rect key="frame" x="8" y="88.333333333333329" width="398" height="21"/>
+                                    <rect key="frame" x="8" y="88.666666666666671" width="398" height="21"/>
                                     <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="17"/>
                                     <inset key="contentEdgeInsets" minX="7" minY="0.0" maxX="0.0" maxY="0.0"/>
                                     <state key="normal" title="See your Consent Form">
@@ -340,7 +341,7 @@ To log-in to a previously registered account tap Recover Account above.</string>
                                     </connections>
                                 </button>
                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="leading" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="wordWrap" translatesAutoresizingMaskIntoConstraints="NO" id="wkQ-h0-GIO">
-                                    <rect key="frame" x="8" y="117.33333333333331" width="398" height="41"/>
+                                    <rect key="frame" x="8" y="117.66666666666669" width="398" height="41"/>
                                     <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="17"/>
                                     <inset key="contentEdgeInsets" minX="10" minY="10" maxX="10" maxY="10"/>
                                     <state key="normal" title="Leave Study">
@@ -352,7 +353,7 @@ To log-in to a previously registered account tap Recover Account above.</string>
                                     </connections>
                                 </button>
                             </subviews>
-                            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <color key="backgroundColor" name="white_gray"/>
                             <constraints>
                                 <constraint firstItem="We0-cd-h10" firstAttribute="top" secondItem="nI8-Mq-6Bk" secondAttribute="bottom" constant="51.670000000000002" identifier="S4" id="E85-iU-xtF"/>
                                 <constraint firstAttribute="trailing" secondItem="We0-cd-h10" secondAttribute="trailing" constant="8" identifier="S5" id="KP5-kT-u4x"/>
@@ -392,7 +393,7 @@ To log-in to a previously registered account tap Recover Account above.</string>
         <scene sceneID="Hxl-vA-dRR">
             <objects>
                 <navigationController automaticallyAdjustsScrollViewInsets="NO" id="IbW-FC-OA0" sceneMemberID="viewController">
-                    <tabBarItem key="tabBarItem" title="Settings" image="tab_profile" id="04I-wD-Xhf"/>
+                    <tabBarItem key="tabBarItem" title="Settings" image="gear" catalog="system" id="04I-wD-Xhf"/>
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="0S4-Xx-Xnh">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
@@ -409,7 +410,13 @@ To log-in to a previously registered account tap Recover Account above.</string>
         </scene>
     </scenes>
     <resources>
-        <image name="tab_activities" width="16" height="16"/>
-        <image name="tab_profile" width="16" height="16"/>
+        <image name="gear" catalog="system" width="64" height="58"/>
+        <image name="pencil" catalog="system" width="64" height="56"/>
+        <namedColor name="white_black">
+            <color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
+        <namedColor name="white_gray">
+            <color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
     </resources>
 </document>

EncuestaMarle/EncuestaViewController.swift

@@ -26,6 +26,15 @@ var jsonDict = [String: Any]()
 var n_jsonDict = [String: Any]()
 var response_survey = String()
 
+var newResponseID: Bool = false
+
+var response_id: String = "" {
+    didSet {
+        newResponseID = true
+    }
+}
+
+
 func getJsonFromUrl(){
     print("entre a getJsonFromUrl ⚠️")
     let request = NSMutableURLRequest(url: NSURL(string: "http://tania.uprrp.edu/getSubQ2.php?tk="+token)! as URL, cachePolicy: .reloadIgnoringLocalAndRemoteCacheData, timeoutInterval: 60)
@@ -221,7 +230,7 @@ class EncuestaViewController: UIViewController {
         //semaphore.wait()
         if response_survey == "Error:NoHay"{
             let alertTitle = NSLocalizedString("No Survey", comment: "")
-            let alertMessage = NSLocalizedString("There is no survey available right now. Please check later.", comment: "")
+            let alertMessage = NSLocalizedString("There is no survey available right now. Please register to an experience or check back later.", comment: "")
             let alert = UIAlertController(title: alertTitle, message: alertMessage, preferredStyle: UIAlertController.Style.alert)
             alert.addAction(UIAlertAction(title: "OK", style: UIAlertAction.Style.default, handler: nil))
             self.present(alert, animated: true, completion: nil)
@@ -243,6 +252,7 @@ class EncuestaViewController: UIViewController {
 
     }
     
+    
     //override func didwake
 }
 

EncuestaMarle/OnboardingViewController.swift

@@ -43,8 +43,6 @@ var jsonDict_reset = [String: Any]()
 var n_jsonDict_reset = [String: Any]()
 var response_reset = String()
 
-var response_id = String()
-
 func getConsent_task(task: ORKTaskViewController) -> ORKTaskViewController{
     return task
 }
@@ -431,6 +429,9 @@ extension OnboardingViewController : ORKTaskViewControllerDelegate {
                 else {
                     UserDefaults.standard.set(true, forKey: "registered")
                     UserDefaults.standard.synchronize()
+                    
+                    // MARK: Restore PDF here
+                    
                     performSegue(withIdentifier: "unwindToStudy", sender: nil)
                 }
             }
@@ -454,7 +455,7 @@ extension OnboardingViewController : ORKTaskViewControllerDelegate {
                         
                         do {
                             try data?.write(to:docURL! as URL)
-                            print("PDF generated ✅")
+                            print("PDF written to disk ✅")
                             print(docURL! as URL)
                             if let pdfBase64 = data?.base64EncodedString() {
                                 sendPDF(pdfBase64, signatureDate)
@@ -575,3 +576,14 @@ extension OnboardingViewController : ORKTaskViewControllerDelegate {
 //        return "id: \(id), constant: \(constant)" //you may print whatever you want here
 //    }
 //}
+
+extension ORKTaskViewController {
+    
+    override open func viewDidLoad() {
+        super.viewDidLoad()
+        if #available(iOS 13, *) {
+            overrideUserInterfaceStyle = .light
+        }
+    }
+    
+}

EncuestaMarle/ResearchContainerViewController.swift

@@ -119,6 +119,9 @@ extension ResearchContainerViewController: ORKTaskViewControllerDelegate {
                 print("❌ User is withdrawing with string: ")
                 print(jsonString_withdraw)
                 sendJson_withdraw()
+                
+                UserDefaults.standard.set(false, forKey: "registered")
+                UserDefaults.standard.synchronize()
             }
             dismiss(animated: true, completion: nil)
         }