Skip to content

Hidden buttons don't process taps. #30

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

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

Hidden buttons don't process taps. #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4a7b79d
Hidden buttons don't process taps.
apozdeyev Jun 24, 2016
7663bc5
Fix KVO crash
Dec 14, 2016
4480a7a
Merge pull request #1 from fevrierR/master
apozdeyev Jun 29, 2017
6046fca
Updated podspec.
apozdeyev Jun 29, 2017
d0434d9
New delegate's method for button touch down action.
apozdeyev Jan 5, 2018
05c9506
New method to get buttons frame.
apozdeyev Jul 2, 2018
65b170d
Additional buttons type animation with sliding from first button and …
apozdeyev Aug 27, 2018
b058dae
FAB is collapsed by outside swipe gesture.
apozdeyev Aug 28, 2018
050287a
Make property isShowHideOnScroll read-write.
apozdeyev Nov 22, 2018
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
148 changes: 75 additions & 73 deletions Demo/LGPlusButtonsViewDemo/PlusScrollViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ - (void)viewWillAppear:(BOOL)animated
_plusButtonsViewMain.coverColor = [UIColor colorWithWhite:1.f alpha:0.7];
_plusButtonsViewMain.position = LGPlusButtonsViewPositionBottomRight;
_plusButtonsViewMain.plusButtonAnimationType = LGPlusButtonAnimationTypeRotate;
_plusButtonsViewMain.appearingAnimationType = LGPlusButtonsAppearingAnimationTypeCrossDissolveAndSlideVertical;
_plusButtonsViewMain.buttonsAppearingAnimationType = LGPlusButtonsAppearingAnimationTypeCrossDissolveAndFullySlideVertical;

[_plusButtonsViewMain setButtonsTitles:@[@"+", @"", @"", @""] forState:UIControlStateNormal];
[_plusButtonsViewMain setDescriptionsTexts:@[@"", @"Take a photo", @"Choose from gallery", @"Send a message"]];
Expand Down Expand Up @@ -116,79 +118,79 @@ - (void)viewWillAppear:(BOOL)animated

[self.navigationController.view addSubview:_plusButtonsViewMain];

// -----

_plusButtonsViewNavBar = [LGPlusButtonsView plusButtonsViewWithNumberOfButtons:3
firstButtonIsPlusButton:NO
showAfterInit:NO
actionHandler:^(LGPlusButtonsView *plusButtonView, NSString *title, NSString *description, NSUInteger index)
{
NSLog(@"actionHandler | title: %@, description: %@, index: %lu", title, description, (long unsigned)index);
}];

_plusButtonsViewNavBar.showHideOnScroll = NO;
_plusButtonsViewNavBar.appearingAnimationType = LGPlusButtonsAppearingAnimationTypeCrossDissolveAndPop;
_plusButtonsViewNavBar.position = LGPlusButtonsViewPositionTopRight;

[_plusButtonsViewNavBar setButtonsTitles:@[@"1", @"2", @"3"] forState:UIControlStateNormal];
[_plusButtonsViewNavBar setDescriptionsTexts:@[@"Description 1", @"Description 2", @"Description 3"]];

[_plusButtonsViewNavBar setButtonsTitleFont:[UIFont boldSystemFontOfSize:32.f] forOrientation:LGPlusButtonsViewOrientationAll];
[_plusButtonsViewNavBar setButtonsSize:CGSizeMake(52.f, 52.f) forOrientation:LGPlusButtonsViewOrientationAll];
[_plusButtonsViewNavBar setButtonsLayerCornerRadius:52.f/2.f forOrientation:LGPlusButtonsViewOrientationAll];
[_plusButtonsViewNavBar setButtonsBackgroundColor:[UIColor colorWithRed:0.f green:0.5 blue:1.f alpha:1.f] forState:UIControlStateNormal];
[_plusButtonsViewNavBar setButtonsBackgroundColor:[UIColor colorWithRed:0.2 green:0.6 blue:1.f alpha:1.f] forState:UIControlStateHighlighted];
[_plusButtonsViewNavBar setButtonsLayerShadowColor:[UIColor colorWithRed:0.1 green:0.1 blue:0.1 alpha:1.f]];
[_plusButtonsViewNavBar setButtonsLayerShadowOpacity:0.5];
[_plusButtonsViewNavBar setButtonsLayerShadowRadius:3.f];
[_plusButtonsViewNavBar setButtonsLayerShadowOffset:CGSizeMake(0.f, 2.f)];

[_plusButtonsViewNavBar setDescriptionsTextColor:[UIColor whiteColor]];
[_plusButtonsViewNavBar setDescriptionsBackgroundColor:[UIColor colorWithWhite:0.f alpha:0.66]];
[_plusButtonsViewNavBar setDescriptionsLayerCornerRadius:6.f forOrientation:LGPlusButtonsViewOrientationAll];
[_plusButtonsViewNavBar setDescriptionsContentEdgeInsets:UIEdgeInsetsMake(4.f, 8.f, 4.f, 8.f) forOrientation:LGPlusButtonsViewOrientationAll];

if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone)
{
[_plusButtonsViewNavBar setButtonsSize:CGSizeMake(44.f, 44.f) forOrientation:LGPlusButtonsViewOrientationLandscape];
[_plusButtonsViewNavBar setButtonsLayerCornerRadius:44.f/2.f forOrientation:LGPlusButtonsViewOrientationLandscape];
[_plusButtonsViewNavBar setButtonsTitleFont:[UIFont systemFontOfSize:24.f] forOrientation:LGPlusButtonsViewOrientationLandscape];
}

[self.scrollView addSubview:_plusButtonsViewNavBar];

// -----

_plusButtonsViewExample = [LGPlusButtonsView plusButtonsViewWithNumberOfButtons:3
firstButtonIsPlusButton:YES
showAfterInit:YES
actionHandler:^(LGPlusButtonsView *plusButtonView, NSString *title, NSString *description, NSUInteger index)
{
NSLog(@"actionHandler | title: %@, description: %@, index: %lu", title, description, (long unsigned)index);
}];

_plusButtonsViewExample.position = LGPlusButtonsViewPositionBottomLeft;
_plusButtonsViewExample.plusButtonAnimationType = LGPlusButtonAnimationTypeCrossDissolve;
_plusButtonsViewExample.buttonsAppearingAnimationType = LGPlusButtonsAppearingAnimationTypeCrossDissolve;

[_plusButtonsViewExample setButtonsTitles:@[@"+", @"1", @"2"] forState:UIControlStateNormal];
[_plusButtonsViewExample setDescriptionsTexts:@[@"", @"Description 1", @"Description 2"]];

[_plusButtonsViewExample setButtonsBackgroundColor:[UIColor colorWithRed:1.f green:0.f blue:0.5 alpha:1.f] forState:UIControlStateNormal];
[_plusButtonsViewExample setButtonsBackgroundColor:[UIColor colorWithRed:1.f green:0.2 blue:0.6 alpha:1.f] forState:UIControlStateHighlighted];
[_plusButtonsViewExample setButtonsBackgroundColor:[UIColor colorWithRed:1.f green:0.2 blue:0.6 alpha:1.f] forState:UIControlStateHighlighted|UIControlStateSelected];
[_plusButtonsViewExample setButtonsSize:CGSizeMake(44.f, 44.f) forOrientation:LGPlusButtonsViewOrientationAll];
[_plusButtonsViewExample setButtonsLayerBorderWidth:2.f];
[_plusButtonsViewExample setButtonsLayerBorderColor:[UIColor colorWithWhite:0.9 alpha:1.f]];
[_plusButtonsViewExample setButtonsTitleFont:[UIFont systemFontOfSize:24.f] forOrientation:LGPlusButtonsViewOrientationAll];
[_plusButtonsViewExample setButtonAtIndex:0 titleOffset:CGPointMake(0.f, -2.f) forOrientation:LGPlusButtonsViewOrientationAll];
[_plusButtonsViewExample setButtonAtIndex:0 title:@"-" forState:UIControlStateSelected];

[_plusButtonsViewExample setDescriptionsTextColor:[UIColor whiteColor]];
[_plusButtonsViewExample setDescriptionsFont:[UIFont boldSystemFontOfSize:18.f] forOrientation:LGPlusButtonsViewOrientationAll];
[_plusButtonsViewExample setDescriptionsInsets:UIEdgeInsetsMake(0.f, 0.f, 0.f, 4.f) forOrientation:LGPlusButtonsViewOrientationAll];

[_exampleView addSubview:_plusButtonsViewExample];
// // -----
//
// _plusButtonsViewNavBar = [LGPlusButtonsView plusButtonsViewWithNumberOfButtons:3
// firstButtonIsPlusButton:NO
// showAfterInit:NO
// actionHandler:^(LGPlusButtonsView *plusButtonView, NSString *title, NSString *description, NSUInteger index)
// {
// NSLog(@"actionHandler | title: %@, description: %@, index: %lu", title, description, (long unsigned)index);
// }];
//
// _plusButtonsViewNavBar.showHideOnScroll = NO;
// _plusButtonsViewNavBar.appearingAnimationType = LGPlusButtonsAppearingAnimationTypeCrossDissolveAndPop;
// _plusButtonsViewNavBar.position = LGPlusButtonsViewPositionTopRight;
//
// [_plusButtonsViewNavBar setButtonsTitles:@[@"1", @"2", @"3"] forState:UIControlStateNormal];
// [_plusButtonsViewNavBar setDescriptionsTexts:@[@"Description 1", @"Description 2", @"Description 3"]];
//
// [_plusButtonsViewNavBar setButtonsTitleFont:[UIFont boldSystemFontOfSize:32.f] forOrientation:LGPlusButtonsViewOrientationAll];
// [_plusButtonsViewNavBar setButtonsSize:CGSizeMake(52.f, 52.f) forOrientation:LGPlusButtonsViewOrientationAll];
// [_plusButtonsViewNavBar setButtonsLayerCornerRadius:52.f/2.f forOrientation:LGPlusButtonsViewOrientationAll];
// [_plusButtonsViewNavBar setButtonsBackgroundColor:[UIColor colorWithRed:0.f green:0.5 blue:1.f alpha:1.f] forState:UIControlStateNormal];
// [_plusButtonsViewNavBar setButtonsBackgroundColor:[UIColor colorWithRed:0.2 green:0.6 blue:1.f alpha:1.f] forState:UIControlStateHighlighted];
// [_plusButtonsViewNavBar setButtonsLayerShadowColor:[UIColor colorWithRed:0.1 green:0.1 blue:0.1 alpha:1.f]];
// [_plusButtonsViewNavBar setButtonsLayerShadowOpacity:0.5];
// [_plusButtonsViewNavBar setButtonsLayerShadowRadius:3.f];
// [_plusButtonsViewNavBar setButtonsLayerShadowOffset:CGSizeMake(0.f, 2.f)];
//
// [_plusButtonsViewNavBar setDescriptionsTextColor:[UIColor whiteColor]];
// [_plusButtonsViewNavBar setDescriptionsBackgroundColor:[UIColor colorWithWhite:0.f alpha:0.66]];
// [_plusButtonsViewNavBar setDescriptionsLayerCornerRadius:6.f forOrientation:LGPlusButtonsViewOrientationAll];
// [_plusButtonsViewNavBar setDescriptionsContentEdgeInsets:UIEdgeInsetsMake(4.f, 8.f, 4.f, 8.f) forOrientation:LGPlusButtonsViewOrientationAll];
//
// if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone)
// {
// [_plusButtonsViewNavBar setButtonsSize:CGSizeMake(44.f, 44.f) forOrientation:LGPlusButtonsViewOrientationLandscape];
// [_plusButtonsViewNavBar setButtonsLayerCornerRadius:44.f/2.f forOrientation:LGPlusButtonsViewOrientationLandscape];
// [_plusButtonsViewNavBar setButtonsTitleFont:[UIFont systemFontOfSize:24.f] forOrientation:LGPlusButtonsViewOrientationLandscape];
// }
//
// [self.scrollView addSubview:_plusButtonsViewNavBar];
//
// // -----
//
// _plusButtonsViewExample = [LGPlusButtonsView plusButtonsViewWithNumberOfButtons:3
// firstButtonIsPlusButton:YES
// showAfterInit:YES
// actionHandler:^(LGPlusButtonsView *plusButtonView, NSString *title, NSString *description, NSUInteger index)
// {
// NSLog(@"actionHandler | title: %@, description: %@, index: %lu", title, description, (long unsigned)index);
// }];
//
// _plusButtonsViewExample.position = LGPlusButtonsViewPositionBottomLeft;
// _plusButtonsViewExample.plusButtonAnimationType = LGPlusButtonAnimationTypeCrossDissolve;
// _plusButtonsViewExample.buttonsAppearingAnimationType = LGPlusButtonsAppearingAnimationTypeCrossDissolve;
//
// [_plusButtonsViewExample setButtonsTitles:@[@"+", @"1", @"2"] forState:UIControlStateNormal];
// [_plusButtonsViewExample setDescriptionsTexts:@[@"", @"Description 1", @"Description 2"]];
//
// [_plusButtonsViewExample setButtonsBackgroundColor:[UIColor colorWithRed:1.f green:0.f blue:0.5 alpha:1.f] forState:UIControlStateNormal];
// [_plusButtonsViewExample setButtonsBackgroundColor:[UIColor colorWithRed:1.f green:0.2 blue:0.6 alpha:1.f] forState:UIControlStateHighlighted];
// [_plusButtonsViewExample setButtonsBackgroundColor:[UIColor colorWithRed:1.f green:0.2 blue:0.6 alpha:1.f] forState:UIControlStateHighlighted|UIControlStateSelected];
// [_plusButtonsViewExample setButtonsSize:CGSizeMake(44.f, 44.f) forOrientation:LGPlusButtonsViewOrientationAll];
// [_plusButtonsViewExample setButtonsLayerBorderWidth:2.f];
// [_plusButtonsViewExample setButtonsLayerBorderColor:[UIColor colorWithWhite:0.9 alpha:1.f]];
// [_plusButtonsViewExample setButtonsTitleFont:[UIFont systemFontOfSize:24.f] forOrientation:LGPlusButtonsViewOrientationAll];
// [_plusButtonsViewExample setButtonAtIndex:0 titleOffset:CGPointMake(0.f, -2.f) forOrientation:LGPlusButtonsViewOrientationAll];
// [_plusButtonsViewExample setButtonAtIndex:0 title:@"-" forState:UIControlStateSelected];
//
// [_plusButtonsViewExample setDescriptionsTextColor:[UIColor whiteColor]];
// [_plusButtonsViewExample setDescriptionsFont:[UIFont boldSystemFontOfSize:18.f] forOrientation:LGPlusButtonsViewOrientationAll];
// [_plusButtonsViewExample setDescriptionsInsets:UIEdgeInsetsMake(0.f, 0.f, 0.f, 4.f) forOrientation:LGPlusButtonsViewOrientationAll];
//
// [_exampleView addSubview:_plusButtonsViewExample];
}

#pragma mark - Dealloc
Expand Down
2 changes: 1 addition & 1 deletion LGPlusButtonsView.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|

s.name = 'LGPlusButtonsView'
s.version = '1.1.1'
s.version = '1.1.7'
s.platform = :ios, '6.0'
s.license = 'MIT'
s.homepage = 'https://github.com/Friend-LGA/LGPlusButtonsView'
Expand Down
8 changes: 6 additions & 2 deletions LGPlusButtonsView/LGPlusButtonsView.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ static NSString *const kLGPlusButtonsViewActionNotification = @"kLGPlus
- (void)plusButtonsViewDidShowButtons:(LGPlusButtonsView *)plusButtonsView;
- (void)plusButtonsViewDidHideButtons:(LGPlusButtonsView *)plusButtonsView;
- (void)plusButtonsView:(LGPlusButtonsView *)plusButtonsView buttonPressedWithTitle:(NSString *)title description:(NSString *)description index:(NSUInteger)index;
- (void)plusButtonsView:(LGPlusButtonsView *)plusButtonsView buttonTouchDownWithTitle:(NSString *)title description:(NSString *)description index:(NSUInteger)index;

@end

Expand Down Expand Up @@ -85,7 +86,8 @@ typedef NS_ENUM(NSUInteger, LGPlusButtonsAppearingAnimationType)
LGPlusButtonsAppearingAnimationTypeCrossDissolve = 1,
LGPlusButtonsAppearingAnimationTypeCrossDissolveAndSlideHorizontal = 2,
LGPlusButtonsAppearingAnimationTypeCrossDissolveAndSlideVertical = 3,
LGPlusButtonsAppearingAnimationTypeCrossDissolveAndPop = 4
LGPlusButtonsAppearingAnimationTypeCrossDissolveAndPop = 4,
LGPlusButtonsAppearingAnimationTypeCrossDissolveAndFullySlideVertical = 5
};

typedef NS_ENUM(NSUInteger, LGPlusButtonAnimationType)
Expand All @@ -97,7 +99,7 @@ typedef NS_ENUM(NSUInteger, LGPlusButtonAnimationType)

@property (assign, nonatomic, readonly, getter=isShowing) BOOL showing;
@property (assign, nonatomic, readonly, getter=isButtonsShowing) BOOL buttonsShowing;
@property (assign, nonatomic, getter=isShowHideOnScroll) BOOL showHideOnScroll;
@property (assign, nonatomic) BOOL isShowHideOnScroll;
/** Hide additional buttons on scroll. Default is NO */
@property (assign, nonatomic, getter=isHideButtonsOnScroll) BOOL hideButtonsOnScroll;
/** Default is YES */
Expand Down Expand Up @@ -150,6 +152,8 @@ typedef NS_ENUM(NSUInteger, LGPlusButtonAnimationType)

#pragma mark - Buttons all

- (CGRect)buttonFrame:(NSUInteger)index;

- (void)setButtonsTitles:(NSArray *)titles forState:(UIControlState)state;
- (void)setButtonsTitleColor:(UIColor *)titleColor forState:(UIControlState)state;
- (void)setButtonsTitleColors:(NSArray *)titleColors forState:(UIControlState)state;
Expand Down
Loading