From d48119be38e1dd3f0abc8a4b61c11aa4d0635810 Mon Sep 17 00:00:00 2001 From: Husam Salhab <47015061+hsalhab@users.noreply.github.com> Date: Mon, 26 Oct 2020 18:50:54 -0400 Subject: [TMA-280] Add coming soon (#73) * move async-storage * removed lock files * added lock files to gitignore * added the wrong file to gitignore * added coming soon screens * moved search next to profile * Added the right icons and abstracted cs to ComingSoon.tsx * Update Checkpoint.tsx Co-authored-by: Ashm Walia --- src/assets/images/coming-soon.png | Bin 0 -> 267348 bytes src/assets/navigationIcons/home-new-clicked.png | Bin 0 -> 2104 bytes .../navigationIcons/home-new-large-clicked.png | Bin 0 -> 673387 bytes src/assets/navigationIcons/home-new-large.png | Bin 0 -> 170704 bytes src/assets/navigationIcons/home-new.png | Bin 0 -> 2502 bytes src/assets/navigationIcons/upload-clicked.png | Bin 0 -> 1529 bytes .../navigationIcons/upload-large-clicked.png | Bin 0 -> 138663 bytes src/assets/navigationIcons/upload-large.png | Bin 0 -> 261404 bytes src/assets/navigationIcons/upload.png | Bin 982 -> 2013 bytes src/components/common/ComingSoon.tsx | 51 ++++++++++++++++++ src/components/common/NavigationIcon.tsx | 6 +-- src/components/common/index.ts | 1 + src/routes/tabs/NavigationBar.tsx | 4 +- src/screens/main/Home.tsx | 59 +-------------------- src/screens/main/Notifications.tsx | 17 ++---- src/screens/main/Upload.tsx | 17 +----- src/screens/onboarding/Checkpoint.tsx | 4 +- 17 files changed, 66 insertions(+), 93 deletions(-) create mode 100644 src/assets/images/coming-soon.png create mode 100644 src/assets/navigationIcons/home-new-clicked.png create mode 100644 src/assets/navigationIcons/home-new-large-clicked.png create mode 100644 src/assets/navigationIcons/home-new-large.png create mode 100644 src/assets/navigationIcons/home-new.png create mode 100644 src/assets/navigationIcons/upload-clicked.png create mode 100644 src/assets/navigationIcons/upload-large-clicked.png create mode 100644 src/assets/navigationIcons/upload-large.png create mode 100644 src/components/common/ComingSoon.tsx (limited to 'src') diff --git a/src/assets/images/coming-soon.png b/src/assets/images/coming-soon.png new file mode 100644 index 00000000..5a8e808f Binary files /dev/null and b/src/assets/images/coming-soon.png differ diff --git a/src/assets/navigationIcons/home-new-clicked.png b/src/assets/navigationIcons/home-new-clicked.png new file mode 100644 index 00000000..9bf31927 Binary files /dev/null and b/src/assets/navigationIcons/home-new-clicked.png differ diff --git a/src/assets/navigationIcons/home-new-large-clicked.png b/src/assets/navigationIcons/home-new-large-clicked.png new file mode 100644 index 00000000..d19cc167 Binary files /dev/null and b/src/assets/navigationIcons/home-new-large-clicked.png differ diff --git a/src/assets/navigationIcons/home-new-large.png b/src/assets/navigationIcons/home-new-large.png new file mode 100644 index 00000000..0531fb9b Binary files /dev/null and b/src/assets/navigationIcons/home-new-large.png differ diff --git a/src/assets/navigationIcons/home-new.png b/src/assets/navigationIcons/home-new.png new file mode 100644 index 00000000..c94dceed Binary files /dev/null and b/src/assets/navigationIcons/home-new.png differ diff --git a/src/assets/navigationIcons/upload-clicked.png b/src/assets/navigationIcons/upload-clicked.png new file mode 100644 index 00000000..083f289d Binary files /dev/null and b/src/assets/navigationIcons/upload-clicked.png differ diff --git a/src/assets/navigationIcons/upload-large-clicked.png b/src/assets/navigationIcons/upload-large-clicked.png new file mode 100644 index 00000000..74fe647c Binary files /dev/null and b/src/assets/navigationIcons/upload-large-clicked.png differ diff --git a/src/assets/navigationIcons/upload-large.png b/src/assets/navigationIcons/upload-large.png new file mode 100644 index 00000000..4d7cb7b7 Binary files /dev/null and b/src/assets/navigationIcons/upload-large.png differ diff --git a/src/assets/navigationIcons/upload.png b/src/assets/navigationIcons/upload.png index ec8c685f..839aaebc 100644 Binary files a/src/assets/navigationIcons/upload.png and b/src/assets/navigationIcons/upload.png differ diff --git a/src/components/common/ComingSoon.tsx b/src/components/common/ComingSoon.tsx new file mode 100644 index 00000000..5e1414e2 --- /dev/null +++ b/src/components/common/ComingSoon.tsx @@ -0,0 +1,51 @@ +import * as React from 'react'; +import {StyleSheet, View, Text, Image} from 'react-native'; +import {Background} from '../onboarding'; + +const ComingSoon: React.FC = () => { + return ( + + + Coming Soon + + Stay tuned! We are working on constructing this page + + + + + ); +}; + +const styles = StyleSheet.create({ + container: { + flex: 1, + alignItems: 'center', + }, + image: { + width: 400, + height: 400, + }, + textContainer: { + marginTop: '30%', + }, + header: { + color: '#fff', + fontSize: 32, + fontWeight: '600', + textAlign: 'center', + marginBottom: '4%', + marginHorizontal: '10%', + }, + subtext: { + color: '#fff', + fontSize: 16, + fontWeight: '600', + textAlign: 'center', + marginBottom: '16%', + marginHorizontal: '10%', + }, +}); +export default ComingSoon; diff --git a/src/components/common/NavigationIcon.tsx b/src/components/common/NavigationIcon.tsx index 9497566b..8bf8b4a0 100644 --- a/src/components/common/NavigationIcon.tsx +++ b/src/components/common/NavigationIcon.tsx @@ -17,8 +17,8 @@ const NavigationIcon = (props: NavigationIconProps) => { switch (props.tab) { case 'Home': imgSrc = props.disabled - ? require('../../assets/navigationIcons/home.png') - : require('../../assets/navigationIcons/home-clicked.png'); + ? require('../../assets/navigationIcons/home-new.png') + : require('../../assets/navigationIcons/home-new-clicked.png'); break; case 'Search': imgSrc = props.disabled @@ -28,7 +28,7 @@ const NavigationIcon = (props: NavigationIconProps) => { case 'Upload': imgSrc = props.disabled ? require('../../assets/navigationIcons/upload.png') - : require('../../assets/navigationIcons/upload.png'); + : require('../../assets/navigationIcons/upload-clicked.png'); break; case 'Notifications': imgSrc = props.disabled diff --git a/src/components/common/index.ts b/src/components/common/index.ts index 61d826bd..950b3f61 100644 --- a/src/components/common/index.ts +++ b/src/components/common/index.ts @@ -10,4 +10,5 @@ export {default as RecentSearches} from '../search/RecentSearches'; export {default as LoadingIndicator} from './LoadingIndicator'; export {default as DateLabel} from './DateLabel'; export {default as SocialLinkModal} from './SocialLinkModal'; +export {default as ComingSoon} from './ComingSoon'; export * from './post'; diff --git a/src/routes/tabs/NavigationBar.tsx b/src/routes/tabs/NavigationBar.tsx index 9cfbe4bf..e0341c40 100644 --- a/src/routes/tabs/NavigationBar.tsx +++ b/src/routes/tabs/NavigationBar.tsx @@ -57,13 +57,13 @@ const NavigationBar: React.FC = () => { }, }}> + + - - { - const linkers: Array = []; - const [state, setState] = React.useState({ - showMore: false, - }); - - let numSocials: Number = state.showMore ? 9 : 3; - - for (let i = 0; i < numSocials; i++) { - let linker: LinkerType = { - label: SOCIAL_LIST[i], - }; - linkers.push(linker); - } - - const handleShowPress = () => { - setState({ - ...state, - showMore: !state.showMore, - }); - }; - - return ( - - - {linkers.map((linker, index) => ( - - ))} - - {state.showMore && Show Less 🔼} - {!state.showMore && Show More 🔽} - - - - ); + return ; }; -const styles = StyleSheet.create({ - container: { - flexDirection: 'row', - height: '19%', - flexWrap: 'wrap', - justifyContent: 'center', - alignContent: 'center', - }, - show: { - borderColor: '#fff', - borderWidth: 1, - borderRadius: 3, - paddingHorizontal: '2%', - paddingVertical: '1%', - marginVertical: '3%', - marginLeft: '65%', - }, -}); - export default Home; diff --git a/src/screens/main/Notifications.tsx b/src/screens/main/Notifications.tsx index db89d7f9..ca8c41c3 100644 --- a/src/screens/main/Notifications.tsx +++ b/src/screens/main/Notifications.tsx @@ -1,7 +1,5 @@ import React from 'react'; -import {Text} from 'react-native-animatable'; -import {StyleSheet} from 'react-native'; -import {GradientBackground} from '../../components'; +import {ComingSoon} from '../../components'; /** * Navigation Screen for displaying other users' @@ -9,16 +7,7 @@ import {GradientBackground} from '../../components'; */ const Notifications: React.FC = () => { - return ( - - Notifications will go here 🔔 - - ); + return ; }; -const styles = StyleSheet.create({ - text: { - justifyContent: 'center', - backgroundColor: 'transparent', - }, -}); + export default Notifications; diff --git a/src/screens/main/Upload.tsx b/src/screens/main/Upload.tsx index d91af1f5..fc089aec 100644 --- a/src/screens/main/Upload.tsx +++ b/src/screens/main/Upload.tsx @@ -1,24 +1,11 @@ import React from 'react'; -import {Text} from 'react-native-animatable'; -import {StyleSheet} from 'react-native'; -import {GradientBackground} from '../../components'; - +import {ComingSoon} from '../../components'; /** * Upload Screen to allow users to upload posts to Tagg */ const Upload: React.FC = () => { - return ( - - Upload pics ⬆ - - ); + return ; }; -const styles = StyleSheet.create({ - text: { - justifyContent: 'center', - backgroundColor: 'transparent', - }, -}); export default Upload; diff --git a/src/screens/onboarding/Checkpoint.tsx b/src/screens/onboarding/Checkpoint.tsx index aae2293e..8e53996f 100644 --- a/src/screens/onboarding/Checkpoint.tsx +++ b/src/screens/onboarding/Checkpoint.tsx @@ -48,8 +48,7 @@ const Checkpoint: React.FC = ({route, navigation}) => { - - + You are registered! We're almost there. Would you like to setup your profile now? @@ -65,6 +64,7 @@ const Checkpoint: React.FC = ({route, navigation}) => { + ); }; -- cgit v1.2.3-70-g09d2