Skip to content

Commit

Permalink
Constraints and URL
Browse files Browse the repository at this point in the history
  • Loading branch information
joespla committed Nov 26, 2018
1 parent 52b6274 commit 710fd55
Show file tree
Hide file tree
Showing 10 changed files with 189 additions and 53 deletions.
32 changes: 16 additions & 16 deletions Musgravite.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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";
Expand All @@ -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";
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>Musgravite.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
</dict>
<key>WMusgravite (Complication).xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>3</integer>
</dict>
<key>WMusgravite (Notification).xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>2</integer>
</dict>
<key>WMusgravite.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>1</integer>
</dict>
</dict>
</dict>
</plist>
Binary file not shown.
4 changes: 2 additions & 2 deletions Musgravite/Controller/Support Files/NetworkSupport.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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)!
Expand Down
12 changes: 6 additions & 6 deletions Musgravite/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>NSLocationUsageDescription</key>
<string>$(PRODUCT_NAME) desea saber tu localización</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>$(PRODUCT_NAME) desea saber tu localización</string>
<key>NSLocationAlwaysUsageDescription</key>
<string>$(PRODUCT_NAME) desea saber tu localización</string>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleExecutable</key>
Expand Down Expand Up @@ -37,6 +31,12 @@
<string>$(PRODUCT_NAME) desea usar tu cámara para mostrar mundos virtuales.</string>
<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
<string>$(PRODUCT_NAME) desea saber tu localización incluso cuando la aplicacion no este en uso.</string>
<key>NSLocationAlwaysUsageDescription</key>
<string>$(PRODUCT_NAME) desea saber tu localización</string>
<key>NSLocationUsageDescription</key>
<string>$(PRODUCT_NAME) desea saber tu localización</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>$(PRODUCT_NAME) desea saber tu localización</string>
<key>NSPhotoLibraryAddUsageDescription</key>
<string>$(PRODUCT_NAME) desea acceder a tu carrete para escoger una imagen</string>
<key>UILaunchStoryboardName</key>
Expand Down
Loading

0 comments on commit 710fd55

Please sign in to comment.