Skip to content

Commit

Permalink
Chage in nav bar color and added info page
Browse files Browse the repository at this point in the history
  • Loading branch information
smtrowel committed Apr 1, 2024
1 parent 966fde1 commit df7de18
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 8 deletions.
16 changes: 11 additions & 5 deletions packages/mobile/src/navigation/root/tab/InfoScreen/InfoScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,13 @@ const InfoScreen = () => {
<>
<StatusBar hidden={false} />
<VStack flexDirection="column" bgColor={bgColor} flex={1}>
<Box
flex={1}
tintColor={bgColor}
borderBottomColor="secondary.400"
borderBottomWidth={2}
borderBottomStyle="solid"
></Box>
{/* Placeholder "Welcome to DanceBlue 2024, we're getting things ready for you!\nPlease check back soon!" */}
<Box
flex={2}
Expand All @@ -31,7 +38,8 @@ const InfoScreen = () => {
width={screenWidth}
>
<Text fontSize={fontScale * 40} marginX={"1/6"} textAlign="center">
Welcome to DanceBlue 2024!
Welcome to DanceBlue Marathon 2024!\nWe are so excited that you are
here!
</Text>
</Box>
<Box flex={1} justifyContent="center">
Expand All @@ -51,16 +59,14 @@ const InfoScreen = () => {
</Button>
<Button
onPress={() => {
openBrowserAsync(
"https://danceblue.org/spirit-point-form/"
).catch(universalCatch);
openBrowserAsync("https://danceblue.org").catch(universalCatch);
}}
width="2/5"
backgroundColor={"secondary.400"}
_text={{ color: "primary.600" }}
_pressed={{ opacity: 0.6 }}
>
Submit Spirit Points
Link to the Live Stream!!
</Button>
</HStack>
<HStack justifyContent="center">
Expand Down
6 changes: 3 additions & 3 deletions packages/mobile/src/navigation/root/tab/TabBarComponent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ function TabBarComponent({
const tabBarHeight = screenHeight * 0.1;

const { dark } = useThemeColors();
const tabBarBackgroundColor = useColorModeValue("#ffebad", dark[100]);
const tabBarBackgroundColor = useColorModeValue("#e0edff", dark[100]);

return (
<Box
Expand Down Expand Up @@ -259,8 +259,8 @@ function TabBarComponent({
typeof options.tabBarLabel === "string"
? options.tabBarLabel
: options.title !== undefined
? options.title
: route.name
? options.title
: route.name
}
isFocused={state.index === index}
options={options}
Expand Down

0 comments on commit df7de18

Please sign in to comment.