diff --git a/Musgravite.xcodeproj/project.pbxproj b/Musgravite.xcodeproj/project.pbxproj
index 243a146..39ffe86 100644
--- a/Musgravite.xcodeproj/project.pbxproj
+++ b/Musgravite.xcodeproj/project.pbxproj
@@ -947,13 +947,13 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
- DEVELOPMENT_TEAM = R935X42Z66;
+ DEVELOPMENT_TEAM = R3KUK9JKD6;
INFOPLIST_FILE = Musgravite/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
- PRODUCT_BUNDLE_IDENTIFIER = com.aabotech.Musgravite;
+ PRODUCT_BUNDLE_IDENTIFIER = com.jorgeelara.Musgravite;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 4.2;
@@ -968,13 +968,13 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
- DEVELOPMENT_TEAM = R935X42Z66;
+ DEVELOPMENT_TEAM = R3KUK9JKD6;
INFOPLIST_FILE = Musgravite/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
- PRODUCT_BUNDLE_IDENTIFIER = com.aabotech.Musgravite;
+ PRODUCT_BUNDLE_IDENTIFIER = com.jorgeelara.Musgravite;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 4.2;
@@ -1029,14 +1029,14 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CODE_SIGN_STYLE = Automatic;
- DEVELOPMENT_TEAM = R935X42Z66;
+ DEVELOPMENT_TEAM = R3KUK9JKD6;
INFOPLIST_FILE = MusgraviteUITests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
- PRODUCT_BUNDLE_IDENTIFIER = com.aabotech.MusgraviteUITests;
+ PRODUCT_BUNDLE_IDENTIFIER = com.jorgeelara.MusgraviteUITests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
@@ -1049,14 +1049,14 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CODE_SIGN_STYLE = Automatic;
- DEVELOPMENT_TEAM = R935X42Z66;
+ DEVELOPMENT_TEAM = R3KUK9JKD6;
INFOPLIST_FILE = MusgraviteUITests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
- PRODUCT_BUNDLE_IDENTIFIER = com.aabotech.MusgraviteUITests;
+ PRODUCT_BUNDLE_IDENTIFIER = com.jorgeelara.MusgraviteUITests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
@@ -1070,10 +1070,10 @@
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
- DEVELOPMENT_TEAM = R935X42Z66;
+ DEVELOPMENT_TEAM = R3KUK9JKD6;
IBSC_MODULE = WMusgravite_Extension;
INFOPLIST_FILE = WMusgravite/Info.plist;
- PRODUCT_BUNDLE_IDENTIFIER = com.aabotech.Musgravite.watchkitapp;
+ PRODUCT_BUNDLE_IDENTIFIER = com.jorgeelara.Musgravite.watchkitapp;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = watchos;
SKIP_INSTALL = YES;
@@ -1089,10 +1089,10 @@
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
- DEVELOPMENT_TEAM = R935X42Z66;
+ DEVELOPMENT_TEAM = R3KUK9JKD6;
IBSC_MODULE = WMusgravite_Extension;
INFOPLIST_FILE = WMusgravite/Info.plist;
- PRODUCT_BUNDLE_IDENTIFIER = com.aabotech.Musgravite.watchkitapp;
+ PRODUCT_BUNDLE_IDENTIFIER = com.jorgeelara.Musgravite.watchkitapp;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = watchos;
SKIP_INSTALL = YES;
@@ -1108,14 +1108,14 @@
ASSETCATALOG_COMPILER_COMPLICATION_NAME = Complication;
CODE_SIGN_ENTITLEMENTS = "WMusgravite Extension/WMusgravite Extension.entitlements";
CODE_SIGN_STYLE = Automatic;
- DEVELOPMENT_TEAM = R935X42Z66;
+ DEVELOPMENT_TEAM = R3KUK9JKD6;
INFOPLIST_FILE = "WMusgravite Extension/Info.plist";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
- PRODUCT_BUNDLE_IDENTIFIER = com.aabotech.Musgravite.watchkitapp.watchkitextension;
+ PRODUCT_BUNDLE_IDENTIFIER = com.jorgeelara.Musgravite.watchkitapp.watchkitextension;
PRODUCT_NAME = "${TARGET_NAME}";
SDKROOT = watchos;
SKIP_INSTALL = YES;
@@ -1131,14 +1131,14 @@
ASSETCATALOG_COMPILER_COMPLICATION_NAME = Complication;
CODE_SIGN_ENTITLEMENTS = "WMusgravite Extension/WMusgravite Extension.entitlements";
CODE_SIGN_STYLE = Automatic;
- DEVELOPMENT_TEAM = R935X42Z66;
+ DEVELOPMENT_TEAM = R3KUK9JKD6;
INFOPLIST_FILE = "WMusgravite Extension/Info.plist";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
- PRODUCT_BUNDLE_IDENTIFIER = com.aabotech.Musgravite.watchkitapp.watchkitextension;
+ PRODUCT_BUNDLE_IDENTIFIER = com.jorgeelara.Musgravite.watchkitapp.watchkitextension;
PRODUCT_NAME = "${TARGET_NAME}";
SDKROOT = watchos;
SKIP_INSTALL = YES;
diff --git a/Musgravite.xcodeproj/xcuserdata/joespla.xcuserdatad/xcschemes/xcschememanagement.plist b/Musgravite.xcodeproj/xcuserdata/joespla.xcuserdatad/xcschemes/xcschememanagement.plist
new file mode 100644
index 0000000..9d57bd2
--- /dev/null
+++ b/Musgravite.xcodeproj/xcuserdata/joespla.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -0,0 +1,29 @@
+
+
+
+
+ SchemeUserState
+
+ Musgravite.xcscheme_^#shared#^_
+
+ orderHint
+ 0
+
+ WMusgravite (Complication).xcscheme_^#shared#^_
+
+ orderHint
+ 3
+
+ WMusgravite (Notification).xcscheme_^#shared#^_
+
+ orderHint
+ 2
+
+ WMusgravite.xcscheme_^#shared#^_
+
+ orderHint
+ 1
+
+
+
+
diff --git a/Musgravite.xcworkspace/xcuserdata/joespla.xcuserdatad/UserInterfaceState.xcuserstate b/Musgravite.xcworkspace/xcuserdata/joespla.xcuserdatad/UserInterfaceState.xcuserstate
new file mode 100644
index 0000000..dd52b4e
Binary files /dev/null and b/Musgravite.xcworkspace/xcuserdata/joespla.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/Musgravite/Controller/Support Files/NetworkSupport.swift b/Musgravite/Controller/Support Files/NetworkSupport.swift
index 6c3a0bc..853fca1 100644
--- a/Musgravite/Controller/Support Files/NetworkSupport.swift
+++ b/Musgravite/Controller/Support Files/NetworkSupport.swift
@@ -12,8 +12,8 @@ import CoreData
class NetworkSupport {
/* Data download links */
- let masterLabURL = "https://s3.amazonaws.com/purple-cdtc/laboratorios-rech.json"
- let masterFloorURL = "https://s3.amazonaws.com/purple-cdtc/pisos.json"
+ let masterLabURL = "http://martinmolina.com.mx/201813/novus2018/Musgravite/laboratorios-rech.json"
+ let masterFloorURL = "http://martinmolina.com.mx/201813/novus2018/Musgravite/pisos.json"
func getLabURL() -> URL {
return URL(string: masterLabURL)!
diff --git a/Musgravite/Info.plist b/Musgravite/Info.plist
index 2c887b9..f5a672f 100644
--- a/Musgravite/Info.plist
+++ b/Musgravite/Info.plist
@@ -2,12 +2,6 @@
- NSLocationUsageDescription
- $(PRODUCT_NAME) desea saber tu localización
- NSLocationWhenInUseUsageDescription
- $(PRODUCT_NAME) desea saber tu localización
- NSLocationAlwaysUsageDescription
- $(PRODUCT_NAME) desea saber tu localización
CFBundleDevelopmentRegion
$(DEVELOPMENT_LANGUAGE)
CFBundleExecutable
@@ -37,6 +31,12 @@
$(PRODUCT_NAME) desea usar tu cámara para mostrar mundos virtuales.
NSLocationAlwaysAndWhenInUseUsageDescription
$(PRODUCT_NAME) desea saber tu localización incluso cuando la aplicacion no este en uso.
+ NSLocationAlwaysUsageDescription
+ $(PRODUCT_NAME) desea saber tu localización
+ NSLocationUsageDescription
+ $(PRODUCT_NAME) desea saber tu localización
+ NSLocationWhenInUseUsageDescription
+ $(PRODUCT_NAME) desea saber tu localización
NSPhotoLibraryAddUsageDescription
$(PRODUCT_NAME) desea acceder a tu carrete para escoger una imagen
UILaunchStoryboardName
diff --git a/Musgravite/View/Base.lproj/Main.storyboard b/Musgravite/View/Base.lproj/Main.storyboard
index c980d1f..79450dd 100644
--- a/Musgravite/View/Base.lproj/Main.storyboard
+++ b/Musgravite/View/Base.lproj/Main.storyboard
@@ -178,27 +178,29 @@
-
+
-
-
-
+
-
+
+
+
@@ -256,9 +260,8 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -326,16 +353,14 @@
-
diff --git a/WMusgravite/Info.plist b/WMusgravite/Info.plist
index 34c1417..872654d 100644
--- a/WMusgravite/Info.plist
+++ b/WMusgravite/Info.plist
@@ -26,7 +26,7 @@
UIInterfaceOrientationPortraitUpsideDown
WKCompanionAppBundleIdentifier
- com.aabotech.Musgravite
+ com.jorgeelara.Musgravite
WKWatchKitApp