-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #12 from Darner-dan-uh/develop
Develop
- Loading branch information
Showing
2,340 changed files
with
687,401 additions
and
1,667 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
|
|
||
| Darner-dan-uh/Darner-dan-uh/.DS_Store | ||
|
|
||
| Darner-dan-uh/Darner-dan-uh/Source/.DS_Store | ||
|
|
||
| Darner-dan-uh/Darner-dan-uh/Source/Base/.DS_Store | ||
|
|
||
| Darner-dan-uh/Darner-dan-uh/Source/Base/Base.lproj/.DS_Store | ||
|
|
||
| Darner-dan-uh/Darner-dan-uh/Source/Modules/.DS_Store | ||
|
|
||
| Darner-dan-uh/Darner-dan-uh/Source/Modules/Memorization/.DS_Store | ||
|
|
||
| Darner-dan-uh/Darner-dan-uh/Source/Modules/Register/.DS_Store | ||
|
|
||
| .DS_Store |
Binary file not shown.
Large diffs are not rendered by default.
Oops, something went wrong.
78 changes: 78 additions & 0 deletions
78
Darner-dan-uh/Darner-dan-uh.xcodeproj/xcshareddata/xcschemes/Darner-dan-uh.xcscheme
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <Scheme | ||
| LastUpgradeVersion = "1200" | ||
| version = "1.3"> | ||
| <BuildAction | ||
| parallelizeBuildables = "YES" | ||
| buildImplicitDependencies = "YES"> | ||
| <BuildActionEntries> | ||
| <BuildActionEntry | ||
| buildForTesting = "YES" | ||
| buildForRunning = "YES" | ||
| buildForProfiling = "YES" | ||
| buildForArchiving = "YES" | ||
| buildForAnalyzing = "YES"> | ||
| <BuildableReference | ||
| BuildableIdentifier = "primary" | ||
| BlueprintIdentifier = "D6578AC62500867A000185F1" | ||
| BuildableName = "Darner-dan-uh.app" | ||
| BlueprintName = "Darner-dan-uh" | ||
| ReferencedContainer = "container:Darner-dan-uh.xcodeproj"> | ||
| </BuildableReference> | ||
| </BuildActionEntry> | ||
| </BuildActionEntries> | ||
| </BuildAction> | ||
| <TestAction | ||
| buildConfiguration = "Debug" | ||
| selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" | ||
| selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" | ||
| shouldUseLaunchSchemeArgsEnv = "YES"> | ||
| <Testables> | ||
| </Testables> | ||
| </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 = "D6578AC62500867A000185F1" | ||
| BuildableName = "Darner-dan-uh.app" | ||
| BlueprintName = "Darner-dan-uh" | ||
| ReferencedContainer = "container:Darner-dan-uh.xcodeproj"> | ||
| </BuildableReference> | ||
| </BuildableProductRunnable> | ||
| </LaunchAction> | ||
| <ProfileAction | ||
| buildConfiguration = "Release" | ||
| shouldUseLaunchSchemeArgsEnv = "YES" | ||
| savedToolIdentifier = "" | ||
| useCustomWorkingDirectory = "NO" | ||
| debugDocumentVersioning = "YES"> | ||
| <BuildableProductRunnable | ||
| runnableDebuggingMode = "0"> | ||
| <BuildableReference | ||
| BuildableIdentifier = "primary" | ||
| BlueprintIdentifier = "D6578AC62500867A000185F1" | ||
| BuildableName = "Darner-dan-uh.app" | ||
| BlueprintName = "Darner-dan-uh" | ||
| ReferencedContainer = "container:Darner-dan-uh.xcodeproj"> | ||
| </BuildableReference> | ||
| </BuildableProductRunnable> | ||
| </ProfileAction> | ||
| <AnalyzeAction | ||
| buildConfiguration = "Debug"> | ||
| </AnalyzeAction> | ||
| <ArchiveAction | ||
| buildConfiguration = "Release" | ||
| revealArchiveInOrganizer = "YES"> | ||
| </ArchiveAction> | ||
| </Scheme> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 14 additions & 0 deletions
14
...Darner-dan-uh.xcodeproj/xcuserdata/munjisu.xcuserdatad/xcschemes/xcschememanagement.plist
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| <?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>Darner-dan-uh.xcscheme_^#shared#^_</key> | ||
| <dict> | ||
| <key>orderHint</key> | ||
| <integer>5</integer> | ||
| </dict> | ||
| </dict> | ||
| </dict> | ||
| </plist> |
8 changes: 8 additions & 0 deletions
8
Darner-dan-uh/Darner-dan-uh.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| <?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>IDEDidComputeMac32BitWarning</key> | ||
| <true/> | ||
| </dict> | ||
| </plist> |
Binary file added
BIN
+118 KB
...arner-dan-uh.xcworkspace/xcuserdata/ihyun_wook.xcuserdatad/UserInterfaceState.xcuserstate
Binary file not shown.
6 changes: 6 additions & 0 deletions
6
...dan-uh.xcworkspace/xcuserdata/ihyun_wook.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <Bucket | ||
| uuid = "80C83770-D3C0-4DFD-99AC-DA09B2B93132" | ||
| type = "0" | ||
| version = "2.0"> | ||
| </Bucket> |
Binary file added
BIN
+127 KB
...h/Darner-dan-uh.xcworkspace/xcuserdata/munjisu.xcuserdatad/UserInterfaceState.xcuserstate
Binary file not shown.
166 changes: 166 additions & 0 deletions
166
...er-dan-uh.xcworkspace/xcuserdata/munjisu.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,166 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <Bucket | ||
| uuid = "D4069D0F-C14B-46E8-B31D-973F4155B617" | ||
| type = "0" | ||
| version = "2.0"> | ||
| <Breakpoints> | ||
| <BreakpointProxy | ||
| BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> | ||
| <BreakpointContent | ||
| uuid = "B656C3A5-E77F-4C17-B22A-0F0A0E589DC8" | ||
| shouldBeEnabled = "Yes" | ||
| ignoreCount = "0" | ||
| continueAfterRunningActions = "No" | ||
| filePath = "Darner-dan-uh/Source/Modules/Ranking/RankingTableViewController.swift" | ||
| startingColumnNumber = "9223372036854775807" | ||
| endingColumnNumber = "9223372036854775807" | ||
| startingLineNumber = "12" | ||
| endingLineNumber = "12" | ||
| landmarkName = "unknown" | ||
| landmarkType = "0"> | ||
| </BreakpointContent> | ||
| </BreakpointProxy> | ||
| <BreakpointProxy | ||
| BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> | ||
| <BreakpointContent | ||
| <<<<<<< HEAD | ||
| uuid = "3CD4F3E9-E608-4C22-8BC8-6ABF0193B77B" | ||
| shouldBeEnabled = "Yes" | ||
| ignoreCount = "0" | ||
| continueAfterRunningActions = "No" | ||
| filePath = "Darner-dan-uh/Source/NetWorking/DarnerAPIClient.swift" | ||
| startingColumnNumber = "9223372036854775807" | ||
| endingColumnNumber = "9223372036854775807" | ||
| startingLineNumber = "20" | ||
| endingLineNumber = "20" | ||
| landmarkName = "networkingResult(from:model:)" | ||
| landmarkType = "7"> | ||
| </BreakpointContent> | ||
| </BreakpointProxy> | ||
| <BreakpointProxy | ||
| BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> | ||
| <BreakpointContent | ||
| uuid = "DC131016-9AFE-4DB2-8672-43C9ABEBAC76" | ||
| shouldBeEnabled = "Yes" | ||
| ignoreCount = "0" | ||
| continueAfterRunningActions = "No" | ||
| filePath = "Darner-dan-uh/Source/NetWorking/DarnerAPIClient.swift" | ||
| startingColumnNumber = "9223372036854775807" | ||
| endingColumnNumber = "9223372036854775807" | ||
| startingLineNumber = "25" | ||
| endingLineNumber = "25" | ||
| landmarkName = "networkingResult(from:model:)" | ||
| landmarkType = "7"> | ||
| </BreakpointContent> | ||
| </BreakpointProxy> | ||
| <BreakpointProxy | ||
| BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> | ||
| <BreakpointContent | ||
| uuid = "27E75686-1952-479C-840F-DFD819DA2BA6" | ||
| shouldBeEnabled = "Yes" | ||
| ignoreCount = "0" | ||
| continueAfterRunningActions = "No" | ||
| filePath = "Darner-dan-uh/Source/NetWorking/DarnerAPIClient.swift" | ||
| startingColumnNumber = "9223372036854775807" | ||
| endingColumnNumber = "9223372036854775807" | ||
| startingLineNumber = "30" | ||
| endingLineNumber = "30" | ||
| landmarkName = "networkingResult(from:model:)" | ||
| landmarkType = "7"> | ||
| </BreakpointContent> | ||
| </BreakpointProxy> | ||
| <BreakpointProxy | ||
| BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> | ||
| <BreakpointContent | ||
| uuid = "614C487C-ACEF-4706-933A-8FB062D56313" | ||
| shouldBeEnabled = "Yes" | ||
| ignoreCount = "0" | ||
| continueAfterRunningActions = "No" | ||
| filePath = "Darner-dan-uh/Source/NetWorking/DarnerAPIClient.swift" | ||
| startingColumnNumber = "9223372036854775807" | ||
| endingColumnNumber = "9223372036854775807" | ||
| startingLineNumber = "31" | ||
| endingLineNumber = "31" | ||
| landmarkName = "networkingResult(from:model:)" | ||
| landmarkType = "7"> | ||
| </BreakpointContent> | ||
| </BreakpointProxy> | ||
| <BreakpointProxy | ||
| BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> | ||
| <BreakpointContent | ||
| uuid = "226D00FE-20AC-4341-B530-8A2BFA984771" | ||
| shouldBeEnabled = "Yes" | ||
| ignoreCount = "0" | ||
| continueAfterRunningActions = "No" | ||
| filePath = "Darner-dan-uh/Source/NetWorking/DarnerAPIClient.swift" | ||
| startingColumnNumber = "9223372036854775807" | ||
| endingColumnNumber = "9223372036854775807" | ||
| startingLineNumber = "36" | ||
| endingLineNumber = "36" | ||
| landmarkName = "networkingResult(from:model:)" | ||
| landmarkType = "7"> | ||
| ======= | ||
| uuid = "58BD4AF2-9CBD-44F9-9514-E520A4AC46A8" | ||
| shouldBeEnabled = "No" | ||
| ignoreCount = "0" | ||
| continueAfterRunningActions = "No" | ||
| filePath = "Darner-dan-uh/Source/NetWorking/DarnerAPI.swift" | ||
| startingColumnNumber = "9223372036854775807" | ||
| endingColumnNumber = "9223372036854775807" | ||
| startingLineNumber = "126" | ||
| endingLineNumber = "126" | ||
| landmarkName = "parameter" | ||
| landmarkType = "24"> | ||
| >>>>>>> MypageNetworking | ||
| </BreakpointContent> | ||
| </BreakpointProxy> | ||
| <BreakpointProxy | ||
| BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> | ||
| <BreakpointContent | ||
| uuid = "C3B05FBC-CA57-4D86-A2CE-9C08E842CF05" | ||
| shouldBeEnabled = "No" | ||
| ignoreCount = "0" | ||
| continueAfterRunningActions = "No" | ||
| filePath = "Darner-dan-uh/Source/Modules/Writing/WritingViewController.swift" | ||
| startingColumnNumber = "9223372036854775807" | ||
| endingColumnNumber = "9223372036854775807" | ||
| startingLineNumber = "53" | ||
| endingLineNumber = "53" | ||
| landmarkName = "save(_:)" | ||
| landmarkType = "7"> | ||
| </BreakpointContent> | ||
| </BreakpointProxy> | ||
| <BreakpointProxy | ||
| BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> | ||
| <BreakpointContent | ||
| uuid = "9701E502-DC91-4273-A73C-373632E82A24" | ||
| shouldBeEnabled = "No" | ||
| ignoreCount = "0" | ||
| continueAfterRunningActions = "No" | ||
| filePath = "Darner-dan-uh/Source/Model/MemoModel.swift" | ||
| startingColumnNumber = "9223372036854775807" | ||
| endingColumnNumber = "9223372036854775807" | ||
| startingLineNumber = "12" | ||
| endingLineNumber = "12" | ||
| landmarkName = "MemoModel" | ||
| landmarkType = "3"> | ||
| </BreakpointContent> | ||
| </BreakpointProxy> | ||
| <BreakpointProxy | ||
| BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> | ||
| <BreakpointContent | ||
| uuid = "A66466C6-A00F-415C-A827-906FCB1663B3" | ||
| shouldBeEnabled = "No" | ||
| ignoreCount = "0" | ||
| continueAfterRunningActions = "No" | ||
| filePath = "Darner-dan-uh/Source/Model/MemoModel.swift" | ||
| startingColumnNumber = "9223372036854775807" | ||
| endingColumnNumber = "9223372036854775807" | ||
| startingLineNumber = "13" | ||
| endingLineNumber = "13" | ||
| landmarkName = "MemoModel" | ||
| landmarkType = "3"> | ||
| </BreakpointContent> | ||
| </BreakpointProxy> | ||
| </Breakpoints> | ||
| </Bucket> |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.