Add feedItems to user

Author: Joey Lorich

EasyReader/Application/Controllers/Home/CSHomeViewController.m

@@ -98,8 +98,13 @@ - (void) setupFeedItemObserver
 
 - (void)setUpCollectionView
 {
-    NSArray *feedItems = [FeedItem MR_findAll]; 
-    
+//    User *current = [User current];
+//    
+//    NSSet *feedItems = current.feedItems;
+
+    NSArray *feedItems = [FeedItem MR_findAll];
+    FeedItem *first = feedItems[0];
+    NSLog(@"%@", first.name);
     feedCollectionViewDataSource =
         [[CSFeedItemCollectionViewDataSource alloc] initWithFeedItems:feedItems
                                          reusableCellIdentifier:@"feedItemCell"

EasyReader/Application/Models/User.h

@@ -25,6 +25,9 @@
 /// The users feeds
 @property (nonatomic, retain) NSSet *feeds;
 
+/// The items in a users feeds
+@property (nonatomic, readonly) NSSet *feedItems;
+
 
 #pragma mark - Methods
 

EasyReader/Application/Models/User.m

@@ -13,6 +13,22 @@
 @implementation User
 
 @dynamic feeds;
+@dynamic feedItems;
+
+/**
+ * Gathers all the items in a users feeds
+ */
+- (NSSet *)feedItems
+{
+    NSMutableSet *feedItems = [[NSMutableSet alloc] init];
+
+    for (Feed *feed in self.feeds)
+    {
+        [feedItems setByAddingObjectsFromSet:feed.feedItems];
+    }
+    
+    return feedItems;
+}
 
 /**
  * Returns the current user.

EasyReader/Application/Views/Main_iPhone.storyboard

@@ -17,7 +17,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
-                            <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" fixedFrame="YES" bounces="NO" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EWA-9Z-pb1">
+                            <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" bounces="NO" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EWA-9Z-pb1">
                                 <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                 <subviews>
@@ -141,6 +141,10 @@
                                         </constraints>
                                     </pageControl>
                                 </subviews>
+                                <constraints>
+                                    <constraint firstAttribute="trailing" secondItem="vdW-Yb-aAb" secondAttribute="trailing" id="Bcm-5I-kx3"/>
+                                    <constraint firstItem="vdW-Yb-aAb" firstAttribute="leading" secondItem="EWA-9Z-pb1" secondAttribute="leading" id="ct5-rK-kEl"/>
+                                </constraints>
                             </scrollView>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>

EasyReader/Resources/CoreData/EasyReader.xcdatamodeld/api_v2.xcdatamodel/contents

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="3401" systemVersion="12F45" minimumToolsVersion="Xcode 4.3" macOSVersion="Automatic" iOSVersion="Automatic">
+<model userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="5063" systemVersion="13C64" minimumToolsVersion="Xcode 4.3" macOSVersion="Automatic" iOSVersion="Automatic">
     <entity name="Feed" representedClassName="Feed" syncable="YES">
         <attribute name="icon" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="id" optional="YES" attributeType="Integer 16" defaultValueString="0" syncable="YES"/>
@@ -23,8 +23,8 @@
         <relationship name="feeds" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="Feed" inverseName="user" inverseEntity="Feed" syncable="YES"/>
     </entity>
     <elements>
-        <element name="Feed" positionX="0" positionY="0" width="0" height="0"/>
-        <element name="FeedItem" positionX="0" positionY="0" width="0" height="0"/>
-        <element name="User" positionX="0" positionY="0" width="0" height="0"/>
+        <element name="Feed" positionX="0" positionY="0" width="128" height="135"/>
+        <element name="FeedItem" positionX="0" positionY="0" width="128" height="178"/>
+        <element name="User" positionX="0" positionY="0" width="128" height="58"/>
     </elements>
 </model>