Skip to content

Jordan's code #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jmkiley wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Jordan's code #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7f58d59
Update README.md
jmkiley Jul 13, 2016
a056ee1
Added some locations and a camera
jmkiley Jul 14, 2016
e67ae05
Merge branch 'master' of github.com:jmkiley/RedPanda
jmkiley Jul 17, 2016
cbcf2fa
Changes to be committed:
jmkiley Jul 17, 2016
7e54381
Red panda time
jmkiley Jul 17, 2016
8d6ad1b
New
jmkiley Jul 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 94 additions & 2 deletions MapProj.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
objects = {

/* Begin PBXBuildFile section */
15BCB8B26ECD52FEB0233AFE /* Pods_MapProj.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 57A22C3A8A42092E2740ED24 /* Pods_MapProj.framework */; };
1739BB8C1D3C538200855F2B /* RegionMonitoring.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1739BB8B1D3C538200855F2B /* RegionMonitoring.swift */; };
1B6365AC1D344DF900472F64 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1B6365AB1D344DF900472F64 /* AppDelegate.swift */; };
1B6365AE1D344DF900472F64 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1B6365AD1D344DF900472F64 /* ViewController.swift */; };
1B6365B11D344DF900472F64 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 1B6365AF1D344DF900472F64 /* Main.storyboard */; };
Expand All @@ -18,6 +20,8 @@
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
0611E19F1AECEF93C6170E8C /* Pods-MapProj.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MapProj.release.xcconfig"; path = "Pods/Target Support Files/Pods-MapProj/Pods-MapProj.release.xcconfig"; sourceTree = "<group>"; };
1739BB8B1D3C538200855F2B /* RegionMonitoring.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RegionMonitoring.swift; sourceTree = "<group>"; };
1B6365A81D344DF900472F64 /* MapProj.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MapProj.app; sourceTree = BUILT_PRODUCTS_DIR; };
1B6365AB1D344DF900472F64 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
1B6365AD1D344DF900472F64 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
Expand All @@ -28,6 +32,8 @@
1B6365BD1D34531900472F64 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
1B6365BF1D345D5000472F64 /* MapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MapKit.framework; path = System/Library/Frameworks/MapKit.framework; sourceTree = SDKROOT; };
1BADFADC1D358A53001482DE /* CustomPointAnnotation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = CustomPointAnnotation.swift; path = ../CustomPointAnnotation.swift; sourceTree = "<group>"; };
57A22C3A8A42092E2740ED24 /* Pods_MapProj.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_MapProj.framework; sourceTree = BUILT_PRODUCTS_DIR; };
AA3945AF81932BE903040910 /* Pods-MapProj.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MapProj.debug.xcconfig"; path = "Pods/Target Support Files/Pods-MapProj/Pods-MapProj.debug.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -37,6 +43,7 @@
files = (
1B6365C01D345D5000472F64 /* MapKit.framework in Frameworks */,
1B6365BE1D34531900472F64 /* CoreLocation.framework in Frameworks */,
15BCB8B26ECD52FEB0233AFE /* Pods_MapProj.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -50,6 +57,8 @@
1B6365BD1D34531900472F64 /* CoreLocation.framework */,
1B6365AA1D344DF900472F64 /* MapProj */,
1B6365A91D344DF900472F64 /* Products */,
AE1EC74B787F11CF38ED837A /* Pods */,
9090FF170B165648DCCF18C6 /* Frameworks */,
);
sourceTree = "<group>";
};
Expand All @@ -68,23 +77,44 @@
1BADFADC1D358A53001482DE /* CustomPointAnnotation.swift */,
1B6365AD1D344DF900472F64 /* ViewController.swift */,
1B6365AF1D344DF900472F64 /* Main.storyboard */,
1739BB8B1D3C538200855F2B /* RegionMonitoring.swift */,
1B6365B21D344DF900472F64 /* Assets.xcassets */,
1B6365B41D344DF900472F64 /* LaunchScreen.storyboard */,
1B6365B71D344DF900472F64 /* Info.plist */,
);
path = MapProj;
sourceTree = "<group>";
};
9090FF170B165648DCCF18C6 /* Frameworks */ = {
isa = PBXGroup;
children = (
57A22C3A8A42092E2740ED24 /* Pods_MapProj.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
AE1EC74B787F11CF38ED837A /* Pods */ = {
isa = PBXGroup;
children = (
AA3945AF81932BE903040910 /* Pods-MapProj.debug.xcconfig */,
0611E19F1AECEF93C6170E8C /* Pods-MapProj.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
1B6365A71D344DF900472F64 /* MapProj */ = {
isa = PBXNativeTarget;
buildConfigurationList = 1B6365BA1D344DF900472F64 /* Build configuration list for PBXNativeTarget "MapProj" */;
buildPhases = (
2516CD68D98B5420E3A1EFF0 /* [CP] Check Pods Manifest.lock */,
1B6365A41D344DF900472F64 /* Sources */,
1B6365A51D344DF900472F64 /* Frameworks */,
1B6365A61D344DF900472F64 /* Resources */,
543BFA5D3EAF28241E7B736C /* [CP] Embed Pods Frameworks */,
D8E8371573846674395F1275 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand All @@ -107,6 +137,7 @@
TargetAttributes = {
1B6365A71D344DF900472F64 = {
CreatedOnToolsVersion = 7.3.1;
DevelopmentTeam = 85826LGZGV;
};
};
};
Expand Down Expand Up @@ -141,6 +172,54 @@
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
2516CD68D98B5420E3A1EFF0 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
543BFA5D3EAF28241E7B736C /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MapProj/Pods-MapProj-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
D8E8371573846674395F1275 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MapProj/Pods-MapProj-resources.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
1B6365A41D344DF900472F64 /* Sources */ = {
isa = PBXSourcesBuildPhase;
Expand All @@ -149,6 +228,7 @@
1B6365AE1D344DF900472F64 /* ViewController.swift in Sources */,
1BADFADD1D358A53001482DE /* CustomPointAnnotation.swift in Sources */,
1B6365AC1D344DF900472F64 /* AppDelegate.swift in Sources */,
1739BB8C1D3C538200855F2B /* RegionMonitoring.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -195,6 +275,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
DEPLOYMENT_LOCATION = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
Expand Down Expand Up @@ -240,6 +321,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEPLOYMENT_LOCATION = NO;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
Expand All @@ -259,23 +341,33 @@
};
1B6365BB1D344DF900472F64 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = AA3945AF81932BE903040910 /* Pods-MapProj.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
INFOPLIST_FILE = MapProj/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = FIS.MapProj;
PRODUCT_BUNDLE_IDENTIFIER = FIS4.MapProj;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
};
name = Debug;
};
1B6365BC1D344DF900472F64 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 0611E19F1AECEF93C6170E8C /* Pods-MapProj.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
INFOPLIST_FILE = MapProj/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = FIS.MapProj;
PRODUCT_BUNDLE_IDENTIFIER = FIS4.MapProj;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
};
name = Release;
};
Expand Down
Binary file added ...codeproj/project.xcworkspace/xcuserdata/Jordan.xcuserdatad/UserInterfaceState.xcuserstate
View file
Open in desktop
Binary file not shown.
5 changes: 5 additions & 0 deletions MapProj.xcodeproj/xcuserdata/Jordan.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<Bucket
type = "1"
version = "2.0">
</Bucket>
95 changes: 95 additions & 0 deletions MapProj.xcodeproj/xcuserdata/Jordan.xcuserdatad/xcschemes/MapProj.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0730"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1B6365A71D344DF900472F64"
BuildableName = "MapProj.app"
BlueprintName = "MapProj"
ReferencedContainer = "container:MapProj.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1B6365A71D344DF900472F64"
BuildableName = "MapProj.app"
BlueprintName = "MapProj"
ReferencedContainer = "container:MapProj.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1B6365A71D344DF900472F64"
BuildableName = "MapProj.app"
BlueprintName = "MapProj"
ReferencedContainer = "container:MapProj.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
<LocationScenarioReference
identifier = "New York, NY, USA"
referenceType = "1">
</LocationScenarioReference>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1B6365A71D344DF900472F64"
BuildableName = "MapProj.app"
BlueprintName = "MapProj"
ReferencedContainer = "container:MapProj.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
22 changes: 22 additions & 0 deletions MapProj.xcodeproj/xcuserdata/Jordan.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?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>MapProj.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>1B6365A71D344DF900472F64</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>
10 changes: 10 additions & 0 deletions MapProj.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added MapProj.xcworkspace/xcuserdata/Jordan.xcuserdatad/UserInterfaceState.xcuserstate
View file
Open in desktop
Binary file not shown.
5 changes: 5 additions & 0 deletions MapProj.xcworkspace/xcuserdata/Jordan.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<Bucket
type = "0"
version = "2.0">
</Bucket>
2 changes: 1 addition & 1 deletion MapProj/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//

// AppDelegate.swift
// MapProj
//
Expand Down
21 changes: 21 additions & 0 deletions MapProj/Assets.xcassets/camera (1).imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "camera (1).png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Binary file added MapProj/Assets.xcassets/camera (1).imageset/camera (1).png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified MapProj/Assets.xcassets/redpanda3d.imageset/redpanda3d.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading