From 8643b5560ebb6935dcfdc4fc2a2cd0d3a2f1fac0 Mon Sep 17 00:00:00 2001
From: Eli White <eliwhite@fb.com>
Date: Mon, 2 Mar 2020 15:07:50 -0800
Subject: [PATCH] Update OSS generated Android component delegates

Summary:
$title

Now that the codegen handles the new PlatformColors, regenerating the checked in native component files.

Changelog:
[Internal]

(Note: this ignores all push blocking failures!)

Reviewed By: mdvacca

Differential Revision: D20175914

fbshipit-source-id: fa7b8e5139dcfe06f49582d7810fae12e1e1fb4b
---
 .../ActivityIndicatorViewManagerDelegate.java         |  3 ++-
 .../AndroidDrawerLayoutManagerDelegate.java           |  5 +++--
 .../AndroidProgressBarManagerDelegate.java            |  3 ++-
 .../AndroidSwipeRefreshLayoutManagerDelegate.java     |  3 ++-
 .../viewmanagers/AndroidSwitchManagerDelegate.java    | 11 ++++++-----
 .../InputAccessoryViewManagerDelegate.java            |  3 ++-
 .../viewmanagers/ProgressViewManagerDelegate.java     |  5 +++--
 .../viewmanagers/SegmentedControlManagerDelegate.java |  7 ++++---
 .../react/viewmanagers/SliderManagerDelegate.java     |  7 ++++---
 9 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/ActivityIndicatorViewManagerDelegate.java b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/ActivityIndicatorViewManagerDelegate.java
index 62514d5988f..833ffe265d9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/ActivityIndicatorViewManagerDelegate.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/ActivityIndicatorViewManagerDelegate.java
@@ -11,6 +11,7 @@ package com.facebook.react.viewmanagers;
 
 import android.view.View;
 import androidx.annotation.Nullable;
+import com.facebook.react.bridge.ColorPropConverter;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
 import com.facebook.react.uimanager.BaseViewManagerInterface;
 import com.facebook.react.uimanager.LayoutShadowNode;
@@ -29,7 +30,7 @@ public class ActivityIndicatorViewManagerDelegate<T extends View, U extends Base
         mViewManager.setAnimating(view, value == null ? false : (boolean) value);
         break;
       case "color":
-        mViewManager.setColor(view, value == null ? null : ((Double) value).intValue());
+        mViewManager.setColor(view, ColorPropConverter.getColor(value, view.getContext()));
         break;
       case "size":
         mViewManager.setSize(view, (String) value);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidDrawerLayoutManagerDelegate.java b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidDrawerLayoutManagerDelegate.java
index d65992cc9a9..5985c4ff1b9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidDrawerLayoutManagerDelegate.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidDrawerLayoutManagerDelegate.java
@@ -11,6 +11,7 @@ package com.facebook.react.viewmanagers;
 
 import android.view.View;
 import androidx.annotation.Nullable;
+import com.facebook.react.bridge.ColorPropConverter;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
 import com.facebook.react.uimanager.BaseViewManagerInterface;
@@ -27,7 +28,7 @@ public class AndroidDrawerLayoutManagerDelegate<T extends View, U extends BaseVi
         mViewManager.setKeyboardDismissMode(view, (String) value);
         break;
       case "drawerBackgroundColor":
-        mViewManager.setDrawerBackgroundColor(view, value == null ? null : ((Double) value).intValue());
+        mViewManager.setDrawerBackgroundColor(view, ColorPropConverter.getColor(value, view.getContext()));
         break;
       case "drawerPosition":
         mViewManager.setDrawerPosition(view, (String) value);
@@ -39,7 +40,7 @@ public class AndroidDrawerLayoutManagerDelegate<T extends View, U extends BaseVi
         mViewManager.setDrawerLockMode(view, (String) value);
         break;
       case "statusBarBackgroundColor":
-        mViewManager.setStatusBarBackgroundColor(view, value == null ? null : ((Double) value).intValue());
+        mViewManager.setStatusBarBackgroundColor(view, ColorPropConverter.getColor(value, view.getContext()));
         break;
       default:
         super.setProperty(view, propName, value);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidProgressBarManagerDelegate.java b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidProgressBarManagerDelegate.java
index 83a3336c030..b0417eed9ce 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidProgressBarManagerDelegate.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidProgressBarManagerDelegate.java
@@ -11,6 +11,7 @@ package com.facebook.react.viewmanagers;
 
 import android.view.View;
 import androidx.annotation.Nullable;
+import com.facebook.react.bridge.ColorPropConverter;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
 import com.facebook.react.uimanager.BaseViewManagerInterface;
 import com.facebook.react.uimanager.LayoutShadowNode;
@@ -38,7 +39,7 @@ public class AndroidProgressBarManagerDelegate<T extends View, U extends BaseVie
         mViewManager.setAnimating(view, value == null ? true : (boolean) value);
         break;
       case "color":
-        mViewManager.setColor(view, value == null ? null : ((Double) value).intValue());
+        mViewManager.setColor(view, ColorPropConverter.getColor(value, view.getContext()));
         break;
       case "testID":
         mViewManager.setTestID(view, value == null ? "" : (String) value);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidSwipeRefreshLayoutManagerDelegate.java b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidSwipeRefreshLayoutManagerDelegate.java
index b46b34948c1..56a18f9aba0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidSwipeRefreshLayoutManagerDelegate.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidSwipeRefreshLayoutManagerDelegate.java
@@ -11,6 +11,7 @@ package com.facebook.react.viewmanagers;
 
 import android.view.View;
 import androidx.annotation.Nullable;
+import com.facebook.react.bridge.ColorPropConverter;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
 import com.facebook.react.uimanager.BaseViewManagerInterface;
@@ -30,7 +31,7 @@ public class AndroidSwipeRefreshLayoutManagerDelegate<T extends View, U extends
         mViewManager.setColors(view, (ReadableArray) value);
         break;
       case "progressBackgroundColor":
-        mViewManager.setProgressBackgroundColor(view, value == null ? null : ((Double) value).intValue());
+        mViewManager.setProgressBackgroundColor(view, ColorPropConverter.getColor(value, view.getContext()));
         break;
       case "size":
         mViewManager.setSize(view, value == null ? 1 : ((Double) value).intValue());
diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidSwitchManagerDelegate.java b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidSwitchManagerDelegate.java
index b801a9cdab2..5152015a956 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidSwitchManagerDelegate.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidSwitchManagerDelegate.java
@@ -11,6 +11,7 @@ package com.facebook.react.viewmanagers;
 
 import android.view.View;
 import androidx.annotation.Nullable;
+import com.facebook.react.bridge.ColorPropConverter;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
 import com.facebook.react.uimanager.BaseViewManagerInterface;
@@ -30,13 +31,13 @@ public class AndroidSwitchManagerDelegate<T extends View, U extends BaseViewMana
         mViewManager.setEnabled(view, value == null ? true : (boolean) value);
         break;
       case "thumbColor":
-        mViewManager.setThumbColor(view, value == null ? null : ((Double) value).intValue());
+        mViewManager.setThumbColor(view, ColorPropConverter.getColor(value, view.getContext()));
         break;
       case "trackColorForFalse":
-        mViewManager.setTrackColorForFalse(view, value == null ? null : ((Double) value).intValue());
+        mViewManager.setTrackColorForFalse(view, ColorPropConverter.getColor(value, view.getContext()));
         break;
       case "trackColorForTrue":
-        mViewManager.setTrackColorForTrue(view, value == null ? null : ((Double) value).intValue());
+        mViewManager.setTrackColorForTrue(view, ColorPropConverter.getColor(value, view.getContext()));
         break;
       case "value":
         mViewManager.setValue(view, value == null ? false : (boolean) value);
@@ -45,10 +46,10 @@ public class AndroidSwitchManagerDelegate<T extends View, U extends BaseViewMana
         mViewManager.setOn(view, value == null ? false : (boolean) value);
         break;
       case "thumbTintColor":
-        mViewManager.setThumbTintColor(view, value == null ? null : ((Double) value).intValue());
+        mViewManager.setThumbTintColor(view, ColorPropConverter.getColor(value, view.getContext()));
         break;
       case "trackTintColor":
-        mViewManager.setTrackTintColor(view, value == null ? null : ((Double) value).intValue());
+        mViewManager.setTrackTintColor(view, ColorPropConverter.getColor(value, view.getContext()));
         break;
       default:
         super.setProperty(view, propName, value);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/InputAccessoryViewManagerDelegate.java b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/InputAccessoryViewManagerDelegate.java
index 85c178abb64..52c14f1f607 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/InputAccessoryViewManagerDelegate.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/InputAccessoryViewManagerDelegate.java
@@ -11,6 +11,7 @@ package com.facebook.react.viewmanagers;
 
 import android.view.View;
 import androidx.annotation.Nullable;
+import com.facebook.react.bridge.ColorPropConverter;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
 import com.facebook.react.uimanager.BaseViewManagerInterface;
 import com.facebook.react.uimanager.LayoutShadowNode;
@@ -23,7 +24,7 @@ public class InputAccessoryViewManagerDelegate<T extends View, U extends BaseVie
   public void setProperty(T view, String propName, @Nullable Object value) {
     switch (propName) {
       case "backgroundColor":
-        mViewManager.setBackgroundColor(view, value == null ? null : ((Double) value).intValue());
+        mViewManager.setBackgroundColor(view, ColorPropConverter.getColor(value, view.getContext()));
         break;
       default:
         super.setProperty(view, propName, value);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/ProgressViewManagerDelegate.java b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/ProgressViewManagerDelegate.java
index b4524bf7cd5..df088d4a87f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/ProgressViewManagerDelegate.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/ProgressViewManagerDelegate.java
@@ -11,6 +11,7 @@ package com.facebook.react.viewmanagers;
 
 import android.view.View;
 import androidx.annotation.Nullable;
+import com.facebook.react.bridge.ColorPropConverter;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
 import com.facebook.react.uimanager.BaseViewManagerInterface;
@@ -30,10 +31,10 @@ public class ProgressViewManagerDelegate<T extends View, U extends BaseViewManag
         mViewManager.setProgress(view, value == null ? 0f : ((Double) value).floatValue());
         break;
       case "progressTintColor":
-        mViewManager.setProgressTintColor(view, value == null ? null : ((Double) value).intValue());
+        mViewManager.setProgressTintColor(view, ColorPropConverter.getColor(value, view.getContext()));
         break;
       case "trackTintColor":
-        mViewManager.setTrackTintColor(view, value == null ? null : ((Double) value).intValue());
+        mViewManager.setTrackTintColor(view, ColorPropConverter.getColor(value, view.getContext()));
         break;
       case "progressImage":
         mViewManager.setProgressImage(view, (ReadableMap) value);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/SegmentedControlManagerDelegate.java b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/SegmentedControlManagerDelegate.java
index f79e5189d97..6763a1f1f53 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/SegmentedControlManagerDelegate.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/SegmentedControlManagerDelegate.java
@@ -11,6 +11,7 @@ package com.facebook.react.viewmanagers;
 
 import android.view.View;
 import androidx.annotation.Nullable;
+import com.facebook.react.bridge.ColorPropConverter;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
 import com.facebook.react.uimanager.BaseViewManagerInterface;
@@ -33,13 +34,13 @@ public class SegmentedControlManagerDelegate<T extends View, U extends BaseViewM
         mViewManager.setEnabled(view, value == null ? true : (boolean) value);
         break;
       case "tintColor":
-        mViewManager.setTintColor(view, value == null ? null : ((Double) value).intValue());
+        mViewManager.setTintColor(view, ColorPropConverter.getColor(value, view.getContext()));
         break;
       case "textColor":
-        mViewManager.setTextColor(view, value == null ? null : ((Double) value).intValue());
+        mViewManager.setTextColor(view, ColorPropConverter.getColor(value, view.getContext()));
         break;
       case "backgroundColor":
-        mViewManager.setBackgroundColor(view, value == null ? null : ((Double) value).intValue());
+        mViewManager.setBackgroundColor(view, ColorPropConverter.getColor(value, view.getContext()));
         break;
       case "momentary":
         mViewManager.setMomentary(view, value == null ? false : (boolean) value);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/SliderManagerDelegate.java b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/SliderManagerDelegate.java
index cfc33e90c7d..5eb9360ef8e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/SliderManagerDelegate.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/SliderManagerDelegate.java
@@ -11,6 +11,7 @@ package com.facebook.react.viewmanagers;
 
 import android.view.View;
 import androidx.annotation.Nullable;
+import com.facebook.react.bridge.ColorPropConverter;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
 import com.facebook.react.uimanager.BaseViewManagerInterface;
@@ -33,7 +34,7 @@ public class SliderManagerDelegate<T extends View, U extends BaseViewManagerInte
         mViewManager.setMaximumTrackImage(view, (ReadableMap) value);
         break;
       case "maximumTrackTintColor":
-        mViewManager.setMaximumTrackTintColor(view, value == null ? null : ((Double) value).intValue());
+        mViewManager.setMaximumTrackTintColor(view, ColorPropConverter.getColor(value, view.getContext()));
         break;
       case "maximumValue":
         mViewManager.setMaximumValue(view, value == null ? 1f : ((Double) value).doubleValue());
@@ -42,7 +43,7 @@ public class SliderManagerDelegate<T extends View, U extends BaseViewManagerInte
         mViewManager.setMinimumTrackImage(view, (ReadableMap) value);
         break;
       case "minimumTrackTintColor":
-        mViewManager.setMinimumTrackTintColor(view, value == null ? null : ((Double) value).intValue());
+        mViewManager.setMinimumTrackTintColor(view, ColorPropConverter.getColor(value, view.getContext()));
         break;
       case "minimumValue":
         mViewManager.setMinimumValue(view, value == null ? 0f : ((Double) value).doubleValue());
@@ -57,7 +58,7 @@ public class SliderManagerDelegate<T extends View, U extends BaseViewManagerInte
         mViewManager.setThumbImage(view, (ReadableMap) value);
         break;
       case "thumbTintColor":
-        mViewManager.setThumbTintColor(view, value == null ? null : ((Double) value).intValue());
+        mViewManager.setThumbTintColor(view, ColorPropConverter.getColor(value, view.getContext()));
         break;
       case "trackImage":
         mViewManager.setTrackImage(view, (ReadableMap) value);