Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update onboarding assets #338

Merged
merged 3 commits into from
Nov 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed assets/onboarding/add.jpg
Binary file not shown.
Binary file modified assets/onboarding/add.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/onboarding/multiplier.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed assets/onboarding/multiplier.png
Binary file not shown.
Binary file modified assets/onboarding/rounds.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/onboarding/sheet.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/onboarding/subtract.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/onboarding/tile.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/onboarding/tile.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 10 additions & 5 deletions src/screens/OnboardingScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const data: OnboardingScreenItem[] = [
image: require('../../assets/icon.png'),
imageHeight: 150,
imageWidth: 150,
description: '« Swipe left to begin «',
description: 'Swipe left to begin.',
backgroundColor: '#3475B1',
},
{
Expand All @@ -55,17 +55,22 @@ const data: OnboardingScreenItem[] = [
},
{
title: "Adjust Point Values",
image: require('../../assets/onboarding/multiplier.png'),
image: require('../../assets/onboarding/multiplier.jpeg'),
description: 'Adjust the point value by tapping on the point value selector.',
backgroundColor: '#7370cf',
},
{
title: "Change Round",
image: require('../../assets/onboarding/rounds.png'),
description: 'Use rounds for score history. \nTap the < and > buttons to cycle rounds.',
//yellow
description: 'Use rounds for score history. \nTap the arrows to cycle rounds.',
backgroundColor: '#f0c330',
},
{
title: "Score History",
image: require('../../assets/onboarding/sheet.png'),
description: 'Pull up the bottom sheet to view score history. \nPull down to close.',
backgroundColor: '#7bcf6e',
},
{
title: "That's it!",
image: require('../../assets/icon.png'),
Expand Down Expand Up @@ -122,7 +127,7 @@ const OnboardingScreen: React.FunctionComponent<Props> = ({ navigation, route })
height: item.imageHeight || '100%',
borderRadius: (
index == 0 || index == data.length - 1
) ? 40 : 0,
) ? 20 : 0,
resizeMode: 'contain',
}} />
</Animated.View>
Expand Down
4 changes: 2 additions & 2 deletions src/screens/SettingsScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,9 @@ const SettingsScreen: React.FunctionComponent<Props> = ({ navigation }) => {

return (
<KeyboardAwareScrollView style={styles.configScrollContainer}
extraScrollHeight={200}
contentContainerStyle={{ alignItems: 'stretch' }}>
<View style={{ width: 350, alignSelf: 'center' }}>
<View style={{ width: 350, alignSelf: 'center', marginBottom: 100 }}>
<Text style={styles.heading}>Game Title</Text>

<EditGame />
Expand Down Expand Up @@ -136,7 +137,6 @@ const SettingsScreen: React.FunctionComponent<Props> = ({ navigation }) => {
<Text style={styles.text}>Max players reached.</Text>
}
</View>
<View style={{ height: 200 }}></View>
</KeyboardAwareScrollView>
);
};
Expand Down