Skip to content

Commit 2d619ad

Browse files
author
Joey Lorich
committed
Update image names to match staging
1 parent b51e86b commit 2d619ad

9 files changed

Lines changed: 46 additions & 11 deletions

File tree

‎EasyReader.xcodeproj/project.pbxproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,7 @@
387387
9D42976F170E164D00E73BFE /* CSMenuLeftViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CSMenuLeftViewController.m; path = Menu/CSMenuLeftViewController.m; sourceTree = "<group>"; };
388388
9D4355731795C708002C6657 /* Social.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Social.framework; path = System/Library/Frameworks/Social.framework; sourceTree = SDKROOT; };
389389
9D4355751795C9B3002C6657 /* MessageUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MessageUI.framework; path = System/Library/Frameworks/MessageUI.framework; sourceTree = SDKROOT; };
390+
9D458C6A18E320B100BC17D6 /* rename_feeditem_images.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = rename_feeditem_images.xcdatamodel; sourceTree = "<group>"; };
390391
9D4FA6E317971D56001E2A65 /* Default-Portrait~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-Portrait~ipad.png"; sourceTree = "<group>"; };
391392
9D4FA6E517971D5B001E2A65 /* Default-Portrait@2x~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-Portrait@2x~ipad.png"; sourceTree = "<group>"; };
392393
9D4FA6E717971E88001E2A65 /* Default-Landscape~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-Landscape~ipad.png"; sourceTree = "<group>"; };
@@ -1899,10 +1900,11 @@
18991900
9DF4BB1D17130E99001DCC88 /* Easy Reader.xcdatamodeld */ = {
19001901
isa = XCVersionGroup;
19011902
children = (
1903+
9D458C6A18E320B100BC17D6 /* rename_feeditem_images.xcdatamodel */,
19021904
0DE51FE318CF8BDE00454E51 /* api_v2.xcdatamodel */,
19031905
9DF4BB1E17130E99001DCC88 /* EasyReader.xcdatamodel */,
19041906
);
1905-
currentVersion = 0DE51FE318CF8BDE00454E51 /* api_v2.xcdatamodel */;
1907+
currentVersion = 9D458C6A18E320B100BC17D6 /* rename_feeditem_images.xcdatamodel */;
19061908
name = "Easy Reader.xcdatamodeld";
19071909
path = EasyReader.xcdatamodeld;
19081910
sourceTree = "<group>";

‎EasyReader/Application/Controllers/Home/CSHomeViewController.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ - (configureFeedItemCell)configureFeedItem
202202
cell.label_summary.text = feedItem.summary;
203203
cell.feedItem = feedItem;
204204

205-
[cell.imageView_background setImageWithURL:[NSURL URLWithString:feedItem.iphone_retina_image]];
205+
[cell.imageView_background setImageWithURL:[NSURL URLWithString:feedItem.image_iphone_retina]];
206206
};
207207
}
208208

‎EasyReader/Application/Controllers/Home/FeedItemCollectionView/CSFeedItemCell.m‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ - (void)layoutSubviews
2929

3030
- (void)applyInfoGradient
3131
{
32+
[self.info_view setBackgroundColor:[UIColor clearColor]];
33+
3234
// Create a new gradient object
3335
CAGradientLayer *gradient = [CAGradientLayer layer];
3436

‎EasyReader/Application/Models/FeedItem.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939
@property (nonatomic, retain) NSDate * createdAt;
4040

4141

42-
@property (nonatomic, retain) NSString * iphone_retina_image;
43-
@property (nonatomic, retain) NSString * ipad_image;
44-
@property (nonatomic, retain) NSString * ipad_retina_image;
42+
@property (nonatomic, retain) NSString * image_iphone_retina;
43+
@property (nonatomic, retain) NSString * image_ipad;
44+
@property (nonatomic, retain) NSString * image_ipad_retina;
4545

4646
/// The article URL for this feed item
4747
@property (nonatomic, retain) NSString * url;

‎EasyReader/Application/Models/FeedItem.m‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ @implementation FeedItem
1919
@dynamic updatedAt;
2020
@dynamic publishedAt;
2121
@dynamic createdAt;
22-
@dynamic iphone_retina_image;
23-
@dynamic ipad_image;
24-
@dynamic ipad_retina_image;
22+
@dynamic image_iphone_retina;
23+
@dynamic image_ipad;
24+
@dynamic image_ipad_retina;
2525
@dynamic url;
2626
@dynamic feed;
2727
@dynamic id;

‎EasyReader/Application/Views/Main_iPhone.storyboard‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@
102102
<nil key="highlightedColor"/>
103103
</label>
104104
</subviews>
105-
<color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
106105
<constraints>
107106
<constraint firstAttribute="bottom" secondItem="5IB-v3-acz" secondAttribute="bottom" constant="98" id="2tv-1M-IpA"/>
108107
<constraint firstItem="Hbm-RM-Vyr" firstAttribute="top" secondItem="Xwa-jG-ubQ" secondAttribute="bottom" constant="71" id="78o-Gp-T4g"/>

‎EasyReader/Resources/CoreData/EasyReader.xcdatamodeld/.xccurrentversion‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
<plist version="1.0">
44
<dict>
55
<key>_XCCurrentVersionName</key>
6-
<string>api_v2.xcdatamodel</string>
6+
<string>rename_feeditem_images.xcdatamodel</string>
77
</dict>
88
</plist>

‎EasyReader/Resources/CoreData/EasyReader.xcdatamodeld/rename_feeditem_images.xcdatamodel/contents‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2+
<model userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="5063" systemVersion="13C64" minimumToolsVersion="Xcode 4.3" macOSVersion="Automatic" iOSVersion="Automatic">
3+
<entity name="Feed" representedClassName="Feed" syncable="YES">
4+
<attribute name="icon" optional="YES" attributeType="String" syncable="YES"/>
5+
<attribute name="id" optional="YES" attributeType="Integer 16" defaultValueString="0" syncable="YES"/>
6+
<attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
7+
<attribute name="url" optional="YES" attributeType="String" syncable="YES"/>
8+
<relationship name="feedItems" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="FeedItem" inverseName="feed" inverseEntity="FeedItem" syncable="YES"/>
9+
<relationship name="user" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="User" inverseName="feeds" inverseEntity="User" syncable="YES"/>
10+
</entity>
11+
<entity name="FeedItem" representedClassName="FeedItem" syncable="YES">
12+
<attribute name="createdAt" optional="YES" attributeType="Date" syncable="YES"/>
13+
<attribute name="id" optional="YES" attributeType="Integer 16" defaultValueString="0" syncable="YES"/>
14+
<attribute name="image_ipad" optional="YES" attributeType="String" syncable="YES"/>
15+
<attribute name="image_ipad_retina" optional="YES" attributeType="String" syncable="YES"/>
16+
<attribute name="image_iphone_retina" optional="YES" attributeType="String" syncable="YES"/>
17+
<attribute name="publishedAt" optional="YES" attributeType="Date" syncable="YES"/>
18+
<attribute name="summary" optional="YES" attributeType="String" syncable="YES"/>
19+
<attribute name="title" optional="YES" attributeType="String" syncable="YES"/>
20+
<attribute name="updatedAt" optional="YES" attributeType="Date" syncable="YES"/>
21+
<attribute name="url" optional="YES" attributeType="String" syncable="YES"/>
22+
<relationship name="feed" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Feed" inverseName="feedItems" inverseEntity="Feed" syncable="YES"/>
23+
</entity>
24+
<entity name="User" representedClassName="User" syncable="YES">
25+
<relationship name="feeds" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="Feed" inverseName="user" inverseEntity="Feed" syncable="YES"/>
26+
</entity>
27+
<elements>
28+
<element name="Feed" positionX="0" positionY="0" width="128" height="135"/>
29+
<element name="FeedItem" positionX="0" positionY="0" width="128" height="210"/>
30+
<element name="User" positionX="0" positionY="0" width="128" height="58"/>
31+
</elements>
32+
</model>

‎EasyReader/Supporting Files/Staging-Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
</dict>
5252
</array>
5353
<key>CFBundleVersion</key>
54-
<string>2.0.21</string>
54+
<string>2.0.22</string>
5555
<key>LSApplicationCategoryType</key>
5656
<string></string>
5757
<key>LSRequiresIPhoneOS</key>

0 commit comments

Comments
 (0)