[TextFields] fixing color mapping for floatingNormal and floatingActi…

…ve Colors. (#3617) * fixing color mapping for floatingNormal and floatingActive Colors. * fixing the tests.
material-components · May 2, 2018 · 7e3c5ae · 7e3c5ae
1 parent cd3a53c
commit 7e3c5ae
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/components/TextFields/src/ColorThemer/MDCFilledTextFieldColorThemer.m b/components/TextFields/src/ColorThemer/MDCFilledTextFieldColorThemer.m
@@ -41,9 +41,9 @@ + (void)applySemanticColorScheme:(nonnull id<MDCColorScheming>)colorScheme
   textInputControllerFilled.errorColor = colorScheme.errorColor;
   textInputControllerFilled.disabledColor =
       [colorScheme.onSurfaceColor colorWithAlphaComponent:kFilledTextFieldDisabledAlpha];
-  id<MDCTextInputControllerFloatingPlaceholder> textInputControllerFloatingPlaceholder =
-      (id<MDCTextInputControllerFloatingPlaceholder>)textInputControllerFilled;
-  textInputControllerFloatingPlaceholder.floatingPlaceholderActiveColor =
+  textInputControllerFilled.floatingPlaceholderNormalColor =
+      [colorScheme.onSurfaceColor colorWithAlphaComponent:kFilledTextFieldOnSurfaceAlpha];
+  textInputControllerFilled.floatingPlaceholderActiveColor =
       [colorScheme.primaryColor colorWithAlphaComponent:kFilledTextFieldActiveAlpha];
 }
 

diff --git a/components/TextFields/src/ColorThemer/MDCOutlinedTextFieldColorThemer.m b/components/TextFields/src/ColorThemer/MDCOutlinedTextFieldColorThemer.m
@@ -43,6 +43,7 @@ + (void)applySemanticColorScheme:(id<MDCColorScheming>)colorScheme
     (id<MDCTextInputControllerFloatingPlaceholder>)textInputController;
     if ([textInputControllerFloatingPlaceholder
          respondsToSelector:@selector(setFloatingPlaceholderNormalColor:)]) {
+      textInputControllerFloatingPlaceholder.floatingPlaceholderNormalColor = onSurfaceOpacity;
       textInputControllerFloatingPlaceholder.floatingPlaceholderActiveColor =
           [colorScheme.primaryColor colorWithAlphaComponent:kOutlinedTextFieldActiveAlpha];
     }

diff --git a/components/TextFields/src/ColorThemer/MDCTextFieldColorThemer.m b/components/TextFields/src/ColorThemer/MDCTextFieldColorThemer.m
@@ -69,12 +69,9 @@ + (void)applySemanticColorScheme:(id<MDCColorScheming>)colorScheme
           conformsToProtocol:@protocol(MDCTextInputControllerFloatingPlaceholder)]) {
     id<MDCTextInputControllerFloatingPlaceholder> textInputControllerFloatingPlaceholder =
         (id<MDCTextInputControllerFloatingPlaceholder>)textInputController;
-
-    if ([textInputControllerFloatingPlaceholder
-            respondsToSelector:@selector(setFloatingPlaceholderNormalColor:)]) {
-      UIColor *primary87Opacity = [colorScheme.primaryColor colorWithAlphaComponent:0.87f];
-      textInputControllerFloatingPlaceholder.floatingPlaceholderNormalColor = primary87Opacity;
-    }
+    UIColor *primary87Opacity = [colorScheme.primaryColor colorWithAlphaComponent:0.87f];
+    textInputControllerFloatingPlaceholder.floatingPlaceholderNormalColor = onSurface60Opacity;
+    textInputControllerFloatingPlaceholder.floatingPlaceholderActiveColor = primary87Opacity;
   }
 }
 
@@ -112,7 +109,9 @@ + (void)applySemanticColorScheme:(id<MDCColorScheming>)colorScheme
         (Class<MDCTextInputControllerFloatingPlaceholder>)textInputControllerClass;
     UIColor *primary87Opacity = [colorScheme.primaryColor colorWithAlphaComponent:0.87f];
     [textInputControllerFloatingPlaceholderClass
-        setFloatingPlaceholderNormalColorDefault:primary87Opacity];
+        setFloatingPlaceholderNormalColorDefault:onSurface60Opacity];
+    [textInputControllerFloatingPlaceholderClass
+        setFloatingPlaceholderActiveColorDefault:primary87Opacity];
   }
 }
 #if !defined(__IPHONE_11_0)

diff --git a/components/TextFields/tests/unit/TextFieldColorThemerTests.m b/components/TextFields/tests/unit/TextFieldColorThemerTests.m
@@ -48,8 +48,8 @@ + (void)resetDefaultsForClass:(Class<MDCTextInputController>)textInputController
        conformsToProtocol:@protocol(MDCTextInputControllerFloatingPlaceholder)]) {
     Class<MDCTextInputControllerFloatingPlaceholder> textInputControllerFloatingPlaceholderClass =
         (Class<MDCTextInputControllerFloatingPlaceholder>)textInputControllerClass;
-    [textInputControllerFloatingPlaceholderClass
-        setFloatingPlaceholderNormalColorDefault:nil];
+    [textInputControllerFloatingPlaceholderClass setFloatingPlaceholderActiveColorDefault:nil];
+    [textInputControllerFloatingPlaceholderClass setFloatingPlaceholderNormalColorDefault:nil];
   }
 }
 #if !defined(__IPHONE_11_0)
@@ -96,6 +96,8 @@ - (void)testDefaultValuesAreSet {
   XCTAssertEqualObjects(MDCTextInputControllerBase.leadingUnderlineLabelTextColorDefault,
                         onSurface60Opacity);
   XCTAssertEqualObjects(MDCTextInputControllerBase.floatingPlaceholderNormalColorDefault,
+                        onSurface60Opacity);
+  XCTAssertEqualObjects(MDCTextInputControllerBase.floatingPlaceholderActiveColorDefault,
                         primary87Opacity);
 
   XCTAssertEqualObjects(MDCTextInputControllerFullWidth.errorColorDefault, colorScheme.errorColor);