Added final About and moved some assets

martin-headspace · Nov 25, 2018 · 52b6274 · 52b6274
1 parent f0518ea
commit 52b6274
Show file tree

Hide file tree

Showing 20 changed files with 184 additions and 31 deletions.
diff --git a/Musgravite.xcworkspace/xcuserdata/Luna.xcuserdatad/UserInterfaceState.xcuserstate b/Musgravite.xcworkspace/xcuserdata/Luna.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Musgravite/Assets.xcassets/men-1.imageset/Contents.json b/Musgravite/Assets.xcassets/men-1.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "bg-cc.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/Musgravite/Assets.xcassets/men-1.imageset/bg-cc.png b/Musgravite/Assets.xcassets/men-1.imageset/bg-cc.png
diff --git a/Musgravite/Assets.xcassets/men-2.imageset/Contents.json b/Musgravite/Assets.xcassets/men-2.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "cedetec.jpg",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/Musgravite/Assets.xcassets/men-2.imageset/cedetec.jpg b/Musgravite/Assets.xcassets/men-2.imageset/cedetec.jpg
diff --git a/Musgravite/Assets.xcassets/men-3.imageset/737967_470791919634819_573986955_o.jpg b/Musgravite/Assets.xcassets/men-3.imageset/737967_470791919634819_573986955_o.jpg
diff --git a/Musgravite/Assets.xcassets/men-3.imageset/Contents.json b/Musgravite/Assets.xcassets/men-3.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "737967_470791919634819_573986955_o.jpg",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/Musgravite/Assets.xcassets/ph1.imageset/Contents.json b/Musgravite/Assets.xcassets/ph1.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "img1.jpg",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/Musgravite/Assets.xcassets/ph1.imageset/img1.jpg b/Musgravite/Assets.xcassets/ph1.imageset/img1.jpg
diff --git a/Musgravite/Assets.xcassets/ph2.imageset/Contents.json b/Musgravite/Assets.xcassets/ph2.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "img2.jpg",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/Musgravite/Assets.xcassets/ph2.imageset/img2.jpg b/Musgravite/Assets.xcassets/ph2.imageset/img2.jpg
diff --git a/Musgravite/Assets.xcassets/ph3.imageset/Contents.json b/Musgravite/Assets.xcassets/ph3.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "img3.jpg",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/Musgravite/Assets.xcassets/ph3.imageset/img3.jpg b/Musgravite/Assets.xcassets/ph3.imageset/img3.jpg
diff --git a/Musgravite/Assets.xcassets/ph4.imageset/Contents.json b/Musgravite/Assets.xcassets/ph4.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "img4.jpg",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/Musgravite/Assets.xcassets/ph4.imageset/img4.jpg b/Musgravite/Assets.xcassets/ph4.imageset/img4.jpg
diff --git a/Musgravite/Controller/ARControllers/VideoViewController.swift b/Musgravite/Controller/ARControllers/VideoViewController.swift
@@ -30,7 +30,7 @@ class VideoViewController: UIViewController, ARSCNViewDelegate {
         // Set message title, body, and icon. Here, we're overriding the default warning
         // image with an emoji character.
         let iconText = ["🔍"].sm_random()!
-        view.configureContent(title: "Busca un QR", body: "Par ver un video, busca el QR del laboratorio", iconText: iconText)
+        view.configureContent(title: "Busca un QR", body: "Para ver un video, busca el QR del laboratorio", iconText: iconText)
 
         // Increase the external margin around the card. In general, the effect of this setting
         // depends on how the given layout is constrained to the layout margins.

diff --git a/Musgravite/Controller/AboutPageViewController.swift b/Musgravite/Controller/AboutPageViewController.swift
@@ -24,12 +24,12 @@ class AboutPageViewController: UIViewController, UICollectionViewDelegate, UICol
     public let selection = UISelectionFeedbackGenerator()
 
     /* Data generator */
-    let names = ["Fernando Martin Garcia Del Angel","Armando Hernandez Vargas","Jorge Espinosa Lara","Luis Daniel Medina Cazarez"]
-    let identifier = ["A01334390","A01334836","A01337002","A01651070"]
-    let githandler = ["@A01334390","@mand027","joespla","LDanielMedinaC"]
-    let portfolio = ["martntn.com","armandomando.com","jorgelara.com","luismedina.com"]
-    let personImages = ["grad15","grad16","grad15","grad16"]
-    let avatarImages = ["grad17","grad18","grad15","grad16"]
+    let names = ["José Martín Molina Espinosa","Fernando Martin Garcia Del Angel","Armando Hernandez Vargas","Jorge Espinosa Lara","Luis Daniel Medina Cazarez"]
+    let identifier = ["Proyectos de desarrollo para dispositivos móviles","A01334390","A01334836","A01337002","A01651070"]
+    let githandler = ["Ago 18 Gpo 1","@A01334390","@mand027","joespla","LDanielMedinaC"]
+    let portfolio = ["tec.mx","martntn.com","armandomando.com","jorgelara.com","luismedina.com"]
+    let personImages = ["grad16","ph1","ph2","ph3","ph4"]
+    let avatarImages = ["grad16","grad17","grad18","grad15","grad16"]
 
     override func viewDidLoad() {
         super.viewDidLoad()

diff --git a/Musgravite/Controller/CharacterCreatorViewController.swift b/Musgravite/Controller/CharacterCreatorViewController.swift
@@ -219,6 +219,13 @@ class CharacterCreatorViewController: UIViewController, UIImagePickerControllerD
         present(imagePicker,animated: true,completion: nil)
     }
 
+    @IBAction func takeBackground(_ sender: Any) {
+        notification.notificationOccurred(.warning)
+        imagePicker.allowsEditing = false
+        imagePicker.sourceType = .camera
+        present(imagePicker,animated: true,completion: nil)
+    }
+
     func imagePickerController(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [UIImagePickerController.InfoKey : Any]) {
         if let pickedImage = info[UIImagePickerController.InfoKey.originalImage] as? UIImage {
             background.contentMode = .scaleAspectFit

diff --git a/Musgravite/Model/MainMenuCards.swift b/Musgravite/Model/MainMenuCards.swift
@@ -17,7 +17,7 @@ class MainMenuCards {
     public let notification = UINotificationFeedbackGenerator()
     public let selection = UISelectionFeedbackGenerator()
     /* Data to be used in cards */
-    let images = ["img1","img2","img3"]
+    let images = ["men-1","men-2","men-3"]
     let titles = ["Crea tu propio avatar","Busca laboratorios","Acerca de la aplicacion"]
     let subtitles = ["Personaliza tu experiencia virtual","¡Crea tu siguiente inovacion ahora!","Autores detras de este proyecto"]
     let targets = ["CharacterCreatorViewController","LaboratorySearchViewController","AboutPageViewController"]

diff --git a/Musgravite/View/Base.lproj/Main.storyboard b/Musgravite/View/Base.lproj/Main.storyboard
@@ -178,19 +178,12 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="grad17" translatesAutoresizingMaskIntoConstraints="NO" id="XA6-jG-KmN">
+                            <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="grad17" translatesAutoresizingMaskIntoConstraints="NO" id="XA6-jG-KmN">
                                 <rect key="frame" x="0.0" y="0.0" width="375" height="669"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             </imageView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Fernando Martin Garcia Del Angel" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="z8N-Ya-pwj">
-                                <rect key="frame" x="16" y="567" width="343" height="26"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="22"/>
-                                <color key="textColor" red="0.95294117649999999" green="0.96078431369999995" blue="0.96078431369999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                <nil key="highlightedColor"/>
-                            </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="@A01334390" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JT0-lf-hID">
-                                <rect key="frame" x="16" y="615" width="106.66666666666669" height="21"/>
+                                <rect key="frame" x="16" y="615" width="343" height="21"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" red="0.95294117649999999" green="0.96078431369999995" blue="0.96078431369999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -204,10 +197,10 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="A01334390" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Fnu-SO-n9g">
-                                <rect key="frame" x="16" y="585" width="106.66666666666669" height="36"/>
+                                <rect key="frame" x="16" y="585" width="343" height="36"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" style="UICTFontTextStyleHeadline"/>
-                                <color key="textColor" red="0.43529411759999997" green="0.4431372549" blue="0.47450980390000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="jIm-Zk-Ozb">
@@ -237,7 +230,7 @@
                                             <rect key="frame" x="0.0" y="0.0" width="182" height="86"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="0Xn-xm-9oT">
+                                                <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="0Xn-xm-9oT">
                                                     <rect key="frame" x="0.0" y="0.0" width="182" height="86"/>
                                                 </imageView>
                                             </subviews>
@@ -273,6 +266,13 @@
                                     <segue destination="OmB-ue-mZq" kind="show" id="Tlu-ii-ucH"/>
                                 </connections>
                             </button>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Fernando Martin Garcia Del Angel" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="z8N-Ya-pwj">
+                                <rect key="frame" x="16" y="535" width="343" height="55"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" name="HelveticaNeue-Bold" family="Helvetica Neue" pointSize="22"/>
+                                <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <nil key="highlightedColor"/>
+                            </label>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
@@ -292,7 +292,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="yzm-BF-4bP" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="1382" y="355"/>
+            <point key="canvasLocation" x="1381.5999999999999" y="354.67980295566502"/>
         </scene>
         <!--View Controller-->
         <scene sceneID="UCV-lJ-h9X">
@@ -301,15 +301,6 @@
                     <view key="view" contentMode="scaleToFill" id="W5f-XB-qnl">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="egg" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CDV-Oy-Qs6">
-                                <rect key="frame" x="166" y="428" width="30" height="21"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <nil key="textColor"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                        </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <viewLayoutGuide key="safeArea" id="Ckj-4d-nbw"/>
                     </view>
@@ -1491,6 +1482,14 @@
                                                     <action selector="selectBackground:" destination="S8d-Th-MfX" eventType="touchUpInside" id="2NP-yT-p7B"/>
                                                 </connections>
                                             </button>
+                                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1c0-YS-VKP">
+                                                <rect key="frame" x="1539" y="159" width="163" height="30"/>
+                                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                <state key="normal" title="Toma una foto de fondo"/>
+                                                <connections>
+                                                    <action selector="takeBackground:" destination="S8d-Th-MfX" eventType="touchUpInside" id="1fM-oU-cTc"/>
+                                                </connections>
+                                            </button>
                                         </subviews>
                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <constraints>
@@ -1532,7 +1531,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="UsD-pE-Hd6" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="3936" y="-301"/>
+            <point key="canvasLocation" x="3936" y="-301.47783251231527"/>
         </scene>
     </scenes>
     <resources>