Skip to content

Commit 44aa7fa

Browse files
lucasderraughlucasderraugh
committed
Fix merge
2 parents 78cc693 + e1860c0 commit 44aa7fa

File tree

257 files changed

+9069
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

257 files changed

+9069
-0
lines changed

‎.gitignore‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
# Xcode
22
#
3+
<<<<<<< HEAD
34
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
45

56
## Build generated
67
build/
78
DerivedData
89

910
## Various settings
11+
=======
12+
build/
13+
>>>>>>> e1860c0cd1eacbb77394b3222053c2162cd85848
1014
*.pbxuser
1115
!default.pbxuser
1216
*.mode1v3
@@ -16,6 +20,7 @@ DerivedData
1620
*.perspectivev3
1721
!default.perspectivev3
1822
xcuserdata
23+
<<<<<<< HEAD
1924

2025
## Other
2126
*.xccheckout
@@ -27,11 +32,21 @@ xcuserdata
2732
## Obj-C/Swift specific
2833
*.hmap
2934
*.ipa
35+
=======
36+
*.xccheckout
37+
*.moved-aside
38+
DerivedData
39+
*.hmap
40+
*.ipa
41+
*.xcuserstate
42+
.DS_Store
43+
>>>>>>> e1860c0cd1eacbb77394b3222053c2162cd85848
3044

3145
# CocoaPods
3246
#
3347
# We recommend against adding the Pods directory to your .gitignore. However
3448
# you should judge for yourself, the pros and cons are mentioned at:
49+
<<<<<<< HEAD
3550
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
3651
#
3752
# Pods/
@@ -52,3 +67,8 @@ Carthage/Build
5267

5368
fastlane/report.xml
5469
fastlane/screenshots
70+
=======
71+
# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
72+
#
73+
# Pods/
74+
>>>>>>> e1860c0cd1eacbb77394b3222053c2162cd85848

‎Lesson 10/Lesson 10.xcodeproj/project.xcworkspace/xcshareddata/Lesson 10.xccheckout‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDESourceControlProjectFavoriteDictionaryKey</key>
6+
<false/>
7+
<key>IDESourceControlProjectIdentifier</key>
8+
<string>EF03EEA9-BE58-4D54-9E94-AB5BF4EF0197</string>
9+
<key>IDESourceControlProjectName</key>
10+
<string>Lesson 10</string>
11+
<key>IDESourceControlProjectOriginsDictionary</key>
12+
<dict>
13+
<key>127944387CE26DB2EE47FE9C9FD56D8A7FFAFDED</key>
14+
<string>https://github.com/lucasd2/AppleProg-Cocoa-Tutorials.git</string>
15+
</dict>
16+
<key>IDESourceControlProjectPath</key>
17+
<string>Lesson 10/Lesson 10.xcodeproj</string>
18+
<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
19+
<dict>
20+
<key>127944387CE26DB2EE47FE9C9FD56D8A7FFAFDED</key>
21+
<string>../../..</string>
22+
</dict>
23+
<key>IDESourceControlProjectURL</key>
24+
<string>https://github.com/lucasd2/AppleProg-Cocoa-Tutorials.git</string>
25+
<key>IDESourceControlProjectVersion</key>
26+
<integer>111</integer>
27+
<key>IDESourceControlProjectWCCIdentifier</key>
28+
<string>127944387CE26DB2EE47FE9C9FD56D8A7FFAFDED</string>
29+
<key>IDESourceControlProjectWCConfigurations</key>
30+
<array>
31+
<dict>
32+
<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
33+
<string>public.vcs.git</string>
34+
<key>IDESourceControlWCCIdentifierKey</key>
35+
<string>127944387CE26DB2EE47FE9C9FD56D8A7FFAFDED</string>
36+
<key>IDESourceControlWCCName</key>
37+
<string>AppleProg-Cocoa-Tutorials</string>
38+
</dict>
39+
</array>
40+
</dict>
41+
</plist>

‎Lesson 10/Lesson 10.xcodeproj/project.xcworkspace/xcuserdata/lucasderraugh.xcuserdatad/UserInterfaceState.xcuserstate‎

55.8 KB
Binary file not shown.

‎Lesson 10/Lesson 10.xcodeproj/project.xcworkspace/xcuserdata/lucasderraugh.xcuserdatad/WorkspaceSettings.xcsettings‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>HasAskedToTakeAutomaticSnapshotBeforeSignificantChanges</key>
6+
<true/>
7+
<key>SnapshotAutomaticallyBeforeSignificantChanges</key>
8+
<false/>
9+
</dict>
10+
</plist>

‎Lesson 10/Lesson 10.xcodeproj/xcuserdata/lucasderraugh.xcuserdatad/xcschemes/Lesson 10.xcscheme‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "0610"
4+
version = "1.8">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "1DB773501372502D006B7976"
18+
BuildableName = "Lesson 10.app"
19+
BlueprintName = "Lesson 10"
20+
ReferencedContainer = "container:Lesson 10.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
27+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
28+
shouldUseLaunchSchemeArgsEnv = "YES"
29+
buildConfiguration = "Debug">
30+
<Testables>
31+
</Testables>
32+
</TestAction>
33+
<LaunchAction
34+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
35+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
36+
displayScaleIsEnabled = "NO"
37+
displayScale = "1.00"
38+
launchStyle = "0"
39+
useCustomWorkingDirectory = "NO"
40+
buildConfiguration = "Debug"
41+
ignoresPersistentStateOnLaunch = "NO"
42+
debugDocumentVersioning = "YES"
43+
allowLocationSimulation = "YES">
44+
<BuildableProductRunnable>
45+
<BuildableReference
46+
BuildableIdentifier = "primary"
47+
BlueprintIdentifier = "1DB773501372502D006B7976"
48+
BuildableName = "Lesson 10.app"
49+
BlueprintName = "Lesson 10"
50+
ReferencedContainer = "container:Lesson 10.xcodeproj">
51+
</BuildableReference>
52+
</BuildableProductRunnable>
53+
<AdditionalOptions>
54+
</AdditionalOptions>
55+
</LaunchAction>
56+
<ProfileAction
57+
displayScaleIsEnabled = "NO"
58+
displayScale = "1.00"
59+
shouldUseLaunchSchemeArgsEnv = "YES"
60+
savedToolIdentifier = ""
61+
useCustomWorkingDirectory = "NO"
62+
buildConfiguration = "Release"
63+
debugDocumentVersioning = "YES">
64+
<BuildableProductRunnable>
65+
<BuildableReference
66+
BuildableIdentifier = "primary"
67+
BlueprintIdentifier = "1DB773501372502D006B7976"
68+
BuildableName = "Lesson 10.app"
69+
BlueprintName = "Lesson 10"
70+
ReferencedContainer = "container:Lesson 10.xcodeproj">
71+
</BuildableReference>
72+
</BuildableProductRunnable>
73+
</ProfileAction>
74+
<AnalyzeAction
75+
buildConfiguration = "Debug">
76+
</AnalyzeAction>
77+
<ArchiveAction
78+
buildConfiguration = "Release"
79+
revealArchiveInOrganizer = "YES">
80+
</ArchiveAction>
81+
</Scheme>

‎Lesson 10/Lesson 10.xcodeproj/xcuserdata/lucasderraugh.xcuserdatad/xcschemes/xcschememanagement.plist‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>SchemeUserState</key>
6+
<dict>
7+
<key>Lesson 10.xcscheme</key>
8+
<dict>
9+
<key>orderHint</key>
10+
<integer>0</integer>
11+
</dict>
12+
</dict>
13+
<key>SuppressBuildableAutocreation</key>
14+
<dict>
15+
<key>1DB773501372502D006B7976</key>
16+
<dict>
17+
<key>primary</key>
18+
<true/>
19+
</dict>
20+
</dict>
21+
</dict>
22+
</plist>

‎Lesson 11/Lesson 11.xcodeproj/project.xcworkspace/xcuserdata/lucasderraugh.xcuserdatad/UserInterfaceState.xcuserstate‎

18.4 KB
Binary file not shown.

‎Lesson 11/Lesson 11.xcodeproj/project.xcworkspace/xcuserdata/lucasderraugh.xcuserdatad/WorkspaceSettings.xcsettings‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>HasAskedToTakeAutomaticSnapshotBeforeSignificantChanges</key>
6+
<true/>
7+
<key>SnapshotAutomaticallyBeforeSignificantChanges</key>
8+
<false/>
9+
</dict>
10+
</plist>

‎Lesson 11/Lesson 11.xcodeproj/xcuserdata/lucasderraugh.xcuserdatad/xcschemes/FINAL.xcscheme‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "0430"
4+
version = "1.8">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "1DF0DCFB1397012A00A9F86F"
18+
BuildableName = "FINAL.app"
19+
BlueprintName = "FINAL"
20+
ReferencedContainer = "container:Lesson 11.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
27+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
28+
shouldUseLaunchSchemeArgsEnv = "YES"
29+
buildConfiguration = "Debug">
30+
<Testables>
31+
</Testables>
32+
</TestAction>
33+
<LaunchAction
34+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
35+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
36+
displayScaleIsEnabled = "NO"
37+
displayScale = "1.00"
38+
launchStyle = "0"
39+
useCustomWorkingDirectory = "NO"
40+
buildConfiguration = "Debug"
41+
ignoresPersistentStateOnLaunch = "NO"
42+
debugDocumentVersioning = "YES"
43+
allowLocationSimulation = "YES">
44+
<BuildableProductRunnable>
45+
<BuildableReference
46+
BuildableIdentifier = "primary"
47+
BlueprintIdentifier = "1DF0DCFB1397012A00A9F86F"
48+
BuildableName = "FINAL.app"
49+
BlueprintName = "FINAL"
50+
ReferencedContainer = "container:Lesson 11.xcodeproj">
51+
</BuildableReference>
52+
</BuildableProductRunnable>
53+
<AdditionalOptions>
54+
</AdditionalOptions>
55+
</LaunchAction>
56+
<ProfileAction
57+
displayScaleIsEnabled = "NO"
58+
displayScale = "1.00"
59+
shouldUseLaunchSchemeArgsEnv = "YES"
60+
savedToolIdentifier = ""
61+
useCustomWorkingDirectory = "NO"
62+
buildConfiguration = "Release"
63+
debugDocumentVersioning = "YES">
64+
<BuildableProductRunnable>
65+
<BuildableReference
66+
BuildableIdentifier = "primary"
67+
BlueprintIdentifier = "1DF0DCFB1397012A00A9F86F"
68+
BuildableName = "FINAL.app"
69+
BlueprintName = "FINAL"
70+
ReferencedContainer = "container:Lesson 11.xcodeproj">
71+
</BuildableReference>
72+
</BuildableProductRunnable>
73+
</ProfileAction>
74+
<AnalyzeAction
75+
buildConfiguration = "Debug">
76+
</AnalyzeAction>
77+
<ArchiveAction
78+
buildConfiguration = "Release"
79+
revealArchiveInOrganizer = "YES">
80+
</ArchiveAction>
81+
</Scheme>

‎Lesson 11/Lesson 11.xcodeproj/xcuserdata/lucasderraugh.xcuserdatad/xcschemes/Lesson 11.xcscheme‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "0430"
4+
version = "1.8">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "1D0BADE3137B5E350026C59D"
18+
BuildableName = "Lesson 11.app"
19+
BlueprintName = "Lesson 11"
20+
ReferencedContainer = "container:Lesson 11.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
27+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
28+
shouldUseLaunchSchemeArgsEnv = "YES"
29+
buildConfiguration = "Debug">
30+
<Testables>
31+
</Testables>
32+
</TestAction>
33+
<LaunchAction
34+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
35+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
36+
displayScaleIsEnabled = "NO"
37+
displayScale = "1.00"
38+
launchStyle = "0"
39+
useCustomWorkingDirectory = "NO"
40+
buildConfiguration = "Debug"
41+
ignoresPersistentStateOnLaunch = "NO"
42+
debugDocumentVersioning = "YES"
43+
allowLocationSimulation = "YES">
44+
<BuildableProductRunnable>
45+
<BuildableReference
46+
BuildableIdentifier = "primary"
47+
BlueprintIdentifier = "1D0BADE3137B5E350026C59D"
48+
BuildableName = "Lesson 11.app"
49+
BlueprintName = "Lesson 11"
50+
ReferencedContainer = "container:Lesson 11.xcodeproj">
51+
</BuildableReference>
52+
</BuildableProductRunnable>
53+
<AdditionalOptions>
54+
</AdditionalOptions>
55+
</LaunchAction>
56+
<ProfileAction
57+
displayScaleIsEnabled = "NO"
58+
displayScale = "1.00"
59+
shouldUseLaunchSchemeArgsEnv = "YES"
60+
savedToolIdentifier = ""
61+
useCustomWorkingDirectory = "NO"
62+
buildConfiguration = "Release"
63+
debugDocumentVersioning = "YES">
64+
<BuildableProductRunnable>
65+
<BuildableReference
66+
BuildableIdentifier = "primary"
67+
BlueprintIdentifier = "1D0BADE3137B5E350026C59D"
68+
BuildableName = "Lesson 11.app"
69+
BlueprintName = "Lesson 11"
70+
ReferencedContainer = "container:Lesson 11.xcodeproj">
71+
</BuildableReference>
72+
</BuildableProductRunnable>
73+
</ProfileAction>
74+
<AnalyzeAction
75+
buildConfiguration = "Debug">
76+
</AnalyzeAction>
77+
<ArchiveAction
78+
buildConfiguration = "Release"
79+
revealArchiveInOrganizer = "YES">
80+
</ArchiveAction>
81+
</Scheme>

0 commit comments

Comments
 (0)