diff --git a/Musgravite.xcworkspace/xcuserdata/Luna.xcuserdatad/UserInterfaceState.xcuserstate b/Musgravite.xcworkspace/xcuserdata/Luna.xcuserdatad/UserInterfaceState.xcuserstate
index 4a79836..8431648 100644
Binary files a/Musgravite.xcworkspace/xcuserdata/Luna.xcuserdatad/UserInterfaceState.xcuserstate and b/Musgravite.xcworkspace/xcuserdata/Luna.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/Musgravite/Assets.xcassets/men-1.imageset/Contents.json b/Musgravite/Assets.xcassets/men-1.imageset/Contents.json
new file mode 100644
index 0000000..ecfcd06
--- /dev/null
+++ 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"
+ }
+}
\ No newline at end of file
diff --git a/Musgravite/Assets.xcassets/men-1.imageset/bg-cc.png b/Musgravite/Assets.xcassets/men-1.imageset/bg-cc.png
new file mode 100644
index 0000000..80d546b
Binary files /dev/null and b/Musgravite/Assets.xcassets/men-1.imageset/bg-cc.png differ
diff --git a/Musgravite/Assets.xcassets/men-2.imageset/Contents.json b/Musgravite/Assets.xcassets/men-2.imageset/Contents.json
new file mode 100644
index 0000000..1cbe2cc
--- /dev/null
+++ 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"
+ }
+}
\ No newline at end of file
diff --git a/Musgravite/Assets.xcassets/men-2.imageset/cedetec.jpg b/Musgravite/Assets.xcassets/men-2.imageset/cedetec.jpg
new file mode 100644
index 0000000..926c45b
Binary files /dev/null and b/Musgravite/Assets.xcassets/men-2.imageset/cedetec.jpg differ
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
new file mode 100644
index 0000000..e1b328f
Binary files /dev/null and b/Musgravite/Assets.xcassets/men-3.imageset/737967_470791919634819_573986955_o.jpg differ
diff --git a/Musgravite/Assets.xcassets/men-3.imageset/Contents.json b/Musgravite/Assets.xcassets/men-3.imageset/Contents.json
new file mode 100644
index 0000000..606c992
--- /dev/null
+++ 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"
+ }
+}
\ No newline at end of file
diff --git a/Musgravite/Assets.xcassets/ph1.imageset/Contents.json b/Musgravite/Assets.xcassets/ph1.imageset/Contents.json
new file mode 100644
index 0000000..ef02dc7
--- /dev/null
+++ 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"
+ }
+}
\ No newline at end of file
diff --git a/Musgravite/Assets.xcassets/ph1.imageset/img1.jpg b/Musgravite/Assets.xcassets/ph1.imageset/img1.jpg
new file mode 100644
index 0000000..1aa9dd7
Binary files /dev/null and b/Musgravite/Assets.xcassets/ph1.imageset/img1.jpg differ
diff --git a/Musgravite/Assets.xcassets/ph2.imageset/Contents.json b/Musgravite/Assets.xcassets/ph2.imageset/Contents.json
new file mode 100644
index 0000000..1a5ee7b
--- /dev/null
+++ 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"
+ }
+}
\ No newline at end of file
diff --git a/Musgravite/Assets.xcassets/ph2.imageset/img2.jpg b/Musgravite/Assets.xcassets/ph2.imageset/img2.jpg
new file mode 100644
index 0000000..a124ed6
Binary files /dev/null and b/Musgravite/Assets.xcassets/ph2.imageset/img2.jpg differ
diff --git a/Musgravite/Assets.xcassets/ph3.imageset/Contents.json b/Musgravite/Assets.xcassets/ph3.imageset/Contents.json
new file mode 100644
index 0000000..892fa2b
--- /dev/null
+++ 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"
+ }
+}
\ No newline at end of file
diff --git a/Musgravite/Assets.xcassets/ph3.imageset/img3.jpg b/Musgravite/Assets.xcassets/ph3.imageset/img3.jpg
new file mode 100644
index 0000000..f98ddde
Binary files /dev/null and b/Musgravite/Assets.xcassets/ph3.imageset/img3.jpg differ
diff --git a/Musgravite/Assets.xcassets/ph4.imageset/Contents.json b/Musgravite/Assets.xcassets/ph4.imageset/Contents.json
new file mode 100644
index 0000000..d8f2b63
--- /dev/null
+++ 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"
+ }
+}
\ No newline at end of file
diff --git a/Musgravite/Assets.xcassets/ph4.imageset/img4.jpg b/Musgravite/Assets.xcassets/ph4.imageset/img4.jpg
new file mode 100644
index 0000000..4fef06a
Binary files /dev/null and b/Musgravite/Assets.xcassets/ph4.imageset/img4.jpg differ
diff --git a/Musgravite/Controller/ARControllers/VideoViewController.swift b/Musgravite/Controller/ARControllers/VideoViewController.swift
index 5bd814a..b6f5e09 100644
--- 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
index 3aadb87..9717a84 100644
--- 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
index d623310..b61c64d 100644
--- 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
index 5b4828a..2e941e9 100644
--- 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
index d5d08dc..c980d1f 100644
--- a/Musgravite/View/Base.lproj/Main.storyboard
+++ b/Musgravite/View/Base.lproj/Main.storyboard
@@ -178,19 +178,12 @@
-
+
-
@@ -237,7 +230,7 @@
-
+
@@ -273,6 +266,13 @@
+
@@ -292,7 +292,7 @@
-
+
@@ -301,15 +301,6 @@
-
-
-
@@ -1491,6 +1482,14 @@
+
@@ -1532,7 +1531,7 @@
-
+