Remove ColorAndroid

facebook · Apr 9, 2020 · d165bc2 · d165bc2
1 parent ccb7dbe
commit d165bc2
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 100 deletions.
diff --git a/Libraries/StyleSheet/PlatformColorValueTypes.android.js b/Libraries/StyleSheet/PlatformColorValueTypes.android.js
@@ -21,10 +21,6 @@ export const PlatformColor = (...names: Array<string>): ColorValue => {
   return {resource_paths: names};
 };
 
-export const ColorAndroidPrivate = (color: string): ColorValue => {
-  return {resource_paths: [color]};
-};
-
 export const normalizeColorObject = (
   color: NativeColorValue,
 ): ?ProcessedColorValue => {

diff --git a/Libraries/StyleSheet/PlatformColorValueTypesAndroid.android.js b/Libraries/StyleSheet/PlatformColorValueTypesAndroid.android.js
diff --git a/Libraries/StyleSheet/PlatformColorValueTypesAndroid.js b/Libraries/StyleSheet/PlatformColorValueTypesAndroid.js
diff --git a/RNTester/js/examples/PlatformColor/PlatformColorExample.js b/RNTester/js/examples/PlatformColor/PlatformColorExample.js
@@ -13,14 +13,7 @@
 const React = require('react');
 const ReactNative = require('react-native');
 import Platform from '../../../../Libraries/Utilities/Platform';
-const {
-  ColorAndroid,
-  DynamicColorIOS,
-  PlatformColor,
-  StyleSheet,
-  Text,
-  View,
-} = ReactNative;
+const {DynamicColorIOS, PlatformColor, StyleSheet, Text, View} = ReactNative;
 
 function PlatformColorsExample() {
   function createTable() {
@@ -263,40 +256,22 @@ function DynamicColorsExample() {
   );
 }
 
-function AndroidColorsExample() {
-  return Platform.OS === 'android' ? (
-    <View style={styles.column}>
-      <View style={styles.row}>
-        <Text style={styles.labelCell}>ColorAndroid('?attr/colorAccent')</Text>
-        <View
-          style={{
-            ...styles.colorCell,
-            backgroundColor: ColorAndroid('?attr/colorAccent'),
-          }}
-        />
-      </View>
-    </View>
-  ) : (
-    <Text style={styles.labelCell}>Not applicable on this platform</Text>
-  );
-}
-
 function VariantColorsExample() {
   return (
     <View style={styles.column}>
       <View style={styles.row}>
         <Text style={styles.labelCell}>
           {Platform.OS === 'ios'
             ? "DynamicColorIOS({light: 'red', dark: 'blue'})"
-            : "ColorAndroid('?attr/colorAccent')"}
+            : "PlatformColor('?attr/colorAccent')"}
         </Text>
         <View
           style={{
             ...styles.colorCell,
             backgroundColor:
               Platform.OS === 'ios'
                 ? DynamicColorIOS({light: 'red', dark: 'blue'})
-                : ColorAndroid('?attr/colorAccent'),
+                : PlatformColor('?attr/colorAccent'),
           }}
         />
       </View>
@@ -340,12 +315,6 @@ exports.examples = [
       return <DynamicColorsExample />;
     },
   },
-  {
-    title: 'Android Colors',
-    render(): React.Element<any> {
-      return <AndroidColorsExample />;
-    },
-  },
   {
     title: 'Variant Colors',
     render(): React.Element<any> {

diff --git a/index.js b/index.js
@@ -96,7 +96,6 @@ import typeof Platform from './Libraries/Utilities/Platform';
 import typeof processColor from './Libraries/StyleSheet/processColor';
 import typeof {PlatformColor} from './Libraries/StyleSheet/PlatformColorValueTypes';
 import typeof {DynamicColorIOS} from './Libraries/StyleSheet/PlatformColorValueTypesIOS';
-import typeof {ColorAndroid} from './Libraries/StyleSheet/PlatformColorValueTypesAndroid';
 import typeof RootTagContext from './Libraries/ReactNative/RootTagContext';
 import typeof DeprecatedColorPropType from './Libraries/DeprecatedPropTypes/DeprecatedColorPropType';
 import typeof DeprecatedEdgeInsetsPropType from './Libraries/DeprecatedPropTypes/DeprecatedEdgeInsetsPropType';
@@ -473,10 +472,6 @@ module.exports = {
     return require('./Libraries/StyleSheet/PlatformColorValueTypesIOS')
       .DynamicColorIOS;
   },
-  get ColorAndroid(): ColorAndroid {
-    return require('./Libraries/StyleSheet/PlatformColorValueTypesAndroid')
-      .ColorAndroid;
-  },
   get requireNativeComponent(): <T>(
     uiViewClassName: string,
   ) => HostComponent<T> {

diff --git a/packages/eslint-plugin-react-native-community/__tests__/platform-colors-test.js b/packages/eslint-plugin-react-native-community/__tests__/platform-colors-test.js
@@ -22,7 +22,6 @@ eslintTester.run('../platform-colors', rule, {
     "const color = PlatformColor('controlAccentColor', 'controlColor');",
     "const color = DynamicColorIOS({light: 'black', dark: 'white'});",
     "const color = DynamicColorIOS({light: PlatformColor('black'), dark: PlatformColor('white')});",
-    "const color = ColorAndroid('?attr/colorAccent')",
   ],
   invalid: [
     {
@@ -49,14 +48,5 @@ eslintTester.run('../platform-colors', rule, {
         "const white = 'white'; const color = DynamicColorIOS({light: 'black', dark: white});",
       errors: [{message: rule.meta.messages.dynamicColorIOSDark}],
     },
-    {
-      code: 'const color = ColorAndroid();',
-      errors: [{message: rule.meta.messages.colorAndroidArg}],
-    },
-    {
-      code:
-        "const colorAccent = '?attr/colorAccent'; const color = ColorAndroid(colorAccent);",
-      errors: [{message: rule.meta.messages.colorAndroidArg}],
-    },
   ],
 });
diff --git a/packages/eslint-plugin-react-native-community/platform-colors.js b/packages/eslint-plugin-react-native-community/platform-colors.js
@@ -12,7 +12,7 @@ module.exports = {
     type: 'problem',
     docs: {
       description:
-        'Ensure that PlatformColor(), DynamicColorIOS(), and ColorAndroid() are passed literals of the expected shape.',
+        'Ensure that PlatformColor() and DynamicColorIOS() are passed literals of the expected shape.',
     },
     messages: {
       platformColorArgsLength:
@@ -25,8 +25,6 @@ module.exports = {
         'DynamicColorIOS() light value must be either a literal or a PlatformColor() call.',
       dynamicColorIOSDark:
         'DynamicColorIOS() dark value must be either a literal or a PlatformColor() call.',
-      colorAndroidArg:
-        'ColorAndroid() must take a single argument that is a literal.',
     },
     schema: [],
   },
@@ -103,15 +101,6 @@ module.exports = {
             });
             return;
           }
-        } else if (node.callee.name === 'ColorAndroid') {
-          const args = node.arguments;
-          if (!(args.length === 1 && args[0].type === 'Literal')) {
-            context.report({
-              node,
-              messageId: 'colorAndroidArg',
-            });
-            return;
-          }
         }
       },
     };