JavaScript-Resource
diff --git a/‎Examples/UIExplorer/ImageEditingExample.js‎
Lines changed: 17 additions & 16 deletions b/‎Examples/UIExplorer/ImageEditingExample.js‎
Lines changed: 17 additions & 16 deletions
diff --git a/‎Examples/UIExplorer/UIExplorerList.android.js‎
Lines changed: 4 additions & 3 deletions b/‎Examples/UIExplorer/UIExplorerList.android.js‎
Lines changed: 4 additions & 3 deletions
diff --git a/‎Examples/UIExplorer/UIExplorerList.ios.js‎
Lines changed: 1 addition & 1 deletion b/‎Examples/UIExplorer/UIExplorerList.ios.js‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎Libraries/Image/ImageStore.js‎
Lines changed: 2 additions & 1 deletion b/‎Libraries/Image/ImageStore.js‎
Lines changed: 2 additions & 1 deletion
@@ -67,22 +67,21 @@ class SquareImageCropper extends React.Component {
     this._fetchRandomPhoto();
   }
 
-  _fetchRandomPhoto() {
-    CameraRoll.getPhotos(
-      {first: PAGE_SIZE},
-      (data) => {
-        if (!this._isMounted) {
-          return;
-        }
-        var edges = data.edges;
-        var edge = edges[Math.floor(Math.random() * edges.length)];
-        var randomPhoto = edge && edge.node && edge.node.image;
-        if (randomPhoto) {
-          this.setState({randomPhoto});
-        }
-      },
-      (error) => undefined
-    );
+  async _fetchRandomPhoto() {
+    try {
+      const data = await CameraRoll.getPhotos({first: PAGE_SIZE});
+      if (!this._isMounted) {
+        return;
+      }
+      var edges = data.edges;
+      var edge = edges[Math.floor(Math.random() * edges.length)];
+      var randomPhoto = edge && edge.node && edge.node.image;
+      if (randomPhoto) {
+        this.setState({randomPhoto});
+      }
+    } catch (error) {
+      console.warn("Can't get a photo from camera roll", error);
+    }
   }
 
   componentWillUnmount() {
@@ -209,6 +208,8 @@ class ImageCropper extends React.Component {
         height: this.props.size.height,
       };
     }
+    // a quick hack for android because Android ScrollView does not have zoom feature
+    this._scaledImageSize.width = 2 * this._scaledImageSize.width;
     this._contentOffset = {
       x: (this._scaledImageSize.width - this.props.size.width) / 2,
       y: (this._scaledImageSize.height - this.props.size.height) / 2,
 
@@ -25,12 +25,12 @@ var UIExplorerListBase = require('./UIExplorerListBase');
 var COMPONENTS = [
   require('./ImageExample'),
   require('./ListViewExample'),
+  require('./PickerAndroidExample'),
   require('./ProgressBarAndroidExample'),
+  require('./PullToRefreshViewAndroidExample.android'),
+  require('./RefreshControlExample'),
   require('./ScrollViewSimpleExample'),
   require('./SwitchExample'),
-  require('./RefreshControlExample'),
-  require('./PickerAndroidExample'),
-  require('./PullToRefreshViewAndroidExample.android'),
   require('./TextExample.android'),
   require('./TextInputExample.android'),
   require('./ToolbarAndroidExample'),
@@ -49,6 +49,7 @@ var APIS = [
   require('./ClipboardExample'),
   require('./DatePickerAndroidExample'),
   require('./GeolocationExample'),
+  require('./ImageEditingExample'),
   require('./IntentAndroidExample.android'),
   require('./LayoutEventsExample'),
   require('./LayoutExample'),
 
@@ -71,6 +71,7 @@ var APIS = [
   require('./CameraRollExample'),
   require('./ClipboardExample'),
   require('./GeolocationExample'),
+  require('./ImageEditingExample'),
   require('./LayoutExample'),
   require('./NetInfoExample'),
   require('./PanResponderExample'),
@@ -82,7 +83,6 @@ var APIS = [
   require('./TransformExample'),
   require('./VibrationIOSExample'),
   require('./XHRExample.ios'),
-  require('./ImageEditingExample'),
 ];
 
 type Props = {
 
@@ -51,6 +51,7 @@ class ImageStore {
    * Note that it is very inefficient to transfer large quantities of binary
    * data between JS and native code, so you should avoid calling this more
    * than necessary.
+   * @platform ios
    */
   static addImageFromBase64(
     base64ImageData: string,
@@ -80,4 +81,4 @@ class ImageStore {
   }
 }
 
-module.exports = ImageStore;
+module.exports = ImageStore;
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ class ImageStore {`
`51`	`51`	`* Note that it is very inefficient to transfer large quantities of binary`
`52`	`52`	`* data between JS and native code, so you should avoid calling this more`
`53`	`53`	`* than necessary.`
	`54`	`+ * @platform ios`
`54`	`55`	`*/`
`55`	`56`	`static addImageFromBase64(`
`56`	`57`	`base64ImageData: string,`
`@@ -80,4 +81,4 @@ class ImageStore {`
`80`	`81`	`}`
`81`	`82`	`}`
`82`	`83`
`83`		`-module.exports = ImageStore;`
	`84`	`+module.exports = ImageStore;`