Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

added 2 delegate methods for above/below insertion #22

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

added 2 delegate methods for above/below insertion #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d13e91e
added 2 delegate methods (viewForLeftSidebarAbove, viewForRightSideba…
Oct 23, 2012
9e3c3a4
changed view animation, the revealedView is outside of the visible a…
Oct 23, 2012
cd04b59
changed the delegate methods from viewForRightSidebarAbove to viewFor…
Oct 24, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions JTRevealSidebarV2/JTRevealSidebarV2Delegate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,19 @@

#import <Foundation/Foundation.h>

typedef NS_OPTIONS(NSUInteger, JTRevealedStyle) {
JTRevealedStyleNone = 0,
JTRevealedStyleAbove = 1 << 0,
JTRevealedStyleMainSticky = 1 << 1
};

@protocol JTRevealSidebarV2Delegate <NSObject>

@optional
- (UIView *)viewForLeftSidebar;
- (JTRevealedStyle) viewForLeftSidebarStyle;
- (UIView *)viewForRightSidebar;
- (JTRevealedStyle) viewForRightSidebarStyle;
- (void)willChangeRevealedStateForViewController:(UIViewController *)viewController;
- (void)didChangeRevealedStateForViewController:(UIViewController *)viewController;

Expand Down
38 changes: 32 additions & 6 deletions JTRevealSidebarV2/UIViewController+JTRevealSidebarV2.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,18 @@ - (void)revealLeftSidebar:(BOOL)showLeftSidebar {
revealedView.tag = SIDEBAR_VIEW_TAG;
CGFloat width = CGRectGetWidth(revealedView.frame);

JTRevealedStyle style = JTRevealedStyleNone;
if( [delegate respondsToSelector:@selector(viewForLeftSidebarStyle)]) {
style = [delegate viewForLeftSidebarStyle];
}
if (showLeftSidebar) {
[self.view.superview insertSubview:revealedView belowSubview:self.view];
BOOL above = style & JTRevealedStyleAbove;
if(above) {
[self.view.superview insertSubview:revealedView aboveSubview:self.view];
}
else {
[self.view.superview insertSubview:revealedView belowSubview:self.view];
}

[UIView beginAnimations:@"" context:nil];
// self.view.transform = CGAffineTransformTranslate([self baseTransform], width, 0);
Expand Down Expand Up @@ -187,19 +197,35 @@ - (void)revealRightSidebar:(BOOL)showRightSidebar {
UIView *revealedView = [delegate viewForRightSidebar];
revealedView.tag = SIDEBAR_VIEW_TAG;
CGFloat width = CGRectGetWidth(revealedView.frame);
revealedView.frame = (CGRect){self.view.frame.size.width - width, revealedView.frame.origin.y, revealedView.frame.size};


JTRevealedStyle style = JTRevealedStyleNone;
if( [delegate respondsToSelector:@selector(viewForRightSidebarStyle)]) {
style = [delegate viewForRightSidebarStyle];
}
if (showRightSidebar) {
[self.view.superview insertSubview:revealedView belowSubview:self.view];
revealedView.frame = (CGRect){self.view.frame.size.width, revealedView.frame.origin.y, revealedView.frame.size};
BOOL above = style & JTRevealedStyleAbove;
if(above) {
[self.view.superview insertSubview:revealedView aboveSubview:self.view];
}
else {
[self.view.superview insertSubview:revealedView belowSubview:self.view];
}

[UIView beginAnimations:@"" context:nil];
// self.view.transform = CGAffineTransformTranslate([self baseTransform], -width, 0);

self.view.frame = CGRectOffset(self.view.frame, -width, 0);
revealedView.frame = CGRectOffset(revealedView.frame, -width, 0);
if(!(style & JTRevealedStyleMainSticky)) {
self.view.frame = CGRectOffset(self.view.frame, -width, 0);
}
} else {
[UIView beginAnimations:@"hideSidebarView" context:(void *)SIDEBAR_VIEW_TAG];
// self.view.transform = CGAffineTransformTranslate([self baseTransform], width, 0);
self.view.frame = CGRectOffset(self.view.frame, width, 0);
revealedView.frame = CGRectOffset(revealedView.frame, width, 0);
if(!(style & JTRevealedStyleMainSticky)) {
self.view.frame = CGRectOffset(self.view.frame, width, 0);
}
}

[UIView setAnimationDidStopSelector:@selector(animationDidStop2:finished:context:)];
Expand Down