Skip to content

Commit e99266d

Browse files
author
Joey Lorich
committed
Fix lots of merge conflicts
1 parent 76f2724 commit e99266d

8 files changed

Lines changed: 50 additions & 103 deletions

File tree

‎EasyReader.xcodeproj/project.pbxproj‎

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,16 @@
3131
8E685AA918DC733B00309270 /* CSCollectionPageControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E685AA618DC733B00309270 /* CSCollectionPageControl.m */; };
3232
8E7F403218D3596C00A6FED6 /* CSResponsiveApiRequestor.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E7F403118D3596C00A6FED6 /* CSResponsiveApiRequestor.m */; };
3333
8E7F81F018D0BF8500BC50C2 /* CSBaseObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E7F81EF18D0BF8500BC50C2 /* CSBaseObject.m */; };
34+
9D096C3318DCE9D40043423B /* CSMenuSearchFeedDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 0D7987AE18DB8F69004440C3 /* CSMenuSearchFeedDataSource.m */; };
35+
9D096C3418DCE9D50043423B /* CSMenuSearchFeedDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 0D7987AE18DB8F69004440C3 /* CSMenuSearchFeedDataSource.m */; };
36+
9D096C3518DCE9D50043423B /* CSMenuSearchFeedDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 0D7987AE18DB8F69004440C3 /* CSMenuSearchFeedDataSource.m */; };
37+
9D096C3618DCE9D70043423B /* CSMenuUserFeedDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 0D7987B018DB8F69004440C3 /* CSMenuUserFeedDataSource.m */; };
38+
9D096C3718DCE9D70043423B /* CSMenuUserFeedDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 0D7987B018DB8F69004440C3 /* CSMenuUserFeedDataSource.m */; };
39+
9D096C3818DCE9D80043423B /* CSMenuUserFeedDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 0D7987B018DB8F69004440C3 /* CSMenuUserFeedDataSource.m */; };
40+
9D096C3918DCEA0D0043423B /* CSFeedSearcher.m in Sources */ = {isa = PBXBuildFile; fileRef = 0D79879D18DB4AE1004440C3 /* CSFeedSearcher.m */; };
41+
9D096C3A18DCEA0E0043423B /* CSFeedSearcher.m in Sources */ = {isa = PBXBuildFile; fileRef = 0D79879D18DB4AE1004440C3 /* CSFeedSearcher.m */; };
42+
9D096C3B18DCEA0E0043423B /* CSFeedSearcher.m in Sources */ = {isa = PBXBuildFile; fileRef = 0D79879D18DB4AE1004440C3 /* CSFeedSearcher.m */; };
43+
9D096C3C18DCEDB40043423B /* CSCollectionPageControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E685AA618DC733B00309270 /* CSCollectionPageControl.m */; };
3444
9D140BF5171F68E000CDD319 /* button_add@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9D140BF4171F68E000CDD319 /* button_add@2x.png */; };
3545
9D16D30718DA2B3A001E9C38 /* CSBaseTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D16D30618DA2B3A001E9C38 /* CSBaseTestCase.m */; };
3646
9D16D30918DA2E43001E9C38 /* UserTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D16D30818DA2E43001E9C38 /* UserTests.m */; };
@@ -65,8 +75,6 @@
6575
9D4FA6E617971D5B001E2A65 /* Default-Portrait@2x~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 9D4FA6E517971D5B001E2A65 /* Default-Portrait@2x~ipad.png */; };
6676
9D4FA6E817971E88001E2A65 /* Default-Landscape~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 9D4FA6E717971E88001E2A65 /* Default-Landscape~ipad.png */; };
6777
9D4FA6EA17971E8D001E2A65 /* Default-Landscape@2x~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 9D4FA6E917971E8D001E2A65 /* Default-Landscape@2x~ipad.png */; };
68-
9D607E4618DCE0FD004DF7F3 /* Development-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 9D607E4518DCE0FD004DF7F3 /* Development-Info.plist */; };
69-
9D6C2B61170F39710087D8F8 /* CSMenuLeft_iPhone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9D6C2B60170F39710087D8F8 /* CSMenuLeft_iPhone.xib */; };
7078
9D79270A18DA1D0300E1D3E1 /* Feed.m in Sources */ = {isa = PBXBuildFile; fileRef = 0DE51FF718CF919900454E51 /* Feed.m */; };
7179
9D79270B18DA1D0300E1D3E1 /* CSAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 9DAC171A170A043200383722 /* CSAppDelegate.m */; };
7280
9D79270C18DA1D0300E1D3E1 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 9DAC1721170A043200383722 /* main.m */; };
@@ -227,7 +235,6 @@
227235
9D9CBAE818DCC68A00532F8C /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9DAC16CB1709D48E00383722 /* CoreGraphics.framework */; };
228236
9D9CBAE918DCC68A00532F8C /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9DAC16CD1709D48E00383722 /* CoreData.framework */; };
229237
9D9CBAEA18DCC68A00532F8C /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A7ACF08D0CD54248B25E110A /* libPods.a */; };
230-
9D9CBAEC18DCC68A00532F8C /* CSMenuLeft_iPhone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9D6C2B60170F39710087D8F8 /* CSMenuLeft_iPhone.xib */; };
231238
9D9CBAED18DCC68A00532F8C /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9D27B1DE1715DECB001C39CF /* Default-568h@2x.png */; };
232239
9D9CBAEE18DCC68A00532F8C /* Icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = 9DA7CB2B171CAD020045CC88 /* Icon-72.png */; };
233240
9D9CBAEF18DCC68A00532F8C /* Icon-72@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9DA7CB2C171CAD020045CC88 /* Icon-72@2x.png */; };
@@ -252,7 +259,7 @@
252259
9D9CBB0218DCC68A00532F8C /* button_add@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9D140BF4171F68E000CDD319 /* button_add@2x.png */; };
253260
9D9CBB0318DCC68A00532F8C /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9D2FDF871721EE4400535763 /* Default@2x.png */; };
254261
9D9CBB0418DCC68A00532F8C /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 9D2FDF891721EE4700535763 /* Default.png */; };
255-
9D9CBB0518DCC68A00532F8C /* CSMenuLeft_iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9DB47D8A1795B948006B99BA /* CSMenuLeft_iPad.xib */; };
262+
9D9CBB0518DCC68A00532F8C /* (null) in Resources */ = {isa = PBXBuildFile; };
256263
9D9CBB0618DCC68A00532F8C /* Default-Portrait~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 9D4FA6E317971D56001E2A65 /* Default-Portrait~ipad.png */; };
257264
9D9CBB0718DCC68A00532F8C /* Default-Portrait@2x~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 9D4FA6E517971D5B001E2A65 /* Default-Portrait@2x~ipad.png */; };
258265
9D9CBB0818DCC68A00532F8C /* Default-Landscape~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 9D4FA6E717971E88001E2A65 /* Default-Landscape~ipad.png */; };
@@ -363,7 +370,6 @@
363370
9D4FA6E717971E88001E2A65 /* Default-Landscape~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-Landscape~ipad.png"; sourceTree = "<group>"; };
364371
9D4FA6E917971E8D001E2A65 /* Default-Landscape@2x~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-Landscape@2x~ipad.png"; sourceTree = "<group>"; };
365372
9D607E4518DCE0FD004DF7F3 /* Development-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "Development-Info.plist"; sourceTree = "<group>"; };
366-
9D6C2B60170F39710087D8F8 /* CSMenuLeft_iPhone.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = CSMenuLeft_iPhone.xib; path = Menu/CSMenuLeft_iPhone.xib; sourceTree = "<group>"; };
367373
9D79274A18DA1D0300E1D3E1 /* Staging.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Staging.app; sourceTree = BUILT_PRODUCTS_DIR; };
368374
9D79278E18DA1D3800E1D3E1 /* Easy Reader.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Easy Reader.app"; sourceTree = BUILT_PRODUCTS_DIR; };
369375
9D79279118DA1D9200E1D3E1 /* Production-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Production-Info.plist"; sourceTree = "<group>"; };
@@ -384,7 +390,6 @@
384390
9D9CBABD18DC826700532F8C /* CSApplicationStyleService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSApplicationStyleService.h; sourceTree = "<group>"; };
385391
9D9CBABE18DC826700532F8C /* CSApplicationStyleService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSApplicationStyleService.m; sourceTree = "<group>"; };
386392
9D9CBB0F18DCC68A00532F8C /* Development copy.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Development copy.app"; sourceTree = BUILT_PRODUCTS_DIR; };
387-
9D9CBB1018DCC68A00532F8C /* Development copy-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Development copy-Info.plist"; path = "/Users/jlorich/projects/iOS-EasyReader/Development copy-Info.plist"; sourceTree = "<absolute>"; };
388393
9DA7CB25171C8B5E0045CC88 /* iAd.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = iAd.framework; path = System/Library/Frameworks/iAd.framework; sourceTree = SDKROOT; };
389394
9DA7CB2B171CAD020045CC88 /* Icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-72.png"; sourceTree = "<group>"; };
390395
9DA7CB2C171CAD020045CC88 /* Icon-72@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-72@2x.png"; sourceTree = "<group>"; };
@@ -746,7 +751,6 @@
746751
9DAC16C61709D48E00383722 /* Frameworks */,
747752
9DAC16C51709D48E00383722 /* Products */,
748753
5CECD14CAE964A1994399D15 /* Pods.xcconfig */,
749-
9D9CBB1018DCC68A00532F8C /* Development copy-Info.plist */,
750754
);
751755
sourceTree = "<group>";
752756
};
@@ -1112,7 +1116,6 @@
11121116
isa = PBXResourcesBuildPhase;
11131117
buildActionMask = 2147483647;
11141118
files = (
1115-
9D9CBAEC18DCC68A00532F8C /* CSMenuLeft_iPhone.xib in Resources */,
11161119
9D9CBAED18DCC68A00532F8C /* Default-568h@2x.png in Resources */,
11171120
9D9CBAEE18DCC68A00532F8C /* Icon-72.png in Resources */,
11181121
9D9CBAEF18DCC68A00532F8C /* Icon-72@2x.png in Resources */,
@@ -1137,7 +1140,7 @@
11371140
9D9CBB0218DCC68A00532F8C /* button_add@2x.png in Resources */,
11381141
9D9CBB0318DCC68A00532F8C /* Default@2x.png in Resources */,
11391142
9D9CBB0418DCC68A00532F8C /* Default.png in Resources */,
1140-
9D9CBB0518DCC68A00532F8C /* CSMenuLeft_iPad.xib in Resources */,
1143+
9D9CBB0518DCC68A00532F8C /* (null) in Resources */,
11411144
9D9CBB0618DCC68A00532F8C /* Default-Portrait~ipad.png in Resources */,
11421145
9D9CBB0718DCC68A00532F8C /* Default-Portrait@2x~ipad.png in Resources */,
11431146
9D9CBB0818DCC68A00532F8C /* Default-Landscape~ipad.png in Resources */,
@@ -1164,7 +1167,6 @@
11641167
9DA7CB3F171CAD020045CC88 /* iTunesArtwork@2x.png in Resources */,
11651168
9D8F3196171DB410006CFC6A /* button_menu@2x.png in Resources */,
11661169
9D8F3197171DB410006CFC6A /* icon_back.png in Resources */,
1167-
9D607E4618DCE0FD004DF7F3 /* Development-Info.plist in Resources */,
11681170
9D8F3198171DB410006CFC6A /* icon_forward.png in Resources */,
11691171
9D8F3199171DB410006CFC6A /* icon_pencil@2x.png in Resources */,
11701172
9D8F319A171DB410006CFC6A /* icon_rss@2x.png in Resources */,
@@ -1317,14 +1319,17 @@
13171319
9D79271218DA1D0300E1D3E1 /* CSRootViewController.m in Sources */,
13181320
9D79271318DA1D0300E1D3E1 /* FeedItem.m in Sources */,
13191321
9D79271418DA1D0300E1D3E1 /* User.m in Sources */,
1322+
9D096C3718DCE9D70043423B /* CSMenuUserFeedDataSource.m in Sources */,
13201323
9D16D34F18DBA9E9001E9C38 /* AKRouter.m in Sources */,
1324+
9D096C3418DCE9D50043423B /* CSMenuSearchFeedDataSource.m in Sources */,
13211325
9D79271518DA1D0300E1D3E1 /* CSFeedItemUpdater.m in Sources */,
13221326
9D79271618DA1D0300E1D3E1 /* CSFakedDataRequestor.m in Sources */,
13231327
9D79271718DA1D0300E1D3E1 /* CSMenuLeftViewController.m in Sources */,
13241328
9D79271818DA1D0300E1D3E1 /* CSResponsiveApiRequestor.m in Sources */,
13251329
9D79271918DA1D0300E1D3E1 /* Easy Reader.xcdatamodeld in Sources */,
13261330
9D16D32918DB57D0001E9C38 /* CSRegisterRoutesService.m in Sources */,
13271331
9D79271A18DA1D0300E1D3E1 /* CSFeedAddViewController.m in Sources */,
1332+
9D096C3A18DCEA0E0043423B /* CSFeedSearcher.m in Sources */,
13281333
9D79271B18DA1D0300E1D3E1 /* NSObject+CSNilAdditions.m in Sources */,
13291334
9D16D33918DB75D9001E9C38 /* CSCoreDataService.m in Sources */,
13301335
9D16D34C18DBA9E9001E9C38 /* AKRoute.m in Sources */,
@@ -1352,14 +1357,17 @@
13521357
9D79275618DA1D3800E1D3E1 /* CSRootViewController.m in Sources */,
13531358
9D79275718DA1D3800E1D3E1 /* FeedItem.m in Sources */,
13541359
9D79275818DA1D3800E1D3E1 /* User.m in Sources */,
1360+
9D096C3818DCE9D80043423B /* CSMenuUserFeedDataSource.m in Sources */,
13551361
9D16D35018DBA9E9001E9C38 /* AKRouter.m in Sources */,
1362+
9D096C3518DCE9D50043423B /* CSMenuSearchFeedDataSource.m in Sources */,
13561363
9D79275918DA1D3800E1D3E1 /* CSFeedItemUpdater.m in Sources */,
13571364
9D79275A18DA1D3800E1D3E1 /* CSFakedDataRequestor.m in Sources */,
13581365
9D79275B18DA1D3800E1D3E1 /* CSMenuLeftViewController.m in Sources */,
13591366
9D79275C18DA1D3800E1D3E1 /* CSResponsiveApiRequestor.m in Sources */,
13601367
9D79275D18DA1D3800E1D3E1 /* Easy Reader.xcdatamodeld in Sources */,
13611368
9D16D32A18DB57D0001E9C38 /* CSRegisterRoutesService.m in Sources */,
13621369
9D79275E18DA1D3800E1D3E1 /* CSFeedAddViewController.m in Sources */,
1370+
9D096C3B18DCEA0E0043423B /* CSFeedSearcher.m in Sources */,
13631371
9D79275F18DA1D3800E1D3E1 /* NSObject+CSNilAdditions.m in Sources */,
13641372
9D16D33A18DB75D9001E9C38 /* CSCoreDataService.m in Sources */,
13651373
9D16D34D18DBA9E9001E9C38 /* AKRoute.m in Sources */,
@@ -1397,18 +1405,22 @@
13971405
9D9CBAD318DCC68A00532F8C /* User.m in Sources */,
13981406
9D9CBAD418DCC68A00532F8C /* AKRouter.m in Sources */,
13991407
9D9CBAD518DCC68A00532F8C /* CSFeedItemUpdater.m in Sources */,
1408+
9D096C3318DCE9D40043423B /* CSMenuSearchFeedDataSource.m in Sources */,
14001409
9D9CBAD618DCC68A00532F8C /* CSFakedDataRequestor.m in Sources */,
14011410
9D9CBAD718DCC68A00532F8C /* CSMenuLeftViewController.m in Sources */,
14021411
9D9CBAD818DCC68A00532F8C /* CSResponsiveApiRequestor.m in Sources */,
14031412
9D9CBAD918DCC68A00532F8C /* Easy Reader.xcdatamodeld in Sources */,
1413+
9D096C3918DCEA0D0043423B /* CSFeedSearcher.m in Sources */,
14041414
9D9CBADA18DCC68A00532F8C /* CSRegisterRoutesService.m in Sources */,
14051415
9D9CBADB18DCC68A00532F8C /* CSFeedAddViewController.m in Sources */,
14061416
9D9CBADC18DCC68A00532F8C /* NSObject+CSNilAdditions.m in Sources */,
14071417
9D9CBADD18DCC68A00532F8C /* CSCoreDataService.m in Sources */,
14081418
9D9CBADE18DCC68A00532F8C /* AKRoute.m in Sources */,
14091419
9D9CBADF18DCC68A00532F8C /* CSFeedItemCollectionViewDataSource.m in Sources */,
1420+
9D096C3C18DCEDB40043423B /* CSCollectionPageControl.m in Sources */,
14101421
9D9CBAE018DCC68A00532F8C /* SOApplicationDelegate.m in Sources */,
14111422
9D9CBAE118DCC68A00532F8C /* SOApplicationDelegateService.m in Sources */,
1423+
9D096C3618DCE9D70043423B /* CSMenuUserFeedDataSource.m in Sources */,
14121424
);
14131425
runOnlyForDeploymentPostprocessing = 0;
14141426
};
@@ -1634,7 +1646,7 @@
16341646
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
16351647
PRODUCT_NAME = "Development copy";
16361648
PROVISIONING_PROFILE = "0B1685CC-627C-4832-97D4-79736E8FE8EE";
1637-
VALID_ARCHS = armv7;
1649+
VALID_ARCHS = "armv7 arm64 armv7s";
16381650
WRAPPER_EXTENSION = app;
16391651
};
16401652
name = Debug;
@@ -1652,7 +1664,7 @@
16521664
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
16531665
PRODUCT_NAME = "Development copy";
16541666
PROVISIONING_PROFILE = "";
1655-
VALID_ARCHS = armv7;
1667+
VALID_ARCHS = "armv7 arm64 armv7s";
16561668
WRAPPER_EXTENSION = app;
16571669
};
16581670
name = Release;
@@ -1728,7 +1740,7 @@
17281740
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
17291741
PRODUCT_NAME = Development;
17301742
PROVISIONING_PROFILE = "0B1685CC-627C-4832-97D4-79736E8FE8EE";
1731-
VALID_ARCHS = armv7;
1743+
VALID_ARCHS = "armv7 arm64 armv7s";
17321744
WRAPPER_EXTENSION = app;
17331745
};
17341746
name = Debug;
@@ -1746,7 +1758,7 @@
17461758
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
17471759
PRODUCT_NAME = Development;
17481760
PROVISIONING_PROFILE = "";
1749-
VALID_ARCHS = armv7;
1761+
VALID_ARCHS = "armv7 arm64 armv7s";
17501762
WRAPPER_EXTENSION = app;
17511763
};
17521764
name = Release;

‎EasyReader/Application/AppDelegates/CSAppDelegate.m‎

Lines changed: 10 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -20,70 +20,23 @@ @implementation CSAppDelegate
2020

2121
/**
2222
* Sets up services on launch
23-
*
23+
*
2424
*
2525
* Do not add anything in here other than registering services
2626
*
2727
*/
2828
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
2929
{
30-
self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
31-
// Override point for customization after application launch.
32-
33-
// Observe account status in settings!!
34-
// This is important, if something changes we need to check authentication settingsi
35-
//[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(canTweetStatus) name:ACAccountStoreDidChangeNotification object:nil];
36-
37-
// [self applyStyles];
38-
39-
40-
//
41-
// Set up core data
42-
//
43-
[MagicalRecord setupAutoMigratingCoreDataStack];
44-
45-
CSFeedItemUpdater *updater = [[CSFeedItemUpdater alloc] init];
46-
[updater start];
47-
48-
//
49-
// Set up root view controller and menu container
50-
//
51-
UIStoryboard *storyboard_home = [UIStoryboard storyboardWithName:@"Main_iPhone" bundle:[NSBundle mainBundle]];
30+
[self registerService:[CSRegisterRoutesService shared]];
31+
[self registerService:[CSCoreDataService shared]];
32+
[self registerService:[CSApplicationStyleService shared]];
33+
[self registerService:[CSFeedUpdateService shared]];
5234

53-
CSMenuLeftViewController *leftMenuViewController = [storyboard_home instantiateViewControllerWithIdentifier:@"LeftMenu"];
54-
CSRootViewController *rootVC = [[CSRootViewController alloc] init];
55-
56-
self.container = [MFSideMenuContainerViewController containerWithCenterViewController:rootVC
57-
leftMenuViewController:leftMenuViewController
58-
rightMenuViewController:nil];
59-
60-
self.window.rootViewController = self.container;
61-
[self.window makeKeyAndVisible];
62-
63-
return YES;
64-
}
65-
66-
67-
- (void)applicationWillResignActive:(UIApplication *)application
68-
{
69-
// Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
70-
// Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
71-
}
72-
73-
- (void)applicationDidEnterBackground:(UIApplication *)application
74-
{
75-
// Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
76-
// If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
77-
}
78-
79-
- (void)applicationWillEnterForeground:(UIApplication *)application
80-
{
81-
// Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
82-
}
83-
84-
- (void)applicationDidBecomeActive:(UIApplication *)application
85-
{
86-
// Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
35+
[self invokeServiceMethodWithSelector:@selector(application:didFinishLaunchingWithOptions:) withArgument:&launchOptions];
36+
37+
[self setUpApplicationWindow];
38+
39+
return YES;
8740
}
8841

8942
/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
@property User* currentUser;
2525
@property CSFeedItemCollectionViewDataSource *feedCollectionViewDataSource;
2626
@property FeedItem *currentFeedItem;
27-
@property int collectionCellGoingTo;
27+
@property NSInteger collectionCellGoingTo;
2828

2929
- (void)scrollToCurrentFeedItem;
3030

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,8 @@ - (void)scrollToCurrentFeedItem
198198

199199
- (void)collectionView:(UICollectionView *)collectionView didEndDisplayingCell:(UICollectionViewCell *)cell forItemAtIndexPath:(NSIndexPath *)indexPath
200200
{
201-
int newIndex = indexPath.row+((indexPath.row-self.collectionCellGoingTo)*-1);
201+
NSInteger newIndex = indexPath.row+((indexPath.row-self.collectionCellGoingTo)*-1);
202+
202203
[_pageControl_itemIndicator setPageControllerPageAtIndex:newIndex
203204
forCollection:_feedItems];
204205
}

‎EasyReader/Application/Controls/CSCollectionPageControl.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
@property UIView *view_leftFade;
1818
@property UIView *view_rightFade;
1919

20-
- (void)setPageControllerPageAtIndex:(int)index forCollection:(NSSet*)collection;
20+
- (void)setPageControllerPageAtIndex:(NSInteger)index forCollection:(NSSet*)collection;
2121
- (void)setUpFadesOnView:(UIView*)mask;
2222

2323
@end

0 commit comments

Comments
 (0)