Skip to content

Commit f14cc35

Browse files
Alfredo UribeAlfredo Uribe
authored andcommitted
left menu updates
added search box, with styling from table removed edit mode code, and added permanent add object cell table gets populated with current feeds setting icon from feed model tried removing swipe gesture recognizer on left menu
1 parent 1e8c5a2 commit f14cc35

7 files changed

Lines changed: 348 additions & 528 deletions

File tree

EasyReader/Application/AppDelegates/CSAppDelegate.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
#import <UIKit/UIKit.h>
1010
#import "CSFeedItemUpdater.h"
11+
#import "CSMenuLeftViewController.h"
12+
#import "MFSideMenu.h"
1113

1214
@class Feed;
1315

@@ -17,4 +19,6 @@
1719
@property (strong, nonatomic) UIWindow *window;
1820
@property (nonatomic, retain) Feed *activeFeed;
1921

22+
@property (strong, nonatomic) MFSideMenuContainerViewController *container;
23+
2024
@end

EasyReader/Application/AppDelegates/CSAppDelegate.m

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
#import "CSAppDelegate.h"
1010
#import "CSRootViewController.h"
11-
#import "CSMenuLeftViewController.h"
1211
#import "CSFeedItemUpdater.h"
1312

1413
#import "CSResponsiveApiRequestor.h"
@@ -65,11 +64,11 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
6564
CSMenuLeftViewController *leftMenuViewController = [[CSMenuLeftViewController alloc] init];
6665
CSRootViewController *rootVC = [[CSRootViewController alloc] init];
6766

68-
MFSideMenuContainerViewController *container = [MFSideMenuContainerViewController
69-
containerWithCenterViewController:rootVC
70-
leftMenuViewController:leftMenuViewController
71-
rightMenuViewController:nil];
72-
self.window.rootViewController = container;
67+
self.container = [MFSideMenuContainerViewController containerWithCenterViewController:rootVC
68+
leftMenuViewController:leftMenuViewController
69+
rightMenuViewController:nil];
70+
71+
self.window.rootViewController = self.container;
7372
[self.window makeKeyAndVisible];
7473

7574
return YES;

EasyReader/Application/Controllers/CSRootViewController.m

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,12 @@ - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
3838
return self;
3939
}
4040

41+
- (void) viewWillAppear:(BOOL)animated
42+
{
43+
[super viewWillAppear:animated];
44+
CSAppDelegate *delegate = (CSAppDelegate *)[UIApplication sharedApplication].delegate;
45+
delegate.container.panMode = MFSideMenuPanModeNone;
46+
}
4147

4248
/**
4349
* If the left menu is open, it closes it

EasyReader/Application/Controllers/Menu/CSMenuLeftViewController.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@
1616

1717
#pragma mark - IBOutlet Properties
1818
@property (nonatomic, retain) IBOutlet CSEnhancedTableView *tableView_feeds;
19+
@property (strong, nonatomic) IBOutlet UITextField *textField_searchInput;
1920

2021

2122
#pragma mark - Properties
22-
@property (nonatomic, retain) NSArray *feeds;
23+
@property (nonatomic, retain) NSMutableSet *feeds;
2324
@property (nonatomic, retain) User *currentUser;
2425

2526

0 commit comments

Comments
 (0)