Added sidebar. UI improvement

syahmi · Sep 23, 2012 · 68a052a · 68a052a
1 parent d77318b
commit 68a052a
Show file tree

Hide file tree

Showing 49 changed files with 950 additions and 21 deletions.
diff --git a/WaktuSolat.xcodeproj/project.pbxproj b/WaktuSolat.xcodeproj/project.pbxproj
diff --git a/WaktuSolat/AppDelegate.m b/WaktuSolat/AppDelegate.m
@@ -9,6 +9,8 @@
 #import "AppDelegate.h"
 #import "KawasanViewController.h"
 #import "WaktuSolatViewController.h"
+#import "MFSideMenu.h"
+#import "SideMenuViewController.h"
 
 @implementation AppDelegate
 
@@ -62,7 +64,17 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     self.window.rootViewController = navigationController;
     [self.window makeKeyAndVisible];
 
+    SideMenuViewController *sideMenuViewController = [[SideMenuViewController alloc] init];
+
+    MenuOptions options = MenuButtonEnabled|BackButtonEnabled;
+    // make sure to display the navigation controller before calling this
+    [MFSideMenuManager configureWithNavigationController:navigationController
+                                      sideMenuController:sideMenuViewController
+                                                menuSide:MenuLeftHandSide
+                                                 options:options];
+
     [self _rateApp];
+    [SideMenuViewController release];
 
     return YES;
 }

diff --git a/WaktuSolat/KawasanViewController.m b/WaktuSolat/KawasanViewController.m
@@ -38,6 +38,13 @@ - (void)viewDidAppear:(BOOL)animated
     self.navigationController.toolbarHidden = YES;
 }
 
+- (void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+
+    self.tableView.backgroundView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"mainBackground.png"]];
+}
+
 - (void)viewWillDisappear:(BOOL)animated
 {
     [super viewWillDisappear:animated];
@@ -80,6 +87,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
 
     if(cell == nil) {
         cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:identifier] autorelease];
+        cell.backgroundView = [ [[UIImageView alloc] initWithImage:[ [UIImage imageNamed:@"cellBackgroundLocation.png"] stretchableImageWithLeftCapWidth:0.0 topCapHeight:5.0] ]autorelease];
         cell.textLabel.font = [UIFont fontWithName:@"Helvetica" size:16];
         cell.selectionStyle = UITableViewCellSelectionStyleGray;
     }
@@ -105,7 +113,7 @@ - (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger
 {
     UIView *headerView = [[UIView alloc] init];
     headerView.backgroundColor = [UIColor colorWithPatternImage:[UIImage imageNamed:@"headerView.png"]];
-    UILabel *titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(5, 1, 320, 20)];
+    UILabel *titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(10, 1, 320, 20)];
     titleLabel.text = [self tableView:tableView titleForHeaderInSection:section];
     titleLabel.shadowColor = [UIColor whiteColor];
     titleLabel.shadowOffset = CGSizeMake(0.5, 0.5);

diff --git a/WaktuSolat/MFSideMenu/MFSideMenu.h b/WaktuSolat/MFSideMenu/MFSideMenu.h
@@ -0,0 +1,13 @@
+//
+//  MFSideMenu.h
+//
+//  Created by Michael Frederick on 3/17/12.
+//
+
+#ifndef MFSideMenu_h
+#define MFSideMenu_h
+
+#import "MFSideMenuManager.h"
+#import "UIViewController+MFSideMenu.h"
+
+#endif
diff --git a/WaktuSolat/MFSideMenu/MFSideMenuManager.h b/WaktuSolat/MFSideMenu/MFSideMenuManager.h
@@ -0,0 +1,47 @@
+//
+//  MFSideMenuManager.h
+//
+//  Created by Michael Frederick on 3/18/12.
+//
+
+#import <Foundation/Foundation.h>
+
+#define kSidebarWidth 270
+
+typedef enum {
+    MenuLeftHandSide, // show the menu on the left hand side
+    MenuRightHandSide // show the menu on the right hand side
+} MenuSide;
+
+typedef enum {
+    MenuButtonEnabled = 1 << 0, // enable the 'menu' UIBarButtonItem
+    BackButtonEnabled = 1 << 1 // enable the 'back' UIBarButtonItem
+} MenuOptions;
+
+
+@interface MFSideMenuManager : NSObject<UIGestureRecognizerDelegate> {
+    CGPoint originalOrigin;
+}
+
+@property (nonatomic, strong) UINavigationController *navigationController;
+@property (nonatomic, strong) UITableViewController *sideMenuController;
+@property (nonatomic, assign) MenuSide menuSide;
+@property (nonatomic, assign) MenuOptions options;
+
++ (MFSideMenuManager *) sharedManager;
+
++ (void) configureWithNavigationController:(UINavigationController *)controller 
+                        sideMenuController:(id)menuController;
+
++ (void) configureWithNavigationController:(UINavigationController *)controller
+                        sideMenuController:(id)menuController
+                                  menuSide:(MenuSide)side
+                                   options:(MenuOptions)options;
+
+// the x position of the nav controller when the menu is shown
++ (CGFloat) menuVisibleNavigationControllerXPosition;
+
++ (BOOL) menuButtonEnabled;
++ (BOOL) backButtonEnabled;
+
+@end