Skip to content

Update for iOS 13 #20

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

Merged
TimOliver merged 7 commits into from
Jun 20, 2019
Merged

Update for iOS 13 #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1a7d848
Removed second button from example
TimOliver Jun 20, 2019
a7f153d
Updated the default values of the button in header
TimOliver Jun 20, 2019
bd2a281
Refactored button with dynamic size and efficiency
TimOliver Jun 20, 2019
b6b620c
Removed second button from view controller
TimOliver Jun 20, 2019
448c934
Fixed compatibility in Xcode 10
TimOliver Jun 20, 2019
af7aacb
Fixed Interface Builder rendering bug
TimOliver Jun 20, 2019
e3b6047
Explicitly set framework bundle name
TimOliver Jun 20, 2019
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
4 changes: 2 additions & 2 deletions TORoundedButton/TORoundedButton.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ IB_DESIGNABLE @interface TORoundedButton : UIControl
/** The attributed string used in the label of this button. See `UILabel.attributedText` documentation for full details (Default is nil) */
@property (nonatomic, copy, nullable) NSAttributedString *attributedText;

/** The radius of the corners of this button (Default is 10.0f) */
/** The radius of the corners of this button (Default is 12.0f) */
@property (nonatomic, assign) IBInspectable CGFloat cornerRadius;

/** The color of the text in this button (Default is white) */
Expand All @@ -45,7 +45,7 @@ IB_DESIGNABLE @interface TORoundedButton : UIControl
/** When tapped, the level of transparency that the text label animates to. (Defaults to 0.5f) */
@property (nonatomic, assign) IBInspectable CGFloat tappedTextAlpha;

/** The font of the text in the button (Default is size 19 Bold) */
/** The font of the text in the button (Default is size UIFontTextStyleBody with bold) */
@property (nonatomic, strong) UIFont *textFont;

/** Because IB cannot handle fonts, this can alternatively be used to set the font size. (Default is off with 0.0) */
Expand Down
257 changes: 48 additions & 209 deletions TORoundedButton/TORoundedButton.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,6 @@

@interface TORoundedButton ()

/** Marked whenever the graphical components of the button need to be recalculated */
@property (nonatomic, assign) BOOL isDirty;

/** When clear, Core Animation clipping is used instead of a bitmap to produce transparency */
@property (nonatomic, assign) BOOL isClear;

/** Hold on to a global state for whether we are tapped or not because the state can change before blocks complete */
@property (nonatomic, assign) BOOL isTapped;

Expand All @@ -40,16 +34,7 @@ @interface TORoundedButton ()
@property (nonatomic, strong) UILabel *titleLabel;

/** An image view that displays the rounded box behind the button text */
@property (nonatomic, strong) UIImageView *backgroundImageView;

/** The dynamically generated rounded box image that is applied to the image view */
@property (nonatomic, strong, nullable) UIImage *backgroundImage;

/** A resizable image that optionally shows when the button is tapped */
@property (nonatomic, strong, nullable) UIImage *tappedBackgroundImage;

/** Because this view is always clear, intercept and store the intended background color */
@property (nonatomic, strong, nullable) UIColor *buttonBackgroundColor;
@property (nonatomic, strong) UIView *backgroundView;

@end

Expand Down Expand Up @@ -100,15 +85,11 @@ - (instancetype)initWithCoder:(NSCoder *)aDecoder
- (void)roundedButtonCommonInit
{
// Default properties (Make sure they're not overriding IB)
_cornerRadius = (_cornerRadius > FLT_EPSILON) ?: 10.0f;
_cornerRadius = (_cornerRadius > FLT_EPSILON) ?: 12.0f;
_tappedTextAlpha = (_tappedTextAlpha > FLT_EPSILON) ?: 1.0f;
_tapAnimationDuration = (_tapAnimationDuration > FLT_EPSILON) ?: 0.4f;
_tappedButtonScale = (_tappedButtonScale > FLT_EPSILON) ?: 0.97f;
_tappedTintColorBrightnessOffset = !TO_ROUNDED_BUTTON_FLOAT_IS_ZERO(_tappedTintColorBrightnessOffset) ?: -0.1f;
_isDirty = YES;

if (!_buttonBackgroundColor) { _buttonBackgroundColor = [UIColor whiteColor]; }
super.backgroundColor = [UIColor clearColor];

// Set the tapped tint color if we've set to dynamically calculate it
[self updateTappedTintColorForTintColor];
Expand All @@ -122,16 +103,29 @@ - (void)roundedButtonCommonInit
[self addSubview:self.containerView];

// Create the image view which will show the button background
self.backgroundImageView = [[UIImageView alloc] initWithFrame:self.bounds];
self.backgroundImageView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
self.backgroundImageView.clipsToBounds = YES;
[self.containerView addSubview:self.backgroundImageView];
self.backgroundView = [[UIView alloc] initWithFrame:self.bounds];
self.backgroundView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
self.backgroundView.backgroundColor = self.tintColor;
self.backgroundView.layer.cornerRadius = _cornerRadius;
#ifdef __IPHONE_13_0
if (@available(iOS 13.0, *)) { self.backgroundView.layer.cornerCurve = kCACornerCurveContinuous; }
#endif
[self.containerView addSubview:self.backgroundView];

// Create the title label that will display the button text
UIFont *buttonFont = [UIFont preferredFontForTextStyle:UIFontTextStyleBody];
buttonFont = [UIFont systemFontOfSize:buttonFont.pointSize weight:UIFontWeightBold];
if (@available(iOS 11.0, *)) {
// Apply resizable button metrics to font
UIFontMetrics *metrics = [[UIFontMetrics alloc] initForTextStyle:UIFontTextStyleBody];
buttonFont = [metrics scaledFontForFont:buttonFont];
}

self.titleLabel = [[UILabel alloc] initWithFrame:CGRectZero];
self.titleLabel.textAlignment = NSTextAlignmentCenter;
self.titleLabel.textColor = [UIColor whiteColor];
self.titleLabel.font = [UIFont systemFontOfSize:19.0f weight:UIFontWeightBold];
self.titleLabel.font = buttonFont;
self.titleLabel.adjustsFontForContentSizeCategory = YES;
self.titleLabel.backgroundColor = self.tintColor;
self.titleLabel.text = @"Button";
[self.containerView addSubview:self.titleLabel];
Expand All @@ -141,9 +135,6 @@ - (void)roundedButtonCommonInit
[self addTarget:self action:@selector(didTouchUpInside) forControlEvents:UIControlEventTouchUpInside];
[self addTarget:self action:@selector(didDragOutside) forControlEvents:UIControlEventTouchDragExit|UIControlEventTouchCancel];
[self addTarget:self action:@selector(didDragInside) forControlEvents:UIControlEventTouchDragEnter];

// Configure views for the current state
[self configureBackgroundView];
}

#pragma mark - View Displaying -
Expand All @@ -152,78 +143,23 @@ - (void)layoutSubviews
{
[super layoutSubviews];

// Regenerate the images if they are dirty and we need them
if (!self.isClear && self.isDirty) {
[self generateOpaqueImages];
self.isDirty = NO;
}

// Configure the button text
[self.titleLabel sizeToFit];
self.titleLabel.center = self.containerView.center;
self.titleLabel.frame = CGRectIntegral(self.titleLabel.frame);
}

- (void)generateOpaqueImages
{
// Double check we have the correct tint color set
[self updateTappedTintColorForTintColor];

// Generate any images we need
self.backgroundImage = [[self class] buttonImageWithBackgroundColor:self.buttonBackgroundColor
foregroundColor:self.tintColor
cornerRadius:self.cornerRadius];

// Attach this new image to the background view
self.backgroundImageView.image = self.backgroundImage;

// If we've set a tapped color, generate an image for that one too
if (self.tappedTintColor) {
self.tappedBackgroundImage = [[self class] buttonImageWithBackgroundColor:self.buttonBackgroundColor
foregroundColor:self.tappedTintColor
cornerRadius:self.cornerRadius];
}
else {
self.tappedBackgroundImage = nil;
}
}

- (void)configureBackgroundView
{
// Configure the image view depending on the state
if (self.isClear) { [self configureImageViewForClearDisplay]; }
else { [self configureImageViewForOpaqueDisplay]; }
}

- (void)configureImageViewForOpaqueDisplay
{
// Configure the background image view for opaque drawing
self.backgroundImageView.image = self.backgroundImage;
self.backgroundImageView.backgroundColor = nil;

// Reset ourselves from potential clipping
self.containerView.layer.masksToBounds = NO;
self.containerView.layer.cornerRadius = 0.0f;
}

- (void)configureImageViewForClearDisplay
{
// Clear out any images on the image view
self.backgroundImageView.image = nil;

// Configure the background image view for transparent drawing
self.backgroundImageView.backgroundColor = self.tintColor;

// Configure ourselves for clipping the views
self.containerView.layer.masksToBounds = YES;
self.containerView.layer.cornerRadius = self.cornerRadius;
}

- (void)tintColorDidChange
{
[super tintColorDidChange];
self.titleLabel.backgroundColor = self.isTapped ? [UIColor clearColor] : self.tintColor;
self.isDirty = YES;
self.backgroundView.backgroundColor = self.tintColor;
[self setNeedsLayout];
}

- (void)traitCollectionDidChange:(UITraitCollection *)previousTraitCollection
{
[super traitCollectionDidChange:previousTraitCollection];
[self setNeedsLayout];
}

Expand Down Expand Up @@ -258,8 +194,10 @@ - (void)didTouchUpInside
[self setBackgroundColorTappedAnimated:YES];
[self setButtonScaledTappedAnimated:YES];

// Send the semantic button action for apps relying on this action
[self sendActionsForControlEvents:UIControlEventPrimaryActionTriggered];

// Trigger the block if it has been set
if (self.tappedHandler) { self.tappedHandler(); }
}

Expand Down Expand Up @@ -296,79 +234,28 @@ - (void)setBackgroundColorTappedAnimated:(BOOL)animated

// -----------------------------------------------------

// For transparent buttons, just animate the tint color
if (self.isClear) {
void (^animationBlock)(void) = ^{
self.backgroundImageView.backgroundColor = self.isTapped ? self.tappedTintColor : self.tintColor;
};

void (^completionBlock)(BOOL) = ^(BOOL completed){
if (completed == NO) { return; }
updateTitleOpacity();
};

if (!animated) {
animationBlock();
completionBlock(YES);
}
else {
self.titleLabel.backgroundColor = [UIColor clearColor];
[UIView animateWithDuration:self.tapAnimationDuration
delay:0.0f
options:UIViewAnimationOptionBeginFromCurrentState
animations:animationBlock
completion:completionBlock];
}

return;
}
void (^animationBlock)(void) = ^{
self.backgroundView.backgroundColor = self.isTapped ? self.tappedTintColor : self.tintColor;
};

// -----------------------------------------------------
void (^completionBlock)(BOOL) = ^(BOOL completed){
if (completed == NO) { return; }
updateTitleOpacity();
};

// Define a single key for reffering to cross fade the image contents
NSString *animateContentsKey = @"animateContents";

if (!animated) {
[self.backgroundImageView.layer removeAnimationForKey:animateContentsKey];
self.backgroundImageView.image = self.isTapped ? self.tappedBackgroundImage : self.backgroundImage;
updateTitleOpacity();
return;
animationBlock();
completionBlock(YES);
}

// For opaque buttons, perform a Core Animation cross fade animation
UIImage *fromImage = self.isTapped ? self.backgroundImage : self.tappedBackgroundImage;
UIImage *toImage = self.isTapped ? self.tappedBackgroundImage : self.backgroundImage;

// If we quickly move between states before the animation completes, capture the progress
// we were at, so we can apply it as the new starting point
id presentationContents = nil;
CABasicAnimation *previousAnimation = [self.backgroundImageView.layer animationForKey:animateContentsKey];
if (previousAnimation) {
presentationContents = self.backgroundImageView.layer.presentationLayer.contents;
[self.backgroundImageView.layer removeAnimationForKey:animateContentsKey];
else {
self.titleLabel.backgroundColor = [UIColor clearColor];
[UIView animateWithDuration:self.tapAnimationDuration
delay:0.0f
options:UIViewAnimationOptionBeginFromCurrentState
animations:animationBlock
completion:completionBlock];
}

// Force the label to be clear before any animations start
self.titleLabel.backgroundColor = [UIColor clearColor];

[CATransaction begin];

// When the animation is complete, set the label back to opaque
[CATransaction setCompletionBlock:^{
// If another animation was queued after this one, don't update the opacity in this block
if ([self.backgroundImageView.layer animationForKey:animateContentsKey]) { return; }
updateTitleOpacity();
}];

// Perform the crossfade animation
CABasicAnimation *crossFade = [CABasicAnimation animationWithKeyPath:@"contents"];
crossFade.duration = self.tapAnimationDuration;
crossFade.fromValue = presentationContents ?: (id)fromImage.CGImage;
crossFade.toValue = (id)toImage.CGImage;
[self.backgroundImageView.layer addAnimation:crossFade forKey:animateContentsKey];
self.backgroundImageView.image = toImage;

[CATransaction commit];
}

- (void)setLabelAlphaTappedAnimated:(BOOL)animated
Expand Down Expand Up @@ -469,29 +356,19 @@ - (void)setTextPointSize:(CGFloat)textPointSize
[self setNeedsLayout];
}

- (void)setBackgroundColor:(UIColor *)backgroundColor
{
if (backgroundColor == _buttonBackgroundColor) { return; }
_buttonBackgroundColor = backgroundColor;
_isDirty = YES;
_isClear = ![[self class] isOpaqueColor:backgroundColor];
[self configureBackgroundView];
[self setNeedsLayout];
}

- (void)setTintColor:(UIColor *)tintColor
{
[super setTintColor:tintColor];
_isDirty = YES;
[self updateTappedTintColorForTintColor];
self.backgroundView.backgroundColor = tintColor;
self.titleLabel.backgroundColor = tintColor;
[self setNeedsLayout];
}

- (void)setTappedTintColor:(UIColor *)tappedTintColor
{
if (_tappedTintColor == tappedTintColor) { return; }
_tappedTintColor = tappedTintColor;
_isDirty = YES;
_tappedTintColorBrightnessOffset = 0.0f;
[self setNeedsLayout];
}
Expand All @@ -505,7 +382,6 @@ - (void)setTappedTintColorBrightnessOffset:(CGFloat)tappedTintColorBrightnessOff
}

_tappedTintColorBrightnessOffset = tappedTintColorBrightnessOffset;
_isDirty = YES;
[self updateTappedTintColorForTintColor];
[self setNeedsLayout];
}
Expand All @@ -518,54 +394,17 @@ - (void)setCornerRadius:(CGFloat)cornerRadius
}

_cornerRadius = cornerRadius;
_isDirty = YES;
self.backgroundView.layer.cornerRadius = _cornerRadius;
[self setNeedsLayout];
}

- (void)setEnabled:(BOOL)enabled
{
[super setEnabled:enabled];

self.containerView.alpha = enabled ? 1 : 0.4;
}

#pragma mark - Graphics Handling -
+ (BOOL)isOpaqueColor:(UIColor *)color
{
// If the background color's _alpha_ is anything other than 1.0, it's not opaque. ;)
CGFloat a = 0;
[color getRed:NULL green:NULL blue:NULL alpha:&a];
return a >= (1.0f - FLT_EPSILON);
}

+ (UIImage *)buttonImageWithBackgroundColor:(UIColor *)backgroundColor
foregroundColor:(UIColor *)foregroundColor
cornerRadius:(CGFloat)cornerRadius
{

CGFloat dimensionSize = (cornerRadius * 2.0f) + 2.0f;
CGSize size = (CGSize){dimensionSize, dimensionSize};

UIGraphicsImageRendererFormat *format = [[UIGraphicsImageRendererFormat alloc] init];
format.opaque = YES;

UIGraphicsImageRenderer *renderer = [[UIGraphicsImageRenderer alloc] initWithSize:size format:format];
UIImage *image = [renderer imageWithActions:^(UIGraphicsImageRendererContext *rendererContext) {
if (format.opaque) {
UIBezierPath *backgroundPath = [UIBezierPath bezierPathWithRect:(CGRect){CGPointZero, size}];
[backgroundColor setFill];
[backgroundPath fill];
}

//// Rectangle Drawing
UIBezierPath *foregroundPath = [UIBezierPath bezierPathWithRoundedRect:(CGRect){CGPointZero, size} cornerRadius:cornerRadius];
[foregroundColor setFill];
[foregroundPath fill];
}];

UIEdgeInsets insets = UIEdgeInsetsMake(cornerRadius, cornerRadius, cornerRadius, cornerRadius);
return [image resizableImageWithCapInsets:insets resizingMode:UIImageResizingModeStretch];
}

+ (UIColor *)brightnessAdjustedColorWithColor:(UIColor *)color amount:(CGFloat)amount
{
Expand Down
Loading