Skip to content

Commit 2701f2b

Browse files
author
jlorich
committed
Merge pull request #82 from cloudspace/split_pods_targets
Split pods targets
2 parents 3ac09a8 + d83cf85 commit 2701f2b

182 files changed

Lines changed: 37523 additions & 15728 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

EasyReader.xcodeproj/project.pbxproj

Lines changed: 6071 additions & 1961 deletions
Large diffs are not rendered by default.
Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "0510"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
</BuildAction>
9+
<TestAction
10+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
11+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
12+
shouldUseLaunchSchemeArgsEnv = "YES"
13+
buildConfiguration = "Debug">
14+
<Testables>
15+
<TestableReference
16+
skipped = "NO">
17+
<BuildableReference
18+
BuildableIdentifier = "primary"
19+
BlueprintIdentifier = "9D7927C218DA279B00E1D3E1"
20+
BuildableName = "EasyReader-Tests.xctest"
21+
BlueprintName = "EasyReader-Tests"
22+
ReferencedContainer = "container:EasyReader.xcodeproj">
23+
</BuildableReference>
24+
</TestableReference>
25+
</Testables>
26+
</TestAction>
27+
<LaunchAction
28+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
29+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
30+
launchStyle = "0"
31+
useCustomWorkingDirectory = "NO"
32+
buildConfiguration = "Debug"
33+
ignoresPersistentStateOnLaunch = "NO"
34+
debugDocumentVersioning = "YES"
35+
allowLocationSimulation = "YES">
36+
<AdditionalOptions>
37+
</AdditionalOptions>
38+
</LaunchAction>
39+
<ProfileAction
40+
shouldUseLaunchSchemeArgsEnv = "YES"
41+
savedToolIdentifier = ""
42+
useCustomWorkingDirectory = "NO"
43+
buildConfiguration = "Release"
44+
debugDocumentVersioning = "YES">
45+
</ProfileAction>
46+
<AnalyzeAction
47+
buildConfiguration = "Debug">
48+
</AnalyzeAction>
49+
<ArchiveAction
50+
buildConfiguration = "Release"
51+
revealArchiveInOrganizer = "YES">
52+
</ArchiveAction>
53+
</Scheme>

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)