diff --git a/src/components/ImageView/index.js b/src/components/ImageView/index.js index 7ebac61d3045..76997155b013 100644 --- a/src/components/ImageView/index.js +++ b/src/components/ImageView/index.js @@ -7,7 +7,7 @@ import styles from '../../styles/styles'; import * as StyleUtils from '../../styles/StyleUtils'; import canUseTouchScreen from '../../libs/canUseTouchscreen'; import withWindowDimensions, {windowDimensionsPropTypes} from '../withWindowDimensions'; -import LoadingSpinnerOverlay from '../LoadingSpinnerOverlay'; +import FullscreenLoadingIndicator from '../FullscreenLoadingIndicator'; const propTypes = { /** URL to full-sized image */ @@ -255,7 +255,7 @@ class ImageView extends PureComponent { onLoadStart={this.imageLoadingStart} onLoadEnd={this.imageLoadingEnd} /> - {this.state.isLoading && <LoadingSpinnerOverlay />} + {this.state.isLoading && <FullscreenLoadingIndicator />} </View> ); } @@ -294,7 +294,7 @@ class ImageView extends PureComponent { /> </Pressable> - {this.state.isLoading && <LoadingSpinnerOverlay />} + {this.state.isLoading && <FullscreenLoadingIndicator />} </View> ); } diff --git a/src/components/ImageView/index.native.js b/src/components/ImageView/index.native.js index 36043a6c8b35..c39e2a41ba15 100644 --- a/src/components/ImageView/index.native.js +++ b/src/components/ImageView/index.native.js @@ -11,7 +11,7 @@ import styles from '../../styles/styles'; import * as StyleUtils from '../../styles/StyleUtils'; import variables from '../../styles/variables'; import withWindowDimensions, {windowDimensionsPropTypes} from '../withWindowDimensions'; -import LoadingSpinnerOverlay from '../LoadingSpinnerOverlay'; +import FullscreenLoadingIndicator from '../FullscreenLoadingIndicator'; /** * On the native layer, we use a image library to handle zoom functionality @@ -137,7 +137,7 @@ class ImageView extends PureComponent { style={StyleUtils.getWidthAndHeightStyle(this.state.thumbnailWidth, this.state.thumbnailHeight)} resizeMode="contain" /> - <LoadingSpinnerOverlay /> + <FullscreenLoadingIndicator /> </View> ); } @@ -212,7 +212,7 @@ class ImageView extends PureComponent { ]} /> </ImageZoom> - {this.state.isLoading && <LoadingSpinnerOverlay />} + {this.state.isLoading && <FullscreenLoadingIndicator />} </View> ); } diff --git a/src/components/ImageWithSizeCalculation.js b/src/components/ImageWithSizeCalculation.js index 208ec596e207..98539c6fca5d 100644 --- a/src/components/ImageWithSizeCalculation.js +++ b/src/components/ImageWithSizeCalculation.js @@ -4,7 +4,7 @@ import PropTypes from 'prop-types'; import Log from '../libs/Log'; import styles from '../styles/styles'; import makeCancellablePromise from '../libs/MakeCancellablePromise'; -import LoadingSpinnerOverlay from './LoadingSpinnerOverlay'; +import FullscreenLoadingIndicator from './FullscreenLoadingIndicator'; const propTypes = { /** Url for image to display */ @@ -122,7 +122,7 @@ class ImageWithSizeCalculation extends PureComponent { onLoadStart={this.imageLoadingStart} onLoadEnd={this.imageLoadingEnd} /> - {this.state.isLoading && <LoadingSpinnerOverlay />} + {this.state.isLoading && <FullscreenLoadingIndicator />} </View> ); } diff --git a/src/components/LoadingSpinnerOverlay.js b/src/components/LoadingSpinnerOverlay.js deleted file mode 100644 index 819f77df0a6f..000000000000 --- a/src/components/LoadingSpinnerOverlay.js +++ /dev/null @@ -1,34 +0,0 @@ -import React from 'react'; -import { - StyleSheet, View, ActivityIndicator, -} from 'react-native'; -import PropTypes from 'prop-types'; -import styles from '../styles/styles'; -import themeColors from '../styles/themes/default'; - -const propTypes = { - /** Size of spinner */ - size: PropTypes.string, -}; - -const defaultProps = { - size: 'large', -}; - -function LoadingSpinnerOverlay(props) { - return ( - <View style={{...StyleSheet.absoluteFillObject}}> - <ActivityIndicator - size={props.size} - color={themeColors.spinner} - style={[styles.flex1]} - /> - </View> - ); -} - -LoadingSpinnerOverlay.propTypes = propTypes; -LoadingSpinnerOverlay.defaultProps = defaultProps; -LoadingSpinnerOverlay.displayName = 'LoadingSpinnerOverlay'; - -export default LoadingSpinnerOverlay;