From ef3b16ef6dc3908aaa55c04a9295a0ab044fffff Mon Sep 17 00:00:00 2001
From: Oleksandr Melnykov <omelnykov@fb.com>
Date: Mon, 23 Sep 2019 07:15:16 -0700
Subject: [PATCH] Use generated Java delegate for setting properties on
 SwipeRefreshLayoutManager

Summary: This diff migrates `SwipeRefreshLayoutManager` to use the generated `AndroidSwipeRefreshLayoutManagerDelegate`.

Reviewed By: JoshuaGross, mdvacca

Differential Revision: D17225894

fbshipit-source-id: e659d2a9cb5dba42c589559f61a0e98330e21612
---
 ...ndroidSwipeRefreshLayoutNativeComponent.js |  2 +-
 ...roidSwipeRefreshLayoutManagerDelegate.java |  2 +-
 .../facebook/react/views/swiperefresh/BUCK    |  3 ++
 .../SwipeRefreshLayoutManager.java            | 34 ++++++++++++++++---
 4 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/Libraries/Components/RefreshControl/AndroidSwipeRefreshLayoutNativeComponent.js b/Libraries/Components/RefreshControl/AndroidSwipeRefreshLayoutNativeComponent.js
index 37fd4e67842..fc6278bcf8d 100644
--- a/Libraries/Components/RefreshControl/AndroidSwipeRefreshLayoutNativeComponent.js
+++ b/Libraries/Components/RefreshControl/AndroidSwipeRefreshLayoutNativeComponent.js
@@ -28,7 +28,7 @@ type NativeProps = $ReadOnly<{|
   /**
    * Whether the pull to refresh functionality is enabled.
    */
-  enabled?: WithDefault<boolean, false>,
+  enabled?: WithDefault<boolean, true>,
   /**
    * The colors (at least one) that will be used to draw the refresh indicator.
    */
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 8aedfee20aa..7ac2f4567f8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidSwipeRefreshLayoutManagerDelegate.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/viewmanagers/AndroidSwipeRefreshLayoutManagerDelegate.java
@@ -24,7 +24,7 @@ public class AndroidSwipeRefreshLayoutManagerDelegate<T extends View, U extends
   public void setProperty(T view, String propName, @Nullable Object value) {
     switch (propName) {
       case "enabled":
-        mViewManager.setEnabled(view, value == null ? false : (boolean) value);
+        mViewManager.setEnabled(view, value == null ? true : (boolean) value);
         break;
       case "colors":
         mViewManager.setColors(view, (ReadableArray) value);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/BUCK
index e889dfdcc22..e6ea16364a9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/BUCK
@@ -23,4 +23,7 @@ rn_android_library(
         react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
         react_native_target("java/com/facebook/react/views/scroll:scroll"),
     ],
+    exported_deps = [
+        react_native_target("java/com/facebook/react/viewmanagers:viewmanagers"),
+    ],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/SwipeRefreshLayoutManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/SwipeRefreshLayoutManager.java
index 539f2e721af..c780d3b93c0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/SwipeRefreshLayoutManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/SwipeRefreshLayoutManager.java
@@ -20,8 +20,11 @@ import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.ViewGroupManager;
+import com.facebook.react.uimanager.ViewManagerDelegate;
 import com.facebook.react.uimanager.ViewProps;
 import com.facebook.react.uimanager.annotations.ReactProp;
+import com.facebook.react.viewmanagers.AndroidSwipeRefreshLayoutManagerDelegate;
+import com.facebook.react.viewmanagers.AndroidSwipeRefreshLayoutManagerInterface;
 import java.util.Map;
 
 /**
@@ -29,10 +32,17 @@ import java.util.Map;
  * child view. Emits an {@code onRefresh} event when this happens.
  */
 @ReactModule(name = REACT_CLASS)
-public class SwipeRefreshLayoutManager extends ViewGroupManager<ReactSwipeRefreshLayout> {
+public class SwipeRefreshLayoutManager extends ViewGroupManager<ReactSwipeRefreshLayout>
+    implements AndroidSwipeRefreshLayoutManagerInterface<ReactSwipeRefreshLayout> {
 
   public static final String REACT_CLASS = "AndroidSwipeRefreshLayout";
 
+  private final ViewManagerDelegate<ReactSwipeRefreshLayout> mDelegate;
+
+  public SwipeRefreshLayoutManager() {
+    mDelegate = new AndroidSwipeRefreshLayoutManagerDelegate<>(this);
+  }
+
   @Override
   protected ReactSwipeRefreshLayout createViewInstance(ThemedReactContext reactContext) {
     return new ReactSwipeRefreshLayout(reactContext);
@@ -43,11 +53,13 @@ public class SwipeRefreshLayoutManager extends ViewGroupManager<ReactSwipeRefres
     return REACT_CLASS;
   }
 
+  @Override
   @ReactProp(name = ViewProps.ENABLED, defaultBoolean = true)
   public void setEnabled(ReactSwipeRefreshLayout view, boolean enabled) {
     view.setEnabled(enabled);
   }
 
+  @Override
   @ReactProp(name = "colors", customType = "ColorArray")
   public void setColors(ReactSwipeRefreshLayout view, @Nullable ReadableArray colors) {
     if (colors != null) {
@@ -61,9 +73,16 @@ public class SwipeRefreshLayoutManager extends ViewGroupManager<ReactSwipeRefres
     }
   }
 
-  @ReactProp(name = "progressBackgroundColor", defaultInt = Color.TRANSPARENT, customType = "Color")
-  public void setProgressBackgroundColor(ReactSwipeRefreshLayout view, int color) {
-    view.setProgressBackgroundColorSchemeColor(color);
+  @Override
+  @ReactProp(name = "progressBackgroundColor", customType = "Color")
+  public void setProgressBackgroundColor(ReactSwipeRefreshLayout view, Integer color) {
+    view.setProgressBackgroundColorSchemeColor(color == null ? Color.TRANSPARENT : color);
+  }
+
+  // TODO(T46143833): Remove this method once the 'size' prop has been migrated to String in JS.
+  @Override
+  public void setSize(ReactSwipeRefreshLayout view, int value) {
+    view.setSize(value);
   }
 
   // This prop temporarily takes both 0 and 1 as well as 'default' and 'large'.
@@ -90,11 +109,13 @@ public class SwipeRefreshLayoutManager extends ViewGroupManager<ReactSwipeRefres
     }
   }
 
+  @Override
   @ReactProp(name = "refreshing")
   public void setRefreshing(ReactSwipeRefreshLayout view, boolean refreshing) {
     view.setRefreshing(refreshing);
   }
 
+  @Override
   @ReactProp(name = "progressViewOffset", defaultFloat = 0)
   public void setProgressViewOffset(final ReactSwipeRefreshLayout view, final float offset) {
     view.setProgressViewOffset(offset);
@@ -129,4 +150,9 @@ public class SwipeRefreshLayoutManager extends ViewGroupManager<ReactSwipeRefres
         .put("topRefresh", MapBuilder.of("registrationName", "onRefresh"))
         .build();
   }
+
+  @Override
+  protected ViewManagerDelegate<ReactSwipeRefreshLayout> getDelegate() {
+    return mDelegate;
+  }
 }