This commit is contained in:
Pfeil, Scott Robert 2019-03-25 17:07:02 -04:00
parent f63b157c16
commit aab0fbc083
2 changed files with 14 additions and 14 deletions

View File

@ -47,20 +47,20 @@ static CGFloat const PrimaryButtonSmallHeight = 30.0;
@property (nonatomic) BOOL skipHighlighted;
// The main creation functions, changed to black button for 2.0 for default
+ (nullable instancetype)primaryButton:(BOOL)enabled;
+ (nullable instancetype)primarySmallButton:(BOOL)enabled;
+ (nullable instancetype)primaryTinyButton:(BOOL)enabled;
+ (nonnull instancetype)primaryButton:(BOOL)enabled;
+ (nonnull instancetype)primarySmallButton:(BOOL)enabled;
+ (nonnull instancetype)primaryTinyButton:(BOOL)enabled;
+ (nonnull instancetype)primaryButton NS_SWIFT_NAME(button());
+ (nullable instancetype)primarySmallButton;
+ (nullable instancetype)primaryWhiteButton:(BOOL)small;
+ (nonnull instancetype)primarySmallButton;
+ (nonnull instancetype)primaryWhiteButton:(BOOL)small;
// legacy color functions.
+ (nullable instancetype)primaryRedButton;
+ (nullable instancetype)primaryGrayButtonSmall:(BOOL)small;
+ (nullable instancetype)primaryRedSmallButton;
+ (nullable instancetype)primaryGraySmallRedButton;
+ (nullable instancetype)primaryWhiteSmallRedButton;
+ (nonnull instancetype)primaryRedButton;
+ (nonnull instancetype)primaryGrayButtonSmall:(BOOL)small;
+ (nonnull instancetype)primaryRedSmallButton;
+ (nonnull instancetype)primaryGraySmallRedButton;
+ (nonnull instancetype)primaryWhiteSmallRedButton;
@ -68,7 +68,7 @@ static CGFloat const PrimaryButtonSmallHeight = 30.0;
#pragma mark - For Subclassing
// Creates and pins the height of the button, nothing more.
+ (nullable instancetype)getButton;
+ (nonnull instancetype)getButton;
// Pins the height initially.
- (void)pinHeight;

View File

@ -555,7 +555,7 @@
return button;
}
+ (nullable instancetype)primarySmallButton {
+ (nonnull instancetype)primarySmallButton {
PrimaryButton *button = [self getButton];
button.primaryButtonType = PrimaryButtonTypeBlack;
[button setAsBlack];
@ -563,7 +563,7 @@
return button;
}
+ (nullable instancetype)primaryTinyButton:(BOOL)enabled {
+ (nonnull instancetype)primaryTinyButton:(BOOL)enabled {
PrimaryButton *button = [self getButton];
button.primaryButtonType = PrimaryButtonTypeBlack;
[button setAsBlack];
@ -612,7 +612,7 @@
return button;
}
+ (nullable instancetype)primaryWhiteButton:(BOOL)small {
+ (nonnull instancetype)primaryWhiteButton:(BOOL)small {
PrimaryButton *button = [self getButton];
button.primaryButtonType = PrimaryButtonTypeWhite;
[button setAsAllWhite];