From c5e306f0aea2a159f2729a78447096c97f6a6210 Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Fri, 31 May 2019 14:22:52 -0400
Subject: [PATCH] highlight button status

---
 MVMCoreUI/Atoms/Buttons/PrimaryButton.m      | 16 ++++++++++++++--
 MVMCoreUI/Categories/UIColor+MFConvenience.h |  3 ---
 MVMCoreUI/Categories/UIColor+MFConvenience.m | 12 ------------
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/MVMCoreUI/Atoms/Buttons/PrimaryButton.m b/MVMCoreUI/Atoms/Buttons/PrimaryButton.m
index b2fe18d2..38cc164e 100644
--- a/MVMCoreUI/Atoms/Buttons/PrimaryButton.m
+++ b/MVMCoreUI/Atoms/Buttons/PrimaryButton.m
@@ -328,7 +328,18 @@
     if (self.skipHighlighted) {
         return;
     }
-    if (self.primaryButtonType == PrimaryButtonTypeRed) {
+    if (self.primaryButtonType == PrimaryButtonTypeCustom) {
+        if (highlighted && self.enabled) {
+            CALayer *mask = [[CALayer alloc] init];
+            mask.backgroundColor = [UIColor whiteColor].CGColor;
+            mask.opacity = 0.7;
+            mask.frame = self.bounds;
+            self.layer.mask = mask;
+            self.layer.opaque = true;
+        } else if (!highlighted) {
+            self.layer.mask = nil;
+        }
+    } if (self.primaryButtonType == PrimaryButtonTypeRed) {
         if (self.bordered) {
             if (highlighted) {
                 self.backgroundColor = [UIColor mfRedColor];
@@ -485,11 +496,12 @@
             [self setTitleColor:(self.disabledTextColor ?: [UIColor blackColor]) forState:UIControlStateNormal];
         }
     }
+    [self setTitleColor:[self titleColorForState:UIControlStateNormal] forState:UIControlStateHighlighted];
 }
 
 - (void)setBordered:(BOOL)bordered {
     if (bordered != _bordered) {
-        if (self.buttonType == PrimaryButtonTypeCustom) {
+        if (self.primaryButtonType == PrimaryButtonTypeCustom) {
             _bordered = bordered;
             [self setAsCustom];
         } else if (bordered) {
diff --git a/MVMCoreUI/Categories/UIColor+MFConvenience.h b/MVMCoreUI/Categories/UIColor+MFConvenience.h
index c7b6a950..4a51a13b 100644
--- a/MVMCoreUI/Categories/UIColor+MFConvenience.h
+++ b/MVMCoreUI/Categories/UIColor+MFConvenience.h
@@ -12,11 +12,9 @@
 
 #pragma mark - 2.0
 
-+ (nonnull UIColor *)mfNegativeOrangeColor;
 + (nonnull UIColor *)mfSwitchOnTintColor;
 + (nonnull UIColor *)mfSwitchOffTintColor;
 + (nonnull UIColor *)mfSilver;
-+ (nonnull UIColor *)mfSilverTwo;
 + (nonnull UIColor *)mfBattleshipGrey;
 + (nonnull UIColor *)mfPrimaryButtonHighlightBlackColor;
 + (nonnull UIColor *)mfPrimaryWhiteButtonDisableColor;
@@ -26,7 +24,6 @@
 + (nonnull UIColor *)mfPumpkinColor;
 + (nonnull UIColor *)mfShamrock;
 + (nonnull UIColor *)mfCerulean;
-+ (nonnull UIColor *)mfLightBlackColor;
 + (nonnull UIColor *)mfWhiteTwo;
 
 #pragma mark - legacy
diff --git a/MVMCoreUI/Categories/UIColor+MFConvenience.m b/MVMCoreUI/Categories/UIColor+MFConvenience.m
index b4ec2ea2..e56d89bc 100644
--- a/MVMCoreUI/Categories/UIColor+MFConvenience.m
+++ b/MVMCoreUI/Categories/UIColor+MFConvenience.m
@@ -13,10 +13,6 @@
 
 #pragma mark - 2.0
 
-+ (nonnull UIColor *)mfNegativeOrangeColor {
-    return [UIColor mfPumpkinColor];
-}
-
 + (nonnull UIColor *)mfSwitchOnTintColor {
     return [UIColor mfShamrock];
 }
@@ -29,10 +25,6 @@
     return [UIColor mfColor8bitsWithRed:216 green:218 blue:218 alpha:1.0];
 }
 
-+ (nonnull UIColor *)mfSilverTwo {
-    return [UIColor mfColor8bitsWithRed:217 green:219 blue:219 alpha:1.0];
-}
-
 + (nonnull UIColor *)mfBattleshipGrey {
     return [UIColor mfColor8bitsWithRed:116 green:118 blue:118 alpha:1.0];
 }
@@ -70,10 +62,6 @@
     return [UIColor mfColor8bitsWithRed:0 green:122 blue:184 alpha:1.0];
 }
 
-+ (nonnull UIColor *)mfLightBlackColor {
-    return [UIColor mfColor8bitsWithRed:95 green:95 blue:95 alpha:1.0];
-}
-
 + (nonnull UIColor *)mfWhiteTwo {
     return [UIColor mfColor8bitsWithRed:246 green:246 blue:246 alpha:1.0];
 }