diff --git a/Examples/UIExplorer/ImageExample.js b/Examples/UIExplorer/ImageExample.js index 1a9af6c87..a15aa38dd 100644 --- a/Examples/UIExplorer/ImageExample.js +++ b/Examples/UIExplorer/ImageExample.js @@ -381,37 +381,41 @@ exports.examples = [ 'rendered within the frame.', render: function() { return ( - - - - Contain - - - - - - Cover - - - - - - Stretch - - - + + {[smallImage, fullImage].map((image, index) => { + return + + + Contain + + + + + + Cover + + + + + + Stretch + + + + ; + })} ); }, diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstants.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstants.java index b8363917e..18626ba32 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstants.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstants.java @@ -87,7 +87,7 @@ import com.facebook.react.uimanager.events.TouchEventType; "ContentMode", MapBuilder.of( "ScaleAspectFit", - ImageView.ScaleType.CENTER_INSIDE.ordinal(), + ImageView.ScaleType.FIT_CENTER.ordinal(), "ScaleAspectFill", ImageView.ScaleType.CENTER_CROP.ordinal()))); diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageResizeMode.java b/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageResizeMode.java index fd7a6f67f..30648f183 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageResizeMode.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/image/ImageResizeMode.java @@ -25,7 +25,7 @@ public class ImageResizeMode { */ public static ScalingUtils.ScaleType toScaleType(@Nullable String resizeModeValue) { if ("contain".equals(resizeModeValue)) { - return ScalingUtils.ScaleType.CENTER_INSIDE; + return ScalingUtils.ScaleType.FIT_CENTER; } if ("cover".equals(resizeModeValue)) { return ScalingUtils.ScaleType.CENTER_CROP; diff --git a/ReactAndroid/src/test/java/com/facebook/react/views/image/ImageResizeModeTest.java b/ReactAndroid/src/test/java/com/facebook/react/views/image/ImageResizeModeTest.java index f74b4528e..a247f1847 100644 --- a/ReactAndroid/src/test/java/com/facebook/react/views/image/ImageResizeModeTest.java +++ b/ReactAndroid/src/test/java/com/facebook/react/views/image/ImageResizeModeTest.java @@ -34,7 +34,7 @@ public class ImageResizeModeTest { .isEqualTo(ScalingUtils.ScaleType.CENTER_CROP); assertThat(ImageResizeMode.toScaleType("contain")) - .isEqualTo(ScalingUtils.ScaleType.CENTER_INSIDE); + .isEqualTo(ScalingUtils.ScaleType.FIT_CENTER); assertThat(ImageResizeMode.toScaleType("cover")) .isEqualTo(ScalingUtils.ScaleType.CENTER_CROP);