[Snackbar] Message View Styling. (#1120)

* Snackbar Message View Styling.

* Small alteration to how colors are generated for the unit tests.

* Not styling the snack bar in the init method.

* Default styling for background views.

* Remove overriding the styling in init.

* Looks like swiftlint is already installed by default on travis-ci
boxes. Trying this as an experiment.

* Trying this?

* Cant get unit tests to pass as there’s no window to add the message
view to with logic tests.

Author: seanoshea

components/Snackbar/src/MDCSnackbarManager.m

@@ -16,11 +16,12 @@
 
 #import "MDCSnackbarManager.h"
 #import "MDCSnackbarMessage.h"
+#import "MDCSnackbarMessageView.h"
 #import "MaterialOverlayWindow.h"
 #import "UIApplication+AppExtensions.h"
 #import "private/MDCSnackbarMessageInternal.h"
-#import "private/MDCSnackbarMessageView.h"
 #import "private/MDCSnackbarOverlayView.h"
+#import "private/MDCSnackbarMessageViewInternal.h"
 
 @class MDCSnackbarManagerSuspensionToken;
 

components/Snackbar/src/MDCSnackbarMessage.m

@@ -15,8 +15,9 @@
  */
 
 #import "MDCSnackbarMessage.h"
+#import "MDCSnackbarMessageView.h"
 #import "private/MDCSnackbarMessageInternal.h"
-#import "private/MDCSnackbarMessageView.h"
+
 
 static const NSTimeInterval kDefaultDuration = 4.0f;
 

components/Snackbar/src/MDCSnackbarMessageView.h

@@ -0,0 +1,40 @@
+/*
+ Copyright 2016-present the Material Components for iOS authors. All Rights Reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+#import <UIKit/UIKit.h>
+
+
+/**
+ Class which provides the default implementation of a snackbar.
+ */
+@interface MDCSnackbarMessageView : UIView
+
+/**
+ The color for the background of the snackbar message view.
+ */
+@property(nonatomic, strong, nullable) UIColor *snackbarMessageViewBackgroundColor UI_APPEARANCE_SELECTOR;
+
+/**
+ The color for the shadow color for the snackbar message view.
+ */
+@property(nonatomic, strong, nullable) UIColor *snackbarMessageViewShadowColor UI_APPEARANCE_SELECTOR;
+
+/**
+ The color for the message text in the snackbar message view.
+ */
+@property(nonatomic, strong, nullable) UIColor *snackbarMessageViewTextColor UI_APPEARANCE_SELECTOR;
+
+@end

components/Snackbar/src/private/MDCSnackbarMessageView.m renamed to components/Snackbar/src/MDCSnackbarMessageView.m

@@ -18,10 +18,12 @@
 
 #import "MDCSnackbarMessage.h"
 #import "MDCSnackbarMessageView.h"
+#import "MaterialButtons.h"
 #import "MDCSnackbarOverlayView.h"
 #import "MaterialAnimationTiming.h"
 #import "MaterialButtons.h"
 #import "MaterialTypography.h"
+#import "private/MDCSnackbarMessageViewInternal.h"
 
 NSString *const MDCSnackbarMessageTitleAutomationIdentifier =
     @"MDCSnackbarMessageTitleAutomationIdentifier";
@@ -133,11 +135,6 @@ @interface MDCSnackbarMessageView ()
  */
 @property(nonatomic, strong) UIView *contentView;
 
-/**
- The message to display.
- */
-@property(nonatomic, strong) MDCSnackbarMessage *message;
-
 /**
  Holds onto the dismissal handler, called when the snackbar should dismiss due to user interaction.
  */
@@ -164,6 +161,12 @@ - (instancetype)initWithFrame:(CGRect)frame {
 
 @implementation MDCSnackbarMessageView
 
++ (void)initialize {
+  [[self appearance] setSnackbarMessageViewShadowColor:MDCRGBAColor(0x00, 0x00, 0x00, 1.0f)];
+  [[self appearance] setSnackbarMessageViewBackgroundColor:MDCRGBAColor(0x32, 0x32, 0x32, 1.0f)];
+  [[self appearance] setSnackbarMessageViewTextColor:MDCRGBAColor(0xFF, 0xFF, 0xFF, 1.0f)];
+}
+
 - (void)dismissWithAction:(MDCSnackbarMessageAction *)action userInitiated:(BOOL)userInitiated {
   if (self.dismissalHandler) {
     self.dismissalHandler(userInitiated, action);
@@ -189,9 +192,7 @@ - (CGFloat)maximumWidth {
                                                               : kMaximumViewWidth_iPhone;
 }
 
-- (UIColor *)snackbarBackgroundColor {
-  return MDCRGBAColor(0x32, 0x32, 0x32, 1.0f);
-}
+#pragma mark - Styling the view
 
 - (UIColor *)snackbarButtonTextColor {
   return MDCRGBAColor(0xFF, 0xFF, 0xFF, 0.6f);
@@ -205,25 +206,40 @@ - (UIColor *)snackbarSeparatorColor {
   return MDCRGBAColor(0xFF, 0xFF, 0xFF, 0.5f);
 }
 
-- (UIColor *)snackbarShadowColor {
-  return MDCRGBAColor(0x00, 0x00, 0x00, 1.0f);
+- (void)setSnackbarMessageViewBackgroundColor:(UIColor *)snackbarMessageViewBackgroundColor {
+  _snackbarMessageViewBackgroundColor = snackbarMessageViewBackgroundColor;
+  _containerView.backgroundColor = snackbarMessageViewBackgroundColor;
 }
 
-- (UIColor *)snackbarTextColor {
-  return MDCRGBAColor(0xFF, 0xFF, 0xFF, 1.0f);
+- (void)setSnackbarShadowColor:(UIColor *)snackbarMessageViewShadowColor {
+  _snackbarMessageViewShadowColor = snackbarMessageViewShadowColor;
+  self.layer.shadowColor = snackbarMessageViewShadowColor.CGColor;
+}
+
+- (void)setSnackbarMessageViewTextColor:(UIColor *)snackbarMessageViewTextColor {
+  _snackbarMessageViewTextColor = snackbarMessageViewTextColor;
+  self.label.textColor = _snackbarMessageViewTextColor;
+}
+
+- (void)addColorToMessageLabel:(UIColor *)color {
+  NSMutableAttributedString *messageString = [_label.attributedText mutableCopy];
+  [messageString addAttributes:@{
+                                 NSForegroundColorAttributeName :color,
+                                 } range:NSMakeRange(0, messageString.length)];
+  _label.attributedText = messageString;
 }
 
 - (instancetype)initWithMessage:(MDCSnackbarMessage *)message
                  dismissHandler:(MDCSnackbarMessageDismissHandler)handler {
   self = [super init];
   if (self) {
+    
     _message = message;
     _dismissalHandler = [handler copy];
-
-    UIColor *shadowColor = [self snackbarShadowColor];
+    
     self.backgroundColor = [UIColor clearColor];
     self.layer.cornerRadius = kCornerRadius;
-    self.layer.shadowColor = shadowColor.CGColor;
+    self.layer.shadowColor = _snackbarMessageViewShadowColor.CGColor;
     self.layer.shadowOpacity = kShadowAlpha;
     self.layer.shadowOffset = kShadowOffset;
     self.layer.shadowRadius = kShadowSpread;
@@ -235,7 +251,7 @@ - (instancetype)initWithMessage:(MDCSnackbarMessage *)message
     [self addSubview:_containerView];
 
     [_containerView setTranslatesAutoresizingMaskIntoConstraints:NO];
-    _containerView.backgroundColor = [self snackbarBackgroundColor];
+    _containerView.backgroundColor = _snackbarMessageViewBackgroundColor;
     _containerView.layer.cornerRadius = kCornerRadius;
     _containerView.layer.masksToBounds = YES;
 
@@ -287,11 +303,6 @@ - (instancetype)initWithMessage:(MDCSnackbarMessage *)message
                 }];
 
     // Apply 'global' attributes along the whole string.
-    NSDictionary *attributes = @{
-      NSForegroundColorAttributeName : [self snackbarTextColor],
-    };
-    [messageString addAttributes:attributes range:NSMakeRange(0, messageString.length)];
-
     _label.backgroundColor = [UIColor clearColor];
     _label.textAlignment = NSTextAlignmentNatural;
     _label.attributedText = messageString;
@@ -331,6 +342,8 @@ - (instancetype)initWithMessage:(MDCSnackbarMessage *)message
     UIColor *textColor = [self snackbarButtonTextColor];
     UIColor *textColorHighlighted = [self snackbarButtonTextColorHighlighted];
 
+    _label.textColor = textColor;
+
     if (message.buttonTextColor) {
       textColor = message.buttonTextColor;
     }

components/Snackbar/src/MaterialSnackbar.h

@@ -16,3 +16,4 @@
 
 #import "MDCSnackbarManager.h"
 #import "MDCSnackbarMessage.h"
+#import "MDCSnackbarMessageView.h"

components/Snackbar/src/private/MDCSnackbarMessageView.h renamed to components/Snackbar/src/private/MDCSnackbarMessageViewInternal.h

@@ -1,21 +1,19 @@
 /*
  Copyright 2016-present the Material Components for iOS authors. All Rights Reserved.
-
+ 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at
-
+ 
  http://www.apache.org/licenses/LICENSE-2.0
-
+ 
  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  See the License for the specific language governing permissions and
  limitations under the License.
  */
 
-#import <UIKit/UIKit.h>
-
 @class MDCSnackbarMessage;
 @class MDCSnackbarMessageAction;
 
@@ -26,12 +24,10 @@
  interaction. @c action, if non-nil, indicates that the user chose to execute a specific action.
  */
 typedef void (^MDCSnackbarMessageDismissHandler)(BOOL userInitiated,
-                                                 MDCSnackbarMessageAction *action);
+    MDCSnackbarMessageAction * _Nullable action);
+
+@interface MDCSnackbarMessageView ()
 
-/**
- Class which provides the default implementation of a snackbar.
- */
-@interface MDCSnackbarMessageView : UIView
 
 /**
  If the user has tapped on the snackbar or if @c dismissWithAction:userInitiated: has been called.
@@ -51,16 +47,15 @@ typedef void (^MDCSnackbarMessageDismissHandler)(BOOL userInitiated,
 /**
  Convenience pointer to the message used to create the view.
  */
-@property(nonatomic, readonly, strong) MDCSnackbarMessage *message;
-
+@property(nonatomic, nullable, readonly, strong) MDCSnackbarMessage *message;
 /**
  Creates a snackbar view to display @c message.
 
  The view will call @c handler when the user has interacted with the snackbar view in such a way
  that it needs to be dismissed prior to its timer-based dismissal time.
  */
-- (instancetype)initWithMessage:(MDCSnackbarMessage *)message
-                 dismissHandler:(MDCSnackbarMessageDismissHandler)handler;
+- (_Nonnull instancetype)initWithMessage:(MDCSnackbarMessage * _Nullable)message
+                          dismissHandler:(MDCSnackbarMessageDismissHandler _Nullable)handler;
 
 /**
  Dismisses the message view.
@@ -71,7 +66,7 @@ typedef void (^MDCSnackbarMessageDismissHandler)(BOOL userInitiated,
  @param action The action that prompted the dismissal.
  @param userInitiated Whether or not this is a user-initiated dismissal or a programmatic one.
  */
-- (void)dismissWithAction:(MDCSnackbarMessageAction *)action userInitiated:(BOOL)userInitiated;
+- (void)dismissWithAction:(MDCSnackbarMessageAction * _Nullable)action userInitiated:(BOOL)userInitiated;
 
 /**
  When VoiceOver is enabled the view should wait for user action before dismissing.
@@ -88,6 +83,7 @@ typedef void (^MDCSnackbarMessageDismissHandler)(BOOL userInitiated,
 - (void)animateContentOpacityFrom:(CGFloat)fromOpacity
                                to:(CGFloat)toOpacity
                          duration:(NSTimeInterval)duration
-                   timingFunction:(CAMediaTimingFunction *)timingFunction;
+                   timingFunction:(CAMediaTimingFunction * _Nullable)timingFunction;
+
 
 @end

components/Snackbar/src/private/MDCSnackbarOverlayView.m

@@ -23,6 +23,7 @@
 #import "MaterialKeyboardWatcher.h"
 #import "MaterialOverlays.h"
 #import "UIApplication+AppExtensions.h"
+#import "MDCSnackbarMessageViewInternal.h"
 
 NSString *const MDCSnackbarOverlayIdentifier = @"MDCSnackbar";