Skip to content

Commit 1d0b20a

Browse files
author
Joey Lorich
committed
Add iPad support
1 parent 16a69e0 commit 1d0b20a

11 files changed

Lines changed: 496 additions & 15 deletions

File tree

‎EasyReader.xcodeproj/project.pbxproj‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,10 @@
6868
9D458C6F18E3286500BC17D6 /* EZRFeedItemUpdateService.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D458C6D18E3286500BC17D6 /* EZRFeedItemUpdateService.m */; };
6969
9D458C7018E3286500BC17D6 /* EZRFeedItemUpdateService.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D458C6D18E3286500BC17D6 /* EZRFeedItemUpdateService.m */; };
7070
9D458C7118E3286500BC17D6 /* EZRFeedItemUpdateService.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D458C6D18E3286500BC17D6 /* EZRFeedItemUpdateService.m */; };
71+
9D5A134D1922E69900BE4CEF /* Main_iPad.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9D5A134C1922E69900BE4CEF /* Main_iPad.storyboard */; };
72+
9D5A134E1922E69900BE4CEF /* Main_iPad.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9D5A134C1922E69900BE4CEF /* Main_iPad.storyboard */; };
73+
9D5A134F1922E69900BE4CEF /* Main_iPad.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9D5A134C1922E69900BE4CEF /* Main_iPad.storyboard */; };
74+
9D5A13501922E69900BE4CEF /* Main_iPad.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9D5A134C1922E69900BE4CEF /* Main_iPad.storyboard */; };
7175
9D5ACFBF18E5C787003CF3E7 /* UIImageView+EZRFeedImageAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D5ACFBE18E5C787003CF3E7 /* UIImageView+EZRFeedImageAdditions.m */; };
7276
9D5ACFC018E5C787003CF3E7 /* UIImageView+EZRFeedImageAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D5ACFBE18E5C787003CF3E7 /* UIImageView+EZRFeedImageAdditions.m */; };
7377
9D5ACFC118E5C787003CF3E7 /* UIImageView+EZRFeedImageAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D5ACFBE18E5C787003CF3E7 /* UIImageView+EZRFeedImageAdditions.m */; };
@@ -298,6 +302,7 @@
298302
9D458C6C18E3286500BC17D6 /* EZRFeedItemUpdateService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZRFeedItemUpdateService.h; sourceTree = "<group>"; };
299303
9D458C6D18E3286500BC17D6 /* EZRFeedItemUpdateService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZRFeedItemUpdateService.m; sourceTree = "<group>"; };
300304
9D458C7718E3327D00BC17D6 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.md; sourceTree = "<group>"; };
305+
9D5A134C1922E69900BE4CEF /* Main_iPad.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main_iPad.storyboard; sourceTree = "<group>"; };
301306
9D5ACFBD18E5C787003CF3E7 /* UIImageView+EZRFeedImageAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIImageView+EZRFeedImageAdditions.h"; path = "EasyReader/Application/Categories/UIImageView+EZRFeedImageAdditions.h"; sourceTree = SOURCE_ROOT; };
302307
9D5ACFBE18E5C787003CF3E7 /* UIImageView+EZRFeedImageAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIImageView+EZRFeedImageAdditions.m"; path = "EasyReader/Application/Categories/UIImageView+EZRFeedImageAdditions.m"; sourceTree = SOURCE_ROOT; };
303308
9D607E4518DCE0FD004DF7F3 /* Development-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "Development-Info.plist"; sourceTree = "<group>"; };
@@ -857,6 +862,7 @@
857862
9DC020F51921C2A70041D8D4 /* Storyboards */ = {
858863
isa = PBXGroup;
859864
children = (
865+
9D5A134C1922E69900BE4CEF /* Main_iPad.storyboard */,
860866
9DC020F61921C2A70041D8D4 /* Main_iPhone.storyboard */,
861867
);
862868
path = Storyboards;
@@ -1010,6 +1016,7 @@
10101016
isa = PBXResourcesBuildPhase;
10111017
buildActionMask = 2147483647;
10121018
files = (
1019+
9D5A134F1922E69900BE4CEF /* Main_iPad.storyboard in Resources */,
10131020
9D010EE818F58BA2001999EE /* Media.xcassets in Resources */,
10141021
9DC020F91921C2A70041D8D4 /* Main_iPhone.storyboard in Resources */,
10151022
);
@@ -1019,6 +1026,7 @@
10191026
isa = PBXResourcesBuildPhase;
10201027
buildActionMask = 2147483647;
10211028
files = (
1029+
9D5A13501922E69900BE4CEF /* Main_iPad.storyboard in Resources */,
10221030
9D010EE918F58BA2001999EE /* Media.xcassets in Resources */,
10231031
9DC020FA1921C2A70041D8D4 /* Main_iPhone.storyboard in Resources */,
10241032
);
@@ -1039,6 +1047,7 @@
10391047
9D010EE718F58BA2001999EE /* Media.xcassets in Resources */,
10401048
9D616F2F18EDB7160058EFE6 /* feedItems.json in Resources */,
10411049
9DC020F81921C2A70041D8D4 /* Main_iPhone.storyboard in Resources */,
1050+
9D5A134E1922E69900BE4CEF /* Main_iPad.storyboard in Resources */,
10421051
9D639E8918E0BAD500350B5F /* feeds.json in Resources */,
10431052
9D9CBB0518DCC68A00532F8C /* (null) in Resources */,
10441053
);
@@ -1048,6 +1057,7 @@
10481057
isa = PBXResourcesBuildPhase;
10491058
buildActionMask = 2147483647;
10501059
files = (
1060+
9D5A134D1922E69900BE4CEF /* Main_iPad.storyboard in Resources */,
10511061
9D010EE618F58BA2001999EE /* Media.xcassets in Resources */,
10521062
9DC020F71921C2A70041D8D4 /* Main_iPhone.storyboard in Resources */,
10531063
);
@@ -1573,7 +1583,7 @@
15731583
buildSettings = {
15741584
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
15751585
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
1576-
CODE_SIGN_IDENTITY = "iPhone Developer: Joseph Lorich (G28849DAB7)";
1586+
CODE_SIGN_IDENTITY = "";
15771587
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
15781588
GCC_PRECOMPILE_PREFIX_HEADER = YES;
15791589
GCC_PREFIX_HEADER = "EasyReader/Other Sources/EasyReader-Prefix.pch";
@@ -1590,8 +1600,8 @@
15901600
"$(PROJECT_DIR)/Pods/GoogleAnalytics-iOS-SDK",
15911601
);
15921602
PRODUCT_NAME = "Easy Reader";
1593-
PROVISIONING_PROFILE = "69FD30FF-426E-4BD8-8941-A0A741F92746";
1594-
TARGETED_DEVICE_FAMILY = 1;
1603+
PROVISIONING_PROFILE = "95A078F5-C68B-40F9-BE58-9AD3A36D668E";
1604+
TARGETED_DEVICE_FAMILY = "1,2";
15951605
VALID_ARCHS = "armv7 arm64 armv7s";
15961606
WRAPPER_EXTENSION = app;
15971607
};
@@ -1620,8 +1630,8 @@
16201630
"$(PROJECT_DIR)/Pods/GoogleAnalytics-iOS-SDK",
16211631
);
16221632
PRODUCT_NAME = "Easy Reader";
1623-
PROVISIONING_PROFILE = "E41143CF-D6B6-4CE1-8493-853B58EB0910";
1624-
TARGETED_DEVICE_FAMILY = 1;
1633+
PROVISIONING_PROFILE = "479F39F3-6896-4CB8-816C-0B5F93F5DC60";
1634+
TARGETED_DEVICE_FAMILY = "1,2";
16251635
VALID_ARCHS = "armv7 arm64 armv7s";
16261636
WRAPPER_EXTENSION = app;
16271637
};

‎EasyReader/Application/Controllers/EZRRootViewController.m‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,14 @@ - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
3535
self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
3636

3737
if (self) {
38-
UIStoryboard *storyboard_home = [UIStoryboard storyboardWithName:@"Main_iPhone" bundle:[NSBundle mainBundle]];
38+
UIStoryboard *storyboard_home;
39+
40+
if(UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
41+
storyboard_home = [UIStoryboard storyboardWithName:@"Main_iPad" bundle:[NSBundle mainBundle]];
42+
} else {
43+
storyboard_home = [UIStoryboard storyboardWithName:@"Main_iPhone" bundle:[NSBundle mainBundle]];
44+
}
45+
3946
EZRHomeViewController *collections = [storyboard_home instantiateViewControllerWithIdentifier:@"Home"];
4047
_viewController_main = collections;
4148

‎EasyReader/Application/Controllers/Home/CollectionView/EZRFeedItemCollectionViewCell.m‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,14 @@ - (void)setFeedItem:(FeedItem *)feedItem
3333

3434

3535
[self.info_view setBackgroundColor:[[UIColor darkGrayColor] colorWithAlphaComponent:0.60]];
36-
[self.imageView_background setImageForURLString:feedItem.imageIphoneRetina];
37-
[self.imageView_backgroundReflection setBlurredImageForURLString:feedItem.imageIphoneRetina];
36+
37+
if(UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
38+
[self.imageView_background setImageForURLString:feedItem.imageIpad];
39+
[self.imageView_backgroundReflection setBlurredImageForURLString:feedItem.imageIpad];
40+
} else {
41+
[self.imageView_background setImageForURLString:feedItem.imageIphoneRetina];
42+
[self.imageView_backgroundReflection setBlurredImageForURLString:feedItem.imageIphoneRetina];
43+
}
3844

3945
[self appleStyles];
4046

‎EasyReader/Application/Controllers/Menu/TableView/EZRMenuSearchFeedDataSource.m‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
6969
cell = [super tableView:tableView cellForRowAtIndexPath:indexPath];
7070
}
7171

72+
cell.backgroundColor = [UIColor clearColor];
73+
7274
return cell;
7375
}
7476

‎EasyReader/Application/Controllers/Menu/TableView/EZRMenuTableViewDelegate.m‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ - (UITableViewCellEditingStyle)tableView:(UITableView *)tableView editingStyleFo
4141
if (!ezrcell.feed) {
4242
return UITableViewCellEditingStyleNone;
4343
}
44+
} else if ([cell isKindOfClass:[EZRSearchFeedCell class]]) {
45+
return UITableViewCellEditingStyleNone;
4446
}
4547

4648
return UITableViewCellEditingStyleDelete;

‎EasyReader/Application/Controllers/Menu/TableView/EZRMenuUserFeedDataSource.m‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
6161
cell = [tableView dequeueReusableCellWithIdentifier:self.reusableCellIdentifier];;
6262
((EZRMenuFeedCell*)cell).feed = nil;
6363
((EZRMenuFeedCell*)cell).label_name.text = @"All Feeds";
64+
cell.backgroundColor = [UIColor clearColor];
6465
if (self.currentFeedsProvider.currentFeed == nil) {
6566
cell.selected = YES;
6667
}
@@ -72,6 +73,8 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
7273
cell.selected = YES;
7374
}
7475
}
76+
77+
cell.backgroundColor = [UIColor clearColor];
7578

7679
return cell;
7780
}

‎EasyReader/Application/Delegate/EZRAppDelegate.m‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,13 @@ - (void)setUpApplicationWindow
7070
{
7171
self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
7272

73-
UIStoryboard *mainStoryBoard = [UIStoryboard storyboardWithName:@"Main_iPhone" bundle:nil];
73+
UIStoryboard *mainStoryBoard;
74+
75+
if(UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
76+
mainStoryBoard = [UIStoryboard storyboardWithName:@"Main_iPad" bundle:[NSBundle mainBundle]];
77+
} else {
78+
mainStoryBoard = [UIStoryboard storyboardWithName:@"Main_iPhone" bundle:[NSBundle mainBundle]];
79+
}
7480

7581
EZRMenuViewController *leftMenuViewController = (EZRMenuViewController*)[mainStoryBoard instantiateViewControllerWithIdentifier:@"LeftMenu"];
7682

0 commit comments

Comments
 (0)