diff --git a/Default-568h@2x.png b/Default-568h@2x.png new file mode 100644 index 0000000..0891b7a Binary files /dev/null and b/Default-568h@2x.png differ diff --git a/nodeProject.xcodeproj/project.xcworkspace/xcuserdata/vadimpustovoitov.xcuserdatad/UserInterfaceState.xcuserstate b/nodeProject.xcodeproj/project.xcworkspace/xcuserdata/vadimpustovoitov.xcuserdatad/UserInterfaceState.xcuserstate deleted file mode 100644 index f97629a..0000000 Binary files a/nodeProject.xcodeproj/project.xcworkspace/xcuserdata/vadimpustovoitov.xcuserdatad/UserInterfaceState.xcuserstate and /dev/null differ diff --git a/nodeProject.xcodeproj/project.pbxproj b/noteProject.xcodeproj/project.pbxproj similarity index 88% rename from nodeProject.xcodeproj/project.pbxproj rename to noteProject.xcodeproj/project.pbxproj index f2a0af8..bd4e18c 100644 --- a/nodeProject.xcodeproj/project.pbxproj +++ b/noteProject.xcodeproj/project.pbxproj @@ -15,19 +15,22 @@ 5AD6B8FE211EA1CF0080EA0F /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5AD6B8FC211EA1CF0080EA0F /* LaunchScreen.storyboard */; }; 5AD6B929211F31670080EA0F /* addNote.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5AD6B928211F31670080EA0F /* addNote.swift */; }; 5AD6B94C2121C8880080EA0F /* ImageViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5AD6B94B2121C8880080EA0F /* ImageViewCell.swift */; }; + 5AD6B94E212E52F20080EA0F /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5AD6B94D212E52F20080EA0F /* Default-568h@2x.png */; }; + 5AD6B951212E56B90080EA0F /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 5AD6B950212E56B90080EA0F /* Info.plist */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 5AD6B8ED211EA1CC0080EA0F /* nodeProject.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = nodeProject.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 5AD6B8ED211EA1CC0080EA0F /* noteProject.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = noteProject.app; sourceTree = BUILT_PRODUCTS_DIR; }; 5AD6B8F0211EA1CC0080EA0F /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 5AD6B8F2211EA1CC0080EA0F /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; 5AD6B8F5211EA1CC0080EA0F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 5AD6B8F8211EA1CC0080EA0F /* nodeProject.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = nodeProject.xcdatamodel; sourceTree = ""; }; 5AD6B8FA211EA1CF0080EA0F /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 5AD6B8FD211EA1CF0080EA0F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; - 5AD6B8FF211EA1CF0080EA0F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 5AD6B928211F31670080EA0F /* addNote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = addNote.swift; sourceTree = ""; }; 5AD6B94B2121C8880080EA0F /* ImageViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageViewCell.swift; sourceTree = ""; }; + 5AD6B94D212E52F20080EA0F /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; + 5AD6B950212E56B90080EA0F /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = ../../../../Desktop/addNote2/nodeProject/Info.plist; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -44,7 +47,8 @@ 5AD6B8E4211EA1CC0080EA0F = { isa = PBXGroup; children = ( - 5AD6B8EF211EA1CC0080EA0F /* nodeProject */, + 5AD6B94D212E52F20080EA0F /* Default-568h@2x.png */, + 5AD6B8EF211EA1CC0080EA0F /* noteProject */, 5AD6B8EE211EA1CC0080EA0F /* Products */, ); sourceTree = ""; @@ -52,12 +56,12 @@ 5AD6B8EE211EA1CC0080EA0F /* Products */ = { isa = PBXGroup; children = ( - 5AD6B8ED211EA1CC0080EA0F /* nodeProject.app */, + 5AD6B8ED211EA1CC0080EA0F /* noteProject.app */, ); name = Products; sourceTree = ""; }; - 5AD6B8EF211EA1CC0080EA0F /* nodeProject */ = { + 5AD6B8EF211EA1CC0080EA0F /* noteProject */ = { isa = PBXGroup; children = ( 5AD6B8F0211EA1CC0080EA0F /* AppDelegate.swift */, @@ -65,20 +69,20 @@ 5AD6B8F4211EA1CC0080EA0F /* Main.storyboard */, 5AD6B8FA211EA1CF0080EA0F /* Assets.xcassets */, 5AD6B8FC211EA1CF0080EA0F /* LaunchScreen.storyboard */, - 5AD6B8FF211EA1CF0080EA0F /* Info.plist */, 5AD6B8F7211EA1CC0080EA0F /* nodeProject.xcdatamodeld */, + 5AD6B950212E56B90080EA0F /* Info.plist */, 5AD6B928211F31670080EA0F /* addNote.swift */, 5AD6B94B2121C8880080EA0F /* ImageViewCell.swift */, ); - path = nodeProject; + path = noteProject; sourceTree = ""; }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 5AD6B8EC211EA1CC0080EA0F /* nodeProject */ = { + 5AD6B8EC211EA1CC0080EA0F /* noteProject */ = { isa = PBXNativeTarget; - buildConfigurationList = 5AD6B902211EA1CF0080EA0F /* Build configuration list for PBXNativeTarget "nodeProject" */; + buildConfigurationList = 5AD6B902211EA1CF0080EA0F /* Build configuration list for PBXNativeTarget "noteProject" */; buildPhases = ( 5AD6B8E9211EA1CC0080EA0F /* Sources */, 5AD6B8EA211EA1CC0080EA0F /* Frameworks */, @@ -88,9 +92,9 @@ ); dependencies = ( ); - name = nodeProject; + name = noteProject; productName = nodeProject; - productReference = 5AD6B8ED211EA1CC0080EA0F /* nodeProject.app */; + productReference = 5AD6B8ED211EA1CC0080EA0F /* noteProject.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -108,7 +112,7 @@ }; }; }; - buildConfigurationList = 5AD6B8E8211EA1CC0080EA0F /* Build configuration list for PBXProject "nodeProject" */; + buildConfigurationList = 5AD6B8E8211EA1CC0080EA0F /* Build configuration list for PBXProject "noteProject" */; compatibilityVersion = "Xcode 9.3"; developmentRegion = en; hasScannedForEncodings = 0; @@ -121,7 +125,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 5AD6B8EC211EA1CC0080EA0F /* nodeProject */, + 5AD6B8EC211EA1CC0080EA0F /* noteProject */, ); }; /* End PBXProject section */ @@ -132,7 +136,9 @@ buildActionMask = 2147483647; files = ( 5AD6B8FE211EA1CF0080EA0F /* LaunchScreen.storyboard in Resources */, + 5AD6B94E212E52F20080EA0F /* Default-568h@2x.png in Resources */, 5AD6B8FB211EA1CF0080EA0F /* Assets.xcassets in Resources */, + 5AD6B951212E56B90080EA0F /* Info.plist in Resources */, 5AD6B8F6211EA1CC0080EA0F /* Main.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -294,7 +300,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = Z8HPQWD7MN; - INFOPLIST_FILE = nodeProject/Info.plist; + INFOPLIST_FILE = "$(SRCROOT)/../../../Desktop/addNote2/nodeProject/Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -312,7 +318,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = Z8HPQWD7MN; - INFOPLIST_FILE = nodeProject/Info.plist; + INFOPLIST_FILE = "$(SRCROOT)/../../../Desktop/addNote2/nodeProject/Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -327,7 +333,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 5AD6B8E8211EA1CC0080EA0F /* Build configuration list for PBXProject "nodeProject" */ = { + 5AD6B8E8211EA1CC0080EA0F /* Build configuration list for PBXProject "noteProject" */ = { isa = XCConfigurationList; buildConfigurations = ( 5AD6B900211EA1CF0080EA0F /* Debug */, @@ -336,7 +342,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 5AD6B902211EA1CF0080EA0F /* Build configuration list for PBXNativeTarget "nodeProject" */ = { + 5AD6B902211EA1CF0080EA0F /* Build configuration list for PBXNativeTarget "noteProject" */ = { isa = XCConfigurationList; buildConfigurations = ( 5AD6B903211EA1CF0080EA0F /* Debug */, diff --git a/nodeProject.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/noteProject.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 69% rename from nodeProject.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to noteProject.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 445cf16..919434a 100644 --- a/nodeProject.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/noteProject.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:"> diff --git a/nodeProject.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/noteProject.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from nodeProject.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to noteProject.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/noteProject.xcodeproj/project.xcworkspace/xcuserdata/vadimpustovoitov.xcuserdatad/UserInterfaceState.xcuserstate b/noteProject.xcodeproj/project.xcworkspace/xcuserdata/vadimpustovoitov.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000..f170485 Binary files /dev/null and b/noteProject.xcodeproj/project.xcworkspace/xcuserdata/vadimpustovoitov.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/nodeProject.xcodeproj/xcuserdata/vadimpustovoitov.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/noteProject.xcodeproj/xcuserdata/vadimpustovoitov.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist similarity index 55% rename from nodeProject.xcodeproj/xcuserdata/vadimpustovoitov.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist rename to noteProject.xcodeproj/xcuserdata/vadimpustovoitov.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 422bb76..08ef2f0 100644 --- a/nodeProject.xcodeproj/xcuserdata/vadimpustovoitov.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/noteProject.xcodeproj/xcuserdata/vadimpustovoitov.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -10,7 +10,7 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "nodeProject/ViewController.swift" - timestampString = "556473681.874917" + timestampString = "556682591.0179909" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "35" @@ -26,11 +26,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "nodeProject/addNote.swift" - timestampString = "556473681.875044" + timestampString = "556682591.018307" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "31" - endingLineNumber = "31" + startingLineNumber = "33" + endingLineNumber = "33" landmarkName = "saveNote(_:)" landmarkType = "7"> @@ -42,27 +42,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "nodeProject/addNote.swift" - timestampString = "556473681.875761" + timestampString = "556682591.018499" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "57" - endingLineNumber = "57" - landmarkName = "saveName(name:info:pictures:)" - landmarkType = "7"> - - - - @@ -74,11 +58,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "nodeProject/addNote.swift" - timestampString = "556473681.87728" + timestampString = "556682591.018688" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "39" - endingLineNumber = "39" + startingLineNumber = "41" + endingLineNumber = "41" landmarkName = "viewDidLoad()" landmarkType = "7"> @@ -90,12 +74,12 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "nodeProject/addNote.swift" - timestampString = "556473681.877779" + timestampString = "556682591.018859" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "145" - endingLineNumber = "145" - landmarkName = "collectionView(_:didDeselectItemAt:)" + startingLineNumber = "150" + endingLineNumber = "150" + landmarkName = "removePhoto(index:)" landmarkType = "7"> @@ -105,30 +89,30 @@ shouldBeEnabled = "No" ignoreCount = "0" continueAfterRunningActions = "No" - filePath = "nodeProject/addNote.swift" - timestampString = "556473681.8782001" + filePath = "nodeProject/ImageViewCell.swift" + timestampString = "556682591.019026" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "138" - endingLineNumber = "138" - landmarkName = "addNote" - landmarkType = "3"> + startingLineNumber = "19" + endingLineNumber = "19" + landmarkName = "removeImage(_:)" + landmarkType = "7"> + startingLineNumber = "70" + endingLineNumber = "70" + landmarkName = "persistentContainer" + landmarkType = "24"> @@ -153,13 +137,13 @@ shouldBeEnabled = "No" ignoreCount = "0" continueAfterRunningActions = "No" - filePath = "nodeProject/ImageViewCell.swift" - timestampString = "556463841.545342" + filePath = "nodeProject/ViewController.swift" + timestampString = "556682591.01934" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "20" - endingLineNumber = "20" - landmarkName = "removeImage(_:)" + startingLineNumber = "80" + endingLineNumber = "80" + landmarkName = "tableView(_:didSelectRowAt:)" landmarkType = "7"> @@ -169,44 +153,60 @@ shouldBeEnabled = "No" ignoreCount = "0" continueAfterRunningActions = "No" - filePath = "nodeProject/addNote.swift" - timestampString = "556473681.879364" + filePath = "nodeProject/ViewController.swift" + timestampString = "556682591.0194449" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "146" - endingLineNumber = "146" - landmarkName = "collectionView(_:didDeselectItemAt:)" + startingLineNumber = "61" + endingLineNumber = "61" + landmarkName = "tableView(_:didSelectRowAt:)" landmarkType = "7"> + + + + + + - - - - @@ -214,33 +214,65 @@ + + + + + + diff --git a/nodeProject.xcodeproj/xcuserdata/vadimpustovoitov.xcuserdatad/xcschemes/xcschememanagement.plist b/noteProject.xcodeproj/xcuserdata/vadimpustovoitov.xcuserdatad/xcschemes/xcschememanagement.plist similarity index 76% rename from nodeProject.xcodeproj/xcuserdata/vadimpustovoitov.xcuserdatad/xcschemes/xcschememanagement.plist rename to noteProject.xcodeproj/xcuserdata/vadimpustovoitov.xcuserdatad/xcschemes/xcschememanagement.plist index 07a5c73..92a4076 100644 --- a/nodeProject.xcodeproj/xcuserdata/vadimpustovoitov.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/noteProject.xcodeproj/xcuserdata/vadimpustovoitov.xcuserdatad/xcschemes/xcschememanagement.plist @@ -9,6 +9,11 @@ orderHint 0 + noteProject.xcscheme + + orderHint + 0 + diff --git a/nodeProject/AppDelegate.swift b/noteProject/AppDelegate.swift similarity index 99% rename from nodeProject/AppDelegate.swift rename to noteProject/AppDelegate.swift index db827f3..6fbe441 100644 --- a/nodeProject/AppDelegate.swift +++ b/noteProject/AppDelegate.swift @@ -1,6 +1,6 @@ // // AppDelegate.swift -// nodeProject +// noteProject // // Created by Вадим Пустовойтов on 11.08.2018. // Copyright © 2018 Вадим Пустовойтов. All rights reserved. diff --git a/nodeProject/Assets.xcassets/AppIcon.appiconset/Contents.json b/noteProject/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from nodeProject/Assets.xcassets/AppIcon.appiconset/Contents.json rename to noteProject/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/nodeProject/Assets.xcassets/Contents.json b/noteProject/Assets.xcassets/Contents.json similarity index 100% rename from nodeProject/Assets.xcassets/Contents.json rename to noteProject/Assets.xcassets/Contents.json diff --git a/nodeProject/Base.lproj/LaunchScreen.storyboard b/noteProject/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from nodeProject/Base.lproj/LaunchScreen.storyboard rename to noteProject/Base.lproj/LaunchScreen.storyboard diff --git a/nodeProject/Base.lproj/Main.storyboard b/noteProject/Base.lproj/Main.storyboard similarity index 68% rename from nodeProject/Base.lproj/Main.storyboard rename to noteProject/Base.lproj/Main.storyboard index 7c19812..9e37741 100644 --- a/nodeProject/Base.lproj/Main.storyboard +++ b/noteProject/Base.lproj/Main.storyboard @@ -43,7 +43,7 @@ - + @@ -93,7 +93,7 @@ - + @@ -143,20 +143,38 @@ - - + - + + + + +