From aa239451afe75a38e7623bf829554474ba0db138 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Wed, 20 Mar 2024 16:26:30 -0500 Subject: Signup shell tweaks --- src/alf/atoms.ts | 7 ++++--- src/alf/tokens.ts | 8 ++++---- src/screens/Signup/index.tsx | 49 +++++++++++++++----------------------------- 3 files changed, 25 insertions(+), 39 deletions(-) (limited to 'src') 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"> - - - + + + Step {state.activeStep + 1} of{' '} {state.serviceDescription && !state.serviceDescription.phoneVerificationRequired @@ -152,7 +146,8 @@ export function Signup({onPressBack}: {onPressBack: () => void}) { )} - + + {state.activeStep === SignupStep.INFO ? ( ) : state.activeStep === SignupStep.HANDLE ? ( @@ -162,12 +157,12 @@ export function Signup({onPressBack}: {onPressBack: () => void}) { )} - + @@ -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}) {