diff options
Diffstat (limited to 'src/components/dialogs/nuxs')
| -rw-r--r-- | src/components/dialogs/nuxs/NeueTypography.tsx | 117 | ||||
| -rw-r--r-- | src/components/dialogs/nuxs/index.tsx | 26 |
2 files changed, 10 insertions, 133 deletions
diff --git a/src/components/dialogs/nuxs/NeueTypography.tsx b/src/components/dialogs/nuxs/NeueTypography.tsx deleted file mode 100644 index f29dc356d..000000000 --- a/src/components/dialogs/nuxs/NeueTypography.tsx +++ /dev/null @@ -1,117 +0,0 @@ -import React from 'react' -import {View} from 'react-native' -import {msg, Trans} from '@lingui/macro' -import {useLingui} from '@lingui/react' - -import {AppearanceToggleButtonGroup} from '#/screens/Settings/AppearanceSettings' -import {atoms as a, useAlf, useTheme} from '#/alf' -import * as Dialog from '#/components/Dialog' -import {useNuxDialogContext} from '#/components/dialogs/nuxs' -import {Divider} from '#/components/Divider' -import {TextSize_Stroke2_Corner0_Rounded as TextSize} from '#/components/icons/TextSize' -import {TitleCase_Stroke2_Corner0_Rounded as Aa} from '#/components/icons/TitleCase' -import {Text} from '#/components/Typography' - -export function NeueTypography() { - const t = useTheme() - const {_} = useLingui() - const nuxDialogs = useNuxDialogContext() - const control = Dialog.useDialogControl() - const {fonts} = useAlf() - - Dialog.useAutoOpen(control, 3e3) - - const onClose = React.useCallback(() => { - nuxDialogs.dismissActiveNux() - }, [nuxDialogs]) - - const onChangeFontFamily = React.useCallback( - (values: string[]) => { - const next = values[0] === 'system' ? 'system' : 'theme' - fonts.setFontFamily(next) - }, - [fonts], - ) - - const onChangeFontScale = React.useCallback( - (values: string[]) => { - const next = values[0] || ('0' as any) - fonts.setFontScale(next) - }, - [fonts], - ) - - return ( - <Dialog.Outer control={control} onClose={onClose}> - <Dialog.Handle /> - <Dialog.ScrollableInner label={_(msg`Introducing new font settings`)}> - <View style={[a.gap_xl]}> - <View style={[a.gap_md]}> - <Text style={[a.text_3xl, a.font_heavy]}> - <Trans>New font settings ✨</Trans> - </Text> - <Text style={[a.text_lg, a.leading_snug, {maxWidth: 400}]}> - <Trans> - We're introducing a new theme font, along with adjustable font - sizing. - </Trans> - </Text> - <Text - style={[a.text_sm, a.leading_snug, t.atoms.text_contrast_medium]}> - <Trans> - You can adjust these in your Appearance Settings later. - </Trans> - </Text> - </View> - - <Divider /> - - <View style={[a.gap_lg]}> - <AppearanceToggleButtonGroup - title={_(msg`Font`)} - description={_( - msg`For the best experience, we recommend using the theme font.`, - )} - icon={Aa} - items={[ - { - label: _(msg`System`), - name: 'system', - }, - { - label: _(msg`Theme`), - name: 'theme', - }, - ]} - values={[fonts.family]} - onChange={onChangeFontFamily} - /> - - <AppearanceToggleButtonGroup - title={_(msg`Font size`)} - icon={TextSize} - items={[ - { - label: _(msg`Smaller`), - name: '-1', - }, - { - label: _(msg`Default`), - name: '0', - }, - { - label: _(msg`Larger`), - name: '1', - }, - ]} - values={[fonts.scale]} - onChange={onChangeFontScale} - /> - </View> - </View> - - <Dialog.Close /> - </Dialog.ScrollableInner> - </Dialog.Outer> - ) -} diff --git a/src/components/dialogs/nuxs/index.tsx b/src/components/dialogs/nuxs/index.tsx index d17615aeb..701ae84e6 100644 --- a/src/components/dialogs/nuxs/index.tsx +++ b/src/components/dialogs/nuxs/index.tsx @@ -19,7 +19,6 @@ import {useOnboardingState} from '#/state/shell' /* * NUXs */ -import {NeueTypography} from '#/components/dialogs/nuxs/NeueTypography' import {isSnoozed, snooze, unsnooze} from '#/components/dialogs/nuxs/snoozing' import {IS_DEV} from '#/env' @@ -36,19 +35,7 @@ const queuedNuxs: { currentProfile: AppBskyActorDefs.ProfileViewDetailed preferences: UsePreferencesQueryResponse }) => boolean -}[] = [ - { - id: Nux.NeueTypography, - enabled(props) { - if (props.currentProfile.createdAt) { - if (new Date(props.currentProfile.createdAt) < new Date('2024-10-09')) { - return true - } - } - return false - }, - }, -] +}[] = [] const Context = React.createContext<Context>({ activeNux: undefined, @@ -66,7 +53,14 @@ export function NuxDialogs() { const onboardingActive = useOnboardingState().isActive const isLoading = - !currentAccount || !preferences || !profile || onboardingActive + onboardingActive || + !currentAccount || + !preferences || + !profile || + // Profile isn't legit ready until createdAt is a real date. + !profile.createdAt || + profile.createdAt === '0001-01-01T00:00:00.000Z' // TODO: Fix this in AppView. + return !isLoading ? ( <Inner currentAccount={currentAccount} @@ -174,7 +168,7 @@ function Inner({ return ( <Context.Provider value={ctx}> - {activeNux === Nux.NeueTypography && <NeueTypography />} + {/*For example, activeNux === Nux.NeueTypography && <NeueTypography />*/} </Context.Provider> ) } |