Skip to content

CoreData Integration #1

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

Draft
imrabti wants to merge 9 commits into
base: main
Choose a base branch
from
Draft

CoreData Integration #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3cd1944
WIP CoreData integration
imrabti Jun 1, 2022
cc5993f
WIP connect CoreData with EditCocktail.
imrabti Jun 1, 2022
300683c
Integrate Add / Update cocktail with coreData
imrabti Jun 4, 2022
99c4a94
Remove old Models object and CocktailBucketStore
imrabti Jun 4, 2022
6f52677
Rename all CoreData entities to remove the CD suffix
imrabti Jun 4, 2022
e6b9774
Cocktail picture support (#2)
imrabti Jun 7, 2022
904d897
Use cascade when convenient to delete elements, replace NSPersistentC…
imrabti Jun 7, 2022
0b0bf80
Update EditCocktail.swift
imrabti Jun 7, 2022
9b7b77d
Merge branch 'main'
imrabti Jun 7, 2022
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
101 changes: 70 additions & 31 deletions CocktailBucket.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
objects = {

/* Begin PBXBuildFile section */
F9629754267A222500BA814A /* Step.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9629753267A222500BA814A /* Step.swift */; };
F9629755267A222500BA814A /* Step.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9629753267A222500BA814A /* Step.swift */; };
F9629757267A23A200BA814A /* CocktailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9629756267A23A200BA814A /* CocktailView.swift */; };
F9629758267A23A200BA814A /* CocktailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9629756267A23A200BA814A /* CocktailView.swift */; };
F9CD5D182679CBF0008AED32 /* CocktailBucket.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = F9CD5D072679CBEF008AED32 /* CocktailBucket.xcdatamodeld */; };
Expand All @@ -19,45 +17,55 @@
F9CD5D1D2679CBF0008AED32 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9CD5D0A2679CBEF008AED32 /* ContentView.swift */; };
F9CD5D202679CBF0008AED32 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F9CD5D0C2679CBF0008AED32 /* Assets.xcassets */; };
F9CD5D212679CBF0008AED32 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F9CD5D0C2679CBF0008AED32 /* Assets.xcassets */; };
F9CD5D2C2679CD9E008AED32 /* Cocktail.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9CD5D2B2679CD9E008AED32 /* Cocktail.swift */; };
F9CD5D2D2679CD9E008AED32 /* Cocktail.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9CD5D2B2679CD9E008AED32 /* Cocktail.swift */; };
F9CD5D2F2679CDAF008AED32 /* Ingredient.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9CD5D2E2679CDAF008AED32 /* Ingredient.swift */; };
F9CD5D302679CDAF008AED32 /* Ingredient.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9CD5D2E2679CDAF008AED32 /* Ingredient.swift */; };
F9CD5D352679D00A008AED32 /* BucketList.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9CD5D342679D00A008AED32 /* BucketList.swift */; };
F9CD5D362679D00A008AED32 /* BucketList.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9CD5D342679D00A008AED32 /* BucketList.swift */; };
F9CD5D382679D237008AED32 /* CocktailStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9CD5D372679D237008AED32 /* CocktailStore.swift */; };
F9CD5D392679D237008AED32 /* CocktailStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9CD5D372679D237008AED32 /* CocktailStore.swift */; };
F9CD5D3C2679E5CE008AED32 /* Sidebar.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9CD5D3B2679E5CE008AED32 /* Sidebar.swift */; };
F9CD5D3D2679E5CE008AED32 /* Sidebar.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9CD5D3B2679E5CE008AED32 /* Sidebar.swift */; };
F9CD5D3F2679E5FA008AED32 /* BucketListDetail.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9CD5D3E2679E5FA008AED32 /* BucketListDetail.swift */; };
F9CD5D402679E5FA008AED32 /* BucketListDetail.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9CD5D3E2679E5FA008AED32 /* BucketListDetail.swift */; };
F9CD5D422679E61C008AED32 /* EditCocktail.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9CD5D412679E61C008AED32 /* EditCocktail.swift */; };
F9CD5D432679E61C008AED32 /* EditCocktail.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9CD5D412679E61C008AED32 /* EditCocktail.swift */; };
F9F9D4122844B26800DC4B06 /* Persistence.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9F9D4112844B26800DC4B06 /* Persistence.swift */; };
F9F9D4132844B26800DC4B06 /* Persistence.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9F9D4112844B26800DC4B06 /* Persistence.swift */; };
F9F9D41528466ACC00DC4B06 /* BucketList+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9F9D41428466ACC00DC4B06 /* BucketList+Extensions.swift */; };
F9F9D41628466ACC00DC4B06 /* BucketList+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9F9D41428466ACC00DC4B06 /* BucketList+Extensions.swift */; };
F9F9D41828466DB900DC4B06 /* Cocktail+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9F9D41728466DB900DC4B06 /* Cocktail+Extensions.swift */; };
F9F9D41928466DB900DC4B06 /* Cocktail+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9F9D41728466DB900DC4B06 /* Cocktail+Extensions.swift */; };
F9F9D41B28473C7A00DC4B06 /* Ingredient+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9F9D41A28473C7A00DC4B06 /* Ingredient+Extensions.swift */; };
F9F9D41C28473C7A00DC4B06 /* Ingredient+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9F9D41A28473C7A00DC4B06 /* Ingredient+Extensions.swift */; };
F9F9D41E28473D1F00DC4B06 /* Step+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9F9D41D28473D1F00DC4B06 /* Step+Extensions.swift */; };
F9F9D41F28473D1F00DC4B06 /* Step+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9F9D41D28473D1F00DC4B06 /* Step+Extensions.swift */; };
F9F9D421284DFC5600DC4B06 /* Attachment+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9F9D420284DFC5600DC4B06 /* Attachment+Extensions.swift */; };
F9F9D422284DFC5600DC4B06 /* Attachment+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9F9D420284DFC5600DC4B06 /* Attachment+Extensions.swift */; };
F9F9D424284E066100DC4B06 /* ImagePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9F9D423284E066100DC4B06 /* ImagePicker.swift */; };
F9F9D425284E066100DC4B06 /* ImagePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9F9D423284E066100DC4B06 /* ImagePicker.swift */; };
F9F9D428284E06A300DC4B06 /* CropViewController in Frameworks */ = {isa = PBXBuildFile; productRef = F9F9D427284E06A300DC4B06 /* CropViewController */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
F9629753267A222500BA814A /* Step.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Step.swift; sourceTree = "<group>"; };
F9629756267A23A200BA814A /* CocktailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CocktailView.swift; sourceTree = "<group>"; };
F9CD5D082679CBEF008AED32 /* Shared.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Shared.xcdatamodel; sourceTree = "<group>"; };
F9CD5D092679CBEF008AED32 /* CocktailBucketApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CocktailBucketApp.swift; sourceTree = "<group>"; };
F9CD5D0A2679CBEF008AED32 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
F9CD5D0C2679CBF0008AED32 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
F9CD5D112679CBF0008AED32 /* CocktailBucket.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CocktailBucket.app; sourceTree = BUILT_PRODUCTS_DIR; };
F9CD5D172679CBF0008AED32 /* CocktailBucket.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CocktailBucket.app; sourceTree = BUILT_PRODUCTS_DIR; };
F9CD5D2B2679CD9E008AED32 /* Cocktail.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Cocktail.swift; sourceTree = "<group>"; };
F9CD5D2E2679CDAF008AED32 /* Ingredient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Ingredient.swift; sourceTree = "<group>"; };
F9CD5D342679D00A008AED32 /* BucketList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BucketList.swift; sourceTree = "<group>"; };
F9CD5D372679D237008AED32 /* CocktailStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CocktailStore.swift; sourceTree = "<group>"; };
F9CD5D3B2679E5CE008AED32 /* Sidebar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Sidebar.swift; sourceTree = "<group>"; };
F9CD5D3E2679E5FA008AED32 /* BucketListDetail.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BucketListDetail.swift; sourceTree = "<group>"; };
F9CD5D412679E61C008AED32 /* EditCocktail.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditCocktail.swift; sourceTree = "<group>"; };
F9F9D4112844B26800DC4B06 /* Persistence.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Persistence.swift; sourceTree = "<group>"; };
F9F9D41428466ACC00DC4B06 /* BucketList+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "BucketList+Extensions.swift"; sourceTree = "<group>"; };
F9F9D41728466DB900DC4B06 /* Cocktail+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Cocktail+Extensions.swift"; sourceTree = "<group>"; };
F9F9D41A28473C7A00DC4B06 /* Ingredient+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Ingredient+Extensions.swift"; sourceTree = "<group>"; };
F9F9D41D28473D1F00DC4B06 /* Step+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Step+Extensions.swift"; sourceTree = "<group>"; };
F9F9D420284DFC5600DC4B06 /* Attachment+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Attachment+Extensions.swift"; sourceTree = "<group>"; };
F9F9D423284E066100DC4B06 /* ImagePicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImagePicker.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
F9CD5D0E2679CBF0008AED32 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
F9F9D428284E06A300DC4B06 /* CropViewController in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -85,8 +93,9 @@
F9CD5D3A2679E5A1008AED32 /* Views */,
F9CD5D2A2679CD78008AED32 /* Model */,
F9CD5D092679CBEF008AED32 /* CocktailBucketApp.swift */,
F9CD5D0C2679CBF0008AED32 /* Assets.xcassets */,
F9F9D4112844B26800DC4B06 /* Persistence.swift */,
F9CD5D072679CBEF008AED32 /* CocktailBucket.xcdatamodeld */,
F9CD5D0C2679CBF0008AED32 /* Assets.xcassets */,
);
path = Shared;
sourceTree = "<group>";
Expand All @@ -103,11 +112,11 @@
F9CD5D2A2679CD78008AED32 /* Model */ = {
isa = PBXGroup;
children = (
F9CD5D342679D00A008AED32 /* BucketList.swift */,
F9CD5D2B2679CD9E008AED32 /* Cocktail.swift */,
F9CD5D2E2679CDAF008AED32 /* Ingredient.swift */,
F9CD5D372679D237008AED32 /* CocktailStore.swift */,
F9629753267A222500BA814A /* Step.swift */,
F9F9D41428466ACC00DC4B06 /* BucketList+Extensions.swift */,
F9F9D41728466DB900DC4B06 /* Cocktail+Extensions.swift */,
F9F9D41A28473C7A00DC4B06 /* Ingredient+Extensions.swift */,
F9F9D41D28473D1F00DC4B06 /* Step+Extensions.swift */,
F9F9D420284DFC5600DC4B06 /* Attachment+Extensions.swift */,
);
path = Model;
sourceTree = "<group>";
Expand All @@ -120,6 +129,7 @@
F9CD5D3E2679E5FA008AED32 /* BucketListDetail.swift */,
F9CD5D412679E61C008AED32 /* EditCocktail.swift */,
F9629756267A23A200BA814A /* CocktailView.swift */,
F9F9D423284E066100DC4B06 /* ImagePicker.swift */,
);
path = Views;
sourceTree = "<group>";
Expand All @@ -140,6 +150,9 @@
dependencies = (
);
name = "CocktailBucket (iOS)";
packageProductDependencies = (
F9F9D427284E06A300DC4B06 /* CropViewController */,
);
productName = "CocktailBucket (iOS)";
productReference = F9CD5D112679CBF0008AED32 /* CocktailBucket.app */;
productType = "com.apple.product-type.application";
Expand Down Expand Up @@ -188,6 +201,9 @@
Base,
);
mainGroup = F9CD5D012679CBEF008AED32;
packageReferences = (
F9F9D426284E06A300DC4B06 /* XCRemoteSwiftPackageReference "TOCropViewController" */,
);
productRefGroup = F9CD5D122679CBF0008AED32 /* Products */;
projectDirPath = "";
projectRoot = "";
Expand Down Expand Up @@ -222,16 +238,18 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
F9F9D41E28473D1F00DC4B06 /* Step+Extensions.swift in Sources */,
F9CD5D3F2679E5FA008AED32 /* BucketListDetail.swift in Sources */,
F9CD5D182679CBF0008AED32 /* CocktailBucket.xcdatamodeld in Sources */,
F9CD5D2F2679CDAF008AED32 /* Ingredient.swift in Sources */,
F9F9D424284E066100DC4B06 /* ImagePicker.swift in Sources */,
F9CD5D422679E61C008AED32 /* EditCocktail.swift in Sources */,
F9629754267A222500BA814A /* Step.swift in Sources */,
F9F9D41828466DB900DC4B06 /* Cocktail+Extensions.swift in Sources */,
F9CD5D1A2679CBF0008AED32 /* CocktailBucketApp.swift in Sources */,
F9CD5D382679D237008AED32 /* CocktailStore.swift in Sources */,
F9F9D4122844B26800DC4B06 /* Persistence.swift in Sources */,
F9F9D421284DFC5600DC4B06 /* Attachment+Extensions.swift in Sources */,
F9629757267A23A200BA814A /* CocktailView.swift in Sources */,
F9CD5D352679D00A008AED32 /* BucketList.swift in Sources */,
F9CD5D2C2679CD9E008AED32 /* Cocktail.swift in Sources */,
F9F9D41B28473C7A00DC4B06 /* Ingredient+Extensions.swift in Sources */,
F9F9D41528466ACC00DC4B06 /* BucketList+Extensions.swift in Sources */,
F9CD5D3C2679E5CE008AED32 /* Sidebar.swift in Sources */,
F9CD5D1C2679CBF0008AED32 /* ContentView.swift in Sources */,
);
Expand All @@ -241,16 +259,18 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
F9F9D41F28473D1F00DC4B06 /* Step+Extensions.swift in Sources */,
F9CD5D402679E5FA008AED32 /* BucketListDetail.swift in Sources */,
F9CD5D192679CBF0008AED32 /* CocktailBucket.xcdatamodeld in Sources */,
F9CD5D302679CDAF008AED32 /* Ingredient.swift in Sources */,
F9F9D425284E066100DC4B06 /* ImagePicker.swift in Sources */,
F9CD5D432679E61C008AED32 /* EditCocktail.swift in Sources */,
F9629755267A222500BA814A /* Step.swift in Sources */,
F9F9D41928466DB900DC4B06 /* Cocktail+Extensions.swift in Sources */,
F9CD5D1B2679CBF0008AED32 /* CocktailBucketApp.swift in Sources */,
F9CD5D392679D237008AED32 /* CocktailStore.swift in Sources */,
F9F9D4132844B26800DC4B06 /* Persistence.swift in Sources */,
F9F9D422284DFC5600DC4B06 /* Attachment+Extensions.swift in Sources */,
F9629758267A23A200BA814A /* CocktailView.swift in Sources */,
F9CD5D362679D00A008AED32 /* BucketList.swift in Sources */,
F9CD5D2D2679CD9E008AED32 /* Cocktail.swift in Sources */,
F9F9D41C28473C7A00DC4B06 /* Ingredient+Extensions.swift in Sources */,
F9F9D41628466ACC00DC4B06 /* BucketList+Extensions.swift in Sources */,
F9CD5D3D2679E5CE008AED32 /* Sidebar.swift in Sources */,
F9CD5D1D2679CBF0008AED32 /* ContentView.swift in Sources */,
);
Expand Down Expand Up @@ -525,6 +545,25 @@
};
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
F9F9D426284E06A300DC4B06 /* XCRemoteSwiftPackageReference "TOCropViewController" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/TimOliver/TOCropViewController.git";
requirement = {
branch = main;
kind = branch;
};
};
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
F9F9D427284E06A300DC4B06 /* CropViewController */ = {
isa = XCSwiftPackageProductDependency;
package = F9F9D426284E06A300DC4B06 /* XCRemoteSwiftPackageReference "TOCropViewController" */;
productName = CropViewController;
};
/* End XCSwiftPackageProductDependency section */

/* Begin XCVersionGroup section */
F9CD5D072679CBEF008AED32 /* CocktailBucket.xcdatamodeld */ = {
isa = XCVersionGroup;
Expand Down
14 changes: 14 additions & 0 deletions CocktailBucket.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop

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

Loading