diff options
author | Thomas F. K. Jorna <[email protected]> | 2021-07-23 15:24:35 +0200 |
---|---|---|
committer | Thomas F. K. Jorna <[email protected]> | 2021-07-23 15:24:35 +0200 |
commit | 356381d14cb1ff3cbd39c7e396dd14379336451b (patch) | |
tree | a03e9b2534600bde7b3b781411b5b03f8134904b /app_expo/screens/welcome | |
parent | 7aa007f158a52b41494049a1202938fc97813ec1 (diff) | |
parent | 73308af061af5e17ac7d4a73fa027a2f303c70dd (diff) |
resolving merge conflicts
Diffstat (limited to 'app_expo/screens/welcome')
-rw-r--r-- | app_expo/screens/welcome/bowser.png | bin | 33502 -> 0 bytes | |||
-rw-r--r-- | app_expo/screens/welcome/[email protected] | bin | 79259 -> 0 bytes | |||
-rw-r--r-- | app_expo/screens/welcome/welcome-screen.tsx | 118 |
3 files changed, 0 insertions, 118 deletions
diff --git a/app_expo/screens/welcome/bowser.png b/app_expo/screens/welcome/bowser.png Binary files differdeleted file mode 100644 index 2b0bdbc..0000000 --- a/app_expo/screens/welcome/bowser.png +++ /dev/null diff --git a/app_expo/screens/welcome/[email protected] b/app_expo/screens/welcome/[email protected] Binary files differdeleted file mode 100644 index 85cc693..0000000 --- a/app_expo/screens/welcome/[email protected] +++ /dev/null diff --git a/app_expo/screens/welcome/welcome-screen.tsx b/app_expo/screens/welcome/welcome-screen.tsx deleted file mode 100644 index 49a6777..0000000 --- a/app_expo/screens/welcome/welcome-screen.tsx +++ /dev/null @@ -1,118 +0,0 @@ -import React from 'react' -import { View, ViewStyle, TextStyle, ImageStyle, SafeAreaView } from 'react-native' -import { useNavigation } from '@react-navigation/native' -import { observer } from 'mobx-react-lite' -import { Button, Header, Screen, Text, Wallpaper, AutoImage as Image } from '../../components' -import { color, spacing, typography } from '../../theme' -const bowserLogo = require('./bowser.png') - -const FULL: ViewStyle = { flex: 1 } -const CONTAINER: ViewStyle = { - backgroundColor: color.transparent, - paddingHorizontal: spacing[4], -} -const TEXT: TextStyle = { - color: color.palette.white, - fontFamily: typography.primary, -} -const BOLD: TextStyle = { fontWeight: 'bold' } -const HEADER: TextStyle = { - paddingTop: spacing[3], - paddingBottom: spacing[4] + spacing[1], - paddingHorizontal: 0, -} -const HEADER_TITLE: TextStyle = { - ...TEXT, - ...BOLD, - fontSize: 12, - lineHeight: 15, - textAlign: 'center', - letterSpacing: 1.5, -} -const TITLE_WRAPPER: TextStyle = { - ...TEXT, - textAlign: 'center', -} -const TITLE: TextStyle = { - ...TEXT, - ...BOLD, - fontSize: 28, - lineHeight: 38, - textAlign: 'center', -} -const ALMOST: TextStyle = { - ...TEXT, - ...BOLD, - fontSize: 26, - fontStyle: 'italic', -} -const BOWSER: ImageStyle = { - alignSelf: 'center', - marginVertical: spacing[5], - maxWidth: '100%', - width: 343, - height: 230, -} -const CONTENT: TextStyle = { - ...TEXT, - color: '#BAB6C8', - fontSize: 15, - lineHeight: 22, - marginBottom: spacing[5], -} -const CONTINUE: ViewStyle = { - paddingVertical: spacing[4], - paddingHorizontal: spacing[4], - backgroundColor: color.palette.deepPurple, -} -const CONTINUE_TEXT: TextStyle = { - ...TEXT, - ...BOLD, - fontSize: 13, - letterSpacing: 2, -} -const FOOTER: ViewStyle = { backgroundColor: '#20162D' } -const FOOTER_CONTENT: ViewStyle = { - paddingVertical: spacing[4], - paddingHorizontal: spacing[4], -} - -export const WelcomeScreen = observer(function WelcomeScreen() { - const navigation = useNavigation() - const nextScreen = () => navigation.navigate('demo') - - return ( - <View testID="WelcomeScreen" style={FULL}> - <Wallpaper /> - <Screen style={CONTAINER} preset="scroll" backgroundColor={color.transparent}> - <Header headerTx="welcomeScreen.poweredBy" style={HEADER} titleStyle={HEADER_TITLE} /> - <Text style={TITLE_WRAPPER}> - <Text style={TITLE} text="Your new app, " /> - <Text style={ALMOST} text="almost" /> - <Text style={TITLE} text="!" /> - </Text> - <Text style={TITLE} preset="header" tx="welcomeScreen.readyForLaunch" /> - <Image source={bowserLogo} style={BOWSER} /> - <Text style={CONTENT}> - This probably isn't what your app is going to look like. Unless your designer handed you - this screen and, in that case, congrats! You're ready to ship. - </Text> - <Text style={CONTENT}> - For everyone else, this is where you'll see a live preview of your fully functioning app - using Ignite. - </Text> - </Screen> - <SafeAreaView style={FOOTER}> - <View style={FOOTER_CONTENT}> - <Button - testID="next-screen-button" - style={CONTINUE} - textStyle={CONTINUE_TEXT} - tx="welcomeScreen.continue" - onPress={nextScreen} - /> - </View> - </SafeAreaView> - </View> - ) -}) |