add screen transitions

This commit is contained in:
Hailey
2024-06-07 10:38:28 -07:00
parent b8e4863845
commit b65074dc83
4 changed files with 63 additions and 54 deletions
+42 -39
View File
@@ -5,6 +5,7 @@ import {useLingui} from '@lingui/react'
import {useProfileQuery} from 'state/queries/profile' import {useProfileQuery} from 'state/queries/profile'
import {useSession} from 'state/session' import {useSession} from 'state/session'
import {ScreenTransition} from '#/screens/Login/ScreenTransition'
import {useWizardState} from '#/screens/StarterPack/Wizard/State' import {useWizardState} from '#/screens/StarterPack/Wizard/State'
import {atoms as a} from '#/alf' import {atoms as a} from '#/alf'
import * as TextField from '#/components/forms/TextField' import * as TextField from '#/components/forms/TextField'
@@ -22,49 +23,51 @@ export function StepDetails() {
}) })
return ( return (
<View style={[a.px_xl, a.gap_xl, a.mt_4xl]}> <ScreenTransition>
<View style={[{height: 65}]}> <View style={[a.px_xl, a.gap_xl, a.mt_4xl]}>
<StarterPackIcon /> <View style={[{height: 65}]}>
</View> <StarterPackIcon />
<View style={[a.gap_md, a.align_center, a.px_md, a.mb_md]}> </View>
<Text style={[a.font_bold, a.text_3xl]}> <View style={[a.gap_md, a.align_center, a.px_md, a.mb_md]}>
<Trans>Invites, but personal</Trans> <Text style={[a.font_bold, a.text_3xl]}>
</Text> <Trans>Invites, but personal</Trans>
<Text style={[a.text_center, a.text_md, a.px_md]}> </Text>
<Trans> <Text style={[a.text_center, a.text_md, a.px_md]}>
Create a starter pack to invite new users to Bluesky and give them <Trans>
your favorite feeds and follows. Create a starter pack to invite new users to Bluesky and give them
</Trans> your favorite feeds and follows.
</Text> </Trans>
</View> </Text>
<View> </View>
<TextField.LabelText>{_(msg`Name`)}</TextField.LabelText> <View>
<TextField.Input <TextField.LabelText>{_(msg`Name`)}</TextField.LabelText>
label={_(
msg`${
currentProfile?.displayName || currentProfile?.handle
}'s starter pack`,
)}
value={state.name}
onChangeText={text => dispatch({type: 'SetName', name: text})}
/>
</View>
<View>
<TextField.LabelText>{_(msg`Description`)}</TextField.LabelText>
<TextField.Root>
<TextField.Input <TextField.Input
label={_( label={_(
msg`Write a short description of your starter pack. What can new users expect?`, msg`${
currentProfile?.displayName || currentProfile?.handle
}'s starter pack`,
)} )}
value={state.description} value={state.name}
onChangeText={text => onChangeText={text => dispatch({type: 'SetName', name: text})}
dispatch({type: 'SetDescription', description: text})
}
multiline
style={{minHeight: 150}}
/> />
</TextField.Root> </View>
<View>
<TextField.LabelText>{_(msg`Description`)}</TextField.LabelText>
<TextField.Root>
<TextField.Input
label={_(
msg`Write a short description of your starter pack. What can new users expect?`,
)}
value={state.description}
onChangeText={text =>
dispatch({type: 'SetDescription', description: text})
}
multiline
style={{minHeight: 150}}
/>
</TextField.Root>
</View>
</View> </View>
</View> </ScreenTransition>
) )
} }
+3 -2
View File
@@ -10,6 +10,7 @@ import {
} from 'state/queries/feed' } from 'state/queries/feed'
import {SearchInput} from 'view/com/util/forms/SearchInput' import {SearchInput} from 'view/com/util/forms/SearchInput'
import {List} from 'view/com/util/List' import {List} from 'view/com/util/List'
import {ScreenTransition} from '#/screens/Login/ScreenTransition'
import {useWizardState} from '#/screens/StarterPack/Wizard/State' import {useWizardState} from '#/screens/StarterPack/Wizard/State'
import {atoms as a} from '#/alf' import {atoms as a} from '#/alf'
import {Loader} from '#/components/Loader' import {Loader} from '#/components/Loader'
@@ -53,7 +54,7 @@ export function StepFeeds() {
} }
return ( return (
<> <ScreenTransition>
<View style={[a.my_sm, a.px_md, {height: 40}]}> <View style={[a.my_sm, a.px_md, {height: 40}]}>
<SearchInput <SearchInput
query={query} query={query}
@@ -76,6 +77,6 @@ export function StepFeeds() {
</View> </View>
} }
/> />
</> </ScreenTransition>
) )
} }
@@ -8,6 +8,7 @@ import {useProfileFollowsQuery} from 'state/queries/profile-follows'
import {useSession} from 'state/session' import {useSession} from 'state/session'
import {SearchInput} from 'view/com/util/forms/SearchInput' import {SearchInput} from 'view/com/util/forms/SearchInput'
import {List} from 'view/com/util/List' import {List} from 'view/com/util/List'
import {ScreenTransition} from '#/screens/Login/ScreenTransition'
import {useWizardState} from '#/screens/StarterPack/Wizard/State' import {useWizardState} from '#/screens/StarterPack/Wizard/State'
import {atoms as a} from '#/alf' import {atoms as a} from '#/alf'
import {Loader} from '#/components/Loader' import {Loader} from '#/components/Loader'
@@ -42,7 +43,7 @@ export function StepProfiles() {
} }
return ( return (
<> <ScreenTransition>
<View style={[a.my_sm, a.px_md, {height: 40}]}> <View style={[a.my_sm, a.px_md, {height: 40}]}>
<SearchInput <SearchInput
query={query} query={query}
@@ -64,6 +65,6 @@ export function StepProfiles() {
</View> </View>
} }
/> />
</> </ScreenTransition>
) )
} }
+15 -11
View File
@@ -221,17 +221,21 @@ function WizardInner() {
isWeb && [a.py_md], isWeb && [a.py_md],
]}> ]}>
<View style={[{width: 65}]}> <View style={[{width: 65}]}>
{state.currentStep !== 'Details' && ( <TouchableOpacity
<TouchableOpacity testID="viewHeaderDrawerBtn"
testID="viewHeaderDrawerBtn" hitSlop={HITSLOP_10}
onPress={() => dispatch({type: 'Back'})} accessibilityRole="button"
hitSlop={HITSLOP_10} accessibilityLabel={_(msg`Back`)}
accessibilityRole="button" accessibilityHint={_(msg`Go back to the previous step`)}
accessibilityLabel={_(msg`Back`)} onPress={() => {
accessibilityHint={_(msg`Go back to the previous step`)}> if (state.currentStep === 'Details') {
<FontAwesomeIcon size={18} icon="angle-left" /> navigation.goBack()
</TouchableOpacity> } else {
)} dispatch({type: 'Back'})
}
}}>
<FontAwesomeIcon size={18} icon="angle-left" />
</TouchableOpacity>
</View> </View>
<Text style={[a.flex_1, a.font_bold, a.text_lg, a.text_center]}> <Text style={[a.flex_1, a.font_bold, a.text_lg, a.text_center]}>
{uiStrings.header} {uiStrings.header}