[Feat] Add image loading indicator

src/components/ImageView/index.js

@@ -1,12 +1,13 @@
 import React, {PureComponent} from 'react';
 import PropTypes from 'prop-types';
 import {
-    View, Image, Pressable,
+    View, Image, Pressable, ActivityIndicator, StyleSheet,
 } from 'react-native';
 import styles from '../../styles/styles';
 import * as StyleUtils from '../../styles/StyleUtils';
 import canUseTouchScreen from '../../libs/canUseTouchscreen';
 import withWindowDimensions, {windowDimensionsPropTypes} from '../withWindowDimensions';
+import themeColors from '../../styles/themes/default';
 
 const propTypes = {
     /** URL to full-sized image */
@@ -23,7 +24,10 @@ class ImageView extends PureComponent {
         this.onContainerPressIn = this.onContainerPressIn.bind(this);
         this.onContainerPress = this.onContainerPress.bind(this);
         this.onContainerPressOut = this.onContainerPressOut.bind(this);
+        this.imageLoadingStart = this.imageLoadingStart.bind(this);
+        this.imageLoadingEnd = this.imageLoadingEnd.bind(this);
         this.state = {
+            isLoading: false,
             containerHeight: 0,
             containerWidth: 0,
             isZoomed: false,
@@ -227,6 +231,14 @@ class ImageView extends PureComponent {
         this.setState(prevState => ({isDragging: prevState.isMouseDown}));
     }
 
+    imageLoadingStart() {
+        this.setState({isLoading: true});
+    }
+
+    imageLoadingEnd() {
+        this.setState({isLoading: false});
+    }
+
     render() {
         if (this.canUseTouchScreen) {
             return (
@@ -240,7 +252,18 @@ class ImageView extends PureComponent {
                             styles.h100,
                         ]}
                         resizeMode="contain"
+                        onLoadStart={this.imageLoadingStart}
+                        onLoadEnd={this.imageLoadingEnd}
                     />
+                    {this.state.isLoading && (
+                        <View style={{...StyleSheet.absoluteFillObject}}>
+                            <ActivityIndicator
+                                size="large"
+                                color={themeColors.spinner}
+                                style={[styles.flex1]}
+                            />
+                        </View>
+                    )}
                 </View>
             );
         }
@@ -274,8 +297,20 @@ class ImageView extends PureComponent {
                             styles.w100,
                         ]}
                         resizeMode="contain"
+                        onLoadStart={this.imageLoadingStart}
+                        onLoadEnd={this.imageLoadingEnd}
                     />
                 </Pressable>
+
+                {this.state.isLoading && (
+                    <View style={{...StyleSheet.absoluteFillObject}}>
+                        <ActivityIndicator
+                            size="large"
+                            color={themeColors.spinner}
+                            style={[styles.flex1]}
+                        />
+                    </View>
+                )}
             </View>
         );
     }

src/components/ImageView/index.native.js

@@ -1,6 +1,8 @@
 import React, {PureComponent} from 'react';
 import PropTypes from 'prop-types';
-import {View, InteractionManager, PanResponder} from 'react-native';
+import {
+    View, InteractionManager, PanResponder, ActivityIndicator, StyleSheet,
+} from 'react-native';
 import Image from 'react-native-fast-image';
 import ImageZoom from 'react-native-image-pan-zoom';
 import ImageSize from 'react-native-image-size';
@@ -9,6 +11,7 @@ import styles from '../../styles/styles';
 import * as StyleUtils from '../../styles/StyleUtils';
 import variables from '../../styles/variables';
 import withWindowDimensions, {windowDimensionsPropTypes} from '../withWindowDimensions';
+import themeColors from '../../styles/themes/default';
 
 /**
  * On the native layer, we use a image library to handle zoom functionality
@@ -25,6 +28,7 @@ class ImageView extends PureComponent {
         super(props);
 
         this.state = {
+            isLoading: false,
             thumbnailWidth: 100,
             thumbnailHeight: 100,
             imageWidth: undefined,
@@ -43,6 +47,9 @@ class ImageView extends PureComponent {
         this.panResponder = PanResponder.create({
             onStartShouldSetPanResponder: this.updatePanResponderTouches.bind(this),
         });
+
+        this.imageLoadingStart = this.imageLoadingStart.bind(this);
+        this.imageLoadingEnd = this.imageLoadingEnd.bind(this);
     }
 
     componentDidMount() {
@@ -100,6 +107,14 @@ class ImageView extends PureComponent {
         return false;
     }
 
+    imageLoadingStart() {
+        this.setState({isLoading: true});
+    }
+
+    imageLoadingEnd() {
+        this.setState({isLoading: false});
+    }
+
     render() {
         // Default windowHeight accounts for the modal header height
         const windowHeight = this.props.windowHeight - variables.contentHeaderHeight;
@@ -122,6 +137,13 @@ class ImageView extends PureComponent {
                         style={StyleUtils.getWidthAndHeightStyle(this.state.thumbnailWidth, this.state.thumbnailHeight)}
                         resizeMode={Image.resizeMode.contain}
                     />
+                    <View style={{...StyleSheet.absoluteFillObject}}>
+                        <ActivityIndicator
+                            size="large"
+                            color={themeColors.spinner}
+                            style={[styles.flex1]}
+                        />
+                    </View>
                 </View>
             );
         }
@@ -178,6 +200,8 @@ class ImageView extends PureComponent {
                         ]}
                         source={{uri: this.props.url}}
                         resizeMode={Image.resizeMode.contain}
+                        onLoadStart={this.imageLoadingStart}
+                        onLoadEnd={this.imageLoadingEnd}
                     />
                     {/**
                      Create an invisible view on top of the image so we can capture and set the amount of touches before
@@ -194,6 +218,15 @@ class ImageView extends PureComponent {
                         ]}
                     />
                 </ImageZoom>
+                {this.state.isLoading && (
+                    <View style={{...StyleSheet.absoluteFillObject}}>
+                        <ActivityIndicator
+                            size="large"
+                            color={themeColors.spinner}
+                            style={[styles.flex1]}
+                        />
+                    </View>
+                )}
             </View>
         );
     }

src/components/ImageWithSizeCalculation.js

@@ -1,9 +1,12 @@
 import React, {PureComponent} from 'react';
-import {Image} from 'react-native';
+import {
+    StyleSheet, View, Image, ActivityIndicator,
+} from 'react-native';
 import PropTypes from 'prop-types';
 import Log from '../libs/Log';
 import styles from '../styles/styles';
 import makeCancellablePromise from '../libs/MakeCancellablePromise';
+import themeColors from '../styles/themes/default';
 
 const propTypes = {
     /** Url for image to display */
@@ -29,6 +32,17 @@ const defaultProps = {
  * it can be appropriately resized.
  */
 class ImageWithSizeCalculation extends PureComponent {
+    constructor(props) {
+        super(props);
+
+        this.state = {
+            isLoading: false,
+        };
+
+        this.imageLoadingStart = this.imageLoadingStart.bind(this);
+        this.imageLoadingEnd = this.imageLoadingEnd.bind(this);
+    }
+
     componentDidMount() {
         this.calculateImageSize();
     }
@@ -83,17 +97,43 @@ class ImageWithSizeCalculation extends PureComponent {
             });
     }
 
+    imageLoadingStart() {
+        this.setState({isLoading: true});
+    }
+
+    imageLoadingEnd() {
+        this.setState({isLoading: false});
+    }
+
     render() {
         return (
-            <Image
+            <View
                 style={[
                     styles.w100,
                     styles.h100,
                     this.props.style,
                 ]}
-                source={{uri: this.props.url}}
-                resizeMode="contain"
-            />
+            >
+                <Image
+                    style={[
+                        styles.w100,
+                        styles.h100,
+                    ]}
+                    source={{uri: this.props.url}}
+                    resizeMode="contain"
+                    onLoadStart={this.imageLoadingStart}
+                    onLoadEnd={this.imageLoadingEnd}
+                />
+                {this.state.isLoading && (
+                    <View style={{...StyleSheet.absoluteFillObject}}>
+                        <ActivityIndicator
+                            size="large"
+                            color={themeColors.spinner}
+                            style={[styles.flex1]}
+                        />
+                    </View>
+                )}
+            </View>
         );
     }
 }