diff options
author | Eric Bailey <git@esb.lol> | 2024-03-20 16:26:30 -0500 |
---|---|---|
committer | Eric Bailey <git@esb.lol> | 2024-03-20 16:26:30 -0500 |
commit | aa239451afe75a38e7623bf829554474ba0db138 (patch) | |
tree | 7f8987fd88223aef5bf596661058f164312f6887 | |
parent | 6e1541f2030897c8e32090dee3904fc65284ee8c (diff) | |
download | voidsky-aa239451afe75a38e7623bf829554474ba0db138.tar.zst |
Signup shell tweaks
-rw-r--r-- | src/alf/atoms.ts | 7 | ||||
-rw-r--r-- | src/alf/tokens.ts | 8 | ||||
-rw-r--r-- | src/screens/Signup/index.tsx | 49 |
3 files changed, 25 insertions, 39 deletions
diff --git a/src/alf/atoms.ts b/src/alf/atoms.ts index ef285c09a..45ab72ca6 100644 --- a/src/alf/atoms.ts +++ b/src/alf/atoms.ts @@ -1,6 +1,7 @@ import {Platform} from 'react-native' -import {web, native} from '#/alf/util/platform' + import * as tokens from '#/alf/tokens' +import {native, web} from '#/alf/util/platform' export const atoms = { /* @@ -253,10 +254,10 @@ export const atoms = { fontWeight: tokens.fontWeight.normal, }, font_semibold: { - fontWeight: '500', + fontWeight: tokens.fontWeight.semibold, }, font_bold: { - fontWeight: tokens.fontWeight.semibold, + fontWeight: tokens.fontWeight.bold, }, italic: { fontStyle: 'italic', diff --git a/src/alf/tokens.ts b/src/alf/tokens.ts index 4045c831c..1bddd95d4 100644 --- a/src/alf/tokens.ts +++ b/src/alf/tokens.ts @@ -1,8 +1,8 @@ import { BLUE_HUE, - RED_HUE, - GREEN_HUE, generateScale, + GREEN_HUE, + RED_HUE, } from '#/alf/util/colorGeneration' export const scale = generateScale(6, 100) @@ -116,8 +116,8 @@ export const borderRadius = { export const fontWeight = { normal: '400', - semibold: '600', - bold: '900', + semibold: '500', + bold: '600', } as const export const gradients = { diff --git a/src/screens/Signup/index.tsx b/src/screens/Signup/index.tsx index 3414aacc1..f19823b4f 100644 --- a/src/screens/Signup/index.tsx +++ b/src/screens/Signup/index.tsx @@ -21,6 +21,7 @@ import {StepHandle} from '#/screens/Signup/StepHandle' import {StepInfo} from '#/screens/Signup/StepInfo' import {atoms as a, useTheme} from '#/alf' import {Button, ButtonText} from '#/components/Button' +import {Divider} from '#/components/Divider' import {InlineLink} from '#/components/Link' import {Text} from '#/components/Typography' @@ -126,16 +127,9 @@ export function Signup({onPressBack}: {onPressBack: () => void}) { keyboardShouldPersistTaps="handled" style={a.h_full} keyboardDismissMode="on-drag"> - <View - style={[ - a.flex_1, - a.px_xl, - a.gap_3xl, - a.pt_2xl, - {paddingBottom: 100}, - ]}> - <View style={[a.gap_sm]}> - <Text style={[a.text_lg, t.atoms.text_contrast_medium]}> + <View style={[a.flex_1, a.px_xl, a.pt_2xl, {paddingBottom: 100}]}> + <View style={[a.gap_sm, a.pb_3xl]}> + <Text style={[a.font_semibold, t.atoms.text_contrast_medium]}> <Trans>Step</Trans> {state.activeStep + 1} <Trans>of</Trans>{' '} {state.serviceDescription && !state.serviceDescription.phoneVerificationRequired @@ -152,7 +146,8 @@ export function Signup({onPressBack}: {onPressBack: () => void}) { )} </Text> </View> - <View> + + <View style={[a.pb_3xl]}> {state.activeStep === SignupStep.INFO ? ( <StepInfo /> ) : state.activeStep === SignupStep.HANDLE ? ( @@ -162,12 +157,12 @@ export function Signup({onPressBack}: {onPressBack: () => void}) { )} </View> - <View style={[a.flex_row, a.justify_between]}> + <View style={[a.flex_row, a.justify_between, a.pb_lg]}> <Button label="Back" variant="solid" color="secondary" - size="small" + size="medium" onPress={onBackPress}> Back </Button> @@ -178,7 +173,7 @@ export function Signup({onPressBack}: {onPressBack: () => void}) { label="Retry" variant="solid" color="primary" - size="small" + size="medium" disabled={state.isLoading} onPress={() => refetch()}> Retry @@ -187,12 +182,8 @@ export function Signup({onPressBack}: {onPressBack: () => void}) { <Button label="Next" variant="solid" - color={ - !state.canNext || state.isLoading - ? 'secondary' - : 'primary' - } - size="small" + color="primary" + size="medium" disabled={!state.canNext || state.isLoading} onPress={onNextPress}> <ButtonText>Next</ButtonText> @@ -201,19 +192,13 @@ export function Signup({onPressBack}: {onPressBack: () => void}) { </> )} </View> - <View - style={[ - a.w_full, - a.py_lg, - a.px_md, - a.rounded_sm, - t.atoms.bg_contrast_25, - ]}> - <Text style={[a.text_md, t.atoms.text_contrast_medium]}> + + <Divider /> + + <View style={[a.w_full, a.py_lg]}> + <Text style={[t.atoms.text_contrast_medium]}> <Trans>Having trouble?</Trans>{' '} - <InlineLink - style={[a.text_md]} - to={FEEDBACK_FORM_URL({email: state.email})}> + <InlineLink to={FEEDBACK_FORM_URL({email: state.email})}> <Trans>Contact support</Trans> </InlineLink> </Text> |