From bc5e4b311bdaf352f8a7ba664980544511a4ab7a Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Mon, 25 Mar 2019 17:32:24 -0400
Subject: [PATCH] un nonnulla

---
 MVMCoreUI/Atoms/Buttons/PrimaryButton.h | 22 +++++++++++-----------
 MVMCoreUI/Atoms/Buttons/PrimaryButton.m |  6 +++---
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/MVMCoreUI/Atoms/Buttons/PrimaryButton.h b/MVMCoreUI/Atoms/Buttons/PrimaryButton.h
index a1c7d393..fb93c33a 100644
--- a/MVMCoreUI/Atoms/Buttons/PrimaryButton.h
+++ b/MVMCoreUI/Atoms/Buttons/PrimaryButton.h
@@ -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
-+ (nonnull instancetype)primaryButton:(BOOL)enabled;
-+ (nonnull instancetype)primarySmallButton:(BOOL)enabled;
-+ (nonnull instancetype)primaryTinyButton:(BOOL)enabled;
++ (nullable instancetype)primaryButton:(BOOL)enabled;
++ (nullable instancetype)primarySmallButton:(BOOL)enabled;
++ (nullable instancetype)primaryTinyButton:(BOOL)enabled;
 
 + (nonnull instancetype)primaryButton NS_SWIFT_NAME(button());
-+ (nonnull instancetype)primarySmallButton;
-+ (nonnull instancetype)primaryWhiteButton:(BOOL)small;
++ (nullable instancetype)primarySmallButton;
++ (nullable instancetype)primaryWhiteButton:(BOOL)small;
 
 // legacy color functions.
-+ (nonnull instancetype)primaryRedButton;
-+ (nonnull instancetype)primaryGrayButtonSmall:(BOOL)small;
-+ (nonnull instancetype)primaryRedSmallButton;
-+ (nonnull instancetype)primaryGraySmallRedButton;
-+ (nonnull instancetype)primaryWhiteSmallRedButton;
++ (nullable instancetype)primaryRedButton;
++ (nullable instancetype)primaryGrayButtonSmall:(BOOL)small;
++ (nullable instancetype)primaryRedSmallButton;
++ (nullable instancetype)primaryGraySmallRedButton;
++ (nullable 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.
-+ (nonnull instancetype)getButton;
++ (nullable instancetype)getButton;
 
 // Pins the height initially.
 - (void)pinHeight;
diff --git a/MVMCoreUI/Atoms/Buttons/PrimaryButton.m b/MVMCoreUI/Atoms/Buttons/PrimaryButton.m
index b87af3ac..a13a693c 100644
--- a/MVMCoreUI/Atoms/Buttons/PrimaryButton.m
+++ b/MVMCoreUI/Atoms/Buttons/PrimaryButton.m
@@ -555,7 +555,7 @@
     return button;
 }
 
-+ (nonnull instancetype)primarySmallButton {
++ (nullable instancetype)primarySmallButton {
     PrimaryButton *button = [self getButton];
     button.primaryButtonType = PrimaryButtonTypeBlack;
     [button setAsBlack];
@@ -563,7 +563,7 @@
     return button;
 }
 
-+ (nonnull instancetype)primaryTinyButton:(BOOL)enabled {
++ (nullable instancetype)primaryTinyButton:(BOOL)enabled {
     PrimaryButton *button = [self getButton];
     button.primaryButtonType = PrimaryButtonTypeBlack;
     [button setAsBlack];
@@ -612,7 +612,7 @@
     return button;
 }
 
-+ (nonnull instancetype)primaryWhiteButton:(BOOL)small {
++ (nullable instancetype)primaryWhiteButton:(BOOL)small {
     PrimaryButton *button = [self getButton];
     button.primaryButtonType = PrimaryButtonTypeWhite;
     [button setAsAllWhite];