Skip to content

Commit d49f15b

Browse files
sameersydsameersyd
authored
Merge pull request #4 from sameersyd/add-coreData
Add core data
2 parents 0b72b20 + 34aae60 commit d49f15b

23 files changed

Lines changed: 412 additions & 50 deletions

File tree

‎BoxFeed.xcodeproj/project.pbxproj‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
73056CE726F6BF4E00DD94BA /* ArticleCD.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73056CE626F6BF4E00DD94BA /* ArticleCD.swift */; };
11+
73056CEA26F6D61300DD94BA /* BookmarksView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73056CE926F6D61300DD94BA /* BookmarksView.swift */; };
12+
73056CEC26F6D63400DD94BA /* BookmarksViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73056CEB26F6D63400DD94BA /* BookmarksViewModel.swift */; };
13+
73056CEE26F6E06E00DD94BA /* ArticleViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73056CED26F6E06E00DD94BA /* ArticleViewModel.swift */; };
1014
732E1D59269620970085F136 /* Config.swift in Sources */ = {isa = PBXBuildFile; fileRef = 732E1D58269620970085F136 /* Config.swift */; };
1115
732E1D5F269621C10085F136 /* HomeViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 732E1D5E269621C10085F136 /* HomeViewModel.swift */; };
1216
732E1D612696222A0085F136 /* HomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 732E1D602696222A0085F136 /* HomeView.swift */; };
@@ -31,6 +35,10 @@
3135
/* End PBXBuildFile section */
3236

3337
/* Begin PBXFileReference section */
38+
73056CE626F6BF4E00DD94BA /* ArticleCD.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArticleCD.swift; sourceTree = "<group>"; };
39+
73056CE926F6D61300DD94BA /* BookmarksView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksView.swift; sourceTree = "<group>"; };
40+
73056CEB26F6D63400DD94BA /* BookmarksViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksViewModel.swift; sourceTree = "<group>"; };
41+
73056CED26F6E06E00DD94BA /* ArticleViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArticleViewModel.swift; sourceTree = "<group>"; };
3442
732E1D58269620970085F136 /* Config.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Config.swift; sourceTree = "<group>"; };
3543
732E1D5E269621C10085F136 /* HomeViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeViewModel.swift; sourceTree = "<group>"; };
3644
732E1D602696222A0085F136 /* HomeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeView.swift; sourceTree = "<group>"; };
@@ -67,6 +75,15 @@
6775
/* End PBXFrameworksBuildPhase section */
6876

6977
/* Begin PBXGroup section */
78+
73056CE826F6D60200DD94BA /* Bookmarks */ = {
79+
isa = PBXGroup;
80+
children = (
81+
73056CE926F6D61300DD94BA /* BookmarksView.swift */,
82+
73056CEB26F6D63400DD94BA /* BookmarksViewModel.swift */,
83+
);
84+
path = Bookmarks;
85+
sourceTree = "<group>";
86+
};
7087
730692922697A6BD008482DE /* CustomViews */ = {
7188
isa = PBXGroup;
7289
children = (
@@ -75,6 +92,14 @@
7592
path = CustomViews;
7693
sourceTree = "<group>";
7794
};
95+
7312871026F67E780060DBE0 /* CoreData */ = {
96+
isa = PBXGroup;
97+
children = (
98+
73056CE626F6BF4E00DD94BA /* ArticleCD.swift */,
99+
);
100+
path = CoreData;
101+
sourceTree = "<group>";
102+
};
78103
731DB92B26F43FAB004D9B27 /* Resources */ = {
79104
isa = PBXGroup;
80105
children = (
@@ -86,6 +111,7 @@
86111
731DB92C26F43FCC004D9B27 /* Library */ = {
87112
isa = PBXGroup;
88113
children = (
114+
7312871026F67E780060DBE0 /* CoreData */,
89115
736C8EE126F5B3250053CC8F /* Services */,
90116
73D48CEB26938A8F0044A5CC /* Helpers */,
91117
730692922697A6BD008482DE /* CustomViews */,
@@ -97,6 +123,7 @@
97123
732E1D5A269621770085F136 /* Screens */ = {
98124
isa = PBXGroup;
99125
children = (
126+
73056CE826F6D60200DD94BA /* Bookmarks */,
100127
73FC2DBA2698848800373EB3 /* Article */,
101128
732E1D5B269621960085F136 /* Home */,
102129
);
@@ -204,6 +231,7 @@
204231
isa = PBXGroup;
205232
children = (
206233
73FC2DBB269884BA00373EB3 /* ArticleView.swift */,
234+
73056CED26F6E06E00DD94BA /* ArticleViewModel.swift */,
207235
);
208236
path = Article;
209237
sourceTree = "<group>";
@@ -284,6 +312,8 @@
284312
73D48CFE269397C10044A5CC /* NewsModel.swift in Sources */,
285313
736C8EE726F5B8ED0053CC8F /* Extensions.swift in Sources */,
286314
736C8EE326F5B34A0053CC8F /* NewsService.swift in Sources */,
315+
73056CE726F6BF4E00DD94BA /* ArticleCD.swift in Sources */,
316+
73056CEA26F6D61300DD94BA /* BookmarksView.swift in Sources */,
287317
737FE37E2697B0BF00A33EB7 /* ActivityIndicator.swift in Sources */,
288318
73D48CE3269387EA0044A5CC /* BoxFeed.xcdatamodeld in Sources */,
289319
732E1D59269620970085F136 /* Config.swift in Sources */,
@@ -292,8 +322,10 @@
292322
732E1D5F269621C10085F136 /* HomeViewModel.swift in Sources */,
293323
73D48CD7269387E50044A5CC /* BoxFeedApp.swift in Sources */,
294324
73D48CFB269394E00044A5CC /* ImageExtension.swift in Sources */,
325+
73056CEE26F6E06E00DD94BA /* ArticleViewModel.swift in Sources */,
295326
73D48CF926938E980044A5CC /* ColorExtension.swift in Sources */,
296327
73FC2DBC269884BA00373EB3 /* ArticleView.swift in Sources */,
328+
73056CEC26F6D63400DD94BA /* BookmarksViewModel.swift in Sources */,
297329
73D48CEE26938AE60044A5CC /* FontModifier.swift in Sources */,
298330
732E1D65269625DB0085F136 /* NewsSelectorView.swift in Sources */,
299331
73D48CF726938DE20044A5CC /* Models.swift in Sources */,

‎BoxFeed.xcodeproj/project.xcworkspace/xcuserdata/sameernawaz.xcuserdatad/UserInterfaceState.xcuserstate‎

8.75 KB
Binary file not shown.

‎BoxFeed/Assets.xcassets/clock.imageset/clock-outline 2.png‎

-2.05 KB
Binary file not shown.

‎BoxFeed/Assets.xcassets/clock.imageset/clock-outline 2@2x.png‎

-4.37 KB
Binary file not shown.

‎BoxFeed/Assets.xcassets/clock.imageset/clock-outline 2@3x.png‎

-7.11 KB
Binary file not shown.

BoxFeed/Assets.xcassets/clock.imageset/Contents.json renamed to BoxFeed/Assets.xcassets/pen.imageset/Contents.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
22
"images" : [
33
{
4-
"filename" : "clock-outline 2.png",
4+
"filename" : "edit-2-outline 1.png",
55
"idiom" : "universal",
66
"scale" : "1x"
77
},
88
{
9-
"filename" : "clock-outline 2@2x.png",
9+
"filename" : "edit-2-outline 1@2x.png",
1010
"idiom" : "universal",
1111
"scale" : "2x"
1212
},
1313
{
14-
"filename" : "clock-outline 2@3x.png",
14+
"filename" : "edit-2-outline 1@3x.png",
1515
"idiom" : "universal",
1616
"scale" : "3x"
1717
}

‎BoxFeed/Assets.xcassets/pen.imageset/edit-2-outline 1.png‎

1.24 KB
Loading

‎BoxFeed/Assets.xcassets/pen.imageset/edit-2-outline 1@2x.png‎

2.65 KB
Loading

‎BoxFeed/Assets.xcassets/pen.imageset/edit-2-outline 1@3x.png‎

4.21 KB
Loading

‎BoxFeed/BoxFeed.xcdatamodeld/BoxFeed.xcdatamodel/contents‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,18 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="1" systemVersion="11A491" minimumToolsVersion="Automatic" sourceLanguage="Swift" usedWithCloudKit="false" userDefinedModelVersionIdentifier="">
3-
<entity name="Item" representedClassName="Item" syncable="YES" codeGenerationType="class">
4-
<attribute name="timestamp" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
2+
<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="19141.11" systemVersion="21A5284e" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
3+
<entity name="ArticleCD" representedClassName=".ArticleCD" syncable="YES">
4+
<attribute name="author" optional="YES" attributeType="String"/>
5+
<attribute name="content" optional="YES" attributeType="String"/>
6+
<attribute name="createdAt" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
7+
<attribute name="desc" optional="YES" attributeType="String"/>
8+
<attribute name="id" optional="YES" attributeType="UUID" usesScalarValueType="NO"/>
9+
<attribute name="publishedAt" optional="YES" attributeType="String"/>
10+
<attribute name="sourceId" optional="YES" attributeType="String"/>
11+
<attribute name="title" optional="YES" attributeType="String"/>
12+
<attribute name="url" optional="YES" attributeType="String"/>
13+
<attribute name="urlToImage" optional="YES" attributeType="String"/>
514
</entity>
615
<elements>
7-
<element name="Item" positionX="-63" positionY="-18" width="128" height="44"/>
16+
<element name="ArticleCD" positionX="-63" positionY="-18" width="128" height="179"/>
817
</elements>
918
</model>

0 commit comments

Comments
 (0)