diff options
Diffstat (limited to 'src/components')
| -rw-r--r-- | src/components/common/NavigationIcon.tsx | 5 | ||||
| -rw-r--r-- | src/components/common/TaggLoadingIndicator.tsx | 40 | ||||
| -rw-r--r-- | src/components/profile/ProfileBody.tsx | 3 |
3 files changed, 39 insertions, 9 deletions
diff --git a/src/components/common/NavigationIcon.tsx b/src/components/common/NavigationIcon.tsx index 8fff18f4..4bf35360 100644 --- a/src/components/common/NavigationIcon.tsx +++ b/src/components/common/NavigationIcon.tsx @@ -10,6 +10,7 @@ import { interface NavigationIconProps extends TouchableOpacityProps { tab: 'Home' | 'Search' | 'Upload' | 'Notifications' | 'Profile'; disabled?: boolean; + newIcon?: boolean; } const NavigationIcon = (props: NavigationIconProps) => { @@ -32,7 +33,9 @@ const NavigationIcon = (props: NavigationIconProps) => { break; case 'Notifications': imgSrc = props.disabled - ? require('../../assets/navigationIcons/notifications.png') + ? props.newIcon + ? require('../../assets/navigationIcons/new-notifications.png') + : require('../../assets/navigationIcons/notifications.png') : require('../../assets/navigationIcons/notifications-clicked.png'); break; case 'Profile': diff --git a/src/components/common/TaggLoadingIndicator.tsx b/src/components/common/TaggLoadingIndicator.tsx index cfb99e80..91c68622 100644 --- a/src/components/common/TaggLoadingIndicator.tsx +++ b/src/components/common/TaggLoadingIndicator.tsx @@ -1,27 +1,53 @@ import * as React from 'react'; -import {ActivityIndicator, StyleSheet, View} from 'react-native'; +import {Image, StyleSheet, View} from 'react-native'; +import {SCREEN_HEIGHT, SCREEN_WIDTH} from '../../utils'; -type TaggLoadingIndicatorProps = { - color: string; -}; -const TaggLoadingIndicator: React.FC<TaggLoadingIndicatorProps> = ({color}) => { +interface TaggLoadingIndicatorProps { + fullscreen: boolean; +} + +const TaggLoadingIndicator: React.FC<TaggLoadingIndicatorProps> = ({ + fullscreen = false, +}) => { return ( - <View style={[styles.container, styles.horizontal]}> - <ActivityIndicator size="large" color={color} /> + <View + style={[ + fullscreen ? styles.fullscreen : {}, + styles.container, + styles.horizontal, + ]}> + <Image + source={require('../../assets/gifs/loading-animation.gif')} + style={styles.icon} + /> </View> ); }; const styles = StyleSheet.create({ + fullscreen: { + zIndex: 999, + position: 'absolute', + height: SCREEN_HEIGHT, + width: SCREEN_WIDTH, + }, container: { flex: 1, justifyContent: 'center', + alignItems: 'center', + backgroundColor: 'rgba(0,0,0,0.3)', }, horizontal: { flexDirection: 'row', justifyContent: 'space-around', padding: 10, }, + icon: { + alignSelf: 'center', + justifyContent: 'center', + width: '40%', + aspectRatio: 2, + }, }); export default TaggLoadingIndicator; diff --git a/src/components/profile/ProfileBody.tsx b/src/components/profile/ProfileBody.tsx index 64aec09c..6284ff59 100644 --- a/src/components/profile/ProfileBody.tsx +++ b/src/components/profile/ProfileBody.tsx @@ -162,10 +162,11 @@ const styles = StyleSheet.create({ fontWeight: '600', fontSize: 16.5, marginBottom: '1%', + marginTop: '-3%', }, biography: { fontSize: 16, - marginBottom: '0.5%', + marginBottom: '1.5%', }, website: { fontSize: 16, |
