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

Add ability to configure shadowRadius, shadowOpacity, and shadowColor #294

Closed
wants to merge 2 commits into from
Closed

Add ability to configure shadowRadius, shadowOpacity, and shadowColor #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99003cc
make drawer shadow parameters configurable
Oct 1, 2014
2de6db5
update example for configurable shadow parameters
Oct 1, 2014
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
102 changes: 94 additions & 8 deletions KitchenSink/ExampleFiles/MMExampleSideDrawerViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger
case MMDrawerSectionDrawerWidth:
return self.drawerWidths.count;
case MMDrawerSectionShadowToggle:
return 1;
return 7;
case MMDrawerSectionOpenDrawerGestures:
return 3;
case MMDrawerSectionCloseDrawerGestures:
Expand Down Expand Up @@ -170,11 +170,60 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
break;
}
case MMDrawerSectionShadowToggle:{
[cell.textLabel setText:@"Show Shadow"];
if(self.mm_drawerController.showsShadow)
[cell setAccessoryType:UITableViewCellAccessoryCheckmark];
else
[cell setAccessoryType:UITableViewCellAccessoryNone];
switch (indexPath.row) {
case 0:
[cell.textLabel setText:@"Show Shadow"];
if(self.mm_drawerController.showsShadow)
[cell setAccessoryType:UITableViewCellAccessoryCheckmark];
else
[cell setAccessoryType:UITableViewCellAccessoryNone];
break;
case 1:
[cell.textLabel setText:@"Shadow Radius 10"];
if(self.mm_drawerController.showsShadow && (fabsf(self.mm_drawerController.shadowRadius - 10.0) <= 0.001))
[cell setAccessoryType:UITableViewCellAccessoryCheckmark];
else
[cell setAccessoryType:UITableViewCellAccessoryNone];
break;
case 2:
[cell.textLabel setText:@"Shadow Radius 5"];
if(self.mm_drawerController.showsShadow && fabsf(self.mm_drawerController.shadowRadius - 5.0) <= 0.001)
[cell setAccessoryType:UITableViewCellAccessoryCheckmark];
else
[cell setAccessoryType:UITableViewCellAccessoryNone];
break;
case 3:
[cell.textLabel setText:@"Shadow Opacity 0.8"];
if(self.mm_drawerController.showsShadow && fabsf(self.mm_drawerController.shadowOpacity - 0.8) <= 0.001)
[cell setAccessoryType:UITableViewCellAccessoryCheckmark];
else
[cell setAccessoryType:UITableViewCellAccessoryNone];
break;
case 4:
[cell.textLabel setText:@"Shadow Opacity 0.4"];
if(self.mm_drawerController.showsShadow && fabsf(self.mm_drawerController.shadowOpacity - 0.4) <= 0.001)
[cell setAccessoryType:UITableViewCellAccessoryCheckmark];
else
[cell setAccessoryType:UITableViewCellAccessoryNone];
break;
case 5:
[cell.textLabel setText:@"Shadow Color Black"];
if(self.mm_drawerController.showsShadow && self.mm_drawerController.shadowColor == [UIColor blackColor].CGColor)
[cell setAccessoryType:UITableViewCellAccessoryCheckmark];
else
[cell setAccessoryType:UITableViewCellAccessoryNone];
break;
case 6:
[cell.textLabel setText:@"Shadow Color Gray"];
if(self.mm_drawerController.showsShadow && self.mm_drawerController.shadowColor == [UIColor darkGrayColor].CGColor)
[cell setAccessoryType:UITableViewCellAccessoryCheckmark];
else
[cell setAccessoryType:UITableViewCellAccessoryNone];
break;

default:
break;
}
break;
}
case MMDrawerSectionOpenDrawerGestures:{
Expand Down Expand Up @@ -380,8 +429,45 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
break;
}
case MMDrawerSectionShadowToggle:{
[self.mm_drawerController setShowsShadow:!self.mm_drawerController.showsShadow];
[tableView reloadSections:[NSIndexSet indexSetWithIndex:indexPath.section] withRowAnimation:UITableViewRowAnimationNone];
switch (indexPath.row) {
case 0:
[self.mm_drawerController setShowsShadow:!self.mm_drawerController.showsShadow];
[tableView reloadSections:[NSIndexSet indexSetWithIndex:indexPath.section] withRowAnimation:UITableViewRowAnimationNone];
break;
case 1:
[self.mm_drawerController setShowsShadow:YES];
[self.mm_drawerController setShadowRadius:10.0];
[tableView reloadSections:[NSIndexSet indexSetWithIndex:indexPath.section] withRowAnimation:UITableViewRowAnimationNone];
break;
case 2:
[self.mm_drawerController setShowsShadow:YES];
[self.mm_drawerController setShadowRadius:5.0];
[tableView reloadSections:[NSIndexSet indexSetWithIndex:indexPath.section] withRowAnimation:UITableViewRowAnimationNone];
break;
case 3:
[self.mm_drawerController setShowsShadow:YES];
[self.mm_drawerController setShadowOpacity:0.8];
[tableView reloadSections:[NSIndexSet indexSetWithIndex:indexPath.section] withRowAnimation:UITableViewRowAnimationNone];
break;
case 4:
[self.mm_drawerController setShowsShadow:YES];
[self.mm_drawerController setShadowOpacity:0.4];
[tableView reloadSections:[NSIndexSet indexSetWithIndex:indexPath.section] withRowAnimation:UITableViewRowAnimationNone];
break;
case 5:
[self.mm_drawerController setShowsShadow:YES];
[self.mm_drawerController setShadowColor:[UIColor blackColor].CGColor];
[tableView reloadSections:[NSIndexSet indexSetWithIndex:indexPath.section] withRowAnimation:UITableViewRowAnimationNone];
break;
case 6:
[self.mm_drawerController setShowsShadow:YES];
[self.mm_drawerController setShadowColor:[UIColor darkGrayColor].CGColor];
[tableView reloadSections:[NSIndexSet indexSetWithIndex:indexPath.section] withRowAnimation:UITableViewRowAnimationNone];
break;

default:
break;
}
break;
}
case MMDrawerSectionOpenDrawerGestures:{
Expand Down
22 changes: 17 additions & 5 deletions ...nSink.xcodeproj/project.xcworkspace/xcshareddata/MMDrawerControllerKitchenSink.xccheckout
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,36 @@
<string>MMDrawerControllerKitchenSink</string>
<key>IDESourceControlProjectOriginsDictionary</key>
<dict>
<key>BF2FE30DD30E807A424B26D63A15FEB4A29593EB</key>
<string>https://github.com/trunkclub/MMDrawerController.git</string>
<key>C486FB0C-7803-4607-BCA9-799E743ECFBA</key>
<string>https://github.com/mutualmobile/MMDrawerController.git</string>
</dict>
<key>IDESourceControlProjectPath</key>
<string>KitchenSink/MMDrawerControllerKitchenSink.xcodeproj/project.xcworkspace</string>
<string>KitchenSink/MMDrawerControllerKitchenSink.xcodeproj</string>
<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
<dict>
<key>C486FB0C-7803-4607-BCA9-799E743ECFBA</key>
<key>BF2FE30DD30E807A424B26D63A15FEB4A29593EB</key>
<string>../../..</string>
<key>C486FB0C-7803-4607-BCA9-799E743ECFBA</key>
<string>../../../../MMDrawerController-GitHub</string>
</dict>
<key>IDESourceControlProjectURL</key>
<string>https://github.com/mutualmobile/MMDrawerController.git</string>
<string>https://github.com/trunkclub/MMDrawerController.git</string>
<key>IDESourceControlProjectVersion</key>
<integer>110</integer>
<integer>111</integer>
<key>IDESourceControlProjectWCCIdentifier</key>
<string>C486FB0C-7803-4607-BCA9-799E743ECFBA</string>
<string>BF2FE30DD30E807A424B26D63A15FEB4A29593EB</string>
<key>IDESourceControlProjectWCConfigurations</key>
<array>
<dict>
<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
<string>public.vcs.git</string>
<key>IDESourceControlWCCIdentifierKey</key>
<string>BF2FE30DD30E807A424B26D63A15FEB4A29593EB</string>
<key>IDESourceControlWCCName</key>
<string>MMDrawerController</string>
</dict>
<dict>
<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
<string>public.vcs.git</string>
Expand Down
21 changes: 21 additions & 0 deletions MMDrawerController/MMDrawerController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,27 @@ typedef void (^MMDrawerControllerDrawerVisualStateBlock)(MMDrawerController * dr
*/
@property (nonatomic, assign) BOOL showsShadow;

/**
The radius of the shadow drawn off of 'centerViewController` when a drawer is open.

By default, this is set to 10.
*/
@property (nonatomic, assign) CGFloat shadowRadius;

/**
The opacity of the shadow drawn off of 'centerViewController` when a drawer is open.

By default, this is set to 0.8.
*/
@property (nonatomic, assign) CGFloat shadowOpacity;

/**
The color of the shadow drawn off of 'centerViewController` when a drawer is open.

By default, this is set to the systme default (opaque black).
*/
@property (nonatomic, assign) CGColorRef shadowColor;

/**
The flag determining if a custom background view should appear beneath the status bar, forcing the child content to be drawn lower than the status bar. This property is only available for > iOS 7.0 to take into account for the new behavior of the status bar.

Expand Down
26 changes: 21 additions & 5 deletions MMDrawerController/MMDrawerController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@
NSTimeInterval const MMDrawerDefaultBounceAnimationDuration = 0.2f;
CGFloat const MMDrawerDefaultSecondBounceDistancePercentage = .25f;

CGFloat const MMDrawerDefaultShadowRadius = 10.0f;
CGFloat const MMDrawerDefaultShadowOpacity = 0.8;

NSTimeInterval const MMDrawerMinimumAnimationDuration = 0.15f;

CGFloat const MMDrawerBezelRange = 20.0f;
Expand Down Expand Up @@ -186,6 +183,9 @@ -(void)commonSetup{
[self setAnimationVelocity:MMDrawerDefaultAnimationVelocity];

[self setShowsShadow:YES];
[self setShadowRadius:10.0f];
[self setShadowOpacity:0.8f];
[self setShadowColor:[UIColor blackColor].CGColor];
[self setShouldStretchDrawer:YES];

[self setOpenDrawerGestureModeMask:MMOpenDrawerGestureModeNone];
Expand Down Expand Up @@ -859,6 +859,21 @@ -(void)setShowsShadow:(BOOL)showsShadow{
[self updateShadowForCenterView];
}

-(void)setShadowRadius:(CGFloat)shadowRadius{
_shadowRadius = shadowRadius;
[self updateShadowForCenterView];
}

-(void)setShadowOpacity:(CGFloat)shadowOpacity{
_shadowOpacity = shadowOpacity;
[self updateShadowForCenterView];
}

-(void)setShadowColor:(CGColorRef)shadowColor{
_shadowColor = shadowColor;
[self updateShadowForCenterView];
}

-(void)setOpenSide:(MMDrawerSide)openSide{
if(_openSide != openSide){
_openSide = openSide;
Expand Down Expand Up @@ -1245,8 +1260,9 @@ -(void)updateShadowForCenterView{
UIView * centerView = self.centerContainerView;
if(self.showsShadow){
centerView.layer.masksToBounds = NO;
centerView.layer.shadowRadius = MMDrawerDefaultShadowRadius;
centerView.layer.shadowOpacity = MMDrawerDefaultShadowOpacity;
centerView.layer.shadowRadius = self.shadowRadius;
centerView.layer.shadowOpacity = self.shadowOpacity;
centerView.layer.shadowColor = self.shadowColor;

/** In the event this gets called a lot, we won't update the shadowPath
unless it needs to be updated (like during rotation) */
Expand Down